Merge branch 'master' into tm/smarter

.gitlab-ci.yml

 variables:
   # This will supress any download for dependencies and plugins or upload messages which would clutter the console log.
   # `showDateTime` will show the passed time in milliseconds. You need to specify `--batch-mode` to make this work.
-  MAVEN_OPTS: "-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true"
+  MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true"
   # As of Maven 3.3.0 instead of this you may define these options in `.mvn/maven.config` so the same config is used
   # when running from the command line.
   # `installAtEnd` and `deployAtEnd`are only effective with recent version of the corresponding plugins.
@@ -9,30 +9,23 @@ variables:
 # Cache downloaded dependencies and plugins between builds.
 cache:
   paths:
-    - /root/.m2/repository/
+    - .m2/repository/
 # This will only validate and compile stuff and run e.g. maven-enforcer-plugin. 
 # Because some enforcer rules might check dependency convergence and class duplications
 # we use `test-compile` here instead of `validate`, so the correct classpath is picked up.
-validate:
+validate: &validate
   stage: build
   script:
     - 'mvn $MAVEN_CLI_OPTS test-compile'
+  only:
+    - master
   image: maven:3.3.9-jdk-8
 # For merge requests do not `deploy` but only run `verify`.
 # See https://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html
-verify:
+verify: &verify
   stage: test
   script:
     - 'mvn $MAVEN_CLI_OPTS verify'
-  except:
-    - master
-  image: maven:3.3.9-jdk-8
-# For `master` branch run `mvn deploy` automatically.
-# Here you need to decide whether you want to use JDK7 or 8.
-deploy:
-  stage: deploy
-  script:
-    - 'mvn $MAVEN_CLI_OPTS deploy'
   only:
     - master
-  image: maven:3.3.9-jdk-8
+  image: maven:3.3.9-jdk-8
\ No newline at end of file

.settings/org.eclipse.core.resources.prefs

+eclipse.preferences.version=1
+encoding/<project>=UTF-8
+encoding/src=UTF-8

pom.xml

@@ -29,7 +29,7 @@
 		<plugins>
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.3.2</version>
+				<version>3.7.0</version>
 				<configuration>
 					<source>1.8</source>
 					<target>1.8</target>
@@ -39,7 +39,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
-				<version>2.0.4</version>
+				<version>3.0.1</version>
 				<executions>
 					<execution>
 						<id>attach-sources</id>
@@ -52,7 +52,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.10.3</version>
+				<version>2.10.4</version>
 				<executions>
 					<execution>
 						<id>attach-javadocs</id>
@@ -71,7 +71,7 @@
 			<extension>
 				<groupId>org.apache.maven.wagon</groupId>
 				<artifactId>wagon-ssh</artifactId>
-				<version>2.10</version>
+				<version>3.0.0</version>
 			</extension>
 		</extensions>
 	</build>
@@ -82,14 +82,19 @@
 		<repository>
 			<id>simonstrator</id>
 			<url>https://dev.kom.e-technik.tu-darmstadt.de/mvn/</url>
+			<snapshots>
+	            <updatePolicy>always</updatePolicy>
+	        </snapshots>
+	        <releases>
+	            <updatePolicy>always</updatePolicy>
+	        </releases>
 		</repository>
 
 		<!-- local kom repository -->
-		<repository>
+		<!-- <repository>
 			<id>maven.kom</id>
-			<!-- <url>file://D:/simcfgm2</url> -->
 			<url>http://www.kom.tu-darmstadt.de/~stingl/PeerfactSim.KOM-Libraries/maven2/</url>
-		</repository>
+		</repository> -->
 
 		<!-- jgrapht can be found there -->
 		<repository>
@@ -109,14 +114,6 @@
 
 	<dependencies>
 
-		<!-- Meta: to remove unused dependencies :) -->
-		<dependency>
-			<groupId>org.apache.maven.plugins</groupId>
-			<artifactId>maven-dependency-plugin</artifactId>
-			<version>2.9</version>
-		</dependency>
-
-
 		<!-- XML -->
 		<dependency>
 			<groupId>dom4j</groupId>
@@ -165,6 +162,13 @@
 			<artifactId>log4j</artifactId>
 			<version>1.2.16</version>
 		</dependency>
+		<!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-api -->
+		<dependency>
+		    <groupId>org.slf4j</groupId>
+		    <artifactId>slf4j-api</artifactId>
+		    <version>1.7.25</version>
+		</dependency>
+		
 
 		<!-- Parsing, Bytecode, ... -->
 		<!-- Unused <dependency> <groupId>antlr</groupId> <artifactId>antlr</artifactId> 
@@ -223,7 +227,7 @@
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
-			<version>10.0.1</version>
+			<version>18.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.inject</groupId>
@@ -231,10 +235,18 @@
 			<version>3.0</version>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-math</artifactId>
-			<version>2.2</version>
+		    <groupId>org.apache.commons</groupId>
+		    <artifactId>commons-math3</artifactId>
+		    <version>3.6.1</version>
 		</dependency>
+		<!-- OLD Math for some outdated classes -->
+		<!-- <dependency>
+		    <groupId>org.apache.commons</groupId>
+		    <artifactId>commons-math</artifactId>
+		    <version>2.2</version>
+		</dependency>-->
+		
+		
 		<dependency>
 			<groupId>commons-net</groupId>
 			<artifactId>commons-net</artifactId>
@@ -363,6 +375,13 @@
 			<artifactId>simonstrator-api</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+		
+		<!-- Traci as a Service -->
+		<dependency>
+			<groupId>maki</groupId>
+			<artifactId>simonstrator-traci</artifactId>
+			<version>0.1-SNAPSHOT</version>
+		</dependency>
 
 	</dependencies>
 </project>

src/de/tud/kom/p2psim/impl/analyzer/metric/filter/StatisticsFilter.java

@@ -24,7 +24,7 @@ import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 
-import org.apache.commons.math.stat.StatUtils;
+import org.apache.commons.math3.stat.StatUtils;
 
 import de.tudarmstadt.maki.simonstrator.api.Host;
 import de.tudarmstadt.maki.simonstrator.api.common.metric.Metric;

src/de/tud/kom/p2psim/impl/analyzer/metric/output/MetricOutputDAO.java

@@ -28,7 +28,7 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
-import org.apache.commons.math.stat.descriptive.DescriptiveStatistics;
+import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
 
 import de.tud.kom.p2psim.api.common.SimHost;
 import de.tud.kom.p2psim.impl.util.db.dao.DAO;

src/de/tud/kom/p2psim/impl/churn/ExponentialChurnModel.java

@@ -26,8 +26,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.math.MathException;
-import org.apache.commons.math.distribution.ExponentialDistributionImpl;
+import org.apache.commons.math3.distribution.ExponentialDistribution;
+import org.apache.commons.math3.exception.OutOfRangeException;
 
 import de.tud.kom.p2psim.api.churn.ChurnModel;
 import de.tud.kom.p2psim.api.common.SimHost;
@@ -42,11 +42,11 @@ public class ExponentialChurnModel implements ChurnModel {
 		TRANSIENT(MEAN_SESSION_LENGTH), NORMAL(10 * MEAN_SESSION_LENGTH), LONG_LASTING(
 				100 * MEAN_SESSION_LENGTH);
 
-		public final ExponentialDistributionImpl expDist;
+		public final ExponentialDistribution expDist;
 
 		private UserType(long length) {
 			double meanLength = Double.parseDouble(Long.toString(length));
-			expDist = new ExponentialDistributionImpl(meanLength);
+			expDist = new ExponentialDistribution(meanLength);
 			Long.toString(length);
 		}
 
@@ -113,7 +113,7 @@ public class ExponentialChurnModel implements ChurnModel {
 			 * .inverseCumulativeProbability(Simulator.getRandom()
 			 * .nextDouble()); data.setOnlineTime((long) value);
 			 */
-		} catch (MathException e) {
+		} catch (OutOfRangeException e) {
 			e.printStackTrace();
 		}
 		return data.onlineTime;

src/de/tud/kom/p2psim/impl/churn/HerreraChurnModel.java

@@ -24,8 +24,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.math.MathException;
-import org.apache.commons.math.distribution.ExponentialDistributionImpl;
+import org.apache.commons.math3.distribution.ExponentialDistribution;
+import org.apache.commons.math3.exception.OutOfRangeException;
 
 import de.tud.kom.p2psim.api.churn.ChurnModel;
 import de.tud.kom.p2psim.api.common.SimHost;
@@ -39,11 +39,11 @@ public class HerreraChurnModel implements ChurnModel {
 		TRANSIENT(MEAN_SESSION_LENGTH), NORMAL(10 * MEAN_SESSION_LENGTH), LONG_LASTING(
 				100 * MEAN_SESSION_LENGTH);
 
-		public final ExponentialDistributionImpl expDist;
+		public final ExponentialDistribution expDist;
 
 		private UserType(long length) {
 			double meanLength = Double.parseDouble(Long.toString(length));
-			expDist = new ExponentialDistributionImpl(meanLength);
+			expDist = new ExponentialDistribution(meanLength);
 			Long.toString(length);
 		}
 
@@ -81,7 +81,7 @@ public class HerreraChurnModel implements ChurnModel {
 			data.setOnlineTime(Math.round(data.type.expDist
 					.inverseCumulativeProbability(Randoms.getRandom(
 							HerreraChurnModel.class).nextDouble())));
-		} catch (MathException e) {
+		} catch (OutOfRangeException e) {
 			e.printStackTrace();
 		}
 		// Simulator.getMonitor().nextSessionTime(data.onlineTime);

src/de/tud/kom/p2psim/impl/churn/KadChurnModel.java

@@ -22,7 +22,7 @@ package de.tud.kom.p2psim.impl.churn;
 
 import java.util.List;
 
-import org.apache.commons.math.distribution.WeibullDistributionImpl;
+import org.apache.commons.math3.distribution.WeibullDistribution;
 
 import de.tud.kom.p2psim.api.churn.ChurnModel;
 import de.tud.kom.p2psim.api.common.SimHost;
@@ -53,11 +53,11 @@ import de.tudarmstadt.maki.simonstrator.api.Time;
  */
 public class KadChurnModel implements ChurnModel {
 
-	public WeibullDistributionImpl sessionTime, interSessionTime;
+	public WeibullDistribution sessionTime, interSessionTime;
 
 	public KadChurnModel() {
-		sessionTime = new WeibullDistributionImpl(0.61511, 169.5385);
-		interSessionTime = new WeibullDistributionImpl(0.47648, 413.6765);
+		sessionTime = new WeibullDistribution(0.61511, 169.5385);
+		interSessionTime = new WeibullDistribution(0.47648, 413.6765);
 	}
 
 	/**
@@ -67,8 +67,8 @@ public class KadChurnModel implements ChurnModel {
 	 * @param lambda
 	 */
 	public void setLambdaFactor(double lambda) {
-		sessionTime = new WeibullDistributionImpl(0.61511, 169.5385 * lambda);
-		interSessionTime = new WeibullDistributionImpl(0.47648,
+		sessionTime = new WeibullDistribution(0.61511, 169.5385 * lambda);
+		interSessionTime = new WeibullDistribution(0.47648,
 				413.6765 * lambda);
 	}
 

src/de/tud/kom/p2psim/impl/network/gnp/topology/GnpSpace.java

@@ -27,7 +27,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedList;
 
-import org.apache.commons.math.stat.StatUtils;
+import org.apache.commons.math3.stat.StatUtils;
 
 /**
  * Implements the downhill simplx algorithm for positioning host in an

src/de/tud/kom/p2psim/impl/network/modular/st/latency/NormalDistributionLatency.java

@@ -25,8 +25,8 @@ import java.util.List;
 import java.util.Random;
 import java.util.Vector;
 
-import org.apache.commons.math.MathException;
-import org.apache.commons.math.distribution.NormalDistributionImpl;
+import org.apache.commons.math3.distribution.NormalDistribution;
+import org.apache.commons.math3.exception.OutOfRangeException;
 
 import de.tud.kom.p2psim.api.network.NetMessage;
 import de.tud.kom.p2psim.impl.network.AbstractNetLayer;
@@ -68,7 +68,7 @@ public class NormalDistributionLatency implements LatencyStrategy {
 	 */
 	private long standardDeviation = 2 * Time.MICROSECOND; // 2ms
 
-	private NormalDistributionImpl normalDistribution = new NormalDistributionImpl(
+	private NormalDistribution normalDistribution = new NormalDistribution(
 			propagationMeanDelay, standardDeviation);
 
 	/**
@@ -109,7 +109,7 @@ public class NormalDistributionLatency implements LatencyStrategy {
 			try {
 				delay = (long) normalDistribution
 						.inverseCumulativeProbability(rnd.nextDouble());
-			} catch (MathException e) {
+			} catch (OutOfRangeException e) {
 				throw new RuntimeException(e);
 			}
 			if (delay <= 0) {
@@ -125,13 +125,13 @@ public class NormalDistributionLatency implements LatencyStrategy {
 					"Bad PropagationMeanDelay. It should be positiv!");
 		}
 		this.propagationMeanDelay = delay;
-		this.normalDistribution = new NormalDistributionImpl(
+		this.normalDistribution = new NormalDistribution(
 				this.propagationMeanDelay, this.standardDeviation);
 	}
 
 	public void setStandardDeviation(long standardDeviation) {
 		this.standardDeviation = standardDeviation;
-		this.normalDistribution = new NormalDistributionImpl(
+		this.normalDistribution = new NormalDistribution(
 				this.propagationMeanDelay, this.standardDeviation);
 	}
 

src/de/tud/kom/p2psim/impl/simengine/Scheduler.java

@@ -2,17 +2,17 @@
  * Copyright (c) 2005-2011 KOM - Multimedia Communications Lab
  *
  * This file is part of PeerfactSim.KOM.
- * 
+ *
  * PeerfactSim.KOM 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
  * any later version.
- * 
+ *
  * PeerfactSim.KOM 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 PeerfactSim.KOM.  If not, see <http://www.gnu.org/licenses/>.
  *
@@ -40,11 +40,11 @@ import de.tudarmstadt.maki.simonstrator.api.component.core.TimeComponent;
  * generated events in order to provide valid experiments. The duration of each
  * experiment is controlled by the scheduler and the parameters defined by the
  * Application.
- * 
+ *
  * @author Sebastian Kaune
  */
 public class Scheduler implements EventHandler,
-		SchedulerComponent, TimeComponent {
+SchedulerComponent, TimeComponent {
 
 	// Flag to allow the compiler to remove the unneeded debug code
 	private static final boolean DEBUG_CODE = false;
@@ -96,7 +96,7 @@ public class Scheduler implements EventHandler,
 	/**
 	 * Constructs a new scheduler instance using a calendar queue. If desired,
 	 * status events about the progress of the simulation will be plotted.
-	 * 
+	 *
 	 * @param statusEvent
 	 *            the flag which speficies if status events will be plotted
 	 */
@@ -158,7 +158,7 @@ public class Scheduler implements EventHandler,
 
 	/**
 	 * Wake up thread safe and insert event immediately.
-	 * 
+	 *
 	 * @param content
 	 *            the content
 	 * @param handler
@@ -198,17 +198,17 @@ public class Scheduler implements EventHandler,
 		}
 		Monitor.log(Scheduler.class, Level.INFO,
 				"Simulated realtime: " + Time.getFormattedTime()
-						+ " - End of simulation.\n Scheduler processed in total "
-						+ this.processedEventCounter + " events with "
-						+ this.eventQueue.size()
-						+ " unprocessed events still in queue");
+				+ " - End of simulation.\n Scheduler processed in total "
+				+ this.processedEventCounter + " events with "
+				+ this.eventQueue.size()
+				+ " unprocessed events still in queue");
 	}
 
 	/**
 	 * Sets the end time at which the simulation framework will finish at the
 	 * latest the simulation , irrespective if there are still unprocessed
 	 * events in the event queue.
-	 * 
+	 *
 	 * @param endTime
 	 *            point in time at which the simulator will finish at the latest
 	 */
@@ -223,7 +223,7 @@ public class Scheduler implements EventHandler,
 
 	/**
 	 * Process the next event from the event queue.
-	 * 
+	 *
 	 * @return whether an event was processed
 	 */
 	synchronized private boolean processNextEvent() {
@@ -252,9 +252,9 @@ public class Scheduler implements EventHandler,
 				}
 
 				assert (nextEvent.getSimulationTime() >= currentTime) : "Next event: "
-						+ nextEvent.getSimulationTime()
-						+ ", but current "
-						+ currentTime + ".";
+				+ nextEvent.getSimulationTime()
+				+ ", but current "
+				+ currentTime + ".";
 
 				if (nextEvent.getSimulationTime() <= newRoundsCurrentTime) {
 
@@ -273,7 +273,7 @@ public class Scheduler implements EventHandler,
 
 					if (realEvent.schedulerType == TYPE_END)
 						return false;
-					
+
 					synchronized (this.eventQueue) {
 						if (this.eventQueue.peek().getSimulationTime() < newRoundsCurrentTime) {
 							unhandledRegularEventsInPast = true;
@@ -310,9 +310,9 @@ public class Scheduler implements EventHandler,
 			}
 
 			assert (peekedEvent.getSimulationTime() >= currentTime) : "Next event: "
-					+ peekedEvent.getSimulationTime()
-					+ ", but current "
-					+ currentTime + ".";
+			+ peekedEvent.getSimulationTime()
+			+ ", but current "
+			+ currentTime + ".";
 
 			if (peekedEvent.getSimulationTime() > currentTime) {
 
@@ -326,12 +326,12 @@ public class Scheduler implements EventHandler,
 
 				/*
 				 * ATTENTION: Magic happening here!
-				 * 
+				 *
 				 * Correct for uncertainties of going to real sleep.
 				 */
 				final long SLEEP_CORRECTION_FACTOR = 400;
 				final long realTime_errorMs = System.currentTimeMillis()
- - 0 /* Starttime */
+						- 0 /* Starttime */
 						- (currentTime / Time.MILLISECOND);
 				final long realTime_correctedTimeToWaitMs = realTime_timeToWaitMs
 						- (realTime_errorMs / SLEEP_CORRECTION_FACTOR);
@@ -379,8 +379,8 @@ public class Scheduler implements EventHandler,
 		final SchedulerEvent realEvent = this.eventQueue.remove();
 
 		assert (realEvent.getSimulationTime() >= currentTime) : "Next event: "
-				+ realEvent.getSimulationTime() + ", but current "
-				+ currentTime + ".";
+		+ realEvent.getSimulationTime() + ", but current "
+		+ currentTime + ".";
 
 		if (timeSkew > 0) {
 			/*
@@ -392,7 +392,7 @@ public class Scheduler implements EventHandler,
 			if (timeToWait > 0) {
 				Monitor.log(Scheduler.class, Level.DEBUG,
 						"Scheduler sleeping: " + timeToWait / 1000
-								+ " milliseconds");
+						+ " milliseconds");
 				try {
 					Thread.sleep((long) ((timeToWait / 1000) / timeSkew));
 
@@ -437,7 +437,7 @@ public class Scheduler implements EventHandler,
 
 	/**
 	 * Return whether event queue is empty.
-	 * 
+	 *
 	 * @return whether event queue is empty.
 	 */
 	public boolean isEmpty() {
@@ -446,16 +446,17 @@ public class Scheduler implements EventHandler,
 
 	/**
 	 * Returns the current time of the scheduler
-	 * 
+	 *
 	 * @return current scheduler time
 	 */
+	@Override
 	public long getCurrentTime() {
 		return currentTime;
 	}
 
 	/**
 	 * Returns the end time of the scheduler
-	 * 
+	 *
 	 * @return
 	 */
 	public long getEndTime() {
@@ -475,7 +476,7 @@ public class Scheduler implements EventHandler,
 
 	/**
 	 * Method for JUnit tests in order to verify the correctness
-	 * 
+	 *
 	 * @return number of events in event queue.
 	 */
 	public int getEventQueueSize() {
@@ -483,7 +484,7 @@ public class Scheduler implements EventHandler,
 	}
 
 	protected static final class SchedulerEvent implements
-			Comparable<SchedulerEvent> {
+	Comparable<SchedulerEvent> {
 
 		protected final int schedulerType;
 
@@ -494,9 +495,9 @@ public class Scheduler implements EventHandler,
 		protected final Object data;
 
 		protected long simTime;
-		
+
 		protected long globalOrderIdx;
-		
+
 		protected static long globalOrderCounter = 0;
 
 		protected SchedulerEvent(Object data, long simTime,
@@ -518,6 +519,7 @@ public class Scheduler implements EventHandler,
 			return simTime;
 		}
 
+		@Override
 		public int compareTo(SchedulerEvent o) {
 			int comp = Double.compare(this.simTime, o.simTime);
 			return comp == 0 ? Double.compare(this.globalOrderIdx, o.globalOrderIdx) : comp;
@@ -530,7 +532,7 @@ public class Scheduler implements EventHandler,
 
 	/**
 	 * Returns wheather the scheduler is running in realTime mode or not.
-	 * 
+	 *
 	 * @return the real time
 	 */
 	public boolean getRealTime() {
@@ -540,7 +542,7 @@ public class Scheduler implements EventHandler,
 	/**
 	 * a flag for slowing down the simulation down to real time. This flag only
 	 * makes sense for simulations which run faster than real time
-	 * 
+	 *
 	 * @param realTime
 	 *            flag for switching the scheduler to real time mode
 	 */
@@ -556,7 +558,7 @@ public class Scheduler implements EventHandler,
 	/**
 	 * method for setting the time skew. A time skew of 100 means, that the
 	 * simulation runs 100 times faster than real time
-	 * 
+	 *
 	 * @param timeSkew
 	 *            the time skew
 	 */
@@ -567,10 +569,14 @@ public class Scheduler implements EventHandler,
 		}
 	}
 
+	public double getTimeSkew() {
+		return timeSkew;
+	}
+
 	/**
 	 * Sets the simulation speed lock, changes in setRealTime or setTimeSkew
 	 * will not apply while the lock is set.
-	 * 
+	 *
 	 * @param locked
 	 *            the new simulation speed locked
 	 */
@@ -593,7 +599,7 @@ public class Scheduler implements EventHandler,
 
 	/**
 	 * The comparator
-	 * 
+	 *
 	 * @author Bjoern Richerzhagen
 	 * @version 1.0, 05.03.2012
 	 */

src/de/tud/kom/p2psim/impl/simengine/Simulator.java

@@ -2,17 +2,17 @@
  * Copyright (c) 2005-2011 KOM - Multimedia Communications Lab
  *
  * This file is part of PeerfactSim.KOM.
- * 
+ *
  * PeerfactSim.KOM 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
  * any later version.
- * 
+ *
  * PeerfactSim.KOM 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 PeerfactSim.KOM.  If not, see <http://www.gnu.org/licenses/>.
  *
@@ -30,8 +30,8 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Random;
 
-import org.apache.commons.math.random.JDKRandomGenerator;
-import org.apache.commons.math.random.RandomGenerator;
+import org.apache.commons.math3.random.JDKRandomGenerator;
+import org.apache.commons.math3.random.RandomGenerator;
 
 import de.tud.kom.p2psim.api.scenario.ConfigurationException;
 import de.tud.kom.p2psim.api.scenario.Configurator;
@@ -56,11 +56,11 @@ import de.tudarmstadt.maki.simonstrator.api.component.core.RandomGeneratorCompon
 /**
  * Concrete implementation of a simulator which can be used to run a simulation
  * by calling the main method in the SimulatorRunner class.
- * 
+ *
  * @author Sebastian Kaune
  * @author Konstantin Pussep
  * @version 3.0, 11/29/2007
- * 
+ *
  */
 public class Simulator implements RandomGeneratorComponent, GlobalComponent {
 
@@ -68,7 +68,7 @@ public class Simulator implements RandomGeneratorComponent, GlobalComponent {
 	 * These constant should be ALWAYS used for virtual time calculations.
 	 */
 	public final static double NANOSECOND_UNIT = 1E-3d;
-	
+
 	/**
 	 * These constant should be ALWAYS used for virtual time calculations.
 	 */
@@ -130,7 +130,7 @@ public class Simulator implements RandomGeneratorComponent, GlobalComponent {
 	/**
 	 * This class is singleton, so use getInstance() method to obtain a
 	 * reference to it.
-	 * 
+	 *
 	 */
 	private Simulator() {
 		singleton = this;
@@ -145,7 +145,7 @@ public class Simulator implements RandomGeneratorComponent, GlobalComponent {
 
 	/**
 	 * Returns the single instance of the SimulationFramework
-	 * 
+	 *
 	 * @return the SimulationFramework
 	 */
 	public static Simulator getInstance() {
@@ -158,10 +158,10 @@ public class Simulator implements RandomGeneratorComponent, GlobalComponent {
 		scheduler.reset();
 	}
 
-    /**
+	/**
 	 * Set the scenario (protocol stack, network topology etc.) which will be
 	 * used to run the simulation.
-	 * 
+	 *
 	 * @param scenario
 	 *            simulation scenario to be used
 	 */
@@ -172,7 +172,7 @@ public class Simulator implements RandomGeneratorComponent, GlobalComponent {
 
 	/**
 	 * Returns the scenario used to run the simulation.
-	 * 
+	 *
 	 * @return
 	 */
 	public Scenario getScenario() {
@@ -181,7 +181,7 @@ public class Simulator implements RandomGeneratorComponent, GlobalComponent {
 
 	/**
 	 * Only for internal use
-	 * 
+	 *
 	 * @return
 	 */
 	public static Scheduler getScheduler() {
@@ -195,35 +195,35 @@ public class Simulator implements RandomGeneratorComponent, GlobalComponent {
 	/**
 	 * This method will run the simulation using the previously set scenario
 	 * data.
-	 * 
+	 *
 	 */
 	public void start(boolean throwExceptions) {
 		checkRunning();
 		Monitor.log(Simulator.class, Level.INFO, "Prepare Scenario ...");
 		this.scenario.prepare();
-		
+
 		Monitor.log(Simulator.class, Level.INFO, "Prepare Scenario ..."
 				+ getSeed());
-		
+
 		/* Real World Starting Time:
-		 * 		Block till we're allowed to start. 
+		 * 		Block till we're allowed to start.
 		 */
 		if( realWorldStartTime != null ) {
 
 			try {
-				
+
 				//final Date now = new Date();
 				final Date now = NTPClient.getDate();
 				final long waitFor = realWorldStartTime.getTime() - now.getTime();
-				
+
 				Thread.sleep(waitFor);
-				
+
 			} catch (InterruptedException e) {
 				//
 			}
-			
+
 		}
-		
+
 		startTime = System.currentTimeMillis();
 		Monitor.log(Simulator.class, Level.INFO, "Simulation started...");
 		this.running = true;
@@ -282,53 +282,53 @@ public class Simulator implements RandomGeneratorComponent, GlobalComponent {
 
 	/**
 	 * Configure simulation from an XML file.
-	 * 
+	 *
 	 * @param configFile
 	 *            XML file with the configuration data.
 	 * @param variables
 	 *            the variables which are specified in the XML file with the
 	 *            configuarion data.
 	 */
-    public void configure(String configFile, Map<String, String> variables, Map<String, String> modifiedVariables, List<String> variations) {
-        // TODO create a class, that contains general informations of the
-        // simulation, which can be accessed from every component during a
-        // simulation. This can be seen as an alternative to implementing the
-        // Composable interface
-        if (configFile.endsWith(".xml")) {
-            this.defaultConfigurator = new DefaultConfigurator(configFile);
-            defaultConfigurator.setVariables(variables);
-        } else {
-            SimCfgConfigurator simCfgConfigurator = new SimCfgConfigurator(configFile);
-            simCfgConfigurator.applyVariations(variations);
-            simCfgConfigurator.setVariables(modifiedVariables);
+	public void configure(String configFile, Map<String, String> variables, Map<String, String> modifiedVariables, List<String> variations) {
+		// TODO create a class, that contains general informations of the
+		// simulation, which can be accessed from every component during a
+		// simulation. This can be seen as an alternative to implementing the
+		// Composable interface
+		if (configFile.endsWith(".xml")) {
+			this.defaultConfigurator = new DefaultConfigurator(configFile);
+			defaultConfigurator.setVariables(variables);
+		} else {
+			SimCfgConfigurator simCfgConfigurator = new SimCfgConfigurator(configFile);
+			simCfgConfigurator.applyVariations(variations);
+			simCfgConfigurator.setVariables(modifiedVariables);
 
-            this.defaultConfigurator = simCfgConfigurator;
-        }
+			this.defaultConfigurator = simCfgConfigurator;
+		}
 
 
-        this.defaultConfigurator.register(Configurator.CORE, this);
+		this.defaultConfigurator.register(Configurator.CORE, this);
 
 		this.defaultConfigurator.configureAll();
 
-        // The next steps are only required for the xml version.
-        // SimCfg will execute them in the configurator
-        if (configFile.endsWith(".xml")) {
-            ScenarioFactory scenarioBuilder = (ScenarioFactory) this.defaultConfigurator.getConfigurable(Configurator.SCENARIO_TAG);
+		// The next steps are only required for the xml version.
+		// SimCfg will execute them in the configurator
+		if (configFile.endsWith(".xml")) {
+			ScenarioFactory scenarioBuilder = (ScenarioFactory) this.defaultConfigurator.getConfigurable(Configurator.SCENARIO_TAG);
 
-            if (scenarioBuilder == null)
-                throw new ConfigurationException(
-                        "No scenario builder specified in the configuration file. Nothing to do.");
+			if (scenarioBuilder == null)
+				throw new ConfigurationException(
+						"No scenario builder specified in the configuration file. Nothing to do.");
 
-            Scenario scenario = scenarioBuilder.createScenario();
-            setScenario(scenario);
-        }
+			Scenario scenario = scenarioBuilder.createScenario();
+			setScenario(scenario);
+		}
 	}
 
 	/**
 	 * Returns the seed used within a simulation run.
-	 * 
+	 *
 	 * @return the predefined seed
-	 * 
+	 *
 	 */
 	public static long getSeed() {
 		return seed;
@@ -337,7 +337,7 @@ public class Simulator implements RandomGeneratorComponent, GlobalComponent {
 	/**
 	 * This method sets the seed of the global random generator which can be
 	 * obtained using the static getRandom()-method.
-	 * 
+	 *
 	 * @param seed
 	 *            the seed to configure the global random generator
 	 */
@@ -356,53 +356,53 @@ public class Simulator implements RandomGeneratorComponent, GlobalComponent {
 			throw new IllegalStateException("Simulator is already running.");
 	}
 
-    /**
-     * This method provides a newly created random generator, configured
-     * with the specified seed of the simulator. This method should be preferred
-     * over the deprecated @{link getRandom}.
-     *
-     * <b>Notes:</b>
-     * Doing so will prevent components from influencing each other, thus creating
-     * reproducible results while allowing different compositions of components.
-     *
-     * The method allows the use of an object as source. This is to allow the use in
-     * different situations:
-     *  1. Random generators belonging to a single component should pass the class
-     *     object of that component to this method.
-     *  2. Components that are always loaded during a simulation can use the
-     *     Simulator.class object for a system wide random generator like {@link #getRandom()}
-     *     provided.
-     *  3. Utility classes that are loaded by many different components should use
-     *     a reference to themselves to avoid transitive dependencies on the same random
-     *     generator throughout different components.
-
-     * This approach will provide way to to configure different seeds for specific class
-     * objects. This will allow component specific seeds and, e.g., the transfer of movement
-     * behavior from one configured scenario to another.
-     *
-     * @param source The source that requires the random generator (component class object is preferred)
-     * @param salt Added to the default seed, should be bound
-     * @return The random generator for the given source
-     */
+	/**
+	 * This method provides a newly created random generator, configured
+	 * with the specified seed of the simulator. This method should be preferred
+	 * over the deprecated @{link getRandom}.
+	 *
+	 * <b>Notes:</b>
+	 * Doing so will prevent components from influencing each other, thus creating
+	 * reproducible results while allowing different compositions of components.
+	 *
+	 * The method allows the use of an object as source. This is to allow the use in
+	 * different situations:
+	 *  1. Random generators belonging to a single component should pass the class
+	 *     object of that component to this method.
+	 *  2. Components that are always loaded during a simulation can use the
+	 *     Simulator.class object for a system wide random generator like {@link #getRandom()}
+	 *     provided.
+	 *  3. Utility classes that are loaded by many different components should use
+	 *     a reference to themselves to avoid transitive dependencies on the same random
+	 *     generator throughout different components.
+
+	 * This approach will provide way to to configure different seeds for specific class
+	 * objects. This will allow component specific seeds and, e.g., the transfer of movement
+	 * behavior from one configured scenario to another.
+	 *
+	 * @param source The source that requires the random generator (component class object is preferred)
+	 * @param salt Added to the default seed, should be bound
+	 * @return The random generator for the given source
+	 */
 	@Override
 	public Random getRandom(Object source) {
-        if (randomGenerators.containsKey(source)) {
-            return randomGenerators.get(source);
-        } else {
+		if (randomGenerators.containsKey(source)) {
+			return randomGenerators.get(source);
+		} else {
 			long thisSeed = source.toString().hashCode() + 31
 					* seed;
 			Monitor.log(Simulator.class, Level.INFO,
 					"Created a new Random Source for %s with seed %d", source,
 					thisSeed);
 			Random randomGenerator = new Random(thisSeed);
-            randomGenerators.put(source, randomGenerator);
-            return randomGenerator;
-        }
-    }
+			randomGenerators.put(source, randomGenerator);
+			return randomGenerator;
+		}
+	}
 
 	/**
 	 * Returns the current simulation unit value.
-	 * 
+	 *
 	 * @return the current simulation unit value
 	 */
 	public static long getCurrentTime() {
@@ -411,17 +411,17 @@ public class Simulator implements RandomGeneratorComponent, GlobalComponent {
 
 	/**
 	 * Returns the start time of the simulation.
-	 * 
+	 *
 	 * @return
 	 */
 	public static long getStartTime() {
 		return singleton.startTime;
 	}
-	
-	
+
+
 	/**
 	 * Returns the end time of the simulation.
-	 * 
+	 *
 	 * @return
 	 */
 	public static long getEndTime() {
@@ -432,7 +432,7 @@ public class Simulator implements RandomGeneratorComponent, GlobalComponent {
 	 * Sets the end time at which the simulation framework will finish at the
 	 * latest the simulation , irrespective if there are still unprocessed
 	 * events in the event queue.
-	 * 
+	 *
 	 * @param endTime
 	 *            point in time at which the simular will finish at the latest
 	 */
@@ -450,7 +450,7 @@ public class Simulator implements RandomGeneratorComponent, GlobalComponent {
 	 * in turn will save the state in a static variable. Is this flag set
 	 * to true the MeasurementDAO will return from every method before
 	 * doing any work.
-	 * 
+	 *
 	 * @param inactive
 	 */
 	public void setDatabaseInactive(boolean inactive) {
@@ -463,25 +463,25 @@ public class Simulator implements RandomGeneratorComponent, GlobalComponent {
 		}
 	}
 
-    /**
+	/**
 	 * Overrides the database name provided in the persistence.xml.
-	 * 
+	 *
 	 * As the DAO class only provides static methods and is not a singleton it
 	 * cannot be accessed through the config file otherwise.
-	 * 
+	 *
 	 * @param database
 	 * @deprecated use the MetricOutputDAO instead to do all relevant
 	 *             configuration!
 	 */
 	@Deprecated
-    public void setDatabase(String database) {
-        DAO.database = database;
-    }
+	public void setDatabase(String database) {
+		DAO.database = database;
+	}
 
 	/**
 	 * Can be used to format the absolute simulation time (current, past or
 	 * future) into human-readable format: (h:m:s:ms).
-	 * 
+	 *
 	 * @param time
 	 *            - absolute simulation time like the one obtained via
 	 *            getCurrentTime();
@@ -494,7 +494,7 @@ public class Simulator implements RandomGeneratorComponent, GlobalComponent {
 	/**
 	 * Specifies how often the scheduler will printout the current simulation
 	 * time.
-	 * 
+	 *
 	 * @param time
 	 */
 	public void setStatusInterval(long time) {
@@ -512,38 +512,38 @@ public class Simulator implements RandomGeneratorComponent, GlobalComponent {
 	public void setSimulationSpeedLocked(boolean locked) {
 		scheduler.setSimulationSpeedLocked(locked);
 	}
-	
+
 	public static Configurator getConfigurator() {
 		return defaultConfigurator;
 	}
-	
+
 	/**
 	 * Sets the real world start time.
 	 *
 	 * @param realWorldStartTime the new real world start time
 	 */
 	public void setRealWorldStartTime(String realWorldStartTime) {
-		
+
 		final Date now = new Date();
 		SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss z dd.MM.yyyy", Locale.GERMANY);
 
 		try {
-			
+
 			final Date startTime = formatter.parse(realWorldStartTime);
 			if( now.after(startTime) ) {
 				throw new AssertionError(
 						"Simulator was supposed to run in the past. Check config for realWorldStartTime.");
-			} 
-			
+			}
+
 			this.realWorldStartTime = startTime;
-			
+
 		} catch (ParseException e) {
 			Monitor.log(
 					Simulator.class,
 					Level.WARN,
 					"Could not parse realWorldStartTime. Please check configuration file. Starting *NOW*");
 		}
-		
+
 	}
 
 	public void addObserver(SimulatorObserver observer) {

src/de/tud/kom/p2psim/impl/topology/movement/vehicular/sumo/simulation/controller/csv/RoadSideUnitInformationHandler.java

@@ -56,7 +56,7 @@ public class RoadSideUnitInformationHandler {
 			}
 			scanner.close();
 		} catch (FileNotFoundException e) {
-			throw new UnsupportedOperationException("Unable to read file", e);
+			System.err.println("Unable to read file " + e.getMessage());
 		}
 	}
 

src/de/tud/kom/p2psim/impl/topology/movement/vehicular/sumo/simulation/controller/traci/TraciSimulationController.java

@@ -7,6 +7,7 @@ import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
@@ -145,6 +146,11 @@ public class TraciSimulationController implements VehicleController, SimulationS
 		return _positons.get(pVehicleID).getPosition();
 	}
 
+	@Override
+	public double getVehicleHeading(String pVehicleID) {
+		return _positons.get(pVehicleID).getHeading();
+	}
+
 	@Override
 	public Location getVehiclePosition(double pStep, String pVehicleID) {
 		if (pStep == _step) {
@@ -743,6 +749,8 @@ public class TraciSimulationController implements VehicleController, SimulationS
 	public List<Location> getLaneShape(String pLaneID) {
 		List<Location> positions = new ArrayList<>();
 
+		boolean set = true;
+		
 		SumoCommand laneShapeCommand = Lane.getShape(pLaneID);
 		SumoGeometry geometry = (SumoGeometry)requestObject(laneShapeCommand);
 		for (SumoPosition2D location : geometry.coords) {
@@ -751,11 +759,17 @@ public class TraciSimulationController implements VehicleController, SimulationS
 			} else {
 				if (_startX <= location.x && location.x <= _endX && _startY <= location.y && location.y <= _endY) {
 					positions.add(new PositionVector(location.x - _startX, location.y - _startY));
+				} else {
+					set = true;
 				}
 			}
 		}
 
-		return positions;
+		if (set) {
+			return positions;
+		} else {
+			return Collections.emptyList();
+		}
 	}
 
 	@Override
@@ -826,10 +840,8 @@ public class TraciSimulationController implements VehicleController, SimulationS
 			List<RoadNetworkLane> lanes = _roadNetwork.getEdge(pEdgeID).getLanes();
 			if (lanes.size() > 0) {
 				List<Location> laneShape = getLaneShape(lanes.get(0).getLaneID());
-				for (Location location : laneShape) {
-					if (0 <= location.getLongitude() && location.getLongitude() <= _endX - _startX && 0 <= location.getLatitude() && location.getLatitude() <= _endY - _startY) {
-						return true;
-					}
+				if (laneShape.size() > 1) {
+					return true;
 				}
 			}
 			return false;

src/de/tud/kom/p2psim/impl/topology/movement/vehicular/sumo/simulation/controller/xml/XMLSimulationController.java

@@ -28,7 +28,7 @@ public class XMLSimulationController implements VehicleController, SimulationSet
 	private List<String> _vehicles;
 
 	private Map<Double, Map<String, VehicleInformationContainer>> _positonsByTimestamp = new HashMap<>();
-	private int _futureInformation = 10;
+	private int _futureInformation = 0;
 
 	private boolean _initalized = false;
 
@@ -178,7 +178,7 @@ public class XMLSimulationController implements VehicleController, SimulationSet
 
 	@Override
 	public RoadNetwork getRoadNetwork() {
-		throw new UnsupportedOperationException("This method is not supported for " + getClass().getSimpleName());
+		return null;
 	}
 
 	@Override
@@ -207,7 +207,12 @@ public class XMLSimulationController implements VehicleController, SimulationSet
 
 	@Override
 	public double getVehicleSpeed(String pVehicleID) {
-		throw new UnsupportedOperationException("This method is not supported for " + getClass().getSimpleName());
+		return _vehicleDataInformationHandler.getVehiclePositions().get(pVehicleID).getSpeed();
+	}
+
+	@Override
+	public double getVehicleHeading(String pVehicleID) {
+		return _vehicleDataInformationHandler.getVehiclePositions().get(pVehicleID).getHeading();
 	}
 
 }

src/de/tud/kom/p2psim/impl/topology/views/visualization/ui/MetricCDFAdapter.java

@@ -27,7 +27,7 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.TreeMap;
 
-import org.apache.commons.math.stat.Frequency;
+import org.apache.commons.math3.stat.Frequency;
 import org.jfree.data.xy.YIntervalSeries;
 
 import de.tudarmstadt.maki.simonstrator.api.Time;

src/de/tud/kom/p2psim/impl/topology/views/visualization/ui/SimControlPanel.java

@@ -20,6 +20,7 @@
 
 package de.tud.kom.p2psim.impl.topology.views.visualization.ui;
 
+import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -28,12 +29,16 @@ import javax.swing.AbstractAction;
 import javax.swing.Action;
 import javax.swing.Box;
 import javax.swing.BoxLayout;
+import javax.swing.JButton;
 import javax.swing.JCheckBoxMenuItem;
 import javax.swing.JLabel;
 import javax.swing.JMenu;
 import javax.swing.JMenuBar;
+import javax.swing.JPanel;
 import javax.swing.JSlider;
+import javax.swing.JSpinner;
 import javax.swing.JToggleButton;
+import javax.swing.SpinnerNumberModel;
 import javax.swing.SwingConstants;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
@@ -44,6 +49,9 @@ import de.tud.kom.p2psim.impl.topology.views.visualization.ComponentVisManager;
 import de.tud.kom.p2psim.impl.topology.views.visualization.ComponentVisManager.VisInfo;
 import de.tud.kom.p2psim.impl.topology.views.visualization.ComponentVisManager.VisualizationListener;
 import de.tud.kom.p2psim.impl.util.guirunner.Config;
+import de.tudarmstadt.maki.simonstrator.api.Event;
+import de.tudarmstadt.maki.simonstrator.api.EventHandler;
+import de.tudarmstadt.maki.simonstrator.api.Time;
 
 /**
  * Menu-Bar containing means to alter the simulation speed, pause and un-pause
@@ -70,6 +78,8 @@ public class SimControlPanel extends JMenuBar implements ActionListener, ChangeL
 
 	private ComponentVisManager visManager;
 
+	private JPanel runUntil;
+
 	public SimControlPanel(ComponentVisManager visManager) {
 		// super("Control");
 		this.visManager = visManager;
@@ -86,6 +96,8 @@ public class SimControlPanel extends JMenuBar implements ActionListener, ChangeL
 		this.add(getSpeedLabel());
 		this.add(Box.createHorizontalStrut(10));
 		this.add(getPlayPauseButton());
+		this.add(Box.createHorizontalStrut(10));
+		this.add(getRunUntil());
 		this.add(Box.createHorizontalGlue());
 	}
 
@@ -162,6 +174,53 @@ public class SimControlPanel extends JMenuBar implements ActionListener, ChangeL
 		return speedslider;
 	}
 
+	protected JPanel getRunUntil() {
+		if (runUntil == null) {
+			runUntil = new JPanel();
+			runUntil.setBackground(new Color(0, 0, 0, 0));
+			JButton button = new JButton("Run until");
+			runUntil.add(button);
+			JSpinner spinner = new JSpinner(new SpinnerNumberModel(0, 0, Simulator.getEndTime() / Time.MINUTE, 1));
+			runUntil.add(spinner);
+			runUntil.add(new JLabel("min"));
+			button.addActionListener(new ActionListener() {
+
+				@Override
+				public void actionPerformed(ActionEvent pE) {
+					int value = (int)((double) spinner.getValue());
+
+					boolean wasPaused = isSimulatorPaused;
+
+					if (Time.getCurrentTime() < value * Time.MINUTE) {
+						if (wasPaused) {
+							unpauseSimulation();
+						}
+
+						double timeSkew = Simulator.getScheduler().getTimeSkew();
+
+						Simulator.getScheduler().setTimeSkew(0);
+
+						Event.scheduleWithDelay(value * Time.MINUTE - Time.getCurrentTime(), new EventHandler() {
+
+							@Override
+							public void eventOccurred(Object pContent, int pType) {
+								if (Simulator.getScheduler().getTimeSkew() == 0) {
+									Simulator.getScheduler().setTimeSkew(timeSkew);
+
+								}
+								if (wasPaused) {
+									pauseSimulation();
+								}
+							}
+						}, null, 0);
+					}
+				}
+			});
+		}
+
+		return runUntil;
+	}
+
 	protected JLabel getSpeedLabel() {
 		if (speedlabel == null) {
 			speedlabel = new JLabel("max");

src/de/tud/kom/p2psim/impl/topology/views/visualization/world/NodeInfoComponentVis.java

@@ -27,6 +27,7 @@ import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.Point;
 import java.awt.RenderingHints;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedList;
 
@@ -112,7 +113,7 @@ implements VisualizationComponent {
 		g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
 				RenderingHints.VALUE_ANTIALIAS_ON);
 		boolean first = true;
-		for (NodeVis vis : nodes) {
+		for (NodeVis vis : new ArrayList<>(nodes)) {
 			vis.draw(g2);
 			if (first) {
 				first = false;
@@ -238,7 +239,7 @@ implements VisualizationComponent {
 
 			g2.setStroke(new BasicStroke(3));
 			for (int color = 0; color < segments; color++) {
-				if (!activeLayers[color]) {
+				if (activeLayers.length <= color || !activeLayers[color]) {
 					continue;
 				}
 				g2.setColor(Color.DARK_GRAY);

src/de/tud/kom/p2psim/impl/topology/views/wifi/phy/errormodel/NistErrorRateModel.java

@@ -20,8 +20,7 @@
 
 package de.tud.kom.p2psim.impl.topology.views.wifi.phy.errormodel;
 
-import org.apache.commons.math.MathException;
-import org.apache.commons.math.special.Erf;
+import org.apache.commons.math3.special.Erf;
 
 import de.tud.kom.p2psim.api.topology.views.wifi.phy.WifiMode;
 import de.tud.kom.p2psim.impl.util.NotSupportedException;
@@ -130,13 +129,7 @@ public class NistErrorRateModel extends AbstractErrorRateModel {
 	}
 
 	private double getErfc(double z) {
-		try {
-			return Erf.erfc(z);
-		} catch (MathException e) {
-			Monitor.log(NistErrorRateModel.class, Level.ERROR,
-					"Unable to compute the complimentary error function! Returning '0'...");
-		}
-		return 0;
+		return Erf.erfc(z);
 	}
 
 	private double getBpskBer(double snr) {

src/de/tud/kom/p2psim/impl/topology/views/wifi/phy/errormodel/YansErrorRateModel.java

@@ -22,8 +22,7 @@ package de.tud.kom.p2psim.impl.topology.views.wifi.phy.errormodel;
 
 import java.util.HashMap;
 
-import org.apache.commons.math.MathException;
-import org.apache.commons.math.special.Erf;
+import org.apache.commons.math3.special.Erf;
 
 import de.tud.kom.p2psim.api.topology.views.wifi.phy.WifiMode;
 import de.tud.kom.p2psim.impl.util.NotSupportedException;
@@ -200,13 +199,7 @@ public class YansErrorRateModel extends AbstractErrorRateModel {
 	}
 
 	private double getErfc(double z) {
-		try {
-			return Erf.erfc(z);
-		} catch (MathException e) {
-			Monitor.log(YansErrorRateModel.class, Level.ERROR,
-					"Unable to compute the complimentary error function! Returning '0'...");
-		}
-		return 0;
+		return Erf.erfc(z);
 	}
 
 	private double getQamBer(double snr, int m, int signalSpread, int phyRate) {