refactor PropertyComparisonProcessor (WIP)

Author: jmkeil

abecto-core/src/main/java/de/uni_jena/cs/fusion/abecto/measure/PerDatasetCount.java

@@ -20,16 +20,29 @@
 
 import de.uni_jena.cs.fusion.abecto.Aspect;
 import de.uni_jena.cs.fusion.abecto.Metadata;
+import de.uni_jena.cs.fusion.abecto.vocabulary.AV;
+import de.uni_jena.cs.fusion.abecto.vocabulary.OM;
 import org.apache.jena.rdf.model.Model;
 import org.apache.jena.rdf.model.Resource;
 
+import java.util.HashMap;
 import java.util.Map;
 
 public class PerDatasetCount extends Count<Resource> {
+
     public PerDatasetCount(Resource quantity, Resource unit) {
         super(quantity, unit);
     }
 
+    public static <K> Map<K, PerDatasetCount> mapOfCounts(Iterable<K> keys, Resource quantity, Resource unit) {
+        Map<K, PerDatasetCount> mapOfCounts = new HashMap<>();
+        for (K key : keys) {
+            PerDatasetCount countOfVariable = new PerDatasetCount(quantity, unit);
+            mapOfCounts.put(key, countOfVariable);
+        }
+        return mapOfCounts;
+    }
+
     public void storeInModel(Aspect aspect, Map<Resource, Model> outputModelsMap) {
         for (Resource dataset : keySet()) {
             Metadata.addQualityMeasurement(quantity, get(dataset), unit, dataset, aspect.getIri(),

abecto-core/src/main/java/de/uni_jena/cs/fusion/abecto/measure/PerDatasetPairCount.java

@@ -21,11 +21,10 @@
 import de.uni_jena.cs.fusion.abecto.Aspect;
 import de.uni_jena.cs.fusion.abecto.Metadata;
 import de.uni_jena.cs.fusion.abecto.ResourcePair;
-import de.uni_jena.cs.fusion.abecto.vocabulary.AV;
-import de.uni_jena.cs.fusion.abecto.vocabulary.OM;
 import org.apache.jena.rdf.model.Model;
 import org.apache.jena.rdf.model.Resource;
 
+import java.util.HashMap;
 import java.util.Map;
 
 public class PerDatasetPairCount extends Count<ResourcePair> {
@@ -34,6 +33,15 @@ public PerDatasetPairCount(Resource quantity, Resource unit) {
         super(quantity, unit);
     }
 
+    public static <K> Map<K, PerDatasetPairCount> mapOfCounts(Iterable<K> keys, Resource quantity, Resource unit) {
+        Map<K, PerDatasetPairCount> mapOfCounts = new HashMap<>();
+        for (K key : keys) {
+            PerDatasetPairCount countOfVariable = new PerDatasetPairCount(quantity, unit);
+            mapOfCounts.put(key, countOfVariable);
+        }
+        return mapOfCounts;
+    }
+
     public void storeInModel(Aspect aspect, Map<Resource, Model> outputModelsMap) {
         storeInModelWithVariable(aspect, null, outputModelsMap);
     }

abecto-core/src/main/java/de/uni_jena/cs/fusion/abecto/measure/PerDatasetTupelRatio.java

@@ -26,6 +26,7 @@
 import org.apache.jena.rdf.model.Resource;
 
 import java.math.BigDecimal;
+import java.util.HashMap;
 import java.util.Map;
 
 public class PerDatasetTupelRatio extends Ratio<ResourceTupel> {
@@ -34,6 +35,15 @@ public PerDatasetTupelRatio(Resource quantity, Resource unit) {
         super(quantity, unit);
     }
 
+    public static <K> Map<K, PerDatasetTupelRatio> mapOfRatios(Iterable<K> keys, Resource quantity, Resource unit) {
+        Map<K, PerDatasetTupelRatio> mapOfCounts = new HashMap<>();
+        for (K key : keys) {
+            PerDatasetTupelRatio ratioOfVariable = new PerDatasetTupelRatio(quantity, unit);
+            mapOfCounts.put(key, ratioOfVariable);
+        }
+        return mapOfCounts;
+    }
+
     public void setRatioOf(PerDatasetPairCount numerators, PerDatasetCount denominators) {
         for (ResourcePair pair : numerators.keySet()) {
             BigDecimal numerator = BigDecimal.valueOf(numerators.get(pair));

abecto-core/src/main/java/de/uni_jena/cs/fusion/abecto/processor/PropertyComparisonProcessor.java

@@ -155,46 +155,10 @@ private void setAspectDatasets() {
     }
 
     private void initializeMeasures() {
-        initializeCount();
-        initializeDeduplicatedCount();
-        initializeAbsoluteCoverage();
-        initializeRelativeCoverage();
-        initializeCompleteness();
-    }
-
-    private void initializeCount() {
-        count = new HashMap<>();
-        for (String variable : variables) {
-            PerDatasetCount countOfVariable = new PerDatasetCount(AV.count, OM.one);
-            count.put(variable, countOfVariable);
-        }
-    }
-
-    private void initializeDeduplicatedCount() {
-        deduplicatedCount = new HashMap<>();
-        for (String variable : variables) {
-            PerDatasetCount deduplicatedCountOfVariable = new PerDatasetCount(AV.deduplicatedCount, OM.one);
-            deduplicatedCount.put(variable, deduplicatedCountOfVariable);
-        }
-    }
-
-    private void initializeAbsoluteCoverage() {
-        absoluteCoverage = new HashMap<>();
-        for (String variable : variables) {
-            PerDatasetPairCount absoluteCoverageOfVariable = new PerDatasetPairCount(AV.absoluteCoverage, OM.one);
-            absoluteCoverage.put(variable, absoluteCoverageOfVariable);
-        }
-    }
-
-    private void initializeRelativeCoverage() {
-        relativeCoverage = new HashMap<>();
-        for (String variable : variables) {
-            PerDatasetTupelRatio relativeCoverageOfVariable = new PerDatasetTupelRatio(AV.relativeCoverage, OM.one);
-            relativeCoverage.put(variable, relativeCoverageOfVariable);
-        }
-    }
-
-    private void initializeCompleteness() {
+        count = PerDatasetCount.mapOfCounts(variables, AV.count, OM.one);
+        deduplicatedCount = PerDatasetCount.mapOfCounts(variables, AV.deduplicatedCount, OM.one);
+        absoluteCoverage = PerDatasetPairCount.mapOfCounts(variables, AV.absoluteCoverage, OM.one);
+        relativeCoverage = PerDatasetTupelRatio.mapOfRatios(variables, AV.relativeCoverage, OM.one);
         completeness = new HashMap<>();
     }