From 4890ec827b91c5794e9ed656a58b744a6f94ed53 Mon Sep 17 00:00:00 2001 From: Tor-Einar Skog <tor-einar.skog@bioforsk.no> Date: Fri, 7 Feb 2014 15:27:05 +0100 Subject: [PATCH] Corrected license information --- .../no/bioforsk/vips/model/naerstadmodel/texts.properties | 6 +++--- .../bioforsk/vips/model/naerstadmodel/texts_nb.properties | 6 +++--- .../vips/model/naerstadmodel/NaerstadModelTest.java | 8 ++++---- 3 files changed, 10 insertions(+), 10 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 9c9138a..e1fd02a 100644 --- a/src/main/resources/no/bioforsk/vips/model/naerstadmodel/texts.properties +++ b/src/main/resources/no/bioforsk/vips/model/naerstadmodel/texts.properties @@ -2,18 +2,18 @@ # # This file is part of VIPS/NaerstadModel # -# VIPSWeb is free software: you can redistribute it and/or modify +# VIPS/NaerstadModel 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, +# VIPS/NaerstadModel 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/>. +# along with VIPS/NaerstadModel. If not, see <http://www.gnu.org/licenses/>. name=Naerstad Model 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 70675ba..6540ded 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 @@ -2,18 +2,18 @@ # # This file is part of VIPS/NaerstadModel # -# VIPSWeb is free software: you can redistribute it and/or modify +# VIPS/NaerstadModel 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, +# VIPS/NaerstadModel 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/>. +# along with VIPS/NaerstadModel. 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 ed8fd92..9911ce8 100644 --- a/src/test/java/no/bioforsk/vips/model/naerstadmodel/NaerstadModelTest.java +++ b/src/test/java/no/bioforsk/vips/model/naerstadmodel/NaerstadModelTest.java @@ -1,19 +1,19 @@ /* * 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 + * This file is part of VIPS/NaerstadModel. + * VIPS/NaerstadModel 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, + * VIPS/NaerstadModel 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/>. + * along with VIPS/NaerstadModel. If not, see <http://www.gnu.org/licenses/>. * */ -- GitLab