Adapted output (no longer implementation dimension because it is impl…

…icit part of detectorVersion)
IDLabResearch · Dec 8, 2018 · 514dc15 · 514dc15
1 parent eb4d9a6
commit 514dc15
Show file tree

Hide file tree

Showing 21 changed files with 20 additions and 21 deletions.
diff --git a/src/lodstats.py b/src/lodstats.py
@@ -278,7 +278,6 @@ def create_dataset(measure_name, datasets, graph, provGeneration, provGeneration
                     g.add((observ, qb.dataSet, dataset))
                     g.add((observ, lrd['executionTimeDimension'], rdflib.Literal(executionTime)))
                     g.add((observ, lrd['restrictionTypeDimension'], lrd[detectors_dict.get('restriction-type')]))
-                    g.add((observ, lrd['implementationDimension'], lrd[detectors_dict.get('implementation', '')]))
                     g.add((observ, lrd['detectorDimension'], lrd[detectors_name]))
                     g.add((observ, lrd['detectorVersionDimension'], lrd[detectors_dict.get('version', '')]))
                     g.add((observ, lrd[results_name], rdflib.Literal(results_dict.get('value', ''), datatype=results_dict.get('type', 'string'))))

diff --git a/src/utils/AsymmetricPropertiesDetectorOwlAsymmetricProperty.py b/src/utils/AsymmetricPropertiesDetectorOwlAsymmetricProperty.py
@@ -21,7 +21,7 @@ def getName(self):
         return "asymmetricPropertiesDetectorOwlAsymmetric"
 
     def getVersion(self):
-        return "asymmetricPropertiesDetectorOwlAsymmetricProperty-v1"
+        return "asymmetricPropertiesLODStatsDetectorOwlAsymmetricProperty-v1"
 
     def compute(self):
         self.setAmountAsymmetricProperties(self.amount)

diff --git a/src/utils/DisjointClassDetectorOwlAllDisjointClasses.py b/src/utils/DisjointClassDetectorOwlAllDisjointClasses.py
@@ -27,7 +27,7 @@ def getName(self):
         return "disjointClassesDetectorOwlAllDisjointClasses"
 
     def getVersion(self):
-        return "disjointClassesDetectorOwlAllDisjointClasses-v1"
+        return "disjointClassesLODStatsDetectorOwlAllDisjointClasses-v1"
 
     def compute(self):
         self.disjoint_classes_list_creator.compute()

diff --git a/src/utils/DisjointClassDetectorOwlDisjointWith.py b/src/utils/DisjointClassDetectorOwlDisjointWith.py
@@ -19,7 +19,7 @@ def getName(self):
         return "disjointClassesDetectorOwlDisjointWith"
 
     def getVersion(self):
-        return "disjointClassesDetectorOwlDisjointWith-v1"
+        return "disjointClassesLODStatsDetectorOwlDisjointWith-v1"
 
     def compute(self):
         self.propertyStats.compute()

diff --git a/src/utils/DisjointPropertyDetectorOwlAllDisjointProperties.py b/src/utils/DisjointPropertyDetectorOwlAllDisjointProperties.py
@@ -27,7 +27,7 @@ def getName(self):
         return "disjointPropertiesDetectorOwlAllDisjointProperties"
 
     def getVersion(self):
-        return "disjointPropertiesDetectorOwlAllDisjointProperties-v1"
+        return "disjointPropertiesLODStatsDetectorOwlAllDisjointProperties-v1"
 
     def compute(self):
         self.disjoint_properties_list_creator.compute()

diff --git a/src/utils/DisjointPropertyDetectorOwlDisjointWith.py b/src/utils/DisjointPropertyDetectorOwlDisjointWith.py
@@ -19,7 +19,7 @@ def getName(self):
         return "disjointPropertiesDetectorOwlDisjointWith"
 
     def getVersion(self):
-        return "disjointPropertiesDetectorOwlDisjointWith-v1"
+        return "disjointPropertiesLODStatsDetectorOwlDisjointWith-v1"
 
     def compute(self):
         self.propertyStats.compute()

diff --git a/src/utils/ExactUnqualifiedCardinalityDetectorOwlCardinality.py b/src/utils/ExactUnqualifiedCardinalityDetectorOwlCardinality.py
@@ -18,7 +18,7 @@ def getName(self):
         return "exactUnqualifiedCardinalityDetectorOwlCardinality"
 
     def getVersion(self):
-        return "exactUnqualifiedCardinalityDetectorOwlCardinality-v1"
+        return "exactUnqualifiedCardinalityLODStatsDetectorOwlCardinality-v1"
 
     def compute(self):
         self.setAmountUnqualifiedExactCardinality(self.amount)

diff --git a/src/utils/ExactUnqualifiedCardinalityDetectorOwlMinMax.py b/src/utils/ExactUnqualifiedCardinalityDetectorOwlMinMax.py
@@ -22,7 +22,7 @@ def getName(self):
         return "exactUnqualifiedCardinalityDetectorOwlMinMax"
 
     def getVersion(self):
-        return "exactUnqualifiedCardinalityDetectorOwlMinMax-v1"
+        return "exactUnqualifiedCardinalityLODStatsDetectorOwlMinMax-v1"
 
     def compute(self):
         # Reduce amount of comparisons by selecting smaller dictionary for outer loop

diff --git a/src/utils/FunctionalPropertyDetectorOwlFunctionalProperty.py b/src/utils/FunctionalPropertyDetectorOwlFunctionalProperty.py
@@ -19,7 +19,7 @@ def getName(self):
         return "functionalPropertiesDetectorOwlFunctionalProperty"
 
     def getVersion(self):
-        return "functionalPropertiesDetectorOwlFunctionalProperty-v1"
+        return "functionalPropertiesLODStatsDetectorOwlFunctionalProperty-v1"
 
     def compute(self):
         self.setAmountFunctionalProperties(self.amount)

diff --git a/src/utils/InverseFunctionalPropertyDetectorOwlInverseFunctionalProperty.py b/src/utils/InverseFunctionalPropertyDetectorOwlInverseFunctionalProperty.py
@@ -19,7 +19,7 @@ def getName(self):
         return "inverseFunctionalPropertiesDetectorOwlInverseFunctionalProperty"
 
     def getVersion(self):
-        return "inverseFunctionalPropertiesDetectorOwlInverseFunctionalProperty-v1"
+        return "inverseFunctionalPropertiesLODStatsDetectorOwlInverseFunctionalProperty-v1"
 
     def compute(self):
         self.setAmountFunctionalProperties(self.amount)

diff --git a/src/utils/IrreflexiveObjectPropertiesDetectorOwlIrreflexiveProperty.py b/src/utils/IrreflexiveObjectPropertiesDetectorOwlIrreflexiveProperty.py
@@ -21,7 +21,7 @@ def getName(self):
         return "irreflexivePropertiesDetectorOwlIrreflexiveProperty"
 
     def getVersion(self):
-        return "irreflexivePropertiesDetectorOwlIrreflexiveProperty-v1"
+        return "irreflexivePropertiesLODStatsDetectorOwlIrreflexiveProperty-v1"
 
     def compute(self):
         self.setAmountIrreflexiveProperties(self.amount)

diff --git a/src/utils/LiteralPatternDetectorXsdPatternOwlRestriction.py b/src/utils/LiteralPatternDetectorXsdPatternOwlRestriction.py
@@ -26,7 +26,7 @@ def getName(self):
         return "literalPatternMatchingDetectorXsdPatternOwlRestriction"
 
     def getVersion(self):
-        return "literalPatternMatchingDetectorXsdPatternOwlRestriction-v1"
+        return "literalPatternMatchingLODStatsDetectorXsdPatternOwlRestriction-v1"
 
     def compute(self):
         self.restriction_list_creator.compute()

diff --git a/src/utils/LiteralRangesDetectorXsdMinMaxOwlRestriction.py b/src/utils/LiteralRangesDetectorXsdMinMaxOwlRestriction.py
@@ -30,7 +30,7 @@ def getName(self):
         return "literalRangesDetectorXsdMinMaxOwlRestriction"
 
     def getVersion(self):
-        return "literalRangesDetectorXsdMinMaxOwlRestriction-v1"
+        return "literalRangesLODStatsDetectorXsdMinMaxOwlRestriction-v1"
 
     def compute(self):
         self.restriction_list_creator.compute()

diff --git a/src/utils/MaxQualifiedCardinalityDetectorOwlMaxQualifiedCardinality.py b/src/utils/MaxQualifiedCardinalityDetectorOwlMaxQualifiedCardinality.py
@@ -18,7 +18,7 @@ def getName(self):
         return "maximumQualifiedCardinalityDetector"
 
     def getVersion(self):
-        return "maximumQualifiedCardinalityDetector-v1"
+        return "maximumQualifiedCardinalityLODStatsDetector-v1"
 
     def compute(self):
         self.setAmountQualifiedMaxCardinality(self.amount)

diff --git a/src/utils/MaxUnqualifiedCardinalityDetectorOwlMaxCardinality.py b/src/utils/MaxUnqualifiedCardinalityDetectorOwlMaxCardinality.py
@@ -18,7 +18,7 @@ def getName(self):
         return "maximumUnqualifiedCardinalityDetector"
 
     def getVersion(self):
-        return "maximumUnqualifiedCardinalityDetectorOwl-v1"
+        return "maximumUnqualifiedCardinalityLODStatsDetectorOwl-v1"
 
     def compute(self):
         self.setAmountUnqualifiedMaxCardinality(self.amount)

diff --git a/src/utils/MinQualifiedCardinalityDetectorOwlMinQualifiedCardinality.py b/src/utils/MinQualifiedCardinalityDetectorOwlMinQualifiedCardinality.py
@@ -18,7 +18,7 @@ def getName(self):
         return "minimumQualifiedCardinalityDetector"
 
     def getVersion(self):
-        return "minimumQualifiedCardinalityDetector-v1"
+        return "minimumQualifiedCardinalityLODStatsDetector-v1"
 
     def compute(self):
         self.setAmountQualifiedMinCardinality(self.amount)

diff --git a/src/utils/MinUnqualifiedCardinalityDetectorOwlMinCardinality.py b/src/utils/MinUnqualifiedCardinalityDetectorOwlMinCardinality.py
@@ -18,7 +18,7 @@ def getName(self):
         return "minimumUnqualifiedCardinalityDetectorOwl"
 
     def getVersion(self):
-        return "minimumUnqualifiedCardinalityDetectorOwl-v1"
+        return "minimumUnqualifiedCardinalityLODStatsDetectorOwl-v1"
 
     def compute(self):
         self.setAmountUnqualifiedMinCardinality(self.amount)

diff --git a/src/utils/PropertyDomainDetectorRdfsDomain.py b/src/utils/PropertyDomainDetectorRdfsDomain.py
@@ -18,7 +18,7 @@ def getName(self):
         return "propertyDomainDetectorRdfsDomain"
 
     def getVersion(self):
-        return "propertyDomainDetectorRdfsDomain-v1"
+        return "propertyDomainLODStatsDetectorRdfsDomain-v1"
 
     def compute(self):
         self.setAmountDomainProperties(self.amount)

diff --git a/src/utils/PropertyRangeDetectorRdfsRange.py b/src/utils/PropertyRangeDetectorRdfsRange.py
@@ -18,7 +18,7 @@ def getName(self):
         return "propertyRangeDetectorRdfsRange"
 
     def getVersion(self):
-        return "propertyRangeDetectorRdfsRange-v1"
+        return "propertyRangeLODStatsDetectorRdfsRange-v1"
 
     def compute(self):
         self.setAmountDomainProperties(self.amount)

diff --git a/src/utils/SubsumptionDetectorRdfsSubClassOf.py b/src/utils/SubsumptionDetectorRdfsSubClassOf.py
@@ -33,7 +33,7 @@ def getName(self):
         return "subsumptionDetectorRdfsSubClassOf"
 
     def getVersion(self):
-        return "subsumptionDetectorRdfsSubClassOf-v1"
+        return "subsumptionLODStatsDetectorRdfsSubClassOf-v1"
 
     def compute(self):
 

diff --git a/src/utils/UniversalQuantificationDetectorOwlAllValuesFrom.py b/src/utils/UniversalQuantificationDetectorOwlAllValuesFrom.py
@@ -18,7 +18,7 @@ def getName(self):
         return "universalQuantificationDetectorOwlAllValuesFrom"
 
     def getVersion(self):
-        return "universalQuantificationDetectorOwlAllValuesFrom-v1"
+        return "universalQuantificationLODStatsDetectorOwlAllValuesFrom-v1"
 
     def compute(self):
         self.setAmountUniversalQuantification(self.amount)