diff --git a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/dataaccess/MATSimDataProviderReceiver.java b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/dataaccess/MATSimDataProviderReceiver.java index 53e8e5912..ad9d5372f 100644 --- a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/dataaccess/MATSimDataProviderReceiver.java +++ b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/dataaccess/MATSimDataProviderReceiver.java @@ -37,6 +37,7 @@ public MATSimDataProviderReceiver(List linksToDisable) { } // Here we return next links ids for MATSim agents + @Override public Map getMATSimData() { Map result = new HashMap(); for (Map.Entry entry : inputs.entrySet()) { @@ -46,8 +47,8 @@ public Map getMATSimData() { } // Here we update sensors - public void setMATSimData(Object data) { - Map map = (Map) data; + @Override + public void setMATSimData(Map map) { outputs.clear(); outputs.putAll(map); } diff --git a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/plugin/MATSimSimulation.java b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/plugin/MATSimSimulation.java index 3f41bf2d5..2901c886c 100644 --- a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/plugin/MATSimSimulation.java +++ b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/plugin/MATSimSimulation.java @@ -43,6 +43,7 @@ import cz.cuni.mff.d3s.jdeeco.matsim.simulation.MATSimPreloadingControler; import cz.cuni.mff.d3s.jdeeco.matsim.simulation.MATSimRouter; import cz.cuni.mff.d3s.jdeeco.matsim.simulation.MATSimSimulationStepListener; +import cz.cuni.mff.d3s.jdeeco.matsim.simulation.Simulation; /** * Plug-in providing MATSim simulation @@ -55,16 +56,16 @@ public class MATSimSimulation implements DEECoPlugin { private final TreeSet callbacks; - class TimerProvider implements SimulationTimer, MATSimSimulationStepListener { + class TimerProvider extends Simulation implements SimulationTimer, MATSimSimulationStepListener { @Override public void notifyAt(long time, TimerEventListener listener, DEECoContainer node) { // System.out.println("NOTIFY AT CALLED FOR: " + time + " NODE:" + node.getId()); - // MATSimSimulation.this.oldSimulation.callAt(time, String.valueOf(node.getId())); callAt(time, String.valueOf(node.getId())); MATSimSimulation.this.getHost(String.valueOf(node.getId())).listener = listener; } + @Override public synchronized void callAt(long absoluteTime, String hostId) { Callback callback = hostIdToCallback.remove(hostId); if (callback != null) { @@ -108,10 +109,6 @@ public void at(double seconds, Mobsim mobsim) { host.at(millisecondsToSeconds(currentMilliseconds)); } } - - private double millisecondsToSeconds(long milliseconds) { - return ((double) (milliseconds)) / 1000; - } } public class Host extends AbstractHost { @@ -265,16 +262,12 @@ public void notifyStartup(StartupEvent event) { } } - this.simulationStep = secondsToMilliseconds(step); - currentMilliseconds = secondsToMilliseconds(controler.getConfig().getQSimConfigGroup().getStartTime()); + this.simulationStep = TimerProvider.secondsToMilliseconds(step); + currentMilliseconds = TimerProvider.secondsToMilliseconds(controler.getConfig().getQSimConfigGroup().getStartTime()); router = new MATSimRouter(controler, travelTime, 10 /* TODO: FAKE VALUE */); } - private long secondsToMilliseconds(double seconds) { - return (long) (seconds * 1000); - } - private void addHost(String id, cz.cuni.mff.d3s.jdeeco.matsim.plugin.MATSimSimulation.Host host) { hosts.put(id, host); } diff --git a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/simulation/DataReceiversHolder.java b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/simulation/DataReceiversHolder.java deleted file mode 100644 index d4dac0b45..000000000 --- a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/simulation/DataReceiversHolder.java +++ /dev/null @@ -1,9 +0,0 @@ -package cz.cuni.mff.d3s.jdeeco.matsim.simulation; - -import cz.cuni.mff.d3s.deeco.network.AbstractHost; -import cz.cuni.mff.d3s.deeco.network.DataReceiver; - -public interface DataReceiversHolder { - - public void addDataReceiver(AbstractHost host, DataReceiver receiver); -} diff --git a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/simulation/DefaultMATSimExtractor.java b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/simulation/DefaultMATSimExtractor.java index 8c49d26b9..69d224b18 100644 --- a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/simulation/DefaultMATSimExtractor.java +++ b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/simulation/DefaultMATSimExtractor.java @@ -10,7 +10,7 @@ public class DefaultMATSimExtractor implements MATSimExtractor { @Override - public Object extractFromMATSim(Collection agents, + public Map extractFromMATSim(Collection agents, Mobsim mobsim) { Map map = new HashMap(); MATSimOutput matSimOutput; diff --git a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/simulation/MATSimDataProvider.java b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/simulation/MATSimDataProvider.java index a8ff1952f..7882770db 100644 --- a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/simulation/MATSimDataProvider.java +++ b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/simulation/MATSimDataProvider.java @@ -11,5 +11,5 @@ * */ public interface MATSimDataProvider { - public Map getMATSimData(); + public Map getMATSimData(); } diff --git a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/simulation/MATSimDataReceiver.java b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/simulation/MATSimDataReceiver.java index c5766ac70..443ef77df 100644 --- a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/simulation/MATSimDataReceiver.java +++ b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/simulation/MATSimDataReceiver.java @@ -1,5 +1,9 @@ package cz.cuni.mff.d3s.jdeeco.matsim.simulation; +import java.util.Map; + +import org.matsim.api.core.v01.Id; + /** * Interface for MATSim data retrieval. This data comes from MATSim side. @@ -8,5 +12,5 @@ * */ public interface MATSimDataReceiver { - public void setMATSimData(Object data); + public void setMATSimData(Map data); } diff --git a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/simulation/MATSimExtractor.java b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/simulation/MATSimExtractor.java index c918759ea..678291ec6 100644 --- a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/simulation/MATSimExtractor.java +++ b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/simulation/MATSimExtractor.java @@ -1,9 +1,11 @@ package cz.cuni.mff.d3s.jdeeco.matsim.simulation; import java.util.Collection; +import java.util.Map; +import org.matsim.api.core.v01.Id; import org.matsim.core.mobsim.framework.Mobsim; public interface MATSimExtractor { - public Object extractFromMATSim(Collection agents, Mobsim mobsim); + public Map extractFromMATSim(Collection agents, Mobsim mobsim); } diff --git a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/simulation/SimulationTimeEventListener.java b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/simulation/SimulationTimeEventListener.java deleted file mode 100644 index ee58ecc98..000000000 --- a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/simulation/SimulationTimeEventListener.java +++ /dev/null @@ -1,22 +0,0 @@ -/** - * - */ -package cz.cuni.mff.d3s.jdeeco.matsim.simulation; - - -/** - * Listener interface for time events triggered by a simulation. - * - * @author Michal Kit - * - */ -public interface SimulationTimeEventListener { - - /** - * Simulation callback method for the previous registration - * - * @param time - * current simulation time - */ - void at(long time); -} diff --git a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/simulation/SimulationTimeEventListenerHolder.java b/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/simulation/SimulationTimeEventListenerHolder.java deleted file mode 100644 index 4960dbd4b..000000000 --- a/jdeeco-matsim-plugin/src/cz/cuni/mff/d3s/jdeeco/matsim/simulation/SimulationTimeEventListenerHolder.java +++ /dev/null @@ -1,5 +0,0 @@ -package cz.cuni.mff.d3s.jdeeco.matsim.simulation; - -public interface SimulationTimeEventListenerHolder { - public void setSimulationTimeEventListener(SimulationTimeEventListener listener); -}