diff --git a/data/carData.rdf b/data/carData.rdf index 1b61a6e..3ce4bdd 100644 --- a/data/carData.rdf +++ b/data/carData.rdf @@ -7,15 +7,56 @@ xmlns:simobjects="http://example.org/carSim/objects#" xmlns:simontology="http://example.org/carSim/carSimulationOntology#"> + - - 3500 - 3.5 - 800 + + + + + + + + + + + + + + + + + + + + + + + + 2000 + 4300 2.9 + 3.2 + B + + + + + 800 + 1900 + 3.5 + 3.8 + B + + + + + 1400 + 2500 + 2.6 + 3.0 B @@ -24,10 +65,38 @@ - - Max - +49 12345 + Max Mustermann + +49 111 123456789 B + + + Simone Mustermann + +49 111 321654987 + B + + + + + Carl Chaos + +49 111 112112112 + B + + + + + Vincent Vorsicht + +49 111 000000000 + B + + + + + Erwin Eilig + +49 111 007007007 + B + + + diff --git a/data/carSimulationOntology.owl b/data/carSimulationOntology.owl index 2cc49f8..b5273b7 100644 --- a/data/carSimulationOntology.owl +++ b/data/carSimulationOntology.owl @@ -35,6 +35,16 @@ + + + + + + + + + + @@ -44,6 +54,15 @@ + + + + + + + + + @@ -85,25 +104,6 @@ - - - - - - - - - - - - - - - - - - - @@ -123,6 +123,25 @@ + + + + + + + + + + + + + + + + + + + @@ -260,6 +279,12 @@ + + + + + + diff --git a/data/carSimulationTBox.rdf b/data/carSimulationTBox.rdf index 380cd56..ba2082d 100644 --- a/data/carSimulationTBox.rdf +++ b/data/carSimulationTBox.rdf @@ -2,65 +2,77 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"> - + - + - + - - + - - + + - - + + - - + + - - + + - - + + + + + + - - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + + + + + + + + + + + diff --git a/src/main/java/lu/jpt/csparqltest/Main.java b/src/main/java/lu/jpt/csparqltest/Main.java index 243a906..8096344 100644 --- a/src/main/java/lu/jpt/csparqltest/Main.java +++ b/src/main/java/lu/jpt/csparqltest/Main.java @@ -34,7 +34,7 @@ public class Main { CsparqlEngine engine = new CsparqlEngineImpl(); engine.initialize(true); - // Add static knowledge into local graph from file + // Add local background knowledge from file into graph try { engine.putStaticNamedModel("http://example.org/carSimKnowledgeGraph", CsparqlUtils.serializeRDFFile("data/carData.rdf")); } catch (Exception e) { diff --git a/src/main/java/lu/jpt/csparqltest/rentacar/Car.java b/src/main/java/lu/jpt/csparqltest/rentacar/Car.java index 3f163b3..05bce13 100644 --- a/src/main/java/lu/jpt/csparqltest/rentacar/Car.java +++ b/src/main/java/lu/jpt/csparqltest/rentacar/Car.java @@ -13,7 +13,7 @@ public class Car { // Fix knowledge about the available car types: private static final String[] CAR_TYPENAME = {"A", "B", "C"}; - private static final String[] REQUIRED_DRIVER_LICENSE = {"B", "B", "C"}; + private static final String[] REQUIRED_DRIVER_LICENSE = {"B", "B", "B"}; private static final int[] MIN_RPM = {2000, 800, 1400}; private static final int[] MAX_RPM = {4300, 1900, 2500}; private static final double[] MIN_TIRE_PRESSURE = {2.9, 3.5, 2.6};