4 files changed, 56 insertions, 60 deletions

diff --git a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/app/Domain.xtend b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/app/Domain.xtend
index 8351e96b..c8fd435b 100644
--- a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/app/Domain.xtend
+++ b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/app/Domain.xtend
@@ -1,5 +1,7 @@
 package ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.app
 
 enum Domain{
-        Yakinduum
+        Yakindumm,
+        Ecore,
+        Github
 }
\ 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 062d69fa..ab187b3a 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
@@ -3,13 +3,25 @@ package ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.app
 import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.graph.EMFGraph
 import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.io.CsvFileWriter
 import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.io.GraphReader
+import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.validation.ViolationCheck
 import hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph.yakindumm.impl.YakindummPackageImpl
+import java.io.File
 import java.util.ArrayList
+import org.eclipse.emf.ecore.EPackage
 import org.eclipse.emf.ecore.EcorePackage
+import org.eclipse.viatra.query.runtime.rete.matcher.ReteEngine
+import org.eclipse.emf.ecore.impl.EcorePackageImpl
+import org.eclipse.emf.ecore.EReference
 
 //import yakindumm2.impl.Yakindumm2PackageImpl
 
 class Main {
+        var static Domain d = Domain.Ecore;
+        val static String suffix = '.ecore'
+        val static String OUTPUT_FOLDER = "Inputs/human/";
+        val static String INPUT_FOLDER = "outputs/human/";
+        val static int NUM_RUNS = 1;
+        
         static class RWInformation{
                 public var String inputFolder;
                 public var String outputFolder;
@@ -24,36 +36,32 @@ class Main {
         
         def static void main(String[] args){
                 //init model
-                YakindummPackageImpl.eINSTANCE.eClass;
-                EcorePackage.eINSTANCE.eClass;
-//              Yakindumm2PackageImpl.eINSTANCE.eClass;
-                //val infos = initData();                                                                       
-                                                                                
-                println("Start Reading Models...");
-                var reader = new GraphReader(EcorePackage.eINSTANCE, ".xmi");
-//              for(info : infos){
-//                      calculateAllModels(info.inputFolder, info.outputFolder,info.numRuns, reader);
-//              }
+                var EPackage metamodel;
                 
-                //human input has different package declaration
-//              reader = new GraphReader(Yakindumm2PackageImpl.eINSTANCE);
-                val human = new RWInformation("Inputs/viatra75/", "outputs/", 50);
-                calculateAllModels(human.inputFolder, human.outputFolder,human.numRuns, reader);
+                //init viatra engine for the violation checker
+                ReteEngine.getClass();
                 
+                if(d == Domain.Yakindumm){
+                        YakindummPackageImpl.eINSTANCE.eClass;
+                        metamodel = YakindummPackageImpl.eINSTANCE;
+                }else if (d == Domain.Ecore){
+                        EcorePackage.eINSTANCE.eClass;
+                        metamodel = EcorePackageImpl.eINSTANCE;
+                }else if (d == Domain.Github){
+                        //TODO: Initialize Github Package
+                }
                 
+                                                                                
+                println("Start Reading Models...");
+                var reader = new GraphReader(metamodel, suffix);
+
+                val models = new RWInformation(OUTPUT_FOLDER, INPUT_FOLDER, NUM_RUNS);
+                calculateAllModels(models.inputFolder, models.outputFolder,models.numRuns, reader);     
                 println("finished");
         }
         
-        static def initData(){
-                val infos = new ArrayList<RWInformation>();
-                infos.add(new RWInformation("inputs/alloyInput/models/", "../plot/statistics/alloyOutput/", 20));
-                infos.add(new RWInformation("inputs/randomInput/models/", "../plot/statistics/randomOutput/", 20));
-                infos.add(new RWInformation("inputs/viatraInput30/", "../plot/statistics/viatraOutput30/", 20));
-                infos.add(new RWInformation("inputs/viatraInput100/", "../plot/statistics/viatraOutput100/", 10));
-                return infos;
-        }
-        
         static def calculateAllModels(String inputFolder, String outputFolder, int numRuns, GraphReader reader){
+                (new File(outputFolder)).mkdir();
                 for(var i = 1; i <= numRuns; i++){
                         val models = new ArrayList<EMFGraph>();
                         models.addAll(reader.readModels(inputFolder + "run" + i));
@@ -67,8 +75,21 @@ class Main {
         }
         
         static def calculateAndOutputMetrics(EMFGraph model, String metaModel, String fileName){
-                //println("evaluating for " + model.name);
+                //println("evaluating for " + model.name);              
                 model.metaModel = metaModel;
-                CsvFileWriter.write(model.evaluateAllMetrics(), fileName);
+                
+                //remove eGenericType for Ecore domain
+                if(d == 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)];
+                }
+                
+                var outputs = model.evaluateAllMetrics();
+                var violationsOutput = newArrayList('violations', ViolationCheck.calculateViolationCounts(model.root, d)+'');
+                outputs.add(violationsOutput);
+                CsvFileWriter.write(outputs, fileName);
         }
 }
\ 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/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 66dcdff6..b2288f52 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
@@ -20,6 +20,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.EdgeTypeMetric
 
 class PartialInterpretationMetricDistance {
         
@@ -34,8 +35,8 @@ class PartialInterpretationMetricDistance {
         var LinearModel linearModel;
         
         
-        new(){
-                var metrics = RepMetricsReader.read(Domain.Yakinduum);
+        new(Domain d){
+                var metrics = RepMetricsReader.read(d);
                 this.g = metrics;
                 ks = new KSDistance(g);
                 js = new JSDistance(g);
@@ -53,6 +54,7 @@ class PartialInterpretationMetricDistance {
                 metrics.add(new NodeActivityMetric());
                 metrics.add(new MultiplexParticipationCoefficientMetric());
                 metrics.add(new NodeTypeMetric());
+                metrics.add(new EdgeTypeMetric());
                 val metricCalculator = new PartialInterpretationGraph(partial, metrics, null);          
                 var metricSamples = metricCalculator.evaluateAllMetricsToSamples();
                 
@@ -63,6 +65,7 @@ class PartialInterpretationMetricDistance {
                 //var typedOutDegree = ks.typedOutDegreeDistance(metricSamples.typedOutDegreeSamples);
                 var distance = new MetricDistanceGroup(mpc, na, outDegree, nodeType);
                 distance.nodeTypeInfo = metricSamples.nodeTypeSamples;
+                distance.edgeTypeDistance = ks.edgeTypeDistance(metricSamples.edgeTypeSamples);
                 return distance;
         }
         
@@ -177,7 +180,8 @@ class MetricDistanceGroup{
         var double outDegreeDistance;
         var double nodeTypeDistance;
         protected var HashMap<String, Double> nodeTypeInfo;
-        
+        public var double edgeTypeDistance;
+                
         new(double mpcDistance, double naDistance, double outDegreeDistance, double nodeTypeDistance){
                 this.mpcDistance = mpcDistance;
                 this.naDistance = naDistance;
diff --git a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/app/Test.java b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/app/Test.java
deleted file mode 100644
index f06b377f..00000000
--- a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/app/Test.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.app;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import weka.core.matrix.LinearRegression;
-import weka.core.matrix.Matrix;
-
-public class Test {
-        public static void main(String[] args) {
-                linearRegressionTest();
-        }
-        
-        public static void linearRegressionTest() {
-                double[][] x = {{1,1,2,3}, {1,2,3,4}, {1,3,5,7}, {1,1,5,7}}; 
-                double[] y = {10, 13, 19, 17};
-                double[] valueToPredict = {1,1,1,1}; 
-                Matrix m = new Matrix(x);
-                Matrix n = new Matrix(y, y.length);
-                
-                LinearRegression regression = new LinearRegression(m, n, 0);
-                double[] coef = regression.getCoefficients();
-        
-                //predict
-                double a = 0;
-                for(int i = 0; i < coef.length; i++) {
-                        a += coef[i] * valueToPredict[i];
-                }
-                System.out.println(a);
-        }
-}