From 76c3ffef47d3d2e150fe462a3d836b57d35655ba Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Wed, 1 Sep 2021 14:39:37 +0200
Subject: [PATCH] General cleanup after forking
---
README.md | 2 +-
pom.xml | 4 +-
.../vips/model/phenology/DataMatrix.java | 23 +++++++--
.../vips/model/phenology/PhenologyModel.java | 49 +++++++++----------
.../model/phenology/PhenologyModelStore.java | 23 +++++++--
.../no/nibio/vips/model/phenology/Plant.java | 23 +++++++--
.../vips/model/phenology/Plantation.java | 25 +++++++---
7 files changed, 98 insertions(+), 51 deletions(-)
diff --git a/README.md b/README.md
index f144993..38b3c44 100644
--- a/README.md
+++ b/README.md
@@ -1 +1 @@
-Model_MAIZEPHENO
+Model_GENPHENOLO
diff --git a/pom.xml b/pom.xml
index 48299e2..b2abb13 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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.nibio.vips.model</groupId>
- <artifactId>Model_PHYNOLOGYM</artifactId>
+ <artifactId>Model_GENPHENOLO</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<dependencies>
@@ -35,5 +35,5 @@
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
</properties>
- <name>Model_PHYNOLOGYM</name>
+ <name>Model_GENPHENOLO</name>
</project>
\ No newline at end of file
diff --git a/src/main/java/no/nibio/vips/model/phenology/DataMatrix.java b/src/main/java/no/nibio/vips/model/phenology/DataMatrix.java
index 0e3b00e..cf71c8d 100644
--- a/src/main/java/no/nibio/vips/model/phenology/DataMatrix.java
+++ b/src/main/java/no/nibio/vips/model/phenology/DataMatrix.java
@@ -1,7 +1,19 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
+/**
+ Copyright (c) 2021 NIBIO <http://www.nibio.no/>.
+
+ This file is part of Model_GENPHENOLO.
+ Model_GENPHENOLO 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.
+
+ Model_GENPHENOLO 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 Model_GENPHENOLO. If not, see <http://www.nibio.no/licenses/>.
*/
package no.nibio.vips.model.phenology;
@@ -9,7 +21,8 @@ import no.nibio.vips.util.DateMap;
/**
*
- * @author wildfly
+ * @author Bhabesh Bhabani Mukhopadyay
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
public class DataMatrix extends DateMap
{
diff --git a/src/main/java/no/nibio/vips/model/phenology/PhenologyModel.java b/src/main/java/no/nibio/vips/model/phenology/PhenologyModel.java
index f53448b..8ff0efa 100644
--- a/src/main/java/no/nibio/vips/model/phenology/PhenologyModel.java
+++ b/src/main/java/no/nibio/vips/model/phenology/PhenologyModel.java
@@ -1,22 +1,19 @@
-/*
- *
-
-Copyright (c) 2020 NIBIO <http://www.nibio.no/>.
-
-This file is part of PhenologyModel.
-AlternariaModel 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.
+/**
+ Copyright (c) 2021 NIBIO <http://www.nibio.no/>.
-AlternariaModel 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.
+ This file is part of Model_GENPHENOLO.
+ Model_GENPHENOLO 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.
-You should have received a copy of the NIBIO Open Source License
-along with AlternariaModel. If not, see <http://www.nibio.no/licenses/>.
+ Model_GENPHENOLO 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 Model_GENPHENOLO. If not, see <http://www.nibio.no/licenses/>.
*/
package no.nibio.vips.model.phenology;
@@ -48,12 +45,12 @@ import no.nibio.vips.util.WeatherUtil;
/**
*
- * @author Bhabesh
- * Creation Date :
+ * @author Bhabesh Bhabani Mukhopadyay
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
public class PhenologyModel extends I18nImpl implements Model{
- public final static String NAME_MODEL_ID = "PHENOLOGYM";
+ public final static String NAME_MODEL_ID = "GENPHENOLO";
public final static ModelId MODEL_ID = new ModelId(NAME_MODEL_ID);
private final ModelUtil modelUtil;
@@ -194,7 +191,7 @@ public class PhenologyModel extends I18nImpl implements Model{
@Override
public String getCopyright() {
- return "(c) 2020 NIBIO (http://www.nibio.no/). Contact: post@nibio.no";
+ return "(c) 2021 NIBIO (http://www.nibio.no/). Contact: post@nibio.no";
}
@Override
@@ -249,11 +246,11 @@ public class PhenologyModel extends I18nImpl implements Model{
config.getConfigParameter("observations")
, new TypeReference<List<WeatherObservation>>(){}
);
- List<WeatherObservation> fawWeatherLIstHourly_tm = new ArrayList<WeatherObservation>();
- Map <Date, WeatherObservation> fawWeatherMapHourly_tx = new HashMap<Date, WeatherObservation> ();
- Map <Date, WeatherObservation> fawWeatherMapHourly_tn = new HashMap<Date, WeatherObservation> ();
- Map <Date, WeatherObservation> fawWeatherMapDaily_tx = new HashMap<Date, WeatherObservation> ();
- Map <Date, WeatherObservation> fawWeatherMapDaily_tn = new HashMap<Date, WeatherObservation> ();
+ List<WeatherObservation> fawWeatherLIstHourly_tm = new ArrayList<>();
+ Map <Date, WeatherObservation> fawWeatherMapHourly_tx = new HashMap<> ();
+ Map <Date, WeatherObservation> fawWeatherMapHourly_tn = new HashMap<> ();
+ Map <Date, WeatherObservation> fawWeatherMapDaily_tx = new HashMap<> ();
+ Map <Date, WeatherObservation> fawWeatherMapDaily_tn = new HashMap<> ();
PhenologyModelStore modelStore = PhenologyModelStore.getInstance();
@@ -521,7 +518,7 @@ public class PhenologyModel extends I18nImpl implements Model{
/**
- * Get a trimmed date without hour,minute,second,milli second
+ * Get a trimmed date without hour,minute,second,millisecond
* @param date
* @return
*/
diff --git a/src/main/java/no/nibio/vips/model/phenology/PhenologyModelStore.java b/src/main/java/no/nibio/vips/model/phenology/PhenologyModelStore.java
index 44cb30f..b5853cb 100644
--- a/src/main/java/no/nibio/vips/model/phenology/PhenologyModelStore.java
+++ b/src/main/java/no/nibio/vips/model/phenology/PhenologyModelStore.java
@@ -1,13 +1,26 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
+/**
+ Copyright (c) 2021 NIBIO <http://www.nibio.no/>.
+
+ This file is part of Model_GENPHENOLO.
+ Model_GENPHENOLO 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.
+
+ Model_GENPHENOLO 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 Model_GENPHENOLO. If not, see <http://www.nibio.no/licenses/>.
*/
package no.nibio.vips.model.phenology;
/**
*
- * @author wildfly
+ * @author Bhabesh Bhabani Mukhopadyay
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
public class PhenologyModelStore {
diff --git a/src/main/java/no/nibio/vips/model/phenology/Plant.java b/src/main/java/no/nibio/vips/model/phenology/Plant.java
index 6f406b6..aa68744 100644
--- a/src/main/java/no/nibio/vips/model/phenology/Plant.java
+++ b/src/main/java/no/nibio/vips/model/phenology/Plant.java
@@ -1,7 +1,19 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
+/**
+ Copyright (c) 2021 NIBIO <http://www.nibio.no/>.
+
+ This file is part of Model_GENPHENOLO.
+ Model_GENPHENOLO 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.
+
+ Model_GENPHENOLO 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 Model_GENPHENOLO. If not, see <http://www.nibio.no/licenses/>.
*/
package no.nibio.vips.model.phenology;
@@ -10,7 +22,8 @@ import java.util.List;
/**
*
- * @author wildfly
+ * @author Bhabesh Bhabani Mukhopadyay
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
public class Plant {
private String speciesLatinName;
diff --git a/src/main/java/no/nibio/vips/model/phenology/Plantation.java b/src/main/java/no/nibio/vips/model/phenology/Plantation.java
index 3bb8425..167ad6b 100644
--- a/src/main/java/no/nibio/vips/model/phenology/Plantation.java
+++ b/src/main/java/no/nibio/vips/model/phenology/Plantation.java
@@ -1,15 +1,26 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
+/**
+ Copyright (c) 2021 NIBIO <http://www.nibio.no/>.
+
+ This file is part of Model_GENPHENOLO.
+ Model_GENPHENOLO 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.
+
+ Model_GENPHENOLO 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 Model_GENPHENOLO. If not, see <http://www.nibio.no/licenses/>.
*/
package no.nibio.vips.model.phenology;
-import java.util.Date;
-
/**
*
- * @author wildfly
+ * @author Bhabesh Bhabani Mukhopadyay
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
public class Plantation {
private String typeName;
--
GitLab