MATSim Code

Brought to you by: jwjoubert, laemmel, michaz, mrieser, and 3 others

Commit [r12759] Maximize Restore History

bugfix: Controler.setMobsimFactory() was ignored/overwritten in CoreControlerListener. CoreControlerListener now only sets a mobsimFactory if none is set before, allowing that the mobsimFactory can be set from "outside". Add a test for this behaviour. Add integration tests to verify that the correct type of SimulationFactory is created by CoreControlerListener depending on configuration parameters.

Authored by: mrieser 2010-09-27

Browse code at this revision

Parent: [r12758]

Child: [r12760]

changed	/matsim/trunk/src/main/java/org/matsim/core/controler/Controler.java
changed	/matsim/trunk/src/test/java/org/matsim/core/controler/ControlerTest.java
added	/matsim/trunk/src/test/java/org/matsim/integration/controler/JDEQSimIntegrationTest.java
added	/matsim/trunk/src/test/java/org/matsim/integration/controler/MultimodalQSimIntegrationTest.java
added	/matsim/trunk/src/test/java/org/matsim/integration/controler/ParallelQSimIntegrationTest.java
added	/matsim/trunk/src/test/java/org/matsim/integration/controler/QSimIntegrationTest.java

MATSim Code

Commit [r12759] Maximize Restore History

/matsim/trunk/src/main/java/org/matsim/core/controler/Controler.java Diff Switch to side-by-side view

/matsim/trunk/src/test/java/org/matsim/core/controler/ControlerTest.java Diff Switch to side-by-side view

/matsim/trunk/src/test/java/org/matsim/integration/controler/JDEQSimIntegrationTest.java Diff Switch to side-by-side view

/matsim/trunk/src/test/java/org/matsim/integration/controler/MultimodalQSimIntegrationTest.java Diff Switch to side-by-side view

/matsim/trunk/src/test/java/org/matsim/integration/controler/ParallelQSimIntegrationTest.java Diff Switch to side-by-side view

/matsim/trunk/src/test/java/org/matsim/integration/controler/QSimIntegrationTest.java Diff Switch to side-by-side view