From 0c447db4490031484ae0b29ccb710e27393d4aa3 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@bioforsk.no>
Date: Tue, 14 Jun 2016 09:32:37 +0200
Subject: [PATCH] Bugfix on end of data series
---
.../septoriaapiicolamodel/SeptoriaApiicolaModel.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/main/java/no/nibio/vips/model/septoriaapiicolamodel/SeptoriaApiicolaModel.java b/src/main/java/no/nibio/vips/model/septoriaapiicolamodel/SeptoriaApiicolaModel.java
index 9f70300..1fd7767 100644
--- a/src/main/java/no/nibio/vips/model/septoriaapiicolamodel/SeptoriaApiicolaModel.java
+++ b/src/main/java/no/nibio/vips/model/septoriaapiicolamodel/SeptoriaApiicolaModel.java
@@ -322,10 +322,18 @@ public class SeptoriaApiicolaModel extends I18nImpl implements Model{
}
private Boolean isWetConditionsMet(Date startOfYesterdayData, Date endOfCurrentDay) throws ModelExcecutionException {
+ // Check if leaf wetness data series ends sometime today
+ Date lastLeafWetnessTime = this.dataMatrix.getLastDateWithParameterValue(DataMatrix.BT);
+ if(endOfCurrentDay.after(lastLeafWetnessTime))
+ {
+ endOfCurrentDay = lastLeafWetnessTime;
+ }
+
+ // Check conditions
Calendar cal = Calendar.getInstance(timeZone);
Date currentHour = startOfYesterdayData;
Integer consecutiveWetHours = 0;
- while(currentHour.before(endOfCurrentDay))
+ while(currentHour.compareTo(endOfCurrentDay) <= 0)
{
Double hourLeafWetness = this.dataMatrix.getParamDoubleValueForDate(currentHour, DataMatrix.BT);
if(hourLeafWetness == null)
--
GitLab