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

the parameter /waiting/ was both used as waiting for an activity and waiting for a vehicle. Since they need to be varied independently, I added a second parameter ptWaiting.

also modified TransitRouterNetworkTravelTimeAndDisutility such that "waitingPt" can be included into derived class without code replication (see AdaptedTransitRouterNetworkTravelTimeCost in moyo playground).

Authored by: vsp_nagel 2012-10-28

Browse code at this revision

Parent: [r21526]

Child: [r21528]

changed	/matsim/trunk/src/main/java/org/matsim/core/config/groups/PlanCalcScoreConfigGroup.java
changed	/matsim/trunk/src/main/java/org/matsim/core/scoring/functions/CharyparNagelScoringParameters.java
changed	/matsim/trunk/src/main/java/org/matsim/pt/router/TransitRouterConfig.java
changed	/matsim/trunk/src/main/java/org/matsim/pt/router/TransitRouterNetworkTravelTimeAndDisutility.java
changed	/matsim/trunk/src/test/java/org/matsim/core/scoring/functions/CharyparNagelScoringFunctionTest.java
changed	/matsim/trunk/src/test/java/org/matsim/pt/router/TransitRouterConfigTest.java
changed	/matsim/trunk/src/test/java/org/matsim/pt/router/TransitRouterNetworkTravelTimeCostTest.java
changed	/playgrounds/trunk/benjamin/src/main/java/playground/benjamin/scoring/distance/BkScoringFunction.java
changed	/playgrounds/trunk/ikaddoura/src/main/java/playground/ikaddoura/busCorridorPaper/busCorridorWelfareAnalysis/InternalControler.java
changed	/playgrounds/trunk/kai/src/main/java/playground/kai/usecases/randomizedptrouter/Main.java
changed	/playgrounds/trunk/meisterk/src/test/java/playground/meisterk/kti/scoring/ActivityScoringFunctionTest.java
changed	/playgrounds/trunk/mmoyo/src/main/java/playground/mmoyo/ptRouterAdapted/AdaptedLauncher.java
changed	/playgrounds/trunk/mmoyo/src/main/java/playground/mmoyo/ptRouterAdapted/AdaptedTransitRouterNetworkTravelTimeCost.java
changed	/playgrounds/trunk/mmoyo/src/test/java/playground/mmoyo/ptRouterAdapted/AdaptedTransitRouterNetworkTravelTimeCostTest.java
changed	/playgrounds/trunk/sergioo/src/main/java/playground/sergioo/Singapore/ScoringFunction/CharyparNagelScoringParameters.java
changed	/playgrounds/trunk/sergioo/src/main/java/playground/sergioo/Singapore/TransitRouterVariable/TransitRouterNetworkTravelTimeAndDisutilityVariableWW.java
changed	/playgrounds/trunk/thibautd/src/main/java/playground/thibautd/herbie/HerbieTransitTravelTimeAndDisutility.java
changed	/playgrounds/trunk/toronto/src/main/java/playground/toronto/router/UpgradedTransitNetworkTravelTimeAndDisutility.java
changed	/playgrounds/trunk/yu/src/main/java/playground/yu/parameterSearch/ParametersGetter.java

/matsim/trunk/src/main/java/org/matsim/core/config/groups/PlanCalcScoreConfigGroup.java Diff Switch to side-by-side view

/matsim/trunk/src/main/java/org/matsim/core/scoring/functions/CharyparNagelScoringParameters.java Diff Switch to side-by-side view

/matsim/trunk/src/main/java/org/matsim/pt/router/TransitRouterConfig.java Diff Switch to side-by-side view

/matsim/trunk/src/main/java/org/matsim/pt/router/TransitRouterNetworkTravelTimeAndDisutility.java Diff Switch to side-by-side view

/matsim/trunk/src/test/java/org/matsim/core/scoring/functions/CharyparNagelScoringFunctionTest.java Diff Switch to side-by-side view

/matsim/trunk/src/test/java/org/matsim/pt/router/TransitRouterConfigTest.java Diff Switch to side-by-side view

/matsim/trunk/src/test/java/org/matsim/pt/router/TransitRouterNetworkTravelTimeCostTest.java Diff Switch to side-by-side view

/playgrounds/trunk/benjamin/src/main/java/playground/benjamin/scoring/distance/BkScoringFunction.java Diff Switch to side-by-side view

/playgrounds/trunk/ikaddoura/src/main/java/playground/ikaddoura/busCorridorPaper/busCorridorWelfareAnalysis/InternalControler.java Diff Switch to side-by-side view

/playgrounds/trunk/kai/src/main/java/playground/kai/usecases/randomizedptrouter/Main.java Diff Switch to side-by-side view

/playgrounds/trunk/meisterk/src/test/java/playground/meisterk/kti/scoring/ActivityScoringFunctionTest.java Diff Switch to side-by-side view

/playgrounds/trunk/mmoyo/src/main/java/playground/mmoyo/ptRouterAdapted/AdaptedLauncher.java Diff Switch to side-by-side view

/playgrounds/trunk/mmoyo/src/main/java/playground/mmoyo/ptRouterAdapted/AdaptedTransitRouterNetworkTravelTimeCost.java Diff Switch to side-by-side view

/playgrounds/trunk/mmoyo/src/test/java/playground/mmoyo/ptRouterAdapted/AdaptedTransitRouterNetworkTravelTimeCostTest.java Diff Switch to side-by-side view

/playgrounds/trunk/sergioo/src/main/java/playground/sergioo/Singapore/ScoringFunction/CharyparNagelScoringParameters.java Diff Switch to side-by-side view

/playgrounds/trunk/sergioo/src/main/java/playground/sergioo/Singapore/TransitRouterVariable/TransitRouterNetworkTravelTimeAndDisutilityVariableWW.java Diff Switch to side-by-side view

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

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

/playgrounds/trunk/yu/src/main/java/playground/yu/parameterSearch/ParametersGetter.java Diff Switch to side-by-side view