From 5a2f0b16521858432700d4db8923fe514eac1fae Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Mon, 20 Apr 2020 16:55:48 +0200
Subject: [PATCH] Bugfix in calculation
---
.../vips/model/bremialactucaemodel/BremiaLactucaeModel.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/no/nibio/vips/model/bremialactucaemodel/BremiaLactucaeModel.java b/src/main/java/no/nibio/vips/model/bremialactucaemodel/BremiaLactucaeModel.java
index 63a9a04..b2f2584 100755
--- a/src/main/java/no/nibio/vips/model/bremialactucaemodel/BremiaLactucaeModel.java
+++ b/src/main/java/no/nibio/vips/model/bremialactucaemodel/BremiaLactucaeModel.java
@@ -285,6 +285,7 @@ public class BremiaLactucaeModel extends I18nImpl implements Model {
{
this.dataMatrix.setParamDoubleValueForDate(o.getTimeMeasured(), o.getElementMeasurementTypeId(), o.getValue());
}
+ //System.out.println(this.dataMatrix.toCSV());
}
/**
@@ -336,9 +337,10 @@ public class BremiaLactucaeModel extends I18nImpl implements Model {
throw new ModelExcecutionException("Not able to determine sunrise today (" + currentDate + "). Too early?");
}
Date endOfDataToday = (thisDayInYear < lastDayWithWeatherData) ? justBeforeMidnight
- : getDateWithCurrentTime(currentDate);
+ : getDateWithCurrentTime(currentDate).before(lastTimeWithWeatherData) ? getDateWithCurrentTime(currentDate)
+ : lastTimeWithWeatherData;
- //System.out.println(currentDate + ": sunsetYesterday=" + sunsetYesterday + ", sunriseToday=" + sunriseToday );
+ //System.out.println(currentDate + ": sunsetYesterday=" + sunsetYesterday + ", sunriseToday=" + sunriseToday + ", endOfDataToday=" + endOfDataToday );
// Rule #1 & #2 (Sporulation the night before yesterday?)
Boolean enoughRelativeHumidityYesterdayNight = isEnoughRelativeHumidityInPeriod(
--
GitLab