Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

M

Model_FINNCEREAL
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

6559c2b0

Commit 6559c2b0 authored 5 years ago by Tor-Einar Skog

Downloads
- Plain Diff

Merge branch 'Aalto_spring2019' into 'master'

Aalto spring2019

See merge request VIPS/Model_FINNCEREAL!4

parents 9eed4280 8b72c971

No related branches found

No related tags found

1 merge request!4Aalto spring2019

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

.settings/org.eclipse.jdt.core.prefs 2 additions, 0 deletions

.settings/org.eclipse.jdt.core.prefs
resources/2019_Aas_Norway.json 1 addition, 0 deletions

resources/2019_Aas_Norway.json
resources/fi/luke/vips/model/cerealmodels/texts.properties 7 additions, 0 deletions

resources/fi/luke/vips/model/cerealmodels/texts.properties
resources/model-constants.json 8 additions, 2 deletions

resources/model-constants.json
src/main/java/fi/luke/vips/model/cerealmodels/FinnCerealModels.java 55 additions, 26 deletions

...ava/fi/luke/vips/model/cerealmodels/FinnCerealModels.java
src/main/java/fi/luke/vips/model/cerealmodels/test/FinnCerealModelsTest.java 8 additions, 0 deletions

...ke/vips/model/cerealmodels/test/FinnCerealModelsTest.java
src/main/java/fi/uef/envi/mtt/model/diseasepressure/BaseRisk.java 37 additions, 2 deletions

.../java/fi/uef/envi/mtt/model/diseasepressure/BaseRisk.java
src/main/java/fi/uef/envi/mtt/model/diseasepressure/DiseasePressureModel.java 65 additions, 2 deletions

.../envi/mtt/model/diseasepressure/DiseasePressureModel.java
src/test/java/fi/luke/vips/model/cerealmodels/FinnCerealModelsTest.java 21 additions, 14 deletions

...fi/luke/vips/model/cerealmodels/FinnCerealModelsTest.java

with 204 additions and 46 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment