Add map of equivalent Classes / Properties in Ontology

jimkont · jimkont · commit a503473ffa4a · 2013-09-02T20:27:44.000+03:00
diff --git a/core/src/main/scala/org/dbpedia/extraction/ontology/Ontology.scala b/core/src/main/scala/org/dbpedia/extraction/ontology/Ontology.scala
@@ -15,5 +15,7 @@ class Ontology (
   val classes : Map[String, OntologyClass],
   val properties : Map[String, OntologyProperty],
   val datatypes : Map[String, Datatype],
-  val specializations : Map[(OntologyClass, OntologyProperty), UnitDatatype] 
+  val specializations : Map[(OntologyClass, OntologyProperty), UnitDatatype],
+  val equivalentPropertiesMap : Map[OntologyProperty,Set[OntologyProperty]],
+  val equivalentClassesMap : Map[OntologyProperty,Set[OntologyProperty]]
 )
diff --git a/core/src/main/scala/org/dbpedia/extraction/ontology/io/OntologyReader.scala b/core/src/main/scala/org/dbpedia/extraction/ontology/io/OntologyReader.scala
@@ -72,10 +72,12 @@ class OntologyReader
                 val name = getName(page.title, _.capitalize(page.title.language.locale))
 
                 ontologyBuilder.classes ::= loadClass(name, templateNode)
+                // Fill the equivalentClass map
 
-                for(specificProperty <- loadSpecificProperties(name, templateNode))
+              for(specificProperty <- loadSpecificProperties(name, templateNode))
                 {
                     ontologyBuilder.specializedProperties ::= specificProperty
+                    // To check for equivalent Property Map
                 }
             }
             else if(templateName == OntologyReader.OBJECTPROPERTY_NAME || templateName == OntologyReader.DATATYPEPROPERTY_NAME)
@@ -85,6 +87,7 @@ class OntologyReader
                 for(property <- loadOntologyProperty(name, templateNode))
                 {
                     ontologyBuilder.properties ::= property
+                    // Fill the equivalentProperty map
                 }
             }
             // TODO: read datatypes
@@ -298,6 +301,8 @@ class OntologyReader
         var properties = List[PropertyBuilder]()
         var datatypes = List[Datatype]()
         var specializedProperties = List[SpecificPropertyBuilder]()
+        var equivalentPropertiesMap = Map[OntologyProperty,Set[OntologyProperty]] ()
+        var equivalentClassesMap = Map[OntologyProperty,Set[OntologyProperty]] ()
 
         def build() : Ontology  =
         {
@@ -308,7 +313,9 @@ class OntologyReader
             new Ontology( classes.flatMap(_.build(classMap)).map(c => (c.name, c)).toMap,
                           properties.flatMap(_.build(classMap, typeMap)).map(p => (p.name, p)).toMap,
                           datatypes.map(t => (t.name, t)).toMap,
-                          specializedProperties.flatMap(_.build(classMap, propertyMap, typeMap)).toMap )
+                          specializedProperties.flatMap(_.build(classMap, propertyMap, typeMap)).toMap,
+                          equivalentPropertiesMap,
+                          equivalentClassesMap)
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -15,5 +15,7 @@ class Ontology (`
`15`	`15`	`val classes : Map[String, OntologyClass],`
`16`	`16`	`val properties : Map[String, OntologyProperty],`
`17`	`17`	`val datatypes : Map[String, Datatype],`
`18`		`- val specializations : Map[(OntologyClass, OntologyProperty), UnitDatatype]`
	`18`	`+ val specializations : Map[(OntologyClass, OntologyProperty), UnitDatatype],`
	`19`	`+ val equivalentPropertiesMap : Map[OntologyProperty,Set[OntologyProperty]],`
	`20`	`+ val equivalentClassesMap : Map[OntologyProperty,Set[OntologyProperty]]`
`19`	`21`	`)`
Original file line number	Diff line number	Diff line change
`@@ -72,10 +72,12 @@ class OntologyReader`
`72`	`72`	`val name = getName(page.title, _.capitalize(page.title.language.locale))`
`73`	`73`
`74`	`74`	`ontologyBuilder.classes ::= loadClass(name, templateNode)`
	`75`	`+ // Fill the equivalentClass map`
`75`	`76`
`76`		`- for(specificProperty <- loadSpecificProperties(name, templateNode))`
	`77`	`+ for(specificProperty <- loadSpecificProperties(name, templateNode))`
`77`	`78`	`{`
`78`	`79`	`ontologyBuilder.specializedProperties ::= specificProperty`
	`80`	`+ // To check for equivalent Property Map`
`79`	`81`	`}`
`80`	`82`	`}`
`81`	`83`	`else if(templateName == OntologyReader.OBJECTPROPERTY_NAME \|\| templateName == OntologyReader.DATATYPEPROPERTY_NAME)`
`@@ -85,6 +87,7 @@ class OntologyReader`
`85`	`87`	`for(property <- loadOntologyProperty(name, templateNode))`
`86`	`88`	`{`
`87`	`89`	`ontologyBuilder.properties ::= property`
	`90`	`+ // Fill the equivalentProperty map`
`88`	`91`	`}`
`89`	`92`	`}`
`90`	`93`	`// TODO: read datatypes`
`@@ -298,6 +301,8 @@ class OntologyReader`
`298`	`301`	`var properties = List[PropertyBuilder]()`
`299`	`302`	`var datatypes = List[Datatype]()`
`300`	`303`	`var specializedProperties = List[SpecificPropertyBuilder]()`
	`304`	`+ var equivalentPropertiesMap = Map[OntologyProperty,Set[OntologyProperty]] ()`
	`305`	`+ var equivalentClassesMap = Map[OntologyProperty,Set[OntologyProperty]] ()`
`301`	`306`
`302`	`307`	`def build() : Ontology =`
`303`	`308`	`{`
`@@ -308,7 +313,9 @@ class OntologyReader`
`308`	`313`	`new Ontology( classes.flatMap(_.build(classMap)).map(c => (c.name, c)).toMap,`
`309`	`314`	`properties.flatMap(_.build(classMap, typeMap)).map(p => (p.name, p)).toMap,`
`310`	`315`	`datatypes.map(t => (t.name, t)).toMap,`
`311`		`- specializedProperties.flatMap(_.build(classMap, propertyMap, typeMap)).toMap )`
	`316`	`+ specializedProperties.flatMap(_.build(classMap, propertyMap, typeMap)).toMap,`
	`317`	`+ equivalentPropertiesMap,`
	`318`	`+ equivalentClassesMap)`
`312`	`319`	`}`
`313`	`320`	`}`
`314`	`321`