From e1d8b99f0afc9127a959e587d88fa801a313566b Mon Sep 17 00:00:00 2001
From: bhabesh <bhabesh.mukhopadhyay@nibio.no>
Date: Mon, 6 Apr 2020 15:10:33 +0200
Subject: [PATCH] New Column for summarize DSV

New column DSV_SUM introduce
---
 .../nibio/vips/model/alternariamodel/AlternariaModel.java   | 6 ++++--
 .../no/nibio/vips/model/alternariamodel/DataMatrix.java     | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

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 414efc2..8bcef03 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 9bc8468..c7789b8 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
     
-- 
GitLab