diff options
author | Aren Babikian <aren.babikian@mail.mcgill.ca> | 2021-01-21 06:47:08 +0100 |
---|---|---|
committer | Aren Babikian <aren.babikian@mail.mcgill.ca> | 2021-01-21 06:47:08 +0100 |
commit | 278ad1aa5f8cff85604f98c2a2e7269753cdbd47 (patch) | |
tree | 0d5d4dafd94d3deec4d845ffb7fcfeebb9aad8ac /Domains/crossingScenario/src | |
parent | Add drawing of generated scenarios (diff) | |
download | VIATRA-Generator-278ad1aa5f8cff85604f98c2a2e7269753cdbd47.tar.gz VIATRA-Generator-278ad1aa5f8cff85604f98c2a2e7269753cdbd47.tar.zst VIATRA-Generator-278ad1aa5f8cff85604f98c2a2e7269753cdbd47.zip |
Major MM update + Refactor VQL + post-meeting approach change
Diffstat (limited to 'Domains/crossingScenario/src')
3 files changed, 59 insertions, 64 deletions
diff --git a/Domains/crossingScenario/src/crossingScenario/run/CrossingScenarioMain.java b/Domains/crossingScenario/src/crossingScenario/run/CrossingScenarioMain.java index 57a91dfc..9d0860ec 100644 --- a/Domains/crossingScenario/src/crossingScenario/run/CrossingScenarioMain.java +++ b/Domains/crossingScenario/src/crossingScenario/run/CrossingScenarioMain.java | |||
@@ -29,12 +29,25 @@ public class CrossingScenarioMain { | |||
29 | System.out.println(errorMessages); | 29 | System.out.println(errorMessages); |
30 | } | 30 | } |
31 | 31 | ||
32 | Path pathStats = Paths.get("outputs/statistics.csv"); | ||
33 | String pathXmi = "outputs/models/1.xmi"; | ||
34 | // Path target = Paths.get("../..//Tests/MODELS2020-CaseStudies/case.study.pledge.run/measurements1/stats.csv"); | ||
35 | // Files.copy(path, target, StandardCopyOption.REPLACE_EXISTING); | ||
32 | 36 | ||
33 | Path path = Paths.get("outputs/statistics.csv"); | 37 | printStats(pathStats); |
34 | Path target = Paths.get("../..//Tests/MODELS2020-CaseStudies/case.study.pledge.run/measurements1/stats.csv"); | 38 | DrawScenario.drawScenario(pathXmi); |
35 | Files.copy(path, target, StandardCopyOption.REPLACE_EXISTING); | ||
36 | 39 | ||
37 | List<String> content = Files.readAllLines(path); | 40 | // String p1 = "outputs/models/1.xmi"; |
41 | // String p2 = "outputs/simplePrevLane.tgf"; | ||
42 | // QueryDebug.checkPrevLanes(p1, p2); | ||
43 | // Desktop.getDesktop().open(new File(p2)); | ||
44 | System.gc(); | ||
45 | System.gc(); | ||
46 | System.gc(); | ||
47 | } | ||
48 | |||
49 | public static void printStats(Path pathToStats) throws IOException { | ||
50 | List<String> content = Files.readAllLines(pathToStats); | ||
38 | String[] times = content.get(1).split(","); | 51 | String[] times = content.get(1).split(","); |
39 | System.out.println("STATISTICS"); | 52 | System.out.println("STATISTICS"); |
40 | int t1 = Integer.parseInt(times[3]); | 53 | int t1 = Integer.parseInt(times[3]); |
@@ -49,13 +62,5 @@ public class CrossingScenarioMain { | |||
49 | System.out.println("postprocessing -> " + t4); | 62 | System.out.println("postprocessing -> " + t4); |
50 | 63 | ||
51 | System.out.println("TOTAL -> " + tot); | 64 | System.out.println("TOTAL -> " + tot); |
52 | |||
53 | String p1 = "outputs/models/1.xmi"; | ||
54 | String p2 = "outputs/simplePrevLane.tgf"; | ||
55 | // QueryDebug.checkPrevLanes(p1, p2); | ||
56 | // Desktop.getDesktop().open(new File(p2)); | ||
57 | System.gc(); | ||
58 | System.gc(); | ||
59 | System.gc(); | ||
60 | } | 65 | } |
61 | } | 66 | } |
diff --git a/Domains/crossingScenario/src/crossingScenario/run/QueryDebug.java b/Domains/crossingScenario/src/crossingScenario/run/QueryDebug.java index f9041e87..3fea18de 100644 --- a/Domains/crossingScenario/src/crossingScenario/run/QueryDebug.java +++ b/Domains/crossingScenario/src/crossingScenario/run/QueryDebug.java | |||
@@ -34,48 +34,48 @@ public class QueryDebug { | |||
34 | } | 34 | } |
35 | 35 | ||
36 | public static void checkPrevLanes(String pathSrc, String pathTgt) throws FileNotFoundException { | 36 | public static void checkPrevLanes(String pathSrc, String pathTgt) throws FileNotFoundException { |
37 | Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap( ).put("*", new XMIResourceFactoryImpl()); | 37 | // Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap( ).put("*", new XMIResourceFactoryImpl()); |
38 | EPackage.Registry.INSTANCE.put(CrossingScenarioPackage.eNS_URI, CrossingScenarioPackage.eINSTANCE); | 38 | // EPackage.Registry.INSTANCE.put(CrossingScenarioPackage.eNS_URI, CrossingScenarioPackage.eINSTANCE); |
39 | ResourceSet rs = new ResourceSetImpl(); | 39 | // ResourceSet rs = new ResourceSetImpl(); |
40 | Resource res = rs.getResource(URI.createFileURI(pathSrc), true); | 40 | // Resource res = rs.getResource(URI.createFileURI(pathSrc), true); |
41 | 41 | // | |
42 | PrintWriter printer = new PrintWriter(pathTgt); | 42 | // PrintWriter printer = new PrintWriter(pathTgt); |
43 | 43 | // | |
44 | CrossingScenario cs = ((CrossingScenario) res.getContents().get(0)); | 44 | // CrossingScenario cs = ((CrossingScenario) res.getContents().get(0)); |
45 | 45 | // | |
46 | for (Actor o : cs.getActors()) { | 46 | // for (Actor o : cs.getActors()) { |
47 | String nodeName = "A(" + rndbl(o.getXPos(), 1)+","+rndbl(o.getYPos(), 1) + ")"; | 47 | // String nodeName = "A(" + rndbl(o.getXPos(), 1)+","+rndbl(o.getYPos(), 1) + ")"; |
48 | printer.println(o.hashCode() + " " + nodeName); | 48 | // printer.println(o.hashCode() + " " + nodeName); |
49 | } | 49 | // } |
50 | 50 | // | |
51 | for (Lane o : cs.getLanes()) { | 51 | // for (Lane o : cs.getLanes()) { |
52 | String prefix = ""; | 52 | // String prefix = ""; |
53 | if (cs.getHorizontal_head().equals(o) || cs.getVertical_head().equals(o)) { | 53 | // if (cs.getHorizontal_head().equals(o) || cs.getVertical_head().equals(o)) { |
54 | prefix = "HEAD"; | 54 | // prefix = "HEAD"; |
55 | } | 55 | // } |
56 | String nodeName = prefix + "L(" + rndbl(o.getReferenceCoord(), 3) + ")" + | 56 | // String nodeName = prefix + "L(" + rndbl(o.getReferenceCoord(), 3) + ")" + |
57 | o.eClass().getName().substring(5, 9); | 57 | // o.eClass().getName().substring(5, 9); |
58 | printer.println(o.hashCode() + " " + nodeName); | 58 | // printer.println(o.hashCode() + " " + nodeName); |
59 | } | 59 | // } |
60 | printer.println("#"); | 60 | // printer.println("#"); |
61 | for (Lane o : cs.getLanes()) { | 61 | // for (Lane o : cs.getLanes()) { |
62 | if (o.getPrevLane() != null){ | 62 | // if (o.getPrevLane() != null){ |
63 | int curName = o.hashCode(); | 63 | // int curName = o.hashCode(); |
64 | int curPrev = o.getPrevLane().hashCode(); | 64 | // int curPrev = o.getPrevLane().hashCode(); |
65 | double edgeLabel = rndbl(o.getPrevLane().getNumWidth(), 1); | 65 | // double edgeLabel = rndbl(o.getPrevLane().getNumWidth(), 1); |
66 | printer.println(curName + " " + curPrev + " " + edgeLabel); | 66 | // printer.println(curName + " " + curPrev + " " + edgeLabel); |
67 | } | 67 | // } |
68 | } | 68 | // } |
69 | 69 | // | |
70 | for (Actor o : cs.getActors()) { | 70 | // for (Actor o : cs.getActors()) { |
71 | int actName = o.hashCode(); | 71 | // int actName = o.hashCode(); |
72 | int lanName = o.getPlacedOn().hashCode(); | 72 | // int lanName = o.getPlacedOn().hashCode(); |
73 | printer.println(actName + " " + lanName ); | 73 | // printer.println(actName + " " + lanName ); |
74 | } | 74 | // } |
75 | 75 | // | |
76 | printer.flush(); | 76 | // printer.flush(); |
77 | printer.close(); | 77 | // printer.close(); |
78 | System.out.println("TGF CREATED"); | 78 | // System.out.println("TGF CREATED"); |
79 | 79 | ||
80 | } | 80 | } |
81 | 81 | ||
diff --git a/Domains/crossingScenario/src/queries/queries.vql b/Domains/crossingScenario/src/queries/queries.vql deleted file mode 100644 index d00fae3f..00000000 --- a/Domains/crossingScenario/src/queries/queries.vql +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | package queries | ||
2 | |||
3 | import "http://www.example.com/crossingScenario" | ||
4 | import "http://www.eclipse.org/emf/2002/Ecore" | ||
5 | |||
6 | /////////pedestrian-width (4) //TODO Derived? | ||
7 | pattern x(p:Pedestrian) { | ||
8 | Pedestrian.length(p, l); | ||
9 | check(l != 1.0); | ||
10 | } \ No newline at end of file | ||