measurements for the different violation types, comparison for differenct generation config

4 files changed, 69 insertions, 31 deletions

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 5c161f4b..b4c57bd8 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
@@ -2,13 +2,14 @@ package ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.graph
 
 import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.Metric
 import java.util.ArrayList
+import java.util.HashSet
 import java.util.List
 import org.eclipse.emf.common.util.EList
 import org.eclipse.emf.ecore.EObject
 import org.eclipse.emf.ecore.EReference
 
 class EMFGraph extends Graph{   
-        def void init (EObject root, List<Metric> metrics, String name, List<String> referenceTypes){
+        def void init (EObject root, List<Metric> metrics, String name, List<EReference> referenceTypes){
                 val otherContents = root.eAllContents.toList();
                 otherContents.add(root);
                 init(otherContents, metrics, name, referenceTypes);
@@ -21,13 +22,15 @@ class EMFGraph extends Graph{
          * @param name: name of the instance model
          * @param ReferenceTypes: reference types defined in the meta model
          */
-        def void init(List<EObject> objects, List<Metric> metrics, String name, List<String> referenceTypes){
+        def void init(List<EObject> objects, List<Metric> metrics, String name, List<EReference> referenceTypes){
                 objects.forEach[it|
-                        statistic.addNode(it);
+                        var types = new HashSet(it.eClass.EAllSuperTypes.map[it|it.name]);
+                        types.add(it.eClass.name);
+                        statistic.addNodeWithAllTypes(it, types);
                 ]
                 
                 referenceTypes.forEach[it|
-                        statistic.addType(it);
+                        statistic.addEdgeType(it.name);
                 ];
                 
                 objects.forEach[source|
diff --git a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/graph/Graph.xtend b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/graph/Graph.xtend
index cf4aedba..6b400b0d 100644
--- a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/graph/Graph.xtend
+++ b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/graph/Graph.xtend
@@ -2,11 +2,15 @@ package ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.graph
 
 import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.Metric
 import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.MetricSampleGroup
-import java.util.ArrayList
-import java.util.List
 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 ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.TypedOutDegree
+import java.util.ArrayList
+import java.util.HashMap
+import java.util.List
+import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.NodeTypeMetric
+import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.EdgeTypeMetric
 
 abstract class Graph {
         
@@ -42,11 +46,17 @@ abstract class Graph {
                 
                 for(metric : this.metrics){
                         if(metric instanceof MultiplexParticipationCoefficientMetric){
-                                sample.mpcSamples = metric.evaluateSamples(this.statistic);                             
+                                sample.mpcSamples = metric.evaluateSamples(this.statistic) as ArrayList<Double>;                                
                         }else if(metric instanceof NodeActivityMetric){
-                                sample.naSamples = metric.evaluateSamples(this.statistic);
+                                sample.naSamples = metric.evaluateSamples(this.statistic) as ArrayList<Double>;
                         }else if(metric instanceof OutDegreeMetric){
-                                sample.outDegreeSamples = metric.evaluateSamples(this.statistic);
+                                sample.outDegreeSamples = metric.evaluateSamples(this.statistic) as ArrayList<Double>;
+                        }else if(metric instanceof TypedOutDegree){
+                                sample.typedOutDegreeSamples = metric.evaluateSamples(this.statistic) as HashMap<String, List<Integer>>;
+                        }else if(metric instanceof NodeTypeMetric){
+                                sample.nodeTypeSamples = metric.evaluateSamples(this.statistic) as HashMap<String, Double>;
+                        }else if (metric instanceof EdgeTypeMetric){
+                                sample.edgeTypeSamples = metric.evaluateSamples(this.statistic) as HashMap<String, Double>;
                         }
                 }
                 
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 7ed58094..9b8fd0e3 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
@@ -5,20 +5,22 @@ import com.google.common.collect.Multimap
 import java.util.HashMap
 import java.util.HashSet
 import java.util.List
+import java.util.Map
+import java.util.Set
 import org.eclipse.emf.ecore.EObject
 
 class GraphStatistic {
         val incomingEdges = new HashMap<String, Multimap<EObject, EObject>>;
         val outcomingEdges = new HashMap<String, Multimap<EObject, EObject>>;
-        
+
         val edgeTypes = new HashSet<String>();
-        val nodes = new HashSet<EObject>();
-                
+        val nodeToType = new HashMap<EObject, Set<String>>();   
+
         /**
          * Add an edge type to to the graph
          * @param type: type to add
          */
-        def void addType(String type){
+        def void addEdgeType(String type){
                 if(edgeTypes.contains(type)){
                         return;
                 }
@@ -28,15 +30,20 @@ class GraphStatistic {
         }
         
         /**
-         * Add a node to he graph 
+         * Add a node to the graph with one type in its type hierarchy
          * @param node: node to add
          */
-         def void addNode(EObject n){
-                if(nodes.contains(n)){
-                        return;
-                }
-                
-                nodes.add(n);
+         def void addNodeWithType(EObject n, String Type){
+                var types = nodeToType.getOrDefault(n, new HashSet<String>());
+                types.add(Type);
+                nodeToType.put(n, types);
+         }
+         
+         /**
+          * Add a node to the graph with all types in its type hierarchy
+          */
+         def void addNodeWithAllTypes(EObject n, Set<String> types){
+                nodeToType.put(n, types);
          }
          
          /**
@@ -82,7 +89,7 @@ class GraphStatistic {
           }
           
           /**
-           * calculate the number of edge types for a given degree.
+           * calculate the number of edge types for a given node.
            */
           def int numOfEdgeTypes(EObject o){
                 var count = 0;
@@ -100,8 +107,17 @@ class GraphStatistic {
                 return edgeTypes.toList();
           }
           
+          def Map<EObject, Set<String>> getNodeToTypesMap(){
+                return nodeToType;
+          }
+          
           def List<EObject> getAllNodes(){
-                return nodes.toList();
+                return nodeToType.keySet().toList();
           }
+          
+          def HashMap<String, Multimap<EObject, EObject>> getOutgoingEdges(){
+                return outcomingEdges; 
+          }
+          
 }
 
diff --git a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/graph/PartialInterpretationGraph.xtend b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/graph/PartialInterpretationGraph.xtend
index 14337ab0..91d7c5f9 100644
--- a/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/graph/PartialInterpretationGraph.xtend
+++ b/Metrics/Metrics-Calculation/ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator/src/ca/mcgill/ecse/dslreasoner/realistic/metrics/calculator/graph/PartialInterpretationGraph.xtend
@@ -4,11 +4,13 @@ import ca.mcgill.ecse.dslreasoner.realistic.metrics.calculator.metrics.Metric
 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.RelationDeclaration
 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.BinaryElementRelationLink
 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation
-import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.impl.BooleanElementImpl
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.impl.PartialComplexTypeInterpretationImpl
 import java.util.ArrayList
 import java.util.List
 
 class PartialInterpretationGraph extends Graph{
+        val typeToExclude = "undefinedpart";
+        val classSuffix = " class";
         
         /**
          * Define a new PartialInterpretationGraph by parse every element from a PartialInterpretation
@@ -16,17 +18,21 @@ class PartialInterpretationGraph extends Graph{
         new(PartialInterpretation partial, List<Metric> metrics, String name){          
                 //the edge types are defined in terms of RelationDeclaration
                 partial.problem.relations.filter(RelationDeclaration).forEach[
-                        this.statistic.addType(it.name);
+                        //only need the name of the reference type (remove everything with and after "reference")
+                        this.statistic.addEdgeType(it.name.split(" ").get(0));
                 ]
                 // add all elements
-                val elements = getElements(partial);
-                for(element : elements){
-                        statistic.addNode(element)
+                val typeInterpretations = getTypes(partial);
+                for(type : typeInterpretations){
+                        var typeName = type.interpretationOf.name.replace(classSuffix, '');
+                        for(node : type.elements){
+                                this.statistic.addNodeWithType(node, typeName);
+                        }
                 }
                 
                 for(relationInterpretation : partial.partialrelationinterpretation) {
-                        val type = relationInterpretation.interpretationOf.name
-                        
+                        //only need the name of the reference type (remove everything with and after "reference")
+                        val type = relationInterpretation.interpretationOf.name.split(" ").get(0);
                         for(edge : relationInterpretation.relationlinks.filter(BinaryElementRelationLink)){
                                 statistic.addEdge(edge.param1, edge.param2, type);
                         }                       
@@ -62,8 +68,11 @@ class PartialInterpretationGraph extends Graph{
                 output.add(stateInfo);
         }
         
-        private def getElements(PartialInterpretation partial){
-                return partial.newElements.filter[!(it instanceof BooleanElementImpl)] + partial.problem.elements;
+        private def getTypes(PartialInterpretation partial){
+                //only the complex type interpretations are the ones defined in meta model
+                //do not care about undefined types as it will be included in the class type
+                return partial.partialtypeinterpratation.filter(PartialComplexTypeInterpretationImpl)
+                                                                                                .filter[!it.interpretationOf.name.toLowerCase.contains(typeToExclude)];
         }
         
         override getStatistic() {