consider node types during generation

3 files changed, 38 insertions, 6 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 b4c57bd8..4ebd59b7 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
@@ -30,13 +30,26 @@ class EMFGraph extends Graph{
                 ]
                 
                 referenceTypes.forEach[it|
-                        statistic.addEdgeType(it.name);
+                        var typeToAdd = it;
+                
+                        // TODO: Here is to only consider one part of opposite edges
+//                      if(it.upperBound != -1 && it.EOpposite !== null && 
+//                              (it.EOpposite.upperBound == -1 || it.EOpposite.upperBound > it.upperBound
+//                      )){
+//                              typeToAdd = it.EOpposite;
+//                      }
+                        //if(!typeToAdd.name.equals('incomingTransitions')){
+                                statistic.addEdgeType(typeToAdd.name);
+                        //}
                 ];
                 
                 objects.forEach[source|
                         source.eClass.EAllReferences.forEach[r|
                                 //add the type first (if it is not added already)
                                 //many references
+//                              if(r.name.equals('incomingTransitions')){
+//                                      return;
+//                              }
                                 if(r.isMany){
                                         source.getNeighbours(r).forEach[target|
                                                 addEdge(source, target, r);
@@ -85,6 +98,14 @@ class EMFGraph extends Graph{
         }
         
         def addEdge(EObject source, EObject target, EReference r){
+                // TODO: Here is to only consider one part of opposite edges
+                //check for the opposite reference and do not add if its opposite will be added
+//              if(r.upperBound != -1 && r.EOpposite !== null && 
+//                              (r.EOpposite.upperBound == -1 || r.EOpposite.upperBound > r.upperBound
+//               )){
+//                      return;
+//              }
+                
                 if(target !== null && r !== null){
                         statistic.addEdge(source, target, r.name);
                 }
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 9b8fd0e3..84071176 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
@@ -8,6 +8,7 @@ import java.util.List
 import java.util.Map
 import java.util.Set
 import org.eclipse.emf.ecore.EObject
+import org.eclipse.emf.ecore.EReference
 
 class GraphStatistic {
         val incomingEdges = new HashMap<String, Multimap<EObject, EObject>>;
@@ -21,9 +22,12 @@ class GraphStatistic {
          * @param type: type to add
          */
         def void addEdgeType(String type){
+                
+                
                 if(edgeTypes.contains(type)){
-                        return;
+                        return;
                 }
+                
                 edgeTypes.add(type);
                 incomingEdges.put(type, ArrayListMultimap.create());
                 outcomingEdges.put(type, ArrayListMultimap.create());
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 91d7c5f9..bb679bf6 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
@@ -19,7 +19,11 @@ class PartialInterpretationGraph extends Graph{
                 //the edge types are defined in terms of RelationDeclaration
                 partial.problem.relations.filter(RelationDeclaration).forEach[
                         //only need the name of the reference type (remove everything with and after "reference")
-                        this.statistic.addEdgeType(it.name.split(" ").get(0));
+                        var n = it.name.split(" ").get(0);
+                        // TODO: Here is to only consider one part of opposite edges
+                        //if(!n.equals('target') && !n.equals('source') /* && !n.equals('incomingTransitions')*/){
+                                this.statistic.addEdgeType(n);
+                        //}
                 ]
                 // add all elements
                 val typeInterpretations = getTypes(partial);
@@ -33,9 +37,12 @@ class PartialInterpretationGraph extends Graph{
                 for(relationInterpretation : partial.partialrelationinterpretation) {
                         //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);
-                        }                       
+                        // TODO: Here is to only consider one part of opposite edges
+                        //if(!type.equals('target') && !type.equals('source') /*&& !type.equals('incomingTransitions')*/){
+                                for(edge : relationInterpretation.relationlinks.filter(BinaryElementRelationLink)){
+                                        statistic.addEdge(edge.param1, edge.param2, type);
+                                }       
+                        //}
                 }       
                 
                 this.name = name;