From 0992988f42dd4587df37f313c98857adc3c73d1f Mon Sep 17 00:00:00 2001 From: Tor-Einar Skog <tor-einar.skog@nibio.no> Date: Wed, 2 May 2018 12:42:06 +0200 Subject: [PATCH] Some adjustments in presented result parameters --- .../nibio/vips/model/septoriahumiditymodel/DataMatrix.java | 4 ++++ .../model/septoriahumiditymodel/SeptoriaHumidityModel.java | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/src/main/java/no/nibio/vips/model/septoriahumiditymodel/DataMatrix.java b/src/main/java/no/nibio/vips/model/septoriahumiditymodel/DataMatrix.java index a9af02b..ae01f55 100644 --- a/src/main/java/no/nibio/vips/model/septoriahumiditymodel/DataMatrix.java +++ b/src/main/java/no/nibio/vips/model/septoriahumiditymodel/DataMatrix.java @@ -41,4 +41,8 @@ public class DataMatrix extends DateMap { public final static String HPH = "HPH"; // Humid period hour (consecutive humid hours) corrected for protection period public final static String HPHPP = "HPHPP"; + // Threshold for consecutive humid hours + public final static String THPHPP = "THPHPP"; + // Is this in the Spraying Protection Period? (1/0) + public final static String SPP = "SPP"; } diff --git a/src/main/java/no/nibio/vips/model/septoriahumiditymodel/SeptoriaHumidityModel.java b/src/main/java/no/nibio/vips/model/septoriahumiditymodel/SeptoriaHumidityModel.java index 13d8e3c..7a664a1 100644 --- a/src/main/java/no/nibio/vips/model/septoriahumiditymodel/SeptoriaHumidityModel.java +++ b/src/main/java/no/nibio/vips/model/septoriahumiditymodel/SeptoriaHumidityModel.java @@ -134,8 +134,13 @@ public class SeptoriaHumidityModel extends I18nImpl implements Model { r.setWarningStatus(currentDate.after(this.date3rdUpperLeafEmerging) && currentDate.before(this.dateGs75) ? Result.WARNING_STATUS_NO_RISK: Result.WARNING_STATUS_NO_WARNING); r.setValue(SeptoriaHumidityModel.MODEL_ID.toString(), DataMatrix.HPH, String.valueOf(humidPeriodHour)); r.setValue(SeptoriaHumidityModel.MODEL_ID.toString(), DataMatrix.HPHPP, String.valueOf(humidPeriodHourInSusceptiblePhase)); + r.setValue(SeptoriaHumidityModel.MODEL_ID.toString(), DataMatrix.THPHPP, String.valueOf(this.thresholdHumidPeriodHours)); r.setValue(SeptoriaHumidityModel.MODEL_ID.toString(), DataMatrix.HH, String.valueOf(humidHour)); r.setValue(SeptoriaHumidityModel.MODEL_ID.toString(), DataMatrix.HHS, String.valueOf(slidingWindowSum)); + if(DateTimeInterval.isDateInIntervals(currentDate, this.protectionPeriods)) + { + r.setValue(SeptoriaHumidityModel.MODEL_ID.toString(), DataMatrix.SPP, "1"); + } r.setValue(CommonNamespaces.NS_WEATHER, WeatherElements.LEAF_WETNESS, String.valueOf(this.dataMatrix.getParamDoubleValueForDate(currentDate, DataMatrix.BT))); r.setValue(CommonNamespaces.NS_WEATHER, WeatherElements.RELATIVE_HUMIDITY_MEAN, String.valueOf(this.dataMatrix.getParamDoubleValueForDate(currentDate, DataMatrix.UM))); r.setValue(CommonNamespaces.NS_WEATHER, WeatherElements.PRECIPITATION, String.valueOf(this.dataMatrix.getParamDoubleValueForDate(currentDate, DataMatrix.RR))); -- GitLab