diff options
author | Kristóf Marussy <marussy@mit.bme.hu> | 2020-06-27 17:56:46 +0200 |
---|---|---|
committer | Kristóf Marussy <marussy@mit.bme.hu> | 2020-06-27 17:56:46 +0200 |
commit | 957082776dbb7efed53a783c5e5be6b443a9bb86 (patch) | |
tree | 6b88701d4b1b3928b7d3e7de49d177ca8c93ffad /Tests/MODELS2020-CaseStudies | |
parent | Merge branch 'kris' (diff) | |
download | VIATRA-Generator-957082776dbb7efed53a783c5e5be6b443a9bb86.tar.gz VIATRA-Generator-957082776dbb7efed53a783c5e5be6b443a9bb86.tar.zst VIATRA-Generator-957082776dbb7efed53a783c5e5be6b443a9bb86.zip |
Fix scope + numerical propagation WIP
Diffstat (limited to 'Tests/MODELS2020-CaseStudies')
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 @@ | |||
1 | /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 @@ | |||
4 | xmlns:xmi="http://www.omg.org/XMI" | 4 | xmlns:xmi="http://www.omg.org/XMI" |
5 | xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | 5 | xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
6 | xmlns:satellite="http://www.example.org/satellite" | 6 | xmlns:satellite="http://www.example.org/satellite" |
7 | xsi:schemaLocation="http://www.example.org/satellite ../model/satellite.ecore"/> | 7 | 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 | |||
12 | import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ScopeSpecification | 12 | import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ScopeSpecification |
13 | import hu.bme.mit.inf.dslreasoner.application.execution.ScriptExecutor | 13 | import hu.bme.mit.inf.dslreasoner.application.execution.ScriptExecutor |
14 | import hu.bme.mit.inf.dslreasoner.application.execution.StandaloneScriptExecutor | 14 | import hu.bme.mit.inf.dslreasoner.application.execution.StandaloneScriptExecutor |
15 | import hu.bme.mit.inf.dslreasoner.application.execution.StandardOutputBasedScriptConsole | ||
15 | import java.io.File | 16 | import java.io.File |
17 | import java.io.PrintWriter | ||
16 | import java.text.SimpleDateFormat | 18 | import java.text.SimpleDateFormat |
17 | import java.util.Date | 19 | import java.util.Date |
18 | import org.apache.commons.cli.BasicParser | 20 | import org.apache.commons.cli.BasicParser |
@@ -23,8 +25,6 @@ import org.apache.commons.cli.Option | |||
23 | import org.apache.commons.cli.Options | 25 | import org.apache.commons.cli.Options |
24 | import org.apache.commons.cli.ParseException | 26 | import org.apache.commons.cli.ParseException |
25 | import org.eclipse.core.runtime.NullProgressMonitor | 27 | import org.eclipse.core.runtime.NullProgressMonitor |
26 | import com.google.common.io.Files | ||
27 | import java.io.PrintWriter | ||
28 | 28 | ||
29 | class RunGeneratorConfig { | 29 | class RunGeneratorConfig { |
30 | static var SIZE_LB = 20 | 30 | static var SIZE_LB = 20 |
@@ -102,7 +102,7 @@ class RunGeneratorConfig { | |||
102 | val SimpleDateFormat format = new SimpleDateFormat("dd-HHmm") | 102 | val SimpleDateFormat format = new SimpleDateFormat("dd-HHmm") |
103 | val formattedDate = format.format(date) | 103 | val formattedDate = format.format(date) |
104 | 104 | ||
105 | val executor = new ScriptExecutor | 105 | val executor = new ScriptExecutor(StandardOutputBasedScriptConsole.FACTORY) |
106 | val path = "config//generic" + DOMAIN + ".vsconfig" | 106 | val path = "config//generic" + DOMAIN + ".vsconfig" |
107 | var ConfigurationScript config = StandaloneScriptExecutor.loadScript(path) | 107 | var ConfigurationScript config = StandaloneScriptExecutor.loadScript(path) |
108 | 108 | ||