Skip to content
Snippets Groups Projects
Commit 763b6e6a authored by Tor-Einar Skog's avatar Tor-Einar Skog
Browse files

Merge branch 'Ny_server_2019' into 'develop' 

Ny server 2019

See merge request VIPS/Model_DELIARADIC!1
parents 60f35fcc 1bf2f752
No related branches found
No related tags found
1 merge request!1Ny server 2019
Hide whitespace changes
Inline Side-by-side
Showing
with 47 additions and 50 deletions
.gitignore
+ 1
− 0
View file @ 763b6e6a
target/ target/
classes/ classes/
*~
pom.xml
+ 2
− 2
View file @ 763b6e6a
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
</dependencies> </dependencies>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.7</maven.compiler.source> <maven.compiler.source>10</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target> <maven.compiler.target>10</maven.compiler.target>
</properties> </properties>
</project> </project>
\ No newline at end of file
src/main/java/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModel.java
+ 2
− 6
View file @ 763b6e6a
...@@ -19,8 +19,6 @@ ...@@ -19,8 +19,6 @@
package no.nibio.vips.model.deliaradicummodel; 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.io.IOException;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -288,9 +286,7 @@ public class DeliaRadicumModel extends I18nImpl implements Model{ ...@@ -288,9 +286,7 @@ public class DeliaRadicumModel extends I18nImpl implements Model{
this.TJM10 = new ArrayList<>(); this.TJM10 = new ArrayList<>();
// Init data matrix // Init data matrix
this.dataMatrix = new DeliaRadicumModelDataMatrix(); this.dataMatrix = new DeliaRadicumModelDataMatrix();
ObjectMapper mapper = new ObjectMapper();
// Setting timezone // Setting timezone
this.timeZone = TimeZone.getTimeZone((String) config.getConfigParameter("timeZone")); this.timeZone = TimeZone.getTimeZone((String) config.getConfigParameter("timeZone"));
//System.out.println("TimeZone=" + this.timeZone); //System.out.println("TimeZone=" + this.timeZone);
...@@ -298,7 +294,7 @@ public class DeliaRadicumModel extends I18nImpl implements Model{ ...@@ -298,7 +294,7 @@ public class DeliaRadicumModel extends I18nImpl implements Model{
// Importing weather data, creating collections // Importing weather data, creating collections
// Can accept both hourly and daily data // Can accept both hourly and daily data
WeatherUtil wUtil = new WeatherUtil(); 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) for(WeatherObservation o:observations)
{ {
switch(o.getElementMeasurementTypeId()) switch(o.getElementMeasurementTypeId())
......
target/classes/.netbeans_automatic_build deleted 100644 → 0
+ 0
− 0
View file @ 60f35fcc
target/classes/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModel$1.class deleted 100644 → 0
+ 0
− 0
View file @ 60f35fcc
File deleted
target/classes/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModel.class
+ 0
− 0
View file @ 763b6e6a
No preview for this file type
target/classes/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModelDataMatrix.class
+ 0
− 0
View file @ 763b6e6a
No preview for this file type
target/surefire-reports/TEST-no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest.xml
+ 41
− 41
View file @ 763b6e6a
<?xml version="1.0" encoding="UTF-8" ?> <?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> <properties>
<property name="java.runtime.name" value="OpenJDK Runtime Environment"/> <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="11.0.7+10-post-Ubuntu-2ubuntu218.04"/>
<property name="java.vm.version" value="25.131-b11"/> <property name="sun.boot.library.path" value="/usr/lib/jvm/java-11-openjdk-amd64/lib"/>
<property name="java.vm.vendor" value="Oracle Corporation"/> <property name="maven.multiModuleProjectDirectory" value="/home/treinar/prosjekter/vips/Sourcecode/DeliaRadicumModel"/>
<property name="java.vendor.url" value="http://java.oracle.com/"/> <property name="java.vm.vendor" value="Ubuntu"/>
<property name="path.separator" value=":"/> <property name="java.vendor.url" value="https://ubuntu.com/"/>
<property name="guice.disable.misplaced.annotation.check" value="true"/> <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="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="user.country" value="US"/>
<property name="sun.java.launcher" value="SUN_STANDARD"/> <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="java.vm.specification.name" value="Java Virtual Machine Specification"/>
<property name="user.dir" value="/home/treinar/prosjekter/vips/Sourcecode/DeliaRadicumModel"/> <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.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="os.arch" value="amd64"/>
<property name="java.io.tmpdir" value="/tmp"/> <property name="java.io.tmpdir" value="/tmp"/>
<property name="line.separator" value=" <property name="line.separator" value="
"/> "/>
<property name="java.vm.specification.vendor" value="Oracle Corporation"/> <property name="java.vm.specification.vendor" value="Oracle Corporation"/>
<property name="os.name" value="Linux"/> <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="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-8.2/java/maven/bin/m2.conf"/> <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="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.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="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.home" value="/home/treinar"/>
<property name="user.timezone" value="Europe/Oslo"/> <property name="user.timezone" value="Europe/Oslo"/>
<property name="java.awt.printerjob" value="sun.print.PSPrinterJob"/> <property name="java.awt.printerjob" value="sun.print.PSPrinterJob"/>
<property name="file.encoding" value="UTF-8"/> <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="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.class.path" value="/home/treinar/bin/netbeans-10/java/maven/boot/plexus-classworlds-2.5.2.jar"/>
<property name="java.vm.specification.version" value="1.8"/> <property name="java.vm.specification.version" value="11"/>
<property name="sun.arch.data.model" value="64"/> <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-10/java/maven-nblib/netbeans-eventspy.jar install"/>
<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.home" value="/usr/lib/jvm/java-11-openjdk-amd64"/>
<property name="java.specification.vendor" value="Oracle Corporation"/>
<property name="user.language" value="en"/> <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="awt.toolkit" value="sun.awt.X11.XToolkit"/>
<property name="java.vm.info" value="mixed mode"/> <property name="java.vm.info" value="mixed mode, sharing"/>
<property name="java.version" value="1.8.0_131"/> <property name="java.version" value="11.0.7"/>
<property name="java.ext.dirs" value="/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/ext:/usr/java/packages/lib/ext"/>
<property name="securerandom.source" value="file:/dev/./urandom"/> <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="Ubuntu"/>
<property name="java.vendor" value="Oracle Corporation"/> <property name="maven.home" value="/home/treinar/bin/netbeans-10/java/maven"/>
<property name="maven.home" value="/home/treinar/bin/netbeans-8.2/java/maven"/>
<property name="file.separator" value="/"/> <property name="file.separator" value="/"/>
<property name="java.vendor.url.bug" value="http://bugreport.sun.com/bugreport/"/> <property name="java.version.date" value="2020-04-14"/>
<property name="sun.cpu.endian" value="little"/> <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.io.unicode.encoding" value="UnicodeLittle"/>
<property name="sun.cpu.endian" value="little"/>
<property name="sun.desktop" value="gnome"/> <property name="sun.desktop" value="gnome"/>
<property name="sun.cpu.isalist" value=""/> <property name="sun.cpu.isalist" value=""/>
</properties> </properties>
<testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetSampleConfig" time="0.005"/> <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetWarningStatusInterpretation_String" time="0.037"/>
<testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testSetConfiguration" time="0.322"/> <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.405"/> <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.116"/> <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.001"/> <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.001"/> <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"/> <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="testGetLicense" time="0"/>
<testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetCopyright" 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_0args" time="0.047"/>
<testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetModelDescription_String" time="0.005"/> <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetModelDescription_String" time="0.013"/>
<testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetWarningStatusInterpretation_0args" time="0"/> <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetModelUsage_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="testGetModelUsage_String" 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> </testsuite>
\ No newline at end of file
target/surefire-reports/no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest.txt
+ 1
− 1
View file @ 763b6e6a
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Test set: no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest 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
target/test-classes/.netbeans_automatic_build deleted 100644 → 0
+ 0
− 0
View file @ 60f35fcc
target/test-classes/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModelTest$1.class
+ 0
− 0
View file @ 763b6e6a
No preview for this file type
target/test-classes/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModelTest.class
+ 0
− 0
View file @ 763b6e6a
No preview for this file type
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment