vergnet/tp2-web-sem
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

feat: add measure property

Browse source
This commit is contained in:
Arnaud Vergnet 2022-01-07 14:44:01 +01:00
parent 0843ac7205
commit 361464c94f
3 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/main/java/semantic/controler/DoItYourselfControl.java
View file

@ -18,9 +18,14 @@ public class DoItYourselfControl implements IControlFunctions {
@Override
public void instantiateObservations(List<ObservationEntity> obsList,
String paramURI) {
obsList.forEach(observationEntity -> customModel.createObs(
observationEntity.getValue().toString(),
paramURI,
customModel.createInstant(observationEntity.getTimestamp())));
obsList.forEach(observationEntity -> {
String instant = customModel.createInstant(observationEntity.getTimestamp());
// System.out.println("Adding new observation: " + observationEntity.getValue().toString() + " " + paramURI + " " + instant);
customModel.createObs(
observationEntity.getValue().toString(),
paramURI,
instant
);
});
}
}

6
src/main/java/semantic/model/DoItYourselfModel.java
View file

@ -53,10 +53,14 @@ public class DoItYourselfModel implements IModelFunctions {
String obsInstanceURI = model.createInstance(instantURI + "_" + paramURI + "_" + value, obsClassURI);
String dataValueURI = model.getEntityURI("a pour valeur").get(0);
String datePropertyURI = model.getEntityURI("a pour date").get(0);
String measurePropertyURI = model.getEntityURI("mesure").get(0);
String sensorURI = model.whichSensorDidIt(getInstantTimestamp(instantURI), paramURI);
model.addObjectPropertyToIndividual(obsInstanceURI, measurePropertyURI, paramURI);
model.addDataPropertyToIndividual(obsInstanceURI, dataValueURI, value);
model.addObjectPropertyToIndividual(obsInstanceURI, datePropertyURI, instantURI);
model.addObservationToSensor(obsInstanceURI, sensorURI);
if (sensorURI != null) {
model.addObservationToSensor(obsInstanceURI, sensorURI);
}
return obsInstanceURI;
}
}

2
src/test/java/semantic/TestModelFunctions.java
View file

@ -57,10 +57,12 @@ public class TestModelFunctions {
String obsClassURI = c.getModel().getEntityURI("Observation").get(0);
String hasDataValueURI = c.getModel().getEntityURI("a pour valeur").get(0);
String datePropertyURI = c.getModel().getEntityURI("a pour date").get(0);
String measurePropertyURI = c.getModel().getEntityURI("mesure").get(0);
String sensorURI = c.getModel().whichSensorDidIt("2014-02-13T06:20:00", paramURI);
Assert.assertTrue("L'observation n'est pas une instance de la bonne classe", c.getModel().isOfType(obsURI, obsClassURI));
Assert.assertTrue("L'observation n'a pas la bonne valeur", c.getModel().hasDataPropertyValue(obsURI, hasDataValueURI, value));
Assert.assertTrue("L'observation n'a pas la bonne date", c.getModel().hasObjectProperty(obsURI, datePropertyURI, instantURI));
Assert.assertTrue("L'observation n'est pas rattachée au bon paramètre", c.getModel().hasObjectProperty(obsURI, measurePropertyURI, paramURI));
Assert.assertTrue("L'observation n'est pas rattachée au bon capteur", c.getModel().hasSensorDoneIt(obsURI, sensorURI));
}
}