various changes to the ontologies (renaming etc.), new parameters for (367a2922) · Commits · Adam Kučera / semanticBMS

SemanticAPI/src/main/java/cz/muni/fi/lasaris/sbms/semantics/logic/BodyBuilders.java

+9 −9

Original line number	Diff line number	Diff line
		@@ -101,7 +101,7 @@ public class BodyBuilders {
		}

		if(fields.contains("source.type")) {
		setTypeClause(body, "source", gsv("source.type"), NS.sbim + "Device", NS.sbms + "Source");
		setTypeClause(body, "source", gsv("source.type"), NS.sbim + "Device", NS.sbms + "SensingDevice");
		//tcc.add(new TypeClauseContainer("source", gsv("source.type"), NS.sbim + "Device", NS.sbms + "Source"));
		}

		@@ -164,7 +164,7 @@ public class BodyBuilders {
		}

		if(fields.contains("scope.type")) {
		setTypeClause(body, "scope", gsv("scope.type"), NS.sbim + "Facility", NS.sbms + "Scope");
		setTypeClause(body, "scope", gsv("scope.type"), NS.sbim + "Facility", NS.sbms + "FeatureOfInterest");
		//tcc.add(new TypeClauseContainer("scope", gsv("scope.type"), NS.sbim + "Facility", NS.sbms + "Scope"));
		}

		@@ -322,11 +322,11 @@ public class BodyBuilders {
		setTypeClause(body, "datapoint", "group", NS.sbms + "DataPoint", NS.sbms + "DataPoint");
		break;
		case "source.type":
		setTypeClause(body, "source", "group", NS.sbim + "Device", NS.sbms + "Source");
		setTypeClause(body, "source", "group", NS.sbim + "Device", NS.sbms + "SensingDevice");
		break;
		case "scope.type":
		//setTypeClause(body, "scope", "group", NS.dul + "PhysicalObject", NS.sbms + "Scope");
		setTypeClause(body, "scope", "group", NS.sbim + "Facility", NS.sbms + "Scope");
		setTypeClause(body, "scope", "group", NS.sbim + "Facility", NS.sbms + "FeatureOfInterest");
		break;
		case "scope.room":
		case "scope.floor":
		@@ -389,10 +389,6 @@ public class BodyBuilders {
		NodeFactory.createLiteral(a.getBmsId())));
		}

		if(fields.contains("type")) {
		setTypeClause(body, "address", gsv("type"), NS.sbms + "Address", NS.sbms + "X");
		}


		if(a.getPublisher() != null \|\| fields.contains("publisher.bimId")) {
		body.addTriplePattern(Triple.create(Var.alloc("address"),
		@@ -442,7 +438,7 @@ public class BodyBuilders {

		if(fields.contains("influenced.scope.type")) {
		//setTypeClause(body, "influencedscope", gsv("influenced.scope.type"), NS.dul + "PhysicalObject", NS.sbms + "Scope");
		setTypeClause(body, "influencedscope", gsv("influenced.scope.type"), NS.sbim + "Facility", NS.sbms + "Scope");
		setTypeClause(body, "influencedscope", gsv("influenced.scope.type"), NS.sbim + "Facility", NS.sbms + "FeatureOfInterest");
		}

		if(a.getInfluenced() != null
		@@ -471,6 +467,10 @@ public class BodyBuilders {
		}
		}

		if(fields.contains("type")) {
		setTypeClause(body, "address", gsv("type"), NS.sbms + "Address", NS.sbms + "X");
		}

		return body;
		}

SemanticAPI/src/main/java/cz/muni/fi/lasaris/sbms/semantics/logic/TdbConnector.java

+7 −2

Original line number	Diff line number	Diff line
		@@ -77,8 +77,13 @@ public class TdbConnector {

		Reasoner r = ReasonerRegistry.getOWLMicroReasoner();

		//OntModelSpec oms = new OntModelSpec(OntModelSpec.OWL_MEM);
		OntModelSpec oms = new OntModelSpec(OntModelSpec.OWL_LITE_MEM_RDFS_INF);
		// this is slow
		//OntModelSpec oms = new OntModelSpec(OntModelSpec.OWL_MEM_MICRO_RULE_INF);

		// this is fast, however slightly incorrect - the SSN is an OWL2 DL ontology. Anyway, it works for querying.
		//OntModelSpec oms = new OntModelSpec(OntModelSpec.OWL_LITE_MEM_RDFS_INF);
		//this is the same speed but more suitable profile
		OntModelSpec oms = new OntModelSpec(OntModelSpec.OWL_DL_MEM_RDFS_INF);

		Model schema = ModelFactory.createOntologyModel(oms);

SemanticAPI/src/main/resources/RDF/SemanticBIM.rdf

+4 −4

Original line number	Diff line number	Diff line
		@@ -4167,7 +4167,7 @@
		<!-- http://is.muni.cz/www/255658/sbms/v2_0/SemanticBIM#Building -->

		<NamedIndividual rdf:about="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBIM#Building">
		<sameAs rdf:resource="http://www.student.dtu.dk/~mhoras/bot#Building"/>
		<equivalentClass rdf:resource="http://www.student.dtu.dk/~mhoras/bot#Building"/>
		</NamedIndividual>


		@@ -4175,7 +4175,7 @@
		<!-- http://is.muni.cz/www/255658/sbms/v2_0/SemanticBIM#Device -->

		<NamedIndividual rdf:about="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBIM#Device">
		<sameAs rdf:resource="http://www.student.dtu.dk/~mhoras/bot#Element"/>
		<equivalentClass rdf:resource="http://www.student.dtu.dk/~mhoras/bot#Element"/>
		</NamedIndividual>


		@@ -4183,7 +4183,7 @@
		<!-- http://is.muni.cz/www/255658/sbms/v2_0/SemanticBIM#Floor -->

		<NamedIndividual rdf:about="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBIM#Floor">
		<sameAs rdf:resource="http://www.student.dtu.dk/~mhoras/bot#Storey"/>
		<equivalentClass rdf:resource="http://www.student.dtu.dk/~mhoras/bot#Storey"/>
		</NamedIndividual>


		@@ -4191,7 +4191,7 @@
		<!-- http://is.muni.cz/www/255658/sbms/v2_0/SemanticBIM#Room -->

		<NamedIndividual rdf:about="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBIM#Room">
		<sameAs rdf:resource="http://www.student.dtu.dk/~mhoras/bot#Space"/>
		<equivalentClass rdf:resource="http://www.student.dtu.dk/~mhoras/bot#Space"/>
		</NamedIndividual>

SemanticAPI/src/main/resources/RDF/SemanticBMS.rdf

+19 −39

Original line number	Diff line number	Diff line
		@@ -88,7 +88,7 @@
		<ObjectProperty rdf:about="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#featureOfInterest">
		<rdfs:subPropertyOf rdf:resource="http://purl.oclc.org/NET/ssnx/ssn#featureOfInterest"/>
		<rdfs:domain rdf:resource="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#Observation"/>
		<rdfs:range rdf:resource="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#Scope"/>
		<rdfs:range rdf:resource="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#FeatureOfInterest"/>
		</ObjectProperty>


		@@ -107,7 +107,7 @@
		<!-- http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#hasPhysicalQuality -->

		<ObjectProperty rdf:about="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#hasPhysicalQuality">
		<rdfs:domain rdf:resource="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#ObservedProperty"/>
		<rdfs:domain rdf:resource="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#Property"/>
		<rdfs:range rdf:resource="http://purl.oclc.org/NET/muo/muo#PhysicalQuality"/>
		<propertyDisjointWith rdf:resource="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#hasPropertyDomain"/>
		<propertyDisjointWith rdf:resource="http://purl.oclc.org/NET/ssnx/ssn#deploymentProcessPart"/>
		@@ -123,18 +123,8 @@
		<ObjectProperty rdf:about="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#hasProperty">
		<rdfs:subPropertyOf rdf:resource="http://purl.oclc.org/NET/ssnx/ssn#hasProperty"/>
		<inverseOf rdf:resource="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#isPropertyOf"/>
		<rdfs:domain>
		<Class>
		<unionOf rdf:parseType="Collection">
		<rdf:Description rdf:about="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBIM#Building"/>
		<rdf:Description rdf:about="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBIM#Device"/>
		<rdf:Description rdf:about="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBIM#Floor"/>
		<rdf:Description rdf:about="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBIM#Room"/>
		<rdf:Description rdf:about="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBIM#Site"/>
		</unionOf>
		</Class>
		</rdfs:domain>
		<rdfs:range rdf:resource="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#ObservedProperty"/>
		<rdfs:domain rdf:resource="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#FeatureOfInterest" />
		<rdfs:range rdf:resource="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#Property"/>
		<rdfs:label xml:lang="en">has property</rdfs:label>
		</ObjectProperty>

		@@ -143,7 +133,7 @@
		<!-- http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#hasPropertyDomain -->

		<ObjectProperty rdf:about="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#hasPropertyDomain">
		<rdfs:domain rdf:resource="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#ObservedProperty"/>
		<rdfs:domain rdf:resource="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#Property"/>
		<rdfs:range rdf:resource="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#PropertyDomain"/>
		<propertyDisjointWith rdf:resource="http://purl.oclc.org/NET/ssnx/ssn#deploymentProcessPart"/>
		<propertyDisjointWith rdf:resource="http://purl.oclc.org/NET/ssnx/ssn#hasSubSystem"/>
		@@ -158,7 +148,7 @@
		<ObjectProperty rdf:about="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#influences">
		<inverseOf rdf:resource="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#isInfluencedBy"/>
		<rdfs:domain rdf:resource="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#Address"/>
		<rdfs:range rdf:resource="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#ObservedProperty"/>
		<rdfs:range rdf:resource="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#Property"/>
		</ObjectProperty>


		@@ -186,7 +176,7 @@
		<!-- http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#isInfluencedBy -->

		<ObjectProperty rdf:about="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#isInfluencedBy">
		<rdfs:domain rdf:resource="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#ObservedProperty"/>
		<rdfs:domain rdf:resource="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#Property"/>
		<rdfs:range rdf:resource="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#Address"/>
		<rdfs:label xml:lang="en"></rdfs:label>
		<rdfs:label>is influenced by</rdfs:label>
		@@ -198,18 +188,8 @@

		<ObjectProperty rdf:about="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#isPropertyOf">
		<rdfs:subPropertyOf rdf:resource="http://purl.oclc.org/NET/ssnx/ssn#isPropertyOf"/>
		<rdfs:domain rdf:resource="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#ObservedProperty"/>
		<rdfs:range>
		<Class>
		<unionOf rdf:parseType="Collection">
		<rdf:Description rdf:about="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBIM#Building"/>
		<rdf:Description rdf:about="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBIM#Device"/>
		<rdf:Description rdf:about="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBIM#Floor"/>
		<rdf:Description rdf:about="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBIM#Room"/>
		<rdf:Description rdf:about="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBIM#Site"/>
		</unionOf>
		</Class>
		</rdfs:range>
		<rdfs:domain rdf:resource="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#Property"/>
		<rdfs:range rdf:resource="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#FeatureOfInterest" />
		<rdfs:label xml:lang="en">is property of</rdfs:label>
		</ObjectProperty>

		@@ -261,7 +241,7 @@
		<ObjectProperty rdf:about="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#observedProperty">
		<rdfs:subPropertyOf rdf:resource="http://purl.oclc.org/NET/ssnx/ssn#observedProperty"/>
		<rdfs:domain rdf:resource="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#Observation"/>
		<rdfs:range rdf:resource="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#ObservedProperty"/>
		<rdfs:range rdf:resource="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#Property"/>
		</ObjectProperty>


		@@ -271,7 +251,7 @@
		<ObjectProperty rdf:about="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#observes">
		<rdfs:subPropertyOf rdf:resource="http://purl.oclc.org/NET/ssnx/ssn#observes"/>
		<rdfs:domain rdf:resource="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBIM#Device"/>
		<rdfs:range rdf:resource="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#ObservedProperty"/>
		<rdfs:range rdf:resource="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#Property"/>
		<propertyChainAxiom rdf:parseType="Collection">
		<rdf:Description rdf:about="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#madeObservation"/>
		<rdf:Description rdf:about="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#observedProperty"/>
		@@ -518,9 +498,9 @@



		<!-- http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#ObservedProperty -->
		<!-- http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#Property -->

		<Class rdf:about="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#ObservedProperty">
		<Class rdf:about="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#Property">
		<rdfs:subClassOf rdf:resource="http://purl.oclc.org/NET/ssnx/ssn#Property"/>
		<rdfs:label xml:lang="en">Observed property</rdfs:label>
		</Class>
		@@ -548,9 +528,9 @@



		<!-- http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#Scope -->
		<!-- http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#FeatureOfInterest -->

		<Class rdf:about="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#Scope">
		<Class rdf:about="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#FeatureOfInterest">
		<rdfs:subClassOf rdf:resource="http://purl.oclc.org/NET/ssnx/ssn#FeatureOfInterest"/>
		<rdfs:subClassOf>
		<Class>
		@@ -567,7 +547,7 @@
		<Restriction>
		<onProperty rdf:resource="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#hasProperty"/>
		<minQualifiedCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#nonNegativeInteger">1</minQualifiedCardinality>
		<onClass rdf:resource="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#ObservedProperty"/>
		<onClass rdf:resource="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#Property"/>
		</Restriction>
		</intersectionOf>
		</Class>
		@@ -593,15 +573,15 @@



		<!-- http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#Source -->
		<!-- http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#SensingDevice -->

		<Class rdf:about="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#Source">
		<Class rdf:about="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#SensingDevice">
		<rdfs:subClassOf rdf:resource="http://purl.oclc.org/NET/ssnx/ssn#SensingDevice"/>
		<rdfs:subClassOf>
		<Restriction>
		<onProperty rdf:resource="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#observes"/>
		<minQualifiedCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#nonNegativeInteger">1</minQualifiedCardinality>
		<onClass rdf:resource="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#ObservedProperty"/>
		<onClass rdf:resource="http://is.muni.cz/www/255658/sbms/v2_0/SemanticBMS#Property"/>
		</Restriction>
		</rdfs:subClassOf>
		</Class>

SemanticBMSClient/js/scripts.js

+1 −1

Original line number	Diff line number	Diff line
		@@ -38,7 +38,7 @@ function SBMSPage(custom) {
		SBMSPage.prototype.mapURL = "https://kompas.muni.cz/auth/";
		SBMSPage.prototype.sbmsURL = "/sbms/semantics/";
		SBMSPage.prototype.bmsChartsURL = "https://bms.muni.cz/Charts/";
		SBMSPage.prototype.cafmURL = "https://archibus.ics.muni.cz/archibus/schema/ab-products/custom/sbms/muni-helpdesk-manager-search-tabs.axvw";
		SBMSPage.prototype.cafmURL = "https://archibus.ics.muni.cz/archibus/schema/muni-helpdesk-manager-search-tabs.axvw";
		SBMSPage.prototype.trendDBs = ["93", "94"];
		SBMSPage.prototype.bmsURL = "https://bms.muni.cz/deltaweb/newlogin/?Referer=/deltaweb/navigator/index.asp&FrameSrc=%2Fdeltaweb%2Fnavigator%2FObject%5F{0}%2Easp%3FObjRef%3DBAC%2E{1}";
		// "https://bms.muni.cz/deltaweb/newlogin/?Referer=/deltaweb/navigator/index.asp&FrameSrc=%2Fdeltaweb%2Fnavigator%2FObject%5F{0}%2Easp%3FObjRef%3DBAC%2E{1}";