From 51ab73a6b2d1eb3182c4085727ae6bd02fd86d56 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Thu, 23 May 2024 12:21:20 +0200
Subject: [PATCH] Refactoring of parameters
---
.../vips/model/alternariamodel/AlternariaModel.java | 8 +++-----
.../nibio/vips/model/alternariamodel/DataMatrix.java | 5 +++--
.../model/alternariamodel/AlternariaModelTest.java | 12 ++++++------
3 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/src/main/java/no/nibio/vips/model/alternariamodel/AlternariaModel.java b/src/main/java/no/nibio/vips/model/alternariamodel/AlternariaModel.java
index a8a193c..4b3e53f 100644
--- a/src/main/java/no/nibio/vips/model/alternariamodel/AlternariaModel.java
+++ b/src/main/java/no/nibio/vips/model/alternariamodel/AlternariaModel.java
@@ -72,11 +72,8 @@ public class AlternariaModel extends I18nImpl implements Model {
public final static ModelId MODEL_ID = new ModelId(NAME_MODEL_ID);
public final static int THRESHOLD_LW = 30; // Threshold for leave wetness
private Double THRESHOLD_DSV_MAX = 20.0; // Threshold Minimum for DSV
- public final static String THRESHOLD_DSV_MAX_NAME = "thresholdDSVMax";
public final static int THRESHOLD_DSV_DIFF_MIN_MAX = 5; // Threshold Maximum for DSV
private Double THRESHOLD_DSV_TEMP_MIN = 13.0; // Minimum temp for getting a DSV value
- public final static String THRESHOLD_DSV_TEMP_MIN_NAME = "thresholdDSVTempMin";
-
public final static String YES = "Y"; // Spray Date
public final static String NO = "N";
@@ -151,6 +148,7 @@ public class AlternariaModel extends I18nImpl implements Model {
result.setValue(NAME_MODEL_ID, DataMatrix.THRESHOLD_DSV_BASE,
String.valueOf(THRESHOLD_DSV_MAX - THRESHOLD_DSV_DIFF_MIN_MAX));
result.setValue(NAME_MODEL_ID, DataMatrix.THRESHOLD_DSV_MAX, String.valueOf(THRESHOLD_DSV_MAX));
+ result.setValue(NAME_MODEL_ID, DataMatrix.THRESHOLD_DSV_TEMP_MIN, String.valueOf(this.THRESHOLD_DSV_TEMP_MIN));
results.add(result);
@@ -424,8 +422,8 @@ public class AlternariaModel extends I18nImpl implements Model {
try
{
- this.THRESHOLD_DSV_TEMP_MIN = config.getConfigParameter(AlternariaModel.THRESHOLD_DSV_TEMP_MIN_NAME) != null ? modelUtil.getDouble(config.getConfigParameter(AlternariaModel.THRESHOLD_DSV_TEMP_MIN_NAME)): this.THRESHOLD_DSV_TEMP_MIN;
- this.THRESHOLD_DSV_MAX = config.getConfigParameter(AlternariaModel.THRESHOLD_DSV_MAX_NAME) != null ? modelUtil.getDouble(config.getConfigParameter(AlternariaModel.THRESHOLD_DSV_MAX_NAME)) : this.THRESHOLD_DSV_MAX;
+ this.THRESHOLD_DSV_TEMP_MIN = config.getConfigParameter(DataMatrix.THRESHOLD_DSV_TEMP_MIN) != null ? modelUtil.getDouble(config.getConfigParameter(DataMatrix.THRESHOLD_DSV_TEMP_MIN)): this.THRESHOLD_DSV_TEMP_MIN;
+ this.THRESHOLD_DSV_MAX = config.getConfigParameter(DataMatrix.THRESHOLD_DSV_MAX) != null ? modelUtil.getDouble(config.getConfigParameter(DataMatrix.THRESHOLD_DSV_MAX)) : this.THRESHOLD_DSV_MAX;
}
catch(ClassCastException ex)
{
diff --git a/src/main/java/no/nibio/vips/model/alternariamodel/DataMatrix.java b/src/main/java/no/nibio/vips/model/alternariamodel/DataMatrix.java
index 6b5588f..f39709c 100644
--- a/src/main/java/no/nibio/vips/model/alternariamodel/DataMatrix.java
+++ b/src/main/java/no/nibio/vips/model/alternariamodel/DataMatrix.java
@@ -42,6 +42,7 @@ import no.nibio.vips.util.DateMap;
/**
*
* @author bhabesh
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
public class DataMatrix extends DateMap{
public final static String WET_HOUR = "WH"; // Leaf wetness 2 m, minutes per hour
@@ -53,8 +54,8 @@ public class DataMatrix extends DateMap{
public final static String SPRAYING_DATE = "sprayingDate"; // Spray Date
public final static String THRESHOLD_DSV_BASE = "THRESHOLD_DSV_BASE"; // THRESHOLD_DSV_BASE
- public final static String THRESHOLD_DSV_MAX = "THRESHOLD_DSV_MAX"; // THRESHOLD_DSV_MAX
-
+ public final static String THRESHOLD_DSV_MAX = "thresholdDSVMax"; // THRESHOLD_DSV_MAX
+ public final static String THRESHOLD_DSV_TEMP_MIN = "thresholdDSVTempMin";
diff --git a/src/test/java/no/nibio/vips/model/alternariamodel/AlternariaModelTest.java b/src/test/java/no/nibio/vips/model/alternariamodel/AlternariaModelTest.java
index cf6f20b..f4438d2 100644
--- a/src/test/java/no/nibio/vips/model/alternariamodel/AlternariaModelTest.java
+++ b/src/test/java/no/nibio/vips/model/alternariamodel/AlternariaModelTest.java
@@ -112,13 +112,13 @@ public class AlternariaModelTest {
System.out.println("getResultWithThresholdDSVTempMin");
ModelConfiguration config = this.getConfiguration(getWeatherDataFile());
config.setConfigParameter("sprayingDates", this.getConfigurationSprayingDates(getResetDataFile()));
- config.setConfigParameter(AlternariaModel.THRESHOLD_DSV_TEMP_MIN_NAME, 10.0);
+ config.setConfigParameter(DataMatrix.THRESHOLD_DSV_TEMP_MIN, 10.0);
AlternariaModel instance = new AlternariaModel();
instance.setConfiguration(config);
List<Result> result = instance.getResult();
assertNotNull(result);
- config.setConfigParameter(AlternariaModel.THRESHOLD_DSV_TEMP_MIN_NAME, "10.0");
+ config.setConfigParameter(DataMatrix.THRESHOLD_DSV_TEMP_MIN, "10.0");
instance.setConfiguration(config);
result = instance.getResult();
@@ -131,7 +131,7 @@ public class AlternariaModelTest {
System.out.println(res.toString());
}*/
- config.setConfigParameter(AlternariaModel.THRESHOLD_DSV_TEMP_MIN_NAME, "13.0");
+ config.setConfigParameter(DataMatrix.THRESHOLD_DSV_TEMP_MIN, "13.0");
//System.out.println(config.toJSON());
instance.setConfiguration(config);
@@ -154,13 +154,13 @@ public class AlternariaModelTest {
System.out.println("getResultWithThresholdDSVMax");
ModelConfiguration config = this.getConfiguration(getWeatherDataFile());
config.setConfigParameter("sprayingDates", this.getConfigurationSprayingDates(getResetDataFile()));
- config.setConfigParameter(AlternariaModel.THRESHOLD_DSV_MAX_NAME, 21);
+ config.setConfigParameter(DataMatrix.THRESHOLD_DSV_MAX, 21);
AlternariaModel instance = new AlternariaModel();
instance.setConfiguration(config);
List<Result> result = instance.getResult();
assertNotNull(result);
- config.setConfigParameter(AlternariaModel.THRESHOLD_DSV_MAX_NAME, "21");
+ config.setConfigParameter(DataMatrix.THRESHOLD_DSV_MAX, "21");
instance.setConfiguration(config);
result = instance.getResult();
@@ -173,7 +173,7 @@ public class AlternariaModelTest {
System.out.println(res.toString());
}*/
- config.setConfigParameter(AlternariaModel.THRESHOLD_DSV_MAX_NAME, "13.0");
+ config.setConfigParameter(DataMatrix.THRESHOLD_DSV_MAX, "13.0");
//System.out.println(config.toJSON());
instance.setConfiguration(config);
--
GitLab