From 9044d997993b4f42209c8d0059921142d42149cf Mon Sep 17 00:00:00 2001 From: Tor-Einar Skog <tor-einar.skog@bioforsk.no> Date: Fri, 7 Feb 2014 15:23:07 +0100 Subject: [PATCH] Added license notification headers for all remaining files --- .../vips/model/naerstadmodel/texts.properties | 19 +++++++++++++++++-- .../model/naerstadmodel/texts_nb.properties | 18 ++++++++++++++++-- .../naerstadmodel/NaerstadModelTest.java | 19 +++++++++++++++++-- 3 files changed, 50 insertions(+), 6 deletions(-) diff --git a/src/main/resources/no/bioforsk/vips/model/naerstadmodel/texts.properties b/src/main/resources/no/bioforsk/vips/model/naerstadmodel/texts.properties index 20817fa..9c9138a 100644 --- a/src/main/resources/no/bioforsk/vips/model/naerstadmodel/texts.properties +++ b/src/main/resources/no/bioforsk/vips/model/naerstadmodel/texts.properties @@ -1,5 +1,20 @@ -# To change this template, choose Tools | Templates -# and open the template in the editor. +# Copyright (C) 2014 Bioforsk +# +# This file is part of VIPS/NaerstadModel +# +# VIPSWeb 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. +# +# VIPSWeb 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 VIPSWeb. If not, see <http://www.gnu.org/licenses/>. + name=Naerstad Model usage=The following input data are required:\ncalculationStart - the time when calculation should start\ncalculationEnd - the time whe calculation should end (TODO: Is this necessary?)\nobservations - array of weather observations. An observation consists of:\n\ttimeMeasured - timestamp for observation\n\telementMeasurementTypeId - Code for parameter\n\tlogIntervalId: 1 for hour value\n\tvalue: the observed value\nFour different weather parameters should be provided:\n* TM - Mean temperature (Deg. Celcius)\n* RR - Aggregated rainfall (Millimeters)\n* Q0 - Global radiation (Wh/m2)\n* BT - Leaf wetness\nThey should all be hourly values, they should all be complete hourly series in the exact same period. \nMinimum period length is 4 days (TODO: Verify!) diff --git a/src/main/resources/no/bioforsk/vips/model/naerstadmodel/texts_nb.properties b/src/main/resources/no/bioforsk/vips/model/naerstadmodel/texts_nb.properties index 69dab6d..70675ba 100644 --- a/src/main/resources/no/bioforsk/vips/model/naerstadmodel/texts_nb.properties +++ b/src/main/resources/no/bioforsk/vips/model/naerstadmodel/texts_nb.properties @@ -1,5 +1,19 @@ -# To change this template, choose Tools | Templates -# and open the template in the editor. +# Copyright (C) 2014 Bioforsk +# +# This file is part of VIPS/NaerstadModel +# +# VIPSWeb 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. +# +# VIPSWeb 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 VIPSWeb. If not, see <http://www.gnu.org/licenses/>. name=N\u00e6rstads modell usage=F\u00f8lgende input kreves:\ncalculationStart - tidspunktet fra n\u00e5r beregningen skal starte\ncalculationEnd - hvor langt fram i tid beregningen skal g\u00e5\nobservations - array (liste) over m\u00e5ledata. En observasjon best\u00e5r av:\n\ttimeMeasured - m\u00e5leverdiens tidsstempel\n\telementMeasurementTypeId - kode for m\u00e5leparameter\n\tlogIntervalId: 1 for timeverdi\n\tvalue: verdien p\u00e5 den m\u00e5lte parameteren\nFire forskjellige m\u00e5leparametre m\u00e5 sendes inn:\n* TM - Middeltemperatur (Celcius)\n* RR - Aggrebert nedb\u00f8r (Millimeter)\n* Q0 - Globalstr\u00e5ling (Wh/m2)\n* BT - Bladfukt (antall minutter/time)\nDisse m\u00e5 alle v\u00e6re timedata. De m\u00e5 alle v\u00e6re komplette tidsserier i eksakt samme periode.\nMinimum lengde p\u00e5 tidsserie: 4 dager. diff --git a/src/test/java/no/bioforsk/vips/model/naerstadmodel/NaerstadModelTest.java b/src/test/java/no/bioforsk/vips/model/naerstadmodel/NaerstadModelTest.java index 84d0438..ed8fd92 100644 --- a/src/test/java/no/bioforsk/vips/model/naerstadmodel/NaerstadModelTest.java +++ b/src/test/java/no/bioforsk/vips/model/naerstadmodel/NaerstadModelTest.java @@ -1,7 +1,22 @@ /* - * To change this template, choose Tools | Templates - * and open the template in the editor. + * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. + * + * This file is part of VIPSLogic. + * VIPSLogic 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. + * + * VIPSLogic 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 VIPSLogic. If not, see <http://www.gnu.org/licenses/>. + * */ + package no.bioforsk.vips.model.naerstadmodel; import java.io.BufferedInputStream; -- GitLab