2 files changed, 35 insertions, 60 deletions

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 fc56e142..8f1feb9d 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
@@ -17,10 +17,18 @@ 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<String>();
+        val referenceTypes = new ArrayList<EReference>();
+        
+        def static void main(String[] args){
+                var g = new GraphReader(YakindummPackage.eINSTANCE);
+        }
         
         new(EPackage metaModel) {
                 Resource.Factory.Registry.INSTANCE.extensionToFactoryMap.put("*",new XMIResourceFactoryImpl)
@@ -28,7 +36,7 @@ class GraphReader{
                 //find all reference types in the meta model
                 metaModel.eAllContents.forEach[
                         if(it instanceof EReference){
-                                referenceTypes.add(it.name);
+                                referenceTypes.add(it);
                         }
                 ]
         }
@@ -45,7 +53,10 @@ class GraphReader{
                 metrics.add(new OutDegreeMetric());
                 metrics.add(new NodeActivityMetric());
                 metrics.add(new MultiplexParticipationCoefficientMetric());
-                                
+                metrics.add(new TypedOutDegree());              
+                metrics.add(new NodeTypeMetric());
+                metrics.add(new EdgeTypeMetric());
+                
                 //check all files in the directory with xmi
                 for(String name : dir.list.filter[it| it.endsWith(".xmi")]){
                         val file = new File(name);
@@ -71,7 +82,7 @@ class GraphReader{
                         }
                 } catch(Exception e) {
                         e.printStackTrace();
-                        throw new FileNotFoundException(getURI(path, name).toString + "reason: " + e.message)
+                        throw new Exception(getURI(path, name).toString());
                 }
         }
         
diff --git a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/io/RepMetricsReader.xtend b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/io/RepMetricsReader.xtend
index 867ddd1a..2ea12581 100644
--- a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/io/RepMetricsReader.xtend
+++ b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/io/RepMetricsReader.xtend
@@ -1,79 +1,43 @@
 package ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.io
 
 import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.app.Domain
-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.OutDegreeMetric
-import java.io.File
-import java.util.List
-import java.util.Scanner
 import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.MetricSampleGroup
+import hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph.yakindumm.impl.YakindummPackageImpl
 
 /**
  * Read the sample of the distribution of a metric provided the csv file of the metric
  */
 class RepMetricsReader {
         static def read(Domain d){
-                var domainRepPath = CsvDataName.REP_PATH + d.name + '/';
+                var reader = new GraphReader(YakindummPackageImpl.eINSTANCE);
+                
+                
+                var domainRepPath = DataName.REP_PATH + d.name + '/';
                 var rep = new MetricSampleGroup()
-                rep.mpcSamples = readFile(domainRepPath + CsvDataName.MPC_REP, MultiplexParticipationCoefficientMetric.valueName,
-                                                          MultiplexParticipationCoefficientMetric.countName).map[Double.parseDouble(it)];
-                rep.naSamples = readFile(domainRepPath+CsvDataName.NA_REP, NodeActivityMetric.valueName, NodeActivityMetric.countName
-                                                        ).map[Double.parseDouble(it)];
-                rep.outDegreeSamples = readFile(domainRepPath+CsvDataName.OUT_D_REP, OutDegreeMetric.valueName, OutDegreeMetric.countName
-                                                        ).map[Double.parseDouble(it)];
+                var out_d = readMetrics(reader, domainRepPath + DataName.OUT_D_REP);
+                rep.mpcSamples = readMetrics(reader, domainRepPath + DataName.MPC_REP).mpcSamples;
+                rep.outDegreeSamples = out_d.outDegreeSamples;
+                rep.naSamples = readMetrics(reader, domainRepPath + DataName.NA_REP).naSamples;
+                rep.typedOutDegreeSamples = out_d.typedOutDegreeSamples;
+                rep.edgeTypeSamples = out_d.edgeTypeSamples;
+                rep.nodeTypeSamples = out_d.nodeTypeSamples;
                 return rep;
         }
         
         /**
-         * read metric data and parse it to samples
+         * Read representative model
          */
-        private static def List<String> readFile(String filename, String valueDataName, String countDataName){
-                var s = new Scanner(new File(filename));
-                val counts = newArrayList();
-                val values = newArrayList();
-                //read data from csv
-                while(s.hasNext()){
-                        var data = s.nextLine().split(',');     
-                        
-                        if(data.size >= 1){
-                                if(data.get(0).equals(countDataName)){
-                                        //add all data with parsing them as integers
-                                        counts.addAll(data.subList(1, data.size()).map[Integer.parseInt(it)]);
-                                }else if(data.get(0).equals(valueDataName)){
-                                        //add all data without parsing (there can be either double or string, to be parsed later)
-                                        values.addAll(data.subList(1, data.size()));
-                                }
-                        }
-                }
-                
-                return createSamples(counts, values);
+        private static def readMetrics(GraphReader r, String path){
+                var model = r.readModels(path).head;
+                return model.evaluateAllMetricsToSamples();
         }
         
-        // create samples from values and counts
-        private static def List<String> createSamples(List<Integer> counts, List<String> values){
-                val samples = newArrayList();
-                
-                if(counts.size() != values.size()){
-                        throw new RuntimeException("counts and values should have the same size!");
-                }
-                
-                for(var i = 0; i < counts.size(); i++){
-                        for(var j = 0; j < counts.get(i); j++){
-                                samples.add(values.get(i));
-                        }
-                }
-                
-                return samples;
-        }
-        
-        
 }
 
-class CsvDataName{
+class DataName{
         public static val REP_PATH = 'data/';
-        public static val MPC_REP = 'mpc_rep.csv';
-        public static val NA_REP = 'na_rep.csv';
-        public static val OUT_D_REP = 'out_d_rep.csv';
+        public static val MPC_REP = 'mpc_rep';
+        public static val NA_REP = 'na_rep';
+        public static val OUT_D_REP = 'out_d_rep';
 }