MATSim Code

copied	/contrib/trunk/roadpricing/src/main/java/org/matsim/roadpricing/ControlerDefaultsWithRoadPricingModule.java -> /playgrounds/trunk/artemc/src/main/java/playground/artemc/pricing/ControlerDefaultsWithRoadPricingWithoutTravelDisutilityModule.java
copied	/contrib/trunk/roadpricing/src/main/java/org/matsim/roadpricing/RoadPricingControlerListener.java -> /playgrounds/trunk/artemc/src/main/java/playground/artemc/pricing/RoadPricingControlerListener.java
copied	/contrib/trunk/roadpricing/src/main/java/org/matsim/roadpricing/TravelDisutilityIncludingToll.java -> /playgrounds/trunk/artemc/src/main/java/playground/artemc/heterogeneityWithToll/TravelDisutilityTollAndIncomeHeterogeneity.java
changed	/playgrounds/trunk/artemc/src/main/java/playground/artemc/analysis/ScheduleDelayCostHandler.java
changed	/playgrounds/trunk/artemc/src/main/java/playground/artemc/heterogeneity/HeteroControler.java
changed	/playgrounds/trunk/artemc/src/main/java/playground/artemc/heterogeneity/HeteroControlerV2.java
copied	/playgrounds/trunk/artemc/src/main/java/playground/artemc/heterogeneity/HeteroControlerV2.java -> /playgrounds/trunk/artemc/src/main/java/playground/artemc/heterogeneityWithToll/ControlerWithHeteroAndToll.java
changed	/playgrounds/trunk/artemc/src/main/java/playground/artemc/heterogeneity/HeteroLoop.java
renamed	/playgrounds/trunk/artemc/src/main/java/playground/artemc/heterogeneity/HeterogeneityConfig.java -> /playgrounds/trunk/artemc/src/main/java/playground/artemc/heterogeneity/old/HeterogeneityConfig.java
changed	/playgrounds/trunk/artemc/src/main/java/playground/artemc/heterogeneity/IncomeHeterogeneityModule.java
copied	/playgrounds/trunk/artemc/src/main/java/playground/artemc/heterogeneity/IncomeHeterogeneityModule.java -> /playgrounds/trunk/artemc/src/main/java/playground/artemc/heterogeneity/IncomeHeterogeneityWithoutTravelDisutilityModule.java
added	/playgrounds/trunk/artemc/src/main/java/playground/artemc/heterogeneity/TravelDisutilityIncomeHeterogeneityProviderWrapper.java
added	/playgrounds/trunk/artemc/src/main/java/playground/artemc/heterogeneity/old
removed	/playgrounds/trunk/artemc/src/main/java/playground/artemc/heterogeneity/routing/TravelDisutilityIncludingIncomeAndToll.java
removed	/playgrounds/trunk/artemc/src/main/java/playground/artemc/heterogeneity/scoring
added	/playgrounds/trunk/artemc/src/main/java/playground/artemc/heterogeneityWithToll
added	/playgrounds/trunk/artemc/src/main/java/playground/artemc/heterogeneityWithToll/TravelDisutilityTollAndIncomeHeterogeneityProviderWrapper.java
changed	/playgrounds/trunk/artemc/src/main/java/playground/artemc/pricing/RunSocialCostPricingExample.java
added	/playgrounds/trunk/artemc/src/main/java/playground/artemc/pricing/TravelDisutilityIncludingTollProviderWrapper.java
changed	/playgrounds/trunk/artemc/src/main/java/playground/artemc/scenarios/CorridorRun.java
changed	/playgrounds/trunk/artemc/src/main/java/playground/artemc/scoring/CharyparNagelScoringFunctionForAnalysisFactory.java
changed	/playgrounds/trunk/artemc/src/main/java/playground/artemc/scoring/HeterogeneousCharyparNagelScoringFunctionForAnalysisFactory.java
renamed	/playgrounds/trunk/artemc/src/main/java/playground/artemc/scoring/PersonalScoringFaunctionFactory.java -> /playgrounds/trunk/artemc/src/main/java/playground/artemc/scoring/PersonalScoringFunctionFactory.java