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

spring cleaning, part II: special implementations of plan elements definitively removed.

Joint trip information is now remembered in routes.
Those routes are used in a prototypical implementation of a qsim engine for joint trips.
All classes too tightly linked to the previous approach (for example, all modules relying on plan elements ids) are removed.
Simplification of the JointPlan and Clique classes, in order to make them closer to "pure" containers.
Some bugfixes as well.

Authored by: thibautd 2012-05-08

Browse code at this revision

Parent: [r19453]

Child: [r19455]

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

changed	/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/agentsmating/dumbmating/Mater.java
changed	/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/agentsmating/dumbmating/RunMating.java
changed	/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/agentsmating/logitbasedmating/spbasedmodel/RunReducedSPModel.java
changed	/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/agentsmating/ptv2matsim/ConvertData.java
changed	/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/agentsmating/ptv2matsim/Converter.java
changed	/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/agentsmating/ptv2matsim/CorrectPlans.java
changed	/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/agentsmating/ptv2matsim/Correcter.java
changed	/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/agentsmating/ptv2matsim/SizeFilter.java
changed	/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/analysis/aposteriorianalysis/EquilibriumOptimalPlansGenerator.java
changed	/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/analysis/aposteriorianalysis/ScoreExecutedPlans.java
changed	/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/jointtrips/population/Clique.java
added	/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/jointtrips/population/DriverRoute.java
removed	/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/jointtrips/population/JointActing.java
changed	/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/jointtrips/population/JointActingTypes.java
removed	/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/jointtrips/population/JointActivity.java
removed	/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/jointtrips/population/JointLeg.java
changed	/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/jointtrips/population/JointPlan.java
added	/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/jointtrips/population/PassengerRoute.java
changed	/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/jointtrips/population/PopulationOfCliquesFactory.java
changed	/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/jointtrips/population/PopulationWithCliques.java
removed	/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/jointtrips/population/PopulationWithCliquesFactory.java
removed	/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/jointtrips/population/PopulationWithJointTripsWriterHandler.java
removed	/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/jointtrips/population/jointtrippossibilities
added	/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/jointtrips/qsim
added	/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/jointtrips/qsim/JointQSimFactory.java

/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/agentsmating/dumbmating/Mater.java Diff Switch to side-by-side view

/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/agentsmating/dumbmating/RunMating.java Diff Switch to side-by-side view

/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/agentsmating/logitbasedmating/spbasedmodel/RunReducedSPModel.java Diff Switch to side-by-side view

/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/agentsmating/ptv2matsim/ConvertData.java Diff Switch to side-by-side view

/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/agentsmating/ptv2matsim/Converter.java Diff Switch to side-by-side view

/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/agentsmating/ptv2matsim/CorrectPlans.java Diff Switch to side-by-side view

/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/agentsmating/ptv2matsim/Correcter.java Diff Switch to side-by-side view

/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/agentsmating/ptv2matsim/SizeFilter.java Diff Switch to side-by-side view

/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/analysis/aposteriorianalysis/EquilibriumOptimalPlansGenerator.java Diff Switch to side-by-side view

/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/analysis/aposteriorianalysis/ScoreExecutedPlans.java Diff Switch to side-by-side view

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

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

/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/jointtrips/population/JointActing.java

File was removed.

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

/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/jointtrips/population/JointActivity.java

File was removed.

/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/jointtrips/population/JointLeg.java

File was removed.

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

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

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

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

/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/jointtrips/population/PopulationWithCliquesFactory.java

File was removed.

/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/jointtrips/population/PopulationWithJointTripsWriterHandler.java

File was removed.

/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/jointtrips/population/jointtrippossibilities

File was removed.

/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/jointtrips/qsim

Directory.

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

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