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 ff3cc28dc2728ef7de36ebf0a63e4c0d52b90377..150dc35bcc023825f691d4007a113f5c51ef1fbd 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 320d257e2afd68345be0c68c05012c61eb99b9ba..a50095154314fcc2ae062e5454ecb2e4fa83f456 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) {