From 3b4cfc90d88fa569334a1f3b0998fe1cc5360e2b Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@bioforsk.no>
Date: Thu, 23 Jun 2016 14:59:00 +0200
Subject: [PATCH] Added extra result parameter
---
.../no/nibio/vips/model/downcastmodel/DOWNCASTModel.java | 5 ++++-
.../java/no/nibio/vips/model/downcastmodel/DataMatrix.java | 1 +
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/main/java/no/nibio/vips/model/downcastmodel/DOWNCASTModel.java b/src/main/java/no/nibio/vips/model/downcastmodel/DOWNCASTModel.java
index 18da402..8930904 100644
--- a/src/main/java/no/nibio/vips/model/downcastmodel/DOWNCASTModel.java
+++ b/src/main/java/no/nibio/vips/model/downcastmodel/DOWNCASTModel.java
@@ -82,6 +82,7 @@ public class DOWNCASTModel extends I18nImpl implements Model {
Integer sporulationValue = this.dataMatrix.getParamIntValueForDate(currentDate, DataMatrix.SPORULATION_VALUE);
Integer infectionDirectlyAfterSporulation = this.dataMatrix.getParamIntValueForDate(currentDate, DataMatrix.INFECTION_DIRECTLY_AFTER_SPORULATION);
Date infectionTimeAfterSporulation = this.dataMatrix.getParamDateValueForDate(currentDate, DataMatrix.INFECTION_TIME_AFTER_SPORULATION);
+ Boolean isInfectionPredictedToday = isInfectionPredictedToday(currentDate);
result.setValue(DOWNCASTModel.MODEL_ID.toString(), DataMatrix.SPORULATION_VALUE,
String.valueOf(sporulationValue));
@@ -89,10 +90,12 @@ public class DOWNCASTModel extends I18nImpl implements Model {
String.valueOf(infectionDirectlyAfterSporulation));
result.setValue(DOWNCASTModel.MODEL_ID.toString(), DataMatrix.INFECTION_TIME_AFTER_SPORULATION,
infectionTimeAfterSporulation != null ? String.valueOf(infectionTimeAfterSporulation) : "");
+ result.setValue(DOWNCASTModel.MODEL_ID.toString(), DataMatrix.INFECTION_LATER_AFTER_SPORULATION,
+ isInfectionPredictedToday ? "1" : "0");
Integer warningStatus = Result.WARNING_STATUS_NO_RISK;
if(infectionDirectlyAfterSporulation == 1
- || isInfectionPredictedToday(currentDate) // Checks today and three days back for prediction
+ || isInfectionPredictedToday // Checks today and three days back for prediction
)
{
warningStatus = Result.WARNING_STATUS_HIGH_RISK;
diff --git a/src/main/java/no/nibio/vips/model/downcastmodel/DataMatrix.java b/src/main/java/no/nibio/vips/model/downcastmodel/DataMatrix.java
index 2d2d5c8..85dfadf 100644
--- a/src/main/java/no/nibio/vips/model/downcastmodel/DataMatrix.java
+++ b/src/main/java/no/nibio/vips/model/downcastmodel/DataMatrix.java
@@ -28,5 +28,6 @@ import no.nibio.vips.util.DateMap;
public class DataMatrix extends DateMap{
public final static String SPORULATION_VALUE = "SPORULATION_VALUE";
public final static String INFECTION_DIRECTLY_AFTER_SPORULATION = "IDAS";
+ public final static String INFECTION_LATER_AFTER_SPORULATION = "ILAS";
public final static String INFECTION_TIME_AFTER_SPORULATION = "ITAS";
}
--
GitLab