From 6818da72c3ad9ea05a79de00399d9bc761914df1 Mon Sep 17 00:00:00 2001 From: Tor-Einar Skog <tor-einar.skog@nibio.no> Date: Mon, 30 Jan 2017 11:35:33 -0800 Subject: [PATCH] Added more documentation --- .gitignore | 0 nb-configuration.xml | 0 nbproject/project.properties | 0 pom.xml | 0 .../java/no/nibio/vips/model/downcastmodel/DOWNCASTModel.java | 0 .../java/no/nibio/vips/model/downcastmodel/DataMatrix.java | 0 .../no/nibio/vips/model/downcastmodel/SporulationTable.java | 0 .../no/nibio/vips/model/downcastmodel/texts.properties | 4 ++-- .../no/nibio/vips/model/downcastmodel/texts_nb.properties | 4 ++-- .../no/nibio/vips/model/downcastmodel/DOWNCASTModelTest.java | 0 src/test/resources/lier_2015.json | 0 11 files changed, 4 insertions(+), 4 deletions(-) mode change 100644 => 100755 .gitignore mode change 100644 => 100755 nb-configuration.xml mode change 100644 => 100755 nbproject/project.properties mode change 100644 => 100755 pom.xml mode change 100644 => 100755 src/main/java/no/nibio/vips/model/downcastmodel/DOWNCASTModel.java mode change 100644 => 100755 src/main/java/no/nibio/vips/model/downcastmodel/DataMatrix.java mode change 100644 => 100755 src/main/java/no/nibio/vips/model/downcastmodel/SporulationTable.java mode change 100644 => 100755 src/main/resources/no/nibio/vips/model/downcastmodel/texts.properties mode change 100644 => 100755 src/main/resources/no/nibio/vips/model/downcastmodel/texts_nb.properties mode change 100644 => 100755 src/test/java/no/nibio/vips/model/downcastmodel/DOWNCASTModelTest.java mode change 100644 => 100755 src/test/resources/lier_2015.json diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/nb-configuration.xml b/nb-configuration.xml old mode 100644 new mode 100755 diff --git a/nbproject/project.properties b/nbproject/project.properties old mode 100644 new mode 100755 diff --git a/pom.xml b/pom.xml old mode 100644 new mode 100755 diff --git a/src/main/java/no/nibio/vips/model/downcastmodel/DOWNCASTModel.java b/src/main/java/no/nibio/vips/model/downcastmodel/DOWNCASTModel.java old mode 100644 new mode 100755 diff --git a/src/main/java/no/nibio/vips/model/downcastmodel/DataMatrix.java b/src/main/java/no/nibio/vips/model/downcastmodel/DataMatrix.java old mode 100644 new mode 100755 diff --git a/src/main/java/no/nibio/vips/model/downcastmodel/SporulationTable.java b/src/main/java/no/nibio/vips/model/downcastmodel/SporulationTable.java old mode 100644 new mode 100755 diff --git a/src/main/resources/no/nibio/vips/model/downcastmodel/texts.properties b/src/main/resources/no/nibio/vips/model/downcastmodel/texts.properties old mode 100644 new mode 100755 index e2119f8..c739d45 --- a/src/main/resources/no/nibio/vips/model/downcastmodel/texts.properties +++ b/src/main/resources/no/nibio/vips/model/downcastmodel/texts.properties @@ -16,6 +16,6 @@ # name=DOWNCAST model -description=TODO +description=The prediction model DOWNCAST was developed by de Visser (1998) in the Netherlands, and calculates whether there is an infection risk of Onion Downy Mildew (Peronospora destructor) from weather data. Inoculum must be present for infections really happening. Criteria for both sporulation and infection must be satisfied for the model to issue an alert for high infection risk.\n\nSporulation activity is calculated on the basis of nightly high relative humidity (RH) (over 92%). Sporulation can occur at temperatures from 4 to 26 \u00b0C (optimum 12-20 \u00b0C). A sporulation index ranging from 1-3 is calculated from the duration of high RH and temperature, where 3 indicates optimal conditions for sporulation. A risk alert will not be issued if there is precipitation between the hours of 0:00 and 06:00, or there was a high temperature the preceding day (several hours at temperatures above 27 \u00b0 C).\n\nInfection alerts are based on leaf wetness. A direct infection requires a minimum of two hours of leaf wetness the morning after sporulation (optimum temperature 6-16 \u00b0 C). Later infections may occur up to 72 hours after sporulation, and requires a minimum of 144 minutes of leaf wetness over a 3 hour period. It is presumed that all spores sprout(????) simultaneously, so only one infection warning is issued per sporulation event.\n\nUnsuccessful infection: Brief periods of leaf wetness (90 to 150 minutes during a 5 hour period) may cause the spores to sprout(????) and die. In such cases a warning is NOT issued. (Next forecast assumes a new sporulation event). statusInterpretation=TODO -usage=TODO +usage=<p>Results returned are:</p>\n<ul>\n<li>DOWNCASTMO.SPORULATION_VALUE = The sporulation value. A sporulation index ranging from 1-3 is calculated from the duration of high RH and temperature, where 3 indicates optimal conditions for sporulation</li>\n<li>DOWNCASTMO.IDAS = Infection directly after sporulation (true/false)</li>\n<li>DOWNCASTMO.ILAS = Infection later after sporulation (true/false)</li>\n<li>DOWNCASTMO.ITAS = Infection time after sporulation (date and time)</li>\n</ul> diff --git a/src/main/resources/no/nibio/vips/model/downcastmodel/texts_nb.properties b/src/main/resources/no/nibio/vips/model/downcastmodel/texts_nb.properties old mode 100644 new mode 100755 index a915521..0cdba39 --- a/src/main/resources/no/nibio/vips/model/downcastmodel/texts_nb.properties +++ b/src/main/resources/no/nibio/vips/model/downcastmodel/texts_nb.properties @@ -1,4 +1,4 @@ name=L\u00f8kbladskimmelmodell -description=TODO +description=<p>Varslingsmodellen Downcast er utviklet av de Visser (1998) i Nederland, og beregner om det er fare for linfeksjoner av bladskimme ut fra værdata. Smitte må imidlertid være tilstede for at infeksjoner virkelig skjer. Kriterier for både sporulering og infeksjon må være oppfylt for at modellen beregner infeksjonsfare (rødt varsel).</p>\n<p>Varsel om sporulering beregnes på grunnlag av høy relativ luftfuktighet (RF) om natta (over 92 %). Sporulering kan forekomme ved temperaturer fra 4 til 26 °C (optimalt 12-20 °C). Det gis en sporuleringsverdi fra 1-3 beregnet utfra varighet av høy RF og temperatur, hvor 3 indikerer optimale forhold for sporulering. Det gis ikke varsel dersom det er registrert nedbør mellom kl 00.00 og 06.00, eller det var høy temperatur foregående dag (flere timer med temperatur over 27 °C).</p>\n<p>Varsel om infeksjon baseres på bladfuktighet. En direkte infeksjon krever minimum to timer bladfuktighet morgenen etter sporulering (optimal temperatur 6-16 °C). Senere infeksjoner kan forekomme opptil 72 timer etter sporulering, og krever minimum 144 minutter bladfuktighet i løpet av en 3 timers periode. Det antas at alle sporene spirer samtidig, og det beregnes kun ett infeksjonsvarsel per sporuleringsvarsel.</p>\n<p>Mislykket infeksjon: Kortvarige perioder med bladfuktighet (90-150 minutter i løpet av en 5 timers periode) kan medføre at sporene spirer og dør. I slike tilfeller gis det IKKE varsel. (neste varsel forutsetter nytt sporuleringsvarsel).</p> statusInterpretation=TODO -usage=TODO +usage=<p>Results returned are:</p>\n<ul>\n<li>DOWNCASTMO.SPORULATION_VALUE = Sporuleringsverdien. Det gis en sporuleringsverdi fra 1-3 beregnet utfra varighet av høy RF og temperatur, hvor 3 indikerer optimale forhold for sporulering.</li>\n<li>DOWNCASTMO.IDAS = Infeksjon direkte etter sporulering (sant/usant)</li>\n<li>DOWNCASTMO.ILAS = Infeksjon senere etter sporulering (sant/usant)</li>\n<li>DOWNCASTMO.ITAS = Tidspunkt for infeksjon etter sporulering</li>\n</ul> diff --git a/src/test/java/no/nibio/vips/model/downcastmodel/DOWNCASTModelTest.java b/src/test/java/no/nibio/vips/model/downcastmodel/DOWNCASTModelTest.java old mode 100644 new mode 100755 diff --git a/src/test/resources/lier_2015.json b/src/test/resources/lier_2015.json old mode 100644 new mode 100755 -- GitLab