From 316b8bec7498b62afc7e8185883a30b54ea287fe Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Mon, 20 Mar 2023 10:29:46 +0100
Subject: [PATCH] Remove April 1st as limiting start date
---
.../RoughageNutritionModel.java | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/src/main/java/no/bioforsk/vips/model/roughagenutritionmodel/RoughageNutritionModel.java b/src/main/java/no/bioforsk/vips/model/roughagenutritionmodel/RoughageNutritionModel.java
index 91da5f9..d4b523b 100755
--- a/src/main/java/no/bioforsk/vips/model/roughagenutritionmodel/RoughageNutritionModel.java
+++ b/src/main/java/no/bioforsk/vips/model/roughagenutritionmodel/RoughageNutritionModel.java
@@ -99,18 +99,12 @@ public class RoughageNutritionModel implements Model {
);
List<Result> results = new ArrayList<>();
-
- // Get april first of the current year
- Calendar cal = Calendar.getInstance(this.timeZone);
- cal.setTime(firstHarvest);
- cal.set(Calendar.MONTH, Calendar.APRIL);
- cal.set(Calendar.DATE, 1);
- Date aprilFirst = new WeatherUtil().normalizeToExactDate(cal.getTime(), timeZone);
-
+
// Get all labels
//Set labels = resultMatrix.getValueLabelsForDate(aprilFirst);
- Date resultDate = aprilFirst;
- // Iterate all dates in matrix, starting April 1st
+ Date resultDate = firstPossibleGrowthStartDate;
+ // Iterate all dates in matrix, starting on the firstPossibleGrowthStartDate
+ Calendar cal = Calendar.getInstance(this.timeZone);
while(resultMatrix.getValueLabelsForDate(resultDate) != null)
{
Result result = new ResultImpl();
--
GitLab