Fix scope + numerical propagation WIP

3 files changed, 4 insertions, 5 deletions

diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/.gitignore b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/.gitignore
deleted file mode 100644
index 7050a7e3..00000000
--- a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/queries/
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/inputs/SatelliteInstance.xmi b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/inputs/SatelliteInstance.xmi
index 3d07a199..66512878 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/inputs/SatelliteInstance.xmi
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/inputs/SatelliteInstance.xmi
@@ -4,4 +4,4 @@
     xmlns:xmi="http://www.omg.org/XMI"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:satellite="http://www.example.org/satellite"
-    xsi:schemaLocation="http://www.example.org/satellite ../model/satellite.ecore"/>
+    xsi:schemaLocation="http://www.example.org/satellite ../../hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore"/>
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/src/run/RunGeneratorConfig.xtend b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/src/run/RunGeneratorConfig.xtend
index 20eed2e2..e4d6fe9f 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/src/run/RunGeneratorConfig.xtend
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/src/run/RunGeneratorConfig.xtend
@@ -12,7 +12,9 @@ import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.RuntimeEn
 import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ScopeSpecification

 import hu.bme.mit.inf.dslreasoner.application.execution.ScriptExecutor

 import hu.bme.mit.inf.dslreasoner.application.execution.StandaloneScriptExecutor

+import hu.bme.mit.inf.dslreasoner.application.execution.StandardOutputBasedScriptConsole

 import java.io.File

+import java.io.PrintWriter

 import java.text.SimpleDateFormat

 import java.util.Date

 import org.apache.commons.cli.BasicParser

@@ -23,8 +25,6 @@ import org.apache.commons.cli.Option
 import org.apache.commons.cli.Options

 import org.apache.commons.cli.ParseException

 import org.eclipse.core.runtime.NullProgressMonitor

-import com.google.common.io.Files

-import java.io.PrintWriter

 

 class RunGeneratorConfig {

         static var SIZE_LB = 20

@@ -102,7 +102,7 @@ class RunGeneratorConfig {
                 val SimpleDateFormat format = new SimpleDateFormat("dd-HHmm")

                 val formattedDate = format.format(date)

 

-                val executor = new ScriptExecutor

+                val executor = new ScriptExecutor(StandardOutputBasedScriptConsole.FACTORY)

                 val path = "config//generic" + DOMAIN + ".vsconfig"

                 var ConfigurationScript config = StandaloneScriptExecutor.loadScript(path)