From 18d8ff15abeb2aecc3cdedb0eabb076b4b8f058c Mon Sep 17 00:00:00 2001 From: Kristóf Marussy Date: Wed, 29 Jul 2020 16:40:45 +0200 Subject: Fix time measurement --- .../case.study.familyTree.run/bin/.gitignore | 1 - .../config/genericFamilyTreeSMTQual.vsconfig | 3 + .../queries/SatelliteQueries.vql | 144 +-------------------- 3 files changed, 4 insertions(+), 144 deletions(-) delete mode 100644 Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/.gitignore (limited to 'Tests') diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/.gitignore b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/.gitignore deleted file mode 100644 index 7050a7e3..00000000 --- a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/queries/ diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericFamilyTreeSMTQual.vsconfig b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericFamilyTreeSMTQual.vsconfig index 80ab2906..fa9cd6e2 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericFamilyTreeSMTQual.vsconfig +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericFamilyTreeSMTQual.vsconfig @@ -36,6 +36,9 @@ generate { log-level = normal, "fitness-punishSize" = "false", "fitness-scope" = "3", + "fitness-objectCreationCosts" = "true", + "scopePropagator" = "typeHierarchy", + "fitness-missing-containment" = "2", "numeric-solver-at-end" = "true" } diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/queries/SatelliteQueries.vql b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/queries/SatelliteQueries.vql index 57b5933a..da889032 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/queries/SatelliteQueries.vql +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/queries/SatelliteQueries.vql @@ -245,146 +245,4 @@ pattern tooLowPathLengthForGroundStation(s:CommSubsystem) { GroundStationNetwork.commSubsystem(_,ts); check(l!=385000);//385.000km } -//// -//// Metrics -//// -// -//// Coverage -// -//pattern coverageMetric(Coverage : java Double) { -// Coverage == sum find missionCoverage(_, #_); -//} -// -//private pattern missionCoverage(Mission : InterferometryMission, Coverage : java Double) { -// InterferometryMission.observationTime(Mission, ObservationTime); -// ObserverCount == count find spacecraftWithInterferometryPayload(Mission, _); -// Coverage == eval(Math.pow(1 - 2.0 / ObserverCount, 1 + 9 * (1.0 / ObservationTime)) + 0.05 * ObservationTime / 3); -//} -// -//// Time -// -//pattern timeMetric(Time : java Double) { -// Time == sum find missionTime(_, #_); -//} -// -//private pattern missionTime(Mission : InterferometryMission, Time : java Double) { -// InterferometryMission.observationTime(Mission, ObservationTime); -// TrasmitTime == sum find transmitTime(Mission, _, #_); -// Time == eval(TrasmitTime + 60.0 * ObservationTime); -//} -// -//private pattern transmitTime(Mission : InterferometryMission, Spacecraft : Spacecraft, TransmitTime : java Double) { -// ConstellationMission.spacecraft(Mission, Spacecraft); -// find scienceData(Spacecraft, ScienceData); -// IncomingData == sum find incomingData(Spacecraft, _, #_); -// find transmitRate(Spacecraft, TransmitRate); -// TransmitTime == eval((ScienceData + IncomingData) / (7.5 * TransmitRate)); -//} -// -//private pattern incomingData(Spacecraft : Spacecraft, Source : Spacecraft, Data : java Double) { -// find indirectCommunicationLink(Source, Spacecraft); -// find scienceData(Source, Data); -//} -// -//private pattern scienceData(Spacecraft : Spacecraft, Data : java Double) { -// ConstellationMission.spacecraft(Mission, Spacecraft); -// InterferometryMission.observationTime(Mission, ObservationTime); -// Data == eval(12.0 * ObservationTime); -//} -// -//private pattern transmitRate(Spacecraft : Spacecraft, TransmitRate : java Double) { -// find spacecraftUplink(Spacecraft, Comm, Target); -// UHFCommSubsystem(Comm); -// Spacecraft(Target); -// TransmitRate == 5.0; -//} or { -// find spacecraftUplink(Spacecraft, Comm, Target); -// XCommSubsystem(Comm); -// Spacecraft(Target); -// TransmitRate == 1.6; -//} or { -// find spacecraftUplink(Spacecraft, Comm, Target); -// XCommSubsystem(Comm); -// GroundStationNetwork(Target); -// TransmitRate == 0.7; -//} or { -// find spacecraftUplink(Spacecraft, Comm, Target); -// KaCommSubsystem(Comm); -// Spacecraft(Target); -// TransmitRate == 220.0; -//} or { -// find spacecraftUplink(Spacecraft, Comm, Target); -// KaCommSubsystem(Comm); -// GroundStationNetwork(Target); -// TransmitRate == 80.0; -//} -// -//private pattern spacecraftUplink(Spacecraft : Spacecraft, TargetSubsystem : CommSubsystem, Target : CommunicatingElement) { -// CommunicatingElement.commSubsystem.target(Spacecraft, TargetSubsystem); -// CommunicatingElement.commSubsystem(Target, TargetSubsystem); -//} -// -//// Cost -// -//pattern costMetric(Cost : java Double) { -// Cost == sum find missionCost(_, #_); -//} -// -//private pattern missionCost(Mission : InterferometryMission, Cost : java Double) { -// InterferometryMission.observationTime(Mission, ObservationTime); -// SpacecraftCost == sum find spacecraftCost(Mission, _, #_); -// Cost == eval(SpacecraftCost + 100000.0 * ObservationTime); -//} -// -//private pattern spacecraftCost(Mission : InterferometryMission, Spacecraft : Spacecraft, Cost : java Double) { -// ConstellationMission.spacecraft(Mission, Spacecraft); -// find spacecraftOfKindCount(Spacecraft, KindCount); -// find basePrice(Spacecraft, BasePrice); -// find interferometryPayloadCost(Spacecraft, InterferometryPayloadCost); -// find additionalCommSubsystemCost(Spacecraft, AdditionalCommSubsystemCost); -// Cost == eval(BasePrice * Math.pow(KindCount, -0.25) + InterferometryPayloadCost + AdditionalCommSubsystemCost); -//} -// -//private pattern spacecraftOfKindCount(Sat : Spacecraft, Count : java Integer) { -// CubeSat3U(Sat); -// Count == count find cubeSat3U(_); -//} or { -// CubeSat6U(Sat); -// Count == count find cubeSat6U(_); -//} or { -// SmallSat(Sat); -// Count == count find smallSat(_); -//} -// -//private pattern basePrice(Spacecraft : Spacecraft, BasePrice : java Double) { -// CubeSat3U(Spacecraft); -// BasePrice == 250000.0; -//} or { -// CubeSat6U(Spacecraft); -// BasePrice == 750000.0; -//} or { -// SmallSat(Spacecraft); -// BasePrice == 3000000.0; -//} -// -//private pattern interferometryPayloadCost(Spacecraft : Spacecraft, Cost : java Double) { -// find spacecraftWithInterferometryPayload(_, Spacecraft); -// Cost == 50000.0; -//} or { -// neg find spacecraftWithInterferometryPayload(_, Spacecraft); -// Cost == 0.0; -//} -// -//private pattern additionalCommSubsystemCost(Spacecraft : Spacecraft, Cost : java Double) { -// find spacecraftWithTwoCommSubsystems(Spacecraft); -// Cost == 100000.0; -//} or { -// neg find spacecraftWithTwoCommSubsystems(Spacecraft); -// Cost == 0.0; -//} -// -//private pattern spacecraftWithTwoCommSubsystems(Spacecraft : Spacecraft) { -// Spacecraft.commSubsystem(Spacecraft, Subsystem1); -// Spacecraft.commSubsystem(Spacecraft, Subsystem2); -// Subsystem1 != Subsystem2; -//} + -- cgit v1.2.3-54-g00ecf