MATSim Code

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

Commit [r27820] Maximize Restore History

VrpOptimizer called only once per time step (before a qSim step); electric vehicle, taxi rank readers added

Authored by: michal-m 2014-02-05

Browse code at this revision

Parent: [r27819]

Child: [r27821]

added	/contrib/trunk/dvrp/src/main/java/org/matsim/contrib/dvrp/data/file/ReaderUtils.java
changed	/contrib/trunk/dvrp/src/main/java/org/matsim/contrib/dvrp/data/file/VehicleReader.java
changed	/contrib/trunk/dvrp/src/main/java/org/matsim/contrib/dvrp/extensions/electric/ElectricVehicleImpl.java
added	/matsim/trunk/src/main/resources/dtd/electric_vehicles_v1.dtd
added	/matsim/trunk/src/main/resources/dtd/taxi_ranks_v1.dtd
changed	/playgrounds/trunk/jbischoff/src/main/java/playground/jbischoff/taxi/launch/JbSingleIterOnlineDvrpLauncher.java
changed	/playgrounds/trunk/michalm/src/main/java/playground/michalm/taxi/TaxiData.java
added	/playgrounds/trunk/michalm/src/main/java/playground/michalm/taxi/file/ElectricVehicleReader.java
changed	/playgrounds/trunk/michalm/src/main/java/playground/michalm/taxi/file/TaxiRankReader.java
removed	/playgrounds/trunk/michalm/src/main/java/playground/michalm/taxi/model/VrpAgentElectricTaxi.java
changed	/playgrounds/trunk/michalm/src/main/java/playground/michalm/taxi/optimizer/immediaterequest/ImmediateRequestTaxiOptimizer.java
changed	/playgrounds/trunk/michalm/src/main/java/playground/michalm/taxi/optimizer/immediaterequest/NOSTaxiOptimizer.java
changed	/playgrounds/trunk/michalm/src/main/java/playground/michalm/taxi/optimizer/immediaterequest/OTSTaxiOptimizer.java
changed	/playgrounds/trunk/michalm/src/main/java/playground/michalm/taxi/optimizer/immediaterequest/RESTaxiOptimizer.java
changed	/playgrounds/trunk/michalm/src/main/java/playground/michalm/taxi/optimizer/immediaterequest/TaxiOptimizerWithPreassignment.java
changed	/playgrounds/trunk/michalm/src/main/java/playground/michalm/taxi/run/AlgorithmConfig.java
changed	/playgrounds/trunk/michalm/src/main/java/playground/michalm/taxi/run/SingleIterTaxiLauncher.java
changed	/playgrounds/trunk/michalm/src/main/java/playground/michalm/taxi/run/TaxiLauncherUtils.java

/contrib/trunk/dvrp/src/main/java/org/matsim/contrib/dvrp/data/file/ReaderUtils.java Diff Switch to side-by-side view

/contrib/trunk/dvrp/src/main/java/org/matsim/contrib/dvrp/data/file/VehicleReader.java Diff Switch to side-by-side view

/contrib/trunk/dvrp/src/main/java/org/matsim/contrib/dvrp/extensions/electric/ElectricVehicleImpl.java Diff Switch to side-by-side view

/matsim/trunk/src/main/resources/dtd/electric_vehicles_v1.dtd Diff Switch to side-by-side view

/matsim/trunk/src/main/resources/dtd/taxi_ranks_v1.dtd Diff Switch to side-by-side view

/playgrounds/trunk/jbischoff/src/main/java/playground/jbischoff/taxi/launch/JbSingleIterOnlineDvrpLauncher.java Diff Switch to side-by-side view

/playgrounds/trunk/michalm/src/main/java/playground/michalm/taxi/TaxiData.java Diff Switch to side-by-side view

/playgrounds/trunk/michalm/src/main/java/playground/michalm/taxi/file/ElectricVehicleReader.java Diff Switch to side-by-side view

/playgrounds/trunk/michalm/src/main/java/playground/michalm/taxi/file/TaxiRankReader.java Diff Switch to side-by-side view

/playgrounds/trunk/michalm/src/main/java/playground/michalm/taxi/model/VrpAgentElectricTaxi.java

File was removed.

/playgrounds/trunk/michalm/src/main/java/playground/michalm/taxi/optimizer/immediaterequest/ImmediateRequestTaxiOptimizer.java Diff Switch to side-by-side view

/playgrounds/trunk/michalm/src/main/java/playground/michalm/taxi/optimizer/immediaterequest/NOSTaxiOptimizer.java Diff Switch to side-by-side view

/playgrounds/trunk/michalm/src/main/java/playground/michalm/taxi/optimizer/immediaterequest/OTSTaxiOptimizer.java Diff Switch to side-by-side view

/playgrounds/trunk/michalm/src/main/java/playground/michalm/taxi/optimizer/immediaterequest/RESTaxiOptimizer.java Diff Switch to side-by-side view

/playgrounds/trunk/michalm/src/main/java/playground/michalm/taxi/optimizer/immediaterequest/TaxiOptimizerWithPreassignment.java Diff Switch to side-by-side view

/playgrounds/trunk/michalm/src/main/java/playground/michalm/taxi/run/AlgorithmConfig.java Diff Switch to side-by-side view

/playgrounds/trunk/michalm/src/main/java/playground/michalm/taxi/run/SingleIterTaxiLauncher.java Diff Switch to side-by-side view

/playgrounds/trunk/michalm/src/main/java/playground/michalm/taxi/run/TaxiLauncherUtils.java Diff Switch to side-by-side view