From 44cdd1a31dff6efaad294c1ac8b7918d0be4cd8f Mon Sep 17 00:00:00 2001 From: 20001LastOrder Date: Thu, 30 May 2019 15:22:18 -0400 Subject: measurement for controlled random generation --- .../dslreasoner/realistic/metrics/calculator/app/Main.xtend | 10 +++++----- .../realistic/metrics/calculator/graph/EMFGraph.xtend | 7 ++++++- 2 files changed, 11 insertions(+), 6 deletions(-) (limited to 'Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill') 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 metrics, String name, List 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(); + stateInfo.add(STATE_ID_HEADER); + stateInfo.add(this.name); + + output.add(metaInfo); output.add(edgeInfo); output.add(nodeInfo); + output.add(stateInfo); } def EList getNeighbours(EObject o, EReference r){ -- cgit v1.2.3-54-g00ecf