2 files changed, 54 insertions, 14 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 491501b0..858113e9 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
@@ -20,6 +20,8 @@ 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 org.eclipse.emf.ecore.EGenericType
+import org.eclipse.emf.ecore.EStructuralFeature
 
 class GraphReader{
         val ResourceSet resSet = new ResourceSetImpl();
@@ -53,9 +55,11 @@ class GraphReader{
                 metrics.add(new TypedOutDegree());              
                 metrics.add(new NodeTypeMetric());
                 metrics.add(new EdgeTypeMetric());
-                
+                var count = 1
                 //check all files in the directory with suffix
                 for(String name : dir.list.filter[it| it.endsWith(suffix)]){
+                        println(name)
+                        println(count)
                         val file = new File(name);
                         val roots = readModel(EObject, path,  file.name);                       
                         //add a list of metrics
@@ -63,7 +67,8 @@ class GraphReader{
                         for(root : roots){
                                 g.init(root, metrics, name.replaceFirst(suffix, ""), referenceTypes);
                         }
-                        
+
+                        count ++;
                         graphs.add(g);
                 }
                 
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 6af0b6c7..06e88efc 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
@@ -4,34 +4,62 @@ import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.app.Domain
 import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.MetricSampleGroup
 import hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph.yakindumm.impl.YakindummPackageImpl
 import java.util.HashMap
+import org.eclipse.emf.ecore.EReference
+import org.eclipse.emf.ecore.impl.EcorePackageImpl
 
 /**
  * Read the sample of the distribution of a metric provided the csv file of the metric
  */
 class RepMetricsReader {
+        static var Domain domain;
         static def read(Domain d){
-                var reader = new GraphReader(YakindummPackageImpl.eINSTANCE, '.xmi');
+                var GraphReader reader;
+                if(d == Domain.Yakindumm){
+                        reader = new GraphReader(YakindummPackageImpl.eINSTANCE, '.xmi');
+                }else if (d == Domain.Ecore){
+                        reader = new GraphReader(EcorePackageImpl.eINSTANCE, '.ecore');
+                }else if (d == Domain.Github){
+                        // Initialize the reader with github package
+                }
                 
+                domain = d;
                 
                 var domainRepPath = DataName.REP_PATH + d.name + '/';
                 var rep = new MetricSampleGroup()
                 var out_d = readMetrics(reader, domainRepPath + DataName.OUT_D_REP);
-                rep.mpcSamples = readMetrics(reader, domainRepPath + DataName.MPC_REP).mpcSamples;
+                var mpc = readMetrics(reader, domainRepPath + DataName.MPC_REP);
+                rep.mpcSamples = mpc.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.edgeTypeSamples = mpc.edgeTypeSamples;
                 
                 //TODO: Parameterize the prior node distribution
                 var nodeTypeSamples = new HashMap<String, Double>();
-                nodeTypeSamples.put('Entry', 0.04257802080554814);
-                nodeTypeSamples.put('Choice', 0.1267671379034409);
-                nodeTypeSamples.put('State', 0.1596092291277674);
-                nodeTypeSamples.put('Transition', 0.6138636969858629);
-                nodeTypeSamples.put('Statechart', 0.010136036276340358);
-                nodeTypeSamples.put('Region', 0.04467858095492131);
-                nodeTypeSamples.put('Exit', 0.0018338223526273673);
-                nodeTypeSamples.put('FinalState', 0.0005334755934915977);
+                if(d == Domain.Yakindumm){
+                        nodeTypeSamples.put('Entry', 0.04257802080554814);
+                        nodeTypeSamples.put('Choice', 0.1267671379034409);
+                        nodeTypeSamples.put('State', 0.1596092291277674);
+                        nodeTypeSamples.put('Transition', 0.6138636969858629);
+                        nodeTypeSamples.put('Statechart', 0.010136036276340358);
+                        nodeTypeSamples.put('Region', 0.04467858095492131);
+                        nodeTypeSamples.put('Exit', 0.0018338223526273673);
+                        nodeTypeSamples.put('FinalState', 0.0005334755934915977);
+                }else if(d ==Domain.Ecore){
+                        nodeTypeSamples.put('EAttribute', 0.23539778449144008);
+                        nodeTypeSamples.put('EClass', 0.33081570996978854);
+                        nodeTypeSamples.put('EReference', 0.30996978851963747);
+                        nodeTypeSamples.put('EPackage', 0.012789526686807653);
+                        nodeTypeSamples.put('EAnnotation', 0.002517623363544813);
+                        nodeTypeSamples.put('EEnumLiteral', 0.07275931520644502);
+                        nodeTypeSamples.put('EEnum', 0.013645518630412891);
+                        nodeTypeSamples.put('EDataType', 0.004028197381671702);
+                        nodeTypeSamples.put('EParameter', 0.005941591137965764);
+                        nodeTypeSamples.put('EGenericType', 0.002014098690835851);
+                        nodeTypeSamples.put('EOperation', 0.009415911379657605);
+                        nodeTypeSamples.put('ETypeParameter', 0.0007049345417925478);   
+                }
+                
                 
                 
                 rep.nodeTypeSamples = nodeTypeSamples;
@@ -42,7 +70,14 @@ class RepMetricsReader {
          * Read representative model
          */
         private static def readMetrics(GraphReader r, String path){
-                var model = r.readModels(path).head;
+                val model = r.readModels(path).head;
+                if(domain == Domain.Ecore){
+                        var refsToRemove = EcorePackageImpl.eINSTANCE.eAllContents.filter(EReference).filter[
+                                it.name.equals('eGenericType') || it.name.equals('eGenericSuperTypes') || it.name.equals('eFactoryInstance') ||
+                                it.name.equals('eGenericExceptions') || it.name.equals('references') || it.name.equals('contents');
+                        ];
+                        refsToRemove.forEach[model.removeReference(it)];
+                }
                 return model.evaluateAllMetricsToSamples();
         }