change exploration value function

3 files changed, 11 insertions, 15 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 ab187b3a..2add9f0e 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
@@ -16,11 +16,11 @@ 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;
+        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;
         
         static class RWInformation{
                 public var String inputFolder;
@@ -88,7 +88,9 @@ class Main {
                 }
                 
                 var outputs = model.evaluateAllMetrics();
-                var violationsOutput = newArrayList('violations', ViolationCheck.calculateViolationCounts(model.root, d)+'');
+                var violations = ViolationCheck.calculateViolationCounts(model.root, d);
+                println(violations);
+                var violationsOutput = newArrayList('violations', violations+'');
                 outputs.add(violationsOutput);
                 CsvFileWriter.write(outputs, fileName);
         }
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 b2288f52..4c9246d1 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
@@ -54,7 +54,6 @@ 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();
                 
@@ -65,7 +64,6 @@ 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;
         }
         
@@ -180,7 +178,6 @@ 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;
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 72239e22..3c98bb1c 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,6 +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 hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.Patterns
 import java.util.ArrayList
 import org.eclipse.emf.ecore.EObject
@@ -16,15 +17,13 @@ class ViolationCheck {
                 if(d == Domain.Yakindumm){
                         packageName = 'constraints.yakindumm';
                 }else if (d == Domain.Ecore){
-                        //TODO: put constraints package names for ecore and github models
-                        return -1;
+                        packageName = 'constraints.ecore';
                 }else if (d == Domain.Github){
                         return -1;
                 }
                 
-                
                 var constriants = loadConstraints(packageName);
-                var collections = new ConstraintCollection(constriants, Patterns.instance);
+                var collections = new ConstraintCollection(constriants, Ecore_pattern.instance);
                 collections.addModel(root);
                 var results = collections.calculateViolations();
                 if(results.size > 0){
@@ -54,7 +53,6 @@ class ViolationCheck {
                 
                 val classPath = ClassPath.from(ClassLoader.systemClassLoader);
                 val classInfos = classPath.getTopLevelClasses(packageName);
-                
                 for(info : classInfos){
                         if(info.load.interfaces.contains(IConstraintSpecification)){
                                 //IConstraintSpecification only has one constructor with empty argument list
@@ -63,7 +61,6 @@ class ViolationCheck {
                                 constraints.add(instance as IConstraintSpecification);
                         }
                 }
-                
                 return constraints
         }
 }