diff options
Diffstat (limited to 'Metrics/Metrics-Calculation')
78 files changed, 109 insertions, 208 deletions
diff --git a/Metrics/Metrics-Calculation/SocialNetwork_plugin/src/ca/mcgill/ecse/socialnetwork/runner/Main.java b/Metrics/Metrics-Calculation/SocialNetwork_plugin/src/ca/mcgill/ecse/socialnetwork/runner/Main.java index e1698e5b..261f32cc 100644 --- a/Metrics/Metrics-Calculation/SocialNetwork_plugin/src/ca/mcgill/ecse/socialnetwork/runner/Main.java +++ b/Metrics/Metrics-Calculation/SocialNetwork_plugin/src/ca/mcgill/ecse/socialnetwork/runner/Main.java | |||
@@ -4,11 +4,8 @@ import java.io.File; | |||
4 | import java.io.FileNotFoundException; | 4 | import java.io.FileNotFoundException; |
5 | import java.io.PrintStream; | 5 | import java.io.PrintStream; |
6 | import java.util.ArrayList; | 6 | import java.util.ArrayList; |
7 | import java.util.List; | ||
8 | import java.util.Map; | 7 | import java.util.Map; |
9 | 8 | ||
10 | import org.eclipse.viatra.query.runtime.matchers.aggregators.count; | ||
11 | |||
12 | import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.app.Domain; | 9 | import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.app.Domain; |
13 | import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.distance.KSDistance; | 10 | import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.distance.KSDistance; |
14 | import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.graph.EMFGraph; | 11 | import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.graph.EMFGraph; |
@@ -27,16 +24,16 @@ public class Main { | |||
27 | return message; | 24 | return message; |
28 | } | 25 | } |
29 | 26 | ||
30 | private static String configFolder = "yakinduum/"; | 27 | private static String configFolder = "yakinduum/config15/"; |
31 | private static String configFileName = configFolder + "info.csv"; | 28 | private static String configFileName = configFolder + "info_new_metric.csv"; |
32 | private static String aggregateViolationMeasureFileName = configFolder + "aggregateInfo2.csv"; | 29 | private static String aggregateViolationMeasureFileName = configFolder + "aggregateInfo.csv"; |
30 | private static String fileReadFolder = "output/Viatra_100/"; | ||
33 | 31 | ||
34 | public static void main(String args[]) { | 32 | public static void main(String args[]) { |
35 | // try { | ||
36 | 33 | ||
37 | 34 | ||
38 | long begin = System.currentTimeMillis(); | 35 | long begin = System.currentTimeMillis(); |
39 | String message = null;//runWithPath("yakinduGeneration.vsconfig"); | 36 | String message = runWithPath("yakinduGeneration.vsconfig"); |
40 | long elapsed = System.currentTimeMillis() - begin; | 37 | long elapsed = System.currentTimeMillis() - begin; |
41 | 38 | ||
42 | if(message != null) { | 39 | if(message != null) { |
@@ -48,17 +45,17 @@ public class Main { | |||
48 | infoOutput.add(time); | 45 | infoOutput.add(time); |
49 | output.add(infoOutput); | 46 | output.add(infoOutput); |
50 | System.out.println(time); | 47 | System.out.println(time); |
51 | //CsvFileWriter.write(output, configFileName); | 48 | CsvFileWriter.write(output, configFileName); |
52 | 49 | ||
53 | 50 | ||
54 | output = new ArrayList<ArrayList<String>>(); | 51 | output = new ArrayList<ArrayList<String>>(); |
55 | output.add(prepareInfo()); | 52 | output.add(prepareInfo()); |
56 | //CsvFileWriter.append(output, configFileName); | 53 | CsvFileWriter.append(output, configFileName); |
57 | 54 | ||
58 | // for(int i = 0; i < 50; i++) { | 55 | for(int i = 0; i < 50; i++) { |
59 | // singleModelViolationMeasure(i+1); | 56 | generateModel(i+1); |
60 | // } | 57 | } |
61 | aggregateViolationMeasure(50); | 58 | //aggregateViolationMeasure(50); |
62 | System.out.println("Finished"); | 59 | System.out.println("Finished"); |
63 | } | 60 | } |
64 | 61 | ||
@@ -70,7 +67,7 @@ public class Main { | |||
70 | infoOutput.add(run+ ""); | 67 | infoOutput.add(run+ ""); |
71 | infoOutput.addAll(calculateMetric(run)); | 68 | infoOutput.addAll(calculateMetric(run)); |
72 | 69 | ||
73 | YakinduumModel model = new YakinduumModel("output/Viatra_100/run"+run+"/"+ filename); | 70 | YakinduumModel model = new YakinduumModel(fileReadFolder +"run" +run + "/" + filename); |
74 | int violationCount = ViolationCheck.calculateViolationCounts(model.yakinduum); | 71 | int violationCount = ViolationCheck.calculateViolationCounts(model.yakinduum); |
75 | infoOutput.add(violationCount + ""); | 72 | infoOutput.add(violationCount + ""); |
76 | 73 | ||
@@ -78,18 +75,18 @@ public class Main { | |||
78 | 75 | ||
79 | //save model to another directory | 76 | //save model to another directory |
80 | model.save(configFolder + run + ".xmi"); | 77 | model.save(configFolder + run + ".xmi"); |
81 | 78 | output.add(infoOutput); | |
82 | CsvFileWriter.append(output, configFileName); | 79 | CsvFileWriter.append(output, configFileName); |
83 | } | 80 | } |
84 | 81 | ||
85 | public static void singleModelViolationMeasure(int run) { | 82 | public static void singleModelViolationMeasure(int run) { |
86 | String filename = run+".xmi"; | 83 | String filename = run+"_1.xmi"; |
87 | //prepare initial info | 84 | //prepare initial info |
88 | ArrayList<ArrayList<String>> output = new ArrayList<ArrayList<String>>(); | 85 | ArrayList<ArrayList<String>> output = new ArrayList<ArrayList<String>>(); |
89 | ArrayList<String> infoOutput = new ArrayList<String>(); | 86 | ArrayList<String> infoOutput = new ArrayList<String>(); |
90 | infoOutput.add(run+ ""); | 87 | infoOutput.add(run+ ""); |
91 | 88 | ||
92 | YakinduumModel model = new YakinduumModel("yakinduum\\config8\\"+ filename); | 89 | YakinduumModel model = new YakinduumModel("output/Viatra_100/run"+run+"/"+ filename); |
93 | 90 | ||
94 | //parse map of violation counts to two list and add them to the result list | 91 | //parse map of violation counts to two list and add them to the result list |
95 | Map<String, Integer> map = ViolationCheck.violationMaps(model.yakinduum); | 92 | Map<String, Integer> map = ViolationCheck.violationMaps(model.yakinduum); |
@@ -112,8 +109,8 @@ public class Main { | |||
112 | ArrayList<String> counts = new ArrayList<String>(); | 109 | ArrayList<String> counts = new ArrayList<String>(); |
113 | ArrayList<String> violationNames = null; | 110 | ArrayList<String> violationNames = null; |
114 | for(int run = 1; run < size+1; run++) { | 111 | for(int run = 1; run < size+1; run++) { |
115 | String filename = run+".xmi"; | 112 | String filename = run+"_1.xmi"; |
116 | YakinduumModel model = new YakinduumModel("yakinduum\\config8\\"+ filename); | 113 | YakinduumModel model = new YakinduumModel("output/Viatra_100/run"+run+"/"+ filename); |
117 | 114 | ||
118 | Map<String, Integer> map = ViolationCheck.violationMaps(model.yakinduum); | 115 | Map<String, Integer> map = ViolationCheck.violationMaps(model.yakinduum); |
119 | if(run == 1) { | 116 | if(run == 1) { |
@@ -147,7 +144,7 @@ public class Main { | |||
147 | //read model and metric | 144 | //read model and metric |
148 | ArrayList<String> output = new ArrayList<String>(); | 145 | ArrayList<String> output = new ArrayList<String>(); |
149 | GraphReader reader = new GraphReader(YakindummPackage.eINSTANCE); | 146 | GraphReader reader = new GraphReader(YakindummPackage.eINSTANCE); |
150 | EMFGraph graph = reader.readModels("output/Viatra_100/run"+run+"/").get(0); | 147 | EMFGraph graph = reader.readModel(fileReadFolder+"/run"+run, run + "_1.xmi"); |
151 | 148 | ||
152 | //KS distance | 149 | //KS distance |
153 | KSDistance ks = new KSDistance(Domain.Yakinduum); | 150 | KSDistance ks = new KSDistance(Domain.Yakinduum); |
diff --git a/Metrics/Metrics-Calculation/SocialNetwork_plugin/yakinduum/info.csv b/Metrics/Metrics-Calculation/SocialNetwork_plugin/yakinduum/info.csv deleted file mode 100644 index c79bc07f..00000000 --- a/Metrics/Metrics-Calculation/SocialNetwork_plugin/yakinduum/info.csv +++ /dev/null | |||
@@ -1,150 +0,0 @@ | |||
1 | 1 | ||
2 | choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry | ||
3 | 0,0,4,0,12,6,0,0,0,8 | ||
4 | 2 | ||
5 | choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry | ||
6 | 0,0,5,0,12,13,4,0,0,2 | ||
7 | 3 | ||
8 | choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry | ||
9 | 0,0,3,1,4,9,3,0,0,0 | ||
10 | 4 | ||
11 | choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry | ||
12 | 0,0,1,0,7,12,3,0,0,2 | ||
13 | 5 | ||
14 | choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry | ||
15 | 0,0,1,0,8,7,6,0,0,2 | ||
16 | 6 | ||
17 | choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry | ||
18 | 0,0,5,0,11,6,4,0,1,6 | ||
19 | 7 | ||
20 | choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry | ||
21 | 0,0,4,2,9,10,4,1,0,2 | ||
22 | 8 | ||
23 | choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry | ||
24 | 0,0,3,0,9,7,5,0,0,0 | ||
25 | 9 | ||
26 | choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry | ||
27 | 0,0,6,0,13,8,4,0,0,10 | ||
28 | 10 | ||
29 | choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry | ||
30 | 0,0,2,0,7,8,2,0,0,4 | ||
31 | 11 | ||
32 | choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry | ||
33 | 0,0,2,0,8,7,3,0,0,2 | ||
34 | 12 | ||
35 | choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry | ||
36 | 0,0,5,0,13,4,1,0,0,2 | ||
37 | 13 | ||
38 | choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry | ||
39 | 0,0,3,1,12,20,2,0,0,2 | ||
40 | 14 | ||
41 | choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry | ||
42 | 0,0,6,0,13,7,2,0,0,0 | ||
43 | 15 | ||
44 | choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry | ||
45 | 0,0,2,0,15,12,3,0,2,2 | ||
46 | 16 | ||
47 | choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry | ||
48 | 0,0,3,0,6,10,1,0,0,2 | ||
49 | 17 | ||
50 | choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry | ||
51 | 0,0,4,1,9,7,2,0,0,4 | ||
52 | 18 | ||
53 | choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry | ||
54 | 0,0,1,0,8,12,4,0,0,0 | ||
55 | 19 | ||
56 | choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry | ||
57 | 0,0,4,0,10,10,1,0,0,0 | ||
58 | 20 | ||
59 | choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry | ||
60 | 0,0,4,2,11,11,6,0,0,2 | ||
61 | 21 | ||
62 | choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry | ||
63 | 0,0,3,1,15,12,4,1,0,2 | ||
64 | 22 | ||
65 | choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry | ||
66 | 0,0,5,0,14,4,1,0,0,4 | ||
67 | 23 | ||
68 | choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry | ||
69 | 0,0,3,1,8,11,4,0,0,2 | ||
70 | 24 | ||
71 | choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry | ||
72 | 0,0,1,0,12,10,4,0,0,0 | ||
73 | 25 | ||
74 | choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry | ||
75 | 0,0,1,1,9,1,4,0,0,2 | ||
76 | 26 | ||
77 | choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry | ||
78 | 0,0,5,0,9,4,7,1,0,2 | ||
79 | 27 | ||
80 | choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry | ||
81 | 0,0,3,0,11,31,0,0,0,2 | ||
82 | 28 | ||
83 | choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry | ||
84 | 0,0,5,0,6,12,0,1,0,2 | ||
85 | 29 | ||
86 | choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry | ||
87 | 0,0,3,1,10,10,3,0,0,0 | ||
88 | 30 | ||
89 | choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry | ||
90 | 0,0,1,0,10,23,4,0,0,2 | ||
91 | 31 | ||
92 | choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry | ||
93 | 0,0,4,0,4,8,3,0,0,2 | ||
94 | 32 | ||
95 | choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry | ||
96 | 0,0,3,0,20,3,1,0,0,2 | ||
97 | 33 | ||
98 | choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry | ||
99 | 0,0,1,1,9,11,7,0,0,2 | ||
100 | 34 | ||
101 | choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry | ||
102 | 0,0,3,3,1,11,7,0,0,2 | ||
103 | 35 | ||
104 | choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry | ||
105 | 0,0,2,0,7,14,6,0,0,0 | ||
106 | 36 | ||
107 | choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry | ||
108 | 0,0,4,0,7,10,1,0,0,0 | ||
109 | 37 | ||
110 | choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry | ||
111 | 0,0,1,0,13,8,3,0,1,2 | ||
112 | 38 | ||
113 | choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry | ||
114 | 0,0,4,0,10,2,5,0,0,4 | ||
115 | 39 | ||
116 | choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry | ||
117 | 0,0,3,1,11,8,5,0,0,2 | ||
118 | 40 | ||
119 | choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry | ||
120 | 0,0,3,0,12,19,4,0,0,6 | ||
121 | 41 | ||
122 | choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry | ||
123 | 0,0,7,0,2,14,1,2,0,2 | ||
124 | 42 | ||
125 | choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry | ||
126 | 0,0,3,1,17,5,2,0,0,0 | ||
127 | 43 | ||
128 | choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry | ||
129 | 0,0,4,0,10,6,2,0,0,0 | ||
130 | 44 | ||
131 | choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry | ||
132 | 0,0,4,0,9,5,4,0,0,0 | ||
133 | 45 | ||
134 | choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry | ||
135 | 0,0,1,0,7,13,4,0,0,2 | ||
136 | 46 | ||
137 | choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry | ||
138 | 0,0,4,0,8,6,1,1,0,4 | ||
139 | 47 | ||
140 | choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry | ||
141 | 0,0,5,0,8,11,6,0,0,0 | ||
142 | 48 | ||
143 | choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry | ||
144 | 0,0,2,0,22,4,3,1,0,4 | ||
145 | 49 | ||
146 | choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry | ||
147 | 0,0,4,0,10,5,2,0,0,2 | ||
148 | 50 | ||
149 | choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry | ||
150 | 0,0,3,0,13,11,2,0,0,6 | ||
diff --git a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/app/Main.xtend b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/app/Main.xtend index 58ac7aea..b1986d50 100644 --- a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/app/Main.xtend +++ b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/app/Main.xtend | |||
@@ -35,7 +35,7 @@ class Main { | |||
35 | 35 | ||
36 | //human input has different package declaration | 36 | //human input has different package declaration |
37 | // reader = new GraphReader(Yakindumm2PackageImpl.eINSTANCE); | 37 | // reader = new GraphReader(Yakindumm2PackageImpl.eINSTANCE); |
38 | val human = new RWInformation("inputs/config7/", "outputs/", 1); | 38 | val human = new RWInformation("Inputs/config15/", "outputs/", 1); |
39 | calculateAllModels(human.inputFolder, human.outputFolder,human.numRuns, reader); | 39 | calculateAllModels(human.inputFolder, human.outputFolder,human.numRuns, reader); |
40 | 40 | ||
41 | 41 | ||
diff --git a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/app/PartialInterpretationMetricDistance.xtend b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/app/PartialInterpretationMetricDistance.xtend index cdce185a..d68eb9d2 100644 --- a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/app/PartialInterpretationMetricDistance.xtend +++ b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/app/PartialInterpretationMetricDistance.xtend | |||
@@ -18,6 +18,7 @@ import java.util.List | |||
18 | import java.util.Map | 18 | import java.util.Map |
19 | import org.apache.commons.math3.stat.regression.OLSMultipleLinearRegression | 19 | import org.apache.commons.math3.stat.regression.OLSMultipleLinearRegression |
20 | import org.eclipse.xtend.lib.annotations.Accessors | 20 | import org.eclipse.xtend.lib.annotations.Accessors |
21 | import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.NodeTypeMetric | ||
21 | 22 | ||
22 | class PartialInterpretationMetricDistance { | 23 | class PartialInterpretationMetricDistance { |
23 | 24 | ||
@@ -48,17 +49,17 @@ class PartialInterpretationMetricDistance { | |||
48 | metrics.add(new OutDegreeMetric()); | 49 | metrics.add(new OutDegreeMetric()); |
49 | metrics.add(new NodeActivityMetric()); | 50 | metrics.add(new NodeActivityMetric()); |
50 | metrics.add(new MultiplexParticipationCoefficientMetric()); | 51 | metrics.add(new MultiplexParticipationCoefficientMetric()); |
51 | metrics.add(new TypedOutDegree()); | 52 | metrics.add(new NodeTypeMetric()); |
52 | |||
53 | val metricCalculator = new PartialInterpretationGraph(partial, metrics, null); | 53 | val metricCalculator = new PartialInterpretationGraph(partial, metrics, null); |
54 | var metricSamples = metricCalculator.evaluateAllMetricsToSamples(); | 54 | var metricSamples = metricCalculator.evaluateAllMetricsToSamples(); |
55 | 55 | ||
56 | var mpc = ks.mpcDistance(metricSamples.mpcSamples); | 56 | var mpc = ks.mpcDistance(metricSamples.mpcSamples); |
57 | var na = ks.naDistance(metricSamples.naSamples); | 57 | var na = ks.naDistance(metricSamples.naSamples); |
58 | var outDegree = ks.outDegreeDistance(metricSamples.outDegreeSamples); | 58 | var outDegree = ks.outDegreeDistance(metricSamples.outDegreeSamples); |
59 | var typedOutDegree = ks.typedOutDegreeDistance(metricSamples.typedOutDegreeSamples); | 59 | //var typedOutDegree = ks.typedOutDegreeDistance(metricSamples.typedOutDegreeSamples); |
60 | 60 | var distance = new MetricDistanceGroup(mpc, na, outDegree); | |
61 | return new MetricDistanceGroup(mpc, na, outDegree, typedOutDegree); | 61 | distance.nodeTypeInfo = metricSamples.nodeTypeSamples; |
62 | return distance; | ||
62 | } | 63 | } |
63 | 64 | ||
64 | def MetricDistanceGroup calculateMetricEuclidean(PartialInterpretation partial){ | 65 | def MetricDistanceGroup calculateMetricEuclidean(PartialInterpretation partial){ |
@@ -66,7 +67,6 @@ class PartialInterpretationMetricDistance { | |||
66 | metrics.add(new OutDegreeMetric()); | 67 | metrics.add(new OutDegreeMetric()); |
67 | metrics.add(new NodeActivityMetric()); | 68 | metrics.add(new NodeActivityMetric()); |
68 | metrics.add(new MultiplexParticipationCoefficientMetric()); | 69 | metrics.add(new MultiplexParticipationCoefficientMetric()); |
69 | metrics.add(new TypedOutDegree()); | ||
70 | 70 | ||
71 | val metricCalculator = new PartialInterpretationGraph(partial, metrics, null); | 71 | val metricCalculator = new PartialInterpretationGraph(partial, metrics, null); |
72 | var metricSamples = metricCalculator.evaluateAllMetricsToSamples(); | 72 | var metricSamples = metricCalculator.evaluateAllMetricsToSamples(); |
@@ -158,8 +158,8 @@ class PartialInterpretationMetricDistance { | |||
158 | var features = newDoubleArrayOfSize(2); | 158 | var features = newDoubleArrayOfSize(2); |
159 | //constant term | 159 | //constant term |
160 | features.set(0, 1); | 160 | features.set(0, 1); |
161 | 161 | features.set(0, Math.sqrt(step) + 30) | |
162 | features.set(1, 1.0 / step); | 162 | features.set(1, 1.0 / (step + 30) ); |
163 | // features.set(2, violations); | 163 | // features.set(2, violations); |
164 | // features.set(3, Math.pow(violations, 2)); | 164 | // features.set(3, Math.pow(violations, 2)); |
165 | 165 | ||
@@ -172,6 +172,7 @@ class MetricDistanceGroup{ | |||
172 | var double naDistance; | 172 | var double naDistance; |
173 | var double outDegreeDistance; | 173 | var double outDegreeDistance; |
174 | var double typedOutDegreeDistance; | 174 | var double typedOutDegreeDistance; |
175 | protected var HashMap<String, Double> nodeTypeInfo; | ||
175 | 176 | ||
176 | new(double mpcDistance, double naDistance, double outDegreeDistance, double typedOutDegreeDistance){ | 177 | new(double mpcDistance, double naDistance, double outDegreeDistance, double typedOutDegreeDistance){ |
177 | this.mpcDistance = mpcDistance; | 178 | this.mpcDistance = mpcDistance; |
@@ -201,4 +202,8 @@ class MetricDistanceGroup{ | |||
201 | def double getOutDegreeDistance(){ | 202 | def double getOutDegreeDistance(){ |
202 | return this.outDegreeDistance | 203 | return this.outDegreeDistance |
203 | } | 204 | } |
205 | |||
206 | def double getNodeTypePercentage(String typeName){ | ||
207 | return nodeTypeInfo.getOrDefault(typeName, 0.0); | ||
208 | } | ||
204 | } \ No newline at end of file | 209 | } \ No newline at end of file |
diff --git a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/graph/EMFGraph.xtend b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/graph/EMFGraph.xtend index b4c57bd8..4ebd59b7 100644 --- a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/graph/EMFGraph.xtend +++ b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/graph/EMFGraph.xtend | |||
@@ -30,13 +30,26 @@ class EMFGraph extends Graph{ | |||
30 | ] | 30 | ] |
31 | 31 | ||
32 | referenceTypes.forEach[it| | 32 | referenceTypes.forEach[it| |
33 | statistic.addEdgeType(it.name); | 33 | var typeToAdd = it; |
34 | |||
35 | // TODO: Here is to only consider one part of opposite edges | ||
36 | // if(it.upperBound != -1 && it.EOpposite !== null && | ||
37 | // (it.EOpposite.upperBound == -1 || it.EOpposite.upperBound > it.upperBound | ||
38 | // )){ | ||
39 | // typeToAdd = it.EOpposite; | ||
40 | // } | ||
41 | //if(!typeToAdd.name.equals('incomingTransitions')){ | ||
42 | statistic.addEdgeType(typeToAdd.name); | ||
43 | //} | ||
34 | ]; | 44 | ]; |
35 | 45 | ||
36 | objects.forEach[source| | 46 | objects.forEach[source| |
37 | source.eClass.EAllReferences.forEach[r| | 47 | source.eClass.EAllReferences.forEach[r| |
38 | //add the type first (if it is not added already) | 48 | //add the type first (if it is not added already) |
39 | //many references | 49 | //many references |
50 | // if(r.name.equals('incomingTransitions')){ | ||
51 | // return; | ||
52 | // } | ||
40 | if(r.isMany){ | 53 | if(r.isMany){ |
41 | source.getNeighbours(r).forEach[target| | 54 | source.getNeighbours(r).forEach[target| |
42 | addEdge(source, target, r); | 55 | addEdge(source, target, r); |
@@ -85,6 +98,14 @@ class EMFGraph extends Graph{ | |||
85 | } | 98 | } |
86 | 99 | ||
87 | def addEdge(EObject source, EObject target, EReference r){ | 100 | def addEdge(EObject source, EObject target, EReference r){ |
101 | // TODO: Here is to only consider one part of opposite edges | ||
102 | //check for the opposite reference and do not add if its opposite will be added | ||
103 | // if(r.upperBound != -1 && r.EOpposite !== null && | ||
104 | // (r.EOpposite.upperBound == -1 || r.EOpposite.upperBound > r.upperBound | ||
105 | // )){ | ||
106 | // return; | ||
107 | // } | ||
108 | |||
88 | if(target !== null && r !== null){ | 109 | if(target !== null && r !== null){ |
89 | statistic.addEdge(source, target, r.name); | 110 | statistic.addEdge(source, target, r.name); |
90 | } | 111 | } |
diff --git a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/graph/GraphStatistic.xtend b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/graph/GraphStatistic.xtend index 9b8fd0e3..84071176 100644 --- a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/graph/GraphStatistic.xtend +++ b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/graph/GraphStatistic.xtend | |||
@@ -8,6 +8,7 @@ import java.util.List | |||
8 | import java.util.Map | 8 | import java.util.Map |
9 | import java.util.Set | 9 | import java.util.Set |
10 | import org.eclipse.emf.ecore.EObject | 10 | import org.eclipse.emf.ecore.EObject |
11 | import org.eclipse.emf.ecore.EReference | ||
11 | 12 | ||
12 | class GraphStatistic { | 13 | class GraphStatistic { |
13 | val incomingEdges = new HashMap<String, Multimap<EObject, EObject>>; | 14 | val incomingEdges = new HashMap<String, Multimap<EObject, EObject>>; |
@@ -21,9 +22,12 @@ class GraphStatistic { | |||
21 | * @param type: type to add | 22 | * @param type: type to add |
22 | */ | 23 | */ |
23 | def void addEdgeType(String type){ | 24 | def void addEdgeType(String type){ |
25 | |||
26 | |||
24 | if(edgeTypes.contains(type)){ | 27 | if(edgeTypes.contains(type)){ |
25 | return; | 28 | return; |
26 | } | 29 | } |
30 | |||
27 | edgeTypes.add(type); | 31 | edgeTypes.add(type); |
28 | incomingEdges.put(type, ArrayListMultimap.create()); | 32 | incomingEdges.put(type, ArrayListMultimap.create()); |
29 | outcomingEdges.put(type, ArrayListMultimap.create()); | 33 | outcomingEdges.put(type, ArrayListMultimap.create()); |
diff --git a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/graph/PartialInterpretationGraph.xtend b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/graph/PartialInterpretationGraph.xtend index 91d7c5f9..bb679bf6 100644 --- a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/graph/PartialInterpretationGraph.xtend +++ b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/graph/PartialInterpretationGraph.xtend | |||
@@ -19,7 +19,11 @@ class PartialInterpretationGraph extends Graph{ | |||
19 | //the edge types are defined in terms of RelationDeclaration | 19 | //the edge types are defined in terms of RelationDeclaration |
20 | partial.problem.relations.filter(RelationDeclaration).forEach[ | 20 | partial.problem.relations.filter(RelationDeclaration).forEach[ |
21 | //only need the name of the reference type (remove everything with and after "reference") | 21 | //only need the name of the reference type (remove everything with and after "reference") |
22 | this.statistic.addEdgeType(it.name.split(" ").get(0)); | 22 | var n = it.name.split(" ").get(0); |
23 | // TODO: Here is to only consider one part of opposite edges | ||
24 | //if(!n.equals('target') && !n.equals('source') /* && !n.equals('incomingTransitions')*/){ | ||
25 | this.statistic.addEdgeType(n); | ||
26 | //} | ||
23 | ] | 27 | ] |
24 | // add all elements | 28 | // add all elements |
25 | val typeInterpretations = getTypes(partial); | 29 | val typeInterpretations = getTypes(partial); |
@@ -33,9 +37,12 @@ class PartialInterpretationGraph extends Graph{ | |||
33 | for(relationInterpretation : partial.partialrelationinterpretation) { | 37 | for(relationInterpretation : partial.partialrelationinterpretation) { |
34 | //only need the name of the reference type (remove everything with and after "reference") | 38 | //only need the name of the reference type (remove everything with and after "reference") |
35 | val type = relationInterpretation.interpretationOf.name.split(" ").get(0); | 39 | val type = relationInterpretation.interpretationOf.name.split(" ").get(0); |
36 | for(edge : relationInterpretation.relationlinks.filter(BinaryElementRelationLink)){ | 40 | // TODO: Here is to only consider one part of opposite edges |
37 | statistic.addEdge(edge.param1, edge.param2, type); | 41 | //if(!type.equals('target') && !type.equals('source') /*&& !type.equals('incomingTransitions')*/){ |
38 | } | 42 | for(edge : relationInterpretation.relationlinks.filter(BinaryElementRelationLink)){ |
43 | statistic.addEdge(edge.param1, edge.param2, type); | ||
44 | } | ||
45 | //} | ||
39 | } | 46 | } |
40 | 47 | ||
41 | this.name = name; | 48 | this.name = name; |
diff --git a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/io/GraphReader.xtend b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/io/GraphReader.xtend index 8f1feb9d..ffec372b 100644 --- a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/io/GraphReader.xtend +++ b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/io/GraphReader.xtend | |||
@@ -1,10 +1,13 @@ | |||
1 | package ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.io; | 1 | package ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.io; |
2 | 2 | ||
3 | import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.graph.EMFGraph | 3 | import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.graph.EMFGraph |
4 | import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.EdgeTypeMetric | ||
4 | import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.Metric | 5 | import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.Metric |
5 | import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.MultiplexParticipationCoefficientMetric | 6 | import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.MultiplexParticipationCoefficientMetric |
6 | import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.NodeActivityMetric | 7 | import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.NodeActivityMetric |
8 | import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.NodeTypeMetric | ||
7 | import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.OutDegreeMetric | 9 | import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.OutDegreeMetric |
10 | import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.TypedOutDegree | ||
8 | import java.io.File | 11 | import java.io.File |
9 | import java.io.FileNotFoundException | 12 | import java.io.FileNotFoundException |
10 | import java.util.ArrayList | 13 | import java.util.ArrayList |
@@ -17,19 +20,11 @@ import org.eclipse.emf.ecore.resource.Resource | |||
17 | import org.eclipse.emf.ecore.resource.ResourceSet | 20 | import org.eclipse.emf.ecore.resource.ResourceSet |
18 | import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl | 21 | import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl |
19 | import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl | 22 | import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl |
20 | import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.NodeTypeMetric | ||
21 | import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.EdgeTypeMetric | ||
22 | import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.TypedOutDegree | ||
23 | import hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph.yakindumm.YakindummPackage | ||
24 | 23 | ||
25 | class GraphReader{ | 24 | class GraphReader{ |
26 | val ResourceSet resSet = new ResourceSetImpl(); | 25 | val ResourceSet resSet = new ResourceSetImpl(); |
27 | val referenceTypes = new ArrayList<EReference>(); | 26 | val referenceTypes = new ArrayList<EReference>(); |
28 | 27 | ||
29 | def static void main(String[] args){ | ||
30 | var g = new GraphReader(YakindummPackage.eINSTANCE); | ||
31 | } | ||
32 | |||
33 | new(EPackage metaModel) { | 28 | new(EPackage metaModel) { |
34 | Resource.Factory.Registry.INSTANCE.extensionToFactoryMap.put("*",new XMIResourceFactoryImpl) | 29 | Resource.Factory.Registry.INSTANCE.extensionToFactoryMap.put("*",new XMIResourceFactoryImpl) |
35 | 30 | ||
@@ -73,6 +68,25 @@ class GraphReader{ | |||
73 | return graphs; | 68 | return graphs; |
74 | } | 69 | } |
75 | 70 | ||
71 | def EMFGraph readModel(String path, String filename){ | ||
72 | val metrics = new ArrayList<Metric>(); | ||
73 | metrics.add(new OutDegreeMetric()); | ||
74 | metrics.add(new NodeActivityMetric()); | ||
75 | metrics.add(new MultiplexParticipationCoefficientMetric()); | ||
76 | metrics.add(new TypedOutDegree()); | ||
77 | metrics.add(new NodeTypeMetric()); | ||
78 | metrics.add(new EdgeTypeMetric()); | ||
79 | |||
80 | val file = new File(filename); | ||
81 | val roots = readModel(EObject, path, file.name); | ||
82 | //add a list of metrics | ||
83 | val g = new EMFGraph(); | ||
84 | for(root : roots){ | ||
85 | g.init(root, metrics, filename.replaceFirst(".xmi", ""), referenceTypes); | ||
86 | } | ||
87 | return g | ||
88 | } | ||
89 | |||
76 | def <RootType extends EObject> List<RootType> readModel(Class<RootType> type, String path, String name) { | 90 | def <RootType extends EObject> List<RootType> readModel(Class<RootType> type, String path, String name) { |
77 | try { | 91 | try { |
78 | val resource = resSet.getResource(getURI(path, name),true); | 92 | val resource = resSet.getResource(getURI(path, name),true); |
diff --git a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/metrics/NodeTypeMetric.xtend b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/metrics/NodeTypeMetric.xtend index 94eaa445..7cec2513 100644 --- a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/metrics/NodeTypeMetric.xtend +++ b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/metrics/NodeTypeMetric.xtend | |||
@@ -28,13 +28,11 @@ class NodeTypeMetric extends Metric { | |||
28 | var map = new HashMap<String, Double>(); | 28 | var map = new HashMap<String, Double>(); |
29 | var nodes = g.allNodes; | 29 | var nodes = g.allNodes; |
30 | var single = 1.0 / nodes.size(); | 30 | var single = 1.0 / nodes.size(); |
31 | for(node : nodes){ | 31 | var nodeToType = g.nodeToTypesMap; |
32 | var classes = new ArrayList(node.eClass.ESuperTypes); | 32 | for(node : nodes){ |
33 | classes.add(node.eClass); | 33 | for(cl : nodeToType.get(node)){ |
34 | 34 | var value = map.getOrDefault(cl, 0.0); | |
35 | for(cl : classes){ | 35 | map.put(cl, value + single); |
36 | var value = map.getOrDefault(cl.name, 0.0); | ||
37 | map.put(cl.name, value + single); | ||
38 | } | 36 | } |
39 | } | 37 | } |
40 | 38 | ||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Realistic Viatra no Exit (100 nodes)-Realistic Viatra consistent (100 nodes)-/MPC.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Realistic Viatra no Exit (100 nodes)-Realistic Viatra consistent (100 nodes)-/MPC.png new file mode 100644 index 00000000..9b0863ae --- /dev/null +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Realistic Viatra no Exit (100 nodes)-Realistic Viatra consistent (100 nodes)-/MPC.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Realistic Viatra no Exit (100 nodes)-Realistic Viatra consistent (100 nodes)-/Node Activity.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Realistic Viatra no Exit (100 nodes)-Realistic Viatra consistent (100 nodes)-/Node Activity.png new file mode 100644 index 00000000..499c83a2 --- /dev/null +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Realistic Viatra no Exit (100 nodes)-Realistic Viatra consistent (100 nodes)-/Node Activity.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Realistic Viatra no Exit (100 nodes)-Realistic Viatra consistent (100 nodes)-/Out Degree.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Realistic Viatra no Exit (100 nodes)-Realistic Viatra consistent (100 nodes)-/Out Degree.png new file mode 100644 index 00000000..1816c3e6 --- /dev/null +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Realistic Viatra no Exit (100 nodes)-Realistic Viatra consistent (100 nodes)-/Out Degree.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-/MPC.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-/MPC.png new file mode 100644 index 00000000..7d317bb4 --- /dev/null +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-/MPC.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-/Node Activity.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-/Node Activity.png new file mode 100644 index 00000000..323635f2 --- /dev/null +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-/Node Activity.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-/Out Degree.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-/Out Degree.png new file mode 100644 index 00000000..aaf2d258 --- /dev/null +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-/Out Degree.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Realistic Viatra (100 nodes)-/MPC.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Realistic Viatra (100 nodes)-/MPC.png new file mode 100644 index 00000000..39e1c4ec --- /dev/null +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Realistic Viatra (100 nodes)-/MPC.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Realistic Viatra (100 nodes)-/Node Activity.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Realistic Viatra (100 nodes)-/Node Activity.png new file mode 100644 index 00000000..16ac54dd --- /dev/null +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Realistic Viatra (100 nodes)-/Node Activity.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Realistic Viatra (100 nodes)-/Out Degree.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Realistic Viatra (100 nodes)-/Out Degree.png new file mode 100644 index 00000000..99ebd383 --- /dev/null +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Realistic Viatra (100 nodes)-/Out Degree.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Realistic Viatra V2 (100 nodes)-/MPC.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Realistic Viatra V2 (100 nodes)-/MPC.png new file mode 100644 index 00000000..08983af2 --- /dev/null +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Realistic Viatra V2 (100 nodes)-/MPC.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Realistic Viatra V2 (100 nodes)-/Node Activity.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Realistic Viatra V2 (100 nodes)-/Node Activity.png new file mode 100644 index 00000000..704ac0f4 --- /dev/null +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Realistic Viatra V2 (100 nodes)-/Node Activity.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Realistic Viatra V2 (100 nodes)-/Out Degree.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Realistic Viatra V2 (100 nodes)-/Out Degree.png new file mode 100644 index 00000000..93ba4a66 --- /dev/null +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Realistic Viatra V2 (100 nodes)-/Out Degree.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Realistic Viatra containers (100 nodes)-Realistic Viatra new (100 nodes)-/MPC.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Realistic Viatra containers (100 nodes)-Realistic Viatra new (100 nodes)-/MPC.png new file mode 100644 index 00000000..e0d5b199 --- /dev/null +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Realistic Viatra containers (100 nodes)-Realistic Viatra new (100 nodes)-/MPC.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Realistic Viatra containers (100 nodes)-Realistic Viatra new (100 nodes)-/Node Activity.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Realistic Viatra containers (100 nodes)-Realistic Viatra new (100 nodes)-/Node Activity.png new file mode 100644 index 00000000..ddcc2451 --- /dev/null +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Realistic Viatra containers (100 nodes)-Realistic Viatra new (100 nodes)-/Node Activity.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Realistic Viatra containers (100 nodes)-Realistic Viatra new (100 nodes)-/Out Degree.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Realistic Viatra containers (100 nodes)-Realistic Viatra new (100 nodes)-/Out Degree.png new file mode 100644 index 00000000..e0ea1c75 --- /dev/null +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Realistic Viatra containers (100 nodes)-Realistic Viatra new (100 nodes)-/Out Degree.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Realistic Viatra new (100 nodes)-/MPC.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Realistic Viatra new (100 nodes)-/MPC.png new file mode 100644 index 00000000..430e7279 --- /dev/null +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Realistic Viatra new (100 nodes)-/MPC.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Realistic Viatra new (100 nodes)-/Node Activity.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Realistic Viatra new (100 nodes)-/Node Activity.png new file mode 100644 index 00000000..fc15d7f5 --- /dev/null +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Realistic Viatra new (100 nodes)-/Node Activity.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Realistic Viatra new (100 nodes)-/Out Degree.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Realistic Viatra new (100 nodes)-/Out Degree.png new file mode 100644 index 00000000..20499e22 --- /dev/null +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Realistic Viatra new (100 nodes)-/Out Degree.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Viatra Consistent (100 nodes)-/MPC.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Viatra Consistent (100 nodes)-/MPC.png new file mode 100644 index 00000000..601fc7f1 --- /dev/null +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Viatra Consistent (100 nodes)-/MPC.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Viatra Consistent (100 nodes)-/Node Activity.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Viatra Consistent (100 nodes)-/Node Activity.png new file mode 100644 index 00000000..76773aa4 --- /dev/null +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Viatra Consistent (100 nodes)-/Node Activity.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Viatra Consistent (100 nodes)-/Out Degree.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Viatra Consistent (100 nodes)-/Out Degree.png new file mode 100644 index 00000000..2e459f1a --- /dev/null +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Viatra Consistent (100 nodes)-/Out Degree.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (30 nodes)-/MPC.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (30 nodes)-/MPC.png new file mode 100644 index 00000000..05e0f430 --- /dev/null +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (30 nodes)-/MPC.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (30 nodes)-/Node Activity.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (30 nodes)-/Node Activity.png new file mode 100644 index 00000000..c1e23deb --- /dev/null +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (30 nodes)-/Node Activity.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (30 nodes)-/Out Degree.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (30 nodes)-/Out Degree.png new file mode 100644 index 00000000..8bb96d31 --- /dev/null +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (30 nodes)-/Out Degree.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/MPC.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/Euclidean_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/MPC.png index 4f8e97e2..4f8e97e2 100644 --- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/MPC.png +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/Euclidean_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/MPC.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/Node Activity.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/Euclidean_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/Node Activity.png index 7c2b5752..7c2b5752 100644 --- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/Node Activity.png +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/Euclidean_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/Node Activity.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/Out Degree.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/Euclidean_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/Out Degree.png index 3cf659b2..3cf659b2 100644 --- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/Out Degree.png +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/Euclidean_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/Out Degree.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Viatra (30 nodes)-/MPC.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/Euclidean_Distance/Human-Viatra (30 nodes)-/MPC.png index 50b882da..50b882da 100644 --- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Viatra (30 nodes)-/MPC.png +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/Euclidean_Distance/Human-Viatra (30 nodes)-/MPC.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Viatra (30 nodes)-/Node Activity.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/Euclidean_Distance/Human-Viatra (30 nodes)-/Node Activity.png index 4e9a68d5..4e9a68d5 100644 --- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Viatra (30 nodes)-/Node Activity.png +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/Euclidean_Distance/Human-Viatra (30 nodes)-/Node Activity.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Viatra (30 nodes)-/Out Degree.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/Euclidean_Distance/Human-Viatra (30 nodes)-/Out Degree.png index bfa4b537..bfa4b537 100644 --- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Viatra (30 nodes)-/Out Degree.png +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/Euclidean_Distance/Human-Viatra (30 nodes)-/Out Degree.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Viatra (30 nodes)-Random-/MPC.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/Euclidean_Distance/Human-Viatra (30 nodes)-Random-/MPC.png index 33176821..33176821 100644 --- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Viatra (30 nodes)-Random-/MPC.png +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/Euclidean_Distance/Human-Viatra (30 nodes)-Random-/MPC.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Viatra (30 nodes)-Random-/Node Activity.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/Euclidean_Distance/Human-Viatra (30 nodes)-Random-/Node Activity.png index 53c46e6f..53c46e6f 100644 --- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Viatra (30 nodes)-Random-/Node Activity.png +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/Euclidean_Distance/Human-Viatra (30 nodes)-Random-/Node Activity.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Viatra (30 nodes)-Random-/Out Degree.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/Euclidean_Distance/Human-Viatra (30 nodes)-Random-/Out Degree.png index abf45ff1..abf45ff1 100644 --- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Viatra (30 nodes)-Random-/Out Degree.png +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/Euclidean_Distance/Human-Viatra (30 nodes)-Random-/Out Degree.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/MPC.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/JS_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/MPC.png index 07c97401..07c97401 100644 --- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/MPC.png +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/JS_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/MPC.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/Node Activity.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/JS_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/Node Activity.png index f2fb5229..f2fb5229 100644 --- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/Node Activity.png +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/JS_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/Node Activity.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/Out Degree.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/JS_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/Out Degree.png index d2677e99..d2677e99 100644 --- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/Out Degree.png +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/JS_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/Out Degree.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Viatra (30 nodes)-/MPC.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/JS_Distance/Human-Viatra (30 nodes)-/MPC.png index a375c676..a375c676 100644 --- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Viatra (30 nodes)-/MPC.png +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/JS_Distance/Human-Viatra (30 nodes)-/MPC.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Viatra (30 nodes)-/Node Activity.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/JS_Distance/Human-Viatra (30 nodes)-/Node Activity.png index d69cd298..d69cd298 100644 --- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Viatra (30 nodes)-/Node Activity.png +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/JS_Distance/Human-Viatra (30 nodes)-/Node Activity.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Viatra (30 nodes)-/Out Degree.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/JS_Distance/Human-Viatra (30 nodes)-/Out Degree.png index 0584ac99..0584ac99 100644 --- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Viatra (30 nodes)-/Out Degree.png +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/JS_Distance/Human-Viatra (30 nodes)-/Out Degree.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Viatra (30 nodes)-Random-/MPC.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/JS_Distance/Human-Viatra (30 nodes)-Random-/MPC.png index 016cc2a3..016cc2a3 100644 --- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Viatra (30 nodes)-Random-/MPC.png +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/JS_Distance/Human-Viatra (30 nodes)-Random-/MPC.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Viatra (30 nodes)-Random-/Node Activity.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/JS_Distance/Human-Viatra (30 nodes)-Random-/Node Activity.png index 55d32444..55d32444 100644 --- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Viatra (30 nodes)-Random-/Node Activity.png +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/JS_Distance/Human-Viatra (30 nodes)-Random-/Node Activity.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Viatra (30 nodes)-Random-/Out Degree.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/JS_Distance/Human-Viatra (30 nodes)-Random-/Out Degree.png index 99cbbae4..99cbbae4 100644 --- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Viatra (30 nodes)-Random-/Out Degree.png +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/JS_Distance/Human-Viatra (30 nodes)-Random-/Out Degree.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/MPC.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/MPC.png index b8480ae0..b8480ae0 100644 --- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/MPC.png +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/MPC.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/Node Activity.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/Node Activity.png index 82268167..82268167 100644 --- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/Node Activity.png +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/Node Activity.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/Out Degree.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/Out Degree.png index 41bcd510..41bcd510 100644 --- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/Out Degree.png +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/Out Degree.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-/MPC.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra (30 nodes)-/MPC.png index b19bb958..b19bb958 100644 --- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-/MPC.png +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra (30 nodes)-/MPC.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-/Node Activity.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra (30 nodes)-/Node Activity.png index cccabc4e..cccabc4e 100644 --- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-/Node Activity.png +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra (30 nodes)-/Node Activity.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-/Out Degree.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra (30 nodes)-/Out Degree.png index 947ebdd2..947ebdd2 100644 --- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-/Out Degree.png +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra (30 nodes)-/Out Degree.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Alloy (30 nodes)-/MPC.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra (30 nodes)-Alloy (30 nodes)-/MPC.png index 0ff4ee89..0ff4ee89 100644 --- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Alloy (30 nodes)-/MPC.png +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra (30 nodes)-Alloy (30 nodes)-/MPC.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Alloy (30 nodes)-/Node Activity.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra (30 nodes)-Alloy (30 nodes)-/Node Activity.png index 1f9e2e18..1f9e2e18 100644 --- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Alloy (30 nodes)-/Node Activity.png +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra (30 nodes)-Alloy (30 nodes)-/Node Activity.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Alloy (30 nodes)-/Out Degree.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra (30 nodes)-Alloy (30 nodes)-/Out Degree.png index 2c63cc3a..2c63cc3a 100644 --- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Alloy (30 nodes)-/Out Degree.png +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra (30 nodes)-Alloy (30 nodes)-/Out Degree.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Random-/MPC.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra (30 nodes)-Random-/MPC.png index 8d76fed9..8d76fed9 100644 --- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Random-/MPC.png +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra (30 nodes)-Random-/MPC.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Random-/Node Activity.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra (30 nodes)-Random-/Node Activity.png index daa7929a..daa7929a 100644 --- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Random-/Node Activity.png +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra (30 nodes)-Random-/Node Activity.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Random-/Out Degree.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra (30 nodes)-Random-/Out Degree.png index e56b1b6e..e56b1b6e 100644 --- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Random-/Out Degree.png +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra (30 nodes)-Random-/Out Degree.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Random-Viatra (100 nodes)-/MPC.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra (30 nodes)-Random-Viatra (100 nodes)-/MPC.png index 8705cee2..8705cee2 100644 --- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Random-Viatra (100 nodes)-/MPC.png +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra (30 nodes)-Random-Viatra (100 nodes)-/MPC.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Random-Viatra (100 nodes)-/Node Activity.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra (30 nodes)-Random-Viatra (100 nodes)-/Node Activity.png index bdab3741..bdab3741 100644 --- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Random-Viatra (100 nodes)-/Node Activity.png +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra (30 nodes)-Random-Viatra (100 nodes)-/Node Activity.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Random-Viatra (100 nodes)-/Out Degree.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra (30 nodes)-Random-Viatra (100 nodes)-/Out Degree.png index e4269f6e..e4269f6e 100644 --- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Random-Viatra (100 nodes)-/Out Degree.png +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra (30 nodes)-Random-Viatra (100 nodes)-/Out Degree.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Viatra (60 nodes)-Viatra (100 nodes)-/MPC.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra (30 nodes)-Viatra (60 nodes)-Viatra (100 nodes)-/MPC.png index e4b6b527..e4b6b527 100644 --- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Viatra (60 nodes)-Viatra (100 nodes)-/MPC.png +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra (30 nodes)-Viatra (60 nodes)-Viatra (100 nodes)-/MPC.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Viatra (60 nodes)-Viatra (100 nodes)-/Node Activity.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra (30 nodes)-Viatra (60 nodes)-Viatra (100 nodes)-/Node Activity.png index e067ad66..e067ad66 100644 --- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Viatra (60 nodes)-Viatra (100 nodes)-/Node Activity.png +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra (30 nodes)-Viatra (60 nodes)-Viatra (100 nodes)-/Node Activity.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Viatra (60 nodes)-Viatra (100 nodes)-/Out Degree.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra (30 nodes)-Viatra (60 nodes)-Viatra (100 nodes)-/Out Degree.png index 9b89e4f9..9b89e4f9 100644 --- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Viatra (60 nodes)-Viatra (100 nodes)-/Out Degree.png +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra (30 nodes)-Viatra (60 nodes)-Viatra (100 nodes)-/Out Degree.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra consistent (100 nodes)-/MPC.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra consistent (100 nodes)-/MPC.png index 820df5c7..820df5c7 100644 --- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra consistent (100 nodes)-/MPC.png +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra consistent (100 nodes)-/MPC.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra consistent (100 nodes)-/Node Activity.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra consistent (100 nodes)-/Node Activity.png index b6aa957a..b6aa957a 100644 --- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra consistent (100 nodes)-/Node Activity.png +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra consistent (100 nodes)-/Node Activity.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra consistent (100 nodes)-/Out Degree.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra consistent (100 nodes)-/Out Degree.png index 161041d9..161041d9 100644 --- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra consistent (100 nodes)-/Out Degree.png +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra consistent (100 nodes)-/Out Degree.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/real vs viatra vs alloy/MPC.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/real vs viatra vs alloy/MPC.png index 4f189578..4f189578 100644 --- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/real vs viatra vs alloy/MPC.png +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/real vs viatra vs alloy/MPC.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/real vs viatra vs alloy/Node Activity.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/real vs viatra vs alloy/Node Activity.png index add3c0f8..add3c0f8 100644 --- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/real vs viatra vs alloy/Node Activity.png +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/real vs viatra vs alloy/Node Activity.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/real vs viatra vs alloy/Out Degree.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/real vs viatra vs alloy/Out Degree.png index f4717a1a..f4717a1a 100644 --- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/real vs viatra vs alloy/Out Degree.png +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/real vs viatra vs alloy/Out Degree.png | |||
Binary files differ | |||
diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/src/plot_ks_stats.py b/Metrics/Metrics-Calculation/metrics_plot/model comparison/src/plot_ks_stats.py index a66802d5..1ac7af75 100644 --- a/Metrics/Metrics-Calculation/metrics_plot/model comparison/src/plot_ks_stats.py +++ b/Metrics/Metrics-Calculation/metrics_plot/model comparison/src/plot_ks_stats.py | |||
@@ -12,15 +12,18 @@ import DistributionMetrics as metrics | |||
12 | 12 | ||
13 | def main(): | 13 | def main(): |
14 | # read models | 14 | # read models |
15 | # human = GraphCollection('../input/humanOutput/', 500, 'Human') | 15 | human = GraphCollection('../input/humanOutput/', 500, 'Human') |
16 | # viatra30 = GraphCollection('../input/viatraOutput30/', 500,'Viatra (30 nodes)') | 16 | # viatra30 = GraphCollection('../input/viatraOutput30/', 500,'Viatra (30 nodes)') |
17 | # viatra60 = GraphCollection('../input/viatraOutput60/', 500, 'Viatra (60 nodes)') | 17 | # viatra60 = GraphCollection('../input/viatraOutput60/', 500, 'Viatra (60 nodes)') |
18 | viatra100 = GraphCollection('../input/viatraOutput100/', 500, 'Viatra (100 nodes)') | 18 | viatra100 = GraphCollection('../input/viatraOutput100/', 500, 'Viatra (100 nodes)') |
19 | viatra100R = GraphCollection('../input/realisticViatraOutput_container/', 500, 'Realistic Viatra containers (100 nodes)') | ||
20 | viatra100C = GraphCollection('../input/viatraOutput100C/', 500, 'Realistic Viatra consistent (100 nodes)') | ||
21 | viatra100EE = GraphCollection('../input/realisticViatra_excludeExit/', 500, 'Realistic Viatra no Exit (100 nodes)') | ||
19 | # random = GraphCollection('../input/randomOutput/', 500, 'Random') | 22 | # random = GraphCollection('../input/randomOutput/', 500, 'Random') |
20 | # alloy = GraphCollection('../input/alloyOutput/', 500, 'Alloy (30 nodes)') | 23 | # alloy = GraphCollection('../input/alloyOutput/', 500, 'Alloy (30 nodes)') |
21 | realistic_viatra = GraphCollection('../input/viatra_output_consistent_100/', 50, 'Realistic Viatra With Some Constraints (100 nodes)') | 24 | # realistic_viatra = GraphCollection('../input/viatra_output_consistent_100/', 50, 'Realistic Viatra With Some Constraints (100 nodes)') |
22 | human100 = GraphCollection('../input/human_output_100/', 304, 'Human') | 25 | # human100 = GraphCollection('../input/human_output_100/', 304, 'Human') |
23 | models_to_compare = [human100, realistic_viatra, viatra100] | 26 | models_to_compare = [human, viatra100EE,viatra100C] |
24 | 27 | ||
25 | # define output folder | 28 | # define output folder |
26 | outputFolder = '../output/' | 29 | outputFolder = '../output/' |
@@ -40,7 +43,7 @@ def calculateKSMatrix(dists): | |||
40 | for i in range(len(dist)): | 43 | for i in range(len(dist)): |
41 | matrix[i,i] = 0 | 44 | matrix[i,i] = 0 |
42 | for j in range(i+1, len(dist)): | 45 | for j in range(i+1, len(dist)): |
43 | value = metrics.euclidean_distance(dist[i], dist[j]) | 46 | value, p = metrics.ks_distance(dist[i], dist[j]) |
44 | matrix[i, j] = value | 47 | matrix[i, j] = value |
45 | matrix[j, i] = value | 48 | matrix[j, i] = value |
46 | return matrix | 49 | return matrix |
diff --git a/Metrics/Metrics-Calculation/metrics_plot/utils/GraphType.py b/Metrics/Metrics-Calculation/metrics_plot/utils/GraphType.py index 827c2a5e..d6bdad0d 100644 --- a/Metrics/Metrics-Calculation/metrics_plot/utils/GraphType.py +++ b/Metrics/Metrics-Calculation/metrics_plot/utils/GraphType.py | |||
@@ -11,8 +11,9 @@ class GraphCollection: | |||
11 | self.nas = [] | 11 | self.nas = [] |
12 | self.mpcs = [] | 12 | self.mpcs = [] |
13 | self.name = name | 13 | self.name = name |
14 | self.size = number | ||
15 | models = reader.readmultiplefiles(path, number, shouldShuffle) | 14 | models = reader.readmultiplefiles(path, number, shouldShuffle) |
15 | print(len(models)) | ||
16 | self.size = len(models) | ||
16 | for i in range(len(models)): | 17 | for i in range(len(models)): |
17 | contents, out_d, na, mpc = reader.getmetrics(models[i]) | 18 | contents, out_d, na, mpc = reader.getmetrics(models[i]) |
18 | self.out_ds.append(out_d) | 19 | self.out_ds.append(out_d) |
diff --git a/Metrics/Metrics-Calculation/metrics_plot/utils/readCSV.py b/Metrics/Metrics-Calculation/metrics_plot/utils/readCSV.py index b27a0ffc..33378ce5 100644 --- a/Metrics/Metrics-Calculation/metrics_plot/utils/readCSV.py +++ b/Metrics/Metrics-Calculation/metrics_plot/utils/readCSV.py | |||
@@ -29,7 +29,8 @@ def readcsvfile(filename): | |||
29 | try: | 29 | try: |
30 | contents[arr[0]] = list(map(int, arr[1:])) | 30 | contents[arr[0]] = list(map(int, arr[1:])) |
31 | except: | 31 | except: |
32 | print(arr[0], ' is not integer') | 32 | message = arr[0], ' is not integer' |
33 | #print(message) | ||
33 | f.close() | 34 | f.close() |
34 | return contents | 35 | return contents |
35 | 36 | ||