MATSim Code

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

• Summary
• Files
• Reviews
• Support
• Mailing Lists
• Code

Menu ▾ ▴

 

• Browse Commits
• Browse Files

Commit [r18573]  Maximize  Restore  History

adding new carrierTourElement 'leg' with 'route' to carrierTour; carrierDriverAgent cannot route anymore but takes the route of the carrierTour;

routing is moved from beforeMobsimEvent to replanningEvent; carrierWriter and -Reader is adapted to new carrierTour; redundant interfaces and factories are removed (i.e. carrierAgentFac, carrierAgentI); small changes of vehicle router to improve performance

Authored by: oblonski 2012-02-29

Browse code at this revision

Parent: [r18572]

Child: [r18574]

1 2 3 .. 5 > >> (Page 1 of 5)

changed	/contrib/trunk/freight
added	/contrib/trunk/freight/src/main/java/org/matsim/contrib/freight/carrier/CarrierFactory.java
changed	/contrib/trunk/freight/src/main/java/org/matsim/contrib/freight/carrier/CarrierPlanReader.java
changed	/contrib/trunk/freight/src/main/java/org/matsim/contrib/freight/carrier/CarrierPlanWriter.java
changed	/contrib/trunk/freight/src/main/java/org/matsim/contrib/freight/carrier/CarrierVehicle.java
changed	/contrib/trunk/freight/src/main/java/org/matsim/contrib/freight/carrier/Tour.java
changed	/contrib/trunk/freight/src/main/java/org/matsim/contrib/freight/carrier/TourBuilder.java
changed	/contrib/trunk/freight/src/main/java/org/matsim/contrib/freight/controler/City2000WQSimFactory.java
changed	/contrib/trunk/freight/src/main/java/org/matsim/contrib/freight/controler/RunMobSimWithCarrier.java
removed	/contrib/trunk/freight/src/main/java/org/matsim/contrib/freight/mobsim/CarrierAgent.java
removed	/contrib/trunk/freight/src/main/java/org/matsim/contrib/freight/mobsim/CarrierAgentFactory.java
changed	/contrib/trunk/freight/src/main/java/org/matsim/contrib/freight/mobsim/CarrierAgentImpl.java
changed	/contrib/trunk/freight/src/main/java/org/matsim/contrib/freight/mobsim/CarrierAgentTracker.java
removed	/contrib/trunk/freight/src/main/java/org/matsim/contrib/freight/mobsim/CarrierDriverAgent.java
removed	/contrib/trunk/freight/src/main/java/org/matsim/contrib/freight/mobsim/CarrierDriverAgentFactory.java
removed	/contrib/trunk/freight/src/main/java/org/matsim/contrib/freight/mobsim/CarrierDriverAgentFactoryImpl.java
removed	/contrib/trunk/freight/src/main/java/org/matsim/contrib/freight/mobsim/CarrierDriverAgentImpl.java
removed	/contrib/trunk/freight/src/main/java/org/matsim/contrib/freight/mobsim/SimpleCarrierAgentFactory.java
added	/contrib/trunk/freight/src/main/java/org/matsim/contrib/freight/replanning/DepartureTimeScheduler.java
changed	/contrib/trunk/freight/src/main/java/org/matsim/contrib/freight/replanning/ReRouteVehicles.java
copied	/contrib/trunk/freight/src/main/java/org/matsim/contrib/freight/replanning/ReRouteVehicles.java -> /contrib/trunk/freight/src/main/java/org/matsim/contrib/freight/replanning/ReScheduleVehicles.java
added	/contrib/trunk/freight/src/main/java/org/matsim/contrib/freight/vrp/DTWSolverFactory.java
changed	/contrib/trunk/freight/src/main/java/org/matsim/contrib/freight/vrp/MatSimVRPBuilder.java
added	/contrib/trunk/freight/src/main/java/org/matsim/contrib/freight/vrp/NetworkTransportCosts.java
copied	/contrib/trunk/freight/src/main/java/org/matsim/contrib/freight/vrp/RRPDTWSolverFactory.java -> /contrib/trunk/freight/src/main/java/org/matsim/contrib/freight/vrp/PDTWSolverFactory.java

/contrib/trunk/freight

Directory.

/contrib/trunk/freight/src/main/java/org/matsim/contrib/freight/carrier/CarrierFactory.java Diff Switch to side-by-side view

/contrib/trunk/freight/src/main/java/org/matsim/contrib/freight/carrier/CarrierPlanReader.java Diff Switch to side-by-side view

/contrib/trunk/freight/src/main/java/org/matsim/contrib/freight/carrier/CarrierPlanWriter.java Diff Switch to side-by-side view

/contrib/trunk/freight/src/main/java/org/matsim/contrib/freight/carrier/CarrierVehicle.java Diff Switch to side-by-side view

/contrib/trunk/freight/src/main/java/org/matsim/contrib/freight/carrier/Tour.java Diff Switch to side-by-side view

/contrib/trunk/freight/src/main/java/org/matsim/contrib/freight/carrier/TourBuilder.java Diff Switch to side-by-side view

/contrib/trunk/freight/src/main/java/org/matsim/contrib/freight/controler/City2000WQSimFactory.java Diff Switch to side-by-side view

/contrib/trunk/freight/src/main/java/org/matsim/contrib/freight/controler/RunMobSimWithCarrier.java Diff Switch to side-by-side view

/contrib/trunk/freight/src/main/java/org/matsim/contrib/freight/mobsim/CarrierAgent.java

File was removed.

/contrib/trunk/freight/src/main/java/org/matsim/contrib/freight/mobsim/CarrierAgentFactory.java

File was removed.

/contrib/trunk/freight/src/main/java/org/matsim/contrib/freight/mobsim/CarrierAgentImpl.java Diff Switch to side-by-side view

/contrib/trunk/freight/src/main/java/org/matsim/contrib/freight/mobsim/CarrierAgentTracker.java Diff Switch to side-by-side view

/contrib/trunk/freight/src/main/java/org/matsim/contrib/freight/mobsim/CarrierDriverAgent.java

File was removed.

/contrib/trunk/freight/src/main/java/org/matsim/contrib/freight/mobsim/CarrierDriverAgentFactory.java

File was removed.

/contrib/trunk/freight/src/main/java/org/matsim/contrib/freight/mobsim/CarrierDriverAgentFactoryImpl.java

File was removed.

/contrib/trunk/freight/src/main/java/org/matsim/contrib/freight/mobsim/CarrierDriverAgentImpl.java

File was removed.

/contrib/trunk/freight/src/main/java/org/matsim/contrib/freight/mobsim/SimpleCarrierAgentFactory.java

File was removed.

/contrib/trunk/freight/src/main/java/org/matsim/contrib/freight/replanning/DepartureTimeScheduler.java Diff Switch to side-by-side view

/contrib/trunk/freight/src/main/java/org/matsim/contrib/freight/replanning/ReRouteVehicles.java Diff Switch to side-by-side view

/contrib/trunk/freight/src/main/java/org/matsim/contrib/freight/replanning/ReRouteVehicles.java to /contrib/trunk/freight/src/main/java/org/matsim/contrib/freight/replanning/ReScheduleVehicles.java

File was copied.

/contrib/trunk/freight/src/main/java/org/matsim/contrib/freight/vrp/DTWSolverFactory.java Diff Switch to side-by-side view

/contrib/trunk/freight/src/main/java/org/matsim/contrib/freight/vrp/MatSimVRPBuilder.java Diff Switch to side-by-side view

/contrib/trunk/freight/src/main/java/org/matsim/contrib/freight/vrp/NetworkTransportCosts.java Diff Switch to side-by-side view

/contrib/trunk/freight/src/main/java/org/matsim/contrib/freight/vrp/RRPDTWSolverFactory.java to /contrib/trunk/freight/src/main/java/org/matsim/contrib/freight/vrp/PDTWSolverFactory.java

File was copied.

1 2 3 .. 5 > >> (Page 1 of 5)