MATSim Code

improved javadoc, specified when to return null in selectPlan()

Marked methods that still expected "age" as parameter (for Plan) deprecated and added methods without this parameter. The parameter was just ignored, time to get rid of it...

The PlanStrategy now ensures that if an unscored plan is selected whenever the agent has such one.

added method getRandomUnscoredPlan()

moved hasUndefinedScore() and isUndefinedScore() from Plan to BasicPlan, as UNDEFINED_SCORE is defined in BasicPlan.

removed, as it was nowhere used, and does basically the same thing as org.matsim.plans.algorithms.PersonFilterSelectedPlan.

- renamed MGC.Coordinate2Coord() to MGC.coordinate2Coord() to be consistent with the other methods as well as with the Naming Conventions.
- fixed several JavaDoc errors
- simplified MGC.coord2Point()

delete an empty package.

moved org.matsim.filters.* to playground.marcel.filters.*

RoadPricingScoringFunction no longer extends CharyparNagelScoringFunction, but takes another ScoringFunction as Delegate. This allows the RoadPricingScoringFunction to be used with any ScoringFunction, not just the CharyparNagelScoringFunction. This required changes to RoadPricingScoringFunctionFactory and all places, where this class was instantiated.
CharyparNagelScoringFunction no longer writes the score into the plan in finish(), because that would have meant that every ScoringFunction would have to do this... instead, EventsToScore does this now, so that is a general solution that works for any ScoringFunction. Improved JavaDoc in ScoringFunction.java to make this clear.