diff --git a/nb-configuration.xml b/nb-configuration.xml index 33e441e8278864cc0db17e7c047d6f8753813a93..7103095542c1a062dedf6d7f32faa28c80b6c0de 100644 --- a/nb-configuration.xml +++ b/nb-configuration.xml @@ -13,6 +13,6 @@ You can copy and paste the single properties, into the pom.xml file and the IDE That way multiple projects can share the same settings (useful for formatting rules for example). Any value defined here will override the pom.xml file value but is only applicable to the current project. --> - <netbeans.hint.license>bioforsk_open_source_license.ftl</netbeans.hint.license> + <netbeans.hint.license>nibio_open_source_license.ftl</netbeans.hint.license> </properties> </project-shared-configuration> diff --git a/pom.xml b/pom.xml index dfeb7d13a630a69989db9973ef7f96d4569b4bea..09028a3a5673e7439dca87a498f744a98d88d764 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>no.bioforsk.vips.model.</groupId> + <groupId>no.nibio.vips.model.</groupId> <artifactId>NaerstadModel</artifactId> <version>1.0-SNAPSHOT</version> <packaging>jar</packaging> @@ -34,7 +34,7 @@ <scope>test</scope> </dependency> <dependency> - <groupId>no.bioforsk.vips.common</groupId> + <groupId>no.nibio.vips.common</groupId> <artifactId>VIPSCommon</artifactId> <version>1.0-SNAPSHOT</version> <scope>provided</scope> diff --git a/src/main/java/no/bioforsk/vips/model/naerstadmodel/NaerstadModel.java b/src/main/java/no/nibio/vips/model/naerstadmodel/NaerstadModel.java similarity index 93% rename from src/main/java/no/bioforsk/vips/model/naerstadmodel/NaerstadModel.java rename to src/main/java/no/nibio/vips/model/naerstadmodel/NaerstadModel.java index ef8db833bc8dbd0eda8b5d385e3919f01b195f0c..dc4b7950df9333389f9d70fb0c4ccf1c1e858e12 100644 --- a/src/main/java/no/bioforsk/vips/model/naerstadmodel/NaerstadModel.java +++ b/src/main/java/no/nibio/vips/model/naerstadmodel/NaerstadModel.java @@ -1,22 +1,22 @@ /* - * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. + * Copyright (c) 2014 NIBIO <http://www.nibio.no/>. * * This file is part of NaerstadModel. * NaerstadModel is free software: you can redistribute it and/or modify - * it under the terms of the Bioforsk Open Source License as published by - * Bioforsk, either version 1 of the License, or (at your option) any + * it under the terms of the NIBIO Open Source License as published by + * NIBIO, either version 1 of the License, or (at your option) any * later version. * * NaerstadModel is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * Bioforsk Open Source License for more details. + * NIBIO Open Source License for more details. * - * You should have received a copy of the Bioforsk Open Source License - * along with NaerstadModel. If not, see <http://www.bioforsk.no/licenses/>. + * You should have received a copy of the NIBIO Open Source License + * along with NaerstadModel. If not, see <http://www.nibio.no/licenses/>. * */ -package no.bioforsk.vips.model.naerstadmodel; +package no.nibio.vips.model.naerstadmodel; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; @@ -28,24 +28,24 @@ import java.util.Date; import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; -import no.bioforsk.vips.i18n.I18nImpl; -import no.bioforsk.vips.entity.ModelConfiguration; -import no.bioforsk.vips.entity.WeatherObservation; -import no.bioforsk.vips.entity.Result; -import no.bioforsk.vips.entity.ResultImpl; -import no.bioforsk.vips.model.ConfigValidationException; -import no.bioforsk.vips.model.Model; -import no.bioforsk.vips.model.ModelExcecutionException; -import no.bioforsk.vips.model.ModelId; -import no.bioforsk.vips.util.CommonNamespaces; -import no.bioforsk.vips.util.WeatherElements; -import no.bioforsk.vips.util.WeatherUtil; +import no.nibio.vips.i18n.I18nImpl; +import no.nibio.vips.entity.ModelConfiguration; +import no.nibio.vips.entity.WeatherObservation; +import no.nibio.vips.entity.Result; +import no.nibio.vips.entity.ResultImpl; +import no.nibio.vips.model.ConfigValidationException; +import no.nibio.vips.model.Model; +import no.nibio.vips.model.ModelExcecutionException; +import no.nibio.vips.model.ModelId; +import no.nibio.vips.util.CommonNamespaces; +import no.nibio.vips.util.WeatherElements; +import no.nibio.vips.util.WeatherUtil; /** * Implementation of the Nærstad model for Potato Blight<br/> - * Developed by <a href="http://www.bioforsk.no/ikbViewer/page/bioforsk/ansatte/person?p_document_id=7146&p_dimension_id=17661">Ragnhild Nærstad</a> - * @copyright 2013 <a href="http://www.bioforsk.no/">Bioforsk</a> - * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no> + * Developed by <a href="http://www.nibio.no/ikbViewer/page/nibio/ansatte/person?p_document_id=7146&p_dimension_id=17661">Ragnhild Nærstad</a> + * @copyright 2013 <a href="http://www.nibio.no/">NIBIO</a> + * @author Tor-Einar Skog <tor-einar.skog@nibio.no> */ public class NaerstadModel extends I18nImpl implements Model{ @@ -72,7 +72,7 @@ public class NaerstadModel extends I18nImpl implements Model{ public NaerstadModel(){ // Setting the file name of the resource bundle - super("no.bioforsk.vips.model.naerstadmodel.texts"); + super("no.nibio.vips.model.naerstadmodel.texts"); } @Override @@ -621,26 +621,26 @@ public class NaerstadModel extends I18nImpl implements Model{ @Override public String getLicense() { return "\n" + - "Copyright (c) 2013-2015 Bioforsk <http://www.bioforsk.no/>. \n" + + "Copyright (c) 2013-2015 NIBIO <http://www.nibio.no/>. \n" + "\n" + "This file is part of NaerstadModel.\n" + "NaerstadModel is free software: you can redistribute it and/or modify\n" + - "it under the terms of the Bioforsk Open Source License as published by \n" + - "Bioforsk, either version 1 of the License, or (at your option) any\n" + + "it under the terms of the NIBIO Open Source License as published by \n" + + "NIBIO, either version 1 of the License, or (at your option) any\n" + "later version.\n" + "\n" + "NaerstadModel is distributed in the hope that it will be useful,\n" + "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" + "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" + - "Bioforsk Open Source License for more details.\n" + + "NIBIO Open Source License for more details.\n" + "\n" + - "You should have received a copy of the Bioforsk Open Source License\n" + - "along with NaerstadModel. If not, see <http://www.bioforsk.no/licenses/>."; + "You should have received a copy of the NIBIO Open Source License\n" + + "along with NaerstadModel. If not, see <http://www.nibio.no/licenses/>."; } @Override public String getCopyright() { - return "(c) 2013-2015 Bioforsk (http://www.bioforsk.no/). Contact: post@bioforsk.no"; + return "(c) 2013-2015 NIBIO (http://www.nibio.no/). Contact: post@nibio.no"; } @Override diff --git a/src/main/java/no/bioforsk/vips/model/naerstadmodel/NaerstadModelBackgroundDataMatrix.java b/src/main/java/no/nibio/vips/model/naerstadmodel/NaerstadModelBackgroundDataMatrix.java similarity index 67% rename from src/main/java/no/bioforsk/vips/model/naerstadmodel/NaerstadModelBackgroundDataMatrix.java rename to src/main/java/no/nibio/vips/model/naerstadmodel/NaerstadModelBackgroundDataMatrix.java index 4dae7f35814f7b995d714f85e813ea090b335cd6..f317e21d3e6683fbd68061ebd1721a1a6e969b3c 100644 --- a/src/main/java/no/bioforsk/vips/model/naerstadmodel/NaerstadModelBackgroundDataMatrix.java +++ b/src/main/java/no/nibio/vips/model/naerstadmodel/NaerstadModelBackgroundDataMatrix.java @@ -1,29 +1,29 @@ /* - * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. + * Copyright (c) 2014 NIBIO <http://www.nibio.no/>. * * This file is part of NaerstadModel. * NaerstadModel is free software: you can redistribute it and/or modify - * it under the terms of the Bioforsk Open Source License as published by - * Bioforsk, either version 1 of the License, or (at your option) any + * it under the terms of the NIBIO Open Source License as published by + * NIBIO, either version 1 of the License, or (at your option) any * later version. * * NaerstadModel is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * Bioforsk Open Source License for more details. + * NIBIO Open Source License for more details. * - * You should have received a copy of the Bioforsk Open Source License - * along with NaerstadModel. If not, see <http://www.bioforsk.no/licenses/>. + * You should have received a copy of the NIBIO Open Source License + * along with NaerstadModel. If not, see <http://www.nibio.no/licenses/>. * */ -package no.bioforsk.vips.model.naerstadmodel; +package no.nibio.vips.model.naerstadmodel; /** * Matrix with calculated background data for Naerstad Model - * @copyright 2009-2014 Bioforsk.no - * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no> + * @copyright 2009-2014 NIBIO.no + * @author Tor-Einar Skog <tor-einar.skog@nibio.no> */ -public class NaerstadModelBackgroundDataMatrix extends no.bioforsk.vips.util.DateMap{ +public class NaerstadModelBackgroundDataMatrix extends no.nibio.vips.util.DateMap{ public final static String TSHH = "TSHH"; public final static String SPH = "SPH"; diff --git a/src/main/resources/no/bioforsk/vips/model/naerstadmodel/texts_nb.properties b/src/main/resources/no/bioforsk/vips/model/naerstadmodel/texts_nb.properties deleted file mode 100644 index c350b8adeea01165bfab85cae5ba959473e820b3..0000000000000000000000000000000000000000 --- a/src/main/resources/no/bioforsk/vips/model/naerstadmodel/texts_nb.properties +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. -# -# This file is part of NaerstadModel. -# NaerstadModel is free software: you can redistribute it and/or modify -# it under the terms of the Bioforsk Open Source License as published by -# Bioforsk, either version 1 of the License, or (at your option) any -# later version. -# -# NaerstadModel is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# Bioforsk Open Source License for more details. -# -# You should have received a copy of the Bioforsk Open Source License -# along with NaerstadModel. If not, see <http://www.bioforsk.no/licenses/>. -# - -name=N\u00e6rstads modell -usage=F\u00f8lgende input kreves:\nobservations - array (liste) over m\u00e5ledata. En observasjon best\u00e5r av:\n\ttimeMeasured - m\u00e5leverdiens tidsstempel\n\telementMeasurementTypeId - kode for m\u00e5leparameter\n\tlogIntervalId: 1 for timeverdi\n\tvalue: verdien p\u00e5 den m\u00e5lte parameteren\nFire forskjellige m\u00e5leparametre m\u00e5 sendes inn:\n* TM - Middeltemperatur (Celcius)\n* RR - Aggrebert nedb\u00f8r (Millimeter)\n* Q0 - Globalstr\u00e5ling (Wh/m2)\n* BT - Bladfukt (antall minutter/time)\nDisse m\u00e5 alle v\u00e6re timedata. De m\u00e5 alle v\u00e6re komplette tidsserier i eksakt samme periode.\nMinimum lengde p\u00e5 tidsserie: 4 dager.\n\nF\u00f8lgende input er valgfritt:\n\ncalculationStart - tidspunktet fra n\u00e5r beregningen skal starte\ncalculationEnd - hvor langt fram i tid beregningen skal g\u00e5 -description=Om modellen\n\nModellen er laget av forsker Ragnhild N\u00e6rstad, Bioforsk Plantehelse, p\u00e5 grunnlag av resultatene fra forskingsprosjektet NORPHYT. Modellen beregner risikoen for sporeproduksjon med p\u00e5f\u00f8lgende spredning, overlevelse og infeksjon p\u00e5 grunnlag av klimadata. For at infeksjonen virkelig skal skje m\u00e5 det v\u00e6re smitte til stede.\n\nDen nye t\u00f8rr\u00e5te modellen er basert p\u00e5 fors\u00f8k over flere \u00e5r hvor testplanter av potet, dyrket i veksthus, har blitt eksponert et d\u00f8gn for smitte fra andre potetplanter i et potetfelt med t\u00f8rr\u00e5te p\u00e5 friland. T\u00f8rr\u00e5teangrepet p\u00e5 disse testplantene har blitt sammenholdt med v\u00e6rforholdene de dagene de er eksponert. P\u00e5 basis av dette er det laget en modell. Modellen beregner hvor gunstig klimaet er for sporeproduksjon med p\u00e5f\u00f8lgende sporespredning, overlevelse og infeksjon av sporene. Modellen er laget slik at risikotallene \u00f8ker med angrepet i testplantene. Terskelverdien p\u00e5 2,5, som gj\u00f8r at varslet blir r\u00f8dt, tilsvarer at det i gjennomsnitt ble en t\u00f8rr\u00e5teflekk per testplante eksponert i potetfeltet som hadde mye smitte. H\u00f8ye verdier betyr at v\u00e6rforholdene gir stor risiko for infeksjon hvis det er smitte til stede.\nData\n\nModellen bruker f\u00f8lgende parametere som timeverdier:\n\n Lufttemperatur i 2m h\u00f8gde(TM)\n Relativ luftfuktighet i 2m h\u00f8gde(UM)\n Nedb\u00f8r, mm (RR)\n Vind i 2m h\u00f8gde(FM2)\n Vind i 10m h\u00f8gde(FF)\n Netto str\u00e5ling, Wh/m2\n Kortb\u00f8lget globalstr\u00e5ling, Wh/m2 (Q0)\n Bladfuktighet i 2m h\u00f8gde, minutter/t (BT)\n Metningstrykk=0.61078*EKSP(17.269* TM /(TM +237.3)), kP\n\nSporeproduksjon\n\nDet m\u00e5 v\u00e6re fuktig, med metningsdeficit under 220 Pa (over ca 90 % luftfuktighet), i minimum 87 timegrader for \u00e5 sette i gang sporeproduksjonen. Jo lenger fuktperioden er jo mer sporer blir produsert. Ved metningsdeficit mellom 220 og 520 Pa reduseres sporeproduksjonen, og ved metningsdeficit over 520 Pa stopper den. Ved dette vanndamptrykket t\u00f8rker sporeb\u00e6rerne inn.\nSporespredning og sporeoverlevelse\n\nSporene spres ut i luften n\u00e5r luftfuktigheten synker. Fritt vann p\u00e5 bladene hemmer sporespredning til luft. Regn vasker ned en del av sporene. Ved sterkt sollys d\u00f8r en stor andel av de frigitte sporene. En time med sterkt sollys dreper ca 95 % av de eksponerte sporene.\nRisiko for t\u00f8rr\u00e5te\n\nSporene trenger fritt vann for \u00e5 spire, enten fra nedb\u00f8r eller dugg. Det m\u00e5 v\u00e6re v\u00e5tt p\u00e5 bladene i minimum 40 timegrader for at sporene skal rekke og b\u00e5de spire og infisere. Jo lenger den v\u00e5te perioden er jo h\u00f8yere andel av sporene rekker \u00e5 infisere.\nRisiko for t\u00f8rr\u00e5te beregnes slik:\nRisiko= (TSWH(t) /40)*VRS(t) *IR(t)\nTSWH(t) =temperatursum for timer med bladfukt\nVRS(t) =tilgjengelige sporer som er spredt\nIR(t) = Infeksjonsrisiko\n\nN\u00e5r Risiko < 1 settes varselsymbolet til gr\u00f8nt\nN\u00e5r Risiko er mellom 1 - 2,5 settes varselsymbolet til gult\nN\u00e5r Risiko > 2,5 settes varselsymbolet til r\u00f8dt diff --git a/src/main/resources/no/bioforsk/vips/model/naerstadmodel/texts.properties b/src/main/resources/no/nibio/vips/model/naerstadmodel/texts.properties similarity index 85% rename from src/main/resources/no/bioforsk/vips/model/naerstadmodel/texts.properties rename to src/main/resources/no/nibio/vips/model/naerstadmodel/texts.properties index 21f6d43bbecd52be6e892037ca6c577cc2c98500..2ffaff5d24a562be9959f722e13a5549edb181a6 100644 --- a/src/main/resources/no/bioforsk/vips/model/naerstadmodel/texts.properties +++ b/src/main/resources/no/nibio/vips/model/naerstadmodel/texts.properties @@ -1,18 +1,18 @@ -# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. +# Copyright (c) 2014 NIBIO <http://www.nibio.no/>. # # This file is part of NaerstadModel. # NaerstadModel is free software: you can redistribute it and/or modify -# it under the terms of the Bioforsk Open Source License as published by -# Bioforsk, either version 1 of the License, or (at your option) any +# it under the terms of the NIBIO Open Source License as published by +# NIBIO, either version 1 of the License, or (at your option) any # later version. # # NaerstadModel is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# Bioforsk Open Source License for more details. +# NIBIO Open Source License for more details. # -# You should have received a copy of the Bioforsk Open Source License -# along with NaerstadModel. If not, see <http://www.bioforsk.no/licenses/>. +# You should have received a copy of the NIBIO Open Source License +# along with NaerstadModel. If not, see <http://www.nibio.no/licenses/>. # diff --git a/src/main/resources/no/nibio/vips/model/naerstadmodel/texts_nb.properties b/src/main/resources/no/nibio/vips/model/naerstadmodel/texts_nb.properties new file mode 100644 index 0000000000000000000000000000000000000000..700d1b675cea342f31a8906524b5bad81745dc8e --- /dev/null +++ b/src/main/resources/no/nibio/vips/model/naerstadmodel/texts_nb.properties @@ -0,0 +1,20 @@ +# Copyright (c) 2014 NIBIO <http://www.nibio.no/>. +# +# This file is part of NaerstadModel. +# NaerstadModel is free software: you can redistribute it and/or modify +# it under the terms of the NIBIO Open Source License as published by +# NIBIO, either version 1 of the License, or (at your option) any +# later version. +# +# NaerstadModel is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# NIBIO Open Source License for more details. +# +# You should have received a copy of the NIBIO Open Source License +# along with NaerstadModel. If not, see <http://www.nibio.no/licenses/>. +# + +name=N\u00e6rstads modell +usage=F\u00f8lgende input kreves:\nobservations - array (liste) over m\u00e5ledata. En observasjon best\u00e5r av:\n\ttimeMeasured - m\u00e5leverdiens tidsstempel\n\telementMeasurementTypeId - kode for m\u00e5leparameter\n\tlogIntervalId: 1 for timeverdi\n\tvalue: verdien p\u00e5 den m\u00e5lte parameteren\nFire forskjellige m\u00e5leparametre m\u00e5 sendes inn:\n* TM - Middeltemperatur (Celcius)\n* RR - Aggrebert nedb\u00f8r (Millimeter)\n* Q0 - Globalstr\u00e5ling (Wh/m2)\n* BT - Bladfukt (antall minutter/time)\nDisse m\u00e5 alle v\u00e6re timedata. De m\u00e5 alle v\u00e6re komplette tidsserier i eksakt samme periode.\nMinimum lengde p\u00e5 tidsserie: 4 dager.\n\nF\u00f8lgende input er valgfritt:\n\ncalculationStart - tidspunktet fra n\u00e5r beregningen skal starte\ncalculationEnd - hvor langt fram i tid beregningen skal g\u00e5 +description=Om modellen\n\nModellen er laget av forsker Ragnhild N\u00e6rstad, NIBIO Plantehelse, p\u00e5 grunnlag av resultatene fra forskingsprosjektet NORPHYT. Modellen beregner risikoen for sporeproduksjon med p\u00e5f\u00f8lgende spredning, overlevelse og infeksjon p\u00e5 grunnlag av klimadata. For at infeksjonen virkelig skal skje m\u00e5 det v\u00e6re smitte til stede.\n\nDen nye t\u00f8rr\u00e5te modellen er basert p\u00e5 fors\u00f8k over flere \u00e5r hvor testplanter av potet, dyrket i veksthus, har blitt eksponert et d\u00f8gn for smitte fra andre potetplanter i et potetfelt med t\u00f8rr\u00e5te p\u00e5 friland. T\u00f8rr\u00e5teangrepet p\u00e5 disse testplantene har blitt sammenholdt med v\u00e6rforholdene de dagene de er eksponert. P\u00e5 basis av dette er det laget en modell. Modellen beregner hvor gunstig klimaet er for sporeproduksjon med p\u00e5f\u00f8lgende sporespredning, overlevelse og infeksjon av sporene. Modellen er laget slik at risikotallene \u00f8ker med angrepet i testplantene. Terskelverdien p\u00e5 2,5, som gj\u00f8r at varslet blir r\u00f8dt, tilsvarer at det i gjennomsnitt ble en t\u00f8rr\u00e5teflekk per testplante eksponert i potetfeltet som hadde mye smitte. H\u00f8ye verdier betyr at v\u00e6rforholdene gir stor risiko for infeksjon hvis det er smitte til stede.\nData\n\nModellen bruker f\u00f8lgende parametere som timeverdier:\n\n Lufttemperatur i 2m h\u00f8gde(TM)\n Relativ luftfuktighet i 2m h\u00f8gde(UM)\n Nedb\u00f8r, mm (RR)\n Vind i 2m h\u00f8gde(FM2)\n Vind i 10m h\u00f8gde(FF)\n Netto str\u00e5ling, Wh/m2\n Kortb\u00f8lget globalstr\u00e5ling, Wh/m2 (Q0)\n Bladfuktighet i 2m h\u00f8gde, minutter/t (BT)\n Metningstrykk=0.61078*EKSP(17.269* TM /(TM +237.3)), kP\n\nSporeproduksjon\n\nDet m\u00e5 v\u00e6re fuktig, med metningsdeficit under 220 Pa (over ca 90 % luftfuktighet), i minimum 87 timegrader for \u00e5 sette i gang sporeproduksjonen. Jo lenger fuktperioden er jo mer sporer blir produsert. Ved metningsdeficit mellom 220 og 520 Pa reduseres sporeproduksjonen, og ved metningsdeficit over 520 Pa stopper den. Ved dette vanndamptrykket t\u00f8rker sporeb\u00e6rerne inn.\nSporespredning og sporeoverlevelse\n\nSporene spres ut i luften n\u00e5r luftfuktigheten synker. Fritt vann p\u00e5 bladene hemmer sporespredning til luft. Regn vasker ned en del av sporene. Ved sterkt sollys d\u00f8r en stor andel av de frigitte sporene. En time med sterkt sollys dreper ca 95 % av de eksponerte sporene.\nRisiko for t\u00f8rr\u00e5te\n\nSporene trenger fritt vann for \u00e5 spire, enten fra nedb\u00f8r eller dugg. Det m\u00e5 v\u00e6re v\u00e5tt p\u00e5 bladene i minimum 40 timegrader for at sporene skal rekke og b\u00e5de spire og infisere. Jo lenger den v\u00e5te perioden er jo h\u00f8yere andel av sporene rekker \u00e5 infisere.\nRisiko for t\u00f8rr\u00e5te beregnes slik:\nRisiko= (TSWH(t) /40)*VRS(t) *IR(t)\nTSWH(t) =temperatursum for timer med bladfukt\nVRS(t) =tilgjengelige sporer som er spredt\nIR(t) = Infeksjonsrisiko\n\nN\u00e5r Risiko < 1 settes varselsymbolet til gr\u00f8nt\nN\u00e5r Risiko er mellom 1 - 2,5 settes varselsymbolet til gult\nN\u00e5r Risiko > 2,5 settes varselsymbolet til r\u00f8dt diff --git a/src/test/java/no/bioforsk/vips/model/naerstadmodel/NaerstadModelTest.java b/src/test/java/no/nibio/vips/model/naerstadmodel/NaerstadModelTest.java similarity index 93% rename from src/test/java/no/bioforsk/vips/model/naerstadmodel/NaerstadModelTest.java rename to src/test/java/no/nibio/vips/model/naerstadmodel/NaerstadModelTest.java index 7aceec7d5f1adf7b1bb26d1fae4307eebd03a44e..aa8f4296a60def81e31127c78a22a74bde1c271b 100644 --- a/src/test/java/no/bioforsk/vips/model/naerstadmodel/NaerstadModelTest.java +++ b/src/test/java/no/nibio/vips/model/naerstadmodel/NaerstadModelTest.java @@ -1,23 +1,23 @@ /* - * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. + * Copyright (c) 2014 NIBIO <http://www.nibio.no/>. * * This file is part of NaerstadModel. * NaerstadModel is free software: you can redistribute it and/or modify - * it under the terms of the Bioforsk Open Source License as published by - * Bioforsk, either version 1 of the License, or (at your option) any + * it under the terms of the NIBIO Open Source License as published by + * NIBIO, either version 1 of the License, or (at your option) any * later version. * * NaerstadModel is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * Bioforsk Open Source License for more details. + * NIBIO Open Source License for more details. * - * You should have received a copy of the Bioforsk Open Source License - * along with NaerstadModel. If not, see <http://www.bioforsk.no/licenses/>. + * You should have received a copy of the NIBIO Open Source License + * along with NaerstadModel. If not, see <http://www.nibio.no/licenses/>. * */ -package no.bioforsk.vips.model.naerstadmodel; +package no.nibio.vips.model.naerstadmodel; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonParser; @@ -34,12 +34,12 @@ import java.util.List; import java.util.TimeZone; import static junit.framework.Assert.fail; import junit.framework.TestCase; -import no.bioforsk.vips.entity.ModelConfiguration; -import no.bioforsk.vips.entity.Result; -import no.bioforsk.vips.entity.WeatherObservation; -import no.bioforsk.vips.model.ConfigValidationException; -import no.bioforsk.vips.model.ModelExcecutionException; -import no.bioforsk.vips.util.JSONUtil; +import no.nibio.vips.entity.ModelConfiguration; +import no.nibio.vips.entity.Result; +import no.nibio.vips.entity.WeatherObservation; +import no.nibio.vips.model.ConfigValidationException; +import no.nibio.vips.model.ModelExcecutionException; +import no.nibio.vips.util.JSONUtil; /**