Merge branch 'TES_weatherdatafix_201905' into 'Aalto_spring2019'

Updated Norw. test data, fixed a couple of things in the tests

See merge request VIPS/Model_FINNCEREAL!3

src/test/java/fi/luke/vips/model/cerealmodels/FinnCerealModelsTest.java

 package fi.luke.vips.model.cerealmodels;
 
-import static org.junit.Assert.*;
-
-import java.util.Calendar;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
@@ -10,7 +7,6 @@ import java.util.stream.Collectors;
 
 import org.junit.Test;
 
-import fi.luke.vips.model.cerealmodels.FinnCerealModels;
 import no.nibio.vips.entity.ModelConfiguration;
 import no.nibio.vips.entity.Result;
 import no.nibio.vips.entity.WeatherObservation;
@@ -21,11 +17,14 @@ import no.nibio.vips.util.test.WeatherDataFileReader;
 
 public class FinnCerealModelsTest {
 
-	private static boolean printOutput = true;
-	private static boolean printTime = false;
-	private static String shortData ="/2_day_weather_data.json";
-	private static String longData = "/2016-june-september_fixed.json";
-	private static String altData ="/2016-june-september2_fixed.json";
+	private static final boolean printOutput = true;
+	private static final boolean printTime = false;
+	private static final String shortData ="/2_day_weather_data.json";
+	private static final String longData = "/2016-june-september_fixed.json";
+	private static final String altData ="/2016-june-september2_fixed.json";
+        private static final String norwegianData = "/2019_Aas_Norway.json";
+        
+        private static final String timeZone = "Europe/Oslo"; // Change this as you change data files
 	
 	@Test
 	public void shortTestDresch() {
@@ -46,7 +45,7 @@ public class FinnCerealModelsTest {
 	public void longTestDresch() {
 		System.out.println("Dreschlera");
 		if(printTime) System.out.println(new Date().getTime());
-		generalTest(FinnCerealModels.DRESCHLERA, "DRESCHLERA", longData);
+		generalTest(FinnCerealModels.DRESCHLERA, "DRESCHLERA", norwegianData);
 		if(printTime) System.out.println(new Date().getTime());
 	}
 	
@@ -54,7 +53,7 @@ public class FinnCerealModelsTest {
 	public void longTestPyre() {
 		System.out.println("Pyrenophora");
 		if(printTime) System.out.println(new Date().getTime());
-		generalTest(FinnCerealModels.PYRENOPHORA, "PYRENOPHORA",longData);
+		generalTest(FinnCerealModels.PYRENOPHORA, "PYRENOPHORA",norwegianData);
 		if(printTime) System.out.println(new Date().getTime());
 	}
 
@@ -62,7 +61,7 @@ public class FinnCerealModelsTest {
 	public void longTestStago() {
 		System.out.println("Stagonospora");
 		if(printTime) System.out.println(new Date().getTime());
-		generalTest(FinnCerealModels.STAGONOSPORA, "STAGONOSPORA",longData);
+		generalTest(FinnCerealModels.STAGONOSPORA, "STAGONOSPORA",norwegianData);
 		if(printTime) System.out.println(new Date().getTime());
 	}
 	
@@ -70,7 +69,7 @@ public class FinnCerealModelsTest {
 	public void ff2Test() {
 		System.out.println("FF2 wind data test, Stagonospora");
 		if(printTime) System.out.println(new Date().getTime());
-		generalTest(FinnCerealModels.STAGONOSPORA, "STAGONOSPORA",altData);
+		generalTest(FinnCerealModels.STAGONOSPORA, "STAGONOSPORA",norwegianData);
 		if(printTime) System.out.println(new Date().getTime());		
 	}
 
@@ -81,7 +80,7 @@ public class FinnCerealModelsTest {
 					WeatherDataFileReader().getModelConfigurationWithWeatherData(inputFileName,
 							modelPublicName);
 			data.setConfigParameter("model", modelName);
-			data.setConfigParameter("timeZone", "GMT");
+			data.setConfigParameter("timeZone", FinnCerealModelsTest.timeZone);
 			setCommonParameters(data);
 			List<Result> results = null;
 			pm.setConfiguration(data);
@@ -131,12 +130,19 @@ public class FinnCerealModelsTest {
 			windSpeedAll = observations.stream().filter(t -> t.getElementMeasurementTypeId().equals(WeatherElements.WIND_SPEED_10MIN_2M))
 			.collect(Collectors.toList());
 		}
+                System.out.println("First temp is at " + temperature.get(0).getTimeMeasured());
+                        System.out.println("Last temp is at " + temperature.get(temperature.size()-1).getTimeMeasured());
         m.setConfigParameter("temperature", temperature);
         m.setConfigParameter("rainfall", rainfall);
         m.setConfigParameter("rh", rh);
         m.setConfigParameter("windspeed", windSpeedAll);
+        
+        System.out.println("temperature size=" + temperature.size());
+        System.out.println("rainfall size=" + rainfall.size());
+        System.out.println("rh size =" + rh.size());
+        System.out.println("windSpeedAll=" + windSpeedAll.size());
 
-        m.setConfigParameter("timeTillageEffects", new Boolean(false));
+        m.setConfigParameter("timeTillageEffects", Boolean.FALSE);
 		m.setConfigParameter("precedingCrop","Wheat");
 		m.setConfigParameter("tillageMethod","Intensive");
 		m.setConfigParameter("diseaseSusceptibility","Normal");