[TASK] Generic commit.

This commit is contained in:
Jan Philipp Timme 2016-10-11 16:59:24 +02:00
parent cad2ad2e8c
commit e975f9825e
2 changed files with 16 additions and 20 deletions

View File

@ -187,7 +187,7 @@ public class SimulationContext {
engine.registerStream(rdfStreamFormatter); engine.registerStream(rdfStreamFormatter);
resultProxy.addObserver(rdfStreamFormatter); resultProxy.addObserver(rdfStreamFormatter);
if(queryContainer.useObserverWindow) { if(queryContainer.useObserverWindow) {
Observer resultObserver = this.createResultObserverWindow(queryContainer.name); Observer resultObserver = this.createResultObserverWindow(streamUri);
resultProxy.addObserver(resultObserver); resultProxy.addObserver(resultObserver);
} }
} else { } else {

View File

@ -74,9 +74,9 @@ public class RentACarSimulation implements Runnable {
private void registerOwnPrefixes() { private void registerOwnPrefixes() {
Main.prefixManager.registerPrefix("event", RentACarSimulation.BASE_OBJECT_IRI+"/event#"); Main.prefixManager.registerPrefix("event", RentACarSimulation.BASE_OBJECT_IRI+"/event#");
Main.prefixManager.registerPrefix("carOnt", RentACarSimulation.BASE_ONTOLOGY_IRI); Main.prefixManager.registerPrefix("car", RentACarSimulation.BASE_ONTOLOGY_IRI);
Main.prefixManager.registerPrefix("car", RentACarSimulation.BASE_OBJECT_IRI+"/Car#"); Main.prefixManager.registerPrefix("cars", RentACarSimulation.BASE_OBJECT_IRI+"/Car#");
Main.prefixManager.registerPrefix("driver", RentACarSimulation.BASE_OBJECT_IRI+"/Driver#"); Main.prefixManager.registerPrefix("drivers", RentACarSimulation.BASE_OBJECT_IRI+"/Driver#");
} }
public RdfStream getCarStream() { public RdfStream getCarStream() {
@ -579,26 +579,22 @@ public class RentACarSimulation implements Runnable {
+ "PREFIX car: <http://example.org/carSim/carSimulationOntology#> " + "PREFIX car: <http://example.org/carSim/carSimulationOntology#> "
+ "CONSTRUCT { " + "CONSTRUCT { "
+ " [] rdf:type car:CarMaintenanceNeededEvent " + " [] rdf:type car:CarMaintenanceNeededEvent "
+ " ; car:relatedCar ?car . " + " ; car:relatedCar ?car "
+ " ; car:numberOfWearEvents ?numberWearEvents . "
+ "} " + "} "
+ "FROM STREAM <http://example.org/carSim/stream/carStream> [RANGE 5s TUMBLING] " + "FROM STREAM <http://example.org/carSim/stream/getWearEvents> [RANGE 5s TUMBLING] "
+ "FROM STREAM <http://example.org/carSim/stream/getEngineWear> [RANGE 4h STEP 5m] "
+ "WHERE { " + "WHERE { "
+ " { " + " { "
+ " SELECT ?car " + " SELECT (?carWithWear AS ?car) (COUNT(?wearEvent) AS ?numberWearEvents) "
+ " WHERE { " + " WHERE { "
+ " ?wearEvent rdf:type car:CarWearEvent . " + " ?wearEvent rdf:type car:CarWearEvent . "
+ " ?wearEvent car:relatedCar ?car . " + " ?wearEvent car:relatedCar ?carWithWear . "
+ " } " + " } "
+ " GROUP BY ?car " + " GROUP BY ?carWithWear "
+ " HAVING (COUNT(?wearEvent) > 10) " + " HAVING (COUNT(?wearEvent) > 10) "
+ " } " + " } "
+ " UNION { "
+ " ?checkEngineEvent rdf:type car:CarCheckEngineEvent . "
+ " ?checkEngineEvent car:relatedCar ?car . "
+ " } "
+ "}"; + "}";
QueryContainer queryContainer = new QueryContainer("getMaintenanceEvents", query, true); QueryContainer queryContainer = new QueryContainer("getMaintenanceEvents", query, false);
queryContainer.useObserverWindow(); queryContainer.useObserverWindow();
return queryContainer; return queryContainer;
} }