[ci skip] Merge branch 'main' into release

README.md

 # SeptoriaApiicolaModel
 
-This repository contains the implementation of the Septoria apiicola model.
+<img src="src/main/resources/images/septoriaapiicola.jpg" title="S. apiicola in celery (Photo: E. Fl&oslash;istad, NIBIO)"/>
+<p>This model is based on a calculation of how leaf wetness periods influence 
+infection of celery by <em>Septoria apiicola</em> in susceptible host plants.<p>
+<p>Forecasts of infection risk are given after a minimum of 12 consecutive hours 
+of leaf wetness. The wet periods are calculated from sensors placed 30 cm above 
+ground. If such a sensor is not available, data from leaf wetness sensors placed 
+2 m above ground are used.</p>
+<p>The model is developed in Michigan, USA and published by Lacy, 1994.</p> 
+<p>It is generally assumed that this model has additional relevance for Septoria petroselini in parsley.</p> 
+<h3>Warning interpretation</h3>
+<p><em>The following recommendations are provided for the Norwegian celery production.</em></p>
+<p>The model is a tool to decide when to start looking for initial disease 
+outbreaks. It is not considered accurate enough to provide reliable advice for 
+timing of fungicide applications under Norwegian conditions. </p>
+<p>If inoculum is present, infections are expected to develop 7-14 days after 
+the first infection risk periods (yellow or red warnings). It is recommended to 
+intensify field inspections after periods with risk warnings to detect early 
+infections of <em>Septoria apiicola</em>. </p>
+<ul>
+<li>Green: No risk of infection.</li> 
+<li>Yellow: Weather conditions favorable for infection risk. No known sources of 
+inoculum in the region.</li> 
+<li>Red: Risk of infection and infections of Septoria late blight has been 
+reported in the nearby region. Disease reports and field inspections are 
+performed in collaboration with advisors in the Norwegian Agricultural Advisory service.</li>
+</ul>
+<p>Graph legend: Blue bars indicate periods of at least 12 consecutive hours of 
+leaf wetness. Black bar indicate date of first field observation of Septoria late 
+blight.</p>
+<h3>Forecast season (Norway only)</h3>
+<p>In Norway this model is generally started June 1 and ends September 30. </p>
+<p>The model is running on all weather stations located in regions of commercial celery production.</p> 
+<h3>Model validation</h3>
+<h4>Norway</h4>
+<p>Validation of this model under Norwegian conditions is ongoing. The current 
+recommendation for this model is as a tool for timing of field inspections. </p>
+<p>Studies of weather conditions, spore production and infection events have been 
+carried out in field trials at Ås from 2012-2016. Preliminary results indicate a 
+good fit, although some adjustments could improve the model, particularly in 
+connection with rain events (Nordskog and Le, 2014). </p>
+<h4>Internationally</h4>
+<p>The model is developed in Michigan, USA and published by Lacy (1994)</p>
+<h3>References</h3>
+<p>Lacy, M.L. 1994. Influence of wetness periods on infection of celery by 
+<em>Septoria apiicola</em> and use in timing sprays for control. Plant Disease 78, 975-979.</p>
+<p>Nordskog, B. og Le, V.H. 2015. Varsling av selleribladflekk. Gartneryrket nr 6, s14-15.</p>
 
 ### Development
 

pom.xml

@@ -11,14 +11,14 @@
 
     <groupId>no.nibio.vips.model</groupId>
     <artifactId>SeptoriaApiicolaModel</artifactId>
-    <version>1.1.2</version>
+    <version>1.1.3-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
             <groupId>no.nibio.vips</groupId>
             <artifactId>VIPSCommon</artifactId>
-            <version>2.0.1</version>
+            <version>2.0.2</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>

src/main/java/no/nibio/vips/model/septoriaapiicolamodel/DataMatrix.java

 /*
  * Copyright (c) 2016 NIBIO <http://www.nibio.no/>. 
- * 
- * This file is part of LygusRugulipennisModel.
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -14,7 +13,7 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- * 
+ *
  */
 
 package no.nibio.vips.model.septoriaapiicolamodel;

src/main/java/no/nibio/vips/model/septoriaapiicolamodel/SeptoriaApiicolaModel.java

 /*
- * Copyright (c) 2016 NIBIO <http://www.nibio.no/>. 
- * 
- * This file is part of LygusRugulipennisModel.
+ * Copyright (c) 2018 NIBIO <http://www.nibio.no/>. 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -14,7 +13,7 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- * 
+ *
  */
 
 package no.nibio.vips.model.septoriaapiicolamodel;
@@ -138,21 +137,23 @@ public class SeptoriaApiicolaModel extends I18nImpl implements Model{
     @Override
     public String getLicense() {
         return "\n" +
-            "Copyright (c) 2016 NIBIO <http://www.nibio.no/>. \n" +
-            "\n" +
-            "This file is part of SeptoriaApiicolaModel.\n" +
-            "SeptoriaApiicolaModel is free software: you can redistribute it and/or modify\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" +
-            "SeptoriaApiicolaModel 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" +
-            "NIBIO Open Source License for more details.\n" +
-            "\n" +
-            "You should have received a copy of the NIBIO Open Source License\n" +
-            "along with SeptoriaApiicolaModel.  If not, see <http://www.nibio.no/licenses/>.";
+            "/*\n" +
+            " * Copyright (c) 2018 NIBIO <http://www.nibio.no/>. \n" +
+            " *\n" +
+            " * This program is free software: you can redistribute it and/or modify\n" +
+            " * it under the terms of the GNU Affero General Public License as published by\n" +
+            " * the Free Software Foundation, either version 3 of the License, or\n" +
+            " * (at your option) any later version.\n" +
+            " *\n" +
+            " * This program 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" +
+            " * GNU Affero General Public License for more details.\n" +
+            " *\n" +
+            " * You should have received a copy of the GNU Affero General Public License\n" +
+            " * along with this program.  If not, see <https://www.gnu.org/licenses/>.\n" +
+            " *\n" +
+            " */";
     }
 
     @Override

src/test/java/no/nibio/vips/model/septoriaapiicolamodel/SeptoriaApiicolaModelTest.java

 /*
  * Copyright (c) 2016 NIBIO <http://www.nibio.no/>. 
- * 
- * This file is part of LygusRugulipennisModel.
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -14,7 +13,7 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- * 
+ *
  */
 package no.nibio.vips.model.septoriaapiicolamodel;