MATSim Code

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

Commit [r6582] Maximize Restore History

only read in car-routes as NetworkRoutes, all other modes are read in as GenericRoute. Change some code to handle non-NetworkRoutes as well. This changed a few reference files from tests, e.g. because a missing route.distance is no longer automatically calculated (as when being a NetworkRoute) and no longer every leg can be visualized in a shape-file. Additional tests for handling non-NetworkRoute routes.

Authored by: mrieser 2009-04-27

Browse code at this revision

Parent: [r6581]

Child: [r6583]

changed	/matsim/trunk/src/org/matsim/core/network/NetworkFactory.java
changed	/matsim/trunk/src/org/matsim/core/population/PopulationReaderMatsimV4.java
changed	/matsim/trunk/src/org/matsim/utils/gis/matsim2esri/plans/SelectedPlans2ESRIShape.java
changed	/matsim/trunk/test/input/org/matsim/core/replanning/ReRoutingTest/testReRouting/plans.xml.gz
changed	/matsim/trunk/test/input/org/matsim/utils/gis/matsim2esri/plans/SelectedPlans2ESRIShapeTest/testSelectedPlansLegsShape/legs.shp
changed	/matsim/trunk/test/src/org/matsim/core/network/NetworkFactoryTest.java
changed	/matsim/trunk/test/src/org/matsim/core/population/AllTests.java
renamed	/matsim/trunk/test/src/org/matsim/core/population/PlanTest.java -> /matsim/trunk/test/src/org/matsim/core/population/PlanImplTest.java
added	/matsim/trunk/test/src/org/matsim/core/population/PopulationWriterHandlerImplV4Test.java

/matsim/trunk/src/org/matsim/core/network/NetworkFactory.java Diff Switch to side-by-side view

/matsim/trunk/src/org/matsim/core/population/PopulationReaderMatsimV4.java Diff Switch to side-by-side view

/matsim/trunk/src/org/matsim/utils/gis/matsim2esri/plans/SelectedPlans2ESRIShape.java Diff Switch to side-by-side view

/matsim/trunk/test/input/org/matsim/core/replanning/ReRoutingTest/testReRouting/plans.xml.gz

Binary file was changed.

/matsim/trunk/test/input/org/matsim/utils/gis/matsim2esri/plans/SelectedPlans2ESRIShapeTest/testSelectedPlansLegsShape/legs.shp

Binary file was changed.

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

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

/matsim/trunk/test/src/org/matsim/core/population/PlanTest.java to /matsim/trunk/test/src/org/matsim/core/population/PlanImplTest.java

File was renamed.