Skip to content
Snippets Groups Projects
Commit 76c3ffef authored by Tor-Einar Skog's avatar Tor-Einar Skog
Browse files

General cleanup after forking

parent 0709ba03
Branches
No related tags found
No related merge requests found
Pipeline #240 failed
Stage: build
Stage: test
Hide whitespace changes
Inline Side-by-side
Showing
with 98 additions and 51 deletions
README.md
+ 1
− 1
View file @ 76c3ffef
Model_MAIZEPHENO
Model_GENPHENOLO
pom.xml
+ 2
− 2
View file @ 76c3ffef
......@@ -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
src/main/java/no/nibio/vips/model/phenology/DataMatrix.java
+ 18
− 5
View file @ 76c3ffef
/*
* 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
{
......
src/main/java/no/nibio/vips/model/phenology/PhenologyModel.java
+ 23
− 26
View file @ 76c3ffef
/*
*
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
*/
......
src/main/java/no/nibio/vips/model/phenology/PhenologyModelStore.java
+ 18
− 5
View file @ 76c3ffef
/*
* 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 {
......
src/main/java/no/nibio/vips/model/phenology/Plant.java
+ 18
− 5
View file @ 76c3ffef
/*
* 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;
......
src/main/java/no/nibio/vips/model/phenology/Plantation.java
+ 18
− 7
View file @ 76c3ffef
/*
* 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;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment