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

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.

Authored by: mrieser 2007-12-26

Browse code at this revision

Parent: [r279]

Child: [r281]

changed	/matsim/trunk/src/org/matsim/controler/Controler.java
changed	/matsim/trunk/src/org/matsim/roadpricing/RoadPricingScoringFunction.java
changed	/matsim/trunk/src/org/matsim/roadpricing/RoadPricingScoringFunctionFactory.java
changed	/matsim/trunk/src/org/matsim/scoring/CharyparNagelScoringFunction.java
changed	/matsim/trunk/src/org/matsim/scoring/EventsToScore.java
changed	/matsim/trunk/src/org/matsim/scoring/ScoringFunction.java
changed	/matsim/trunk/src/playground/jhackney/run/SNController01.java
changed	/matsim/trunk/src/playground/marcel/AppraisalScorer.java
changed	/matsim/trunk/test/src/org/matsim/roadpricing/RoadPricingTest.java

/matsim/trunk/src/org/matsim/controler/Controler.java Diff Switch to side-by-side view

/matsim/trunk/src/org/matsim/roadpricing/RoadPricingScoringFunction.java Diff Switch to side-by-side view

/matsim/trunk/src/org/matsim/roadpricing/RoadPricingScoringFunctionFactory.java Diff Switch to side-by-side view

/matsim/trunk/src/org/matsim/scoring/CharyparNagelScoringFunction.java Diff Switch to side-by-side view

/matsim/trunk/src/org/matsim/scoring/EventsToScore.java Diff Switch to side-by-side view

/matsim/trunk/src/org/matsim/scoring/ScoringFunction.java Diff Switch to side-by-side view

/matsim/trunk/src/playground/jhackney/run/SNController01.java Diff Switch to side-by-side view

/matsim/trunk/src/playground/marcel/AppraisalScorer.java Diff Switch to side-by-side view

/matsim/trunk/test/src/org/matsim/roadpricing/RoadPricingTest.java Diff Switch to side-by-side view