From fcd00593bc68fdd96ad78660e93e275ea6327949 Mon Sep 17 00:00:00 2001
From: treinar <treinar@treinar-laptop>
Date: Fri, 8 Sep 2017 14:37:05 +0200
Subject: [PATCH] Refactoring Result object

---
 .../java/no/nibio/vips/model/naerstadmodel/NaerstadModel.java | 2 +-
 .../no/nibio/vips/model/naerstadmodel/NaerstadModelTest.java  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/no/nibio/vips/model/naerstadmodel/NaerstadModel.java b/src/main/java/no/nibio/vips/model/naerstadmodel/NaerstadModel.java
index ff3cc28..150dc35 100755
--- a/src/main/java/no/nibio/vips/model/naerstadmodel/NaerstadModel.java
+++ b/src/main/java/no/nibio/vips/model/naerstadmodel/NaerstadModel.java
@@ -102,7 +102,7 @@ public class NaerstadModel extends I18nImpl implements Model{
             {
 
                 Result result = new ResultImpl();
-                result.setResultValidTime(thePresent);
+                result.setValidTimeStart(thePresent);
                 Double RISK = this.backgroundData.getParamDoubleValueForDate(thePresent, NaerstadModelBackgroundDataMatrix.RISK);
                 // TODO: Find better way of terminating?
                 if(RISK == null)
diff --git a/src/test/java/no/nibio/vips/model/naerstadmodel/NaerstadModelTest.java b/src/test/java/no/nibio/vips/model/naerstadmodel/NaerstadModelTest.java
index 320d257..a500951 100755
--- a/src/test/java/no/nibio/vips/model/naerstadmodel/NaerstadModelTest.java
+++ b/src/test/java/no/nibio/vips/model/naerstadmodel/NaerstadModelTest.java
@@ -122,12 +122,12 @@ public class NaerstadModelTest extends TestCase {
             cal.set(Calendar.MILLISECOND, 0);
             for(Result res:results)
             {
-                if(res.getResultValidTime().compareTo(cal.getTime()) == 0)
+                if(res.getValidTimeStart().compareTo(cal.getTime()) == 0)
                 {
                     assertTrue(res.getValue(instance.getModelId().toString(),"RISK").equals("5.36"));
                 }
                     
-                System.out.println("Res[" + res.getResultValidTime() + "]:" + res.getAllValues());
+                System.out.println("Res[" + res.getValidTimeStart()+ "]:" + res.getAllValues());
             }
             assertTrue(results.size() == 209);
         } catch (ConfigValidationException | ModelExcecutionException ex) {
-- 
GitLab