From 5b637a2815f21cfbb00631594f978054ceb7fb0e Mon Sep 17 00:00:00 2001 From: Tor-Einar Skog <tor-einar.skog@nibio.no> Date: Mon, 6 Mar 2023 15:53:30 +0100 Subject: [PATCH] Add thresholds to output [IDEC-343] --- .../MamestraBrassicaeModel.java | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/src/main/java/no/nibio/vips/model/mamestrabrassicaemodel/MamestraBrassicaeModel.java b/src/main/java/no/nibio/vips/model/mamestrabrassicaemodel/MamestraBrassicaeModel.java index 3725f85..86159e4 100755 --- a/src/main/java/no/nibio/vips/model/mamestrabrassicaemodel/MamestraBrassicaeModel.java +++ b/src/main/java/no/nibio/vips/model/mamestrabrassicaemodel/MamestraBrassicaeModel.java @@ -122,6 +122,35 @@ public class MamestraBrassicaeModel extends I18nImpl implements Model{ } result.setValue(CommonNamespaces.NS_WEATHER, "TMD", dFormat.format(((WeatherObservation)this.dataMatrix.getParamValueForDate(currentDate, DataMatrix.TMD)).getValue())); + // Adding thresholds for model display + result.setValue(this.getModelId().toString(), "THRESHOLD_TMDD_PUPAE", String.valueOf(THRESHOLD_TMDD_PUPAE)); + result.setValue(this.getModelId().toString(), "THRESHOLD_TMDD_EGG_DEPOSIT", String.valueOf(THRESHOLD_TMDD_PUPAE + THRESHOLD_TMDD_EGG_DEPOSIT)); + result.setValue(this.getModelId().toString(), "THRESHOLD_TMDD_LARVAE_1", String.valueOf( + THRESHOLD_TMDD_PUPAE + + THRESHOLD_TMDD_EGG_DEPOSIT + + THRESHOLD_TMDD_EGG_HATCH + + THRESHOLD_TMDD_LARVAE_1 + )); + result.setValue(this.getModelId().toString(), "THRESHOLD_TMDD_LARVAE_3", String.valueOf( + THRESHOLD_TMDD_PUPAE + + THRESHOLD_TMDD_EGG_DEPOSIT + + THRESHOLD_TMDD_EGG_HATCH + + THRESHOLD_TMDD_LARVAE_1 + + THRESHOLD_TMDD_LARVAE_2 + + THRESHOLD_TMDD_LARVAE_3 + )); + result.setValue(this.getModelId().toString(), "THRESHOLD_TMDD_LARVAE_5", String.valueOf( + THRESHOLD_TMDD_PUPAE + + THRESHOLD_TMDD_EGG_DEPOSIT + + THRESHOLD_TMDD_EGG_HATCH + + THRESHOLD_TMDD_LARVAE_1 + + THRESHOLD_TMDD_LARVAE_2 + + THRESHOLD_TMDD_LARVAE_3 + + THRESHOLD_TMDD_LARVAE_4 + + THRESHOLD_TMDD_LARVAE_5) + ); + + retVal.add(result); cal.setTime(currentDate); cal.add(Calendar.DATE, 1); -- GitLab