Added new replacement strategy, renamed default to no replacment

src/de/tud/kom/p2psim/impl/vehicular/caching/replacement/CacheReplacementStrategyType.java

@@ -23,7 +23,7 @@ package de.tud.kom.p2psim.impl.vehicular.caching.replacement;
 import de.tudarmstadt.maki.simonstrator.api.component.vehicular.caching.replacement.CacheReplacementStrategy;
 
 public enum CacheReplacementStrategyType {
-	DEFAULT(DefaultCacheReplacementStrategy.class), TTL(TTLbasedCacheReplacementStrategy.class);
+	DEFAULT(NoCacheReplacementStrategy.class), NONE(NoCacheReplacementStrategy.class), IMMEDIATE(ImmediateCacheReplacementStrategy.class), TTL(TTLbasedCacheReplacementStrategy.class);
 
 	private final Class<? extends CacheReplacementStrategy> replacementStrategy;
 

src/de/tud/kom/p2psim/impl/vehicular/caching/replacement/ImmediateCacheReplacementStrategy.java

+/*
+ * Copyright (c) 2005-2010 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/>.
+ *
+ */
+
+package de.tud.kom.p2psim.impl.vehicular.caching.replacement;
+
+import de.tudarmstadt.maki.simonstrator.api.component.vehicular.caching.replacement.CacheReplacementStrategy;
+import de.tudarmstadt.maki.simonstrator.api.component.vehicular.information.PointInformation;
+
+public class ImmediateCacheReplacementStrategy implements CacheReplacementStrategy {
+
+	@Override
+	public boolean replaceInformation(PointInformation pCachedInformation,
+			PointInformation pSensedInformation) {
+		return pSensedInformation.getDetectionDate() > pCachedInformation.getDetectionDate();
+	}
+
+}

src/de/tud/kom/p2psim/impl/vehicular/caching/replacement/NoCacheReplacementStrategy.java

@@ -23,12 +23,12 @@ package de.tud.kom.p2psim.impl.vehicular.caching.replacement;
 import de.tudarmstadt.maki.simonstrator.api.component.vehicular.caching.replacement.CacheReplacementStrategy;
 import de.tudarmstadt.maki.simonstrator.api.component.vehicular.information.PointInformation;
 
-public class DefaultCacheReplacementStrategy implements CacheReplacementStrategy {
+public class NoCacheReplacementStrategy implements CacheReplacementStrategy {
 
 	@Override
 	public boolean replaceInformation(PointInformation pCachedInformation,
 			PointInformation pSensedInformation) {
-		return false;//pSensedInformation.getDetectionDate() > pCachedInformation.getDetectionDate();
+		return false;
 	}
 
 }