4 files changed, 21 insertions, 106 deletions

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 {