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 [r20957]  Maximize  Restore  History

simplify the structure

The "RoutingModuleFactory" layer is removed, and the TripRouterFactory
is not a configurable object anymore, but an interface one implements to
"plug together" the required RoutingModuleFactories.

Authored by: thibautd 2012-09-11

Browse code at this revision

Parent: [r20956]

Child: [r20958]

removed	/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/hitchiking/routing/HitchHikingDriverRoutingModuleFactory.java
removed	/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/hitchiking/routing/HitchHikingPassengerRoutingModuleFactory.java
changed	/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/hitchiking/run/HitchHikingControler.java
renamed	/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/hitchiking/run/HitchHikingTripRouterFactory.java -> /playgrounds/trunk/thibautd/src/main/java/playground/thibautd/hitchiking/routing/HitchHikingTripRouterFactory.java
changed	/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/jointtrips/replanning/modules/jointtimemodechooser/JointTimeModeChooserAlgorithm.java
changed	/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/jointtrips/replanning/modules/jointtimemodechooser/StatisticsCollector.java
renamed	/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/jointtrips/router/DriverRoutingModuleFactory.java -> /playgrounds/trunk/thibautd/src/main/java/playground/thibautd/jointtrips/router/JointTripRouterFactory.java
removed	/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/jointtrips/router/PassengerRoutingModuleFactory.java
changed	/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/jointtrips/run/JointControler.java
changed	/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/parknride/ParkAndRideModule.java
removed	/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/router/DefaultRoutingModuleFactory.java
removed	/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/router/RoutingModuleFactory.java
removed	/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/router/TransitRoutingModuleFactory.java
changed	/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/router/TripRouter.java
changed	/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/router/TripRouterFactory.java
copied	/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/router/TripRouterFactory.java -> /playgrounds/trunk/thibautd/src/main/java/playground/thibautd/router/RoutingElements.java
added	/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/router/TripRouterFactoryImpl.java
changed	/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/router/controler/MultiLegRoutingControler.java
changed	/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/tsplanoptimizer/timemodechooser/TimeModeChooserAlgorithm.java
removed	/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/tsplanoptimizer/timemodechooser/traveltimeestimation/EstimatorRouterBuilder.java
added	/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/tsplanoptimizer/timemodechooser/traveltimeestimation/EstimatorTripRouterFactory.java
changed	/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/tsplanoptimizer/timemodechooser/traveltimeestimation/FixedRouteNetworkRoutingModule.java
changed	/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/tsplanoptimizer/timemodechooser/traveltimeestimation/FixedTransitRouteRoutingModule.java

/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/hitchiking/routing/HitchHikingDriverRoutingModuleFactory.java

File was removed.

/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/hitchiking/routing/HitchHikingPassengerRoutingModuleFactory.java

File was removed.

/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/hitchiking/run/HitchHikingControler.java Diff Switch to side-by-side view

/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/hitchiking/run/HitchHikingTripRouterFactory.java to /playgrounds/trunk/thibautd/src/main/java/playground/thibautd/hitchiking/routing/HitchHikingTripRouterFactory.java

File was renamed.

/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/jointtrips/replanning/modules/jointtimemodechooser/JointTimeModeChooserAlgorithm.java Diff Switch to side-by-side view

/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/jointtrips/replanning/modules/jointtimemodechooser/StatisticsCollector.java Diff Switch to side-by-side view

/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/jointtrips/router/DriverRoutingModuleFactory.java to /playgrounds/trunk/thibautd/src/main/java/playground/thibautd/jointtrips/router/JointTripRouterFactory.java

File was renamed.

/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/jointtrips/router/PassengerRoutingModuleFactory.java

File was removed.

/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/jointtrips/run/JointControler.java Diff Switch to side-by-side view

/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/parknride/ParkAndRideModule.java Diff Switch to side-by-side view

/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/router/DefaultRoutingModuleFactory.java

File was removed.

/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/router/RoutingModuleFactory.java

File was removed.

/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/router/TransitRoutingModuleFactory.java

File was removed.

/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/router/TripRouter.java Diff Switch to side-by-side view

/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/router/TripRouterFactory.java Diff Switch to side-by-side view

/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/router/TripRouterFactory.java to /playgrounds/trunk/thibautd/src/main/java/playground/thibautd/router/RoutingElements.java

File was copied.

/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/router/TripRouterFactoryImpl.java Diff Switch to side-by-side view

/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/router/controler/MultiLegRoutingControler.java Diff Switch to side-by-side view

/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/tsplanoptimizer/timemodechooser/TimeModeChooserAlgorithm.java Diff Switch to side-by-side view

/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/tsplanoptimizer/timemodechooser/traveltimeestimation/EstimatorRouterBuilder.java

File was removed.

/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/tsplanoptimizer/timemodechooser/traveltimeestimation/EstimatorTripRouterFactory.java Diff Switch to side-by-side view

/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/tsplanoptimizer/timemodechooser/traveltimeestimation/FixedRouteNetworkRoutingModule.java Diff Switch to side-by-side view

/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/tsplanoptimizer/timemodechooser/traveltimeestimation/FixedTransitRouteRoutingModule.java Diff Switch to side-by-side view