measurement for controlled random generation

3 files changed, 13 insertions, 7 deletions

diff --git a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/.gitignore b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/.gitignore
index b75ad9db..317e68e2 100644
--- a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/.gitignore
+++ b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/.gitignore
@@ -2,4 +2,5 @@
 bin/
 testInput/
 testOutput/
-xtend-gen/
\ No newline at end of file
+xtend-gen/
+*.csv
\ 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/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 2e793b23..15df0dde 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
@@ -25,17 +25,17 @@ class Main {
                 //init model
                 YakindummPackageImpl.eINSTANCE.eClass;
 //              Yakindumm2PackageImpl.eINSTANCE.eClass;
-                val infos = initData();                                                                 
+                //val infos = initData();                                                                       
                                                                                 
                 println("Start Reading Models...");
                 var reader = new GraphReader(YakindummPackageImpl.eINSTANCE);
-                for(info : infos){
-                        calculateAllModels(info.inputFolder, info.outputFolder,info.numRuns, reader);
-                }
+//              for(info : infos){
+//                      calculateAllModels(info.inputFolder, info.outputFolder,info.numRuns, reader);
+//              }
                 
                 //human input has different package declaration
 //              reader = new GraphReader(Yakindumm2PackageImpl.eINSTANCE);
-                val human = new RWInformation("inputs/humanInput/", "../plot/statistics/humanOutput/", 1);
+                val human = new RWInformation("inputs/Random/", "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/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 b20ffa01..5c161f4b 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
@@ -8,7 +8,6 @@ import org.eclipse.emf.ecore.EObject
 import org.eclipse.emf.ecore.EReference
 
 class EMFGraph extends Graph{   
-        
         def void init (EObject root, List<Metric> metrics, String name, List<String> referenceTypes){
                 val otherContents = root.eAllContents.toList();
                 otherContents.add(root);
@@ -67,9 +66,15 @@ class EMFGraph extends Graph{
                 nodeInfo.add(NUM_NODE_HEADER);
                 nodeInfo.add(this.statistic.allNodes.size()+"");
                 
+                val stateInfo = new ArrayList<String>();
+                stateInfo.add(STATE_ID_HEADER);
+                stateInfo.add(this.name);
+                
+                
                 output.add(metaInfo);
                 output.add(edgeInfo);
                 output.add(nodeInfo);
+                output.add(stateInfo);
         }
         
         def EList<EObject> getNeighbours(EObject o, EReference r){