consider node types during generation

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;
 import java.io.FileNotFoundException;
 import java.io.PrintStream;
 import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 
-import org.eclipse.viatra.query.runtime.matchers.aggregators.count;
-
 import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.app.Domain;
 import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.distance.KSDistance;
 import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.graph.EMFGraph;
@@ -27,16 +24,16 @@ public class Main {
                 return message;
         }
         
-        private static String configFolder = "yakinduum/";
-        private static String configFileName = configFolder + "info.csv";
-        private static String aggregateViolationMeasureFileName = configFolder + "aggregateInfo2.csv";
+        private static String configFolder = "yakinduum/config15/";
+        private static String configFileName = configFolder + "info_new_metric.csv";
+        private static String aggregateViolationMeasureFileName = configFolder + "aggregateInfo.csv";
+        private static String fileReadFolder = "output/Viatra_100/";
         
         public static void main(String args[]) {
-//              try {
                 
                 
                 long begin = System.currentTimeMillis();
-                String message = null;//runWithPath("yakinduGeneration.vsconfig");
+                String message = runWithPath("yakinduGeneration.vsconfig");
                 long elapsed = System.currentTimeMillis() - begin;
 
                 if(message != null) {
@@ -48,17 +45,17 @@ public class Main {
                 infoOutput.add(time);
                 output.add(infoOutput);
                 System.out.println(time);
-                //CsvFileWriter.write(output, configFileName);
+                CsvFileWriter.write(output, configFileName);
                 
                 
                 output = new ArrayList<ArrayList<String>>();
                 output.add(prepareInfo());
-                //CsvFileWriter.append(output, configFileName);
+                CsvFileWriter.append(output, configFileName);
                 
-//              for(int i = 0; i < 50; i++) {
-//                      singleModelViolationMeasure(i+1);
-//              }
-                aggregateViolationMeasure(50);
+                for(int i = 0; i < 50; i++) {
+                        generateModel(i+1);
+                }
+                //aggregateViolationMeasure(50);
                 System.out.println("Finished");
         }
 
@@ -70,7 +67,7 @@ public class Main {
                 infoOutput.add(run+ "");
                 infoOutput.addAll(calculateMetric(run));
 
-                YakinduumModel model = new YakinduumModel("output/Viatra_100/run"+run+"/"+ filename);
+                YakinduumModel model = new YakinduumModel(fileReadFolder +"run" +run + "/" + filename);
                 int violationCount = ViolationCheck.calculateViolationCounts(model.yakinduum);
                 infoOutput.add(violationCount + "");
 
@@ -78,18 +75,18 @@ public class Main {
                 
                 //save model to another directory
                 model.save(configFolder + run + ".xmi");
-                
+                output.add(infoOutput);
                 CsvFileWriter.append(output, configFileName);
         }
         
         public static void singleModelViolationMeasure(int run) {
-                String filename = run+".xmi";
+                String filename = run+"_1.xmi";
                 //prepare initial info
                 ArrayList<ArrayList<String>> output = new ArrayList<ArrayList<String>>();
                 ArrayList<String> infoOutput = new ArrayList<String>();
                 infoOutput.add(run+ "");
 
-                YakinduumModel model = new YakinduumModel("yakinduum\\config8\\"+ filename);
+                YakinduumModel model = new YakinduumModel("output/Viatra_100/run"+run+"/"+ filename);
                 
                 //parse map of violation counts to two list and add them to the result list 
                 Map<String, Integer> map = ViolationCheck.violationMaps(model.yakinduum);
@@ -112,8 +109,8 @@ public class Main {
                 ArrayList<String> counts = new ArrayList<String>();
                 ArrayList<String> violationNames = null;
                 for(int run = 1; run < size+1; run++) {
-                        String filename = run+".xmi";
-                        YakinduumModel model = new YakinduumModel("yakinduum\\config8\\"+ filename);
+                        String filename = run+"_1.xmi";
+                        YakinduumModel model = new YakinduumModel("output/Viatra_100/run"+run+"/"+ filename);
 
                         Map<String, Integer> map = ViolationCheck.violationMaps(model.yakinduum);
                         if(run == 1) {
@@ -147,7 +144,7 @@ public class Main {
                 //read model and metric
                 ArrayList<String> output = new ArrayList<String>();
                 GraphReader reader = new GraphReader(YakindummPackage.eINSTANCE);
-                EMFGraph graph = reader.readModels("output/Viatra_100/run"+run+"/").get(0);
+                EMFGraph graph = reader.readModel(fileReadFolder+"/run"+run, run + "_1.xmi");
                 
                 //KS distance
                 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
-choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
-0,0,4,0,12,6,0,0,0,8
-2
-choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
-0,0,5,0,12,13,4,0,0,2
-3
-choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
-0,0,3,1,4,9,3,0,0,0
-4
-choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
-0,0,1,0,7,12,3,0,0,2
-5
-choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
-0,0,1,0,8,7,6,0,0,2
-6
-choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
-0,0,5,0,11,6,4,0,1,6
-7
-choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
-0,0,4,2,9,10,4,1,0,2
-8
-choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
-0,0,3,0,9,7,5,0,0,0
-9
-choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
-0,0,6,0,13,8,4,0,0,10
-10
-choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
-0,0,2,0,7,8,2,0,0,4
-11
-choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
-0,0,2,0,8,7,3,0,0,2
-12
-choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
-0,0,5,0,13,4,1,0,0,2
-13
-choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
-0,0,3,1,12,20,2,0,0,2
-14
-choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
-0,0,6,0,13,7,2,0,0,0
-15
-choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
-0,0,2,0,15,12,3,0,2,2
-16
-choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
-0,0,3,0,6,10,1,0,0,2
-17
-choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
-0,0,4,1,9,7,2,0,0,4
-18
-choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
-0,0,1,0,8,12,4,0,0,0
-19
-choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
-0,0,4,0,10,10,1,0,0,0
-20
-choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
-0,0,4,2,11,11,6,0,0,2
-21
-choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
-0,0,3,1,15,12,4,1,0,2
-22
-choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
-0,0,5,0,14,4,1,0,0,4
-23
-choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
-0,0,3,1,8,11,4,0,0,2
-24
-choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
-0,0,1,0,12,10,4,0,0,0
-25
-choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
-0,0,1,1,9,1,4,0,0,2
-26
-choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
-0,0,5,0,9,4,7,1,0,2
-27
-choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
-0,0,3,0,11,31,0,0,0,2
-28
-choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
-0,0,5,0,6,12,0,1,0,2
-29
-choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
-0,0,3,1,10,10,3,0,0,0
-30
-choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
-0,0,1,0,10,23,4,0,0,2
-31
-choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
-0,0,4,0,4,8,3,0,0,2
-32
-choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
-0,0,3,0,20,3,1,0,0,2
-33
-choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
-0,0,1,1,9,11,7,0,0,2
-34
-choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
-0,0,3,3,1,11,7,0,0,2
-35
-choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
-0,0,2,0,7,14,6,0,0,0
-36
-choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
-0,0,4,0,7,10,1,0,0,0
-37
-choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
-0,0,1,0,13,8,3,0,1,2
-38
-choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
-0,0,4,0,10,2,5,0,0,4
-39
-choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
-0,0,3,1,11,8,5,0,0,2
-40
-choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
-0,0,3,0,12,19,4,0,0,6
-41
-choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
-0,0,7,0,2,14,1,2,0,2
-42
-choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
-0,0,3,1,17,5,2,0,0,0
-43
-choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
-0,0,4,0,10,6,2,0,0,0
-44
-choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
-0,0,4,0,9,5,4,0,0,0
-45
-choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
-0,0,1,0,7,13,4,0,0,2
-46
-choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
-0,0,4,0,8,6,1,1,0,4
-47
-choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
-0,0,5,0,8,11,6,0,0,0
-48
-choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
-0,0,2,0,22,4,3,1,0,4
-49
-choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
-0,0,4,0,10,5,2,0,0,2
-50
-choiceHasNoOutgoing,choiceHasNoIncoming,incomingToEntry,noStateInRegion,outgoingFromFinal,outgoingFromExit,noEntryInRegion,multipleEntryInRegion,noOutgoingTransitionFromEntry,multipleTransitionFromEntry
-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 {
                 
                 //human input has different package declaration
 //              reader = new GraphReader(Yakindumm2PackageImpl.eINSTANCE);
-                val human = new RWInformation("inputs/config7/", "outputs/", 1);
+                val human = new RWInformation("Inputs/config15/", "outputs/", 1);
                 calculateAllModels(human.inputFolder, human.outputFolder,human.numRuns, reader);
                 
                 
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
 import java.util.Map
 import org.apache.commons.math3.stat.regression.OLSMultipleLinearRegression
 import org.eclipse.xtend.lib.annotations.Accessors
+import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.NodeTypeMetric
 
 class PartialInterpretationMetricDistance {
         
@@ -48,17 +49,17 @@ class PartialInterpretationMetricDistance {
                 metrics.add(new OutDegreeMetric());
                 metrics.add(new NodeActivityMetric());
                 metrics.add(new MultiplexParticipationCoefficientMetric());
-                metrics.add(new TypedOutDegree());
-                
+                metrics.add(new NodeTypeMetric());
                 val metricCalculator = new PartialInterpretationGraph(partial, metrics, null);          
                 var metricSamples = metricCalculator.evaluateAllMetricsToSamples();
                 
                 var mpc = ks.mpcDistance(metricSamples.mpcSamples);
                 var na = ks.naDistance(metricSamples.naSamples);
                 var outDegree = ks.outDegreeDistance(metricSamples.outDegreeSamples);
-                var typedOutDegree = ks.typedOutDegreeDistance(metricSamples.typedOutDegreeSamples);
-                
-                return new MetricDistanceGroup(mpc, na, outDegree, typedOutDegree);
+                //var typedOutDegree = ks.typedOutDegreeDistance(metricSamples.typedOutDegreeSamples);
+                var distance = new MetricDistanceGroup(mpc, na, outDegree);
+                distance.nodeTypeInfo = metricSamples.nodeTypeSamples;
+                return distance;
         }
         
         def MetricDistanceGroup calculateMetricEuclidean(PartialInterpretation partial){
@@ -66,7 +67,6 @@ class PartialInterpretationMetricDistance {
                 metrics.add(new OutDegreeMetric());
                 metrics.add(new NodeActivityMetric());
                 metrics.add(new MultiplexParticipationCoefficientMetric());
-                metrics.add(new TypedOutDegree());
                 
                 val metricCalculator = new PartialInterpretationGraph(partial, metrics, null);          
                 var metricSamples = metricCalculator.evaluateAllMetricsToSamples();
@@ -158,8 +158,8 @@ class PartialInterpretationMetricDistance {
                 var features = newDoubleArrayOfSize(2);
                 //constant term
                 features.set(0, 1);
-                
-                features.set(1, 1.0 / step);
+                features.set(0, Math.sqrt(step) + 30)
+                features.set(1, 1.0 / (step + 30) );
 //              features.set(2, violations);
 //              features.set(3, Math.pow(violations, 2));
                 
@@ -172,6 +172,7 @@ class MetricDistanceGroup{
         var double naDistance;
         var double outDegreeDistance;
         var double typedOutDegreeDistance;
+        protected var HashMap<String, Double> nodeTypeInfo;
         
         new(double mpcDistance, double naDistance, double outDegreeDistance, double typedOutDegreeDistance){
                 this.mpcDistance = mpcDistance;
@@ -201,4 +202,8 @@ class MetricDistanceGroup{
         def double getOutDegreeDistance(){
                 return this.outDegreeDistance
         }
+        
+        def double getNodeTypePercentage(String typeName){
+                return nodeTypeInfo.getOrDefault(typeName, 0.0);
+        }
 }
\ 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{
                 ]
                 
                 referenceTypes.forEach[it|
-                        statistic.addEdgeType(it.name);
+                        var typeToAdd = it;
+                
+                        // TODO: Here is to only consider one part of opposite edges
+//                      if(it.upperBound != -1 && it.EOpposite !== null && 
+//                              (it.EOpposite.upperBound == -1 || it.EOpposite.upperBound > it.upperBound
+//                      )){
+//                              typeToAdd = it.EOpposite;
+//                      }
+                        //if(!typeToAdd.name.equals('incomingTransitions')){
+                                statistic.addEdgeType(typeToAdd.name);
+                        //}
                 ];
                 
                 objects.forEach[source|
                         source.eClass.EAllReferences.forEach[r|
                                 //add the type first (if it is not added already)
                                 //many references
+//                              if(r.name.equals('incomingTransitions')){
+//                                      return;
+//                              }
                                 if(r.isMany){
                                         source.getNeighbours(r).forEach[target|
                                                 addEdge(source, target, r);
@@ -85,6 +98,14 @@ class EMFGraph extends Graph{
         }
         
         def addEdge(EObject source, EObject target, EReference r){
+                // TODO: Here is to only consider one part of opposite edges
+                //check for the opposite reference and do not add if its opposite will be added
+//              if(r.upperBound != -1 && r.EOpposite !== null && 
+//                              (r.EOpposite.upperBound == -1 || r.EOpposite.upperBound > r.upperBound
+//               )){
+//                      return;
+//              }
+                
                 if(target !== null && r !== null){
                         statistic.addEdge(source, target, r.name);
                 }
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
 import java.util.Map
 import java.util.Set
 import org.eclipse.emf.ecore.EObject
+import org.eclipse.emf.ecore.EReference
 
 class GraphStatistic {
         val incomingEdges = new HashMap<String, Multimap<EObject, EObject>>;
@@ -21,9 +22,12 @@ class GraphStatistic {
          * @param type: type to add
          */
         def void addEdgeType(String type){
+                
+                
                 if(edgeTypes.contains(type)){
-                        return;
+                        return;
                 }
+                
                 edgeTypes.add(type);
                 incomingEdges.put(type, ArrayListMultimap.create());
                 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{
                 //the edge types are defined in terms of RelationDeclaration
                 partial.problem.relations.filter(RelationDeclaration).forEach[
                         //only need the name of the reference type (remove everything with and after "reference")
-                        this.statistic.addEdgeType(it.name.split(" ").get(0));
+                        var n = it.name.split(" ").get(0);
+                        // TODO: Here is to only consider one part of opposite edges
+                        //if(!n.equals('target') && !n.equals('source') /* && !n.equals('incomingTransitions')*/){
+                                this.statistic.addEdgeType(n);
+                        //}
                 ]
                 // add all elements
                 val typeInterpretations = getTypes(partial);
@@ -33,9 +37,12 @@ class PartialInterpretationGraph extends Graph{
                 for(relationInterpretation : partial.partialrelationinterpretation) {
                         //only need the name of the reference type (remove everything with and after "reference")
                         val type = relationInterpretation.interpretationOf.name.split(" ").get(0);
-                        for(edge : relationInterpretation.relationlinks.filter(BinaryElementRelationLink)){
-                                statistic.addEdge(edge.param1, edge.param2, type);
-                        }                       
+                        // TODO: Here is to only consider one part of opposite edges
+                        //if(!type.equals('target') && !type.equals('source') /*&& !type.equals('incomingTransitions')*/){
+                                for(edge : relationInterpretation.relationlinks.filter(BinaryElementRelationLink)){
+                                        statistic.addEdge(edge.param1, edge.param2, type);
+                                }       
+                        //}
                 }       
                 
                 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 @@
 package ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.io;
 
 import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.graph.EMFGraph
+import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.EdgeTypeMetric
 import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.Metric
 import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.MultiplexParticipationCoefficientMetric
 import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.NodeActivityMetric
+import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.NodeTypeMetric
 import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.OutDegreeMetric
+import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.TypedOutDegree
 import java.io.File
 import java.io.FileNotFoundException
 import java.util.ArrayList
@@ -17,19 +20,11 @@ import org.eclipse.emf.ecore.resource.Resource
 import org.eclipse.emf.ecore.resource.ResourceSet
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl
 import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl
-import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.NodeTypeMetric
-import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.EdgeTypeMetric
-import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.TypedOutDegree
-import hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph.yakindumm.YakindummPackage
 
 class GraphReader{
         val ResourceSet resSet = new ResourceSetImpl();
         val referenceTypes = new ArrayList<EReference>();
         
-        def static void main(String[] args){
-                var g = new GraphReader(YakindummPackage.eINSTANCE);
-        }
-        
         new(EPackage metaModel) {
                 Resource.Factory.Registry.INSTANCE.extensionToFactoryMap.put("*",new XMIResourceFactoryImpl)
                 
@@ -73,6 +68,25 @@ class GraphReader{
                 return graphs;
         }
         
+        def EMFGraph readModel(String path, String filename){
+                val metrics = new ArrayList<Metric>();
+                metrics.add(new OutDegreeMetric());
+                metrics.add(new NodeActivityMetric());
+                metrics.add(new MultiplexParticipationCoefficientMetric());
+                metrics.add(new TypedOutDegree());              
+                metrics.add(new NodeTypeMetric());
+                metrics.add(new EdgeTypeMetric());
+                
+                val file = new File(filename);
+                val roots = readModel(EObject, path,  file.name);                       
+                //add a list of metrics
+                val g = new EMFGraph();
+                for(root : roots){
+                        g.init(root, metrics, filename.replaceFirst(".xmi", ""), referenceTypes);
+                }
+                return g
+        }
+        
         def <RootType extends EObject> List<RootType> readModel(Class<RootType> type, String path, String name) {
                 try {
                         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 {
                 var map = new HashMap<String, Double>();
                 var nodes = g.allNodes;
                 var single = 1.0 / nodes.size();
-                for(node : nodes){
-                        var classes = new ArrayList(node.eClass.ESuperTypes);
-                        classes.add(node.eClass);
-                        
-                        for(cl : classes){
-                                var value = map.getOrDefault(cl.name, 0.0);
-                                map.put(cl.name, value + single);
+                var nodeToType = g.nodeToTypesMap;
+                for(node : nodes){                      
+                        for(cl : nodeToType.get(node)){
+                                var value = map.getOrDefault(cl, 0.0);
+                                map.put(cl, value + single);
                         }       
                 }
                 
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
 
 def main():
     # read models
-    # human = GraphCollection('../input/humanOutput/', 500, 'Human')
+    human = GraphCollection('../input/humanOutput/', 500, 'Human')
     # viatra30 = GraphCollection('../input/viatraOutput30/', 500,'Viatra (30 nodes)')
     # viatra60 = GraphCollection('../input/viatraOutput60/', 500, 'Viatra (60 nodes)')
     viatra100 = GraphCollection('../input/viatraOutput100/', 500, 'Viatra (100 nodes)')
+    viatra100R = GraphCollection('../input/realisticViatraOutput_container/', 500, 'Realistic Viatra containers (100 nodes)')
+    viatra100C = GraphCollection('../input/viatraOutput100C/', 500, 'Realistic Viatra consistent (100 nodes)')
+    viatra100EE = GraphCollection('../input/realisticViatra_excludeExit/', 500, 'Realistic Viatra no Exit (100 nodes)')
     # random = GraphCollection('../input/randomOutput/', 500, 'Random')
     # alloy = GraphCollection('../input/alloyOutput/', 500, 'Alloy (30 nodes)')
-    realistic_viatra = GraphCollection('../input/viatra_output_consistent_100/', 50, 'Realistic Viatra With Some Constraints (100 nodes)')
-    human100 = GraphCollection('../input/human_output_100/', 304, 'Human')
-    models_to_compare = [human100, realistic_viatra, viatra100]
+    # realistic_viatra = GraphCollection('../input/viatra_output_consistent_100/', 50, 'Realistic Viatra With Some Constraints (100 nodes)')
+    # human100 = GraphCollection('../input/human_output_100/', 304, 'Human')
+    models_to_compare = [human, viatra100EE,viatra100C]
     
     # define output folder
     outputFolder = '../output/'
@@ -40,7 +43,7 @@ def calculateKSMatrix(dists):
     for i in range(len(dist)):
         matrix[i,i] = 0
         for j in range(i+1, len(dist)):
-            value = metrics.euclidean_distance(dist[i], dist[j])
+            value, p = metrics.ks_distance(dist[i], dist[j])
             matrix[i, j] = value
             matrix[j, i] = value
     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:
         self.nas = []
         self.mpcs = []
         self.name = name
-        self.size = number
         models = reader.readmultiplefiles(path, number, shouldShuffle)
+        print(len(models))
+        self.size = len(models)
         for i in range(len(models)):
             contents, out_d, na, mpc = reader.getmetrics(models[i])
             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):
                 try:
                     contents[arr[0]] = list(map(int, arr[1:]))
                 except:
-                    print(arr[0], ' is not integer')
+                    message = arr[0], ' is not integer'
+                    #print(message)
     f.close()
     return contents