Added more weather data

src/test/java/no/bioforsk/vips/model/roughagenutritionmodel/RoughageNutritionModelTest.java

@@ -80,15 +80,15 @@ public class RoughageNutritionModelTest {
         System.out.println("getResult");
         try
         {
-            ModelConfiguration config = this.getConfiguration("/weatherdata_boe_2015.json");
+            ModelConfiguration config = this.getConfiguration("/weatherdata_kvithamar_2016.json");
             Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("Europe/Oslo"));
-            cal.set(2015, Calendar.JUNE, 1, 0, 0, 0);
+            cal.set(2016, Calendar.JUNE, 1, 0, 0, 0);
             cal.set(Calendar.MILLISECOND,0);
             config.setConfigParameter("timeZone","Europe/Oslo");
             config.setConfigParameter("firstHarvest", cal.getTime());
             config.setConfigParameter("soilType", RoughageNutritionModel.JORDTYPE_SAND);
             config.setConfigParameter("cloverShare", RoughageNutritionModel.ENGSAMMENSETNING_KLOEVERANDEL_LITEN);
-            String[] optimizationInfoLines = {"2015-06-02,2,3,,,,"};
+            String[] optimizationInfoLines = {"2016-06-02,2,3,,,,"};
             List<String> optimizationInfo = Arrays.asList(optimizationInfoLines);
             config.setConfigParameter("optimizationInfo", optimizationInfo);
             RoughageNutritionModel instance = new RoughageNutritionModel();
@@ -97,12 +97,12 @@ public class RoughageNutritionModelTest {
             List<Result> result = instance.getResult();
             //assertEquals(expResult, result);
             assertNotNull(result);
-            /*Collections.sort(result);
+            Collections.sort(result);
             //System.out.println("Number of result objects: " + result.size());
             for(Result r:result)
             {
                 System.out.println(r);
-            }*/
+            }
         }
         catch(ConfigValidationException | ModelExcecutionException ex)
         {