From 59ef2d4560cde4954c5e1f850958c0ca59c742df Mon Sep 17 00:00:00 2001 From: 20001LastOrder Date: Tue, 16 Jul 2019 10:54:25 -0400 Subject: consider node types during generation --- .../ca/mcgill/ecse/socialnetwork/runner/Main.java | 39 +++--- .../SocialNetwork_plugin/yakinduum/info.csv | 150 --------------------- .../realistic/metrics/calculator/app/Main.xtend | 2 +- .../app/PartialInterpretationMetricDistance.xtend | 21 +-- .../metrics/calculator/graph/EMFGraph.xtend | 23 +++- .../metrics/calculator/graph/GraphStatistic.xtend | 6 +- .../graph/PartialInterpretationGraph.xtend | 15 ++- .../metrics/calculator/io/GraphReader.xtend | 30 +++-- .../calculator/metrics/NodeTypeMetric.xtend | 12 +- .../MPC.png | Bin 93318 -> 0 bytes .../Node Activity.png | Bin 72012 -> 0 bytes .../Out Degree.png | Bin 111830 -> 0 bytes .../Human-Viatra (30 nodes)-/MPC.png | Bin 113112 -> 0 bytes .../Human-Viatra (30 nodes)-/Node Activity.png | Bin 98628 -> 0 bytes .../Human-Viatra (30 nodes)-/Out Degree.png | Bin 110816 -> 0 bytes .../Human-Viatra (30 nodes)-Random-/MPC.png | Bin 136233 -> 0 bytes .../Node Activity.png | Bin 124315 -> 0 bytes .../Human-Viatra (30 nodes)-Random-/Out Degree.png | Bin 136745 -> 0 bytes .../MPC.png | Bin 0 -> 97291 bytes .../Node Activity.png | Bin 0 -> 87259 bytes .../Out Degree.png | Bin 0 -> 118965 bytes .../output/Human-Viatra (100 nodes)-/MPC.png | Bin 0 -> 79437 bytes .../Human-Viatra (100 nodes)-/Node Activity.png | Bin 0 -> 63687 bytes .../Human-Viatra (100 nodes)-/Out Degree.png | Bin 0 -> 63520 bytes .../MPC.png | Bin 0 -> 109723 bytes .../Node Activity.png | Bin 0 -> 80099 bytes .../Out Degree.png | Bin 0 -> 91912 bytes .../MPC.png | Bin 0 -> 112332 bytes .../Node Activity.png | Bin 0 -> 81639 bytes .../Out Degree.png | Bin 0 -> 92200 bytes .../MPC.png | Bin 0 -> 116546 bytes .../Node Activity.png | Bin 0 -> 93653 bytes .../Out Degree.png | Bin 0 -> 129648 bytes .../MPC.png | Bin 0 -> 118510 bytes .../Node Activity.png | Bin 0 -> 80223 bytes .../Out Degree.png | Bin 0 -> 120029 bytes .../MPC.png | Bin 0 -> 93499 bytes .../Node Activity.png | Bin 0 -> 79559 bytes .../Out Degree.png | Bin 0 -> 95080 bytes .../output/Human-Viatra (30 nodes)-/MPC.png | Bin 0 -> 103764 bytes .../Human-Viatra (30 nodes)-/Node Activity.png | Bin 0 -> 55991 bytes .../output/Human-Viatra (30 nodes)-/Out Degree.png | Bin 0 -> 140069 bytes .../MPC.png | Bin 116110 -> 0 bytes .../Node Activity.png | Bin 74006 -> 0 bytes .../Out Degree.png | Bin 117047 -> 0 bytes .../JS_Distance/Human-Viatra (30 nodes)-/MPC.png | Bin 135531 -> 0 bytes .../Human-Viatra (30 nodes)-/Node Activity.png | Bin 95290 -> 0 bytes .../Human-Viatra (30 nodes)-/Out Degree.png | Bin 134916 -> 0 bytes .../Human-Viatra (30 nodes)-Random-/MPC.png | Bin 184969 -> 0 bytes .../Node Activity.png | Bin 139857 -> 0 bytes .../Human-Viatra (30 nodes)-Random-/Out Degree.png | Bin 186513 -> 0 bytes .../MPC.png | Bin 95465 -> 0 bytes .../Node Activity.png | Bin 93444 -> 0 bytes .../Out Degree.png | Bin 97919 -> 0 bytes .../KS_Distance/Human-Viatra (30 nodes)-/MPC.png | Bin 92255 -> 0 bytes .../Human-Viatra (30 nodes)-/Node Activity.png | Bin 87694 -> 0 bytes .../Human-Viatra (30 nodes)-/Out Degree.png | Bin 86352 -> 0 bytes .../MPC.png | Bin 98310 -> 0 bytes .../Node Activity.png | Bin 85826 -> 0 bytes .../Out Degree.png | Bin 86139 -> 0 bytes .../Human-Viatra (30 nodes)-Random-/MPC.png | Bin 127107 -> 0 bytes .../Node Activity.png | Bin 118735 -> 0 bytes .../Human-Viatra (30 nodes)-Random-/Out Degree.png | Bin 116864 -> 0 bytes .../MPC.png | Bin 85397 -> 0 bytes .../Node Activity.png | Bin 87774 -> 0 bytes .../Out Degree.png | Bin 95122 -> 0 bytes .../MPC.png | Bin 171018 -> 0 bytes .../Node Activity.png | Bin 114184 -> 0 bytes .../Out Degree.png | Bin 139638 -> 0 bytes .../Human-Viatra consistent (100 nodes)-/MPC.png | Bin 69041 -> 0 bytes .../Node Activity.png | Bin 50629 -> 0 bytes .../Out Degree.png | Bin 60762 -> 0 bytes .../KS_Distance/real vs viatra vs alloy/MPC.png | Bin 97403 -> 0 bytes .../real vs viatra vs alloy/Node Activity.png | Bin 88084 -> 0 bytes .../real vs viatra vs alloy/Out Degree.png | Bin 87391 -> 0 bytes .../MPC.png | Bin 0 -> 93318 bytes .../Node Activity.png | Bin 0 -> 72012 bytes .../Out Degree.png | Bin 0 -> 111830 bytes .../Human-Viatra (30 nodes)-/MPC.png | Bin 0 -> 113112 bytes .../Human-Viatra (30 nodes)-/Node Activity.png | Bin 0 -> 98628 bytes .../Human-Viatra (30 nodes)-/Out Degree.png | Bin 0 -> 110816 bytes .../Human-Viatra (30 nodes)-Random-/MPC.png | Bin 0 -> 136233 bytes .../Node Activity.png | Bin 0 -> 124315 bytes .../Human-Viatra (30 nodes)-Random-/Out Degree.png | Bin 0 -> 136745 bytes .../MPC.png | Bin 0 -> 116110 bytes .../Node Activity.png | Bin 0 -> 74006 bytes .../Out Degree.png | Bin 0 -> 117047 bytes .../JS_Distance/Human-Viatra (30 nodes)-/MPC.png | Bin 0 -> 135531 bytes .../Human-Viatra (30 nodes)-/Node Activity.png | Bin 0 -> 95290 bytes .../Human-Viatra (30 nodes)-/Out Degree.png | Bin 0 -> 134916 bytes .../Human-Viatra (30 nodes)-Random-/MPC.png | Bin 0 -> 184969 bytes .../Node Activity.png | Bin 0 -> 139857 bytes .../Human-Viatra (30 nodes)-Random-/Out Degree.png | Bin 0 -> 186513 bytes .../MPC.png | Bin 0 -> 95465 bytes .../Node Activity.png | Bin 0 -> 93444 bytes .../Out Degree.png | Bin 0 -> 97919 bytes .../KS_Distance/Human-Viatra (30 nodes)-/MPC.png | Bin 0 -> 92255 bytes .../Human-Viatra (30 nodes)-/Node Activity.png | Bin 0 -> 87694 bytes .../Human-Viatra (30 nodes)-/Out Degree.png | Bin 0 -> 86352 bytes .../MPC.png | Bin 0 -> 98310 bytes .../Node Activity.png | Bin 0 -> 85826 bytes .../Out Degree.png | Bin 0 -> 86139 bytes .../Human-Viatra (30 nodes)-Random-/MPC.png | Bin 0 -> 127107 bytes .../Node Activity.png | Bin 0 -> 118735 bytes .../Human-Viatra (30 nodes)-Random-/Out Degree.png | Bin 0 -> 116864 bytes .../MPC.png | Bin 0 -> 85397 bytes .../Node Activity.png | Bin 0 -> 87774 bytes .../Out Degree.png | Bin 0 -> 95122 bytes .../MPC.png | Bin 0 -> 171018 bytes .../Node Activity.png | Bin 0 -> 114184 bytes .../Out Degree.png | Bin 0 -> 139638 bytes .../Human-Viatra consistent (100 nodes)-/MPC.png | Bin 0 -> 69041 bytes .../Node Activity.png | Bin 0 -> 50629 bytes .../Out Degree.png | Bin 0 -> 60762 bytes .../KS_Distance/real vs viatra vs alloy/MPC.png | Bin 0 -> 97403 bytes .../real vs viatra vs alloy/Node Activity.png | Bin 0 -> 88084 bytes .../real vs viatra vs alloy/Out Degree.png | Bin 0 -> 87391 bytes .../model comparison/src/plot_ks_stats.py | 13 +- .../metrics_plot/utils/GraphType.py | 3 +- .../metrics_plot/utils/readCSV.py | 3 +- 120 files changed, 109 insertions(+), 208 deletions(-) delete mode 100644 Metrics/Metrics-Calculation/SocialNetwork_plugin/yakinduum/info.csv delete mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/MPC.png delete mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/Node Activity.png delete mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/Out Degree.png delete mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Viatra (30 nodes)-/MPC.png delete mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Viatra (30 nodes)-/Node Activity.png delete mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Viatra (30 nodes)-/Out Degree.png delete mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Viatra (30 nodes)-Random-/MPC.png delete mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Viatra (30 nodes)-Random-/Node Activity.png delete mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Viatra (30 nodes)-Random-/Out Degree.png create mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Realistic Viatra no Exit (100 nodes)-Realistic Viatra consistent (100 nodes)-/MPC.png create mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Realistic Viatra no Exit (100 nodes)-Realistic Viatra consistent (100 nodes)-/Node Activity.png create mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Realistic Viatra no Exit (100 nodes)-Realistic Viatra consistent (100 nodes)-/Out Degree.png create mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-/MPC.png create mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-/Node Activity.png create mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-/Out Degree.png create mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Realistic Viatra (100 nodes)-/MPC.png create mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Realistic Viatra (100 nodes)-/Node Activity.png create mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Realistic Viatra (100 nodes)-/Out Degree.png create mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Realistic Viatra V2 (100 nodes)-/MPC.png create mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Realistic Viatra V2 (100 nodes)-/Node Activity.png create mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Realistic Viatra V2 (100 nodes)-/Out Degree.png create mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Realistic Viatra containers (100 nodes)-Realistic Viatra new (100 nodes)-/MPC.png create mode 100644 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 create mode 100644 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 create mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Realistic Viatra new (100 nodes)-/MPC.png create mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Realistic Viatra new (100 nodes)-/Node Activity.png create mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Realistic Viatra new (100 nodes)-/Out Degree.png create mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Viatra Consistent (100 nodes)-/MPC.png create mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Viatra Consistent (100 nodes)-/Node Activity.png create mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Viatra Consistent (100 nodes)-/Out Degree.png create mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (30 nodes)-/MPC.png create mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (30 nodes)-/Node Activity.png create mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (30 nodes)-/Out Degree.png delete mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/MPC.png delete mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/Node Activity.png delete mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/Out Degree.png delete mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Viatra (30 nodes)-/MPC.png delete mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Viatra (30 nodes)-/Node Activity.png delete mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Viatra (30 nodes)-/Out Degree.png delete mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Viatra (30 nodes)-Random-/MPC.png delete mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Viatra (30 nodes)-Random-/Node Activity.png delete mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Viatra (30 nodes)-Random-/Out Degree.png delete mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/MPC.png delete mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/Node Activity.png delete mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/Out Degree.png delete mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-/MPC.png delete mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-/Node Activity.png delete mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-/Out Degree.png delete mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Alloy (30 nodes)-/MPC.png delete mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Alloy (30 nodes)-/Node Activity.png delete mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Alloy (30 nodes)-/Out Degree.png delete mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Random-/MPC.png delete mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Random-/Node Activity.png delete mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Random-/Out Degree.png delete mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Random-Viatra (100 nodes)-/MPC.png delete mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Random-Viatra (100 nodes)-/Node Activity.png delete mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Random-Viatra (100 nodes)-/Out Degree.png delete mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Viatra (60 nodes)-Viatra (100 nodes)-/MPC.png delete mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Viatra (60 nodes)-Viatra (100 nodes)-/Node Activity.png delete mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Viatra (60 nodes)-Viatra (100 nodes)-/Out Degree.png delete mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra consistent (100 nodes)-/MPC.png delete mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra consistent (100 nodes)-/Node Activity.png delete mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra consistent (100 nodes)-/Out Degree.png delete mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/real vs viatra vs alloy/MPC.png delete mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/real vs viatra vs alloy/Node Activity.png delete mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/real vs viatra vs alloy/Out Degree.png create mode 100644 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 create mode 100644 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 create mode 100644 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 create mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/Euclidean_Distance/Human-Viatra (30 nodes)-/MPC.png create mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/Euclidean_Distance/Human-Viatra (30 nodes)-/Node Activity.png create mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/Euclidean_Distance/Human-Viatra (30 nodes)-/Out Degree.png create mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/Euclidean_Distance/Human-Viatra (30 nodes)-Random-/MPC.png create mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/Euclidean_Distance/Human-Viatra (30 nodes)-Random-/Node Activity.png create mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/Euclidean_Distance/Human-Viatra (30 nodes)-Random-/Out Degree.png create mode 100644 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 create mode 100644 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 create mode 100644 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 create mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/JS_Distance/Human-Viatra (30 nodes)-/MPC.png create mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/JS_Distance/Human-Viatra (30 nodes)-/Node Activity.png create mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/JS_Distance/Human-Viatra (30 nodes)-/Out Degree.png create mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/JS_Distance/Human-Viatra (30 nodes)-Random-/MPC.png create mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/JS_Distance/Human-Viatra (30 nodes)-Random-/Node Activity.png create mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/JS_Distance/Human-Viatra (30 nodes)-Random-/Out Degree.png create mode 100644 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 create mode 100644 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 create mode 100644 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 create mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra (30 nodes)-/MPC.png create mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra (30 nodes)-/Node Activity.png create mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra (30 nodes)-/Out Degree.png create mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra (30 nodes)-Alloy (30 nodes)-/MPC.png create mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra (30 nodes)-Alloy (30 nodes)-/Node Activity.png create mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra (30 nodes)-Alloy (30 nodes)-/Out Degree.png create mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra (30 nodes)-Random-/MPC.png create mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra (30 nodes)-Random-/Node Activity.png create mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra (30 nodes)-Random-/Out Degree.png create mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra (30 nodes)-Random-Viatra (100 nodes)-/MPC.png create mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra (30 nodes)-Random-Viatra (100 nodes)-/Node Activity.png create mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra (30 nodes)-Random-Viatra (100 nodes)-/Out Degree.png create mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra (30 nodes)-Viatra (60 nodes)-Viatra (100 nodes)-/MPC.png create mode 100644 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 create mode 100644 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 create mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra consistent (100 nodes)-/MPC.png create mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra consistent (100 nodes)-/Node Activity.png create mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra consistent (100 nodes)-/Out Degree.png create mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/real vs viatra vs alloy/MPC.png create mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/real vs viatra vs alloy/Node Activity.png create mode 100644 Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/real vs viatra vs alloy/Out Degree.png (limited to 'Metrics') 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>(); 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> output = new ArrayList>(); ArrayList infoOutput = new ArrayList(); 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 map = ViolationCheck.violationMaps(model.yakinduum); @@ -112,8 +109,8 @@ public class Main { ArrayList counts = new ArrayList(); ArrayList 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 map = ViolationCheck.violationMaps(model.yakinduum); if(run == 1) { @@ -147,7 +144,7 @@ public class Main { //read model and metric ArrayList output = new ArrayList(); 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 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>; @@ -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(); - 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(); + 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 List readModel(Class 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(); 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/Euclidean_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/MPC.png b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/MPC.png deleted file mode 100644 index 4f8e97e2..00000000 Binary files a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/MPC.png and /dev/null 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/Euclidean_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/Node Activity.png deleted file mode 100644 index 7c2b5752..00000000 Binary files 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 and /dev/null 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/Euclidean_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/Out Degree.png deleted file mode 100644 index 3cf659b2..00000000 Binary files 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 and /dev/null 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/Euclidean_Distance/Human-Viatra (30 nodes)-/MPC.png deleted file mode 100644 index 50b882da..00000000 Binary files a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Viatra (30 nodes)-/MPC.png and /dev/null 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/Euclidean_Distance/Human-Viatra (30 nodes)-/Node Activity.png deleted file mode 100644 index 4e9a68d5..00000000 Binary files a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Viatra (30 nodes)-/Node Activity.png and /dev/null 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/Euclidean_Distance/Human-Viatra (30 nodes)-/Out Degree.png deleted file mode 100644 index bfa4b537..00000000 Binary files a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Viatra (30 nodes)-/Out Degree.png and /dev/null 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/Euclidean_Distance/Human-Viatra (30 nodes)-Random-/MPC.png deleted file mode 100644 index 33176821..00000000 Binary files a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Viatra (30 nodes)-Random-/MPC.png and /dev/null 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/Euclidean_Distance/Human-Viatra (30 nodes)-Random-/Node Activity.png deleted file mode 100644 index 53c46e6f..00000000 Binary files a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Viatra (30 nodes)-Random-/Node Activity.png and /dev/null 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/Euclidean_Distance/Human-Viatra (30 nodes)-Random-/Out Degree.png deleted file mode 100644 index abf45ff1..00000000 Binary files a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Euclidean_Distance/Human-Viatra (30 nodes)-Random-/Out Degree.png and /dev/null differ 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 Binary files /dev/null and b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Realistic Viatra no Exit (100 nodes)-Realistic Viatra consistent (100 nodes)-/MPC.png 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 Binary files /dev/null and b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Realistic Viatra no Exit (100 nodes)-Realistic Viatra consistent (100 nodes)-/Node Activity.png 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 Binary files /dev/null and b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Realistic Viatra no Exit (100 nodes)-Realistic Viatra consistent (100 nodes)-/Out Degree.png 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 Binary files /dev/null and b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-/MPC.png 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 Binary files /dev/null and b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-/Node Activity.png 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 Binary files /dev/null and b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-/Out Degree.png 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 Binary files /dev/null and b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Realistic Viatra (100 nodes)-/MPC.png 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 Binary files /dev/null and b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Realistic Viatra (100 nodes)-/Node Activity.png 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 Binary files /dev/null and b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Realistic Viatra (100 nodes)-/Out Degree.png 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 Binary files /dev/null and b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Realistic Viatra V2 (100 nodes)-/MPC.png 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 Binary files /dev/null and b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Realistic Viatra V2 (100 nodes)-/Node Activity.png 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 Binary files /dev/null and b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Realistic Viatra V2 (100 nodes)-/Out Degree.png 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 Binary files /dev/null and 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 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 Binary files /dev/null and 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 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 Binary files /dev/null and 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 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 Binary files /dev/null and b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Realistic Viatra new (100 nodes)-/MPC.png 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 Binary files /dev/null and b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Realistic Viatra new (100 nodes)-/Node Activity.png 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 Binary files /dev/null and b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Realistic Viatra new (100 nodes)-/Out Degree.png 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 Binary files /dev/null and b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Viatra Consistent (100 nodes)-/MPC.png 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 Binary files /dev/null and b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Viatra Consistent (100 nodes)-/Node Activity.png 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 Binary files /dev/null and b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (100 nodes)-Viatra Consistent (100 nodes)-/Out Degree.png 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 Binary files /dev/null and b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (30 nodes)-/MPC.png 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 Binary files /dev/null and b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (30 nodes)-/Node Activity.png 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 Binary files /dev/null and b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/Human-Viatra (30 nodes)-/Out Degree.png 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/JS_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/MPC.png deleted file mode 100644 index 07c97401..00000000 Binary files a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/MPC.png and /dev/null 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/JS_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/Node Activity.png deleted file mode 100644 index f2fb5229..00000000 Binary files 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 and /dev/null 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/JS_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/Out Degree.png deleted file mode 100644 index d2677e99..00000000 Binary files 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 and /dev/null 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/JS_Distance/Human-Viatra (30 nodes)-/MPC.png deleted file mode 100644 index a375c676..00000000 Binary files a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Viatra (30 nodes)-/MPC.png and /dev/null 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/JS_Distance/Human-Viatra (30 nodes)-/Node Activity.png deleted file mode 100644 index d69cd298..00000000 Binary files a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Viatra (30 nodes)-/Node Activity.png and /dev/null 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/JS_Distance/Human-Viatra (30 nodes)-/Out Degree.png deleted file mode 100644 index 0584ac99..00000000 Binary files a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Viatra (30 nodes)-/Out Degree.png and /dev/null 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/JS_Distance/Human-Viatra (30 nodes)-Random-/MPC.png deleted file mode 100644 index 016cc2a3..00000000 Binary files a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Viatra (30 nodes)-Random-/MPC.png and /dev/null 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/JS_Distance/Human-Viatra (30 nodes)-Random-/Node Activity.png deleted file mode 100644 index 55d32444..00000000 Binary files a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Viatra (30 nodes)-Random-/Node Activity.png and /dev/null 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/JS_Distance/Human-Viatra (30 nodes)-Random-/Out Degree.png deleted file mode 100644 index 99cbbae4..00000000 Binary files a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/JS_Distance/Human-Viatra (30 nodes)-Random-/Out Degree.png and /dev/null 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/KS_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/MPC.png deleted file mode 100644 index b8480ae0..00000000 Binary files a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/MPC.png and /dev/null 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/KS_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/Node Activity.png deleted file mode 100644 index 82268167..00000000 Binary files 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 and /dev/null 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/KS_Distance/Human-Realistic Viatra With Some Constraints (100 nodes)-Viatra (100 nodes)-/Out Degree.png deleted file mode 100644 index 41bcd510..00000000 Binary files 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 and /dev/null 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/KS_Distance/Human-Viatra (30 nodes)-/MPC.png deleted file mode 100644 index b19bb958..00000000 Binary files a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-/MPC.png and /dev/null 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/KS_Distance/Human-Viatra (30 nodes)-/Node Activity.png deleted file mode 100644 index cccabc4e..00000000 Binary files a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-/Node Activity.png and /dev/null 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/KS_Distance/Human-Viatra (30 nodes)-/Out Degree.png deleted file mode 100644 index 947ebdd2..00000000 Binary files a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-/Out Degree.png and /dev/null 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/KS_Distance/Human-Viatra (30 nodes)-Alloy (30 nodes)-/MPC.png deleted file mode 100644 index 0ff4ee89..00000000 Binary files a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Alloy (30 nodes)-/MPC.png and /dev/null 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/KS_Distance/Human-Viatra (30 nodes)-Alloy (30 nodes)-/Node Activity.png deleted file mode 100644 index 1f9e2e18..00000000 Binary files a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Alloy (30 nodes)-/Node Activity.png and /dev/null 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/KS_Distance/Human-Viatra (30 nodes)-Alloy (30 nodes)-/Out Degree.png deleted file mode 100644 index 2c63cc3a..00000000 Binary files a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Alloy (30 nodes)-/Out Degree.png and /dev/null 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/KS_Distance/Human-Viatra (30 nodes)-Random-/MPC.png deleted file mode 100644 index 8d76fed9..00000000 Binary files a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Random-/MPC.png and /dev/null 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/KS_Distance/Human-Viatra (30 nodes)-Random-/Node Activity.png deleted file mode 100644 index daa7929a..00000000 Binary files a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Random-/Node Activity.png and /dev/null 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/KS_Distance/Human-Viatra (30 nodes)-Random-/Out Degree.png deleted file mode 100644 index e56b1b6e..00000000 Binary files a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Random-/Out Degree.png and /dev/null 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/KS_Distance/Human-Viatra (30 nodes)-Random-Viatra (100 nodes)-/MPC.png deleted file mode 100644 index 8705cee2..00000000 Binary files a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Random-Viatra (100 nodes)-/MPC.png and /dev/null 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/KS_Distance/Human-Viatra (30 nodes)-Random-Viatra (100 nodes)-/Node Activity.png deleted file mode 100644 index bdab3741..00000000 Binary files a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Random-Viatra (100 nodes)-/Node Activity.png and /dev/null 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/KS_Distance/Human-Viatra (30 nodes)-Random-Viatra (100 nodes)-/Out Degree.png deleted file mode 100644 index e4269f6e..00000000 Binary files a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Random-Viatra (100 nodes)-/Out Degree.png and /dev/null 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/KS_Distance/Human-Viatra (30 nodes)-Viatra (60 nodes)-Viatra (100 nodes)-/MPC.png deleted file mode 100644 index e4b6b527..00000000 Binary files a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Viatra (60 nodes)-Viatra (100 nodes)-/MPC.png and /dev/null 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/KS_Distance/Human-Viatra (30 nodes)-Viatra (60 nodes)-Viatra (100 nodes)-/Node Activity.png deleted file mode 100644 index e067ad66..00000000 Binary files a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Viatra (60 nodes)-Viatra (100 nodes)-/Node Activity.png and /dev/null 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/KS_Distance/Human-Viatra (30 nodes)-Viatra (60 nodes)-Viatra (100 nodes)-/Out Degree.png deleted file mode 100644 index 9b89e4f9..00000000 Binary files a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra (30 nodes)-Viatra (60 nodes)-Viatra (100 nodes)-/Out Degree.png and /dev/null 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/KS_Distance/Human-Viatra consistent (100 nodes)-/MPC.png deleted file mode 100644 index 820df5c7..00000000 Binary files a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra consistent (100 nodes)-/MPC.png and /dev/null 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/KS_Distance/Human-Viatra consistent (100 nodes)-/Node Activity.png deleted file mode 100644 index b6aa957a..00000000 Binary files a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra consistent (100 nodes)-/Node Activity.png and /dev/null 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/KS_Distance/Human-Viatra consistent (100 nodes)-/Out Degree.png deleted file mode 100644 index 161041d9..00000000 Binary files a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/Human-Viatra consistent (100 nodes)-/Out Degree.png and /dev/null 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/KS_Distance/real vs viatra vs alloy/MPC.png deleted file mode 100644 index 4f189578..00000000 Binary files a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/real vs viatra vs alloy/MPC.png and /dev/null 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/KS_Distance/real vs viatra vs alloy/Node Activity.png deleted file mode 100644 index add3c0f8..00000000 Binary files a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/real vs viatra vs alloy/Node Activity.png and /dev/null 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/KS_Distance/real vs viatra vs alloy/Out Degree.png deleted file mode 100644 index f4717a1a..00000000 Binary files a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/KS_Distance/real vs viatra vs alloy/Out Degree.png and /dev/null differ diff --git a/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 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 new file mode 100644 index 00000000..4f8e97e2 Binary files /dev/null and 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 differ diff --git a/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 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 new file mode 100644 index 00000000..7c2b5752 Binary files /dev/null and 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 differ diff --git a/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 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 new file mode 100644 index 00000000..3cf659b2 Binary files /dev/null and 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 differ diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/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 new file mode 100644 index 00000000..50b882da Binary files /dev/null and b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/Euclidean_Distance/Human-Viatra (30 nodes)-/MPC.png differ diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/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 new file mode 100644 index 00000000..4e9a68d5 Binary files /dev/null and b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/Euclidean_Distance/Human-Viatra (30 nodes)-/Node Activity.png differ diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/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 new file mode 100644 index 00000000..bfa4b537 Binary files /dev/null and b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/Euclidean_Distance/Human-Viatra (30 nodes)-/Out Degree.png differ diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/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 new file mode 100644 index 00000000..33176821 Binary files /dev/null and b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/Euclidean_Distance/Human-Viatra (30 nodes)-Random-/MPC.png differ diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/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 new file mode 100644 index 00000000..53c46e6f Binary files /dev/null and b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/Euclidean_Distance/Human-Viatra (30 nodes)-Random-/Node Activity.png differ diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/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 new file mode 100644 index 00000000..abf45ff1 Binary files /dev/null and b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/Euclidean_Distance/Human-Viatra (30 nodes)-Random-/Out Degree.png differ diff --git a/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 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 new file mode 100644 index 00000000..07c97401 Binary files /dev/null and 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 differ diff --git a/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 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 new file mode 100644 index 00000000..f2fb5229 Binary files /dev/null and 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 differ diff --git a/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 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 new file mode 100644 index 00000000..d2677e99 Binary files /dev/null and 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 differ diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/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 new file mode 100644 index 00000000..a375c676 Binary files /dev/null and b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/JS_Distance/Human-Viatra (30 nodes)-/MPC.png differ diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/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 new file mode 100644 index 00000000..d69cd298 Binary files /dev/null and b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/JS_Distance/Human-Viatra (30 nodes)-/Node Activity.png differ diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/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 new file mode 100644 index 00000000..0584ac99 Binary files /dev/null and b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/JS_Distance/Human-Viatra (30 nodes)-/Out Degree.png differ diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/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 new file mode 100644 index 00000000..016cc2a3 Binary files /dev/null and b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/JS_Distance/Human-Viatra (30 nodes)-Random-/MPC.png differ diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/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 new file mode 100644 index 00000000..55d32444 Binary files /dev/null and b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/JS_Distance/Human-Viatra (30 nodes)-Random-/Node Activity.png differ diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/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 new file mode 100644 index 00000000..99cbbae4 Binary files /dev/null and b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/JS_Distance/Human-Viatra (30 nodes)-Random-/Out Degree.png differ diff --git a/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 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 new file mode 100644 index 00000000..b8480ae0 Binary files /dev/null and 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 differ diff --git a/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 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 new file mode 100644 index 00000000..82268167 Binary files /dev/null and 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 differ diff --git a/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 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 new file mode 100644 index 00000000..41bcd510 Binary files /dev/null and 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 differ diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/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 new file mode 100644 index 00000000..b19bb958 Binary files /dev/null and b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra (30 nodes)-/MPC.png differ diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/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 new file mode 100644 index 00000000..cccabc4e Binary files /dev/null and b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra (30 nodes)-/Node Activity.png differ diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/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 new file mode 100644 index 00000000..947ebdd2 Binary files /dev/null and b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra (30 nodes)-/Out Degree.png differ diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/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 new file mode 100644 index 00000000..0ff4ee89 Binary files /dev/null and b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra (30 nodes)-Alloy (30 nodes)-/MPC.png differ diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/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 new file mode 100644 index 00000000..1f9e2e18 Binary files /dev/null and b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra (30 nodes)-Alloy (30 nodes)-/Node Activity.png differ diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/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 new file mode 100644 index 00000000..2c63cc3a Binary files /dev/null and b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra (30 nodes)-Alloy (30 nodes)-/Out Degree.png differ diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/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 new file mode 100644 index 00000000..8d76fed9 Binary files /dev/null and b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra (30 nodes)-Random-/MPC.png differ diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/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 new file mode 100644 index 00000000..daa7929a Binary files /dev/null and b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra (30 nodes)-Random-/Node Activity.png differ diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/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 new file mode 100644 index 00000000..e56b1b6e Binary files /dev/null and b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra (30 nodes)-Random-/Out Degree.png differ diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/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 new file mode 100644 index 00000000..8705cee2 Binary files /dev/null and b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra (30 nodes)-Random-Viatra (100 nodes)-/MPC.png differ diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/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 new file mode 100644 index 00000000..bdab3741 Binary files /dev/null and b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra (30 nodes)-Random-Viatra (100 nodes)-/Node Activity.png differ diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/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 new file mode 100644 index 00000000..e4269f6e Binary files /dev/null and b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra (30 nodes)-Random-Viatra (100 nodes)-/Out Degree.png differ diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/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 new file mode 100644 index 00000000..e4b6b527 Binary files /dev/null and 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 differ diff --git a/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 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 new file mode 100644 index 00000000..e067ad66 Binary files /dev/null and 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 differ diff --git a/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 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 new file mode 100644 index 00000000..9b89e4f9 Binary files /dev/null and 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 differ diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/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 new file mode 100644 index 00000000..820df5c7 Binary files /dev/null and b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra consistent (100 nodes)-/MPC.png differ diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/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 new file mode 100644 index 00000000..b6aa957a Binary files /dev/null and b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra consistent (100 nodes)-/Node Activity.png differ diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/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 new file mode 100644 index 00000000..161041d9 Binary files /dev/null and b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/Human-Viatra consistent (100 nodes)-/Out Degree.png differ diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/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 new file mode 100644 index 00000000..4f189578 Binary files /dev/null and b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/real vs viatra vs alloy/MPC.png differ diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/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 new file mode 100644 index 00000000..add3c0f8 Binary files /dev/null and b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/real vs viatra vs alloy/Node Activity.png differ diff --git a/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/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 new file mode 100644 index 00000000..f4717a1a Binary files /dev/null and b/Metrics/Metrics-Calculation/metrics_plot/model comparison/output/old measurements/KS_Distance/real vs viatra vs alloy/Out Degree.png 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 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 -- cgit v1.2.3-54-g00ecf