From c8e5b918bde2f3b0d6322b7b79cb7bf8faa934be Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Wed, 15 Mar 2023 16:08:14 +0100
Subject: [PATCH] License, copyright and attributions updates
---
README.md | 50 +++++++++++++++++++
.../model/cerealmodels/FinnCerealModels.java | 12 +++--
.../test/FinnCerealModelsTest.java | 4 ++
.../diseasepressure/AccumulatedRisk.java | 31 ++++++------
.../mtt/model/diseasepressure/BaseRisk.java | 31 ++++++------
.../mtt/model/diseasepressure/DailyRisk.java | 31 ++++++------
.../diseasepressure/DiseasePressureModel.java | 31 ++++++------
.../diseasepressure/DiseaseProgress.java | 31 ++++++------
.../diseasepressure/InfectionProbability.java | 31 ++++++------
.../mtt/model/diseasepressure/Measure.java | 31 ++++++------
.../mtt/model/diseasepressure/Options.java | 31 ++++++------
.../envi/mtt/model/diseasepressure/Risk.java | 31 ++++++------
.../diseasepressure/SporeDevelopment.java | 31 ++++++------
.../model/diseasepressure/SporeSpreading.java | 31 ++++++------
.../envi/mtt/model/diseasepressure/Utils.java | 31 ++++++------
15 files changed, 267 insertions(+), 171 deletions(-)
create mode 100644 README.md
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..1147a73
--- /dev/null
+++ b/README.md
@@ -0,0 +1,50 @@
+# Finn Cereal Models
+**Model for net blotch (Pyrenophora teres), tan spot (pyrenophora triciti-repentis), and stagonospora blotch (s. nodorum)**
+
+
+This is a mechanistic model that can be used for three fungal diseases in cereals: the barley net
+blotch caused by *Pyrenophora teres*, the wheat tan spot caused by *Pyrenophora triciti-repentis*,
+and the wheat stagonospora blotch caused by *S. nodorum*.
+
+All three diseases included in the model can be modeled similarly, but only one disease,
+shown in the model title, is being modeled at a time.
+
+The model is based on explicitly modeling the progress of diseases separately on each location.
+The principal entities and phenomena used in the model are *the disease*, *the field*, *the cultivar*,
+and *the weather*. The output of the model provides the farmer with information when the situation on
+their field has been beneficial for disease development and thus there is an elevated risk of a disease
+outbreak. Modeling each disease is based on the same, mechanistic modeling approach. However, as the optimal
+circumstances for the progress of each disease are different, each disease needs to be modelled individually.
+
+The model gives two types of results: the daily risk and the accumulated risk. Of these the accumulated risk
+value is the one to keep an eye on. The accumulated risk tells how likely it is that the net blotch is going
+to infect the crop; the higher the accumulated risk value the higher the likehood of infection.
+
+**An accumulated risk value of 50 or more is a cause for concern.**
+
+**An accumulated risk value of 100 or more is a cause for heightened concern.**
+
+To set up the model, the following information is required:
+
+* A weather data source, such as a weather station, integrated to the VIPS system
+* The sowing date for the field in question
+* The preceding crop on the field
+* The tillage method used on the field
+* The susceptibility of the crop on the field
+
+As can be seen from the list, the model is field-specific, and therefore needs to be set up separately for
+each field where the disease situation is being monitored.
+
+## References and attributions
+This model is based on and uses to a large extent code that was originally written in the context of research work published in
+
+* Markus Stocker, Jussi Nikander, Hanna Huitu, Marja Jalli, Markku
+Koistinen, Mauno Rönkkö, and Mikko Kolehmainen (2016). Representing
+Situational Knowledge for Disease Outbreaks in Agriculture. Journal of
+Agricultural Informatics, 7(2):29-39. https://doi.org/10.17700/jai.2016.7.2.290
+* Markus Stocker (2015). Situation Awareness in Environmental
+Monitoring. Doctoral Dissertation (PhD). Publications of the
+University of Eastern Finland. Dissertations in Forestry and Natural
+Sciences No 192, University of Eastern Finland. ISBN:
+978-952-61-1907-6. http://urn.fi/URN:ISBN:978-952-61-1908-3
+
diff --git a/src/main/java/fi/luke/vips/model/cerealmodels/FinnCerealModels.java b/src/main/java/fi/luke/vips/model/cerealmodels/FinnCerealModels.java
index cb8ee47..02944b5 100644
--- a/src/main/java/fi/luke/vips/model/cerealmodels/FinnCerealModels.java
+++ b/src/main/java/fi/luke/vips/model/cerealmodels/FinnCerealModels.java
@@ -93,9 +93,15 @@ public class FinnCerealModels extends I18nImpl implements Model {
@Override
public String getLicense() {
return "Copyright (c) 2016-2019 Natural Resources Institute Finland\n" +
- "This file is part of the Finnish cereal models package." +
- "The Finnish cereal models package is free software: you can distribute and/or modify it\n" +
- "under the terms of the GNU Lesser General Public License (LGPL) version 3, or any later version.";
+ "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.";
}
@Override
diff --git a/src/main/java/fi/luke/vips/model/cerealmodels/test/FinnCerealModelsTest.java b/src/main/java/fi/luke/vips/model/cerealmodels/test/FinnCerealModelsTest.java
index b066208..4bc9eac 100644
--- a/src/main/java/fi/luke/vips/model/cerealmodels/test/FinnCerealModelsTest.java
+++ b/src/main/java/fi/luke/vips/model/cerealmodels/test/FinnCerealModelsTest.java
@@ -37,6 +37,10 @@ import no.nibio.vips.model.ModelExcecutionException;
import no.nibio.vips.util.WeatherElements;
import no.nibio.vips.util.test.WeatherDataFileReader;
+/**
+ *
+ * @author Jussi Nikander <jussi.nikander@aalto.fi>
+ */
public class FinnCerealModelsTest {
private static boolean printOutput = true;
diff --git a/src/main/java/fi/uef/envi/mtt/model/diseasepressure/AccumulatedRisk.java b/src/main/java/fi/uef/envi/mtt/model/diseasepressure/AccumulatedRisk.java
index 655a222..623aba4 100644
--- a/src/main/java/fi/uef/envi/mtt/model/diseasepressure/AccumulatedRisk.java
+++ b/src/main/java/fi/uef/envi/mtt/model/diseasepressure/AccumulatedRisk.java
@@ -1,6 +1,20 @@
/*
- * Copyright (C) 2014 see CREDITS.txt
- * All rights reserved.
+ * Copyright (c) 2018 LUKE <https://www.luke.fi>
+ *
+ * This file is part of FinnCerealModels.
+ * 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
+ * (at your option) any later version.
+ *
+ * This program 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
+ * GNU Affero General Public License for more details.
+ *
+ * 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 fi.uef.envi.mtt.model.diseasepressure;
@@ -16,18 +30,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
/**
- * <p>
- * Title: AccumulatedRisk
- * </p>
- * <p>
- * Description:
- * </p>
- * <p>
- * Project:
- * </p>
- * <p>
- * Copyright: Copyright (C) 2014
- * </p>
+ * Copyright (c) 2018 LUKE <https://www.luke.fi>
*
* @author Markus Stocker
*/
diff --git a/src/main/java/fi/uef/envi/mtt/model/diseasepressure/BaseRisk.java b/src/main/java/fi/uef/envi/mtt/model/diseasepressure/BaseRisk.java
index 24206cd..0dcb251 100644
--- a/src/main/java/fi/uef/envi/mtt/model/diseasepressure/BaseRisk.java
+++ b/src/main/java/fi/uef/envi/mtt/model/diseasepressure/BaseRisk.java
@@ -1,6 +1,20 @@
/*
- * Copyright (C) 2014 see CREDITS.txt
- * All rights reserved.
+ * Copyright (c) 2018 LUKE <https://www.luke.fi>
+ *
+ * This file is part of FinnCerealModels.
+ * 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
+ * (at your option) any later version.
+ *
+ * This program 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
+ * GNU Affero General Public License for more details.
+ *
+ * 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 fi.uef.envi.mtt.model.diseasepressure;
@@ -15,18 +29,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
/**
- * <p>
- * Title: BaseRisk
- * </p>
- * <p>
- * Description: (A+B)*C
- * </p>
- * <p>
- * Project:
- * </p>
- * <p>
- * Copyright: Copyright (C) 2014
- * </p>
+ * Copyright (c) 2018 LUKE <https://www.luke.fi>
*
* @author Markus Stocker
*/
diff --git a/src/main/java/fi/uef/envi/mtt/model/diseasepressure/DailyRisk.java b/src/main/java/fi/uef/envi/mtt/model/diseasepressure/DailyRisk.java
index 6092b76..f409968 100644
--- a/src/main/java/fi/uef/envi/mtt/model/diseasepressure/DailyRisk.java
+++ b/src/main/java/fi/uef/envi/mtt/model/diseasepressure/DailyRisk.java
@@ -1,24 +1,27 @@
/*
- * Copyright (C) 2014 see CREDITS.txt
- * All rights reserved.
+ * Copyright (c) 2018 LUKE <https://www.luke.fi>
+ *
+ * This file is part of FinnCerealModels.
+ * 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
+ * (at your option) any later version.
+ *
+ * This program 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
+ * GNU Affero General Public License for more details.
+ *
+ * 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 fi.uef.envi.mtt.model.diseasepressure;
/**
- * <p>
- * Title: DailyRisk
- * </p>
- * <p>
- * Description: (A+B)*C*D*E*F*G
- * </p>
- * <p>
- * Project:
- * </p>
- * <p>
- * Copyright: Copyright (C) 2014
- * </p>
+ * Copyright (c) 2018 LUKE <https://www.luke.fi>
*
* @author Markus Stocker
*/
diff --git a/src/main/java/fi/uef/envi/mtt/model/diseasepressure/DiseasePressureModel.java b/src/main/java/fi/uef/envi/mtt/model/diseasepressure/DiseasePressureModel.java
index f4f6c45..5161d5b 100644
--- a/src/main/java/fi/uef/envi/mtt/model/diseasepressure/DiseasePressureModel.java
+++ b/src/main/java/fi/uef/envi/mtt/model/diseasepressure/DiseasePressureModel.java
@@ -1,6 +1,20 @@
/*
- * Copyright (C) 2014 see CREDITS.txt
- * All rights reserved.
+ * Copyright (c) 2018 LUKE <https://www.luke.fi>
+ *
+ * This file is part of FinnCerealModels.
+ * 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
+ * (at your option) any later version.
+ *
+ * This program 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
+ * GNU Affero General Public License for more details.
+ *
+ * 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 fi.uef.envi.mtt.model.diseasepressure;
@@ -18,18 +32,7 @@ import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
/**
- * <p>
- * Title: DiseasePressureModel
- * </p>
- * <p>
- * Description:
- * </p>
- * <p>
- * Project:
- * </p>
- * <p>
- * Copyright: Copyright (C) 2014
- * </p>
+ * Copyright (c) 2018 LUKE <https://www.luke.fi>
*
* @author Markus Stocker
*/
diff --git a/src/main/java/fi/uef/envi/mtt/model/diseasepressure/DiseaseProgress.java b/src/main/java/fi/uef/envi/mtt/model/diseasepressure/DiseaseProgress.java
index 5895df5..c97e893 100644
--- a/src/main/java/fi/uef/envi/mtt/model/diseasepressure/DiseaseProgress.java
+++ b/src/main/java/fi/uef/envi/mtt/model/diseasepressure/DiseaseProgress.java
@@ -1,6 +1,20 @@
/*
- * Copyright (C) 2014 see CREDITS.txt
- * All rights reserved.
+ * Copyright (c) 2018 LUKE <https://www.luke.fi>
+ *
+ * This file is part of FinnCerealModels.
+ * 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
+ * (at your option) any later version.
+ *
+ * This program 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
+ * GNU Affero General Public License for more details.
+ *
+ * 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 fi.uef.envi.mtt.model.diseasepressure;
@@ -16,18 +30,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
/**
- * <p>
- * Title: DiseaseProgress
- * </p>
- * <p>
- * Description:
- * </p>
- * <p>
- * Project:
- * </p>
- * <p>
- * Copyright: Copyright (C) 2014
- * </p>
+ * Copyright (c) 2018 LUKE <https://www.luke.fi>
*
* @author Markus Stocker
*/
diff --git a/src/main/java/fi/uef/envi/mtt/model/diseasepressure/InfectionProbability.java b/src/main/java/fi/uef/envi/mtt/model/diseasepressure/InfectionProbability.java
index 823f850..7fc5759 100644
--- a/src/main/java/fi/uef/envi/mtt/model/diseasepressure/InfectionProbability.java
+++ b/src/main/java/fi/uef/envi/mtt/model/diseasepressure/InfectionProbability.java
@@ -1,6 +1,20 @@
/*
- * Copyright (C) 2014 see CREDITS.txt
- * All rights reserved.
+ * Copyright (c) 2018 LUKE <https://www.luke.fi>
+ *
+ * This file is part of FinnCerealModels.
+ * 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
+ * (at your option) any later version.
+ *
+ * This program 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
+ * GNU Affero General Public License for more details.
+ *
+ * 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 fi.uef.envi.mtt.model.diseasepressure;
@@ -16,18 +30,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
/**
- * <p>
- * Title: InfectionProbability
- * </p>
- * <p>
- * Description:
- * </p>
- * <p>
- * Project:
- * </p>
- * <p>
- * Copyright: Copyright (C) 2014
- * </p>
+ * Copyright (c) 2018 LUKE <https://www.luke.fi>
*
* @author Markus Stocker
*/
diff --git a/src/main/java/fi/uef/envi/mtt/model/diseasepressure/Measure.java b/src/main/java/fi/uef/envi/mtt/model/diseasepressure/Measure.java
index d1e374e..ec5c020 100644
--- a/src/main/java/fi/uef/envi/mtt/model/diseasepressure/Measure.java
+++ b/src/main/java/fi/uef/envi/mtt/model/diseasepressure/Measure.java
@@ -1,23 +1,26 @@
/*
- * Copyright (C) 2014 see CREDITS.txt
- * All rights reserved.
+ * Copyright (c) 2018 LUKE <https://www.luke.fi>
+ *
+ * This file is part of FinnCerealModels.
+ * 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
+ * (at your option) any later version.
+ *
+ * This program 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
+ * GNU Affero General Public License for more details.
+ *
+ * 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 fi.uef.envi.mtt.model.diseasepressure;
/**
- * <p>
- * Title: Measure
- * </p>
- * <p>
- * Description:
- * </p>
- * <p>
- * Project:
- * </p>
- * <p>
- * Copyright: Copyright (C) 2014
- * </p>
+ * Copyright (c) 2018 LUKE <https://www.luke.fi>
*
* @author Markus Stocker
*/
diff --git a/src/main/java/fi/uef/envi/mtt/model/diseasepressure/Options.java b/src/main/java/fi/uef/envi/mtt/model/diseasepressure/Options.java
index 219b64c..b025960 100644
--- a/src/main/java/fi/uef/envi/mtt/model/diseasepressure/Options.java
+++ b/src/main/java/fi/uef/envi/mtt/model/diseasepressure/Options.java
@@ -1,23 +1,26 @@
/*
- * Copyright (C) 2014 see CREDITS.txt
- * All rights reserved.
+ * Copyright (c) 2018 LUKE <https://www.luke.fi>
+ *
+ * This file is part of FinnCerealModels.
+ * 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
+ * (at your option) any later version.
+ *
+ * This program 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
+ * GNU Affero General Public License for more details.
+ *
+ * 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 fi.uef.envi.mtt.model.diseasepressure;
/**
- * <p>
- * Title:
- * </p>
- * <p>
- * Description:
- * </p>
- * <p>
- * Project:
- * </p>
- * <p>
- * Copyright: Copyright (C) 2014
- * </p>
+ * Copyright (c) 2018 LUKE <https://www.luke.fi>
*
* @author Markus Stocker
*/
diff --git a/src/main/java/fi/uef/envi/mtt/model/diseasepressure/Risk.java b/src/main/java/fi/uef/envi/mtt/model/diseasepressure/Risk.java
index f99a58a..7dbd797 100644
--- a/src/main/java/fi/uef/envi/mtt/model/diseasepressure/Risk.java
+++ b/src/main/java/fi/uef/envi/mtt/model/diseasepressure/Risk.java
@@ -1,23 +1,26 @@
/*
- * Copyright (C) 2014 see CREDITS.txt
- * All rights reserved.
+ * Copyright (c) 2018 LUKE <https://www.luke.fi>
+ *
+ * This file is part of FinnCerealModels.
+ * 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
+ * (at your option) any later version.
+ *
+ * This program 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
+ * GNU Affero General Public License for more details.
+ *
+ * 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 fi.uef.envi.mtt.model.diseasepressure;
/**
- * <p>
- * Title: Risk
- * </p>
- * <p>
- * Description:
- * </p>
- * <p>
- * Project:
- * </p>
- * <p>
- * Copyright: Copyright (C) 2014
- * </p>
+ * Copyright (c) 2018 LUKE <https://www.luke.fi>
*
* @author Markus Stocker
*/
diff --git a/src/main/java/fi/uef/envi/mtt/model/diseasepressure/SporeDevelopment.java b/src/main/java/fi/uef/envi/mtt/model/diseasepressure/SporeDevelopment.java
index 2766db8..a9ed389 100644
--- a/src/main/java/fi/uef/envi/mtt/model/diseasepressure/SporeDevelopment.java
+++ b/src/main/java/fi/uef/envi/mtt/model/diseasepressure/SporeDevelopment.java
@@ -1,6 +1,20 @@
/*
- * Copyright (C) 2014 see CREDITS.txt
- * All rights reserved.
+ * Copyright (c) 2018 LUKE <https://www.luke.fi>
+ *
+ * This file is part of FinnCerealModels.
+ * 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
+ * (at your option) any later version.
+ *
+ * This program 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
+ * GNU Affero General Public License for more details.
+ *
+ * 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 fi.uef.envi.mtt.model.diseasepressure;
@@ -16,18 +30,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
/**
- * <p>
- * Title: SporeDevelopment
- * </p>
- * <p>
- * Description:
- * </p>
- * <p>
- * Project:
- * </p>
- * <p>
- * Copyright: Copyright (C) 2014
- * </p>
+ * Copyright (c) 2018 LUKE <https://www.luke.fi>
*
* @author Markus Stocker
*/
diff --git a/src/main/java/fi/uef/envi/mtt/model/diseasepressure/SporeSpreading.java b/src/main/java/fi/uef/envi/mtt/model/diseasepressure/SporeSpreading.java
index 5b02671..98f0906 100644
--- a/src/main/java/fi/uef/envi/mtt/model/diseasepressure/SporeSpreading.java
+++ b/src/main/java/fi/uef/envi/mtt/model/diseasepressure/SporeSpreading.java
@@ -1,6 +1,20 @@
/*
- * Copyright (C) 2014 see CREDITS.txt
- * All rights reserved.
+ * Copyright (c) 2018 LUKE <https://www.luke.fi>
+ *
+ * This file is part of FinnCerealModels.
+ * 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
+ * (at your option) any later version.
+ *
+ * This program 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
+ * GNU Affero General Public License for more details.
+ *
+ * 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 fi.uef.envi.mtt.model.diseasepressure;
@@ -16,18 +30,7 @@ import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
/**
- * <p>
- * Title: SporeSpreading
- * </p>
- * <p>
- * Description:
- * </p>
- * <p>
- * Project:
- * </p>
- * <p>
- * Copyright: Copyright (C) 2014
- * </p>
+ * Copyright (c) 2018 LUKE <https://www.luke.fi>
*
* @author Markus Stocker
*/
diff --git a/src/main/java/fi/uef/envi/mtt/model/diseasepressure/Utils.java b/src/main/java/fi/uef/envi/mtt/model/diseasepressure/Utils.java
index ea6e084..c275fe3 100644
--- a/src/main/java/fi/uef/envi/mtt/model/diseasepressure/Utils.java
+++ b/src/main/java/fi/uef/envi/mtt/model/diseasepressure/Utils.java
@@ -1,23 +1,26 @@
/*
- * Copyright (C) 2014 see CREDITS.txt
- * All rights reserved.
+ * Copyright (c) 2018 LUKE <https://www.luke.fi>
+ *
+ * This file is part of FinnCerealModels.
+ * 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
+ * (at your option) any later version.
+ *
+ * This program 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
+ * GNU Affero General Public License for more details.
+ *
+ * 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 fi.uef.envi.mtt.model.diseasepressure;
/**
- * <p>
- * Title:
- * </p>
- * <p>
- * Description:
- * </p>
- * <p>
- * Project:
- * </p>
- * <p>
- * Copyright: Copyright (C) 2014
- * </p>
+ * Copyright (c) 2018 LUKE <https://www.luke.fi>
*
* @author Markus Stocker
*/
--
GitLab