Commit 82c65aae authored by Uwe Peuker's avatar Uwe Peuker

Update auf DuA 2.0 (noch nicht komplett!!!)

git-svn-id: svn://ntoserver/Datenverteiler/VRZ3/trunk/de.bsvrz.dua.progglaette@62685 40c0be50-5d29-0410-901d-fb59edb5cafc
parent 5611ea09
<?xml version="1.0" encoding="UTF-8"?>
<package name="de.bsvrz.dua.progglaette">
<license name="GPL" />
<release name="DuA Version 2.0.0" />
<version number="2.0.0-201605311503" />
<revision number="861d8fc820b8df226e60bf608bf03b1f31ce60db" />
<compile time="31.05.2016 15:13:43" />
<depends-on-compiled packages="de.bsvrz.dav.daf, de.bsvrz.dav.dav, de.bsvrz.sys.funclib.commandLineArgs, de.bsvrz.sys.funclib.debug, de.bsvrz.sys.funclib.application, de.bsvrz.sys.funclib.operatingMessage, de.bsvrz.sys.funclib.bitctrl.dua, de.bsvrz.sys.funclib.bitctrl" />
<depends-on-source packages="" />
<depends-on-lib jars="" />
<jvm version="1.8" />
</package>
This diff is collapsed.
......@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>de.bsvrz.dua</groupId>
<artifactId>de.bsvrz.dua.progglaette</artifactId>
<version>1.4.0-SNAPSHOT</version>
<version>2.0.0</version>
<name>Glaettewarnung und -prognose</name>
......@@ -16,7 +16,7 @@
<licenses>
<license>
<name>GNU General Public License, Version 2</name>
<name>GNU General Public License, Version 3</name>
<url>LICENSE.txt</url>
</license>
</licenses>
......@@ -46,7 +46,7 @@
<dependency>
<groupId>de.bsvrz.dav</groupId>
<artifactId>de.bsvrz.dav.daf</artifactId>
<version>3.6.2</version>
<version>3.8.0</version>
</dependency>
<dependency>
<groupId>de.bsvrz.sys</groupId>
......@@ -56,12 +56,12 @@
<dependency>
<groupId>de.bsvrz.dua</groupId>
<artifactId>de.bsvrz.dua.guete</artifactId>
<version>1.2.0</version>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>de.bsvrz.dua</groupId>
<artifactId>de.bsvrz.dua.plloglve</artifactId>
<version>[1.2.1,2.0.0)</version>
<version>2.0.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
......
package de.bsvrz.dua.progglaette;
public class PackageRuntimeInfo {
public static String getLicence() { return "GPL";}
public static String getRelease() { return "DuA Version 2.0.0";}
public static String getVersion() { return "2.0.0";}
public static String getRevision() { return "861d8fc820b8df226e60bf608bf03b1f31ce60db";}
public static String getCompileTime() { return "31.05.2016 15:13:43";}
public static String getDependsOnCompiled() { return "de.bsvrz.dav.daf, de.bsvrz.dav.dav, de.bsvrz.sys.funclib.commandLineArgs, de.bsvrz.sys.funclib.debug, de.bsvrz.sys.funclib.application, de.bsvrz.sys.funclib.operatingMessage, de.bsvrz.sys.funclib.bitctrl.dua, de.bsvrz.sys.funclib.bitctrl";}
public static String getDependsOnSource() { return "";}
public static String getDependsOnLib() { return "";}
public static String getJvmVersion() { return "1.8";}
}
\ No newline at end of file
/*
* Segment Datenübernahme und Aufbereitung (DUA), SWE Glättewarnung und -prognose
* Copyright 2016 by Kappich Systemberatung Aachen
*
* This file is part of de.bsvrz.dua.progglaette.
*
* de.bsvrz.dua.progglaette is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* de.bsvrz.dua.progglaette 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 General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with de.bsvrz.dua.progglaette. If not, see <http://www.gnu.org/licenses/>.
* Contact Information:
* Kappich Systemberatung
* Martin-Luther-Straße 14
* 52062 Aachen, Germany
* phone: +49 241 4090 436
* mail: <info@kappich.de>
*/
/**
* Segment Datenübernahme und Aufbereitung (DUA), SWE Glättewarnung und -prognose
*
* @author Kappich Systemberatung
*/
package de.bsvrz.dua.progglaette;
/*
* Segment 4 Datenübernahme und Aufbereitung (DUA), SWE 4.14 Glättewarnung und -prognose
*
* Copyright (C) 2007-2015 BitCtrl Systems GmbH
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
* Foundation; either version 2 of the License, or (at your option) any later
* version.
*
* This program 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 General Public License for more
* details.
*
* You should have received a copy of the GNU General Public License along with
* this program; if not, write to the Free Software Foundation, Inc., 51
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* Contact Information:<br>
* BitCtrl Systems GmbH<br>
* Weißenfelser Straße 67<br>
* 04229 Leipzig<br>
* Phone: +49 341-490670<br>
* mailto: info@bitctrl.de
* Copyright 2016 by Kappich Systemberatung Aachen
*
* This file is part of de.bsvrz.dua.progglaette.
*
* de.bsvrz.dua.progglaette is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* de.bsvrz.dua.progglaette 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 General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with de.bsvrz.dua.progglaette. If not, see <http://www.gnu.org/licenses/>.
* Contact Information:
* Kappich Systemberatung
* Martin-Luther-Straße 14
* 52062 Aachen, Germany
* phone: +49 241 4090 436
* mail: <info@kappich.de>
*/
package de.bsvrz.dua.progglaette.progglaette;
......@@ -30,14 +31,14 @@ package de.bsvrz.dua.progglaette.progglaette;
import java.util.SortedSet;
import java.util.TreeSet;
import com.bitctrl.Constants;
/**
* Berechnet eine Prognose von Messwerten mit der Methode der Linearen
* Trendextrapolation ( Least Square Method ) Die Prognose ist nach AFo im
* Horizont 5, 15, 30, 60, 90 Minuten.
*
* @author BitCtrl Systems GmbH, Bachraty
*
* @version $Id$
*/
public class PrognoseZustand {
......@@ -81,7 +82,7 @@ public class PrognoseZustand {
final long[] zeitArray = new long[zeitArrayOriginal.length];
for (int i = 0; i < zeitArrayOriginal.length; i++) {
if (zeitArrayOriginal[i] > 0) {
zeitArray[i] = ((zeitArrayOriginal[i] - kleinsterZeitStempel) / Constants.MILLIS_PER_MINUTE) + 1;
zeitArray[i] = ((zeitArrayOriginal[i] - kleinsterZeitStempel) / ((long) (60 * 1000))) + 1;
if (zeitArray[i] > t0) {
t0 = zeitArray[i];
}
......@@ -103,7 +104,7 @@ public class PrognoseZustand {
int m = n;
for (int i = 0; i < n; i++) {
// Zeitstemepel ist 0, wenn ein Datum faehlt
// Zeitstempel ist 0, wenn ein Datum fehlt
if (zeitArray[i] != 0) {
sumT += zeitArray[i];
sumW += werteArray[i];
......
/*
* Segment 4 Datenübernahme und Aufbereitung (DUA), SWE 4.14 Glättewarnung und -prognose
*
* Copyright (C) 2007-2015 BitCtrl Systems GmbH
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
* Foundation; either version 2 of the License, or (at your option) any later
* version.
*
* This program 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 General Public License for more
* details.
*
* You should have received a copy of the GNU General Public License along with
* this program; if not, write to the Free Software Foundation, Inc., 51
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* Contact Information:<br>
* BitCtrl Systems GmbH<br>
* Weißenfelser Straße 67<br>
* 04229 Leipzig<br>
* Phone: +49 341-490670<br>
* mailto: info@bitctrl.de
* Copyright 2016 by Kappich Systemberatung Aachen
*
* This file is part of de.bsvrz.dua.progglaette.
*
* de.bsvrz.dua.progglaette is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* de.bsvrz.dua.progglaette 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 General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with de.bsvrz.dua.progglaette. If not, see <http://www.gnu.org/licenses/>.
* Contact Information:
* Kappich Systemberatung
* Martin-Luther-Straße 14
* 52062 Aachen, Germany
* phone: +49 241 4090 436
* mail: <info@kappich.de>
*/
/**
......
/*
* Segment 4 Datenübernahme und Aufbereitung (DUA), SWE 4.14 Glättewarnung und -prognose
*
* Copyright (C) 2007-2015 BitCtrl Systems GmbH
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
* Foundation; either version 2 of the License, or (at your option) any later
* version.
*
* This program 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 General Public License for more
* details.
*
* You should have received a copy of the GNU General Public License along with
* this program; if not, write to the Free Software Foundation, Inc., 51
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* Contact Information:<br>
* BitCtrl Systems GmbH<br>
* Weißenfelser Straße 67<br>
* 04229 Leipzig<br>
* Phone: +49 341-490670<br>
* mailto: info@bitctrl.de
*/
package de.bsvrz.dua.progglaette.progglaette;
/**
* Speichert die Verbindungsdaten.
*
* @author BitCtrl Systems GmbH, Thierfelder
*/
public final class Verbindung {
/**
* Standardkonstruktor.
*/
private Verbindung() {
//
}
/**
* Verbindungsdaten.
*/
public static final String[] CON_DATA = new String[] {
"-datenverteiler=localhost:8083", "-benutzer=Tester",
"-authentifizierung=passwd", "-debugLevelStdErrText=OFF",
"-debugLevelFileText=OFF",
"-KonfigurationsBereichsPid=kb.glaetteProgTest" };
// /**
// * Verbindungsdaten.
// */
// public static final String[] CON_DATA = new String[] {
// "-datenverteiler=localhost:8083", "-benutzer=Tester",
// "-authentifizierung=c:\\passwd",
// "-debugLevelStdErrText=WARNING", "-debugLevelFileText=OFF",
// "-KonfigurationsBereichsPid=kb.glaetteProgTest" };
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment