From 8a842717a3251db80d3aae0228abf566fccedd87 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Thu, 4 Apr 2019 15:34:52 +0200
Subject: [PATCH] No real change, just removing an unused variable and changing
some debug output
---
.../ZymoseptoriaSimpleRiskGridModelPreprocessor.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/main/java/no/nibio/vips/logic/scheduling/model/grid/preprocessor/ZymoseptoriaSimpleRiskGridModelPreprocessor.java b/src/main/java/no/nibio/vips/logic/scheduling/model/grid/preprocessor/ZymoseptoriaSimpleRiskGridModelPreprocessor.java
index a8789977..e22771e2 100644
--- a/src/main/java/no/nibio/vips/logic/scheduling/model/grid/preprocessor/ZymoseptoriaSimpleRiskGridModelPreprocessor.java
+++ b/src/main/java/no/nibio/vips/logic/scheduling/model/grid/preprocessor/ZymoseptoriaSimpleRiskGridModelPreprocessor.java
@@ -92,9 +92,10 @@ public class ZymoseptoriaSimpleRiskGridModelPreprocessor extends ModelRunPreproc
System.out.println("Problem with station " + station.getPointOfInterest().getName() + " (#" + station.getPointOfInterestId() + "): " + ex.getMessage());
}
- /*
+
// TODO: Remove this debug
- if(station.getPointOfInterestId().equals(302))
+ /*
+ if(station.getPointOfInterestId().equals(345))
{
Collections.sort(stationObs);
stationObs.forEach(obs->System.out.println(obs));
@@ -120,7 +121,6 @@ public class ZymoseptoriaSimpleRiskGridModelPreprocessor extends ModelRunPreproc
{
List<WeatherObservation> stationObs;// = new ArrayList<>();
WeatherDataSourceUtil wdsUtil = new WeatherDataSourceUtil();
- WeatherUtil wUtil = new WeatherUtil();
// We run this for max 1 week back in time to make sure it doesn't crash
ZonedDateTime aWeekAgo = ZonedDateTime.ofInstant(SystemTime.getSystemTime().toInstant(), ZoneId.of("Europe/Oslo")).minus(1, ChronoUnit.WEEKS);
@@ -141,7 +141,6 @@ public class ZymoseptoriaSimpleRiskGridModelPreprocessor extends ModelRunPreproc
true,
new HashSet<>(Arrays.asList(WeatherObservation.LOG_INTERVAL_ID_1H,WeatherObservation.LOG_INTERVAL_ID_3H, WeatherObservation.LOG_INTERVAL_ID_6H))
);
- //stationObs = wUtil.checkForAndFixHourlyTimeSeriesHoles(stationObs,6);
return stationObs;
} catch (WeatherDataSourceException ex ) {
throw new PreprocessorException(ex.getMessage());
--
GitLab