7 files changed, 40 insertions, 19 deletions

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 2add9f0e..dfde6593 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
@@ -18,9 +18,9 @@ import org.eclipse.emf.ecore.EReference
 class Main {
         var static Domain d = Domain.Yakindumm;
         val static String suffix = '.xmi'
-        val static String OUTPUT_FOLDER = "Inputs/yakindumm/human/humanInput100/";
-        val static String INPUT_FOLDER = "outputs/Human/";
-        val static int NUM_RUNS = 100;
+        val static String OUTPUT_FOLDER = "Inputs/measurement2/yakindu/Alloy/";
+        val static String INPUT_FOLDER = "outputs/measurement2/yakindu/Alloy/";
+        val static int NUM_RUNS = 1;
         
         static class RWInformation{
                 public var String inputFolder;
@@ -37,7 +37,6 @@ class Main {
         def static void main(String[] args){
                 //init model
                 var EPackage metamodel;
-                
                 //init viatra engine for the violation checker
                 ReteEngine.getClass();
                 
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 4c9246d1..697b2639 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
@@ -162,9 +162,11 @@ class PartialInterpretationMetricDistance {
         def double[] calculateFeature(int step, int violations){
                 var features = newDoubleArrayOfSize(2);
                 //constant term
-                features.set(0, 1);
-                features.set(0, Math.sqrt(step) + 30)
-                features.set(1, 1.0 / (step + 30) );
+                features.set(0, 1); //a
+                features.set(0, Math.sqrt(step) + 30) // b
+                features.set(1, 1.0 / (step + 30) );// c
+                
+                
 //              features.set(2, violations);
 //              features.set(3, Math.pow(violations, 2));
                 
diff --git a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/graph/GraphStatistic.xtend b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/graph/GraphStatistic.xtend
index af05a1cd..31788bb2 100644
--- a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/graph/GraphStatistic.xtend
+++ b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/graph/GraphStatistic.xtend
@@ -186,5 +186,9 @@ class GraphStatistic {
                 return outgoingEdges; 
           }
           
+          def HashMap<String, Multimap<EObject, EObject>> incomingEdges(){
+                return incomingEdges; 
+          }
+          
 }
 
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 858113e9..053e0da3 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
@@ -22,6 +22,7 @@ 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
+import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.TypedClusteringCoefficientMetric
 
 class GraphReader{
         val ResourceSet resSet = new ResourceSetImpl();
@@ -58,8 +59,6 @@ class GraphReader{
                 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
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 06e88efc..2e7be586 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
@@ -2,6 +2,7 @@ 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.MetricSampleGroup
+import github.impl.GithubPackageImpl
 import hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph.yakindumm.impl.YakindummPackageImpl
 import java.util.HashMap
 import org.eclipse.emf.ecore.EReference
@@ -19,7 +20,7 @@ class RepMetricsReader {
                 }else if (d == Domain.Ecore){
                         reader = new GraphReader(EcorePackageImpl.eINSTANCE, '.ecore');
                 }else if (d == Domain.Github){
-                        // Initialize the reader with github package
+                        reader = new GraphReader(GithubPackageImpl.eINSTANCE, '.githubmodel')
                 }
                 
                 domain = d;
@@ -58,6 +59,13 @@ class RepMetricsReader {
                         nodeTypeSamples.put('EGenericType', 0.002014098690835851);
                         nodeTypeSamples.put('EOperation', 0.009415911379657605);
                         nodeTypeSamples.put('ETypeParameter', 0.0007049345417925478);   
+                }else if (d == Domain.Github){
+                        nodeTypeSamples.put('Project', 0.012636538873420432);
+                        nodeTypeSamples.put('Commit', 0.5525808524309276);
+                        nodeTypeSamples.put('User', 0.05847076461769116);
+                        nodeTypeSamples.put('Issue', 0.12743628185907047);
+                        nodeTypeSamples.put('PullRequest', 0.07560505461554937);
+                        nodeTypeSamples.put('IssueEvent', 0.17327050760334123);
                 }
                 
                 
diff --git a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/metrics/TypedClusteringCoefficientMetric.xtend b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/metrics/TypedClusteringCoefficientMetric.xtend
index 93f5ccd4..0b6d61c6 100644
--- a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/metrics/TypedClusteringCoefficientMetric.xtend
+++ b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/metrics/TypedClusteringCoefficientMetric.xtend
@@ -4,6 +4,7 @@ import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.graph.GraphStatis
 import java.text.DecimalFormat
 import java.util.ArrayList
 import java.util.HashMap
+import java.util.HashSet
 import org.eclipse.emf.ecore.EObject
 
 class TypedClusteringCoefficientMetric extends Metric {
@@ -18,7 +19,9 @@ class TypedClusteringCoefficientMetric extends Metric {
                 //calculate the metric distribution
                 g.allNodes.forEach[n|
                         var coef = calculateTCC1(n, g);
-                        
+                        if(coef > 0){
+                                println(n);
+                        }
                         //format number to String
                         val value = formatter.format(coef);
                         if(!map.containsKey(value)){
@@ -61,15 +64,20 @@ class TypedClusteringCoefficientMetric extends Metric {
                 var triangles = 0;
 
                 for(type1 : g.allTypes){
-                        val type1EdgeTargetNodes = g.outgoingEdges.get(type1).values;
+                        val typed1RelatedOfN = new HashSet<EObject>(g.outgoingEdges.get(type1).get(n));
+                        val type1EdgeSourceNodesOfN = new HashSet<EObject>(g.incomingEdges.get(type1).get(n));
+                        
+                        typed1RelatedOfN.addAll(type1EdgeSourceNodesOfN);
+                        
+                        
                         
                         // number of wedges
-                        val d = type1EdgeTargetNodes.size
-                        wedges += d * (d-1)
+                        val d = typed1RelatedOfN.size
+                        wedges += d * (d-1) // we will also count each closed triangle twice
 
                         // pairs of neighbors
-                        for (n1: type1EdgeTargetNodes) {
-                                for (n2: type1EdgeTargetNodes) {
+                        for (n1: typed1RelatedOfN) {
+                                for (n2: typed1RelatedOfN) {
                                         for(type2 : g.allTypes){
                                                 if ((type1 != type2) &&
                                                         (g.outgoingEdges.get(type2).containsEntry(n1, n2) || 
@@ -81,10 +89,11 @@ class TypedClusteringCoefficientMetric extends Metric {
                                 }
                         }
                 }               
+                
                 if (wedges == 0.0) {
                         return 0.0
                 } else {
-                        return triangles/wedges
+                        return (triangles as double)/wedges
                 }
         }
 }
\ 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/validation/ViolationCheck.xtend b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/validation/ViolationCheck.xtend
index 3c98bb1c..4db5f940 100644
--- a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/validation/ViolationCheck.xtend
+++ b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/validation/ViolationCheck.xtend
@@ -2,7 +2,7 @@ package ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.validation
 
 import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.app.Domain
 import com.google.common.reflect.ClassPath
-import ecore.Ecore_pattern
+import ecore.Ecore
 import hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.Patterns
 import java.util.ArrayList
 import org.eclipse.emf.ecore.EObject
@@ -23,7 +23,7 @@ class ViolationCheck {
                 }
                 
                 var constriants = loadConstraints(packageName);
-                var collections = new ConstraintCollection(constriants, Ecore_pattern.instance);
+                var collections = new ConstraintCollection(constriants, Ecore.instance);
                 collections.addModel(root);
                 var results = collections.calculateViolations();
                 if(results.size > 0){