diff --git a/flow/controllers/car_following_models.py b/flow/controllers/car_following_models.py index a26b52cb1..2840e291e 100755 --- a/flow/controllers/car_following_models.py +++ b/flow/controllers/car_following_models.py @@ -57,7 +57,7 @@ def __init__(self, time_delay=0.0, noise=0, fail_safe=None, - display_warnings=True): + display_warnings=False): """Instantiate a CFM controller.""" BaseController.__init__( self, @@ -136,7 +136,7 @@ def __init__(self, time_delay=0.0, noise=0, fail_safe=None, - display_warnings=True): + display_warnings=False): """Instantiate a Bilateral car-following model controller.""" BaseController.__init__( self, @@ -219,7 +219,7 @@ def __init__(self, time_delay=0.0, noise=0, fail_safe=None, - display_warnings=True): + display_warnings=False): """Instantiate a Linear Adaptive Cruise controller.""" BaseController.__init__( self, @@ -299,7 +299,7 @@ def __init__(self, time_delay=0, noise=0, fail_safe=None, - display_warnings=True): + display_warnings=False): """Instantiate an Optimal Vehicle Model controller.""" BaseController.__init__( self, @@ -377,7 +377,7 @@ def __init__(self, time_delay=0.0, noise=0, fail_safe=None, - display_warnings=True): + display_warnings=False): """Instantiate a Linear OVM controller.""" BaseController.__init__( self, @@ -460,7 +460,7 @@ def __init__(self, time_delay=0.0, noise=0, fail_safe=None, - display_warnings=True, + display_warnings=False, car_following_params=None): """Instantiate an IDM controller.""" BaseController.__init__( @@ -565,7 +565,7 @@ def __init__(self, delay=0, noise=0, fail_safe=None, - display_warnings=True): + display_warnings=False): """Instantiate a Gipps' controller.""" BaseController.__init__( self, @@ -648,7 +648,7 @@ def __init__(self, time_delay=0, noise=0, fail_safe=None, - display_warnings=True): + display_warnings=False): """Instantiate an Bando controller.""" BaseController.__init__( self, diff --git a/flow/core/kernel/simulation/traci.py b/flow/core/kernel/simulation/traci.py index 7998b4d1b..2e29e1f30 100644 --- a/flow/core/kernel/simulation/traci.py +++ b/flow/core/kernel/simulation/traci.py @@ -273,8 +273,8 @@ def teardown_sumo(self): def save_emission(self, run_id=0): """Save any collected emission data to a csv file. - If not data was collected, nothing happens. Moreover, any internally - stored data by this class is clear whenever data is stored. + If no data was collected, nothing happens. Moreover, any internally + stored data by this class is cleared whenever data is stored. Parameters ---------- diff --git a/flow/core/kernel/vehicle/traci.py b/flow/core/kernel/vehicle/traci.py index 8aabc1726..fba4240e3 100644 --- a/flow/core/kernel/vehicle/traci.py +++ b/flow/core/kernel/vehicle/traci.py @@ -1167,7 +1167,7 @@ def get_accel(self, veh_id, noise=True, failsafe=True): else: metric_name += '_no_noise' if failsafe: - metric_name += '_with_falsafe' + metric_name += '_with_failsafe' else: metric_name += '_no_failsafe' @@ -1182,7 +1182,7 @@ def update_accel(self, veh_id, accel, noise=True, failsafe=True): else: metric_name += '_no_noise' if failsafe: - metric_name += '_with_falsafe' + metric_name += '_with_failsafe' else: metric_name += '_no_failsafe' diff --git a/flow/core/rewards.py b/flow/core/rewards.py index be2f0bbf8..33960f8cd 100755 --- a/flow/core/rewards.py +++ b/flow/core/rewards.py @@ -307,7 +307,7 @@ def punish_rl_lane_changes(env, penalty=1): def energy_consumption(env, gain=.001): - """Calculate power consumption of a vehicle. + """Calculate power consumption for all vehicle. Assumes vehicle is an average sized vehicle. The power calculated here is the lower bound of the actual power consumed diff --git a/flow/data_pipeline/data_pipeline.py b/flow/data_pipeline/data_pipeline.py index d569c31a9..059930207 100644 --- a/flow/data_pipeline/data_pipeline.py +++ b/flow/data_pipeline/data_pipeline.py @@ -18,7 +18,7 @@ def generate_trajectory_table(emission_files, trajectory_table_path, source_id): emission_files : list paths to the SUMO emission trajectory_table_path : str - path to the file fot S3 upload only + path to the file for S3 upload only source_id : str the source id of this simulation """