From 7e0a5a6cab71bf586b7dd0fb14a16f34e8ce5510 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Wed, 2 May 2018 15:08:54 +0200
Subject: [PATCH] Bugfix in growth start date calculation
---
.../RoughageNutritionModelImpl.java | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/main/java/no/bioforsk/vips/model/roughagenutritionmodel/RoughageNutritionModelImpl.java b/src/main/java/no/bioforsk/vips/model/roughagenutritionmodel/RoughageNutritionModelImpl.java
index 419536b..bbfca5f 100755
--- a/src/main/java/no/bioforsk/vips/model/roughagenutritionmodel/RoughageNutritionModelImpl.java
+++ b/src/main/java/no/bioforsk/vips/model/roughagenutritionmodel/RoughageNutritionModelImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016 NIBIO <http://www.nibio.no/>.
+ * Copyright (c) 2018 NIBIO <http://www.nibio.no/>.
*
* This file is part of RoughageNutritionModel.
* RoughageNutritionModel is free software: you can redistribute it and/or modify
@@ -45,7 +45,7 @@ import org.apache.commons.math.optimization.NelderMead;
import org.apache.commons.math.optimization.PointCostPair;
/**
- * @copyright 2016 <a href="http://www.nibio.no/">NIBIO</a>
+ * @copyright 2018 <a href="http://www.nibio.no/">NIBIO</a>
* @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
public class RoughageNutritionModelImpl implements CostFunction {
@@ -1315,9 +1315,9 @@ public class RoughageNutritionModelImpl implements CostFunction {
antallPaafoelgende5DoegnsMiddelOverTerskel = 0;
}
}
-
+ //System.out.println("antallPaafoelgende5DoegnsMiddelOverTerskel=" + antallPaafoelgende5DoegnsMiddelOverTerskel);
//System.out.println("[RoughageNutritionModel/getVekststart] dato= " + doegnVerdi.getTimeMeasured().toString() + ", sumSiste5DoegnVerdier / 5 = " + (sumSiste5DoegnVerdier / 5));
- if (antallPaafoelgende5DoegnsMiddelOverTerskel == 3) {
+ if (antallPaafoelgende5DoegnsMiddelOverTerskel >= 3) {
// If soil temps not provided, use only air temp
if (doegnVerdiJordtemp == null) {
//System.out.println("Ingen jordtemp! Vekststart=" + doegnVerdi.getTimeMeasured());
@@ -1328,8 +1328,9 @@ public class RoughageNutritionModelImpl implements CostFunction {
for (WeatherObservation soilTemp : siste7DoegnVerdierJordtemp) {
soilTempSum += soilTemp.getValue();
}
+ //System.out.println("soilTempSum / siste7DoegnVerdierJordtemp.size()=" + soilTempSum / siste7DoegnVerdierJordtemp.size() );
if (soilTempSum / siste7DoegnVerdierJordtemp.size() > jordtempTerskel) {
- //System.out.println("Jordtempsnitt=" + soilTempSum/siste8DoegnVerdierJordtemp.size());
+ //System.out.println("Jordtempsnitt=" + soilTempSum/siste7DoegnVerdierJordtemp.size());
return doegnVerdi.getTimeMeasured();
}
}
@@ -1951,7 +1952,7 @@ public class RoughageNutritionModelImpl implements CostFunction {
}
differanse += Math.pow(maaltUtviklingstrinn - beregnetUtviklingstrinn, 2);
}
- System.out.println("Differanse=" + differanse);
+ //System.out.println("Differanse=" + differanse);
return differanse;
}
--
GitLab