diff --git a/.gitignore b/.gitignore
index 23176e3effbf3094ff070c26224e3b2d14427283..4bc1e934d1a2494c4b7a08a7b94ce0c6f5834c65 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
target/
classes/
+*~
diff --git a/pom.xml b/pom.xml
index 270f0bb521155c08a2d9b2fd9feb6275f9b44594..4944b29dfe53608984ed0d163b5bbd0ae7b32a44 100755
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
</dependencies>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
+ <maven.compiler.source>10</maven.compiler.source>
+ <maven.compiler.target>10</maven.compiler.target>
</properties>
</project>
\ No newline at end of file
diff --git a/src/main/java/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModel.java b/src/main/java/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModel.java
index 4ff6d24477c873ae6784df2edfb991922dd283be..ea055dc2eab9a565fa368b5dcda3bee9246dc6f0 100755
--- a/src/main/java/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModel.java
+++ b/src/main/java/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModel.java
@@ -19,8 +19,6 @@
package no.nibio.vips.model.deliaradicummodel;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
import java.io.IOException;
import java.text.DecimalFormat;
import java.util.ArrayList;
@@ -288,9 +286,7 @@ public class DeliaRadicumModel extends I18nImpl implements Model{
this.TJM10 = new ArrayList<>();
// Init data matrix
this.dataMatrix = new DeliaRadicumModelDataMatrix();
-
- ObjectMapper mapper = new ObjectMapper();
-
+
// Setting timezone
this.timeZone = TimeZone.getTimeZone((String) config.getConfigParameter("timeZone"));
//System.out.println("TimeZone=" + this.timeZone);
@@ -298,7 +294,7 @@ public class DeliaRadicumModel extends I18nImpl implements Model{
// Importing weather data, creating collections
// Can accept both hourly and daily data
WeatherUtil wUtil = new WeatherUtil();
- List<WeatherObservation> observations = mapper.convertValue(config.getConfigParameter("observations"), new TypeReference<List<WeatherObservation>>(){});
+ List<WeatherObservation> observations = this.modelUtil.extractWeatherObservationList(config.getConfigParameter("observations"));
for(WeatherObservation o:observations)
{
switch(o.getElementMeasurementTypeId())
diff --git a/target/classes/.netbeans_automatic_build b/target/classes/.netbeans_automatic_build
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/target/classes/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModel$1.class b/target/classes/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModel$1.class
deleted file mode 100644
index 02bcb429dc9d4e14ad26e5f3bc4309d63af4edf5..0000000000000000000000000000000000000000
Binary files a/target/classes/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModel$1.class and /dev/null differ
diff --git a/target/classes/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModel.class b/target/classes/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModel.class
index 6ccfe7663f6d29ca85284a620028a512aa1e6b92..639d0283e442d542cb1e17988108ff15e8bb24c3 100644
Binary files a/target/classes/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModel.class and b/target/classes/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModel.class differ
diff --git a/target/classes/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModelDataMatrix.class b/target/classes/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModelDataMatrix.class
index f7e33768c7b326ec6fee16274df3dd84f5235d16..55a1800910f2d3dee5ef0ae18d9e821e3dd855b4 100644
Binary files a/target/classes/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModelDataMatrix.class and b/target/classes/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModelDataMatrix.class differ
diff --git a/target/surefire-reports/TEST-no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest.xml b/target/surefire-reports/TEST-no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest.xml
index 4b75410ef0f18cc1f356e4ac032b7d6c47cb2653..08ed70b146fb485b6584dc52ac27fc2fe1a339b4 100644
--- a/target/surefire-reports/TEST-no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest.xml
+++ b/target/surefire-reports/TEST-no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest.xml
@@ -1,78 +1,78 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<testsuite tests="15" failures="0" name="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" time="0.929" errors="0" skipped="0">
+<testsuite tests="15" failures="0" name="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" time="0.895" errors="0" skipped="0">
<properties>
<property name="java.runtime.name" value="OpenJDK Runtime Environment"/>
- <property name="sun.boot.library.path" value="/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64"/>
- <property name="java.vm.version" value="25.131-b11"/>
- <property name="java.vm.vendor" value="Oracle Corporation"/>
- <property name="java.vendor.url" value="http://java.oracle.com/"/>
- <property name="path.separator" value=":"/>
+ <property name="java.vm.version" value="11.0.7+10-post-Ubuntu-2ubuntu218.04"/>
+ <property name="sun.boot.library.path" value="/usr/lib/jvm/java-11-openjdk-amd64/lib"/>
+ <property name="maven.multiModuleProjectDirectory" value="/home/treinar/prosjekter/vips/Sourcecode/DeliaRadicumModel"/>
+ <property name="java.vm.vendor" value="Ubuntu"/>
+ <property name="java.vendor.url" value="https://ubuntu.com/"/>
<property name="guice.disable.misplaced.annotation.check" value="true"/>
+ <property name="path.separator" value=":"/>
<property name="java.vm.name" value="OpenJDK 64-Bit Server VM"/>
- <property name="file.encoding.pkg" value="sun.io"/>
+ <property name="sun.os.patch.level" value="unknown"/>
<property name="user.country" value="US"/>
<property name="sun.java.launcher" value="SUN_STANDARD"/>
- <property name="sun.os.patch.level" value="unknown"/>
<property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
<property name="user.dir" value="/home/treinar/prosjekter/vips/Sourcecode/DeliaRadicumModel"/>
- <property name="java.runtime.version" value="1.8.0_131-8u131-b11-2ubuntu1.16.04.3-b11"/>
+ <property name="java.vm.compressedOopsMode" value="Zero based"/>
+ <property name="java.runtime.version" value="11.0.7+10-post-Ubuntu-2ubuntu218.04"/>
<property name="java.awt.graphicsenv" value="sun.awt.X11GraphicsEnvironment"/>
- <property name="java.endorsed.dirs" value="/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/endorsed"/>
<property name="os.arch" value="amd64"/>
<property name="java.io.tmpdir" value="/tmp"/>
<property name="line.separator" value="
"/>
<property name="java.vm.specification.vendor" value="Oracle Corporation"/>
<property name="os.name" value="Linux"/>
- <property name="maven.ext.class.path" value="/home/treinar/bin/netbeans-8.2/java/maven-nblib/netbeans-eventspy.jar"/>
- <property name="classworlds.conf" value="/home/treinar/bin/netbeans-8.2/java/maven/bin/m2.conf"/>
+ <property name="maven.ext.class.path" value="/home/treinar/bin/netbeans-10/java/maven-nblib/netbeans-eventspy.jar"/>
+ <property name="classworlds.conf" value="/home/treinar/bin/netbeans-10/java/maven/bin/m2.conf"/>
<property name="sun.jnu.encoding" value="UTF-8"/>
- <property name="java.library.path" value="/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64:/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/i386::/usr/java/packages/lib/amd64:/usr/lib/x86_64-linux-gnu/jni:/lib/x86_64-linux-gnu:/usr/lib/x86_64-linux-gnu:/usr/lib/jni:/lib:/usr/lib"/>
+ <property name="java.library.path" value="/usr/java/packages/lib:/usr/lib/x86_64-linux-gnu/jni:/lib/x86_64-linux-gnu:/usr/lib/x86_64-linux-gnu:/usr/lib/jni:/lib:/usr/lib"/>
+ <property name="jdk.debug" value="release"/>
+ <property name="java.class.version" value="55.0"/>
<property name="java.specification.name" value="Java Platform API Specification"/>
- <property name="java.class.version" value="52.0"/>
<property name="sun.management.compiler" value="HotSpot 64-Bit Tiered Compilers"/>
- <property name="os.version" value="4.4.0-97-generic"/>
+ <property name="os.version" value="5.3.0-46-generic"/>
<property name="user.home" value="/home/treinar"/>
<property name="user.timezone" value="Europe/Oslo"/>
<property name="java.awt.printerjob" value="sun.print.PSPrinterJob"/>
<property name="file.encoding" value="UTF-8"/>
- <property name="java.specification.version" value="1.8"/>
+ <property name="java.specification.version" value="11"/>
<property name="user.name" value="treinar"/>
- <property name="java.class.path" value="/home/treinar/bin/netbeans-8.2/java/maven/boot/plexus-classworlds-2.4.jar"/>
- <property name="java.vm.specification.version" value="1.8"/>
+ <property name="java.class.path" value="/home/treinar/bin/netbeans-10/java/maven/boot/plexus-classworlds-2.5.2.jar"/>
+ <property name="java.vm.specification.version" value="11"/>
<property name="sun.arch.data.model" value="64"/>
- <property name="java.home" value="/usr/lib/jvm/java-8-openjdk-amd64/jre"/>
- <property name="sun.java.command" value="org.codehaus.plexus.classworlds.launcher.Launcher -Dmaven.ext.class.path=/home/treinar/bin/netbeans-8.2/java/maven-nblib/netbeans-eventspy.jar install"/>
- <property name="java.specification.vendor" value="Oracle Corporation"/>
+ <property name="sun.java.command" value="org.codehaus.plexus.classworlds.launcher.Launcher -Dmaven.ext.class.path=/home/treinar/bin/netbeans-10/java/maven-nblib/netbeans-eventspy.jar install"/>
+ <property name="java.home" value="/usr/lib/jvm/java-11-openjdk-amd64"/>
<property name="user.language" value="en"/>
+ <property name="java.specification.vendor" value="Oracle Corporation"/>
<property name="awt.toolkit" value="sun.awt.X11.XToolkit"/>
- <property name="java.vm.info" value="mixed mode"/>
- <property name="java.version" value="1.8.0_131"/>
- <property name="java.ext.dirs" value="/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/ext:/usr/java/packages/lib/ext"/>
+ <property name="java.vm.info" value="mixed mode, sharing"/>
+ <property name="java.version" value="11.0.7"/>
<property name="securerandom.source" value="file:/dev/./urandom"/>
- <property name="sun.boot.class.path" value="/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/resources.jar:/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/rt.jar:/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/sunrsasign.jar:/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/jsse.jar:/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/jce.jar:/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/charsets.jar:/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/jfr.jar:/usr/lib/jvm/java-8-openjdk-amd64/jre/classes"/>
- <property name="java.vendor" value="Oracle Corporation"/>
- <property name="maven.home" value="/home/treinar/bin/netbeans-8.2/java/maven"/>
+ <property name="java.vendor" value="Ubuntu"/>
+ <property name="maven.home" value="/home/treinar/bin/netbeans-10/java/maven"/>
<property name="file.separator" value="/"/>
- <property name="java.vendor.url.bug" value="http://bugreport.sun.com/bugreport/"/>
- <property name="sun.cpu.endian" value="little"/>
+ <property name="java.version.date" value="2020-04-14"/>
+ <property name="java.vendor.url.bug" value="https://bugs.launchpad.net/ubuntu/+source/openjdk-lts"/>
<property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
+ <property name="sun.cpu.endian" value="little"/>
<property name="sun.desktop" value="gnome"/>
<property name="sun.cpu.isalist" value=""/>
</properties>
- <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetSampleConfig" time="0.005"/>
- <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testSetConfiguration" time="0.322"/>
- <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testAcceptance" time="0.405"/>
- <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testWithSwedishData" time="0.116"/>
- <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetModelId" time="0.001"/>
- <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetModelName_0args" time="0.001"/>
- <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetModelName_String" time="0"/>
+ <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetWarningStatusInterpretation_String" time="0.037"/>
+ <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetWarningStatusInterpretation_0args" time="0.001"/>
+ <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testAcceptance" time="0.672"/>
+ <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testWithSwedishData" time="0.086"/>
+ <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetModelId" time="0"/>
+ <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetModelName_0args" time="0"/>
+ <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetModelName_String" time="0.001"/>
<testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetLicense" time="0"/>
<testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetCopyright" time="0"/>
- <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetModelDescription_0args" time="0.027"/>
- <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetModelDescription_String" time="0.005"/>
- <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetWarningStatusInterpretation_0args" time="0"/>
- <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetWarningStatusInterpretation_String" time="0"/>
- <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetModelUsage_0args" time="0.001"/>
+ <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetModelDescription_0args" time="0.047"/>
+ <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetModelDescription_String" time="0.013"/>
+ <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetModelUsage_0args" time="0"/>
<testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetModelUsage_String" time="0"/>
+ <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetSampleConfig" time="0.028"/>
+ <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testSetConfiguration" time="0.01"/>
</testsuite>
\ No newline at end of file
diff --git a/target/surefire-reports/no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest.txt b/target/surefire-reports/no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest.txt
index 204cb293778c42c2b24b29a5f83f887a56893e34..da9fe526f4bf9507f48970be438f31bf25294108 100644
--- a/target/surefire-reports/no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest.txt
+++ b/target/surefire-reports/no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest.txt
@@ -1,4 +1,4 @@
-------------------------------------------------------------------------------
Test set: no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest
-------------------------------------------------------------------------------
-Tests run: 15, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.929 sec
+Tests run: 15, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.942 sec
diff --git a/target/test-classes/.netbeans_automatic_build b/target/test-classes/.netbeans_automatic_build
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/target/test-classes/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModelTest$1.class b/target/test-classes/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModelTest$1.class
index 3447d918192e39f6aa26ff816e6c80fb8ac626d5..beac300910a6ce00d0d51805099ab8dc37d98742 100644
Binary files a/target/test-classes/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModelTest$1.class and b/target/test-classes/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModelTest$1.class differ
diff --git a/target/test-classes/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModelTest.class b/target/test-classes/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModelTest.class
index f715a32d168d8baf5fd23837cd7c9a6919d9a95d..e6a41d874fd196831073cb23e1611f9d09b66a24 100644
Binary files a/target/test-classes/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModelTest.class and b/target/test-classes/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModelTest.class differ