diff --git a/src/utils/SubsumptionDetector.py b/src/utils/SubsumptionDetector.py index 3fe3670..adf4bf2 100644 --- a/src/utils/SubsumptionDetector.py +++ b/src/utils/SubsumptionDetector.py @@ -21,12 +21,12 @@ class SubsumptionDetector(RestrictionTypeDetector): def __init__(self): super(SubsumptionDetector, self).__init__() - self.addResult(MEASURE_HIERARCHY_OCCURRENCE, 0, TYPE_INT) + #self.addResult(MEASURE_HIERARCHY_OCCURRENCE, 0, TYPE_INT) self.addResult(MEASURE_OCCURRENCE, 0, TYPE_INT) - self.addResult(MEASURE_HIERARCHY_AVERAGE_DEPTH, 0.0, TYPE_FLOAT) - self.addResult(MEASURE_HIERARCHY_MEDIAN_DEPTH, 0.0, TYPE_FLOAT) - self.addResult(MEASURE_HIERARCHY_MIN_DEPTH, 0, TYPE_INT) - self.addResult(MEASURE_HIERARCHY_MAX_DEPTH, 0, TYPE_INT) + #self.addResult(MEASURE_HIERARCHY_AVERAGE_DEPTH, 0.0, TYPE_FLOAT) + #self.addResult(MEASURE_HIERARCHY_MEDIAN_DEPTH, 0.0, TYPE_FLOAT) + #self.addResult(MEASURE_HIERARCHY_MIN_DEPTH, 0, TYPE_INT) + #self.addResult(MEASURE_HIERARCHY_MAX_DEPTH, 0, TYPE_INT) def getRestrictionType(self): return "subsumption" diff --git a/src/utils/SubsumptionDetectorRdfsSubClassOf.py b/src/utils/SubsumptionDetectorRdfsSubClassOf.py index 20ec1bd..c0fc349 100644 --- a/src/utils/SubsumptionDetectorRdfsSubClassOf.py +++ b/src/utils/SubsumptionDetectorRdfsSubClassOf.py @@ -44,11 +44,14 @@ def compute(self): else: average_depth=0 - self.setAll(amount_hierarchies=len(hierarchies_depths), - amount_subclasses=self.c, - average=average_depth, - median=median(hierarchies_depths) if hierarchies_depths else 0, - min=min(hierarchies_depths) if hierarchies_depths else 0, - max=max(hierarchies_depths) if hierarchies_depths else 0) + self.setAmountSubclasses(self.c); + + # We are not considering other measures than occurrence in the current version + #self.setAll(amount_hierarchies=len(hierarchies_depths), + # amount_subclasses=self.c, + # average=average_depth, + # median=median(hierarchies_depths) if hierarchies_depths else 0, + # min=min(hierarchies_depths) if hierarchies_depths else 0, + # max=max(hierarchies_depths) if hierarchies_depths else 0)