From a67e37a527c76c024feb5a35b07fec6118503115 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Wed, 15 Mar 2023 13:29:39 +0100
Subject: [PATCH] Add model usage text
---
.../SeptoriaReferenceHumidityModel.java | 64 ++++++++++++++++++-
.../SeptoriaReferenceHumidityModelTest.java | 1 +
2 files changed, 63 insertions(+), 2 deletions(-)
diff --git a/src/main/java/no/nibio/vips/model/septoriareferencehumiditymodel/SeptoriaReferenceHumidityModel.java b/src/main/java/no/nibio/vips/model/septoriareferencehumiditymodel/SeptoriaReferenceHumidityModel.java
index 1f47477..55b3c79 100644
--- a/src/main/java/no/nibio/vips/model/septoriareferencehumiditymodel/SeptoriaReferenceHumidityModel.java
+++ b/src/main/java/no/nibio/vips/model/septoriareferencehumiditymodel/SeptoriaReferenceHumidityModel.java
@@ -207,12 +207,72 @@ public class SeptoriaReferenceHumidityModel implements Model {
@Override
public String getModelUsage(String language) {
- return "TODO";
+ return "Description of required input parameters:\n" +
+"\n" +
+"timeZone - What timezone the calculation is for. See this list of time zones: http://en.wikipedia.org/wiki/List_of_tz_database_time_zones (Column \"TZ\")\n" +
+"\n" +
+"observations - list of weather data. The following parameters are required:\n" +
+"* BT - Leaf wetness (minutes/hour)\n" +
+"* TM - Mean temp (Celcius)\n" +
+"* UM - Relative humidity (%)\n" +
+"* RR - Rainfall (mm)\n" +
+"\n" +
+"The weather data must be hourly data";
}
@Override
public String getSampleConfig() {
- return "TODO";
+ return "{\n" +
+" \"loginInfo\":{\n" +
+" \"username\":\"example\",\n" +
+" \"password\":\"example\"\n" +
+" },\n" +
+" \"modelId\":\"SEPAPIICOL\",\n" +
+" \"configParameters\":{\n" +
+" \"timeZone\":\"Europe/Oslo\",\n" +
+" \"observations\": [{\n" +
+" \"elementMeasurementTypeId\": \"TM\",\n" +
+" \"logIntervalId\": 1,\n" +
+" \"timeMeasured\": \"2019-04-30T22:00:00Z\",\n" +
+" \"value\": 12.96\n" +
+" }, {\n" +
+" \"elementMeasurementTypeId\": \"BT\",\n" +
+" \"logIntervalId\": 1,\n" +
+" \"timeMeasured\": \"2019-04-30T22:00:00Z\",\n" +
+" \"value\": 0.0\n" +
+" }, {\n" +
+" \"elementMeasurementTypeId\": \"UM\",\n" +
+" \"logIntervalId\": 1,\n" +
+" \"timeMeasured\": \"2019-04-30T22:00:00Z\",\n" +
+" \"value\": 77.93\n" +
+" }, {\n" +
+" \"elementMeasurementTypeId\": \"RR\",\n" +
+" \"logIntervalId\": 1,\n" +
+" \"timeMeasured\": \"2019-04-30T22:00:00Z\",\n" +
+" \"value\": 0.0\n" +
+" }, {\n" +
+" \"elementMeasurementTypeId\": \"TM\",\n" +
+" \"logIntervalId\": 1,\n" +
+" \"timeMeasured\": \"2019-04-30T23:00:00Z\",\n" +
+" \"value\": 12.4\n" +
+" }, {\n" +
+" \"elementMeasurementTypeId\": \"BT\",\n" +
+" \"logIntervalId\": 1,\n" +
+" \"timeMeasured\": \"2019-04-30T23:00:00Z\",\n" +
+" \"value\": 0.0\n" +
+" }, {\n" +
+" \"elementMeasurementTypeId\": \"UM\",\n" +
+" \"logIntervalId\": 1,\n" +
+" \"timeMeasured\": \"2019-04-30T23:00:00Z\",\n" +
+" \"value\": 81.3\n" +
+" }, {\n" +
+" \"elementMeasurementTypeId\": \"RR\",\n" +
+" \"logIntervalId\": 1,\n" +
+" \"timeMeasured\": \"2019-04-30T23:00:00Z\",\n" +
+" \"value\": 0.0\n" +
+" }]\n" +
+" }\n" +
+"}";
}
@Override
diff --git a/src/test/java/no/nibio/vips/model/septoriareferencehumiditymodel/SeptoriaReferenceHumidityModelTest.java b/src/test/java/no/nibio/vips/model/septoriareferencehumiditymodel/SeptoriaReferenceHumidityModelTest.java
index cfdc6cc..1c1a147 100644
--- a/src/test/java/no/nibio/vips/model/septoriareferencehumiditymodel/SeptoriaReferenceHumidityModelTest.java
+++ b/src/test/java/no/nibio/vips/model/septoriareferencehumiditymodel/SeptoriaReferenceHumidityModelTest.java
@@ -66,6 +66,7 @@ public class SeptoriaReferenceHumidityModelTest {
config.setConfigParameter("timeZone", "Europe/Oslo");
SeptoriaReferenceHumidityModel instance = new SeptoriaReferenceHumidityModel();
instance.setConfiguration(config);
+ //System.out.println(config.toJSON());
List<Result> result = instance.getResult();
//result.forEach(r->System.out.println(r.toString()));
--
GitLab