Bump MDEOptimizer version

https://github.com/mde-optimiser/mde_optimiser/issues/49

31 files changed, 731 insertions, 450 deletions

diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/mdeo/CpsMdeOptimiserMain.xtend b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/mdeo/CpsMdeOptimiserMain.xtend
index 459c6ab7..4a4b7a87 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/mdeo/CpsMdeOptimiserMain.xtend
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/mdeo/CpsMdeOptimiserMain.xtend
@@ -11,7 +11,7 @@ import org.eclipse.emf.common.util.URI
 import org.eclipse.emf.ecore.EPackage
 import org.eclipse.emf.ecore.resource.Resource
 import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl
-import uk.ac.kcl.inf.mdeoptimiser.languages.MoptStandaloneSetup
+import uk.ac.kcl.inf.mdeoptimiser.interfaces.cli.Run
 
 class CpsMdeOptimiserMain {
         static val PROJECT_PATH = "."
@@ -31,8 +31,7 @@ class CpsMdeOptimiserMain {
                 problem.eResource.URI = URI.createFileURI(PROBLEM_PATH)
                 problem.eResource.save(emptyMap)
                 fixupHenshinModel("model/cps.henshin", "model/cps_fixup.henshin", #{"cps.ecore" -> CpsPackage.eNS_URI})
-                val injector = new MoptStandaloneSetup().createInjectorAndDoEMFRegistration();
-                injector.getInstance(ExcludedRun).run(PROJECT_PATH, MOPT_PATH)
+                Run.main(#["-p", PROJECT_PATH, "-m", MOPT_PATH])
         }
 
         private def static void fixupHenshinModel(String originalPath, String outputPath, Map<String, String> remapMap) {
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/mdeo/ExcludedOptimisationInterpreter.xtend b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/mdeo/ExcludedOptimisationInterpreter.xtend
deleted file mode 100644
index 1e9c5adf..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/mdeo/ExcludedOptimisationInterpreter.xtend
+++ /dev/null
@@ -1,85 +0,0 @@
-package hu.bme.mit.inf.dslreasoner.domains.cps.mdeo
-
-import java.util.Properties
-import org.moeaframework.Executor
-import org.moeaframework.Instrumenter
-import org.moeaframework.algorithm.PeriodicAction
-import org.moeaframework.core.TerminationCondition
-import org.moeaframework.core.spi.AlgorithmFactory
-import uk.ac.kcl.inf.mdeoptimiser.interfaces.cli.Run
-import uk.ac.kcl.inf.mdeoptimiser.languages.mopt.Optimisation
-import uk.ac.kcl.inf.mdeoptimiser.languages.mopt.SolverSpec
-import uk.ac.kcl.inf.mdeoptimiser.libraries.core.optimisation.OptimisationInterpreter
-import uk.ac.kcl.inf.mdeoptimiser.libraries.core.optimisation.executor.SolutionGenerator
-import uk.ac.kcl.inf.mdeoptimiser.libraries.core.optimisation.moea.MoeaOptimisation
-import uk.ac.kcl.inf.mdeoptimiser.libraries.core.optimisation.moea.algorithms.MoeaOptimisationAlgorithmProvider
-import uk.ac.kcl.inf.mdeoptimiser.libraries.core.optimisation.moea.instrumentation.PopulationCollector
-import uk.ac.kcl.inf.mdeoptimiser.libraries.core.optimisation.moea.problem.MoeaOptimisationProblem
-import uk.ac.kcl.inf.mdeoptimiser.libraries.core.optimisation.operators.adaptation.MutationStepSizeStrategyFactory
-import uk.ac.kcl.inf.mdeoptimiser.libraries.core.optimisation.output.MDEOBatch
-
-class ExcludedMoeaOptimisation extends MoeaOptimisation {
-        SolutionGenerator solutionGenerator
-        Instrumenter algorithmStepSizeInstrumenter
-
-        override execute(SolverSpec solverSpec, SolutionGenerator solutionGenerator) {
-                this.solutionGenerator = solutionGenerator
-                super.execute(solverSpec, solutionGenerator)
-        }
-
-        override Instrumenter runOptimisation(SolverSpec solverSpec, Properties optimisationProperties) {
-                val algorithmFactory = new AlgorithmFactory
-                algorithmFactory.addProvider(new MoeaOptimisationAlgorithmProvider)
-
-                algorithmStepSizeInstrumenter = new Instrumenter().addExcludedPackage("org.eclipse").withProblemClass(
-                        MoeaOptimisationProblem, solutionGenerator).attachApproximationSetCollector().attachElapsedTimeCollector().
-                        attachPopulationSizeCollector.attach(new PopulationCollector()).withFrequency(1).withFrequencyType(
-                                PeriodicAction.FrequencyType.STEPS)
-
-                var stepSizeStrategy = new MutationStepSizeStrategyFactory(solverSpec.algorithm, algorithmStepSizeInstrumenter).
-                        strategy
-
-                solutionGenerator.setMutationStepSizeStrategy(stepSizeStrategy)
-
-                // TODO: Place this in a better location. 
-                // Exclude JDK packages from Instrumenter
-                this.algorithmStepSizeInstrumenter.addExcludedPackage("jdk")
-
-                new Executor().usingAlgorithmFactory(algorithmFactory).withAlgorithm(solverSpec.algorithm.name) // Initialize problem with our solution generator
-                .withProblemClass(MoeaOptimisationProblem, solutionGenerator).withProperties(optimisationProperties).
-                        withInstrumenter(algorithmStepSizeInstrumenter).withTerminationCondition(
-                                optimisationProperties.get("terminationCondition") as TerminationCondition).run()
-
-                return algorithmStepSizeInstrumenter
-        }
-}
-
-class ExcludedOptimisationInterpreter extends OptimisationInterpreter {
-        val Optimisation model
-
-        new(String projectPath, Optimisation model) {
-                super(projectPath, model)
-                this.model = model
-        }
-
-        override start() {
-                // This model provider loads the model given by the user in the DSL
-                var solutionGenerator = new SolutionGenerator(model, getBreedingOperators, getMutationOperators,
-                        getModelProvider, getMetamodel);
-
-                return new ExcludedMoeaOptimisation().execute(model.solver, solutionGenerator)
-        }
-
-}
-
-class ExcludedRun extends Run {
-        override runBatch(String moptProjectPath, Optimisation optimisationModel, Integer batch, boolean singleBatch) {
-                val optimisationInterpreter = new ExcludedOptimisationInterpreter(moptProjectPath, optimisationModel);
-                val startTime = System.nanoTime();
-                val optimisationOutcome = optimisationInterpreter.start();
-                val endTime = System.nanoTime();
-                val experimentDuration = ((endTime - startTime) / 1000000);
-                val generatedRules = optimisationInterpreter.getRulegenOperators();
-                return new MDEOBatch(batch, experimentDuration, optimisationOutcome, generatedRules, singleBatch);
-        }
-}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/cps/cplex/.CpsToLpTranslator.xtendbin b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/cps/cplex/.CpsToLpTranslator.xtendbin
index fd8995c0..9acd8621 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/cps/cplex/.CpsToLpTranslator.xtendbin
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/cps/cplex/.CpsToLpTranslator.xtendbin
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/cps/dse/.CpsStateCoder.xtendbin b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/cps/dse/.CpsStateCoder.xtendbin
index afdf61a1..ee672cb1 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/cps/dse/.CpsStateCoder.xtendbin
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/cps/dse/.CpsStateCoder.xtendbin
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/cps/mdeo/.CpsMdeOptimiserMain.xtendbin b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/cps/mdeo/.CpsMdeOptimiserMain.xtendbin
index e8035410..b9f0df1a 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/cps/mdeo/.CpsMdeOptimiserMain.xtendbin
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/cps/mdeo/.CpsMdeOptimiserMain.xtendbin
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/cps/mdeo/.ExcludedOptimisationInterpreter.xtendbin b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/cps/mdeo/.ExcludedOptimisationInterpreter.xtendbin
deleted file mode 100644
index 315d1748..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/cps/mdeo/.ExcludedOptimisationInterpreter.xtendbin
+++ /dev/null
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/cps/mdeo/CpsMdeOptimiserMain.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/cps/mdeo/CpsMdeOptimiserMain.java
index 7a2a7e99..c047f255 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/cps/mdeo/CpsMdeOptimiserMain.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/cps/mdeo/CpsMdeOptimiserMain.java
@@ -1,10 +1,8 @@
 package hu.bme.mit.inf.dslreasoner.domains.cps.mdeo;
 
-import com.google.inject.Injector;
 import hu.bme.mit.inf.dslreasoner.domains.cps.CpsPackage;
 import hu.bme.mit.inf.dslreasoner.domains.cps.CyberPhysicalSystem;
 import hu.bme.mit.inf.dslreasoner.domains.cps.generator.CpsGenerator;
-import hu.bme.mit.inf.dslreasoner.domains.cps.mdeo.ExcludedRun;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.FileReader;
@@ -19,7 +17,7 @@ import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
 import org.eclipse.xtext.xbase.lib.CollectionLiterals;
 import org.eclipse.xtext.xbase.lib.Exceptions;
 import org.eclipse.xtext.xbase.lib.Pair;
-import uk.ac.kcl.inf.mdeoptimiser.languages.MoptStandaloneSetup;
+import uk.ac.kcl.inf.mdeoptimiser.interfaces.cli.Run;
 
 @SuppressWarnings("all")
 public class CpsMdeOptimiserMain {
@@ -46,8 +44,7 @@ public class CpsMdeOptimiserMain {
       problem.eResource().save(CollectionLiterals.<Object, Object>emptyMap());
       Pair<String, String> _mappedTo = Pair.<String, String>of("cps.ecore", CpsPackage.eNS_URI);
       CpsMdeOptimiserMain.fixupHenshinModel("model/cps.henshin", "model/cps_fixup.henshin", Collections.<String, String>unmodifiableMap(CollectionLiterals.<String, String>newHashMap(_mappedTo)));
-      final Injector injector = new MoptStandaloneSetup().createInjectorAndDoEMFRegistration();
-      injector.<ExcludedRun>getInstance(ExcludedRun.class).run(CpsMdeOptimiserMain.PROJECT_PATH, CpsMdeOptimiserMain.MOPT_PATH);
+      Run.main(new String[] { "-p", CpsMdeOptimiserMain.PROJECT_PATH, "-m", CpsMdeOptimiserMain.MOPT_PATH });
     } catch (Throwable _e) {
       throw Exceptions.sneakyThrow(_e);
     }
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/cps/mdeo/ExcludedMoeaOptimisation.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/cps/mdeo/ExcludedMoeaOptimisation.java
deleted file mode 100644
index 52d3f665..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/cps/mdeo/ExcludedMoeaOptimisation.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package hu.bme.mit.inf.dslreasoner.domains.cps.mdeo;
-
-import java.util.Properties;
-import org.moeaframework.Executor;
-import org.moeaframework.Instrumenter;
-import org.moeaframework.algorithm.PeriodicAction;
-import org.moeaframework.core.TerminationCondition;
-import org.moeaframework.core.spi.AlgorithmFactory;
-import uk.ac.kcl.inf.mdeoptimiser.languages.mopt.AlgorithmSpec;
-import uk.ac.kcl.inf.mdeoptimiser.languages.mopt.SolverSpec;
-import uk.ac.kcl.inf.mdeoptimiser.libraries.core.optimisation.executor.SolutionGenerator;
-import uk.ac.kcl.inf.mdeoptimiser.libraries.core.optimisation.moea.MoeaOptimisation;
-import uk.ac.kcl.inf.mdeoptimiser.libraries.core.optimisation.moea.algorithms.MoeaOptimisationAlgorithmProvider;
-import uk.ac.kcl.inf.mdeoptimiser.libraries.core.optimisation.moea.instrumentation.PopulationCollector;
-import uk.ac.kcl.inf.mdeoptimiser.libraries.core.optimisation.moea.problem.MoeaOptimisationProblem;
-import uk.ac.kcl.inf.mdeoptimiser.libraries.core.optimisation.operators.adaptation.MutationStepSizeStrategy;
-import uk.ac.kcl.inf.mdeoptimiser.libraries.core.optimisation.operators.adaptation.MutationStepSizeStrategyFactory;
-
-@SuppressWarnings("all")
-public class ExcludedMoeaOptimisation extends MoeaOptimisation {
-  private SolutionGenerator solutionGenerator;
-  
-  private Instrumenter algorithmStepSizeInstrumenter;
-  
-  @Override
-  public Instrumenter execute(final SolverSpec solverSpec, final SolutionGenerator solutionGenerator) {
-    Instrumenter _xblockexpression = null;
-    {
-      this.solutionGenerator = solutionGenerator;
-      _xblockexpression = super.execute(solverSpec, solutionGenerator);
-    }
-    return _xblockexpression;
-  }
-  
-  @Override
-  public Instrumenter runOptimisation(final SolverSpec solverSpec, final Properties optimisationProperties) {
-    final AlgorithmFactory algorithmFactory = new AlgorithmFactory();
-    MoeaOptimisationAlgorithmProvider _moeaOptimisationAlgorithmProvider = new MoeaOptimisationAlgorithmProvider();
-    algorithmFactory.addProvider(_moeaOptimisationAlgorithmProvider);
-    Instrumenter _attachPopulationSizeCollector = new Instrumenter().addExcludedPackage("org.eclipse").withProblemClass(
-      MoeaOptimisationProblem.class, this.solutionGenerator).attachApproximationSetCollector().attachElapsedTimeCollector().attachPopulationSizeCollector();
-    PopulationCollector _populationCollector = new PopulationCollector();
-    this.algorithmStepSizeInstrumenter = _attachPopulationSizeCollector.attach(_populationCollector).withFrequency(1).withFrequencyType(
-      PeriodicAction.FrequencyType.STEPS);
-    AlgorithmSpec _algorithm = solverSpec.getAlgorithm();
-    MutationStepSizeStrategy stepSizeStrategy = new MutationStepSizeStrategyFactory(_algorithm, this.algorithmStepSizeInstrumenter).getStrategy();
-    this.solutionGenerator.setMutationStepSizeStrategy(stepSizeStrategy);
-    this.algorithmStepSizeInstrumenter.addExcludedPackage("jdk");
-    Object _get = optimisationProperties.get("terminationCondition");
-    new Executor().usingAlgorithmFactory(algorithmFactory).withAlgorithm(solverSpec.getAlgorithm().getName()).withProblemClass(MoeaOptimisationProblem.class, this.solutionGenerator).withProperties(optimisationProperties).withInstrumenter(this.algorithmStepSizeInstrumenter).withTerminationCondition(
-      ((TerminationCondition) _get)).run();
-    return this.algorithmStepSizeInstrumenter;
-  }
-}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/cps/mdeo/ExcludedOptimisationInterpreter.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/cps/mdeo/ExcludedOptimisationInterpreter.java
deleted file mode 100644
index 90641d73..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/cps/mdeo/ExcludedOptimisationInterpreter.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package hu.bme.mit.inf.dslreasoner.domains.cps.mdeo;
-
-import hu.bme.mit.inf.dslreasoner.domains.cps.mdeo.ExcludedMoeaOptimisation;
-import java.util.List;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.henshin.model.Unit;
-import org.moeaframework.Instrumenter;
-import uk.ac.kcl.inf.mdeoptimiser.languages.mopt.Optimisation;
-import uk.ac.kcl.inf.mdeoptimiser.libraries.core.optimisation.IModelProvider;
-import uk.ac.kcl.inf.mdeoptimiser.libraries.core.optimisation.OptimisationInterpreter;
-import uk.ac.kcl.inf.mdeoptimiser.libraries.core.optimisation.executor.SolutionGenerator;
-
-@SuppressWarnings("all")
-public class ExcludedOptimisationInterpreter extends OptimisationInterpreter {
-  private final Optimisation model;
-  
-  public ExcludedOptimisationInterpreter(final String projectPath, final Optimisation model) {
-    super(projectPath, model);
-    this.model = model;
-  }
-  
-  @Override
-  public Instrumenter start() {
-    List<Unit> _breedingOperators = this.getBreedingOperators();
-    List<Unit> _mutationOperators = this.getMutationOperators();
-    IModelProvider _modelProvider = this.getModelProvider();
-    EPackage _metamodel = this.getMetamodel();
-    SolutionGenerator solutionGenerator = new SolutionGenerator(this.model, _breedingOperators, _mutationOperators, _modelProvider, _metamodel);
-    return new ExcludedMoeaOptimisation().execute(this.model.getSolver(), solutionGenerator);
-  }
-}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/cps/mdeo/ExcludedRun.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/cps/mdeo/ExcludedRun.java
deleted file mode 100644
index 76f12e79..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/cps/mdeo/ExcludedRun.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package hu.bme.mit.inf.dslreasoner.domains.cps.mdeo;
-
-import hu.bme.mit.inf.dslreasoner.domains.cps.mdeo.ExcludedOptimisationInterpreter;
-import java.util.List;
-import java.util.Map;
-import org.eclipse.emf.ecore.EPackage;
-import org.moeaframework.Instrumenter;
-import uk.ac.kcl.inf.mdeoptimiser.interfaces.cli.Run;
-import uk.ac.kcl.inf.mdeoptimiser.languages.mopt.Optimisation;
-import uk.ac.kcl.inf.mdeoptimiser.libraries.core.optimisation.output.MDEOBatch;
-
-@SuppressWarnings("all")
-public class ExcludedRun extends Run {
-  @Override
-  public MDEOBatch runBatch(final String moptProjectPath, final Optimisation optimisationModel, final Integer batch, final boolean singleBatch) {
-    final ExcludedOptimisationInterpreter optimisationInterpreter = new ExcludedOptimisationInterpreter(moptProjectPath, optimisationModel);
-    final long startTime = System.nanoTime();
-    final Instrumenter optimisationOutcome = optimisationInterpreter.start();
-    final long endTime = System.nanoTime();
-    final long experimentDuration = ((endTime - startTime) / 1000000);
-    final Map<EPackage, List<org.eclipse.emf.henshin.model.Module>> generatedRules = optimisationInterpreter.getRulegenOperators();
-    return new MDEOBatch(batch, experimentDuration, optimisationOutcome, generatedRules, singleBatch);
-  }
-}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite_fixup.henshin b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite_fixup.henshin
index 5cc76605..224ced8f 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite_fixup.henshin
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite_fixup.henshin
@@ -20,4 +20,42 @@
     </rhs>
     <mappings xmi:id="_Qn4G0X9EEemiUoPdWqOlQg" origin="_Qn3fwH9EEemiUoPdWqOlQg" image="_Qn4G0H9EEemiUoPdWqOlQg"/>
   </units>
+  <units xsi:type="henshin:Rule" xmi:id="_kgBHMH9KEemiUoPdWqOlQg" name="addCubeSat6U">
+    <lhs xmi:id="_kgHN0H9KEemiUoPdWqOlQg" name="Lhs">
+      <nodes xmi:id="_obHq0H9KEemiUoPdWqOlQg">
+        <type href="http://www.example.org/satellite#//InterferometryMission"/>
+      </nodes>
+    </lhs>
+    <rhs xmi:id="_kgIb8H9KEemiUoPdWqOlQg" name="Rhs">
+      <nodes xmi:id="_obIR4H9KEemiUoPdWqOlQg" outgoing="_skabcH9KEemiUoPdWqOlQg">
+        <type href="http://www.example.org/satellite#//InterferometryMission"/>
+      </nodes>
+      <nodes xmi:id="_qHno4H9KEemiUoPdWqOlQg" incoming="_skabcH9KEemiUoPdWqOlQg">
+        <type href="http://www.example.org/satellite#//CubeSat6U"/>
+      </nodes>
+      <edges xmi:id="_skabcH9KEemiUoPdWqOlQg" source="_obIR4H9KEemiUoPdWqOlQg" target="_qHno4H9KEemiUoPdWqOlQg">
+        <type href="http://www.example.org/satellite#//ConstellationMission/spacecraft"/>
+      </edges>
+    </rhs>
+    <mappings xmi:id="_obIR4X9KEemiUoPdWqOlQg" origin="_obHq0H9KEemiUoPdWqOlQg" image="_obIR4H9KEemiUoPdWqOlQg"/>
+  </units>
+  <units xsi:type="henshin:Rule" xmi:id="_xFdIQH9LEemiUoPdWqOlQg" name="addSmallSat">
+    <lhs xmi:id="_xFiAwH9LEemiUoPdWqOlQg" name="Lhs">
+      <nodes xmi:id="_a7r_UH9MEemiUoPdWqOlQg">
+        <type href="http://www.example.org/satellite#//InterferometryMission"/>
+      </nodes>
+    </lhs>
+    <rhs xmi:id="_xFjO4H9LEemiUoPdWqOlQg" name="Rhs">
+      <nodes xmi:id="_a7w30H9MEemiUoPdWqOlQg" outgoing="_hORXsH9MEemiUoPdWqOlQg">
+        <type href="http://www.example.org/satellite#//InterferometryMission"/>
+      </nodes>
+      <nodes xmi:id="_dt0vwH9MEemiUoPdWqOlQg" incoming="_hORXsH9MEemiUoPdWqOlQg">
+        <type href="http://www.example.org/satellite#//SmallSat"/>
+      </nodes>
+      <edges xmi:id="_hORXsH9MEemiUoPdWqOlQg" source="_a7w30H9MEemiUoPdWqOlQg" target="_dt0vwH9MEemiUoPdWqOlQg">
+        <type href="http://www.example.org/satellite#//ConstellationMission/spacecraft"/>
+      </edges>
+    </rhs>
+    <mappings xmi:id="_a7xe4H9MEemiUoPdWqOlQg" origin="_a7r_UH9MEemiUoPdWqOlQg" image="_a7w30H9MEemiUoPdWqOlQg"/>
+  </units>
 </henshin:Module>
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/plugin.xml b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/plugin.xml
index 8c9f4be1..a8146d37 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/plugin.xml
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/plugin.xml
@@ -15,6 +15,9 @@
       <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.threeUCubeSatWithNonUhfCrossLink"/>
       <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.cubeSatWithKaAntenna"/>
       <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.smallSat"/>
+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.coverageMetric"/>
+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.timeMetric"/>
+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.costMetric"/>
     </group>
   </extension>
 </plugin>
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.java
index 9025d93a..d7326877 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.java
@@ -5,6 +5,8 @@ package hu.bme.mit.inf.dslreasoner.domains.satellite.queries;
 
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CommunicationLinkDoesNotStartAtContainingElement;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CommunicationLoop;
+import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CostMetric;
+import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CoverageMetric;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CubeSatWithKaAntenna;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.IncompatibleSourceAndTargetBand;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.NoLinkToGroundStation;
@@ -12,6 +14,7 @@ import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.NoPotentialLinkToGro
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.NotEnoughInterferometryPayloads;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.SmallSat;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.ThreeUCubeSatWithNonUhfCrossLink;
+import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.TimeMetric;
 import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
 import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedPatternGroup;
 
@@ -32,6 +35,9 @@ import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedPatternGroup;
  * <li>threeUCubeSatWithNonUhfCrossLink</li>
  * <li>cubeSatWithKaAntenna</li>
  * <li>smallSat</li>
+ * <li>coverageMetric</li>
+ * <li>timeMetric</li>
+ * <li>costMetric</li>
  * </ul>
  * 
  * @see IQueryGroup
@@ -65,6 +71,9 @@ public final class SatelliteQueries extends BaseGeneratedPatternGroup {
     querySpecifications.add(ThreeUCubeSatWithNonUhfCrossLink.instance());
     querySpecifications.add(CubeSatWithKaAntenna.instance());
     querySpecifications.add(SmallSat.instance());
+    querySpecifications.add(CoverageMetric.instance());
+    querySpecifications.add(TimeMetric.instance());
+    querySpecifications.add(CostMetric.instance());
   }
   
   public CommunicationLinkDoesNotStartAtContainingElement getCommunicationLinkDoesNotStartAtContainingElement() {
@@ -138,4 +147,28 @@ public final class SatelliteQueries extends BaseGeneratedPatternGroup {
   public SmallSat.Matcher getSmallSat(final ViatraQueryEngine engine) {
     return SmallSat.Matcher.on(engine);
   }
+  
+  public CoverageMetric getCoverageMetric() {
+    return CoverageMetric.instance();
+  }
+  
+  public CoverageMetric.Matcher getCoverageMetric(final ViatraQueryEngine engine) {
+    return CoverageMetric.Matcher.on(engine);
+  }
+  
+  public TimeMetric getTimeMetric() {
+    return TimeMetric.instance();
+  }
+  
+  public TimeMetric.Matcher getTimeMetric(final ViatraQueryEngine engine) {
+    return TimeMetric.Matcher.on(engine);
+  }
+  
+  public CostMetric getCostMetric() {
+    return CostMetric.instance();
+  }
+  
+  public CostMetric.Matcher getCostMetric(final ViatraQueryEngine engine) {
+    return CostMetric.Matcher.on(engine);
+  }
 }
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/.gitignore b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/.gitignore
index 58443486..2f9ae41d 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/.gitignore
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/.gitignore
@@ -67,3 +67,4 @@
 /.CubeSat6U.java._trace
 /.MatchingCommSubsystem.java._trace
 /.TransmittingCommSubsystem.java._trace
+/.SpacecraftOfKindCount.java._trace
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/SatelliteQueriesAll.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/SatelliteQueriesAll.java
index 4093e2b2..0235dbec 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/SatelliteQueriesAll.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/SatelliteQueriesAll.java
@@ -5,6 +5,8 @@ package hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal;
 
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CommunicationLinkDoesNotStartAtContainingElement;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CommunicationLoop;
+import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CostMetric;
+import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CoverageMetric;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CubeSatWithKaAntenna;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.IncompatibleSourceAndTargetBand;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.NoLinkToGroundStation;
@@ -12,18 +14,33 @@ import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.NoPotentialLinkToGro
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.NotEnoughInterferometryPayloads;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.SmallSat;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.ThreeUCubeSatWithNonUhfCrossLink;
+import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.TimeMetric;
+import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.AdditionalCommSubsystemCost;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.AtLeastTwoInterferometryPayloads;
+import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.BasePrice;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.CommSubsystemBandUhf;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.CubeSat3U;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.CubeSat6U;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.DirectCommunicationLink;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.GroundStationNetwork;
+import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.IncomingData;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.IndirectCommunicationLink;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.IndirectLinkAllowed;
+import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.InterferometryPayloadCost;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.LinkAllowed;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.MatchingAntenna;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.MatchingCommSubsystem;
+import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.MissionCost;
+import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.MissionCoverage;
+import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.MissionTime;
+import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.ScienceData;
+import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.SpacecraftCost;
+import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.SpacecraftOfKindCount;
+import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.SpacecraftUplink;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.SpacecraftWithInterferometryPayload;
+import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.SpacecraftWithTwoCommSubsystems;
+import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.TransmitRate;
+import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.TransmitTime;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.TransmittingCommSubsystem;
 import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedPatternGroup;
 
@@ -55,6 +72,23 @@ import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedPatternGroup;
  * <li>groundStationNetwork</li>
  * <li>cubeSatWithKaAntenna</li>
  * <li>smallSat</li>
+ * <li>coverageMetric</li>
+ * <li>missionCoverage</li>
+ * <li>timeMetric</li>
+ * <li>missionTime</li>
+ * <li>transmitTime</li>
+ * <li>incomingData</li>
+ * <li>scienceData</li>
+ * <li>transmitRate</li>
+ * <li>spacecraftUplink</li>
+ * <li>costMetric</li>
+ * <li>missionCost</li>
+ * <li>spacecraftCost</li>
+ * <li>spacecraftOfKindCount</li>
+ * <li>basePrice</li>
+ * <li>interferometryPayloadCost</li>
+ * <li>additionalCommSubsystemCost</li>
+ * <li>spacecraftWithTwoCommSubsystems</li>
  * </ul>
  * 
  * @see IQueryGroup
@@ -101,5 +135,22 @@ public final class SatelliteQueriesAll extends BaseGeneratedPatternGroup {
     querySpecifications.add(GroundStationNetwork.instance());
     querySpecifications.add(CubeSatWithKaAntenna.instance());
     querySpecifications.add(SmallSat.instance());
+    querySpecifications.add(CoverageMetric.instance());
+    querySpecifications.add(MissionCoverage.instance());
+    querySpecifications.add(TimeMetric.instance());
+    querySpecifications.add(MissionTime.instance());
+    querySpecifications.add(TransmitTime.instance());
+    querySpecifications.add(IncomingData.instance());
+    querySpecifications.add(ScienceData.instance());
+    querySpecifications.add(TransmitRate.instance());
+    querySpecifications.add(SpacecraftUplink.instance());
+    querySpecifications.add(CostMetric.instance());
+    querySpecifications.add(MissionCost.instance());
+    querySpecifications.add(SpacecraftCost.instance());
+    querySpecifications.add(SpacecraftOfKindCount.instance());
+    querySpecifications.add(BasePrice.instance());
+    querySpecifications.add(InterferometryPayloadCost.instance());
+    querySpecifications.add(AdditionalCommSubsystemCost.instance());
+    querySpecifications.add(SpacecraftWithTwoCommSubsystems.instance());
   }
 }
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/SpacecraftOfKindCount.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/SpacecraftOfKindCount.java
new file mode 100644
index 00000000..3c4f9244
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/SpacecraftOfKindCount.java
@@ -0,0 +1,189 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal;
+
+import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.SmallSat;
+import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.CubeSat3U;
+import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.CubeSat6U;
+import java.util.Arrays;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecificationWithGenericMatcher;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.context.common.JavaTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.PatternMatchCounter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.TypeFilterConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+
+/**
+ * A pattern-specific query specification that can instantiate GenericPatternMatcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         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(_);
+ *         }
+ * </pre></code>
+ * 
+ * @see GenericPatternMatcher
+ * @see GenericPatternMatch
+ * 
+ */
+@SuppressWarnings("all")
+public final class SpacecraftOfKindCount extends BaseGeneratedEMFQuerySpecificationWithGenericMatcher {
+  private SpacecraftOfKindCount() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static SpacecraftOfKindCount instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.SpacecraftOfKindCount (visibility: PUBLIC, simpleName: SpacecraftOfKindCount, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.SpacecraftOfKindCount, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.SpacecraftOfKindCount (visibility: PUBLIC, simpleName: SpacecraftOfKindCount, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.SpacecraftOfKindCount, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final SpacecraftOfKindCount INSTANCE = new SpacecraftOfKindCount();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final SpacecraftOfKindCount.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_Sat = new PParameter("Sat", "satellite.Spacecraft", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "Spacecraft")), PParameterDirection.INOUT);
+    
+    private final PParameter parameter_Count = new PParameter("Count", "java.lang.Integer", new JavaTransitiveInstancesKey(java.lang.Integer.class), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_Sat, parameter_Count);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PRIVATE);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.satellite.queries.spacecraftOfKindCount";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("Sat","Count");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_Sat = body.getOrCreateVariableByName("Sat");
+          PVariable var_Count = body.getOrCreateVariableByName("Count");
+          PVariable var___0_ = body.getOrCreateVariableByName("_<0>");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Sat), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "Spacecraft")));
+          new TypeFilterConstraint(body, Tuples.flatTupleOf(var_Count), new JavaTransitiveInstancesKey(java.lang.Integer.class));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_Sat, parameter_Sat),
+             new ExportedParameter(body, var_Count, parameter_Count)
+          ));
+          //    CubeSat3U(Sat)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Sat), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CubeSat3U")));
+          //    Count == count find cubeSat3U(_)
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new PatternMatchCounter(body, Tuples.flatTupleOf(var___0_), CubeSat3U.instance().getInternalQueryRepresentation(), var__virtual_0_);
+          new Equality(body, var_Count, var__virtual_0_);
+          bodies.add(body);
+      }
+      {
+          PBody body = new PBody(this);
+          PVariable var_Sat = body.getOrCreateVariableByName("Sat");
+          PVariable var_Count = body.getOrCreateVariableByName("Count");
+          PVariable var___0_ = body.getOrCreateVariableByName("_<0>");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Sat), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "Spacecraft")));
+          new TypeFilterConstraint(body, Tuples.flatTupleOf(var_Count), new JavaTransitiveInstancesKey(java.lang.Integer.class));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_Sat, parameter_Sat),
+             new ExportedParameter(body, var_Count, parameter_Count)
+          ));
+          //    CubeSat6U(Sat)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Sat), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CubeSat6U")));
+          //    Count == count find cubeSat6U(_)
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new PatternMatchCounter(body, Tuples.flatTupleOf(var___0_), CubeSat6U.instance().getInternalQueryRepresentation(), var__virtual_0_);
+          new Equality(body, var_Count, var__virtual_0_);
+          bodies.add(body);
+      }
+      {
+          PBody body = new PBody(this);
+          PVariable var_Sat = body.getOrCreateVariableByName("Sat");
+          PVariable var_Count = body.getOrCreateVariableByName("Count");
+          PVariable var___0_ = body.getOrCreateVariableByName("_<0>");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Sat), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "Spacecraft")));
+          new TypeFilterConstraint(body, Tuples.flatTupleOf(var_Count), new JavaTransitiveInstancesKey(java.lang.Integer.class));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_Sat, parameter_Sat),
+             new ExportedParameter(body, var_Count, parameter_Count)
+          ));
+          //    SmallSat(Sat)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Sat), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "SmallSat")));
+          //    Count == count find smallSat(_)
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new PatternMatchCounter(body, Tuples.flatTupleOf(var___0_), SmallSat.instance().getInternalQueryRepresentation(), var__virtual_0_);
+          new Equality(body, var_Count, var__virtual_0_);
+          bodies.add(body);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/CostObjective.xtend b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/CostObjective.xtend
index 43b2902f..3a8688e9 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/CostObjective.xtend
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/CostObjective.xtend
@@ -1,13 +1,13 @@
 package hu.bme.mit.inf.dslreasoner.domains.satellite.mdeo
 
-//import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CostMetric
-//
-//class CostObjective extends MetricBasedGuidanceFunction {
-//      new() {
-//              super(CostMetric.instance)
-//      }
-//
-//      override getName() {
-//              "Cost"
-//      }
-//}
+import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CostMetric
+
+class CostObjective extends MetricBasedGuidanceFunction {
+        new() {
+                super(CostMetric.instance)
+        }
+
+        override getName() {
+                "Cost"
+        }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/ExcludedOptimisationInterpreter.xtend b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/ExcludedOptimisationInterpreter.xtend
deleted file mode 100644
index ddf5748e..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/ExcludedOptimisationInterpreter.xtend
+++ /dev/null
@@ -1,85 +0,0 @@
-package hu.bme.mit.inf.dslreasoner.domains.satellite.mdeo
-
-import java.util.Properties
-import org.moeaframework.Executor
-import org.moeaframework.Instrumenter
-import org.moeaframework.algorithm.PeriodicAction
-import org.moeaframework.core.TerminationCondition
-import org.moeaframework.core.spi.AlgorithmFactory
-import uk.ac.kcl.inf.mdeoptimiser.interfaces.cli.Run
-import uk.ac.kcl.inf.mdeoptimiser.languages.mopt.Optimisation
-import uk.ac.kcl.inf.mdeoptimiser.languages.mopt.SolverSpec
-import uk.ac.kcl.inf.mdeoptimiser.libraries.core.optimisation.OptimisationInterpreter
-import uk.ac.kcl.inf.mdeoptimiser.libraries.core.optimisation.executor.SolutionGenerator
-import uk.ac.kcl.inf.mdeoptimiser.libraries.core.optimisation.moea.MoeaOptimisation
-import uk.ac.kcl.inf.mdeoptimiser.libraries.core.optimisation.moea.algorithms.MoeaOptimisationAlgorithmProvider
-import uk.ac.kcl.inf.mdeoptimiser.libraries.core.optimisation.moea.instrumentation.PopulationCollector
-import uk.ac.kcl.inf.mdeoptimiser.libraries.core.optimisation.moea.problem.MoeaOptimisationProblem
-import uk.ac.kcl.inf.mdeoptimiser.libraries.core.optimisation.operators.adaptation.MutationStepSizeStrategyFactory
-import uk.ac.kcl.inf.mdeoptimiser.libraries.core.optimisation.output.MDEOBatch
-
-class ExcludedMoeaOptimisation extends MoeaOptimisation {
-        SolutionGenerator solutionGenerator
-        Instrumenter algorithmStepSizeInstrumenter
-
-        override execute(SolverSpec solverSpec, SolutionGenerator solutionGenerator) {
-                this.solutionGenerator = solutionGenerator
-                super.execute(solverSpec, solutionGenerator)
-        }
-
-        override Instrumenter runOptimisation(SolverSpec solverSpec, Properties optimisationProperties) {
-                val algorithmFactory = new AlgorithmFactory
-                algorithmFactory.addProvider(new MoeaOptimisationAlgorithmProvider)
-
-                algorithmStepSizeInstrumenter = new Instrumenter().addExcludedPackage("org.eclipse").withProblemClass(
-                        MoeaOptimisationProblem, solutionGenerator).attachApproximationSetCollector().attachElapsedTimeCollector().
-                        attachPopulationSizeCollector.attach(new PopulationCollector()).withFrequency(1).withFrequencyType(
-                                PeriodicAction.FrequencyType.STEPS)
-
-                var stepSizeStrategy = new MutationStepSizeStrategyFactory(solverSpec.algorithm, algorithmStepSizeInstrumenter).
-                        strategy
-
-                solutionGenerator.setMutationStepSizeStrategy(stepSizeStrategy)
-
-                // TODO: Place this in a better location. 
-                // Exclude JDK packages from Instrumenter
-                this.algorithmStepSizeInstrumenter.addExcludedPackage("jdk")
-
-                new Executor().usingAlgorithmFactory(algorithmFactory).withAlgorithm(solverSpec.algorithm.name) // Initialize problem with our solution generator
-                .withProblemClass(MoeaOptimisationProblem, solutionGenerator).withProperties(optimisationProperties).
-                        withInstrumenter(algorithmStepSizeInstrumenter).withTerminationCondition(
-                                optimisationProperties.get("terminationCondition") as TerminationCondition).run()
-
-                return algorithmStepSizeInstrumenter
-        }
-}
-
-class ExcludedOptimisationInterpreter extends OptimisationInterpreter {
-        val Optimisation model
-
-        new(String projectPath, Optimisation model) {
-                super(projectPath, model)
-                this.model = model
-        }
-
-        override start() {
-                // This model provider loads the model given by the user in the DSL
-                var solutionGenerator = new SolutionGenerator(model, getBreedingOperators, getMutationOperators,
-                        getModelProvider, getMetamodel);
-
-                return new ExcludedMoeaOptimisation().execute(model.solver, solutionGenerator)
-        }
-
-}
-
-class ExcludedRun extends Run {
-        override runBatch(String moptProjectPath, Optimisation optimisationModel, Integer batch, boolean singleBatch) {
-                val optimisationInterpreter = new ExcludedOptimisationInterpreter(moptProjectPath, optimisationModel);
-                val startTime = System.nanoTime();
-                val optimisationOutcome = optimisationInterpreter.start();
-                val endTime = System.nanoTime();
-                val experimentDuration = ((endTime - startTime) / 1000000);
-                val generatedRules = optimisationInterpreter.getRulegenOperators();
-                return new MDEOBatch(batch, experimentDuration, optimisationOutcome, generatedRules, singleBatch);
-        }
-}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/SatelliteMdeOptimiserMain.xtend b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/SatelliteMdeOptimiserMain.xtend
index c5a30f94..58034c43 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/SatelliteMdeOptimiserMain.xtend
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/SatelliteMdeOptimiserMain.xtend
@@ -9,7 +9,7 @@ import org.eclipse.emf.ecore.EPackage
 import org.eclipse.emf.ecore.resource.Resource
 import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl
 import satellite.SatellitePackage
-import uk.ac.kcl.inf.mdeoptimiser.languages.MoptStandaloneSetup
+import uk.ac.kcl.inf.mdeoptimiser.interfaces.cli.Run
 
 class SatelliteMdeOptimiserMain {
         static val PROJECT_PATH = "."
@@ -25,8 +25,7 @@ class SatelliteMdeOptimiserMain {
                 EPackage.Registry.INSTANCE.put(SatellitePackage.eNS_URI, SatellitePackage.eINSTANCE)
                 fixupHenshinModel("model/satellite.henshin", "model/satellite_fixup.henshin",
                         #{"satellite.ecore" -> SatellitePackage.eNS_URI})
-                val injector = new MoptStandaloneSetup().createInjectorAndDoEMFRegistration();
-                injector.getInstance(ExcludedRun).run(PROJECT_PATH, MOPT_PATH)
+                Run.main(#["-p", PROJECT_PATH, "-m", MOPT_PATH])
         }
 
         private def static void fixupHenshinModel(String originalPath, String outputPath, Map<String, String> remapMap) {
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/satellite.mopt b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/satellite.mopt
index 138ea309..e9bd1a64 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/satellite.mopt
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/satellite.mopt
@@ -10,13 +10,14 @@ goal {
 }
 
 search {
-        mutate using <satellite_fixup.henshin> unit "addCubeSat3U"
-//      mutate { "CubeSat3U" }
-//      mutate { "CubeSat6U" }
-//      mutate { "SmallSat" }
-//      mutate { "InterferometryPayload" }
-//      mutate { "CommSubsystem" }
-//      mutate { "DirectedCommunicationLink" }
+//      mutate using <satellite_fixup.henshin> unit "addCubeSat3U"
+        mutate { "CubeSat3U" }
+        mutate { "CubeSat6U" }
+        mutate { "SmallSat" }
+        mutate { "InterferometryPayload" }
+        mutate { "UHFCommSubsystem" }
+        mutate { "XCommSubsystem" }
+        mutate { "KaCommSubsystem" }
 }
 
 solver {
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.vql b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.vql
index bdda6ec7..711c7ce6 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.vql
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.vql
@@ -158,147 +158,146 @@ pattern smallSat(Sat : SmallSat) {
         SmallSat(Sat);
 }
 
-////
-//// Metrics
-////
 //
-//// Coverage
+// Metrics
 //
-//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.communicationLink(Spacecraft, Link);
-//      DirectedCommunicationLink.target(Link, 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;
-//}
\ No newline at end of file
+
+// 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/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/.CostObjective.xtendbin b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/.CostObjective.xtendbin
new file mode 100644
index 00000000..9d4649e5
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/.CostObjective.xtendbin
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/.LocalSearchEngineManager.xtendbin b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/.LocalSearchEngineManager.xtendbin
new file mode 100644
index 00000000..9c013962
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/.LocalSearchEngineManager.xtendbin
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/.MetricBasedGuidanceFunction.xtendbin b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/.MetricBasedGuidanceFunction.xtendbin
new file mode 100644
index 00000000..456c7785
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/.MetricBasedGuidanceFunction.xtendbin
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/.PatternMatchConstraint.xtendbin b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/.PatternMatchConstraint.xtendbin
new file mode 100644
index 00000000..4eaa04bd
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/.PatternMatchConstraint.xtendbin
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/.SatelliteMdeOptimiserMain.xtendbin b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/.SatelliteMdeOptimiserMain.xtendbin
new file mode 100644
index 00000000..11cbad32
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/.SatelliteMdeOptimiserMain.xtendbin
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/CostObjective.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/CostObjective.java
new file mode 100644
index 00000000..8659913c
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/CostObjective.java
@@ -0,0 +1,16 @@
+package hu.bme.mit.inf.dslreasoner.domains.satellite.mdeo;
+
+import hu.bme.mit.inf.dslreasoner.domains.satellite.mdeo.MetricBasedGuidanceFunction;
+import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CostMetric;
+
+@SuppressWarnings("all")
+public class CostObjective extends MetricBasedGuidanceFunction {
+  public CostObjective() {
+    super(CostMetric.instance());
+  }
+  
+  @Override
+  public String getName() {
+    return "Cost";
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/LocalSearchEngineManager.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/LocalSearchEngineManager.java
new file mode 100644
index 00000000..18708a37
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/LocalSearchEngineManager.java
@@ -0,0 +1,39 @@
+package hu.bme.mit.inf.dslreasoner.domains.satellite.mdeo;
+
+import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.SatelliteQueries;
+import java.util.WeakHashMap;
+import java.util.function.Function;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.viatra.query.runtime.api.AdvancedViatraQueryEngine;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngineOptions;
+import org.eclipse.viatra.query.runtime.emf.EMFScope;
+import org.eclipse.viatra.query.runtime.localsearch.matcher.integration.LocalSearchHints;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+
+@SuppressWarnings("all")
+public class LocalSearchEngineManager {
+  public static final LocalSearchEngineManager INSTANCE = new LocalSearchEngineManager();
+  
+  private final WeakHashMap<EObject, ViatraQueryEngine> engineMap = new WeakHashMap<EObject, ViatraQueryEngine>();
+  
+  private LocalSearchEngineManager() {
+  }
+  
+  public ViatraQueryEngine getEngine(final EObject eObject) {
+    final Function<EObject, ViatraQueryEngine> _function = (EObject it) -> {
+      ViatraQueryEngine _xblockexpression = null;
+      {
+        final EMFScope scope = new EMFScope(it);
+        final QueryEvaluationHint localSearchHints = LocalSearchHints.getDefault().build();
+        final ViatraQueryEngineOptions options = ViatraQueryEngineOptions.defineOptions().withDefaultHint(localSearchHints).withDefaultBackend(
+          localSearchHints.getQueryBackendFactory()).build();
+        final ViatraQueryEngine engine = AdvancedViatraQueryEngine.on(scope, options);
+        SatelliteQueries.instance().prepare(engine);
+        _xblockexpression = engine;
+      }
+      return _xblockexpression;
+    };
+    return this.engineMap.computeIfAbsent(eObject, _function);
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/MetricBasedGuidanceFunction.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/MetricBasedGuidanceFunction.java
new file mode 100644
index 00000000..f3dae715
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/MetricBasedGuidanceFunction.java
@@ -0,0 +1,72 @@
+package hu.bme.mit.inf.dslreasoner.domains.satellite.mdeo;
+
+import hu.bme.mit.inf.dslreasoner.domains.satellite.mdeo.LocalSearchEngineManager;
+import java.util.Iterator;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.viatra.query.runtime.api.IPatternMatch;
+import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryMatcher;
+import uk.ac.kcl.inf.mdeoptimiser.libraries.core.optimisation.IGuidanceFunction;
+import uk.ac.kcl.inf.mdeoptimiser.libraries.core.optimisation.interpreter.guidance.Solution;
+
+@SuppressWarnings("all")
+public abstract class MetricBasedGuidanceFunction implements IGuidanceFunction {
+  private final IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>> querySpecification;
+  
+  protected MetricBasedGuidanceFunction(final IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>> querySpecification) {
+    this.querySpecification = querySpecification;
+    int _size = querySpecification.getParameters().size();
+    boolean _notEquals = (_size != 1);
+    if (_notEquals) {
+      throw new IllegalArgumentException("Metric must have a single parameter");
+    }
+  }
+  
+  @Override
+  public double computeFitness(final Solution model) {
+    double _xblockexpression = (double) 0;
+    {
+      final double value = this.getMetricValue(model);
+      _xblockexpression = this.computeFitness(value);
+    }
+    return _xblockexpression;
+  }
+  
+  protected double computeFitness(final double metricValue) {
+    return metricValue;
+  }
+  
+  private double getMetricValue(final Solution solution) {
+    double _xblockexpression = (double) 0;
+    {
+      final EObject model = solution.getModel();
+      final ViatraQueryEngine queryEngine = LocalSearchEngineManager.INSTANCE.getEngine(model);
+      final ViatraQueryMatcher<? extends IPatternMatch> matcher = this.querySpecification.getMatcher(queryEngine);
+      final Iterator<? extends IPatternMatch> iterator = matcher.getAllMatches().iterator();
+      boolean _hasNext = iterator.hasNext();
+      boolean _not = (!_hasNext);
+      if (_not) {
+        throw new IllegalStateException("Too few matches");
+      }
+      final Object objectValue = iterator.next().get(0);
+      double _xifexpression = (double) 0;
+      if ((objectValue instanceof Number)) {
+        double _xblockexpression_1 = (double) 0;
+        {
+          final double doubleValue = ((Number)objectValue).doubleValue();
+          boolean _hasNext_1 = iterator.hasNext();
+          if (_hasNext_1) {
+            throw new IllegalStateException("Too many matches");
+          }
+          _xblockexpression_1 = doubleValue;
+        }
+        _xifexpression = _xblockexpression_1;
+      } else {
+        throw new IllegalStateException("Metric value must be a number");
+      }
+      _xblockexpression = _xifexpression;
+    }
+    return _xblockexpression;
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/PatternMatchConstraint.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/PatternMatchConstraint.java
new file mode 100644
index 00000000..f089d469
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/PatternMatchConstraint.java
@@ -0,0 +1,54 @@
+package hu.bme.mit.inf.dslreasoner.domains.satellite.mdeo;
+
+import com.google.common.base.Objects;
+import com.google.common.collect.ImmutableList;
+import hu.bme.mit.inf.dslreasoner.domains.satellite.mdeo.LocalSearchEngineManager;
+import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.SatelliteQueries;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.viatra.query.runtime.api.IPatternMatch;
+import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryMatcher;
+import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;
+import org.eclipse.xtext.xbase.lib.Functions.Function1;
+import org.eclipse.xtext.xbase.lib.IterableExtensions;
+import uk.ac.kcl.inf.mdeoptimiser.libraries.core.optimisation.IGuidanceFunction;
+import uk.ac.kcl.inf.mdeoptimiser.libraries.core.optimisation.interpreter.guidance.Solution;
+
+@SuppressWarnings("all")
+public class PatternMatchConstraint implements IGuidanceFunction {
+  private static final String CONSTRAINT_ANNOTATION_NAME = "Constraint";
+  
+  private final ImmutableList<IQuerySpecification<?>> queries = ImmutableList.<IQuerySpecification<?>>copyOf(IterableExtensions.<IQuerySpecification<?>>filter(SatelliteQueries.instance().getSpecifications(), ((Function1<IQuerySpecification<?>, Boolean>) (IQuerySpecification<?> it) -> {
+    final Function1<PAnnotation, Boolean> _function = (PAnnotation it_1) -> {
+      String _name = it_1.getName();
+      return Boolean.valueOf(Objects.equal(_name, PatternMatchConstraint.CONSTRAINT_ANNOTATION_NAME));
+    };
+    return Boolean.valueOf(IterableExtensions.<PAnnotation>exists(it.getAllAnnotations(), _function));
+  })));
+  
+  @Override
+  public String getName() {
+    return "PatternMatch";
+  }
+  
+  @Override
+  public double computeFitness(final Solution solution) {
+    int _xblockexpression = (int) 0;
+    {
+      final EObject model = solution.getModel();
+      final ViatraQueryEngine queryEngine = LocalSearchEngineManager.INSTANCE.getEngine(model);
+      int matchCount = 0;
+      for (final IQuerySpecification<?> query : this.queries) {
+        {
+          final ViatraQueryMatcher<? extends IPatternMatch> matcher = query.getMatcher(queryEngine);
+          int _matchCount = matchCount;
+          int _countMatches = matcher.countMatches();
+          matchCount = (_matchCount + _countMatches);
+        }
+      }
+      _xblockexpression = matchCount;
+    }
+    return _xblockexpression;
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/SatelliteMdeOptimiserMain.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/SatelliteMdeOptimiserMain.java
new file mode 100644
index 00000000..6cbb08fc
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/SatelliteMdeOptimiserMain.java
@@ -0,0 +1,69 @@
+package hu.bme.mit.inf.dslreasoner.domains.satellite.mdeo;
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Set;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
+import org.eclipse.xtext.xbase.lib.CollectionLiterals;
+import org.eclipse.xtext.xbase.lib.Exceptions;
+import org.eclipse.xtext.xbase.lib.Pair;
+import satellite.SatellitePackage;
+import uk.ac.kcl.inf.mdeoptimiser.interfaces.cli.Run;
+
+@SuppressWarnings("all")
+public class SatelliteMdeOptimiserMain {
+  private static final String PROJECT_PATH = ".";
+  
+  private static final String MOPT_PATH = "src/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/satellite.mopt";
+  
+  private SatelliteMdeOptimiserMain() {
+    new IllegalStateException("This is a static utility class and should not be instantiated directly.");
+  }
+  
+  public static void main(final String[] args) {
+    Map<String, Object> _extensionToFactoryMap = Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap();
+    XMIResourceFactoryImpl _xMIResourceFactoryImpl = new XMIResourceFactoryImpl();
+    _extensionToFactoryMap.put(Resource.Factory.Registry.DEFAULT_EXTENSION, _xMIResourceFactoryImpl);
+    EPackage.Registry.INSTANCE.put(SatellitePackage.eNS_URI, SatellitePackage.eINSTANCE);
+    Pair<String, String> _mappedTo = Pair.<String, String>of("satellite.ecore", SatellitePackage.eNS_URI);
+    SatelliteMdeOptimiserMain.fixupHenshinModel("model/satellite.henshin", "model/satellite_fixup.henshin", 
+      Collections.<String, String>unmodifiableMap(CollectionLiterals.<String, String>newHashMap(_mappedTo)));
+    Run.main(new String[] { "-p", SatelliteMdeOptimiserMain.PROJECT_PATH, "-m", SatelliteMdeOptimiserMain.MOPT_PATH });
+  }
+  
+  private static void fixupHenshinModel(final String originalPath, final String outputPath, final Map<String, String> remapMap) {
+    try {
+      FileReader _fileReader = new FileReader(originalPath);
+      final BufferedReader reader = new BufferedReader(_fileReader);
+      try {
+        FileWriter _fileWriter = new FileWriter(outputPath);
+        final BufferedWriter writer = new BufferedWriter(_fileWriter);
+        try {
+          String line = null;
+          while (((line = reader.readLine()) != null)) {
+            {
+              Set<Map.Entry<String, String>> _entrySet = remapMap.entrySet();
+              for (final Map.Entry<String, String> entry : _entrySet) {
+                line = line.replace(entry.getKey(), entry.getValue());
+              }
+              writer.write(line);
+              writer.write("\n");
+            }
+          }
+        } finally {
+          writer.close();
+        }
+      } finally {
+        reader.close();
+      }
+    } catch (Throwable _e) {
+      throw Exceptions.sneakyThrow(_e);
+    }
+  }
+}