Final version for Springer book

src/de/tudarmstadt/maki/simonstrator/api/component/pubsub/SubscriptionListener.java → src/de/tudarmstadt/maki/simonstrator/api/component/pubsub/BypassCloudListener.java

 /*
- * Copyright (c) 2005-2010 KOM  Multimedia Communications Lab
+ * Copyright (c) 2005-2010 KOM � Multimedia Communications Lab
  *
  * This file is part of Simonstrator.KOM.
  * 
@@ -22,6 +22,8 @@ package de.tudarmstadt.maki.simonstrator.api.component.pubsub;
 
 import de.tudarmstadt.maki.simonstrator.api.component.overlay.OverlayContact;
 
-public interface SubscriptionListener {
+public interface BypassCloudListener {
 	void onSubscribeAtBroker(OverlayContact pSubscriber, Subscription[] subscriptions);
+
+	void onNotificationArrivedAtBroker(Notification pNotification);
 }

src/de/tudarmstadt/maki/simonstrator/api/component/sensor/environment/data/jam/VectoralJamProperty.java

@@ -120,7 +120,9 @@ public class VectoralJamProperty extends NumericVectoralProperty {
 
 	@Override
 	public EnvironmentProperty getDefaultProperty() {
-		return new VectoralJamProperty(getLocation(), getEdge());
+		VectoralJamProperty jamProperty = new VectoralJamProperty(getLocation(), getEdge());
+		jamProperty.setSpeed(getEdge().getOriginalMaxSpeedState());
+		return jamProperty;
 	}
 
 	@Override

src/de/tudarmstadt/maki/simonstrator/api/component/vehicular/relevance/ImpactFunction.java

 /*
- * Copyright (c) 2005-2010 KOM  Multimedia Communications Lab
+ * Copyright (c) 2005-2010 KOM � Multimedia Communications Lab
  *
  * This file is part of Simonstrator.KOM.
  * 
@@ -23,5 +23,9 @@ package de.tudarmstadt.maki.simonstrator.api.component.vehicular.relevance;
 import de.tudarmstadt.maki.simonstrator.api.component.vehicular.information.PointInformation;
 
 public interface ImpactFunction<T extends PointInformation> {
-	double calculateImpact(T pInformation);
+	default double calculateImpact(T pInformation) {
+		return calculateImpact(pInformation.getDetectionDate());
+	}
+
+	double calculateImpact(long pDetectionDate);
 }

src/de/tudarmstadt/maki/simonstrator/api/component/vehicular/relevance/impl/AbstractQoIBasedImpactFunction.java

@@ -117,7 +117,7 @@ public abstract class AbstractQoIBasedImpactFunction<T extends PointInformation>
 		}
 
 		ttl = getTTL(pInformation.get(0));
-		numberOfMessages = amount * ttl / (difference + Time.SECOND);
+		numberOfMessages = amount * ttl * SCALING / (difference + Time.SECOND);
 
 		rate = ttl / (double) numberOfMessages;
 
@@ -149,11 +149,9 @@ public abstract class AbstractQoIBasedImpactFunction<T extends PointInformation>
 			double pErrorProbability, double pNumberOfMessages, double pCostWrongKeep, double pCostWrongChange);
 
 	@Override
-	public double calculateImpact(T pInformation) {
+	public double calculateImpact(long pDetectionDate) {
 		double impact = calculateImpact(1 - accuracy, numberOfMessages,
-				(((pInformation.getDetectionDate() - maxTimestamp) / SCALING + ttl) / (double) ttl) * numberOfMessages,
-				b)
-				/ (accuracy);
+				((ttl - (maxTimestamp - pDetectionDate) / SCALING) / (double) ttl) * numberOfMessages, b) / (accuracy);
 		return impact;
 	}
 

src/de/tudarmstadt/maki/simonstrator/api/component/vehicular/roadnetwork/RoadNetworkEdge.java

@@ -186,6 +186,10 @@ public class RoadNetworkEdge {
 		return _originalMaxSpeed;
 	}
 
+	public double getOriginalMaxSpeedState() {
+		return RoadNetworkEdge.getCorrespondingState(_originalMaxSpeed);
+	}
+
 	public int getLaneAmount() {
 		return _lanes.size();
 	}