diff --git a/src/main/java/no/nibio/vips/model/alternariamodel/AlternariaModel.java b/src/main/java/no/nibio/vips/model/alternariamodel/AlternariaModel.java index 414efc264f90200768f81410f5a6580bb2f3b104..8bcef03622304dda80f8a344e82e342e69390965 100644 --- a/src/main/java/no/nibio/vips/model/alternariamodel/AlternariaModel.java +++ b/src/main/java/no/nibio/vips/model/alternariamodel/AlternariaModel.java @@ -136,6 +136,7 @@ public class AlternariaModel extends I18nImpl implements Model{ result.setValue(CommonNamespaces.NS_WEATHER, DataMatrix.TEMPERATURE_MEAN, dFormat.format(this.dataMatrix.getParamValueForDate(currentDate, DataMatrix.TEMPERATURE_MEAN))); result.setValue(NAME_MODEL_ID, DataMatrix.WET_HOUR, iFormat.format(this.dataMatrix.getParamValueForDate(currentDate, DataMatrix.LEAF_WETNESS_DURATION))); + result.setValue(NAME_MODEL_ID, DataMatrix.DAILY_DISEASE_SEVERITY_VALUE_SUM, iFormat.format(accumulatedDSV)); result.setValue(NAME_MODEL_ID, DataMatrix.DAILY_DISEASE_SEVERITY_VALUE, iFormat.format(this.dataMatrix.getParamValueForDate(currentDate, DataMatrix.DAILY_DISEASE_SEVERITY_VALUE))); results.add(result); @@ -144,7 +145,8 @@ public class AlternariaModel extends I18nImpl implements Model{ cal.add(Calendar.DATE, 1); currentDate = cal.getTime(); } - + //System.out.println("DataMatrix : "+dataMatrix); + //System.out.println("-----------------------------------------------------------------"); return results; } @@ -738,7 +740,7 @@ public class AlternariaModel extends I18nImpl implements Model{ } else { - // 20 -- 25 + // e.g. 20 -- 30 if((accumulatedDSV < THRESHOLD_DSV_MAX) && (accumulatedDSV >= (THRESHOLD_DSV_MIN - THRESHOLD_DSV_BASE)) ) { result = Result.WARNING_STATUS_MINOR_RISK; diff --git a/src/main/java/no/nibio/vips/model/alternariamodel/DataMatrix.java b/src/main/java/no/nibio/vips/model/alternariamodel/DataMatrix.java index 9bc8468e7512a0250127c8be4ef9f6aa96f1c767..c7789b8bc05f4a3a50de291c92d31bec73b1e6c3 100644 --- a/src/main/java/no/nibio/vips/model/alternariamodel/DataMatrix.java +++ b/src/main/java/no/nibio/vips/model/alternariamodel/DataMatrix.java @@ -48,6 +48,7 @@ public class DataMatrix extends DateMap{ public final static String LEAF_WETNESS_DURATION = "BT"; // Leaf wetness 2 m, minutes per hour public final static String TEMPERATURE_MEAN = "TM"; // Mean Temperature public final static String DAILY_DISEASE_SEVERITY_VALUE = "DSV"; // Daily Disease Severity Value + public final static String DAILY_DISEASE_SEVERITY_VALUE_SUM= "DSV_SUM"; // Daily Disease Severity Value public final static String SPRAYING_DATES = "sprayingDates";// Spraying dates public final static String SPRAYING_DATE = "sprayingDate"; // Spray Date