18
18
import org .matsim .core .config .CommandLine ;
19
19
import org .matsim .core .config .CommandLine .ConfigurationException ;
20
20
import org .matsim .core .config .Config ;
21
- import org .matsim .core .config .groups .ControlerConfigGroup .RoutingAlgorithmType ;
22
- import org .matsim .core .config .groups .PlanCalcScoreConfigGroup ;
23
- import org .matsim .core .config .groups .PlanCalcScoreConfigGroup .ActivityParams ;
24
- import org .matsim .core .config .groups .PlanCalcScoreConfigGroup .ModeParams ;
25
- import org .matsim .core .config .groups .PlansCalcRouteConfigGroup ;
26
- import org .matsim .core .config .groups .PlansCalcRouteConfigGroup .AccessEgressType ;
27
- import org .matsim .core .config .groups .PlansCalcRouteConfigGroup .ModeRoutingParams ;
21
+ import org .matsim .core .config .groups .ControllerConfigGroup .RoutingAlgorithmType ;
28
22
import org .matsim .core .config .groups .PlansConfigGroup ;
23
+ import org .matsim .core .config .groups .RoutingConfigGroup ;
24
+ import org .matsim .core .config .groups .RoutingConfigGroup .AccessEgressType ;
25
+ import org .matsim .core .config .groups .RoutingConfigGroup .TeleportedModeParams ;
26
+ import org .matsim .core .config .groups .ScoringConfigGroup ;
27
+ import org .matsim .core .config .groups .ScoringConfigGroup .ActivityParams ;
28
+ import org .matsim .core .config .groups .ScoringConfigGroup .ModeParams ;
29
29
import org .matsim .core .controler .OutputDirectoryHierarchy .OverwriteFileSetting ;
30
30
31
31
public class GenerateConfig {
@@ -61,17 +61,17 @@ public GenerateConfig(CommandLine cmd, String prefix, double sampleSize, int ran
61
61
protected void adaptConfiguration (Config config ) {
62
62
// General settings
63
63
64
- config .controler ().setFirstIteration (0 );
65
- config .controler ().setLastIteration (DEFAULT_ITERATIONS );
66
- config .controler ().setWriteEventsInterval (DEFAULT_ITERATIONS );
67
- config .controler ().setWritePlansInterval (DEFAULT_ITERATIONS );
68
- config .controler ().setOutputDirectory ("simulation_output" );
69
- config .controler ().setOverwriteFileSetting (OverwriteFileSetting .deleteDirectoryIfExists );
64
+ config .controller ().setFirstIteration (0 );
65
+ config .controller ().setLastIteration (DEFAULT_ITERATIONS );
66
+ config .controller ().setWriteEventsInterval (DEFAULT_ITERATIONS );
67
+ config .controller ().setWritePlansInterval (DEFAULT_ITERATIONS );
68
+ config .controller ().setOutputDirectory ("simulation_output" );
69
+ config .controller ().setOverwriteFileSetting (OverwriteFileSetting .deleteDirectoryIfExists );
70
70
71
71
config .global ().setRandomSeed (randomSeed );
72
72
config .global ().setNumberOfThreads (threads );
73
73
74
- config .controler ().setRoutingAlgorithmType (RoutingAlgorithmType .FastAStarLandmarks );
74
+ config .controller ().setRoutingAlgorithmType (RoutingAlgorithmType .SpeedyALT );
75
75
76
76
config .transit ().setUseTransit (true );
77
77
@@ -92,7 +92,7 @@ protected void adaptConfiguration(Config config) {
92
92
terminationConfig .setModes (MODES );
93
93
94
94
// Scoring config
95
- PlanCalcScoreConfigGroup scoringConfig = config .planCalcScore ();
95
+ ScoringConfigGroup scoringConfig = config .scoring ();
96
96
97
97
scoringConfig .setMarginalUtilityOfMoney (0.0 );
98
98
scoringConfig .setMarginalUtlOfWaitingPt_utils_hr (0.0 );
@@ -102,7 +102,7 @@ protected void adaptConfiguration(Config config) {
102
102
103
103
if (activityParams == null ) {
104
104
activityParams = new ActivityParams (activityType );
105
- config .planCalcScore ().addActivityParams (activityParams );
105
+ config .scoring ().addActivityParams (activityParams );
106
106
}
107
107
108
108
activityParams .setScoringThisActivityAtAll (false );
@@ -121,22 +121,22 @@ protected void adaptConfiguration(Config config) {
121
121
}
122
122
123
123
// Routing configuration
124
- PlansCalcRouteConfigGroup routingConfig = config .plansCalcRoute ();
124
+ RoutingConfigGroup routingConfig = config .routing ();
125
125
126
- config .plansCalcRoute ().setNetworkModes (NETWORK_MODES );
126
+ config .routing ().setNetworkModes (NETWORK_MODES );
127
127
128
- config .plansCalcRoute ().setAccessEgressType (AccessEgressType .accessEgressModeToLink );
129
- config .plansCalcRoute ().setRoutingRandomness (0.0 );
128
+ config .routing ().setAccessEgressType (AccessEgressType .accessEgressModeToLink );
129
+ config .routing ().setRoutingRandomness (0.0 );
130
130
131
- ModeRoutingParams outsideParams = routingConfig .getOrCreateModeRoutingParams ("outside" );
131
+ TeleportedModeParams outsideParams = routingConfig .getOrCreateModeRoutingParams ("outside" );
132
132
outsideParams .setBeelineDistanceFactor (1.0 );
133
133
outsideParams .setTeleportedModeSpeed (1000.0 );
134
134
135
- ModeRoutingParams bikeParams = routingConfig .getOrCreateModeRoutingParams (TransportMode .bike );
135
+ TeleportedModeParams bikeParams = routingConfig .getOrCreateModeRoutingParams (TransportMode .bike );
136
136
bikeParams .setBeelineDistanceFactor (1.4 );
137
137
bikeParams .setTeleportedModeSpeed (3.1 ); // 11.6 km/h
138
138
139
- ModeRoutingParams walkParams = routingConfig .getOrCreateModeRoutingParams (TransportMode .walk );
139
+ TeleportedModeParams walkParams = routingConfig .getOrCreateModeRoutingParams (TransportMode .walk );
140
140
walkParams .setBeelineDistanceFactor (1.3 );
141
141
walkParams .setTeleportedModeSpeed (1.2 ); // 4.32 km/h
142
142
0 commit comments