diff --git a/nb-configuration.xml b/nb-configuration.xml index 8a89e6deb1612912550a17f804b7132c7c3a2b6c..5793a1f0dc3c38ef42851f77ccf9ab8d726e8354 100644 --- a/nb-configuration.xml +++ b/nb-configuration.xml @@ -15,6 +15,5 @@ Any value defined here will override the pom.xml file value but is only applicab --> <netbeans.hint.license>default_1</netbeans.hint.license> <org-netbeans-modules-javascript2-editor.jsversion>ECMA5</org-netbeans-modules-javascript2-editor.jsversion> - <netbeans.hint.jdkPlatform>JDK_1.8__GraalVM_1.0_</netbeans.hint.jdkPlatform> </properties> </project-shared-configuration> diff --git a/pom.xml b/pom.xml index aa2736771087603066e0a6ce29c474e6ba584bf1..e2ade298bd828e6ab7b8099278327403956cf055 100644 --- a/pom.xml +++ b/pom.xml @@ -30,11 +30,22 @@ <scope>test</scope> </dependency> + <dependency> - <groupId>org.graalvm.sdk</groupId> - <artifactId>graal-sdk</artifactId> - <version>1.0.0-rc12</version> - </dependency> + <groupId>org.graalvm.js</groupId> + <artifactId>js</artifactId> + <version>1.0.0-rc16</version> + </dependency> + <dependency> + <groupId>org.graalvm.js</groupId> + <artifactId>js-scriptengine</artifactId> + <version>1.0.0-rc16</version> + </dependency> + <dependency> + <groupId>org.graalvm.truffle</groupId> + <artifactId>truffle-api</artifactId> + <version>1.0.0-rc16</version> + </dependency> <dependency> <groupId>com.eclipsesource.j2v8</groupId> <artifactId>j2v8_linux_x86_64</artifactId> @@ -48,6 +59,11 @@ <scope>test</scope> <version>4.11</version> </dependency> + <dependency> + <groupId>com.ibm.icu</groupId> + <artifactId>icu4j</artifactId> + <version>65.1</version> + </dependency> </dependencies> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> diff --git a/src/main/java/no/nibio/vips/model/fallarmywormmodel/FallArmywormModel.java b/src/main/java/no/nibio/vips/model/fallarmywormmodel/FallArmywormModel.java index d1fe7368b9a5d8daf6ff8538b35e37ef34ed65bc..7f9e3fac7a3aaf1ad492f87c30db90540f227676 100644 --- a/src/main/java/no/nibio/vips/model/fallarmywormmodel/FallArmywormModel.java +++ b/src/main/java/no/nibio/vips/model/fallarmywormmodel/FallArmywormModel.java @@ -53,7 +53,7 @@ public class FallArmywormModel extends I18nImpl implements Model{ private final Map<String, Double> INTERCROPPING_RISK_REDUCTION; Integer RISK_THRESHOLD_HIGH = 50; Double OBSERVATIONS_10KM_ABSCENCE_RISK_REDUCTION = 10d/100; // 10% risk reduction if no observations within 10km - Double OBSERVATIONS_25KM_ABSCENCE_RISK_REDUCTION = 70d/100; // 60% risk reduction if no observations within 25km + Double OBSERVATIONS_25KM_ABSCENCE_RISK_REDUCTION = 70d/100; // 70% risk reduction if no observations within 25km public final static ModelId MODEL_ID = new ModelId("FAWMODEL01"); private final ModelUtil modelUtil; @@ -67,6 +67,7 @@ public class FallArmywormModel extends I18nImpl implements Model{ INTERCROPPING_RISK_REDUCTION.put("BEANS/DESMODIUM", 30d/100); } + @Override public List<Result> getResult() throws ModelExcecutionException { List<Result> resultList = new ArrayList<>(); Calendar cal = Calendar.getInstance(timeZone); @@ -247,7 +248,7 @@ public class FallArmywormModel extends I18nImpl implements Model{ if(config.getConfigParameter("observations10kmLast3Months") == null || config.getConfigParameter("observations25kmLast3Months") == null) { - Map<Integer, Integer> observations = this.getFAWObservations(Double.valueOf((String) config.getConfigParameter("longitude")), Double.valueOf((String)config.getConfigParameter("longitude"))); + Map<Integer, Integer> observations = this.getFAWObservations(Double.valueOf((String) config.getConfigParameter("longitude")), Double.valueOf((String)config.getConfigParameter("latitude"))); if(config.getConfigParameter("observations10kmLast3Months") == null) { config.setConfigParameter("observations10kmLast3Months", observations.get(10));