From a0f0d75977f88fca587d27aa785bd5d26821684f Mon Sep 17 00:00:00 2001
From: Olivier Maury <Olivier.Maury@inrae.fr>
Date: Fri, 18 Oct 2024 16:09:37 +0200
Subject: [PATCH 1/2] =?UTF-8?q?fix!:=20=F0=9F=92=A5=20Modifier=20le=20seui?=
=?UTF-8?q?l=20de=20l'indicateur=20excraidays?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
RAIN > 0 Ã RAIN > 20
fixes #15
---
.../resources/fr/inrae/agroclim/indicators/knowledge.xml | 5 ++---
src/site/markdown/release-notes-fr.md | 6 +++++-
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/fr/inrae/agroclim/indicators/knowledge.xml b/src/main/resources/fr/inrae/agroclim/indicators/knowledge.xml
index d1855f54..f3e3a2ea 100644
--- a/src/main/resources/fr/inrae/agroclim/indicators/knowledge.xml
+++ b/src/main/resources/fr/inrae/agroclim/indicators/knowledge.xml
@@ -1353,10 +1353,9 @@ along with Indicators. If not, see <https://www.gnu.org/licenses/>.
<id>excraidays</id>
<normalizationFunction xsi:type="sigmoid" sigmoidA="20.0" sigmoidB="-4.0" />
<criteria xsi:type="simpleCriteria">
- <variable>rain</variable><!-- TODO : discussion de Patrick : utiliser
- SWC > sat ? ou ressuyage > 0 ? RAIN > WATER_RESERVE -->
+ <variable>rain</variable>
<operator>GT</operator>
- <threshold>0.0</threshold><!-- quelle valeur ? -->
+ <threshold>20.0</threshold>
</criteria>
<unit>day</unit>
</indicator>
diff --git a/src/site/markdown/release-notes-fr.md b/src/site/markdown/release-notes-fr.md
index f3b0c967..6d297803 100644
--- a/src/site/markdown/release-notes-fr.md
+++ b/src/site/markdown/release-notes-fr.md
@@ -5,6 +5,10 @@ keywords: "version"
date: 2024-09-19
---
+# [v2.1.1](https://forgemia.inra.fr/agroclim/Indicators/indicators-java/-/releases/v2.1.1) − 18 octobre 2024
+
+- Modifier le seuil de l'indicateur `excraidays` Ã `RAIN > 20`.
+
# [v2.1.0](https://forgemia.inra.fr/agroclim/Indicators/indicators-java/-/releases/v2.1.0) − 19 septembre 2024
- Ajouter la méthode `Evaluation.computeEachDate()`.
@@ -12,7 +16,7 @@ date: 2024-09-19
- Supprimer `Evaluation#getResults()`.
- Supprimer `Evaluation#getComputedPhases()`.
- Supprimer `CompositeIndicator#toAggregate(boolean)`.
-- Passer le nombre de jours de la phase S4 - S5 pour la vigne à 35.
+- Passer le nombre de jours de la phase S4 - S5 pour la vigne à 35.
# [v2.0.2](https://forgemia.inra.fr/agroclim/Indicators/indicators-java/-/releases/v2.0.2) − 11 juillet 2024
--
GitLab
From b9139e34de40116cb0e1a3b18e8e9c296e056c09 Mon Sep 17 00:00:00 2001
From: Olivier Maury <Olivier.Maury@inrae.fr>
Date: Fri, 18 Oct 2024 16:12:53 +0200
Subject: [PATCH 2/2] v2.1.1
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 08264780..c2c7cadb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@ along with Indicators. If not, see <https://www.gnu.org/licenses/>.
<name>Indicators</name>
<description>Library of agro- and eco-climatic indicators.</description>
<inceptionYear>2018</inceptionYear>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.1</version>
<packaging>jar</packaging>
<licenses>
<license>
@@ -208,7 +208,7 @@ along with Indicators. If not, see <https://www.gnu.org/licenses/>.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.12.1</version>
+ <version>3.13.0</version>
<configuration>
<annotationProcessorPaths>
<!-- This plugin allows a Maven project to take advantage of Project Lombok -->
--
GitLab