Commit cd069d45 authored by Uwe Peuker's avatar Uwe Peuker
Browse files

Merge branch 'feature/dua_bereinigung' into develop

parents 6789033a 377d705b

.project

+12 −0
Original line number Diff line number Diff line
@@ -15,9 +15,21 @@ 
			<arguments>

			</arguments>

		</buildCommand>

		<buildCommand>

			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>

			<arguments>

			</arguments>

		</buildCommand>

		<buildCommand>

			<name>edu.umd.cs.findbugs.plugin.eclipse.findbugsBuilder</name>

			<arguments>

			</arguments>

		</buildCommand>

	</buildSpec>

	<natures>

		<nature>org.eclipse.jdt.core.javanature</nature>

		<nature>org.eclipse.m2e.core.maven2Nature</nature>

		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>

		<nature>edu.umd.cs.findbugs.plugin.eclipse.findbugsNature</nature>

	</natures>

</projectDescription>

README.md

+11 −0
Original line number Diff line number Diff line
@@ -16,6 +16,17 @@ mögliche Glätte. Des Weiteren wird für die Prognosehorizonte 5-, 15-, 30-, 60 


## Versionsgeschichte



### 2.0.2



Release-Datum: 28.07.2016



de.bsvrz.dua.progglaette.tests.DuAProgGlaetteTestBase

- der Member "_glaetteWarnungUndPrognose" sollte nicht statisch sein, der er bei jedem Test neu initialisiert wird



- Javadoc für Java8-Kompatibilität korrigiert

- Obsolete SVN-Tags aus Kommentaren entfernt

- Obsolete inheritDoc-Kommentare entfernt



### 2.0.1



Release-Datum: 22.07.2016

pom.xml

+3 −5
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 


	<groupId>de.bsvrz.dua</groupId>

	<artifactId>de.bsvrz.dua.progglaette</artifactId>

	<version>2.0.1</version>

	<version>2.0.2</version>





	<name>Glaettewarnung und -prognose</name>
@@ -25,9 +25,8 @@ 
		<maven.build.timestamp.format>yyyy-MM-dd</maven.build.timestamp.format>

		<kernsoftware.version>3.8.0</kernsoftware.version>

		<distributionspaket.status>FREI</distributionspaket.status>

		<distributionspaket.standDatum>2016-07-22</distributionspaket.standDatum>

		<distributionspaket.standDatum>${maven.build.timestamp}</distributionspaket.standDatum>

		<distributionspaket.lizenz>GPLv3.0</distributionspaket.lizenz>

		<additionalparam>-Xdoclint:none</additionalparam>

	</properties>



	<licenses>
@@ -175,7 +174,7 @@ 
		<dependency>

			<groupId>de.bsvrz.sys</groupId>

			<artifactId>de.bsvrz.sys.funclib.bitctrl.dua</artifactId>

			<version>1.6.0</version>

			<version>1.6.1</version>

		</dependency>

		<dependency>

			<groupId>de.bsvrz.dua</groupId>
@@ -407,7 +406,6 @@ 
				<artifactId>findbugs-maven-plugin</artifactId>

				<version>3.0.3</version>

				<configuration>

					<excludeFilterFile>src/main/config/findbugs-exclude.xml</excludeFilterFile>

					<threshold>High</threshold>

					<includeTests>true</includeTests>

				</configuration>

src/main/config/findbugs-exclude.xml

deleted100644 → 0
+0 −9
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<FindBugsFilter>

	<Match>

        <Bug pattern="ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD"/>

    </Match>

</FindBugsFilter>

src/main/java/de/bsvrz/dua/progglaette/progglaette/EntscheidungsBaum.java

+390 −404
Original line number Diff line number Diff line
@@ -35,8 +35,6 @@ import de.bsvrz.sys.funclib.debug.Debug; 
 * Eigenschaften der Fahrbahn und Luft und seinen Prognosewerten.

 *

 * @author BitCtrl Systems GmbH, Bachraty..

 *

 * @version $Id: EntscheidungsBaum.java 53837 2015-03-18 11:45:45Z peuker $

 */

public class EntscheidungsBaum {
@@ -227,12 +225,9 @@ public class EntscheidungsBaum { 
	}



/**

	 * Operator "<".

	 * Operator "&lt;".

	 */

	public static class OperatorKleiner implements Operator {

		/**

		 * {@inheritDoc}

		 */

		@Override

		public boolean anwende(final double x, final double y) {

			return (x < y);
@@ -240,12 +235,9 @@ public class EntscheidungsBaum { 
	}



	/**

	 * Operator "<=".

	 * Operator "&lt;=".

	 */

	public static class OperatorKleinerGleich implements Operator {

		/**

		 * {@inheritDoc}

		 */

		@Override

		public boolean anwende(final double x, final double y) {

			return (x <= y);
@@ -253,12 +245,9 @@ public class EntscheidungsBaum { 
	}



	/**

	 * Operator ">".

	 * Operator "&gt;".

	 */

	public static class OperatorGroesser implements Operator {

		/**

		 * {@inheritDoc}

		 */

		@Override

		public boolean anwende(final double x, final double y) {

			return (x > y);
@@ -266,12 +255,9 @@ public class EntscheidungsBaum { 
	}



	/**

	 * Operator ">=".

	 * Operator "&gt;=".

	 */

	public static class OperatorGroesserGleich implements Operator {

		/**

		 * {@inheritDoc}

		 */

		@Override

		public boolean anwende(final double x, final double y) {

			return (x >= y);