From 556b4de76c5882b284bd7ed95b1c331914714784 Mon Sep 17 00:00:00 2001 From: Tor-Einar Skog <tor-einar.skog@nibio.no> Date: Wed, 6 Sep 2017 14:14:31 +0200 Subject: [PATCH] Refactoring Result object --- .../vips/model/applescabmodel/AppleScabModel.java | 2 +- .../model/applescabmodel/AppleScabModelTest.java | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/main/java/no/nibio/vips/model/applescabmodel/AppleScabModel.java b/src/main/java/no/nibio/vips/model/applescabmodel/AppleScabModel.java index 714b2e2..d36de9f 100755 --- a/src/main/java/no/nibio/vips/model/applescabmodel/AppleScabModel.java +++ b/src/main/java/no/nibio/vips/model/applescabmodel/AppleScabModel.java @@ -129,7 +129,7 @@ public class AppleScabModel extends I18nImpl implements Model{ for(Date timeStamp:this.calculations.getSortedDateKeys()) { Result result = new ResultImpl(); - result.setResultValidTime(timeStamp); + result.setValidTimeStart(timeStamp); result.setValue(CommonNamespaces.NS_FORECAST, "THRESHOLD_LOW", MILLS_THRESHOLD_YELLOW_WARNING.toString()); result.setValue(CommonNamespaces.NS_FORECAST, "THRESHOLD_HIGH", MILLS_THRESHOLD_RED_WARNING.toString()); diff --git a/src/test/java/no/nibio/vips/model/applescabmodel/AppleScabModelTest.java b/src/test/java/no/nibio/vips/model/applescabmodel/AppleScabModelTest.java index 0b7d38d..1413543 100755 --- a/src/test/java/no/nibio/vips/model/applescabmodel/AppleScabModelTest.java +++ b/src/test/java/no/nibio/vips/model/applescabmodel/AppleScabModelTest.java @@ -19,9 +19,6 @@ package no.nibio.vips.model.applescabmodel; -import no.nibio.vips.model.applescabmodel.AppleScabCalculations; -import no.nibio.vips.model.applescabmodel.MillsTable; -import no.nibio.vips.model.applescabmodel.AppleScabModel; import com.fasterxml.jackson.core.JsonFactory; import java.io.BufferedInputStream; import java.io.IOException; @@ -36,7 +33,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.fail; -import junit.framework.Test; import junit.framework.TestCase; import no.nibio.vips.entity.ModelConfiguration; import no.nibio.vips.entity.Result; @@ -107,7 +103,7 @@ public class AppleScabModelTest extends TestCase { if(result.getValue(instance.getModelId().toString(), AppleScabCalculations.ACCUMULATED_TEMPERATURE) != null) { System.out.println( - format.format(result.getResultValidTime()) + + format.format(result.getValidTimeStart()) + "\t" + result.getValue(CommonNamespaces.NS_WEATHER, AppleScabCalculations.ACCUMULATED_TEMPERATURE) + "\t" + result.getValue(CommonNamespaces.NS_WEATHER, AppleScabCalculations.AGGREGATED_LEAF_WETNESS) + "\t" + result.getValue(CommonNamespaces.NS_WEATHER, AppleScabCalculations.AGGREGATED_TEMPERATURE) + @@ -128,7 +124,7 @@ public class AppleScabModelTest extends TestCase { for(Result result:results) { System.out.println( - format.format(result.getResultValidTime()) + + format.format(result.getValidTimeStart()) + "\t" + result.getValue(instance.getModelId().toString(), AppleScabCalculations.ACCUMULATED_MILLS) + "\t" + result.getValue(instance.getModelId().toString(), AppleScabCalculations.ASCOSPORE_MATURITY) + "\t" + result.getValue(CommonNamespaces.NS_WEATHER, "TM") + @@ -182,7 +178,7 @@ public class AppleScabModelTest extends TestCase { if(result.getValue(instance.getModelId().toString(), AppleScabCalculations.ACCUMULATED_TEMPERATURE)!= null) { System.out.println( - format.format(result.getResultValidTime()) + + format.format(result.getValidTimeStart()) + "\t" + result.getValue(CommonNamespaces.NS_WEATHER, AppleScabCalculations.ACCUMULATED_TEMPERATURE) + "\t" + result.getValue(CommonNamespaces.NS_WEATHER, AppleScabCalculations.AGGREGATED_LEAF_WETNESS) + "\t" + result.getValue(CommonNamespaces.NS_WEATHER, AppleScabCalculations.AGGREGATED_TEMPERATURE) + @@ -203,7 +199,7 @@ public class AppleScabModelTest extends TestCase { for(Result result:results) { System.out.println( - format.format(result.getResultValidTime()) + + format.format(result.getValidTimeStart()) + "\t" + result.getValue(instance.getModelId().toString(), AppleScabCalculations.ACCUMULATED_MILLS) + "\t" + result.getValue(instance.getModelId().toString(), AppleScabCalculations.ASCOSPORE_MATURITY) + "\t" + result.getValue(CommonNamespaces.NS_WEATHER, "TM") + -- GitLab