10 files changed, 18 insertions, 155 deletions

diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.originalFiles/xtend-gen/converter/.UML2TGF.xtendbin b/Tests/MODELS2020-CaseStudies/case.study.pledge.originalFiles/xtend-gen/converter/.UML2TGF.xtendbin
deleted file mode 100644
index 4a93782b..00000000
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.originalFiles/xtend-gen/converter/.UML2TGF.xtendbin
+++ /dev/null
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;
-//}
+
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/FileSystemHint.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/FileSystemHint.xtend
index 8d6523b1..300f8b51 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/FileSystemHint.xtend
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/FileSystemHint.xtend
@@ -4,6 +4,8 @@ import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic
 import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace
 import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.LinearTypeExpressionBuilderFactory
 import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.patterns.PatternGenerator
+import java.util.Map
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PQuery
 
 class FileSystemHint extends Ecore2LogicTraceBasedHint {
         static val REMAINING_CONTENTS_ROOT = "hint_root"
@@ -12,7 +14,7 @@ class FileSystemHint extends Ecore2LogicTraceBasedHint {
                 super(ecore2Logic, trace)
         }
 
-        override getAdditionalPatterns(PatternGenerator it) '''
+        override getAdditionalPatterns(PatternGenerator it, Map<String, PQuery> fqnToPQuery) '''
                 pattern «REMAINING_CONTENTS_ROOT»(problem:LogicProblem, interpretation:PartialInterpretation, remainingContents:java Integer) {
                         find interpretation(problem, interpretation);
                         remainingContents == sum find remainingContents_root_reference_Dir_helper(problem, interpretation, _, #_)
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/FileSystemInconsistencyDetector.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/FileSystemInconsistencyDetector.xtend
index f4f36951..9cc6e415 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/FileSystemInconsistencyDetector.xtend
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/FileSystemInconsistencyDetector.xtend
@@ -1,10 +1,10 @@
 package hu.bme.mit.inf.dslreasoner.run

 

-import org.eclipse.viatra.query.runtime.api.ViatraQueryMatcher

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation

+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ModelGenerationMethod

 import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ModelGenerationMethodBasedGlobalConstraint

-import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.ModelGenerationMethod

 import org.eclipse.viatra.dse.base.ThreadContext

+import org.eclipse.viatra.query.runtime.api.ViatraQueryMatcher

 

 class FileSystemInconsistencyDetector extends ModelGenerationMethodBasedGlobalConstraint {

         var PartialInterpretation partialInterpretation

diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/MetamodelLoader.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/MetamodelLoader.xtend
index bf9ca274..cbc692b3 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/MetamodelLoader.xtend
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/MetamodelLoader.xtend
@@ -12,8 +12,8 @@ import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace
 import hu.bme.mit.inf.dslreasoner.ecore2logic.EcoreMetamodelDescriptor

 import hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.Patterns

 import hu.bme.mit.inf.dslreasoner.viatra2logic.ViatraQuerySetDescriptor

-import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.ModelGenerationMethod

 import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.LinearTypeConstraintHint

+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ModelGenerationMethod

 import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ModelGenerationMethodBasedGlobalConstraint

 import hu.bme.mit.inf.dslreasoner.workspace.ReasonerWorkspace

 import java.util.Collection

diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SGraphHint.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SGraphHint.xtend
index 97ce4ee6..9a84f777 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SGraphHint.xtend
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SGraphHint.xtend
@@ -4,13 +4,15 @@ import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic
 import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace
 import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.LinearTypeExpressionBuilderFactory
 import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.patterns.PatternGenerator
+import java.util.Map
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PQuery
 
 class SGraphHint extends Ecore2LogicTraceBasedHint {
         new(Ecore2Logic ecore2Logic, Ecore2Logic_Trace trace) {
                 super(ecore2Logic, trace)
         }
 
-        override getAdditionalPatterns(extension PatternGenerator patternGenerator) {
+        override getAdditionalPatterns(extension PatternGenerator patternGenerator, Map<String, PQuery> fqnToPQuery) {
                 ""
         }
 
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SGraphInconsistencyDetector.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SGraphInconsistencyDetector.xtend
index 22addd3d..b8167566 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SGraphInconsistencyDetector.xtend
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SGraphInconsistencyDetector.xtend
@@ -1,7 +1,7 @@
 package hu.bme.mit.inf.dslreasoner.run

 

-import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.ModelGenerationMethod

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation

+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ModelGenerationMethod

 import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ModelGenerationMethodBasedGlobalConstraint

 import org.eclipse.viatra.dse.base.ThreadContext

 import org.eclipse.viatra.query.runtime.api.ViatraQueryMatcher

diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SatelliteHint.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SatelliteHint.xtend
index ef5b779e..28954d60 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SatelliteHint.xtend
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SatelliteHint.xtend
@@ -5,6 +5,8 @@ import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace
 import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.Modality
 import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.LinearTypeExpressionBuilderFactory
 import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.patterns.PatternGenerator
+import java.util.Map
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PQuery
 
 class SatelliteHint extends Ecore2LogicTraceBasedHint {
         static val INTERFEROMETY_PAYLOAD = "hint_interferometryPayload"
@@ -14,7 +16,7 @@ class SatelliteHint extends Ecore2LogicTraceBasedHint {
                 super(ecore2Logic, trace)
         }
 
-        override getAdditionalPatterns(PatternGenerator it) '''
+        override getAdditionalPatterns(PatternGenerator it, Map<String, PQuery> fqnToPQuery) '''
                 pattern «INTERFEROMETY_PAYLOAD»(problem:LogicProblem, interpretation:PartialInterpretation, object:DefinedElement) {
                         find interpretation(problem, interpretation);
                         find mustExist(problem, interpretation, object);
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SimpleRun.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SimpleRun.xtend
index b65826ad..5e2d0920 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SimpleRun.xtend
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SimpleRun.xtend
@@ -1,9 +1,8 @@
 package hu.bme.mit.inf.dslreasoner.run

 

 import functionalarchitecture.FunctionalarchitecturePackage

+import hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Model

 import hu.bme.mit.inf.dslreasoner.domains.transima.fam.FamPatterns

-import hu.bme.mit.inf.dslreasoner.domains.transima.fam.Model

-import hu.bme.mit.inf.dslreasoner.domains.transima.fam.Type

 import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic

 import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2LogicConfiguration

 import hu.bme.mit.inf.dslreasoner.ecore2logic.EcoreMetamodelDescriptor

@@ -15,7 +14,6 @@ import hu.bme.mit.inf.dslreasoner.logic2ecore.Logic2Ecore
 import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2Logic

 import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2LogicConfiguration

 import hu.bme.mit.inf.dslreasoner.viatra2logic.ViatraQuerySetDescriptor

-import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.ScopePropagatorStrategy

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.InstanceModel2Logic

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.visualisation.PartialInterpretation2Gml

@@ -121,8 +119,6 @@ class SimpleRun {
                 val patterns = i.specifications.toList

                 val wfPatterns = patterns.filter[it.allAnnotations.exists[it.name== "Constraint"]].toSet

                 val derivedFeatures = new LinkedHashMap

-                derivedFeatures.put(Type.instance,metamodel.attributes.filter[it.name == "type"].head)

-                derivedFeatures.put(Model.instance,metamodel.references.filter[it.name == "model"].head)

                 val res = new ViatraQuerySetDescriptor(

                         patterns,

                         wfPatterns,