From 8843b3bc3238d2d605351b99cfa73ac5ee33faf6 Mon Sep 17 00:00:00 2001 From: liljonnystyle Date: Thu, 21 May 2020 22:24:41 -0700 Subject: [PATCH 01/60] New energy class to inventory multiple energy models --- flow/core/kernel/energy.py | 119 ++++++++++++++++++ flow/core/kernel/vehicle/traci.py | 194 +++++++++++------------------- 2 files changed, 190 insertions(+), 123 deletions(-) create mode 100644 flow/core/kernel/energy.py diff --git a/flow/core/kernel/energy.py b/flow/core/kernel/energy.py new file mode 100644 index 000000000..0e2189073 --- /dev/null +++ b/flow/core/kernel/energy.py @@ -0,0 +1,119 @@ +import dill as pickle +import boto3 +import botocore +import math +import random +import statistics +import numpy as np +from scipy.interpolate import interp1d +from collections import namedtuple + + +class EnergyModel(): + """Base energy model class.""" + + def __init__(self,kernel): + self.vehicle = vehicle + + def get_energy(self, veh_id): + #return self.calc_energy(veh_id) + pass + + +class PowerDemandModel(EnergyModel): + + def __init__(self,kernel): + self.k = kernel + + """Calculate power consumption of a vehicle. + Assumes vehicle is an average sized vehicle. + The power calculated here is the lower bound of the actual power consumed + by a vehicle. + M mass of average sized vehicle (kg) + g gravitational acceleration (m/s^2) + Cr rolling resistance coefficient + Ca aerodynamic drag coefficient + rho air density (kg/m^3) + A vehicle cross sectional area (m^2) + """ + g = 9.8 + rho = 1.225 + + if vtype == 'average': + M = 1200 + Cr = 0.005 + Ca = 0.3 + A = 2.6 + + def get_energy(self, veh_id) + # if we know the constants for other vehicle types, we may put them here as well + speed = self.k.get_speed(veh_id) + if veh_id in self.k.old_speeds: + old_speed = self.k.old_speeds[veh_id] + else: + old_speed = speed + + accel = (speed - old_speed)/0.1 + power = M * speed * accel + M * g * Cr * speed + 0.5 * rho * A * Ca * speed ** 3 + + return power + + +class ToyotaPriusEVModel(EnergyModel): + + def __init__(self,kernel): + self.k = kernel + + # download file from s3 bucket + s3 = boto3.client('s3') + s3.download_file('toyota.restricted','prius_test.pkl','PriusEVModel.pkl') #move to init + with open('PriusEVModel.pkl','rb')as file: + prius_energy = pickle.load(file) #self.prius_energy + # delete pickle file + + def get_energy(self): + + speed = self.k.get_speed(veh_id) + + if veh_id in self.k.old_speeds: + old_speed = self.k.old_speeds[veh_id] + else: + old_speed = speed + + accel = (speed - old_speed)/0.1 + + old_soc = self.k.get_soc(veh_id) + grade = 0 + + socdot = prius_energy(old_soc,speed,accel,grade) + new_soc = old_soc + socdot*0.1 + + return new_soc # return current soc level + + +class ToyotaTacomaModel(EnergyModel): + + def __init__(self,kernel): + self.k = kernel + + # download file from s3 bucket + s3 = boto3.client('s3') + s3.download_file('toyota.restricted','tacoma_test.pkl','TacomaModel.pkl') + + with open('TacomaModel.pkl','rb')as file: + tacoma_energy = pickle.load(file) + + + def get_energy(self,speed,accel,grade): + + speed = self.k.get_speed(veh_id) + + if veh_id in self.k.old_speeds: + old_speed = self.k.old_speeds[veh_id] + else: + old_speed = speed + + accel = (speed - old_speed)/0.1 + grade = 0 + + return tacoma_energy(speed,accel,grade) # returns instantanoes fuel consumption diff --git a/flow/core/kernel/vehicle/traci.py b/flow/core/kernel/vehicle/traci.py index b89e981be..09f2b6a8c 100644 --- a/flow/core/kernel/vehicle/traci.py +++ b/flow/core/kernel/vehicle/traci.py @@ -1,34 +1,30 @@ """Script containing the TraCI vehicle kernel class.""" import traceback - from flow.core.kernel.vehicle import KernelVehicle import traci.constants as tc from traci.exceptions import FatalTraCIError, TraCIException import numpy as np +import math import collections import warnings +import random +import statistics from flow.controllers.car_following_models import SimCarFollowingController from flow.controllers.rlcontroller import RLController from flow.controllers.lane_change_controllers import SimLaneChangeController from bisect import bisect_left import itertools from copy import deepcopy +from flow.core.kernel.energy import Energy # colors for vehicles WHITE = (255, 255, 255) CYAN = (0, 255, 255) RED = (255, 0, 0) -GREEN = (0, 255, 0) -STEPS = 10 -rdelta = 255 / STEPS -# smoothly go from red to green as the speed increases -color_bins = [[int(255 - rdelta * i), int(rdelta * i), 0] for i in - range(STEPS + 1)] class TraCIVehicle(KernelVehicle): """Flow kernel for the TraCI API. - Extends flow.core.kernel.vehicle.base.KernelVehicle """ @@ -57,8 +53,6 @@ def __init__(self, self.num_vehicles = 0 # number of rl vehicles in the network self.num_rl_vehicles = 0 - # number of vehicles loaded but not departed vehicles - self.num_not_departed = 0 # contains the parameters associated with each type of vehicle self.type_parameters = {} @@ -71,29 +65,28 @@ def __init__(self, # number of vehicles that entered the network for every time-step self._num_departed = [] - self._departed_ids = 0 + self._departed_ids = [] # number of vehicles to exit the network for every time-step self._num_arrived = [] - self._arrived_ids = 0 + self._arrived_ids = [] self._arrived_rl_ids = [] # whether or not to automatically color vehicles try: - self._color_by_speed = sim_params.color_by_speed - self._force_color_update = sim_params.force_color_update + self._color_vehicles = sim_params.color_vehicles except AttributeError: - self._force_color_update = False + self._color_vehicles = False - # old speeds used to compute accelerations - self.previous_speeds = {} + self.energy = Energy(self) + self.energy.calc_energy_level(self) + # # store speeds of all vehicles at last iteration + self.old_speeds = {} def initialize(self, vehicles): """Initialize vehicle state information. - This is responsible for collecting vehicle type information from the VehicleParams object and placing them within the Vehicles kernel. - Parameters ---------- vehicles : flow.core.params.VehicleParams @@ -104,7 +97,6 @@ def initialize(self, vehicles): self.minGap = vehicles.minGap self.num_vehicles = 0 self.num_rl_vehicles = 0 - self.num_not_departed = 0 self.__vehicles.clear() for typ in vehicles.initial: @@ -113,32 +105,34 @@ def initialize(self, vehicles): self.__vehicles[veh_id] = dict() self.__vehicles[veh_id]['type'] = typ['veh_id'] self.__vehicles[veh_id]['initial_speed'] = typ['initial_speed'] + # self.energy.initialize(veh_id) + # energy.intialize(veh_id) + self.__vehicles[veh_id]['SOC'] = float(random.randrange(8, 92))/100 #move to experiment code + # # Assume level of fuel is 10-100% of capacity + # # Tacoma has 21.1 gallon capacity = 79.87219 L + # # Use density of gasoline = 748.9 g/L (needs to convert b/c fc is in g/s) + self.__vehicles[veh_id]['fuel'] = float(random.randrange(598163, 5981628))/100 self.num_vehicles += 1 if typ['acceleration_controller'][0] == RLController: self.num_rl_vehicles += 1 def update(self, reset): """See parent class. - The following actions are performed: - * The state of all vehicles is modified to match their state at the current time step. This includes states specified by sumo, and states explicitly defined by flow, e.g. "num_arrived". * If vehicles exit the network, they are removed from the vehicles class, and newly departed vehicles are introduced to the class. - Parameters ---------- reset : bool specifies whether the simulator was reset in the last simulation step """ - # copy over the previous speeds - + # print(self.get_ids()) vehicle_obs = {} for veh_id in self.__ids: - self.previous_speeds[veh_id] = self.get_speed(veh_id) vehicle_obs[veh_id] = \ self.kernel_api.vehicle.getSubscriptionResults(veh_id) sim_obs = self.kernel_api.simulation.getSubscriptionResults() @@ -184,19 +178,18 @@ def update(self, reset): self.prev_last_lc[veh_id] = -float("inf") self._num_departed.clear() self._num_arrived.clear() - self._departed_ids = 0 - self._arrived_ids = 0 + self._departed_ids.clear() + self._arrived_ids.clear() self._arrived_rl_ids.clear() - self.num_not_departed = 0 # add vehicles from a network template, if applicable if hasattr(self.master_kernel.network.network, "template_vehicles"): - for veh_id in self.master_kernel.network.network. \ + for veh_id in self.master_kernel.network.network.\ template_vehicles: vals = deepcopy(self.master_kernel.network.network. template_vehicles[veh_id]) - # a step is executed during initialization, so add this sim + # a step is executed during initialiG\zation, so add this sim # step to the departure time of vehicles vals['depart'] = str( float(vals['depart']) + 2 * self.sim_step) @@ -211,14 +204,11 @@ def update(self, reset): self.__vehicles[veh_id]["last_lc"] = self.time_counter # updated the list of departed and arrived vehicles - self._num_departed.append(sim_obs[tc.VAR_LOADED_VEHICLES_NUMBER]) - self._num_arrived.append(sim_obs[tc.VAR_ARRIVED_VEHICLES_NUMBER]) - self._departed_ids = sim_obs[tc.VAR_DEPARTED_VEHICLES_IDS] - self._arrived_ids = sim_obs[tc.VAR_ARRIVED_VEHICLES_IDS] - - # update the number of not departed vehicles - self.num_not_departed += sim_obs[tc.VAR_LOADED_VEHICLES_NUMBER] - \ - sim_obs[tc.VAR_DEPARTED_VEHICLES_NUMBER] + self._num_departed.append( + len(sim_obs[tc.VAR_DEPARTED_VEHICLES_IDS])) + self._num_arrived.append(len(sim_obs[tc.VAR_ARRIVED_VEHICLES_IDS])) + self._departed_ids.append(sim_obs[tc.VAR_DEPARTED_VEHICLES_IDS]) + self._arrived_ids.append(sim_obs[tc.VAR_ARRIVED_VEHICLES_IDS]) # update the "headway", "leader", and "follower" variables for veh_id in self.__ids: @@ -263,16 +253,16 @@ def update(self, reset): # make sure the rl vehicle list is still sorted self.__rl_ids.sort() + self.energy.calc_energy_level(self) + def _add_departed(self, veh_id, veh_type): """Add a vehicle that entered the network from an inflow or reset. - Parameters ---------- veh_id: str name of the vehicle veh_type: str type of vehicle, as specified to sumo - Returns ------- dict @@ -319,6 +309,7 @@ def _add_departed(self, veh_id, veh_type): if accel_controller[0] == RLController: if veh_id not in self.__rl_ids: self.__rl_ids.append(veh_id) + self.num_rl_vehicles += 1 else: if veh_id not in self.__human_ids: self.__human_ids.append(veh_id) @@ -329,14 +320,9 @@ def _add_departed(self, veh_id, veh_type): # subscribe the new vehicle self.kernel_api.vehicle.subscribe(veh_id, [ - tc.VAR_LANE_INDEX, tc.VAR_LANEPOSITION, - tc.VAR_ROAD_ID, - tc.VAR_SPEED, - tc.VAR_EDGES, - tc.VAR_POSITION, - tc.VAR_ANGLE, - tc.VAR_SPEED_WITHOUT_TRACI, - tc.VAR_FUELCONSUMPTION + tc.VAR_LANE_INDEX, tc.VAR_LANEPOSITION, tc.VAR_ROAD_ID, + tc.VAR_SPEED, tc.VAR_EDGES, tc.VAR_POSITION, tc.VAR_ANGLE, + tc.VAR_SPEED_WITHOUT_TRACI ]) self.kernel_api.vehicle.subscribeLeader(veh_id, 2000) @@ -371,22 +357,15 @@ def _add_departed(self, veh_id, veh_type): self.kernel_api.vehicle.getLaneIndex(veh_id) self.__sumo_obs[veh_id][tc.VAR_SPEED] = \ self.kernel_api.vehicle.getSpeed(veh_id) - self.__sumo_obs[veh_id][tc.VAR_FUELCONSUMPTION] = \ - self.kernel_api.vehicle.getFuelConsumption(veh_id) # make sure that the order of rl_ids is kept sorted self.__rl_ids.sort() - self.num_rl_vehicles = len(self.__rl_ids) # get the subscription results from the new vehicle new_obs = self.kernel_api.vehicle.getSubscriptionResults(veh_id) return new_obs - def reset(self): - """See parent class.""" - self.previous_speeds = {} - def remove(self, veh_id): """See parent class.""" # remove from sumo @@ -519,7 +498,10 @@ def get_num_arrived(self): def get_arrived_ids(self): """See parent class.""" - return self._arrived_ids + if len(self._arrived_ids) > 0: + return self._arrived_ids[-1] + else: + return 0 def get_arrived_rl_ids(self): """See parent class.""" @@ -530,29 +512,21 @@ def get_arrived_rl_ids(self): def get_departed_ids(self): """See parent class.""" - return self._departed_ids - - def get_num_not_departed(self): - """See parent class.""" - return self.num_not_departed - - def get_fuel_consumption(self, veh_id, error=-1001): - """Return fuel consumption in gallons/s.""" - ml_to_gallons = 0.000264172 - if isinstance(veh_id, (list, np.ndarray)): - return [self.get_fuel_consumption(vehID, error) for vehID in veh_id] - return self.__sumo_obs.get(veh_id, {}).get(tc.VAR_FUELCONSUMPTION, error) * ml_to_gallons + if len(self._departed_ids) > 0: + return self._departed_ids[-1] + else: + return 0 - def get_previous_speed(self, veh_id, error=-1001): + def get_speed(self, veh_id, error=-1001): """See parent class.""" if isinstance(veh_id, (list, np.ndarray)): - return [self.get_previous_speed(vehID, error) for vehID in veh_id] - return self.previous_speeds.get(veh_id, 0) + return [self.get_speed(vehID, error) for vehID in veh_id] + return self.__sumo_obs.get(veh_id, {}).get(tc.VAR_SPEED, error) - def get_speed(self, veh_id, error=-1001): + def old_speed(self, veh_id, error=-1001): """See parent class.""" if isinstance(veh_id, (list, np.ndarray)): - return [self.get_speed(vehID, error) for vehID in veh_id] + return [self.old_speed(vehID, error) for vehID in veh_id] return self.__sumo_obs.get(veh_id, {}).get(tc.VAR_SPEED, error) def get_default_speed(self, veh_id, error=-1001): @@ -709,7 +683,6 @@ def get_lane_followers(self, veh_id, error=None): def _multi_lane_headways(self): """Compute multi-lane data for all vehicles. - This includes the lane leaders/followers/headways/tailways/ leader velocity/follower velocity for all vehicles in the network. @@ -747,7 +720,7 @@ def _multi_lane_headways(self): for lane in range(max_lanes): edge_dict[edge][lane].sort(key=lambda x: x[1]) - for veh_id in self.get_ids(): + for veh_id in self.get_rl_ids(): # collect the lane leaders, followers, headways, and tailways for # each vehicle edge = self.get_edge(veh_id) @@ -775,7 +748,6 @@ def _multi_lane_headways(self): def _multi_lane_headways_util(self, veh_id, edge_dict, num_edges): """Compute multi-lane data for the specified vehicle. - Parameters ---------- veh_id : str @@ -784,7 +756,6 @@ def _multi_lane_headways_util(self, veh_id, edge_dict, num_edges): Key = Edge name Index = lane index Element = list sorted by position of (vehicle id, position) - Returns ------- headway : list @@ -861,11 +832,9 @@ def _multi_lane_headways_util(self, veh_id, edge_dict, num_edges): def _next_edge_leaders(self, veh_id, edge_dict, lane, num_edges): """Search for leaders in the next edge. - Looks to the edges/junctions in front of the vehicle's current edge for potential leaders. This is currently done by only looking one edge/junction forwards. - Returns ------- headway : float @@ -906,11 +875,9 @@ def _next_edge_leaders(self, veh_id, edge_dict, lane, num_edges): def _prev_edge_followers(self, veh_id, edge_dict, lane, num_edges): """Search for followers in the previous edge. - Looks to the edges/junctions behind the vehicle's current edge for potential followers. This is currently done by only looking one edge/junction backwards. - Returns ------- tailway : float @@ -990,7 +957,7 @@ def apply_lane_change(self, veh_ids, direction): # perform the requested lane action action in TraCI if target_lane != this_lane: self.kernel_api.vehicle.changeLane( - veh_id, int(target_lane), self.sim_step) + veh_id, int(target_lane), 100000) if veh_id in self.get_rl_ids(): self.prev_last_lc[veh_id] = \ @@ -1010,8 +977,6 @@ def choose_routes(self, veh_ids, route_choices): def get_x_by_id(self, veh_id): """See parent class.""" - if isinstance(veh_id, (list, np.ndarray)): - return [self.get_x_by_id(vehID) for vehID in veh_id] if self.get_edge(veh_id) == '': # occurs when a vehicle crashes is teleported for some other reason return 0. @@ -1020,7 +985,6 @@ def get_x_by_id(self, veh_id): def update_vehicle_colors(self): """See parent class. - The colors of all vehicles are updated as follows: - red: autonomous (rl) vehicles - white: unobserved human-driven vehicles @@ -1028,11 +992,8 @@ def update_vehicle_colors(self): """ for veh_id in self.get_rl_ids(): try: - # If vehicle is already being colored via argument to vehicles.add(), don't re-color it. - if self._force_color_update or 'color' not in \ - self.type_parameters[self.get_type(veh_id)]: - # color rl vehicles red - self.set_color(veh_id=veh_id, color=RED) + # color rl vehicles red + self.set_color(veh_id=veh_id, color=RED) except (FatalTraCIError, TraCIException) as e: print('Error when updating rl vehicle colors:', e) @@ -1040,43 +1001,16 @@ def update_vehicle_colors(self): for veh_id in self.get_human_ids(): try: color = CYAN if veh_id in self.get_observed_ids() else WHITE - # If vehicle is already being colored via argument to vehicles.add(), don't re-color it. - if self._force_color_update or 'color' not in \ - self.type_parameters[self.get_type(veh_id)]: - self.set_color(veh_id=veh_id, color=color) - except (FatalTraCIError, TraCIException) as e: - print('Error when updating human vehicle colors:', e) - - for veh_id in self.get_ids(): - try: - if 'av' in veh_id: - color = RED - # If vehicle is already being colored via argument to vehicles.add(), don't re-color it. - if self._force_color_update or 'color' not in \ - self.type_parameters[self.get_type(veh_id)]: - self.set_color(veh_id=veh_id, color=color) + self.set_color(veh_id=veh_id, color=color) except (FatalTraCIError, TraCIException) as e: print('Error when updating human vehicle colors:', e) - # color vehicles by speed if desired - if self._color_by_speed: - max_speed = self.master_kernel.network.max_speed() - speed_ranges = np.linspace(0, max_speed, STEPS) - for veh_id in self.get_ids(): - veh_speed = self.get_speed(veh_id) - bin_index = np.digitize(veh_speed, speed_ranges) - # If vehicle is already being colored via argument to vehicles.add(), don't re-color it. - if self._force_color_update or 'color' not in \ - self.type_parameters[self.get_type(veh_id)]: - self.set_color(veh_id=veh_id, color=color_bins[bin_index]) - # clear the list of observed vehicles for veh_id in self.get_observed_ids(): self.remove_observed(veh_id) def get_color(self, veh_id): """See parent class. - This does not pass the last term (i.e. transparency). """ r, g, b, t = self.kernel_api.vehicle.getColor(veh_id) @@ -1084,12 +1018,12 @@ def get_color(self, veh_id): def set_color(self, veh_id, color): """See parent class. - The last term for sumo (transparency) is set to 255. """ - r, g, b = color - self.kernel_api.vehicle.setColor( - vehID=veh_id, color=(r, g, b, 255)) + if self._color_vehicles: + r, g, b = color + self.kernel_api.vehicle.setColor( + vehID=veh_id, color=(r, g, b, 255)) def add(self, veh_id, type_id, edge, pos, lane, speed): """See parent class.""" @@ -1120,3 +1054,17 @@ def get_max_speed(self, veh_id, error=-1001): def set_max_speed(self, veh_id, max_speed): """See parent class.""" self.kernel_api.vehicle.setMaxSpeed(veh_id, max_speed) + + def get_soc(self, veh_id): + return self.__vehicles[veh_id]['SOC'] + + def set_soc(self, veh_id, soc): + """Set the lane headways of the specified vehicle.""" + self.__vehicles[veh_id]['SOC'] = soc + + def get_fuel(self, veh_id): + return self.__vehicles[veh_id]['fuel'] + + def set_fuel(self, veh_id, fuel): + """Set the lane headways of the specified vehicle.""" + self.__vehicles[veh_id]['fuel'] = fuel From 9bda1ebe5f76c0c0764c9d1f890debb0a9a1e76d Mon Sep 17 00:00:00 2001 From: liljonnystyle Date: Thu, 21 May 2020 23:00:59 -0700 Subject: [PATCH 02/60] revert some inadvertent changes --- flow/core/kernel/vehicle/traci.py | 162 ++++++++++++++++++++++-------- 1 file changed, 120 insertions(+), 42 deletions(-) diff --git a/flow/core/kernel/vehicle/traci.py b/flow/core/kernel/vehicle/traci.py index 09f2b6a8c..78ae17775 100644 --- a/flow/core/kernel/vehicle/traci.py +++ b/flow/core/kernel/vehicle/traci.py @@ -1,5 +1,6 @@ """Script containing the TraCI vehicle kernel class.""" import traceback + from flow.core.kernel.vehicle import KernelVehicle import traci.constants as tc from traci.exceptions import FatalTraCIError, TraCIException @@ -12,19 +13,27 @@ from flow.controllers.car_following_models import SimCarFollowingController from flow.controllers.rlcontroller import RLController from flow.controllers.lane_change_controllers import SimLaneChangeController +from flow.core.kernel.energy import Energy from bisect import bisect_left import itertools from copy import deepcopy -from flow.core.kernel.energy import Energy + # colors for vehicles WHITE = (255, 255, 255) CYAN = (0, 255, 255) RED = (255, 0, 0) +GREEN = (0, 255, 0) +STEPS = 10 +rdelta = 255 / STEPS +# smoothly go from red to green as the speed increases +color_bins = [[int(255 - rdelta * i), int(rdelta * i), 0] for i in + range(STEPS + 1)] class TraCIVehicle(KernelVehicle): """Flow kernel for the TraCI API. + Extends flow.core.kernel.vehicle.base.KernelVehicle """ @@ -53,6 +62,8 @@ def __init__(self, self.num_vehicles = 0 # number of rl vehicles in the network self.num_rl_vehicles = 0 + # number of vehicles loaded but not departed vehicles + self.num_not_departed = 0 # contains the parameters associated with each type of vehicle self.type_parameters = {} @@ -65,28 +76,35 @@ def __init__(self, # number of vehicles that entered the network for every time-step self._num_departed = [] - self._departed_ids = [] + self._departed_ids = 0 # number of vehicles to exit the network for every time-step self._num_arrived = [] - self._arrived_ids = [] + self._arrived_ids = 0 self._arrived_rl_ids = [] # whether or not to automatically color vehicles try: - self._color_vehicles = sim_params.color_vehicles + self._color_by_speed = sim_params.color_by_speed + self._force_color_update = sim_params.force_color_update except AttributeError: - self._color_vehicles = False + self._force_color_update = False + + # old speeds used to compute accelerations + self.previous_speeds = {} self.energy = Energy(self) self.energy.calc_energy_level(self) + # # store speeds of all vehicles at last iteration self.old_speeds = {} def initialize(self, vehicles): """Initialize vehicle state information. + This is responsible for collecting vehicle type information from the VehicleParams object and placing them within the Vehicles kernel. + Parameters ---------- vehicles : flow.core.params.VehicleParams @@ -97,6 +115,7 @@ def initialize(self, vehicles): self.minGap = vehicles.minGap self.num_vehicles = 0 self.num_rl_vehicles = 0 + self.num_not_departed = 0 self.__vehicles.clear() for typ in vehicles.initial: @@ -118,21 +137,26 @@ def initialize(self, vehicles): def update(self, reset): """See parent class. + The following actions are performed: + * The state of all vehicles is modified to match their state at the current time step. This includes states specified by sumo, and states explicitly defined by flow, e.g. "num_arrived". * If vehicles exit the network, they are removed from the vehicles class, and newly departed vehicles are introduced to the class. + Parameters ---------- reset : bool specifies whether the simulator was reset in the last simulation step """ - # print(self.get_ids()) + # copy over the previous speeds + vehicle_obs = {} for veh_id in self.__ids: + self.previous_speeds[veh_id] = self.get_speed(veh_id) vehicle_obs[veh_id] = \ self.kernel_api.vehicle.getSubscriptionResults(veh_id) sim_obs = self.kernel_api.simulation.getSubscriptionResults() @@ -178,18 +202,19 @@ def update(self, reset): self.prev_last_lc[veh_id] = -float("inf") self._num_departed.clear() self._num_arrived.clear() - self._departed_ids.clear() - self._arrived_ids.clear() + self._departed_ids = 0 + self._arrived_ids = 0 self._arrived_rl_ids.clear() + self.num_not_departed = 0 # add vehicles from a network template, if applicable if hasattr(self.master_kernel.network.network, "template_vehicles"): - for veh_id in self.master_kernel.network.network.\ + for veh_id in self.master_kernel.network.network. \ template_vehicles: vals = deepcopy(self.master_kernel.network.network. template_vehicles[veh_id]) - # a step is executed during initialiG\zation, so add this sim + # a step is executed during initialization, so add this sim # step to the departure time of vehicles vals['depart'] = str( float(vals['depart']) + 2 * self.sim_step) @@ -204,11 +229,14 @@ def update(self, reset): self.__vehicles[veh_id]["last_lc"] = self.time_counter # updated the list of departed and arrived vehicles - self._num_departed.append( - len(sim_obs[tc.VAR_DEPARTED_VEHICLES_IDS])) - self._num_arrived.append(len(sim_obs[tc.VAR_ARRIVED_VEHICLES_IDS])) - self._departed_ids.append(sim_obs[tc.VAR_DEPARTED_VEHICLES_IDS]) - self._arrived_ids.append(sim_obs[tc.VAR_ARRIVED_VEHICLES_IDS]) + self._num_departed.append(sim_obs[tc.VAR_LOADED_VEHICLES_NUMBER]) + self._num_arrived.append(sim_obs[tc.VAR_ARRIVED_VEHICLES_NUMBER]) + self._departed_ids = sim_obs[tc.VAR_DEPARTED_VEHICLES_IDS] + self._arrived_ids = sim_obs[tc.VAR_ARRIVED_VEHICLES_IDS] + + # update the number of not departed vehicles + self.num_not_departed += sim_obs[tc.VAR_LOADED_VEHICLES_NUMBER] - \ + sim_obs[tc.VAR_DEPARTED_VEHICLES_NUMBER] # update the "headway", "leader", and "follower" variables for veh_id in self.__ids: @@ -257,12 +285,14 @@ def update(self, reset): def _add_departed(self, veh_id, veh_type): """Add a vehicle that entered the network from an inflow or reset. + Parameters ---------- veh_id: str name of the vehicle veh_type: str type of vehicle, as specified to sumo + Returns ------- dict @@ -309,7 +339,6 @@ def _add_departed(self, veh_id, veh_type): if accel_controller[0] == RLController: if veh_id not in self.__rl_ids: self.__rl_ids.append(veh_id) - self.num_rl_vehicles += 1 else: if veh_id not in self.__human_ids: self.__human_ids.append(veh_id) @@ -320,9 +349,14 @@ def _add_departed(self, veh_id, veh_type): # subscribe the new vehicle self.kernel_api.vehicle.subscribe(veh_id, [ - tc.VAR_LANE_INDEX, tc.VAR_LANEPOSITION, tc.VAR_ROAD_ID, - tc.VAR_SPEED, tc.VAR_EDGES, tc.VAR_POSITION, tc.VAR_ANGLE, - tc.VAR_SPEED_WITHOUT_TRACI + tc.VAR_LANE_INDEX, tc.VAR_LANEPOSITION, + tc.VAR_ROAD_ID, + tc.VAR_SPEED, + tc.VAR_EDGES, + tc.VAR_POSITION, + tc.VAR_ANGLE, + tc.VAR_SPEED_WITHOUT_TRACI, + tc.VAR_FUELCONSUMPTION ]) self.kernel_api.vehicle.subscribeLeader(veh_id, 2000) @@ -357,15 +391,22 @@ def _add_departed(self, veh_id, veh_type): self.kernel_api.vehicle.getLaneIndex(veh_id) self.__sumo_obs[veh_id][tc.VAR_SPEED] = \ self.kernel_api.vehicle.getSpeed(veh_id) + self.__sumo_obs[veh_id][tc.VAR_FUELCONSUMPTION] = \ + self.kernel_api.vehicle.getFuelConsumption(veh_id) # make sure that the order of rl_ids is kept sorted self.__rl_ids.sort() + self.num_rl_vehicles = len(self.__rl_ids) # get the subscription results from the new vehicle new_obs = self.kernel_api.vehicle.getSubscriptionResults(veh_id) return new_obs + def reset(self): + """See parent class.""" + self.previous_speeds = {} + def remove(self, veh_id): """See parent class.""" # remove from sumo @@ -498,10 +539,7 @@ def get_num_arrived(self): def get_arrived_ids(self): """See parent class.""" - if len(self._arrived_ids) > 0: - return self._arrived_ids[-1] - else: - return 0 + return self._arrived_ids def get_arrived_rl_ids(self): """See parent class.""" @@ -512,21 +550,22 @@ def get_arrived_rl_ids(self): def get_departed_ids(self): """See parent class.""" - if len(self._departed_ids) > 0: - return self._departed_ids[-1] - else: - return 0 + return self._departed_ids - def get_speed(self, veh_id, error=-1001): + def get_num_not_departed(self): + """See parent class.""" + return self.num_not_departed + + def get_previous_speed(self, veh_id, error=-1001): """See parent class.""" if isinstance(veh_id, (list, np.ndarray)): - return [self.get_speed(vehID, error) for vehID in veh_id] - return self.__sumo_obs.get(veh_id, {}).get(tc.VAR_SPEED, error) + return [self.get_previous_speed(vehID, error) for vehID in veh_id] + return self.previous_speeds.get(veh_id, 0) - def old_speed(self, veh_id, error=-1001): + def get_speed(self, veh_id, error=-1001): """See parent class.""" if isinstance(veh_id, (list, np.ndarray)): - return [self.old_speed(vehID, error) for vehID in veh_id] + return [self.get_speed(vehID, error) for vehID in veh_id] return self.__sumo_obs.get(veh_id, {}).get(tc.VAR_SPEED, error) def get_default_speed(self, veh_id, error=-1001): @@ -683,6 +722,7 @@ def get_lane_followers(self, veh_id, error=None): def _multi_lane_headways(self): """Compute multi-lane data for all vehicles. + This includes the lane leaders/followers/headways/tailways/ leader velocity/follower velocity for all vehicles in the network. @@ -720,7 +760,7 @@ def _multi_lane_headways(self): for lane in range(max_lanes): edge_dict[edge][lane].sort(key=lambda x: x[1]) - for veh_id in self.get_rl_ids(): + for veh_id in self.get_ids(): # collect the lane leaders, followers, headways, and tailways for # each vehicle edge = self.get_edge(veh_id) @@ -748,6 +788,7 @@ def _multi_lane_headways(self): def _multi_lane_headways_util(self, veh_id, edge_dict, num_edges): """Compute multi-lane data for the specified vehicle. + Parameters ---------- veh_id : str @@ -756,6 +797,7 @@ def _multi_lane_headways_util(self, veh_id, edge_dict, num_edges): Key = Edge name Index = lane index Element = list sorted by position of (vehicle id, position) + Returns ------- headway : list @@ -832,9 +874,11 @@ def _multi_lane_headways_util(self, veh_id, edge_dict, num_edges): def _next_edge_leaders(self, veh_id, edge_dict, lane, num_edges): """Search for leaders in the next edge. + Looks to the edges/junctions in front of the vehicle's current edge for potential leaders. This is currently done by only looking one edge/junction forwards. + Returns ------- headway : float @@ -875,9 +919,11 @@ def _next_edge_leaders(self, veh_id, edge_dict, lane, num_edges): def _prev_edge_followers(self, veh_id, edge_dict, lane, num_edges): """Search for followers in the previous edge. + Looks to the edges/junctions behind the vehicle's current edge for potential followers. This is currently done by only looking one edge/junction backwards. + Returns ------- tailway : float @@ -957,7 +1003,7 @@ def apply_lane_change(self, veh_ids, direction): # perform the requested lane action action in TraCI if target_lane != this_lane: self.kernel_api.vehicle.changeLane( - veh_id, int(target_lane), 100000) + veh_id, int(target_lane), self.sim_step) if veh_id in self.get_rl_ids(): self.prev_last_lc[veh_id] = \ @@ -977,6 +1023,8 @@ def choose_routes(self, veh_ids, route_choices): def get_x_by_id(self, veh_id): """See parent class.""" + if isinstance(veh_id, (list, np.ndarray)): + return [self.get_x_by_id(vehID) for vehID in veh_id] if self.get_edge(veh_id) == '': # occurs when a vehicle crashes is teleported for some other reason return 0. @@ -985,6 +1033,7 @@ def get_x_by_id(self, veh_id): def update_vehicle_colors(self): """See parent class. + The colors of all vehicles are updated as follows: - red: autonomous (rl) vehicles - white: unobserved human-driven vehicles @@ -992,25 +1041,54 @@ def update_vehicle_colors(self): """ for veh_id in self.get_rl_ids(): try: - # color rl vehicles red - self.set_color(veh_id=veh_id, color=RED) + # If vehicle is already being colored via argument to vehicles.add(), don't re-color it. + if self._force_color_update or 'color' not in \ + self.type_parameters[self.get_type(veh_id)]: + # color rl vehicles red + self.set_color(veh_id=veh_id, color=RED) except (FatalTraCIError, TraCIException) as e: print('Error when updating rl vehicle colors:', e) # color vehicles white if not observed and cyan if observed for veh_id in self.get_human_ids(): try: - color = CYAN if veh_id in self.get_observed_ids() else WHITE - self.set_color(veh_id=veh_id, color=color) + # If vehicle is already being colored via argument to vehicles.add(), don't re-color it. + if self._force_color_update or 'color' not in \ + self.type_parameters[self.get_type(veh_id)]: + self.set_color(veh_id=veh_id, color=color) + except (FatalTraCIError, TraCIException) as e: + print('Error when updating human vehicle colors:', e) + + for veh_id in self.get_ids(): + try: + if 'av' in veh_id: + color = RED + # If vehicle is already being colored via argument to vehicles.add(), don't re-color it. + if self._force_color_update or 'color' not in \ + self.type_parameters[self.get_type(veh_id)]: + self.set_color(veh_id=veh_id, color=color) except (FatalTraCIError, TraCIException) as e: print('Error when updating human vehicle colors:', e) + # color vehicles by speed if desired + if self._color_by_speed: + max_speed = self.master_kernel.network.max_speed() + speed_ranges = np.linspace(0, max_speed, STEPS) + for veh_id in self.get_ids(): + veh_speed = self.get_speed(veh_id) + bin_index = np.digitize(veh_speed, speed_ranges) + # If vehicle is already being colored via argument to vehicles.add(), don't re-color it. + if self._force_color_update or 'color' not in \ + self.type_parameters[self.get_type(veh_id)]: + self.set_color(veh_id=veh_id, color=color_bins[bin_index]) + # clear the list of observed vehicles for veh_id in self.get_observed_ids(): self.remove_observed(veh_id) def get_color(self, veh_id): """See parent class. + This does not pass the last term (i.e. transparency). """ r, g, b, t = self.kernel_api.vehicle.getColor(veh_id) @@ -1018,12 +1096,12 @@ def get_color(self, veh_id): def set_color(self, veh_id, color): """See parent class. + The last term for sumo (transparency) is set to 255. """ - if self._color_vehicles: - r, g, b = color - self.kernel_api.vehicle.setColor( - vehID=veh_id, color=(r, g, b, 255)) + r, g, b = color + self.kernel_api.vehicle.setColor( + vehID=veh_id, color=(r, g, b, 255)) def add(self, veh_id, type_id, edge, pos, lane, speed): """See parent class.""" From 32527f805a587dfc821b4f3ea845d6f9ebf7e9fb Mon Sep 17 00:00:00 2001 From: liljonnystyle Date: Thu, 21 May 2020 23:02:26 -0700 Subject: [PATCH 03/60] revert some inadvertent changes --- flow/core/kernel/vehicle/traci.py | 1 + 1 file changed, 1 insertion(+) diff --git a/flow/core/kernel/vehicle/traci.py b/flow/core/kernel/vehicle/traci.py index 78ae17775..7acaa0c43 100644 --- a/flow/core/kernel/vehicle/traci.py +++ b/flow/core/kernel/vehicle/traci.py @@ -1052,6 +1052,7 @@ def update_vehicle_colors(self): # color vehicles white if not observed and cyan if observed for veh_id in self.get_human_ids(): try: + color = CYAN if veh_id in self.get_observed_ids() else WHITE # If vehicle is already being colored via argument to vehicles.add(), don't re-color it. if self._force_color_update or 'color' not in \ self.type_parameters[self.get_type(veh_id)]: From 1aeb97d9be915f558ec3025f861e0283e4610319 Mon Sep 17 00:00:00 2001 From: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> Date: Tue, 26 May 2020 23:55:40 +0800 Subject: [PATCH 04/60] energy.py changed to base_energy.py This python file describes the base energy file which will serve as the parent class of the power demand model and toyota energy models. --- flow/core/kernel/base_energy.py | 30 ++++++++ flow/core/kernel/energy.py | 119 -------------------------------- 2 files changed, 30 insertions(+), 119 deletions(-) create mode 100644 flow/core/kernel/base_energy.py delete mode 100644 flow/core/kernel/energy.py diff --git a/flow/core/kernel/base_energy.py b/flow/core/kernel/base_energy.py new file mode 100644 index 000000000..fe2a6ebd1 --- /dev/null +++ b/flow/core/kernel/base_energy.py @@ -0,0 +1,30 @@ +import dill as pickle +import boto3 +import botocore +import math +import random +import statistics +import numpy as np +from scipy.interpolate import interp1d +from collections import namedtuple +from abc import ABCMeta, abstractmethod + + +class BaseEnergyModel(metaclass=ABCMeta): + """Base energy model class. + + Calculate the instantanoeus power consumption of a vehicle in + the network. It returns the power in Watts regardless of the + vehicle type: whether EV or Combustion Engine, Toyota Prius or Tacoma + or non-Toyota vehicles. Non-Toyota vehicles are set by deafult + to be an averaged-size vehicle. + + """ + + def __init__(self,kernel): + self.vehicle = vehicle + + @abstractmethod + def get_energy(self, veh_id,model_param,grade): + #return self.calc_energy(veh_id) + pass diff --git a/flow/core/kernel/energy.py b/flow/core/kernel/energy.py deleted file mode 100644 index 0e2189073..000000000 --- a/flow/core/kernel/energy.py +++ /dev/null @@ -1,119 +0,0 @@ -import dill as pickle -import boto3 -import botocore -import math -import random -import statistics -import numpy as np -from scipy.interpolate import interp1d -from collections import namedtuple - - -class EnergyModel(): - """Base energy model class.""" - - def __init__(self,kernel): - self.vehicle = vehicle - - def get_energy(self, veh_id): - #return self.calc_energy(veh_id) - pass - - -class PowerDemandModel(EnergyModel): - - def __init__(self,kernel): - self.k = kernel - - """Calculate power consumption of a vehicle. - Assumes vehicle is an average sized vehicle. - The power calculated here is the lower bound of the actual power consumed - by a vehicle. - M mass of average sized vehicle (kg) - g gravitational acceleration (m/s^2) - Cr rolling resistance coefficient - Ca aerodynamic drag coefficient - rho air density (kg/m^3) - A vehicle cross sectional area (m^2) - """ - g = 9.8 - rho = 1.225 - - if vtype == 'average': - M = 1200 - Cr = 0.005 - Ca = 0.3 - A = 2.6 - - def get_energy(self, veh_id) - # if we know the constants for other vehicle types, we may put them here as well - speed = self.k.get_speed(veh_id) - if veh_id in self.k.old_speeds: - old_speed = self.k.old_speeds[veh_id] - else: - old_speed = speed - - accel = (speed - old_speed)/0.1 - power = M * speed * accel + M * g * Cr * speed + 0.5 * rho * A * Ca * speed ** 3 - - return power - - -class ToyotaPriusEVModel(EnergyModel): - - def __init__(self,kernel): - self.k = kernel - - # download file from s3 bucket - s3 = boto3.client('s3') - s3.download_file('toyota.restricted','prius_test.pkl','PriusEVModel.pkl') #move to init - with open('PriusEVModel.pkl','rb')as file: - prius_energy = pickle.load(file) #self.prius_energy - # delete pickle file - - def get_energy(self): - - speed = self.k.get_speed(veh_id) - - if veh_id in self.k.old_speeds: - old_speed = self.k.old_speeds[veh_id] - else: - old_speed = speed - - accel = (speed - old_speed)/0.1 - - old_soc = self.k.get_soc(veh_id) - grade = 0 - - socdot = prius_energy(old_soc,speed,accel,grade) - new_soc = old_soc + socdot*0.1 - - return new_soc # return current soc level - - -class ToyotaTacomaModel(EnergyModel): - - def __init__(self,kernel): - self.k = kernel - - # download file from s3 bucket - s3 = boto3.client('s3') - s3.download_file('toyota.restricted','tacoma_test.pkl','TacomaModel.pkl') - - with open('TacomaModel.pkl','rb')as file: - tacoma_energy = pickle.load(file) - - - def get_energy(self,speed,accel,grade): - - speed = self.k.get_speed(veh_id) - - if veh_id in self.k.old_speeds: - old_speed = self.k.old_speeds[veh_id] - else: - old_speed = speed - - accel = (speed - old_speed)/0.1 - grade = 0 - - return tacoma_energy(speed,accel,grade) # returns instantanoes fuel consumption From eae12b7f0e47f52780773108064bf9767923554e Mon Sep 17 00:00:00 2001 From: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> Date: Wed, 27 May 2020 00:07:23 +0800 Subject: [PATCH 05/60] update traci.py applied comments from from previous PR. --- flow/core/kernel/vehicle/traci.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flow/core/kernel/vehicle/traci.py b/flow/core/kernel/vehicle/traci.py index 01e562b6e..9343b2124 100644 --- a/flow/core/kernel/vehicle/traci.py +++ b/flow/core/kernel/vehicle/traci.py @@ -13,7 +13,7 @@ from flow.controllers.car_following_models import SimCarFollowingController from flow.controllers.rlcontroller import RLController from flow.controllers.lane_change_controllers import SimLaneChangeController -from flow.core.kernel.energy import Energy +from flow.core.kernel.base_energy import BaseEnergyModel from bisect import bisect_left import itertools from copy import deepcopy @@ -284,7 +284,7 @@ def update(self, reset): # make sure the rl vehicle list is still sorted self.__rl_ids.sort() - self.energy.calc_energy_level(self) + #self.base_energy.get_energy(self) def _add_departed(self, veh_id, veh_type): """Add a vehicle that entered the network from an inflow or reset. From 4106217b1bcdb5608621b8faf3b3ef57dbdd9363 Mon Sep 17 00:00:00 2001 From: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> Date: Wed, 27 May 2020 00:12:16 +0800 Subject: [PATCH 06/60] Energy models for power_demand and toyota These are child classes of the base_energy class. --- flow/core/kernel/power_demand.py | 60 ++++++++++++++++++++++++++ flow/core/kernel/toyota_energy.py | 71 +++++++++++++++++++++++++++++++ 2 files changed, 131 insertions(+) create mode 100644 flow/core/kernel/power_demand.py create mode 100644 flow/core/kernel/toyota_energy.py diff --git a/flow/core/kernel/power_demand.py b/flow/core/kernel/power_demand.py new file mode 100644 index 000000000..76f42ec8b --- /dev/null +++ b/flow/core/kernel/power_demand.py @@ -0,0 +1,60 @@ +import math +import random +import statistics +import numpy as np +from scipy.interpolate import interp1d +from collections import namedtuple +from flow.energy.base_energy import BaseEnergyModel + +class PowerDemandModel(BaseEnergyModel): + """Calculate power consumption of a vehicle. + Assumes vehicle is an average sized vehicle. + The power calculated here is the lower bound of the + actual power consumed by the vehicle + """ + + def __init__(self,kernel): + self.k = kernel + self.g = 9.8 + self.rho_air = 1.225 + self.Mass = 1200 + self.rolling_res_coeff = 0.005 + self.aerodymnamic_drag_coeff = 0.3 + self.cross_A = 2.6 + + def get_energy(self, veh_id, grade): + pass + + +class PDM_CEV(PowerDemandModel): + + # Power Demand Model for a combustion engine vehicle + + def get_energy(self, veh_id, grade): + speed = self.k.get_speed(veh_id) + if veh_id in self.k.previous_speeds: + old_speed = self.k.previous_speeds[veh_id] + else: + old_speed = speed + + accel = (speed - old_speed)/self.sim_step + power = self.Mass*speed*(accel+self.g*math.sin(grade))+self.Mass*self.g*self.rolling_res_coeff*speed+0.5*self.rho_air*self.cross_A*self.aerodymnamic_drag_coeff*speed**3 + + return power + +class PDM_EV(PowerDemandModel): + + # Power Demand Model for an electric vehicle + + def get_energy(self, veh_id, grade): + speed = self.k.get_speed(veh_id) + if veh_id in self.k.previous_speeds: + old_speed = self.k.previous_speeds[veh_id] + else: + old_speed = speed + + accel = (speed - old_speed)/self.sim_step + power = self.Mass*speed*(accel+self.g*math.sin(grade))+self.Mass*self.g*self.rolling_res_coeff*speed+0.5*self.rho_air*self.cross_A*self.aerodymnamic_drag_coeff*speed**3 + power = max(0,power) + + return power diff --git a/flow/core/kernel/toyota_energy.py b/flow/core/kernel/toyota_energy.py new file mode 100644 index 000000000..404a3b339 --- /dev/null +++ b/flow/core/kernel/toyota_energy.py @@ -0,0 +1,71 @@ +import dill as pickle +import boto3 +import botocore +import math +import random +import statistics +import numpy as np +from scipy.interpolate import interp1d +from collections import namedtuple +from flow.energy.base_energy import BaseEnergyModel +import os + +class ToyotaModel(BaseEnergyModel): + + def __init__(self,kernel): + self.k = kernel + + # download file from s3 bucket + s3 = boto3.client('s3') + s3.download_file('toyota.restricted',filename,'file.pkl') #move to init + with open('file.pkl','rb')as file: + self.toyota_energy = pickle.load(file) #self.prius_energy + # delete pickle file + os.remove(file.pkl) + + def get_energy(self,veh_id,soc,grade): + pass + + +class prius_energy(ToyotaModel): + + super.__init__(kernel,filename = 'prius_test.pkl') + + def get_energy(self,veh_id,soc,grade): + + speed = self.k.get_speed(veh_id) + + if veh_id in self.k.previous_speeds: + old_speed = self.k.previous_speeds[veh_id] + else: + old_speed = speed + + accel = (speed - old_speed)/self.sim_step + + old_soc = self.k.get_soc(veh_id) + grade = 0 + + socdot = self.toyota_energy(old_soc,speed,accel,grade) + + return socdot + +class tacoma_energy(ToyotaModel): + + super.__init__(kernel,filename = 'tacoma_test.pkl') + + def get_energy(self,veh_id,grade, sim_step): + + speed = self.k.get_speed(veh_id) + + if veh_id in self.k.previous_speeds: + old_speed = self.k.previous_speeds[veh_id] + else: + old_speed = speed + + accel = (speed - old_speed)/self.sim_step + grade = 0 + + fc = tacoma_test(speed,accel,grade) # returns instantanoes fuel consumption + return fc + + From 3e849631fd5c85ed2c8f8d465137f0dc35626ad6 Mon Sep 17 00:00:00 2001 From: liljonnystyle Date: Tue, 26 May 2020 14:55:40 -0700 Subject: [PATCH 07/60] fix typo --- flow/core/kernel/base_energy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flow/core/kernel/base_energy.py b/flow/core/kernel/base_energy.py index fe2a6ebd1..b7dc35748 100644 --- a/flow/core/kernel/base_energy.py +++ b/flow/core/kernel/base_energy.py @@ -16,7 +16,7 @@ class BaseEnergyModel(metaclass=ABCMeta): Calculate the instantanoeus power consumption of a vehicle in the network. It returns the power in Watts regardless of the vehicle type: whether EV or Combustion Engine, Toyota Prius or Tacoma - or non-Toyota vehicles. Non-Toyota vehicles are set by deafult + or non-Toyota vehicles. Non-Toyota vehicles are set by default to be an averaged-size vehicle. """ From 5398d2191dea100474af8442a6ed3a83fe462caa Mon Sep 17 00:00:00 2001 From: liljonnystyle Date: Tue, 26 May 2020 14:58:15 -0700 Subject: [PATCH 08/60] rename get method --- flow/core/kernel/base_energy.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/flow/core/kernel/base_energy.py b/flow/core/kernel/base_energy.py index b7dc35748..95f9811ad 100644 --- a/flow/core/kernel/base_energy.py +++ b/flow/core/kernel/base_energy.py @@ -13,18 +13,20 @@ class BaseEnergyModel(metaclass=ABCMeta): """Base energy model class. - Calculate the instantanoeus power consumption of a vehicle in + Calculate the instantaneous power consumption of a vehicle in the network. It returns the power in Watts regardless of the vehicle type: whether EV or Combustion Engine, Toyota Prius or Tacoma or non-Toyota vehicles. Non-Toyota vehicles are set by default to be an averaged-size vehicle. - """ def __init__(self,kernel): self.vehicle = vehicle @abstractmethod - def get_energy(self, veh_id,model_param,grade): - #return self.calc_energy(veh_id) + def get_instantaneous_power(self, veh_id, model_param, grade): + """Calculate the instantaneous power consumption of a vehicle. + + Must be implemented by child classes. + """ pass From 5558af0d3cbd303821fb14f271ab873b08c16383 Mon Sep 17 00:00:00 2001 From: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> Date: Sat, 30 May 2020 07:09:04 +0800 Subject: [PATCH 09/60] Update base_energy.py Some imports removed --- flow/core/kernel/base_energy.py | 9 --------- 1 file changed, 9 deletions(-) diff --git a/flow/core/kernel/base_energy.py b/flow/core/kernel/base_energy.py index 95f9811ad..5a32b56ac 100644 --- a/flow/core/kernel/base_energy.py +++ b/flow/core/kernel/base_energy.py @@ -1,12 +1,3 @@ -import dill as pickle -import boto3 -import botocore -import math -import random -import statistics -import numpy as np -from scipy.interpolate import interp1d -from collections import namedtuple from abc import ABCMeta, abstractmethod From f82dfb00cb225859112fa2e38d5affaad2929b15 Mon Sep 17 00:00:00 2001 From: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> Date: Sat, 30 May 2020 07:10:03 +0800 Subject: [PATCH 10/60] Update base_energy.py added space after all commas --- flow/core/kernel/base_energy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flow/core/kernel/base_energy.py b/flow/core/kernel/base_energy.py index 5a32b56ac..c621564e1 100644 --- a/flow/core/kernel/base_energy.py +++ b/flow/core/kernel/base_energy.py @@ -11,7 +11,7 @@ class BaseEnergyModel(metaclass=ABCMeta): to be an averaged-size vehicle. """ - def __init__(self,kernel): + def __init__(self, kernel): self.vehicle = vehicle @abstractmethod From 3ad43b4502dec12df4643849ced4c754e2f8f0c9 Mon Sep 17 00:00:00 2001 From: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> Date: Sat, 30 May 2020 07:33:57 +0800 Subject: [PATCH 11/60] Update power_demand.py --- flow/core/kernel/power_demand.py | 53 +++++++++++++++++--------------- 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/flow/core/kernel/power_demand.py b/flow/core/kernel/power_demand.py index 76f42ec8b..14840c093 100644 --- a/flow/core/kernel/power_demand.py +++ b/flow/core/kernel/power_demand.py @@ -5,8 +5,9 @@ from scipy.interpolate import interp1d from collections import namedtuple from flow.energy.base_energy import BaseEnergyModel +from abc import ABCMeta, abstractmethod -class PowerDemandModel(BaseEnergyModel): +class PowerDemandModel(BaseEnergyModel, metaclass=ABCMeta): """Calculate power consumption of a vehicle. Assumes vehicle is an average sized vehicle. The power calculated here is the lower bound of the @@ -15,22 +16,15 @@ class PowerDemandModel(BaseEnergyModel): def __init__(self,kernel): self.k = kernel - self.g = 9.8 + self.g = 9.81 self.rho_air = 1.225 - self.Mass = 1200 + self.mass = 1200 self.rolling_res_coeff = 0.005 self.aerodymnamic_drag_coeff = 0.3 - self.cross_A = 2.6 + self.cross_area = 2.6 + self.gamma = 1 - def get_energy(self, veh_id, grade): - pass - - -class PDM_CEV(PowerDemandModel): - - # Power Demand Model for a combustion engine vehicle - - def get_energy(self, veh_id, grade): + def calculate_power(self, veh_id, grade): speed = self.k.get_speed(veh_id) if veh_id in self.k.previous_speeds: old_speed = self.k.previous_speeds[veh_id] @@ -38,23 +32,32 @@ def get_energy(self, veh_id, grade): old_speed = speed accel = (speed - old_speed)/self.sim_step - power = self.Mass*speed*(accel+self.g*math.sin(grade))+self.Mass*self.g*self.rolling_res_coeff*speed+0.5*self.rho_air*self.cross_A*self.aerodymnamic_drag_coeff*speed**3 + accel_slope_forces = self.mass * speed * ( + (np.heaviside(accel, 0.5) * (1 - self.gamma) + self.gamma)) * accel + + self.g * math.sin(grade)) + rolling_friction = self.mass * self.g * self.rolling_res_coeff * speed + air_drag = 0.5 * self.rho_air * self.cross_area * self.aerodynamic_drag_coeff * speed**3 + power = accel_slope_forces + rolling_friction + air_drag + return power + + @abstractmethod + def get_instantaneous_power(self, veh_id, grade): + pass + +class PDMCombustionEngine(PowerDemandModel): + + # Power Demand Model for a combustion engine vehicle + + def get_instantaneous_power(self, veh_id, grade): + power = self.calculate_power return power -class PDM_EV(PowerDemandModel): +class PDMElectric(PowerDemandModel): # Power Demand Model for an electric vehicle - def get_energy(self, veh_id, grade): - speed = self.k.get_speed(veh_id) - if veh_id in self.k.previous_speeds: - old_speed = self.k.previous_speeds[veh_id] - else: - old_speed = speed - - accel = (speed - old_speed)/self.sim_step - power = self.Mass*speed*(accel+self.g*math.sin(grade))+self.Mass*self.g*self.rolling_res_coeff*speed+0.5*self.rho_air*self.cross_A*self.aerodymnamic_drag_coeff*speed**3 - power = max(0,power) + def get_instantaneous_power(self, veh_id, grade): + power = max(0,self.calculate_power) return power From be2673bc2527eeb1d288a92a67ce721f091f6b77 Mon Sep 17 00:00:00 2001 From: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> Date: Sat, 30 May 2020 07:42:05 +0800 Subject: [PATCH 12/60] Update toyota_energy.py --- flow/core/kernel/toyota_energy.py | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/flow/core/kernel/toyota_energy.py b/flow/core/kernel/toyota_energy.py index 404a3b339..3b0be934f 100644 --- a/flow/core/kernel/toyota_energy.py +++ b/flow/core/kernel/toyota_energy.py @@ -12,26 +12,27 @@ class ToyotaModel(BaseEnergyModel): - def __init__(self,kernel): + def __init__(self, kernel, filename=None): self.k = kernel # download file from s3 bucket s3 = boto3.client('s3') - s3.download_file('toyota.restricted',filename,'file.pkl') #move to init - with open('file.pkl','rb')as file: + s3.download_file('toyota.restricted', filename,'file.pkl') #move to init + with open('file.pkl','rb') as file: self.toyota_energy = pickle.load(file) #self.prius_energy # delete pickle file os.remove(file.pkl) - def get_energy(self,veh_id,soc,grade): + def get_energy(self, veh_id, soc, grade): pass -class prius_energy(ToyotaModel): +class PriusEnergy(ToyotaModel): + + def __init__(self, kernel): + super(PriusEnergy, self).__init__(kernel, filename = 'prius_test.pkl') - super.__init__(kernel,filename = 'prius_test.pkl') - - def get_energy(self,veh_id,soc,grade): + def get_instantaneous_power(self, veh_id, soc, grade): speed = self.k.get_speed(veh_id) @@ -45,15 +46,16 @@ def get_energy(self,veh_id,soc,grade): old_soc = self.k.get_soc(veh_id) grade = 0 - socdot = self.toyota_energy(old_soc,speed,accel,grade) + socdot = self.toyota_energy(old_soc, speed, accel, grade) return socdot -class tacoma_energy(ToyotaModel): +class TacomaEnergy(ToyotaModel): - super.__init__(kernel,filename = 'tacoma_test.pkl') + def __init__(self, kernel): + super(PriusEnergy, self).__init__(kernel, filename = 'tacoma_test.pkl') - def get_energy(self,veh_id,grade, sim_step): + def get_instantaneous_power(self, veh_id, grade): speed = self.k.get_speed(veh_id) @@ -65,7 +67,7 @@ def get_energy(self,veh_id,grade, sim_step): accel = (speed - old_speed)/self.sim_step grade = 0 - fc = tacoma_test(speed,accel,grade) # returns instantanoes fuel consumption + fc = self.toyota_energy(speed,accel,grade) # returns instantanoes fuel consumption return fc From 21047646bffa7ebfb8f20010f7c5d0356477f100 Mon Sep 17 00:00:00 2001 From: liljonnystyle Date: Sat, 30 May 2020 01:21:39 -0700 Subject: [PATCH 13/60] add get_fuel_consumption() back this code is actually unrelated to the energy classes being implemented, but rather the fuel consumption from SUMO --- flow/core/kernel/vehicle/traci.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/flow/core/kernel/vehicle/traci.py b/flow/core/kernel/vehicle/traci.py index 27d27d387..078848c7d 100644 --- a/flow/core/kernel/vehicle/traci.py +++ b/flow/core/kernel/vehicle/traci.py @@ -558,6 +558,13 @@ def get_num_not_departed(self): """See parent class.""" return self.num_not_departed + def get_fuel_consumption(self, veh_id, error=-1001): + """Return fuel consumption in gallons/s.""" + ml_to_gallons = 0.000264172 + if isinstance(veh_id, (list, np.ndarray)): + return [self.get_fuel_consumption(vehID, error) for vehID in veh_id] + return self.__sumo_obs.get(veh_id, {}).get(tc.VAR_FUELCONSUMPTION, error) * ml_to_gallons + def get_previous_speed(self, veh_id, error=-1001): """See parent class.""" if isinstance(veh_id, (list, np.ndarray)): From 372335bc0995e4d158cb90466d19ab1315034b79 Mon Sep 17 00:00:00 2001 From: liljonnystyle Date: Sat, 30 May 2020 01:22:48 -0700 Subject: [PATCH 14/60] remove extra whitespace --- flow/core/kernel/vehicle/traci.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flow/core/kernel/vehicle/traci.py b/flow/core/kernel/vehicle/traci.py index 078848c7d..eb874b208 100644 --- a/flow/core/kernel/vehicle/traci.py +++ b/flow/core/kernel/vehicle/traci.py @@ -564,7 +564,7 @@ def get_fuel_consumption(self, veh_id, error=-1001): if isinstance(veh_id, (list, np.ndarray)): return [self.get_fuel_consumption(vehID, error) for vehID in veh_id] return self.__sumo_obs.get(veh_id, {}).get(tc.VAR_FUELCONSUMPTION, error) * ml_to_gallons - + def get_previous_speed(self, veh_id, error=-1001): """See parent class.""" if isinstance(veh_id, (list, np.ndarray)): From f747be3c78c9f7a575432b8b492c443a3915c601 Mon Sep 17 00:00:00 2001 From: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> Date: Mon, 8 Jun 2020 00:39:55 +0800 Subject: [PATCH 15/60] Update base_energy.py --- flow/core/kernel/base_energy.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flow/core/kernel/base_energy.py b/flow/core/kernel/base_energy.py index c621564e1..cf97a1b82 100644 --- a/flow/core/kernel/base_energy.py +++ b/flow/core/kernel/base_energy.py @@ -12,10 +12,10 @@ class BaseEnergyModel(metaclass=ABCMeta): """ def __init__(self, kernel): - self.vehicle = vehicle + self.k.env.vehicle = vehicle @abstractmethod - def get_instantaneous_power(self, veh_id, model_param, grade): + def get_instantaneous_power(self): """Calculate the instantaneous power consumption of a vehicle. Must be implemented by child classes. From 9ae25785efed7a74e1b2991a7e2ba88f24199ebb Mon Sep 17 00:00:00 2001 From: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> Date: Mon, 8 Jun 2020 00:42:48 +0800 Subject: [PATCH 16/60] Update power_demand.py --- flow/core/kernel/power_demand.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/flow/core/kernel/power_demand.py b/flow/core/kernel/power_demand.py index 14840c093..9987ebb41 100644 --- a/flow/core/kernel/power_demand.py +++ b/flow/core/kernel/power_demand.py @@ -16,6 +16,7 @@ class PowerDemandModel(BaseEnergyModel, metaclass=ABCMeta): def __init__(self,kernel): self.k = kernel + self.k.env.vehicle = vehicle self.g = 9.81 self.rho_air = 1.225 self.mass = 1200 @@ -24,14 +25,14 @@ def __init__(self,kernel): self.cross_area = 2.6 self.gamma = 1 - def calculate_power(self, veh_id, grade): - speed = self.k.get_speed(veh_id) - if veh_id in self.k.previous_speeds: - old_speed = self.k.previous_speeds[veh_id] + def calculate_power(self): + speed = self.k.env.get_speed(veh_id) + if veh_id in self.k.env.previous_speeds: + old_speed = self.k.env.previous_speeds[veh_id] else: old_speed = speed - accel = (speed - old_speed)/self.sim_step + accel = (speed - old_speed)/self.k.env.sim_step accel_slope_forces = self.mass * speed * ( (np.heaviside(accel, 0.5) * (1 - self.gamma) + self.gamma)) * accel + self.g * math.sin(grade)) From 4461995aacb3b80423aeb511d84715dec3cd2906 Mon Sep 17 00:00:00 2001 From: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> Date: Mon, 8 Jun 2020 00:45:54 +0800 Subject: [PATCH 17/60] Update toyota_energy.py --- flow/core/kernel/toyota_energy.py | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/flow/core/kernel/toyota_energy.py b/flow/core/kernel/toyota_energy.py index 3b0be934f..6faa9d360 100644 --- a/flow/core/kernel/toyota_energy.py +++ b/flow/core/kernel/toyota_energy.py @@ -9,11 +9,13 @@ from collections import namedtuple from flow.energy.base_energy import BaseEnergyModel import os +from abc import ABCMeta, abstractmethod class ToyotaModel(BaseEnergyModel): def __init__(self, kernel, filename=None): self.k = kernel + self.k.env.vehicle = vehicle # download file from s3 bucket s3 = boto3.client('s3') @@ -22,8 +24,9 @@ def __init__(self, kernel, filename=None): self.toyota_energy = pickle.load(file) #self.prius_energy # delete pickle file os.remove(file.pkl) - - def get_energy(self, veh_id, soc, grade): + + @abstractmethod + def get_instantaneous_power(self): pass @@ -32,18 +35,18 @@ class PriusEnergy(ToyotaModel): def __init__(self, kernel): super(PriusEnergy, self).__init__(kernel, filename = 'prius_test.pkl') - def get_instantaneous_power(self, veh_id, soc, grade): + def get_instantaneous_power(self: - speed = self.k.get_speed(veh_id) + speed = self.k.env.get_speed(veh_id) - if veh_id in self.k.previous_speeds: - old_speed = self.k.previous_speeds[veh_id] + if veh_id in self.k.env.previous_speeds: + old_speed = self.k.env.previous_speeds[veh_id] else: old_speed = speed - accel = (speed - old_speed)/self.sim_step + accel = (speed - old_speed)/self.k.env.sim_step - old_soc = self.k.get_soc(veh_id) + old_soc = self.k.env.get_soc(veh_id) grade = 0 socdot = self.toyota_energy(old_soc, speed, accel, grade) @@ -55,16 +58,16 @@ class TacomaEnergy(ToyotaModel): def __init__(self, kernel): super(PriusEnergy, self).__init__(kernel, filename = 'tacoma_test.pkl') - def get_instantaneous_power(self, veh_id, grade): + def get_instantaneous_power(self): - speed = self.k.get_speed(veh_id) + speed = self.k.env.get_speed(veh_id) - if veh_id in self.k.previous_speeds: - old_speed = self.k.previous_speeds[veh_id] + if veh_id in self.k.env.previous_speeds: + old_speed = self.k.env.previous_speeds[veh_id] else: old_speed = speed - accel = (speed - old_speed)/self.sim_step + accel = (speed - old_speed)/self.k.env.sim_step grade = 0 fc = self.toyota_energy(speed,accel,grade) # returns instantanoes fuel consumption From 23688b2a39786139b8a9f994f2c1393c1d0549f1 Mon Sep 17 00:00:00 2001 From: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> Date: Mon, 15 Jun 2020 00:26:27 +0800 Subject: [PATCH 18/60] Update base_energy.py instantiate vehicle to have all the properties of VehicleParams() --- flow/core/kernel/base_energy.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/flow/core/kernel/base_energy.py b/flow/core/kernel/base_energy.py index cf97a1b82..8b91f6d41 100644 --- a/flow/core/kernel/base_energy.py +++ b/flow/core/kernel/base_energy.py @@ -1,4 +1,5 @@ from abc import ABCMeta, abstractmethod +from flow.core.params import VehicleParams class BaseEnergyModel(metaclass=ABCMeta): @@ -11,8 +12,8 @@ class BaseEnergyModel(metaclass=ABCMeta): to be an averaged-size vehicle. """ - def __init__(self, kernel): - self.k.env.vehicle = vehicle + def __init__(self): + vehicle = VehicleParams() @abstractmethod def get_instantaneous_power(self): From 0a0de585dbc93aef40b54bae371d483c76238591 Mon Sep 17 00:00:00 2001 From: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> Date: Mon, 15 Jun 2020 02:53:38 +0800 Subject: [PATCH 19/60] Update power_demand.py --- flow/core/kernel/power_demand.py | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/flow/core/kernel/power_demand.py b/flow/core/kernel/power_demand.py index 9987ebb41..83a7e0e88 100644 --- a/flow/core/kernel/power_demand.py +++ b/flow/core/kernel/power_demand.py @@ -4,7 +4,7 @@ import numpy as np from scipy.interpolate import interp1d from collections import namedtuple -from flow.energy.base_energy import BaseEnergyModel +from flow.core.kernel.base_energy import BaseEnergyModel from abc import ABCMeta, abstractmethod class PowerDemandModel(BaseEnergyModel, metaclass=ABCMeta): @@ -16,33 +16,23 @@ class PowerDemandModel(BaseEnergyModel, metaclass=ABCMeta): def __init__(self,kernel): self.k = kernel - self.k.env.vehicle = vehicle self.g = 9.81 self.rho_air = 1.225 self.mass = 1200 self.rolling_res_coeff = 0.005 - self.aerodymnamic_drag_coeff = 0.3 + self.aerodynamic_drag_coeff = 0.3 self.cross_area = 2.6 self.gamma = 1 - def calculate_power(self): - speed = self.k.env.get_speed(veh_id) - if veh_id in self.k.env.previous_speeds: - old_speed = self.k.env.previous_speeds[veh_id] - else: - old_speed = speed - - accel = (speed - old_speed)/self.k.env.sim_step - accel_slope_forces = self.mass * speed * ( - (np.heaviside(accel, 0.5) * (1 - self.gamma) + self.gamma)) * accel - + self.g * math.sin(grade)) + def calculate_power(self, accel, speed, grade): + accel_slope_forces = self.mass * speed * ((np.heaviside(accel, 0.5) * (1 - self.gamma) + self.gamma)) * accel + self.g * math.sin(grade) rolling_friction = self.mass * self.g * self.rolling_res_coeff * speed air_drag = 0.5 * self.rho_air * self.cross_area * self.aerodynamic_drag_coeff * speed**3 power = accel_slope_forces + rolling_friction + air_drag return power @abstractmethod - def get_instantaneous_power(self, veh_id, grade): + def get_instantaneous_power(self, parameter, accel, speed, grade): pass @@ -50,15 +40,14 @@ class PDMCombustionEngine(PowerDemandModel): # Power Demand Model for a combustion engine vehicle - def get_instantaneous_power(self, veh_id, grade): - power = self.calculate_power + def get_instantaneous_power(self, parameter, accel, speed, grade): + power = self.calculate_power(accel, speed, grade) return power class PDMElectric(PowerDemandModel): # Power Demand Model for an electric vehicle - def get_instantaneous_power(self, veh_id, grade): - power = max(0,self.calculate_power) - + def get_instantaneous_power(self, parameter, accel, speed, grade): + power = max(0,self.calculate_power(accel, speed, grade)) return power From c133fb08fbf4fdb3e5e2a585840e79cbd30015f6 Mon Sep 17 00:00:00 2001 From: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> Date: Mon, 15 Jun 2020 02:54:54 +0800 Subject: [PATCH 20/60] Update toyota_energy.py --- flow/core/kernel/toyota_energy.py | 37 +++++-------------------------- 1 file changed, 6 insertions(+), 31 deletions(-) diff --git a/flow/core/kernel/toyota_energy.py b/flow/core/kernel/toyota_energy.py index 6faa9d360..45e5db65d 100644 --- a/flow/core/kernel/toyota_energy.py +++ b/flow/core/kernel/toyota_energy.py @@ -7,7 +7,7 @@ import numpy as np from scipy.interpolate import interp1d from collections import namedtuple -from flow.energy.base_energy import BaseEnergyModel +from flow.core.kernel.base_energy import BaseEnergyModel import os from abc import ABCMeta, abstractmethod @@ -15,7 +15,6 @@ class ToyotaModel(BaseEnergyModel): def __init__(self, kernel, filename=None): self.k = kernel - self.k.env.vehicle = vehicle # download file from s3 bucket s3 = boto3.client('s3') @@ -35,42 +34,18 @@ class PriusEnergy(ToyotaModel): def __init__(self, kernel): super(PriusEnergy, self).__init__(kernel, filename = 'prius_test.pkl') - def get_instantaneous_power(self: + def get_instantaneous_power(self, parameter, accel, speed, grade): - speed = self.k.env.get_speed(veh_id) - - if veh_id in self.k.env.previous_speeds: - old_speed = self.k.env.previous_speeds[veh_id] - else: - old_speed = speed - - accel = (speed - old_speed)/self.k.env.sim_step - - old_soc = self.k.env.get_soc(veh_id) - grade = 0 - - socdot = self.toyota_energy(old_soc, speed, accel, grade) + socdot = self.toyota_energy(parameter, accel, speed, grade) return socdot class TacomaEnergy(ToyotaModel): def __init__(self, kernel): - super(PriusEnergy, self).__init__(kernel, filename = 'tacoma_test.pkl') + super(TacomaEnergy, self).__init__(kernel, filename = 'tacoma_test.pkl') - def get_instantaneous_power(self): + def get_instantaneous_power(self, parameter, accel, speed, grade): - speed = self.k.env.get_speed(veh_id) - - if veh_id in self.k.env.previous_speeds: - old_speed = self.k.env.previous_speeds[veh_id] - else: - old_speed = speed - - accel = (speed - old_speed)/self.k.env.sim_step - grade = 0 - - fc = self.toyota_energy(speed,accel,grade) # returns instantanoes fuel consumption + fc = self.toyota_energy(accel, speed, grade) # returns instantaneous fuel consumption return fc - - From 81cfba9f86604537de16e14dcb6279970fee3be6 Mon Sep 17 00:00:00 2001 From: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> Date: Mon, 15 Jun 2020 02:55:29 +0800 Subject: [PATCH 21/60] Update base_energy.py --- flow/core/kernel/base_energy.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/flow/core/kernel/base_energy.py b/flow/core/kernel/base_energy.py index 8b91f6d41..4908153ec 100644 --- a/flow/core/kernel/base_energy.py +++ b/flow/core/kernel/base_energy.py @@ -1,6 +1,4 @@ from abc import ABCMeta, abstractmethod -from flow.core.params import VehicleParams - class BaseEnergyModel(metaclass=ABCMeta): """Base energy model class. @@ -12,11 +10,11 @@ class BaseEnergyModel(metaclass=ABCMeta): to be an averaged-size vehicle. """ - def __init__(self): - vehicle = VehicleParams() + def __init__(self, kernel): + self.k = kernel @abstractmethod - def get_instantaneous_power(self): + def get_instantaneous_power(self, parameter, accel, speed, grade): """Calculate the instantaneous power consumption of a vehicle. Must be implemented by child classes. From b8d2d1238c886614e8c74dba674c45be5f83e524 Mon Sep 17 00:00:00 2001 From: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> Date: Mon, 15 Jun 2020 02:57:46 +0800 Subject: [PATCH 22/60] Update rewards.py --- flow/core/rewards.py | 49 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/flow/core/rewards.py b/flow/core/rewards.py index 1434636e6..e85c912e3 100755 --- a/flow/core/rewards.py +++ b/flow/core/rewards.py @@ -441,3 +441,52 @@ def miles_per_gallon(env, veh_ids=None, gain=.001): mpg /= 1609.0 return mpg * gain + + +def instantaneous_power(env, veh_ids=None, gain=.001): + """Calculate the instantaneous power for every simulation step specific to the vehicle type. + + The energy model used is based on the vehicle type: + veh_id = "Prius" --> energy model is PriusEnergy in flow.core.kernel.toyata_energy + veh_id = "Tacoma" --> energy model is TacomaEnergy in flow.core.kernel.toyata_energy + veh_id = "EV" --> energy model is PDMElectric in flow.core.kernel.power_demand + veh_id = "human" --> energy model is PDMCombustionEngine in flow.core.kernel.power_demand + + Parameters + ---------- + env : flow.envs.Env + the environment variable, which contains information on the current + state of the system. + veh_ids : [list] + list of veh_ids to compute the reward over + gain : float + scaling factor for the reward + """ + + if veh_ids is None: + veh_ids = env.k.vehicle.get_ids() + elif not isinstance(veh_ids, list): + veh_ids = [veh_ids] + for veh_id in veh_ids: + speed = env.k.vehicle.get_speed(veh_id) + prev_speed = env.k.vehicle.get_previous_speed(veh_id) + # negative acceleration indicates regenerative breaking for some energy models + accel = (speed - prev_speed) / env.sim_step + grade = 0 + + parameter = None + # determine which energy model to use + if veh_id is "Prius": + energy_model = env.k.PriusEnergy + initial_soc = 0.9 + parameter = initial_soc + elif veh_id is "Tacoma": + energy_model = env.k.TacomaEnergy + elif veh_id is "EV": + energy_model = env.k.PDMElectric + else: + energy_model = env.k.PDMCombustionEngine + + inst_power = energy_model.get_instantaneous_power(parameter, accel, speed, grade) + + return inst_power From d718a3312b89ef6de760175dce362ba03ea7c7d8 Mon Sep 17 00:00:00 2001 From: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> Date: Thu, 18 Jun 2020 22:05:30 +0800 Subject: [PATCH 23/60] Update params.py --- flow/core/params.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/flow/core/params.py b/flow/core/params.py index 0527b33c2..666ccc134 100755 --- a/flow/core/params.py +++ b/flow/core/params.py @@ -8,6 +8,14 @@ from flow.controllers.rlcontroller import RLController from flow.controllers.lane_change_controllers import SimLaneChangeController +# To add these after creating the forlder for energy models # (1) +""" +from flow.enermod.toyota_energy import PriusEnergy +from flow.enermod.toyota_energy import TacomaEnergy +from flow.enermod.power_demand import PDMCombustionEngine +from flow.enermod.power_demand import PDMElectric +""" + SPEED_MODES = { "aggressive": 0, @@ -270,6 +278,19 @@ def add(self, lane_change_params : flow.core.params.SumoLaneChangeParams Params object specifying attributes for Sumo lane changing model. """ + + # determine which energy model to use + if "prius" in veh_id: + energy_model = env.k.PriusEnergy.get_instantaneous_power() + elif "tacoma" in veh_id: + energy_model = env.k.TacomaEnergy.get_instantaneous_power() + elif "ev" in veh_id: + energy_model = env.k.PDMElectric.get_instantaneous_power() + else: + energy_model = env.k.PDMCombustionEngine.get_instantaneous_power() + + + if car_following_params is None: # FIXME: depends on simulator car_following_params = SumoCarFollowingParams() From 4643ed883789b75ca2899ffc4e3fbd6eee578c3d Mon Sep 17 00:00:00 2001 From: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> Date: Thu, 18 Jun 2020 22:10:34 +0800 Subject: [PATCH 24/60] Update rewards.py --- flow/core/rewards.py | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/flow/core/rewards.py b/flow/core/rewards.py index e85c912e3..f1c7396b8 100755 --- a/flow/core/rewards.py +++ b/flow/core/rewards.py @@ -442,8 +442,7 @@ def miles_per_gallon(env, veh_ids=None, gain=.001): return mpg * gain - -def instantaneous_power(env, veh_ids=None, gain=.001): +def instantaneous_power(env, veh_ids=None, parameter=None, gain=.001): """Calculate the instantaneous power for every simulation step specific to the vehicle type. The energy model used is based on the vehicle type: @@ -469,24 +468,10 @@ def instantaneous_power(env, veh_ids=None, gain=.001): veh_ids = [veh_ids] for veh_id in veh_ids: speed = env.k.vehicle.get_speed(veh_id) - prev_speed = env.k.vehicle.get_previous_speed(veh_id) - # negative acceleration indicates regenerative breaking for some energy models - accel = (speed - prev_speed) / env.sim_step + accel = env.k.vehicle.get_accel_no_noise_with_failsafe(veh_id) grade = 0 - - parameter = None - # determine which energy model to use - if veh_id is "Prius": - energy_model = env.k.PriusEnergy - initial_soc = 0.9 - parameter = initial_soc - elif veh_id is "Tacoma": - energy_model = env.k.TacomaEnergy - elif veh_id is "EV": - energy_model = env.k.PDMElectric - else: - energy_model = env.k.PDMCombustionEngine - - inst_power = energy_model.get_instantaneous_power(parameter, accel, speed, grade) + # need to pass the parameter value to the init of the energy models ????? + inst_power = energy_model(accel, speed, grade) + return inst_power From 26afe673fb8d4ee0d6afc1637883a23bde6959ec Mon Sep 17 00:00:00 2001 From: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> Date: Thu, 18 Jun 2020 22:15:57 +0800 Subject: [PATCH 25/60] Update base_energy.py --- flow/core/kernel/base_energy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flow/core/kernel/base_energy.py b/flow/core/kernel/base_energy.py index 4908153ec..45eff2d29 100644 --- a/flow/core/kernel/base_energy.py +++ b/flow/core/kernel/base_energy.py @@ -14,7 +14,7 @@ def __init__(self, kernel): self.k = kernel @abstractmethod - def get_instantaneous_power(self, parameter, accel, speed, grade): + def get_instantaneous_power(self, accel, speed, grade): """Calculate the instantaneous power consumption of a vehicle. Must be implemented by child classes. From 994c0890273c90ec58ded7b5e5a650c42c33dc87 Mon Sep 17 00:00:00 2001 From: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> Date: Thu, 18 Jun 2020 22:16:58 +0800 Subject: [PATCH 26/60] Update power_demand.py --- flow/core/kernel/power_demand.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/flow/core/kernel/power_demand.py b/flow/core/kernel/power_demand.py index 83a7e0e88..983afa976 100644 --- a/flow/core/kernel/power_demand.py +++ b/flow/core/kernel/power_demand.py @@ -25,14 +25,15 @@ def __init__(self,kernel): self.gamma = 1 def calculate_power(self, accel, speed, grade): - accel_slope_forces = self.mass * speed * ((np.heaviside(accel, 0.5) * (1 - self.gamma) + self.gamma)) * accel + self.g * math.sin(grade) + accel_slope_forces = self.mass * speed * ((np.heaviside(accel, 0.5) * (1 - self.gamma) + self.gamma)) * accel + accel_slope_forces = accel_slope_forces + self.g * math.sin(grade) rolling_friction = self.mass * self.g * self.rolling_res_coeff * speed air_drag = 0.5 * self.rho_air * self.cross_area * self.aerodynamic_drag_coeff * speed**3 power = accel_slope_forces + rolling_friction + air_drag return power @abstractmethod - def get_instantaneous_power(self, parameter, accel, speed, grade): + def get_instantaneous_power(self, accel, speed, grade): pass @@ -40,7 +41,7 @@ class PDMCombustionEngine(PowerDemandModel): # Power Demand Model for a combustion engine vehicle - def get_instantaneous_power(self, parameter, accel, speed, grade): + def get_instantaneous_power(self, accel, speed, grade): power = self.calculate_power(accel, speed, grade) return power @@ -48,6 +49,6 @@ class PDMElectric(PowerDemandModel): # Power Demand Model for an electric vehicle - def get_instantaneous_power(self, parameter, accel, speed, grade): + def get_instantaneous_power(self, accel, speed, grade): power = max(0,self.calculate_power(accel, speed, grade)) return power From 31ca68fe27b3215ca0c20f6c6003b93ebe82fba1 Mon Sep 17 00:00:00 2001 From: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> Date: Thu, 18 Jun 2020 22:17:43 +0800 Subject: [PATCH 27/60] Update toyota_energy.py --- flow/core/kernel/toyota_energy.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/flow/core/kernel/toyota_energy.py b/flow/core/kernel/toyota_energy.py index 45e5db65d..32060d83e 100644 --- a/flow/core/kernel/toyota_energy.py +++ b/flow/core/kernel/toyota_energy.py @@ -25,7 +25,7 @@ def __init__(self, kernel, filename=None): os.remove(file.pkl) @abstractmethod - def get_instantaneous_power(self): + def get_instantaneous_power(self, accel, speed, grade): pass @@ -33,10 +33,11 @@ class PriusEnergy(ToyotaModel): def __init__(self, kernel): super(PriusEnergy, self).__init__(kernel, filename = 'prius_test.pkl') + self.soc = # how to pass here the parameter vargument from the rewards.py - def get_instantaneous_power(self, parameter, accel, speed, grade): - + def get_instantaneous_power(self, accel, speed, grade): socdot = self.toyota_energy(parameter, accel, speed, grade) + self.soc = self.soc - socdot * env.sim_step return socdot @@ -45,7 +46,7 @@ class TacomaEnergy(ToyotaModel): def __init__(self, kernel): super(TacomaEnergy, self).__init__(kernel, filename = 'tacoma_test.pkl') - def get_instantaneous_power(self, parameter, accel, speed, grade): + def get_instantaneous_power(self, accel, speed, grade): fc = self.toyota_energy(accel, speed, grade) # returns instantaneous fuel consumption return fc From e2d95cdba879513b7216e4ebdd9e9a0addf12d4c Mon Sep 17 00:00:00 2001 From: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> Date: Mon, 22 Jun 2020 20:42:20 +0800 Subject: [PATCH 28/60] Create base_energy.py --- flow/energy_models/base_energy.py | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 flow/energy_models/base_energy.py diff --git a/flow/energy_models/base_energy.py b/flow/energy_models/base_energy.py new file mode 100644 index 000000000..45eff2d29 --- /dev/null +++ b/flow/energy_models/base_energy.py @@ -0,0 +1,22 @@ +from abc import ABCMeta, abstractmethod + +class BaseEnergyModel(metaclass=ABCMeta): + """Base energy model class. + + Calculate the instantaneous power consumption of a vehicle in + the network. It returns the power in Watts regardless of the + vehicle type: whether EV or Combustion Engine, Toyota Prius or Tacoma + or non-Toyota vehicles. Non-Toyota vehicles are set by default + to be an averaged-size vehicle. + """ + + def __init__(self, kernel): + self.k = kernel + + @abstractmethod + def get_instantaneous_power(self, accel, speed, grade): + """Calculate the instantaneous power consumption of a vehicle. + + Must be implemented by child classes. + """ + pass From ddedb95c5438fdcef675a5af8ca1d710de36fbc4 Mon Sep 17 00:00:00 2001 From: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> Date: Mon, 22 Jun 2020 20:44:15 +0800 Subject: [PATCH 29/60] Create toyota_energy.py --- flow/energy_models/toyota_energy.py | 52 +++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 flow/energy_models/toyota_energy.py diff --git a/flow/energy_models/toyota_energy.py b/flow/energy_models/toyota_energy.py new file mode 100644 index 000000000..c476c419c --- /dev/null +++ b/flow/energy_models/toyota_energy.py @@ -0,0 +1,52 @@ +import dill as pickle +import boto3 +import botocore +import math +import random +import statistics +import numpy as np +from scipy.interpolate import interp1d +from collections import namedtuple +from flow.core.kernel.base_energy import BaseEnergyModel +import os +from abc import ABCMeta, abstractmethod + +class ToyotaModel(BaseEnergyModel): + + def __init__(self, kernel, filename=None): + self.k = kernel + + # download file from s3 bucket + s3 = boto3.client('s3') + s3.download_file('toyota.restricted', filename,'file.pkl') #move to init + with open('file.pkl','rb') as file: + self.toyota_energy = pickle.load(file) #self.prius_energy + # delete pickle file + os.remove(file.pkl) + + @abstractmethod + def get_instantaneous_power(self, accel, speed, grade): + pass + + +class PriusEnergy(ToyotaModel): + + def __init__(self, kernel, soc): + super(PriusEnergy, self).__init__(kernel, filename = 'prius_test.pkl') + self.soc = soc + + def get_instantaneous_power(self, accel, speed, grade): + socdot = self.toyota_energy(self.soc, accel, speed, grade) + self.soc -= socdot * self.k.env.sim_step + return socdot + +class TacomaEnergy(ToyotaModel): + + def __init__(self, kernel): + super(TacomaEnergy, self).__init__(kernel, filename = 'tacoma_test.pkl') + + def get_instantaneous_power(self, accel, speed, grade): + fc = self.toyota_energy(accel, speed, grade) + return fc + + From 74382e4c5a15f0fd6a319ad75a60980b7bae72a8 Mon Sep 17 00:00:00 2001 From: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> Date: Mon, 22 Jun 2020 20:45:00 +0800 Subject: [PATCH 30/60] Create power_demand.py --- flow/energy_models/power_demand.py | 54 ++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 flow/energy_models/power_demand.py diff --git a/flow/energy_models/power_demand.py b/flow/energy_models/power_demand.py new file mode 100644 index 000000000..000c336bd --- /dev/null +++ b/flow/energy_models/power_demand.py @@ -0,0 +1,54 @@ +import math +import random +import statistics +import numpy as np +from scipy.interpolate import interp1d +from collections import namedtuple +from flow.core.kernel.base_energy import BaseEnergyModel +from abc import ABCMeta, abstractmethod + +class PowerDemandModel(BaseEnergyModel, metaclass=ABCMeta): + """Calculate power consumption of a vehicle. + Assumes vehicle is an average sized vehicle. + The power calculated here is the lower bound of the + actual power consumed by the vehicle + """ + + def __init__(self,kernel): + self.k = kernel + self.g = 9.81 + self.rho_air = 1.225 + self.mass = 1200 + self.rolling_res_coeff = 0.005 + self.aerodynamic_drag_coeff = 0.3 + self.cross_area = 2.6 + self.gamma = 1 + + def calculate_power(self, accel, speed, grade): + accel_slope_forces = self.mass * speed * ((np.heaviside(accel, 0.5) * (1 - self.gamma) + self.gamma)) * accel + accel_slope_forces += + self.g * math.sin(grade) + rolling_friction = self.mass * self.g * self.rolling_res_coeff * speed + air_drag = 0.5 * self.rho_air * self.cross_area * self.aerodynamic_drag_coeff * speed**3 + power = accel_slope_forces + rolling_friction + air_drag + return power + + @abstractmethod + def get_regen_cap(self, accel, speed, grade) + pass + + def get_instantaneous_power(self, accel, speed, grade): + power = max(get_regen_cap(), self.calculate_power(accel, speed, grade)) + return power + + +class PDMCombustionEngine(PowerDemandModel): + + # Power Demand Model for a combustion engine vehicle + def get_regen_cap(self, accel, speed, grade) + return 0 + +class PDMElectric(PowerDemandModel): + + # Power Demand Model for an electric vehicle + def get_regen_cap(self, accel, speed, grade) + return -2.8 * speed From 70e9a4b7a8cb976f8f89c42f4355601675afa650 Mon Sep 17 00:00:00 2001 From: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> Date: Mon, 22 Jun 2020 20:51:17 +0800 Subject: [PATCH 31/60] Update params.py --- flow/core/params.py | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/flow/core/params.py b/flow/core/params.py index 666ccc134..88195377f 100755 --- a/flow/core/params.py +++ b/flow/core/params.py @@ -7,14 +7,11 @@ from flow.controllers.car_following_models import SimCarFollowingController from flow.controllers.rlcontroller import RLController from flow.controllers.lane_change_controllers import SimLaneChangeController +from flow.energy_models.toyota_energy import PriusEnergy +from flow.energy_models.toyota_energy import TacomaEnergy +from flow.energy_models.power_demand import PDMCombustionEngine +from flow.energy_models.power_demand import PDMElectric -# To add these after creating the forlder for energy models # (1) -""" -from flow.enermod.toyota_energy import PriusEnergy -from flow.enermod.toyota_energy import TacomaEnergy -from flow.enermod.power_demand import PDMCombustionEngine -from flow.enermod.power_demand import PDMElectric -""" SPEED_MODES = { @@ -250,7 +247,8 @@ def add(self, num_vehicles=0, car_following_params=None, lane_change_params=None, - color=None): + color=None, + energy_model = None): """Add a sequence of vehicles to the list of vehicles in the network. Parameters @@ -279,18 +277,26 @@ def add(self, Params object specifying attributes for Sumo lane changing model. """ - # determine which energy model to use + """# determine which energy model to use if "prius" in veh_id: - energy_model = env.k.PriusEnergy.get_instantaneous_power() + self.energy_model = PriusEnergy() elif "tacoma" in veh_id: - energy_model = env.k.TacomaEnergy.get_instantaneous_power() + self.energy_model = TacomaEnergy elif "ev" in veh_id: - energy_model = env.k.PDMElectric.get_instantaneous_power() + self.energy_model = PDMElectric() else: - energy_model = env.k.PDMCombustionEngine.get_instantaneous_power() + self.energy_model = PDMCombustionEngine() + """ + + if energy_model is "prius": + self.energy_model = PriusEnergy(kernel, 0.9) + elif energy_model is "tacoma": + self.energy_model = TacomaEnergy() + elif energy_model is "ev": + self.energy_model = PDMElectric() + else: + self.energy_model = PDMCombustionEngine() - - if car_following_params is None: # FIXME: depends on simulator car_following_params = SumoCarFollowingParams() From f338c4b9a61a6d0f87954c7a85c917688d4b57df Mon Sep 17 00:00:00 2001 From: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> Date: Mon, 22 Jun 2020 20:52:37 +0800 Subject: [PATCH 32/60] Update traci.py --- flow/core/kernel/vehicle/traci.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/flow/core/kernel/vehicle/traci.py b/flow/core/kernel/vehicle/traci.py index eb874b208..93fd03cd7 100644 --- a/flow/core/kernel/vehicle/traci.py +++ b/flow/core/kernel/vehicle/traci.py @@ -93,8 +93,8 @@ def __init__(self, # old speeds used to compute accelerations self.previous_speeds = {} - self.energy = Energy(self) - self.energy.calc_energy_level(self) + """ self.energy = Energy(self) + self.energy.calc_energy_level(self) """ # # store speeds of all vehicles at last iteration self.old_speeds = {} @@ -312,6 +312,9 @@ def _add_departed(self, veh_id, veh_type): # specify the type self.__vehicles[veh_id]["type"] = veh_type + # specify energy model + self.__vehicles[veh_id]["energy_model"] = veh_type.energy_model + car_following_params = \ self.type_parameters[veh_type]["car_following_params"] @@ -1231,3 +1234,4 @@ def get_fuel(self, veh_id): def set_fuel(self, veh_id, fuel): """Set the lane headways of the specified vehicle.""" self.__vehicles[veh_id]['fuel'] = fuel + From 3d48f15e47fb28ed7b256e9c138ae0d214ba9d50 Mon Sep 17 00:00:00 2001 From: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> Date: Mon, 22 Jun 2020 20:57:50 +0800 Subject: [PATCH 33/60] Update traci.py --- flow/core/kernel/vehicle/traci.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/flow/core/kernel/vehicle/traci.py b/flow/core/kernel/vehicle/traci.py index 93fd03cd7..97c9c9ab7 100644 --- a/flow/core/kernel/vehicle/traci.py +++ b/flow/core/kernel/vehicle/traci.py @@ -13,7 +13,10 @@ from flow.controllers.car_following_models import SimCarFollowingController from flow.controllers.rlcontroller import RLController from flow.controllers.lane_change_controllers import SimLaneChangeController -from flow.core.kernel.base_energy import BaseEnergyModel +from flow.energy_models.toyota_energy import PriusEnergy +from flow.energy_models.toyota_energy import TacomaEnergy +from flow.energy_models.power_demand import PDMCombustionEngine +from flow.energy_models.power_demand import PDMElectric from bisect import bisect_left import itertools from copy import deepcopy @@ -127,11 +130,11 @@ def initialize(self, vehicles): # self.energy.initialize(veh_id) # energy.intialize(veh_id) - self.__vehicles[veh_id]['SOC'] = float(random.randrange(8, 92))/100 #move to experiment code + # self.__vehicles[veh_id]['SOC'] = float(random.randrange(8, 92))/100 #move to experiment code # # Assume level of fuel is 10-100% of capacity # # Tacoma has 21.1 gallon capacity = 79.87219 L # # Use density of gasoline = 748.9 g/L (needs to convert b/c fc is in g/s) - self.__vehicles[veh_id]['fuel'] = float(random.randrange(598163, 5981628))/100 + # self.__vehicles[veh_id]['fuel'] = float(random.randrange(598163, 5981628))/100 self.num_vehicles += 1 if typ['acceleration_controller'][0] == RLController: @@ -1221,7 +1224,7 @@ def get_road_grade(self, veh_id): # TODO : Brent return 0 - def get_soc(self, veh_id): + """ def get_soc(self, veh_id): return self.__vehicles[veh_id]['SOC'] def set_soc(self, veh_id, soc): @@ -1234,4 +1237,5 @@ def get_fuel(self, veh_id): def set_fuel(self, veh_id, fuel): """Set the lane headways of the specified vehicle.""" self.__vehicles[veh_id]['fuel'] = fuel + """ From 8a0bdeebe8288488191881e74f18a82c5308f017 Mon Sep 17 00:00:00 2001 From: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> Date: Mon, 22 Jun 2020 21:19:51 +0800 Subject: [PATCH 34/60] Update rewards.py --- flow/core/rewards.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/flow/core/rewards.py b/flow/core/rewards.py index f1c7396b8..360c34c99 100755 --- a/flow/core/rewards.py +++ b/flow/core/rewards.py @@ -442,7 +442,7 @@ def miles_per_gallon(env, veh_ids=None, gain=.001): return mpg * gain -def instantaneous_power(env, veh_ids=None, parameter=None, gain=.001): +def instantaneous_power(env, veh_ids=None, gain=.001): """Calculate the instantaneous power for every simulation step specific to the vehicle type. The energy model used is based on the vehicle type: @@ -469,9 +469,7 @@ def instantaneous_power(env, veh_ids=None, parameter=None, gain=.001): for veh_id in veh_ids: speed = env.k.vehicle.get_speed(veh_id) accel = env.k.vehicle.get_accel_no_noise_with_failsafe(veh_id) - grade = 0 - # need to pass the parameter value to the init of the energy models ????? - inst_power = energy_model(accel, speed, grade) + grade = env.k.vehicle.get_road_grade(veh_id) + inst_power = energy_model[veh_id].get_instantaneous_power(accel, speed, grade) - return inst_power From 0e0a6f74e07ff5a6fadd416a23d595b689b9e082 Mon Sep 17 00:00:00 2001 From: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> Date: Mon, 22 Jun 2020 21:39:14 +0800 Subject: [PATCH 35/60] Update traci.py --- flow/core/kernel/vehicle/traci.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flow/core/kernel/vehicle/traci.py b/flow/core/kernel/vehicle/traci.py index 97c9c9ab7..cacc29854 100644 --- a/flow/core/kernel/vehicle/traci.py +++ b/flow/core/kernel/vehicle/traci.py @@ -316,7 +316,7 @@ def _add_departed(self, veh_id, veh_type): self.__vehicles[veh_id]["type"] = veh_type # specify energy model - self.__vehicles[veh_id]["energy_model"] = veh_type.energy_model + self.__vehicles[veh_id]["energy_model"] = energy_model car_following_params = \ self.type_parameters[veh_type]["car_following_params"] From ef1209baaafa8738a33b18a519169814dd475236 Mon Sep 17 00:00:00 2001 From: liljonnystyle Date: Mon, 22 Jun 2020 08:58:43 -0700 Subject: [PATCH 36/60] Delete base_energy.py --- flow/core/kernel/base_energy.py | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 flow/core/kernel/base_energy.py diff --git a/flow/core/kernel/base_energy.py b/flow/core/kernel/base_energy.py deleted file mode 100644 index 45eff2d29..000000000 --- a/flow/core/kernel/base_energy.py +++ /dev/null @@ -1,22 +0,0 @@ -from abc import ABCMeta, abstractmethod - -class BaseEnergyModel(metaclass=ABCMeta): - """Base energy model class. - - Calculate the instantaneous power consumption of a vehicle in - the network. It returns the power in Watts regardless of the - vehicle type: whether EV or Combustion Engine, Toyota Prius or Tacoma - or non-Toyota vehicles. Non-Toyota vehicles are set by default - to be an averaged-size vehicle. - """ - - def __init__(self, kernel): - self.k = kernel - - @abstractmethod - def get_instantaneous_power(self, accel, speed, grade): - """Calculate the instantaneous power consumption of a vehicle. - - Must be implemented by child classes. - """ - pass From 45d7e4fa96dedb53696c72c1fc73ff217eb6c4a0 Mon Sep 17 00:00:00 2001 From: liljonnystyle Date: Mon, 22 Jun 2020 08:58:56 -0700 Subject: [PATCH 37/60] Delete power_demand.py --- flow/core/kernel/power_demand.py | 54 -------------------------------- 1 file changed, 54 deletions(-) delete mode 100644 flow/core/kernel/power_demand.py diff --git a/flow/core/kernel/power_demand.py b/flow/core/kernel/power_demand.py deleted file mode 100644 index 983afa976..000000000 --- a/flow/core/kernel/power_demand.py +++ /dev/null @@ -1,54 +0,0 @@ -import math -import random -import statistics -import numpy as np -from scipy.interpolate import interp1d -from collections import namedtuple -from flow.core.kernel.base_energy import BaseEnergyModel -from abc import ABCMeta, abstractmethod - -class PowerDemandModel(BaseEnergyModel, metaclass=ABCMeta): - """Calculate power consumption of a vehicle. - Assumes vehicle is an average sized vehicle. - The power calculated here is the lower bound of the - actual power consumed by the vehicle - """ - - def __init__(self,kernel): - self.k = kernel - self.g = 9.81 - self.rho_air = 1.225 - self.mass = 1200 - self.rolling_res_coeff = 0.005 - self.aerodynamic_drag_coeff = 0.3 - self.cross_area = 2.6 - self.gamma = 1 - - def calculate_power(self, accel, speed, grade): - accel_slope_forces = self.mass * speed * ((np.heaviside(accel, 0.5) * (1 - self.gamma) + self.gamma)) * accel - accel_slope_forces = accel_slope_forces + self.g * math.sin(grade) - rolling_friction = self.mass * self.g * self.rolling_res_coeff * speed - air_drag = 0.5 * self.rho_air * self.cross_area * self.aerodynamic_drag_coeff * speed**3 - power = accel_slope_forces + rolling_friction + air_drag - return power - - @abstractmethod - def get_instantaneous_power(self, accel, speed, grade): - pass - - -class PDMCombustionEngine(PowerDemandModel): - - # Power Demand Model for a combustion engine vehicle - - def get_instantaneous_power(self, accel, speed, grade): - power = self.calculate_power(accel, speed, grade) - return power - -class PDMElectric(PowerDemandModel): - - # Power Demand Model for an electric vehicle - - def get_instantaneous_power(self, accel, speed, grade): - power = max(0,self.calculate_power(accel, speed, grade)) - return power From 6a088334c05ce0aa65e59b54d41037677241970e Mon Sep 17 00:00:00 2001 From: liljonnystyle Date: Mon, 22 Jun 2020 08:59:08 -0700 Subject: [PATCH 38/60] Delete toyota_energy.py --- flow/core/kernel/toyota_energy.py | 52 ------------------------------- 1 file changed, 52 deletions(-) delete mode 100644 flow/core/kernel/toyota_energy.py diff --git a/flow/core/kernel/toyota_energy.py b/flow/core/kernel/toyota_energy.py deleted file mode 100644 index 32060d83e..000000000 --- a/flow/core/kernel/toyota_energy.py +++ /dev/null @@ -1,52 +0,0 @@ -import dill as pickle -import boto3 -import botocore -import math -import random -import statistics -import numpy as np -from scipy.interpolate import interp1d -from collections import namedtuple -from flow.core.kernel.base_energy import BaseEnergyModel -import os -from abc import ABCMeta, abstractmethod - -class ToyotaModel(BaseEnergyModel): - - def __init__(self, kernel, filename=None): - self.k = kernel - - # download file from s3 bucket - s3 = boto3.client('s3') - s3.download_file('toyota.restricted', filename,'file.pkl') #move to init - with open('file.pkl','rb') as file: - self.toyota_energy = pickle.load(file) #self.prius_energy - # delete pickle file - os.remove(file.pkl) - - @abstractmethod - def get_instantaneous_power(self, accel, speed, grade): - pass - - -class PriusEnergy(ToyotaModel): - - def __init__(self, kernel): - super(PriusEnergy, self).__init__(kernel, filename = 'prius_test.pkl') - self.soc = # how to pass here the parameter vargument from the rewards.py - - def get_instantaneous_power(self, accel, speed, grade): - socdot = self.toyota_energy(parameter, accel, speed, grade) - self.soc = self.soc - socdot * env.sim_step - - return socdot - -class TacomaEnergy(ToyotaModel): - - def __init__(self, kernel): - super(TacomaEnergy, self).__init__(kernel, filename = 'tacoma_test.pkl') - - def get_instantaneous_power(self, accel, speed, grade): - - fc = self.toyota_energy(accel, speed, grade) # returns instantaneous fuel consumption - return fc From 979aa95776d009aeb81dd0634adb54394c945f56 Mon Sep 17 00:00:00 2001 From: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> Date: Tue, 23 Jun 2020 03:58:42 +0800 Subject: [PATCH 39/60] Update power_demand.py --- flow/energy_models/power_demand.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flow/energy_models/power_demand.py b/flow/energy_models/power_demand.py index 000c336bd..e1c3b7a88 100644 --- a/flow/energy_models/power_demand.py +++ b/flow/energy_models/power_demand.py @@ -33,22 +33,22 @@ def calculate_power(self, accel, speed, grade): return power @abstractmethod - def get_regen_cap(self, accel, speed, grade) + def get_regen_cap(self, accel, speed, grade): pass def get_instantaneous_power(self, accel, speed, grade): - power = max(get_regen_cap(), self.calculate_power(accel, speed, grade)) + power = max(self.get_regen_cap(), self.calculate_power(accel, speed, grade)) return power class PDMCombustionEngine(PowerDemandModel): # Power Demand Model for a combustion engine vehicle - def get_regen_cap(self, accel, speed, grade) + def get_regen_cap(self, accel, speed, grade): return 0 class PDMElectric(PowerDemandModel): # Power Demand Model for an electric vehicle - def get_regen_cap(self, accel, speed, grade) + def get_regen_cap(self, accel, speed, grade): return -2.8 * speed From 71341531b89e314e7d97cb73a12e3d797eef070a Mon Sep 17 00:00:00 2001 From: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> Date: Tue, 23 Jun 2020 03:59:18 +0800 Subject: [PATCH 40/60] Update toyota_energy.py --- flow/energy_models/toyota_energy.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/flow/energy_models/toyota_energy.py b/flow/energy_models/toyota_energy.py index c476c419c..acdf726d0 100644 --- a/flow/energy_models/toyota_energy.py +++ b/flow/energy_models/toyota_energy.py @@ -31,7 +31,7 @@ def get_instantaneous_power(self, accel, speed, grade): class PriusEnergy(ToyotaModel): - def __init__(self, kernel, soc): + def __init__(self, kernel, soc=0.9): super(PriusEnergy, self).__init__(kernel, filename = 'prius_test.pkl') self.soc = soc @@ -48,5 +48,3 @@ def __init__(self, kernel): def get_instantaneous_power(self, accel, speed, grade): fc = self.toyota_energy(accel, speed, grade) return fc - - From 108910809ad0cf71ffd01cfc4694cb42a8b62823 Mon Sep 17 00:00:00 2001 From: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> Date: Tue, 23 Jun 2020 22:30:47 +0800 Subject: [PATCH 41/60] Update power_demand.py --- flow/energy_models/power_demand.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/flow/energy_models/power_demand.py b/flow/energy_models/power_demand.py index e1c3b7a88..9e977aade 100644 --- a/flow/energy_models/power_demand.py +++ b/flow/energy_models/power_demand.py @@ -4,7 +4,7 @@ import numpy as np from scipy.interpolate import interp1d from collections import namedtuple -from flow.core.kernel.base_energy import BaseEnergyModel +from flow.energy_models.base_energy import BaseEnergyModel from abc import ABCMeta, abstractmethod class PowerDemandModel(BaseEnergyModel, metaclass=ABCMeta): @@ -14,14 +14,14 @@ class PowerDemandModel(BaseEnergyModel, metaclass=ABCMeta): actual power consumed by the vehicle """ - def __init__(self,kernel): + def __init__(self, kernel, mass=2041, area=3.2, Cr=0.0027, Ca=0.4): self.k = kernel - self.g = 9.81 + self.g = 9.807 self.rho_air = 1.225 - self.mass = 1200 - self.rolling_res_coeff = 0.005 - self.aerodynamic_drag_coeff = 0.3 - self.cross_area = 2.6 + self.mass = mass + self.rolling_res_coeff = Cr + self.aerodynamic_drag_coeff = Ca + self.cross_area = area self.gamma = 1 def calculate_power(self, accel, speed, grade): @@ -50,5 +50,8 @@ def get_regen_cap(self, accel, speed, grade): class PDMElectric(PowerDemandModel): # Power Demand Model for an electric vehicle + def __init__(self,kernel): + super(PDMElectric, self).__init__(kernel, mass=1663, area=2.4, Cr=0.007, Ca=0.24) + def get_regen_cap(self, accel, speed, grade): return -2.8 * speed From ae48511f4e64b4a76d63a3417d0b20908cdc1662 Mon Sep 17 00:00:00 2001 From: Joy Carpio Date: Tue, 23 Jun 2020 23:12:29 +0800 Subject: [PATCH 42/60] Update toyota_energy.py --- flow/energy_models/toyota_energy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flow/energy_models/toyota_energy.py b/flow/energy_models/toyota_energy.py index acdf726d0..d2139a139 100644 --- a/flow/energy_models/toyota_energy.py +++ b/flow/energy_models/toyota_energy.py @@ -7,7 +7,7 @@ import numpy as np from scipy.interpolate import interp1d from collections import namedtuple -from flow.core.kernel.base_energy import BaseEnergyModel +from flow.energy_models.base_energy import BaseEnergyModel import os from abc import ABCMeta, abstractmethod From 21e6805efcb63052c27bd9e35da77b969f0e16b8 Mon Sep 17 00:00:00 2001 From: Joy Carpio Date: Thu, 25 Jun 2020 02:56:48 +0800 Subject: [PATCH 43/60] Updated energy model codes Updated traci.py, params.py and rewards.py --- flow/core/kernel/vehicle/traci.py | 27 ++++++++++----------------- flow/core/params.py | 30 ++++++------------------------ flow/core/rewards.py | 2 +- flow/energy_models/power_demand.py | 2 +- 4 files changed, 18 insertions(+), 43 deletions(-) diff --git a/flow/core/kernel/vehicle/traci.py b/flow/core/kernel/vehicle/traci.py index cacc29854..0e1eb56d8 100644 --- a/flow/core/kernel/vehicle/traci.py +++ b/flow/core/kernel/vehicle/traci.py @@ -316,7 +316,10 @@ def _add_departed(self, veh_id, veh_type): self.__vehicles[veh_id]["type"] = veh_type # specify energy model - self.__vehicles[veh_id]["energy_model"] = energy_model + energy_model = \ + self.type_parameters[veh_type]["energy_model"] + self.__vehicles[veh_id]["energy_model"] = \ + energy_model[0](veh_id, **energy_model[1]) car_following_params = \ self.type_parameters[veh_type]["car_following_params"] @@ -582,6 +585,12 @@ def get_speed(self, veh_id, error=-1001): if isinstance(veh_id, (list, np.ndarray)): return [self.get_speed(vehID, error) for vehID in veh_id] return self.__sumo_obs.get(veh_id, {}).get(tc.VAR_SPEED, error) + + def get_power(self, veh_id, error=-1001): + """See parent class.""" + if isinstance(veh_id, (list, np.ndarray)): + return [self.get_power(vehID, error) for vehID in veh_id] + return self.__vehicles.get(veh_id, {}).get("energy_model", error) def get_default_speed(self, veh_id, error=-1001): """See parent class.""" @@ -1223,19 +1232,3 @@ def get_road_grade(self, veh_id): """See parent class.""" # TODO : Brent return 0 - - """ def get_soc(self, veh_id): - return self.__vehicles[veh_id]['SOC'] - - def set_soc(self, veh_id, soc): - """Set the lane headways of the specified vehicle.""" - self.__vehicles[veh_id]['SOC'] = soc - - def get_fuel(self, veh_id): - return self.__vehicles[veh_id]['fuel'] - - def set_fuel(self, veh_id, fuel): - """Set the lane headways of the specified vehicle.""" - self.__vehicles[veh_id]['fuel'] = fuel - """ - diff --git a/flow/core/params.py b/flow/core/params.py index 88195377f..49c2fbaae 100755 --- a/flow/core/params.py +++ b/flow/core/params.py @@ -248,7 +248,7 @@ def add(self, car_following_params=None, lane_change_params=None, color=None, - energy_model = None): + energy_model = (PDMCombustionEngine, {})): """Add a sequence of vehicles to the list of vehicles in the network. Parameters @@ -276,27 +276,6 @@ def add(self, lane_change_params : flow.core.params.SumoLaneChangeParams Params object specifying attributes for Sumo lane changing model. """ - - """# determine which energy model to use - if "prius" in veh_id: - self.energy_model = PriusEnergy() - elif "tacoma" in veh_id: - self.energy_model = TacomaEnergy - elif "ev" in veh_id: - self.energy_model = PDMElectric() - else: - self.energy_model = PDMCombustionEngine() - """ - - if energy_model is "prius": - self.energy_model = PriusEnergy(kernel, 0.9) - elif energy_model is "tacoma": - self.energy_model = TacomaEnergy() - elif energy_model is "ev": - self.energy_model = PDMElectric() - else: - self.energy_model = PDMCombustionEngine() - if car_following_params is None: # FIXME: depends on simulator car_following_params = SumoCarFollowingParams() @@ -318,7 +297,8 @@ def add(self, "routing_controller": routing_controller, "initial_speed": initial_speed, "car_following_params": car_following_params, - "lane_change_params": lane_change_params} + "lane_change_params": lane_change_params, + "energy_model": energy_model} if color: type_params['color'] = color @@ -341,7 +321,9 @@ def add(self, "car_following_params": car_following_params, "lane_change_params": - lane_change_params + lane_change_params, + "energy_model": + energy_model }) # This is used to return the actual headways from the vehicles class. diff --git a/flow/core/rewards.py b/flow/core/rewards.py index 360c34c99..aa3fd3f50 100755 --- a/flow/core/rewards.py +++ b/flow/core/rewards.py @@ -470,6 +470,6 @@ def instantaneous_power(env, veh_ids=None, gain=.001): speed = env.k.vehicle.get_speed(veh_id) accel = env.k.vehicle.get_accel_no_noise_with_failsafe(veh_id) grade = env.k.vehicle.get_road_grade(veh_id) - inst_power = energy_model[veh_id].get_instantaneous_power(accel, speed, grade) + inst_power = env.k.vehicle.get_power(veh_id).get_instantaneous_power(accel, speed, grade) return inst_power diff --git a/flow/energy_models/power_demand.py b/flow/energy_models/power_demand.py index 9e977aade..505153d14 100644 --- a/flow/energy_models/power_demand.py +++ b/flow/energy_models/power_demand.py @@ -37,7 +37,7 @@ def get_regen_cap(self, accel, speed, grade): pass def get_instantaneous_power(self, accel, speed, grade): - power = max(self.get_regen_cap(), self.calculate_power(accel, speed, grade)) + power = max(self.get_regen_cap(accel, speed, grade), self.calculate_power(accel, speed, grade)) return power From cc5edbd1380fa4cd4b003186adbc33d34c31a428 Mon Sep 17 00:00:00 2001 From: Joy Carpio Date: Thu, 2 Jul 2020 00:30:16 +0800 Subject: [PATCH 44/60] Update params.py --- flow/core/params.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/flow/core/params.py b/flow/core/params.py index 49c2fbaae..c2a963a35 100755 --- a/flow/core/params.py +++ b/flow/core/params.py @@ -247,8 +247,9 @@ def add(self, num_vehicles=0, car_following_params=None, lane_change_params=None, - color=None, - energy_model = (PDMCombustionEngine, {})): + energy_model=(PDMCombustionEngine, {}), + color=None): + """Add a sequence of vehicles to the list of vehicles in the network. Parameters From 695d7c9d909c5382ea59a5881a72543d5eb6ddf1 Mon Sep 17 00:00:00 2001 From: Joy Carpio Date: Thu, 2 Jul 2020 00:30:22 +0800 Subject: [PATCH 45/60] Update rewards.py --- flow/core/rewards.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/flow/core/rewards.py b/flow/core/rewards.py index aa3fd3f50..2df720acb 100755 --- a/flow/core/rewards.py +++ b/flow/core/rewards.py @@ -442,15 +442,9 @@ def miles_per_gallon(env, veh_ids=None, gain=.001): return mpg * gain -def instantaneous_power(env, veh_ids=None, gain=.001): +def instantaneous_power(env, veh_id=None, gain=.001): """Calculate the instantaneous power for every simulation step specific to the vehicle type. - The energy model used is based on the vehicle type: - veh_id = "Prius" --> energy model is PriusEnergy in flow.core.kernel.toyata_energy - veh_id = "Tacoma" --> energy model is TacomaEnergy in flow.core.kernel.toyata_energy - veh_id = "EV" --> energy model is PDMElectric in flow.core.kernel.power_demand - veh_id = "human" --> energy model is PDMCombustionEngine in flow.core.kernel.power_demand - Parameters ---------- env : flow.envs.Env From 6a0208b2cba83ed55d880ed338339d03635d3712 Mon Sep 17 00:00:00 2001 From: Joy Carpio Date: Thu, 2 Jul 2020 00:30:29 +0800 Subject: [PATCH 46/60] Update power_demand.py --- flow/energy_models/power_demand.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flow/energy_models/power_demand.py b/flow/energy_models/power_demand.py index 505153d14..d1469b24d 100644 --- a/flow/energy_models/power_demand.py +++ b/flow/energy_models/power_demand.py @@ -14,13 +14,13 @@ class PowerDemandModel(BaseEnergyModel, metaclass=ABCMeta): actual power consumed by the vehicle """ - def __init__(self, kernel, mass=2041, area=3.2, Cr=0.0027, Ca=0.4): + def __init__(self, kernel, mass=2041, area=3.2, rolling_res_coeff=0.0027, aerodynamic_drag_coeff=0.4): self.k = kernel self.g = 9.807 self.rho_air = 1.225 self.mass = mass - self.rolling_res_coeff = Cr - self.aerodynamic_drag_coeff = Ca + self.rolling_res_coeff = rolling_res_coeff + self.aerodynamic_drag_coeff = aerodynamic_drag_coeff self.cross_area = area self.gamma = 1 @@ -51,7 +51,7 @@ class PDMElectric(PowerDemandModel): # Power Demand Model for an electric vehicle def __init__(self,kernel): - super(PDMElectric, self).__init__(kernel, mass=1663, area=2.4, Cr=0.007, Ca=0.24) + super(PDMElectric, self).__init__(kernel, mass=1663, area=2.4, rolling_res_coeff=0.007, aerodynamic_drag_coeff=0.24) def get_regen_cap(self, accel, speed, grade): return -2.8 * speed From 2c9bcaa216ed00a307de1f2dcdd970220bfadf37 Mon Sep 17 00:00:00 2001 From: Joy Carpio Date: Thu, 2 Jul 2020 00:30:37 +0800 Subject: [PATCH 47/60] Create git push --- git push | 29119 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 29119 insertions(+) create mode 100644 git push diff --git a/git push b/git push new file mode 100644 index 000000000..8b4fd57a9 --- /dev/null +++ b/git push @@ -0,0 +1,29119 @@ +commit ae48511f4e64b4a76d63a3417d0b20908cdc1662 (HEAD -> jc-energy-class, origin/jc-energy-class) +Author: Joy Carpio +Date: Tue Jun 23 23:12:29 2020 +0800 + + Update toyota_energy.py + +commit 108910809ad0cf71ffd01cfc4694cb42a8b62823 +Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> +Date: Tue Jun 23 22:30:47 2020 +0800 + + Update power_demand.py + +commit 71341531b89e314e7d97cb73a12e3d797eef070a +Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> +Date: Tue Jun 23 03:59:18 2020 +0800 + + Update toyota_energy.py + +commit 979aa95776d009aeb81dd0634adb54394c945f56 +Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> +Date: Tue Jun 23 03:58:42 2020 +0800 + + Update power_demand.py + +commit 6a088334c05ce0aa65e59b54d41037677241970e +Author: liljonnystyle +Date: Mon Jun 22 08:59:08 2020 -0700 + + Delete toyota_energy.py + +commit 45d7e4fa96dedb53696c72c1fc73ff217eb6c4a0 +Author: liljonnystyle +Date: Mon Jun 22 08:58:56 2020 -0700 + + Delete power_demand.py + +commit ef1209baaafa8738a33b18a519169814dd475236 +Author: liljonnystyle +Date: Mon Jun 22 08:58:43 2020 -0700 + + Delete base_energy.py + +commit 0e0a6f74e07ff5a6fadd416a23d595b689b9e082 +Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> +Date: Mon Jun 22 21:39:14 2020 +0800 + + Update traci.py + +commit 8a0bdeebe8288488191881e74f18a82c5308f017 +Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> +Date: Mon Jun 22 21:19:51 2020 +0800 + + Update rewards.py + +commit 3d48f15e47fb28ed7b256e9c138ae0d214ba9d50 +Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> +Date: Mon Jun 22 20:57:50 2020 +0800 + + Update traci.py + +commit f338c4b9a61a6d0f87954c7a85c917688d4b57df +Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> +Date: Mon Jun 22 20:52:37 2020 +0800 + + Update traci.py + +commit 70e9a4b7a8cb976f8f89c42f4355601675afa650 +Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> +Date: Mon Jun 22 20:51:17 2020 +0800 + + Update params.py + +commit 74382e4c5a15f0fd6a319ad75a60980b7bae72a8 +Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> +Date: Mon Jun 22 20:45:00 2020 +0800 + + Create power_demand.py + +commit ddedb95c5438fdcef675a5af8ca1d710de36fbc4 +Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> +Date: Mon Jun 22 20:44:15 2020 +0800 + + Create toyota_energy.py + +commit e2d95cdba879513b7216e4ebdd9e9a0addf12d4c +Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> +Date: Mon Jun 22 20:42:20 2020 +0800 + + Create base_energy.py + +commit 31ca68fe27b3215ca0c20f6c6003b93ebe82fba1 +Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> +Date: Thu Jun 18 22:17:43 2020 +0800 + + Update toyota_energy.py + +commit 994c0890273c90ec58ded7b5e5a650c42c33dc87 +Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> +Date: Thu Jun 18 22:16:58 2020 +0800 + + Update power_demand.py + +commit 26afe673fb8d4ee0d6afc1637883a23bde6959ec +Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> +Date: Thu Jun 18 22:15:57 2020 +0800 + + Update base_energy.py + +commit 4643ed883789b75ca2899ffc4e3fbd6eee578c3d +Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> +Date: Thu Jun 18 22:10:34 2020 +0800 + + Update rewards.py + +commit d718a3312b89ef6de760175dce362ba03ea7c7d8 +Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> +Date: Thu Jun 18 22:05:30 2020 +0800 + + Update params.py + +commit b8d2d1238c886614e8c74dba674c45be5f83e524 +Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> +Date: Mon Jun 15 02:57:46 2020 +0800 + + Update rewards.py + +commit 81cfba9f86604537de16e14dcb6279970fee3be6 +Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> +Date: Mon Jun 15 02:55:29 2020 +0800 + + Update base_energy.py + +commit c133fb08fbf4fdb3e5e2a585840e79cbd30015f6 +Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> +Date: Mon Jun 15 02:54:54 2020 +0800 + + Update toyota_energy.py + +commit 0a0de585dbc93aef40b54bae371d483c76238591 +Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> +Date: Mon Jun 15 02:53:38 2020 +0800 + + Update power_demand.py + +commit 23688b2a39786139b8a9f994f2c1393c1d0549f1 +Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> +Date: Mon Jun 15 00:26:27 2020 +0800 + + Update base_energy.py + + instantiate vehicle to have all the properties of VehicleParams() + +commit 4461995aacb3b80423aeb511d84715dec3cd2906 +Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> +Date: Mon Jun 8 00:45:54 2020 +0800 + + Update toyota_energy.py + +commit 9ae25785efed7a74e1b2991a7e2ba88f24199ebb +Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> +Date: Mon Jun 8 00:42:48 2020 +0800 + + Update power_demand.py + +commit f747be3c78c9f7a575432b8b492c443a3915c601 +Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> +Date: Mon Jun 8 00:39:55 2020 +0800 + + Update base_energy.py + +commit 372335bc0995e4d158cb90466d19ab1315034b79 +Author: liljonnystyle +Date: Sat May 30 01:22:48 2020 -0700 + + remove extra whitespace + +commit 21047646bffa7ebfb8f20010f7c5d0356477f100 +Author: liljonnystyle +Date: Sat May 30 01:21:39 2020 -0700 + + add get_fuel_consumption() back + + this code is actually unrelated to the energy classes being implemented, but rather the fuel consumption from SUMO + +commit be2673bc2527eeb1d288a92a67ce721f091f6b77 +Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> +Date: Sat May 30 07:42:05 2020 +0800 + + Update toyota_energy.py + +commit 3ad43b4502dec12df4643849ced4c754e2f8f0c9 +Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> +Date: Sat May 30 07:33:57 2020 +0800 + + Update power_demand.py + +commit f82dfb00cb225859112fa2e38d5affaad2929b15 +Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> +Date: Sat May 30 07:10:03 2020 +0800 + + Update base_energy.py + + added space after all commas + +commit 5558af0d3cbd303821fb14f271ab873b08c16383 +Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> +Date: Sat May 30 07:09:04 2020 +0800 + + Update base_energy.py + + Some imports removed + +commit fd4a9ccb86b62ef7e0aacb2a8a3ea0f7334c427e +Merge: 5398d219 243c8951 +Author: liljonnystyle +Date: Wed May 27 14:01:05 2020 -0700 + + Merge branch 'i210_dev' into jc-energy-class + +commit 243c895181f9498ebdda25a01434badbfe9b1add +Merge: 7ab2b3e9 16697871 +Author: liljonnystyle +Date: Wed May 27 10:05:56 2020 -0700 + + Merge pull request #939 from flow-project/jl-more-accel-outputs + + Add several accelerations to custom output + +commit 16697871d63f735a90aad66ace14b5d757ce73e0 +Author: liljonnystyle +Date: Wed May 27 10:05:09 2020 -0700 + + addressing comments + +commit 7ab2b3e9469e0c9f4cb6a382158db2b2a3766179 +Merge: 3a501dab 7f68c503 +Author: Akash Velu <31679538+akashvelu@users.noreply.github.com> +Date: Wed May 27 09:25:09 2020 -0700 + + Merge pull request #952 from flow-project/av-emission-path + + Fixed trajectory_table_path + +commit 7f68c503945c14eec9ca81fab228759d50668b39 (origin/av-emission-path) +Author: akashvelu +Date: Wed May 27 09:21:09 2020 -0700 + + Fixed trajectory_table_path + +commit c3756f8745cac215ec7f53845aa439d5aac4ef74 +Author: akashvelu +Date: Wed May 27 09:07:46 2020 -0700 + + Fixed trajectory_table_path + +commit 86458115b1f2f4d1f59755fae484daa8af4b00dc +Author: liljonnystyle +Date: Tue May 26 17:07:41 2020 -0700 + + minor docstring formatting + +commit cbf6a420b727f5bf1d60a9bf8ff7cef92bbfe5ae +Author: Yasharzf +Date: Tue May 26 15:15:05 2020 -0700 + + removed duplicated print + +commit 528f0aace706fc8a3de99aba720bda7c0eb309b4 +Author: Yasharzf +Date: Tue May 26 15:14:00 2020 -0700 + + fixed docstrings + +commit b49dbce1cfa3d18e191b51547e2dbd4848a7bb3a +Merge: b5f54245 53cf0356 +Author: Yasharzf +Date: Tue May 26 14:59:49 2020 -0700 + + fixed merge conflicts + +commit 5398d2191dea100474af8442a6ed3a83fe462caa +Author: liljonnystyle +Date: Tue May 26 14:58:15 2020 -0700 + + rename get method + +commit 3e849631fd5c85ed2c8f8d465137f0dc35626ad6 +Author: liljonnystyle +Date: Tue May 26 14:55:40 2020 -0700 + + fix typo + +commit 53cf035684b02668fa2116942c75b02cd4398d29 (origin/yashar_fail_safe) +Author: Yasharzf +Date: Tue May 26 14:22:16 2020 -0700 + + removed json file which was added by mistake + +commit ddf6a2435d0c2ca7eafe0dd6292ec574626bd397 +Author: Yasharzf +Date: Tue May 26 14:12:23 2020 -0700 + + added failsafe methods for max accel/decel and speed limit, and all + +commit 3c6dcf71c0ac4219e13da3a3a58471a69dfc88d1 +Author: Yasharzf +Date: Tue May 26 13:38:08 2020 -0700 + + added apply acceleratino function which uses setSpeed() method instead of slowDown() + +commit 4106217b1bcdb5608621b8faf3b3ef57dbdd9363 +Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> +Date: Wed May 27 00:12:16 2020 +0800 + + Energy models for power_demand and toyota + + These are child classes of the base_energy class. + +commit eae12b7f0e47f52780773108064bf9767923554e +Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> +Date: Wed May 27 00:07:23 2020 +0800 + + update traci.py + + applied comments from from previous PR. + +commit 1aeb97d9be915f558ec3025f861e0283e4610319 +Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> +Date: Tue May 26 23:55:40 2020 +0800 + + energy.py changed to base_energy.py + + This python file describes the base energy file which will serve as the parent class of the power demand model and toyota energy models. + +commit 9475e152e1cd91097b7a45b08aa4199d56c56379 +Merge: 32527f80 3a501dab +Author: liljonnystyle +Date: Mon May 25 21:14:39 2020 -0700 + + Merge branch 'i210_dev' into jc-energy-class + +commit b5f54245250bb96c9ef03d606a5dad04345aaae0 +Merge: 8eee7722 3a501dab +Author: liljonnystyle +Date: Mon May 25 21:11:49 2020 -0700 + + Merge branch 'i210_dev' into jl-more-accel-outputs + +commit 8eee7722bc28ae05ac330e741e33ee9b659391a2 +Author: liljonnystyle +Date: Mon May 25 18:03:02 2020 -0700 + + rename trajectory table + +commit d2ba0694ef7cf0e4f6c913d4e855011fbcdc76e2 +Author: liljonnystyle +Date: Mon May 25 18:00:46 2020 -0700 + + revert accidental change + +commit 4f2f23ec7d47bff699baeac9bf8810af68f2f465 +Author: liljonnystyle +Date: Mon May 25 17:58:58 2020 -0700 + + add return carriage to eof + +commit 69f6f5536a3be4d885652471c3008da258e58416 +Author: liljonnystyle +Date: Mon May 25 17:57:41 2020 -0700 + + rm deleted file + +commit 27e2960cbee48680627ada7ada16befd833052c8 +Merge: d8884057 151e3b21 +Author: liljonnystyle +Date: Mon May 25 17:56:30 2020 -0700 + + fix merge conflicts + +commit d88840578f88c70da428d829b7b9d22024d6bf52 +Author: liljonnystyle +Date: Mon May 25 16:57:52 2020 -0700 + + fix rebase errors + +commit df182ad6c820b1fd2b05db9ce6a305aee248cec5 +Author: liljonnystyle +Date: Sun May 24 23:20:29 2020 -0700 + + fix accel with noise with failsafe output + +commit fceedf874599c68852aa8feb016921b12abd358e +Author: liljonnystyle +Date: Wed May 20 21:31:20 2020 -0700 + + Add several accelerations (with/without noise, with/without failsafes) to custom output + +commit 38af177a02bd47cc691201083f4192f61fa2dedc +Author: liljonnystyle +Date: Wed May 20 21:51:46 2020 -0700 + + remove trailing whitespaces + +commit d66a0ab6542a6075ce9495991790afadf8a4d3e4 +Author: liljonnystyle +Date: Wed May 20 21:47:44 2020 -0700 + + fix flake8 issues + +commit b3f15a3c2a4527b59139ed1d9198f68110c93270 +Author: liljonnystyle +Date: Wed May 20 21:44:15 2020 -0700 + + update queries with new column names + +commit 077983206ea4454190ffa98987dc81e4ba5d2954 +Author: liljonnystyle +Date: Wed May 20 21:31:20 2020 -0700 + + Add several accelerations (with/without noise, with/without failsafes) to custom output + +commit 28d4f73c4170c05b8fde403d8a6148347d2d1351 +Author: liljonnystyle +Date: Sun May 24 21:29:11 2020 -0700 + + fix bug in vehicle power demand + +commit 3df23123743b183a737adb0c7f29516771f2d353 +Author: liljonnystyle +Date: Wed May 20 11:49:38 2020 -0700 + + specify power demand model names + +commit d7da535e81b50dd7b14b2cbb5c72d8cd65fa1825 +Author: Brent Zhao +Date: Tue May 19 21:47:19 2020 -0700 + + style fixed + +commit 498e08aa1f35d2c37bb1551b35b5d8c98635afa4 +Author: liljonnystyle +Date: Tue May 19 21:04:56 2020 -0700 + + remove whitespace + +commit 2563818e4e31cf61606f53955a7b7aed35557a7b +Author: liljonnystyle +Date: Tue May 19 20:59:00 2020 -0700 + + add back ray import + +commit f4fa42632a13c17b76ba49e73d67d13559f19062 +Author: liljonnystyle +Date: Tue May 19 20:51:14 2020 -0700 + + remove blank lines after docstrings + +commit a799abda655a821b66828b44669210c8a8dd35ea +Author: liljonnystyle +Date: Tue May 19 20:45:08 2020 -0700 + + remove dupe imports + +commit 7e549be514a427b1877f19cab3ecb603a02c4f50 +Author: Brent Zhao +Date: Tue May 19 21:18:43 2020 -0700 + + update lambda function, change partition into multi-column + +commit 6884960aecf8adb4704143b17383fcddd2aa0ffa +Author: Brent Zhao +Date: Tue May 19 15:56:53 2020 -0700 + + get up to date with i210_dev + +commit b5be92ac038b118b4055ef6489612a9836cf00f2 +Author: Brent Zhao +Date: Tue May 19 15:28:54 2020 -0700 + + fix some style issue + +commit c7cd96303620e97530bceb9507a085d6e4089cc9 +Author: Brent Zhao +Date: Tue May 19 13:41:17 2020 -0700 + + fix some query string formatting issue + +commit 32c052866e2d750fb4e4911c06320cb89ccd3157 +Author: liljonnystyle +Date: Tue May 19 10:44:06 2020 -0700 + + move partition condition to cte's + +commit d578e6337b117316ce9d0633c7e18070ec27d6dc +Author: liljonnystyle +Date: Tue May 19 08:52:17 2020 -0700 + + rename vehicle power demand query + +commit e45eb92cc420836fa297c0ccceb2d93d88d06359 +Author: liljonnystyle +Date: Tue May 19 08:42:29 2020 -0700 + + reformatting energy queries + +commit 420ea3f798d00e2a79260b82b79092f304ee9b72 +Author: Brent Zhao +Date: Tue May 19 04:10:43 2020 -0700 + + some minor issue fixed + +commit 72d4733f07458a2863bb2c95cb7ef75c89935d33 +Author: Brent Zhao +Date: Tue May 19 04:07:29 2020 -0700 + + fix trailing white space style issue + +commit 6af7e02c86ddfbce78851d2c85a2042ae3b9ea6c +Author: Brent Zhao +Date: Tue May 19 04:01:41 2020 -0700 + + added auto upload to s3 feature for the reply scipt and fix some other minor issues + +commit fdd983eb19b7a4acd75b9101568dfa8441c86294 +Author: Brent Zhao +Date: Thu Apr 23 12:58:44 2020 -0700 + + fix some more style issues + +commit 979d0476fbd2e3308d4bc75f0fc3576306ae6ad5 +Author: Brent Zhao +Date: Thu Apr 23 12:38:47 2020 -0700 + + reorganized file locations + +commit de35f9009e9de0c75de7ba4c1eccdccac794e877 +Author: Brent Zhao +Date: Thu Apr 23 12:35:54 2020 -0700 + + fix style issue + +commit 00a526b43f8ee069c768b27629233b074ca60260 +Author: Brent Zhao +Date: Thu Apr 23 02:54:33 2020 -0700 + + fix windoes line ending issue with experiment.py + +commit aa14dbf247bbe5610d4f3741ed81581152596293 +Author: Brent Zhao +Date: Wed Apr 22 05:22:01 2020 -0700 + + added more support for lambda function + +commit 8d4ad2904bb76afeb6c03cd8d90d8ea1e038df15 +Author: Brent Zhao +Date: Fri Apr 10 19:54:30 2020 -0700 + + multiple runs issue solved, testing added + +commit 3af559503e36d69c4f1481ee405778aab01c6840 +Author: Brent Zhao +Date: Mon Apr 6 15:28:57 2020 -0700 + + datapip pipeline implemented + +commit 0ee66469dcb5f21d542a57b464b3ad5fe7b11008 +Author: Eugene Vinitsky +Date: Wed Mar 18 16:43:22 2020 -0700 + + Add an on ramp option + +commit bc8584a30d3736169d9c0f985ddc677d34144dfd +Author: Brent Zhao +Date: Mon May 18 12:28:17 2020 -0700 + + removed the old tests + +commit 638f9b4ff1a7baec698264f2f2cdbb35d507b669 +Author: Brent Zhao +Date: Mon May 18 12:25:00 2020 -0700 + + change the bucket to a common bucket + +commit 3b10524a6830986f3ec446907a9655a08c3f85dd +Author: Brent Zhao +Date: Sun May 10 23:03:35 2020 -0700 + + including next_V for testing only + +commit c97021992460a6d628ad769c289975f83bdf9628 +Author: Brent Zhao +Date: Sat May 9 22:06:30 2020 -0700 + + added new two new quries + +commit e7ac1a9afa6513f0cb425a2e37c3db26b259f6f0 +Author: Brent Zhao +Date: Thu Apr 23 13:02:33 2020 -0700 + + fix one more style issue + +commit ddc53fb03ae5474c6c2faf2627feb11a6bdac7da +Author: Brent Zhao +Date: Thu Apr 23 12:58:44 2020 -0700 + + fix some more style issues + +commit 5a3ff57fb2d70f2736a9f1ba091aa5730d7006d4 +Author: Brent Zhao +Date: Thu Apr 23 12:38:47 2020 -0700 + + reorganized file locations + +commit 65c9ee061541b4e9660bf54d241a603dabf77e95 +Author: Brent Zhao +Date: Thu Apr 23 12:35:54 2020 -0700 + + fix style issue + +commit ee1188ec7b5796aeb96bc7de89c5d9bfd10168de +Author: Brent Zhao +Date: Thu Apr 23 02:54:33 2020 -0700 + + fix windoes line ending issue with experiment.py + +commit dc881e06442f642538320c1792dec529abad6086 +Author: Brent Zhao +Date: Wed Apr 22 05:22:01 2020 -0700 + + added more support for lambda function + +commit c3b2a51aa3fcf2c60c0678e7e3c385febf11d867 +Author: Brent Zhao +Date: Fri Apr 10 19:54:30 2020 -0700 + + multiple runs issue solved, testing added + +commit 7d52445fdaa2f6ef358bad6cd58f6b26775a4f36 +Author: Eugene Vinitsky +Date: Tue Mar 24 22:49:17 2020 -0700 + + Add 1 lane highway network for Benni + +commit 505d646beb9814daaa527f417740f8309a9f1c85 +Author: Eugene Vinitsky +Date: Thu Mar 19 12:10:07 2020 -0700 + + Upgrade the network to not have keepclear value on the junctions + +commit e4c02bb1f5513e905f2ea0c5e635d3946fe4d38a +Author: Eugene Vinitsky +Date: Thu Mar 19 11:32:12 2020 -0700 + + Increased inflows to 10800 to match density in Bennis ring + +commit ebb29215ad82c0b2a6b89625ea1b899b5587420a +Author: Eugene Vinitsky +Date: Wed Mar 18 16:43:22 2020 -0700 + + Add an on ramp option + +commit 36e8851f7f7ae71a25b2d5ca5a927396b9e1e41a +Author: Yashar Zeinali Farid <34227133+Yasharzf@users.noreply.github.com> +Date: Sat May 9 15:31:44 2020 -0700 + + changed _departed_ids, and _arrived_ids in the update function (#926) + + * changed _departed_ids, and _arrived_ids in the update function + + * fixed bug in get_departed_ids and get_arrived_ids + +commit a4c7d67758bd4187f176e1b5f1f63bc12a10af81 +Author: Yashar Zeinali Farid <34227133+Yasharzf@users.noreply.github.com> +Date: Thu May 7 23:51:53 2020 -0700 + + get not departed vehicles (#922) + + * added function to kernel/vehicle to get number of not departed vehiles + + * fixed over indentation of the docstring + + * indentation edit + + * pep8 + + Co-authored-by: AboudyKreidieh + +commit 1111e9aa34a4ce46058ec282255c43d03b117123 +Author: chendiw <31671291+chendiw@users.noreply.github.com> +Date: Tue Apr 21 15:14:31 2020 -0700 + + moved imports under functions in train.py (#903) + + * deleting unworking params from SumoChangeLaneParams + + * deleted unworking params, sublane working in highway + : + + * moved imports inside functions + + * Apply suggestions from code review + + * bug fixes + + * bug fix + + Co-authored-by: Aboudy Kreidieh + +commit 0ade197b74f7ec0a5a4890e419d605ff3933f824 +Author: liljonnystyle +Date: Tue May 19 21:04:56 2020 -0700 + + remove whitespace + +commit 0d5fa6bda67aca96014b8be335cde547b47d7f7b +Author: liljonnystyle +Date: Tue May 19 20:59:00 2020 -0700 + + add back ray import + +commit 306a01fe55f3e756931098e306d03872602b88b2 +Author: liljonnystyle +Date: Tue May 19 20:51:14 2020 -0700 + + remove blank lines after docstrings + +commit 89f8d1d504a4e4c98bc564967c1490f0718774cd +Author: liljonnystyle +Date: Tue May 19 20:45:08 2020 -0700 + + remove dupe imports + +commit a88c209f5fa6eb057c978c6583ab040cd11a8aa0 +Author: Brent Zhao +Date: Tue May 19 15:56:53 2020 -0700 + + get up to date with i210_dev + +commit c373e94388e8fa4399a95e377c1ba95bbdb282c3 +Author: Brent Zhao +Date: Mon Apr 6 15:28:57 2020 -0700 + + datapip pipeline implemented + +commit 8eed7e16ef8793914761a48cc6c0af30756b89d0 +Author: Eugene Vinitsky +Date: Thu Mar 19 12:10:07 2020 -0700 + + Upgrade the network to not have keepclear value on the junctions + +commit 43eeee0193d92e10ef76c9436dac903a52060157 +Author: Eugene Vinitsky +Date: Wed Mar 18 16:43:22 2020 -0700 + + Add an on ramp option + +commit 9d2026e6a3635f756417f632abd30bb8891310a9 +Author: Yashar Zeinali Farid <34227133+Yasharzf@users.noreply.github.com> +Date: Thu May 7 23:51:53 2020 -0700 + + get not departed vehicles (#922) + + * added function to kernel/vehicle to get number of not departed vehiles + + * fixed over indentation of the docstring + + * indentation edit + + * pep8 + + Co-authored-by: AboudyKreidieh + +commit 151e3b2195de3d6f9079593d0acf684489633e81 +Author: liljonnystyle +Date: Mon May 25 16:57:52 2020 -0700 + + fix rebase errors + +commit 97400c7b03b3dc211243b723327660215bf39ca0 +Merge: d6ffaa6b 97f3ccdf +Author: liljonnystyle +Date: Mon May 25 16:48:59 2020 -0700 + + rebase and fix merge conflicts + +commit d6ffaa6bb0783fe0aaf0feb09a7b2b1f9591d0b5 +Author: liljonnystyle +Date: Tue May 19 21:04:56 2020 -0700 + + remove whitespace + +commit 6c11a70281ba4673edad160ffdcf68fc4372c13a +Author: liljonnystyle +Date: Tue May 19 20:59:00 2020 -0700 + + add back ray import + +commit fc9983631ec172b624ae6dfef65eeed1eb8dce4c +Author: liljonnystyle +Date: Tue May 19 20:51:14 2020 -0700 + + remove blank lines after docstrings + +commit 34cecff822badd955a79ee8c773640875e6bea2b +Author: liljonnystyle +Date: Tue May 19 20:45:08 2020 -0700 + + remove dupe imports + +commit 5878eae7cc27e766085362b478beb2abe1f51933 +Author: Brent Zhao +Date: Tue May 19 15:56:53 2020 -0700 + + get up to date with i210_dev + +commit c18ec58b8a1e0a036b111649dbd2b0f05bd28c55 +Author: Brent Zhao +Date: Mon Apr 6 15:28:57 2020 -0700 + + datapip pipeline implemented + +commit 9b649efbda97a80f3c926ec1fc9838b76f27aa60 +Author: Eugene Vinitsky +Date: Thu Mar 19 12:10:07 2020 -0700 + + Upgrade the network to not have keepclear value on the junctions + +commit 0a83576b80c2955ac8e09f88e0b159c836a887c4 +Author: Eugene Vinitsky +Date: Wed Mar 18 16:43:22 2020 -0700 + + Add an on ramp option + +commit 36086521fff4c3e3d0728423e36af15bfa242403 +Author: Yashar Zeinali Farid <34227133+Yasharzf@users.noreply.github.com> +Date: Thu May 7 23:51:53 2020 -0700 + + get not departed vehicles (#922) + + * added function to kernel/vehicle to get number of not departed vehiles + + * fixed over indentation of the docstring + + * indentation edit + + * pep8 + + Co-authored-by: AboudyKreidieh + +commit 3a501dab148900d2d5f3a17f7af7232acf1eb059 +Author: Brent Zhao +Date: Mon May 25 15:59:26 2020 -0700 + + fix minor string formatting issue in the query + +commit 8941cea6c2f8d9f7c0a2674ce273c6cc9dbe61f9 +Merge: eac7730c 3b93994d +Author: Brent Zhao +Date: Mon May 25 15:19:31 2020 -0700 + + Merge pull request #912 from flow-project/datapipeline_dev + + Datapipeline Dev + +commit 3b93994d4be805e9b12d79906e29857eeca76312 (origin/datapipeline_dev) +Author: liljonnystyle +Date: Mon May 25 14:31:43 2020 -0700 + + update energy query to MVP params + +commit d0df0a3d9271584c80c26fe691d7d2cb4a70f5f4 +Author: liljonnystyle +Date: Mon May 25 14:27:50 2020 -0700 + + revert temporary change + +commit e9e66a77e5ea38e2deda69ae46191d3aeee72723 +Author: liljonnystyle +Date: Mon May 25 14:27:27 2020 -0700 + + remove extra_init() in favor of collections.defaultdict() + +commit 97f3ccdf34d4fb1323a25d479abc4ccab616c8f1 +Author: liljonnystyle +Date: Sun May 24 23:20:29 2020 -0700 + + fix accel with noise with failsafe output + +commit 5bb70741986345cc01d0db71148828c1d111d526 +Merge: 215d4abb 863f3608 +Author: liljonnystyle +Date: Sun May 24 22:23:04 2020 -0700 + + Merge branch 'jl-more-accel-outputs' of https://github.com/flow-project/flow into jl-more-accel-outputs + +commit 215d4abb938e7b7032f227b9a2e6997092164bc6 +Author: liljonnystyle +Date: Wed May 20 21:51:46 2020 -0700 + + remove trailing whitespaces + +commit 92a745dd3d517135f3bef6b69782c212ffbfd336 +Author: liljonnystyle +Date: Wed May 20 21:47:44 2020 -0700 + + fix flake8 issues + +commit d192a9f5dc1ca2622875cd26997198c1889d213c +Author: liljonnystyle +Date: Wed May 20 21:44:15 2020 -0700 + + update queries with new column names + +commit 87dcff271ac1aa5450516f2592940eddeb149fe4 +Author: liljonnystyle +Date: Wed May 20 21:31:20 2020 -0700 + + Add several accelerations (with/without noise, with/without failsafes) to custom output + +commit 57b42ca5544b72a5d6641ac38c50f9677117d940 +Author: liljonnystyle +Date: Sun May 24 21:29:11 2020 -0700 + + fix bug in vehicle power demand + +commit eac7730cd2da0d400f97bb90b43c2e79e0937a5a +Merge: 3d16a5ad 3b7364b9 +Author: Kathy Jang +Date: Fri May 22 11:52:11 2020 -0700 + + Merge pull request #942 from flow-project/slowdown_i210 + + Slowdown i210 + +commit 32527f805a587dfc821b4f3ea845d6f9ebf7e9fb +Author: liljonnystyle +Date: Thu May 21 23:02:26 2020 -0700 + + revert some inadvertent changes + +commit 9bda1ebe5f76c0c0764c9d1f890debb0a9a1e76d +Author: liljonnystyle +Date: Thu May 21 23:00:59 2020 -0700 + + revert some inadvertent changes + +commit 8843b3bc3238d2d605351b99cfa73ac5ee33faf6 +Author: liljonnystyle +Date: Thu May 21 22:24:41 2020 -0700 + + New energy class to inventory multiple energy models + +commit 3b7364b9ee26642d8c9700874541899de447de9a (origin/slowdown_i210) +Author: Kathy Jang +Date: Thu May 21 12:41:32 2020 -0700 + + Updated ray_autoscale and requirements.txt + +commit 863f360809eac6fad1ae26eba0b197759a7c666c +Author: liljonnystyle +Date: Wed May 20 21:51:46 2020 -0700 + + remove trailing whitespaces + +commit df0bb664e80e5fe9819c6246663b8602212da243 +Author: liljonnystyle +Date: Wed May 20 21:47:44 2020 -0700 + + fix flake8 issues + +commit 951c755672a37bffcec0ac723545746b5e1d0e73 +Author: liljonnystyle +Date: Wed May 20 21:44:15 2020 -0700 + + update queries with new column names + +commit da243f946c109259e4c75943bd24515dd4d9e516 +Author: liljonnystyle +Date: Wed May 20 21:31:20 2020 -0700 + + Add several accelerations (with/without noise, with/without failsafes) to custom output + +commit 0ea7ffc571c441e0d6b4c8c42d0edc4df7186fc5 +Author: liljonnystyle +Date: Wed May 20 11:49:38 2020 -0700 + + specify power demand model names + +commit a60b023d233335c2a0f4776f404d5a79f47e9b02 +Author: Brent Zhao +Date: Tue May 19 21:47:19 2020 -0700 + + style fixed + +commit d4923f6a76f3d3f8756c41021c24d50e72bf3094 +Author: Brent Zhao +Date: Tue May 19 21:37:12 2020 -0700 + + remove the IDM config file from another campus + +commit efa60f79f096f44f5b12fcbf70fa57c344d0a587 +Author: Brent Zhao +Date: Tue May 19 21:32:39 2020 -0700 + + style fix + +commit 9d690d4b05eaa2617f5e8a9005442c69a6600de4 +Merge: 7306298d 18a88bca +Author: Brent Zhao +Date: Tue May 19 21:19:05 2020 -0700 + + Merge branch 'datapipeline_dev' of https://github.com/flow-project/flow into datapipeline_dev + +commit 7306298d97fbaa1fd03fb9f4a4ea816631b300b5 +Author: Brent Zhao +Date: Tue May 19 21:18:43 2020 -0700 + + update lambda function, change partition into multi-column + +commit 18a88bcaef5b677a1f81e65beb9dbab6d3a17f29 +Author: liljonnystyle +Date: Tue May 19 21:04:56 2020 -0700 + + remove whitespace + +commit 4d206b374e843ee611f46d5519de62119d8fb1b2 +Author: liljonnystyle +Date: Tue May 19 20:59:00 2020 -0700 + + add back ray import + +commit 6b5111b93db5760235d05f26e6ef163591b36497 +Author: liljonnystyle +Date: Tue May 19 20:51:14 2020 -0700 + + remove blank lines after docstrings + +commit e6db29b9d6013b541f9e066383f1aa7f3090f885 +Author: liljonnystyle +Date: Tue May 19 20:45:08 2020 -0700 + + remove dupe imports + +commit 437f8cf4103626bae222268b3e9380f397f26469 +Author: Brent Zhao +Date: Tue May 19 15:56:53 2020 -0700 + + get up to date with i210_dev + +commit aa02ac983fbe922464d39dd6a4623669e1036a5b +Merge: 78e47457 e9c3f8de +Author: Brent Zhao +Date: Tue May 19 15:29:33 2020 -0700 + + Merge branch 'datapipeline_dev' of https://github.com/flow-project/flow into datapipeline_dev + +commit 78e47457c034dce1cfbe3d18695ba6ff2a466159 +Author: Brent Zhao +Date: Tue May 19 15:28:54 2020 -0700 + + fix some style issue + +commit e9c3f8ded5e9a5e5e27f335a633b18efc71c071f +Merge: f43d0e43 3d16a5ad +Author: Brent Zhao +Date: Tue May 19 15:23:49 2020 -0700 + + Merge branch 'i210_dev' into datapipeline_dev + +commit f43d0e43a0b4ef158a15c680d4e3131bd7dee0fb +Author: Brent Zhao +Date: Tue May 19 13:41:17 2020 -0700 + + fix some query string formatting issue + +commit 3d16a5ad4e308da3628354191f14b2c949a59526 +Author: Eugene Vinitsky +Date: Tue May 19 15:53:30 2020 -0400 + + Ev i210 highway updated (#937) + + Merge in wave calibration for the straight road @AboudyKreidieh + +commit f021d5a6381e777eaea0a917b6a8f7e95ca3a1e0 +Author: liljonnystyle +Date: Tue May 19 10:44:06 2020 -0700 + + move partition condition to cte's + +commit 8a68fb93be587339fc1535b5c58c5e79731e1cd7 +Author: liljonnystyle +Date: Tue May 19 08:52:17 2020 -0700 + + rename vehicle power demand query + +commit 1dcf6a654f59a2c36406b3b6cf732e1fac79d3fb +Author: liljonnystyle +Date: Tue May 19 08:42:29 2020 -0700 + + reformatting energy queries + +commit c2513e9e1d0f22065e513c34e8edee178bef1602 +Author: Brent Zhao +Date: Tue May 19 04:10:43 2020 -0700 + + some minor issue fixed + +commit 462f4bb877a6e179ed27a926e0e660e9b37d6700 +Author: Brent Zhao +Date: Tue May 19 04:07:29 2020 -0700 + + fix trailing white space style issue + +commit 27445157469851cf146b7eb4b08d811929155033 +Author: Brent Zhao +Date: Tue May 19 04:01:41 2020 -0700 + + added auto upload to s3 feature for the reply scipt and fix some other minor issues + +commit c01f235891baa45b8af010e730e0daeefb557ae5 +Author: Brent Zhao +Date: Mon May 18 12:49:11 2020 -0700 + + fix merge issue in i210_replay + +commit b0689fecbceba9c3ca65c74606c37e3b00b6e824 +Merge: 78499d07 0f45dbe3 +Author: Brent Zhao +Date: Mon May 18 12:43:57 2020 -0700 + + Merge branch 'i210_dev' into datapipeline_dev + +commit 78499d071c4a9dc9a6c611b375c85ad1a80b3f82 +Merge: 2851e8a6 4b834647 +Author: Brent Zhao +Date: Mon May 18 12:35:58 2020 -0700 + + merge conflict resolved + +commit 2851e8a6b7089756c33a4519f6148c373b763a77 +Author: Brent Zhao +Date: Mon May 18 12:28:17 2020 -0700 + + removed the old tests + +commit 153da9d7dfd6b811c13634284f06000dceca9842 +Author: Brent Zhao +Date: Mon May 18 12:25:00 2020 -0700 + + change the bucket to a common bucket + +commit 0f45dbe356b79067915e933f5795ab3760d69930 +Author: Eugene Vinitsky +Date: Mon May 18 14:06:22 2020 -0400 + + Mpg reward2 (#933) + + Add an MPG and MPJ reward + +commit 3468747c4f824fcefcfc7b80ad3a695b4e8ae5d3 +Author: Kanaad Parvate +Date: Thu May 14 11:51:26 2020 -0700 + + Replay Improvement / Fixes (#905) + + * added aggressive driver and made modifications to replay scripts + + * add numpy import + + * some more small changes and cleanup + + * remove aggressive driver + + * added distribution plots + + * Fixed minor but common matplotlib error + + * merge + + Co-authored-by: Kathy Jang + +commit bdd6068b9326f984b886037f9572b01013df2e05 +Author: Brent Zhao +Date: Sun May 10 23:03:35 2020 -0700 + + including next_V for testing only + +commit 5d5606acad5b7f60c2eed3a3c67060d465d75733 +Author: Brent Zhao +Date: Sat May 9 22:06:30 2020 -0700 + + added new two new quries + +commit 6335dd847ef95b4e672616f27293bd612f8f6e1c +Author: Brent Zhao +Date: Thu Apr 23 13:02:33 2020 -0700 + + fix one more style issue + +commit 3bd49eca1b39d998abbc2c4fbbbb737dd58786cc +Author: Brent Zhao +Date: Thu Apr 23 12:58:44 2020 -0700 + + fix some more style issues + +commit 23783bd6e70f471189c929086be0a5e0a18e7797 +Author: Brent Zhao +Date: Thu Apr 23 12:38:47 2020 -0700 + + reorganized file locations + +commit 29ebdb70d4ab1203edfee65d9d50bb03785ea235 +Author: Brent Zhao +Date: Thu Apr 23 12:35:54 2020 -0700 + + fix style issue + +commit 8f05ec596edfe048487fcabf830b9cd04cedaf04 +Author: Brent Zhao +Date: Thu Apr 23 02:54:33 2020 -0700 + + fix windoes line ending issue with experiment.py + +commit 221bb9319a1df6e7550ecf18804278e6584ca4ea +Author: Brent Zhao +Date: Wed Apr 22 05:22:01 2020 -0700 + + added more support for lambda function + +commit bd13f693bd58522dfa69b11c15bc12f26b862772 +Author: Brent Zhao +Date: Fri Apr 10 19:54:30 2020 -0700 + + multiple runs issue solved, testing added + +commit 48e2642bd6da2be5696c2649eb73f1351b94769c +Author: Brent Zhao +Date: Mon Apr 6 15:28:57 2020 -0700 + + datapip pipeline implemented + +commit edfd1496f0fb85c7798526b8c23bc22b331ad2cc +Author: Eugene Vinitsky +Date: Tue Mar 24 22:49:17 2020 -0700 + + Add 1 lane highway network for Benni + +commit d99b8b7271bbd6231b93b3035d837028257db490 +Author: Eugene Vinitsky +Date: Thu Mar 19 12:41:31 2020 -0700 + + Convert inflows to pick out the best lane to travel in instead of a random lane + +commit 37161a60991187f71d20effb03b527481f657030 +Author: Eugene Vinitsky +Date: Thu Mar 19 12:10:07 2020 -0700 + + Upgrade the network to not have keepclear value on the junctions + +commit 1a36503ba19034f1bd11891fc13896b22f7d5c25 +Author: Eugene Vinitsky +Date: Thu Mar 19 11:32:12 2020 -0700 + + Increased inflows to 10800 to match density in Bennis ring + +commit 1db687e557ffab1d4caffb0b3a72cc647d806892 +Author: Eugene Vinitsky +Date: Wed Mar 18 16:43:22 2020 -0700 + + Add an on ramp option + +commit 5080514630615d232f3b9caf75c57c1623bdca7f +Author: Yashar Zeinali Farid <34227133+Yasharzf@users.noreply.github.com> +Date: Sat May 9 15:31:44 2020 -0700 + + changed _departed_ids, and _arrived_ids in the update function (#926) + + * changed _departed_ids, and _arrived_ids in the update function + + * fixed bug in get_departed_ids and get_arrived_ids + +commit aa1d7133bda5d89c54cd5a68a792a83e9e0f09cc +Author: Yashar Zeinali Farid <34227133+Yasharzf@users.noreply.github.com> +Date: Thu May 7 23:51:53 2020 -0700 + + get not departed vehicles (#922) + + * added function to kernel/vehicle to get number of not departed vehiles + + * fixed over indentation of the docstring + + * indentation edit + + * pep8 + + Co-authored-by: AboudyKreidieh + +commit bb3c14cfdbb742eca861a3846d6016aa0b237384 +Author: Eugene Vinitsky +Date: Sun May 3 23:47:51 2020 -0700 + + Benchmark fix (#919) + + * Add the appropriate reward to the grid benchmark back + + * Put the bottleneck in a congested regime + + * Bump bottleneck inflows to put it in the congested regime + +commit 771e504a413cdf0720de6304df7ebc48db43ddca +Author: Aboudy Kreidieh +Date: Sat May 2 02:51:06 2020 -0700 + + Bando / ghost edge (#917) + + * added bando model + + * added ghost edge to the highway network + + * added highway-single example + + * bug fixes + + * more tests + +commit 6ef1f0f231d3a3e643b0ee74b540846826733ff5 +Author: chendiw <31671291+chendiw@users.noreply.github.com> +Date: Tue Apr 21 15:14:31 2020 -0700 + + moved imports under functions in train.py (#903) + + * deleting unworking params from SumoChangeLaneParams + + * deleted unworking params, sublane working in highway + : + + * moved imports inside functions + + * Apply suggestions from code review + + * bug fixes + + * bug fix + + Co-authored-by: Aboudy Kreidieh + +commit ba2e214c6d263c2e8b107f8edde1666f3cf282d9 +Author: Eugene Vinitsky +Date: Fri May 8 15:43:03 2020 -0700 + + Add option to reroute exiting vehicles back into the network (#918) + + Add option to reroute exiting vehicles back into the network + +commit d15f19b0d5ca4529374d62553f4dd677c39f5008 +Author: Kanaad Parvate +Date: Tue May 5 11:14:57 2020 -0700 + + fix train multiagent_i210 (#915) + +commit eb67d2804574f20c42f64c974e8df4e8f722532a +Author: Kathy Jang +Date: Tue Apr 28 12:57:47 2020 -0700 + + New AMI with ray 0.8.0, tensorflow 2.1.0, h-baselines, stable-baselines (#916) + +commit 4b8346470714678ed2a50883a32ce60c79681ac6 +Author: Brent Zhao +Date: Thu Apr 23 13:02:33 2020 -0700 + + fix one more style issue + +commit 2177ef6e66af579530a003e961fb5302852bbb33 +Author: Brent Zhao +Date: Thu Apr 23 12:58:44 2020 -0700 + + fix some more style issues + +commit c429bf267f6ec18ecf1c9647ea637a490438ee36 +Author: Brent Zhao +Date: Thu Apr 23 12:38:47 2020 -0700 + + reorganized file locations + +commit 517499ee2d832deb266a0b86e8785ca105a63547 +Author: Brent Zhao +Date: Thu Apr 23 12:35:54 2020 -0700 + + fix style issue + +commit e84952580b1c7aeb3809593313121169872790d2 +Author: Brent Zhao +Date: Thu Apr 23 02:54:33 2020 -0700 + + fix windoes line ending issue with experiment.py + +commit 1759b027dbf24354e050bce3c6c6705092c2d6ec +Author: Brent Zhao +Date: Wed Apr 22 05:22:01 2020 -0700 + + added more support for lambda function + +commit 47057758ba3cf84dd125ac102fd0bae6681ac91a (origin/kj_temp) +Author: Eugene Vinitsky +Date: Wed Apr 15 20:24:51 2020 -0700 + + Evinitsky/straight road pr (#909) + + Add a straight road training environment. Swap out the reward for a desired velocity squared reward. + +commit adcc61787729ec7a60af1bb5e294f1df2eeca825 +Author: Brent Zhao +Date: Fri Apr 10 19:54:30 2020 -0700 + + multiple runs issue solved, testing added + +commit 073d828c2e6b7f3361056f01320b14e585c48a9b +Merge: 1100d8d2 5e3e8874 +Author: Kathy Jang +Date: Thu Apr 9 14:59:45 2020 -0700 + + Merge pull request #901 from flow-project/time_space_fixes + + Time space fixes + +commit 5e3e88742197c0587423b35c0ec9a9457ad75cf0 +Author: Kathy Jang +Date: Thu Apr 9 11:50:44 2020 -0700 + + style + +commit 4ce53319e4768cae17f866f3cfc9686db9080ae7 +Author: Brent Zhao +Date: Mon Apr 6 15:28:57 2020 -0700 + + datapip pipeline implemented + +commit 1100d8d2223014ea3919bbf553f7498d9c69bd60 +Author: Kanaad Parvate +Date: Sun Apr 5 22:41:18 2020 -0700 + + I210 Replay Script (#886) + + Replay script for the i210 env. + +commit d04f1440c7f3e953ac8cdddcc591b75f2800a13b +Author: Eugene Vinitsky +Date: Tue Mar 31 13:43:29 2020 -0700 + + Python upgrade (#895) + + - Upgrade python + - Clean up AMI + +commit 861c31e21d042471d9ea3be54d9ab0145d4321ff +Author: Eugene Vinitsky +Date: Tue Mar 31 11:49:58 2020 -0700 + + Noise fix (#894) + + * Add an option for a local reward that just computes speed of the AV and its follower + + * Set the noise scaling to match Bennis suggestions + +commit ba2ff131f64db344b8d928ff290266653680213f +Author: Eugene Vinitsky +Date: Mon Mar 30 11:56:15 2020 -0700 + + Add an option for a local reward that just computes speed of the AV and its follower (#891) + +commit 27f325b9fd9031f027b32732d195b808167ee980 +Author: Kanaad Parvate +Date: Sun Mar 29 16:21:59 2020 -0700 + + missed a flake8 + +commit eec0a02b430238c3a7ce4f05de0f04fb362d6e2b +Author: Kanaad Parvate +Date: Sun Mar 29 16:20:28 2020 -0700 + + flake and pydocstyle + +commit 91144cae9ddb0651603ab32b8652ca11cf7f9579 +Author: Eugene Vinitsky +Date: Thu Mar 26 12:46:39 2020 -0700 + + Add current dev version of multiagent I210 + +commit 5603f035581c6db19c3c7f6fcc8ab1378fbd215b +Author: Aboudy Kreidieh +Date: Wed Mar 25 10:24:39 2020 -0700 + + bug fix for num_rl_vehicles during reset (#884) + +commit 903bb729ccd6f4ad174ceac639a6665ded59d131 (origin/circles/model_dev) +Author: Eugene Vinitsky +Date: Tue Mar 24 22:49:17 2020 -0700 + + Add 1 lane highway network for Benni + +commit 0166e419330ba56c16df84a413bedb78e65be2b4 +Author: Aboudy Kreidieh +Date: Tue Mar 24 13:38:06 2020 -0700 + + support for h-baselines (#874) + + * started adding support for h-baselines + + * some cleanup + + * some cleanup + + * pydocstyle + + * added test to parse_args + + * working support for multiagent envs + + * added tests for train_h_baselines + + * maybe a bug fix + + * maybe a bug fix + + * one more try + + * helping out coveralls + + * got rid of broken test + + * pep8 + +commit d6ed510694f97cfa2a76539b481ec2c81a920144 +Author: zpymyyn +Date: Mon Mar 23 22:09:09 2020 +0200 + + specify python version for pip install (#859) + + To avoid error caused by multiple versions of python and pip + +commit 5869c581ca884af61902cea9e6acfe52a7b15e80 +Author: Eugene Vinitsky +Date: Thu Mar 19 12:41:31 2020 -0700 + + Convert inflows to pick out the best lane to travel in instead of a random lane + +commit 661564baeaec5f1be107a65b4ba3a4f6ea727c8c +Author: Eugene Vinitsky +Date: Thu Mar 19 12:10:07 2020 -0700 + + Upgrade the network to not have keepclear value on the junctions + +commit b8d12126b09bbf2552b27c5ed35887ec078dad97 +Author: Eugene Vinitsky +Date: Thu Mar 19 11:32:12 2020 -0700 + + Increased inflows to 10800 to match density in Bennis ring + +commit 35f5b5f1b96e6ca9db6175b0fd9ccdcfb30bff6b +Author: Kathy Jang +Date: Thu Mar 19 11:18:07 2020 -0700 + + Added code to output json. Added code to resolve macOS matplotlib import error + +commit 4c49ab74022a613a713f93a4ff7828821dec8cad +Author: Kathy Jang +Date: Thu Mar 19 10:32:47 2020 -0700 + + Fixed issue 840 (#841) + +commit 2eac0da8ecb3dbdbc45fd6efcca2718c9207fc12 +Author: Eugene Vinitsky +Date: Wed Mar 18 18:25:53 2020 -0700 + + The acceleration noise is now scaled by the sqrt of the sim step as suggested by Benni + +commit bdaa306aafe44d7caa47bd54084248868b0b4e27 +Author: Eugene Vinitsky +Date: Wed Mar 18 16:43:22 2020 -0700 + + Add an on ramp option + +commit d1688c6d533d5370b7f20b6776ddf191a7b32377 +Author: zpymyyn +Date: Tue Mar 17 21:22:34 2020 +0200 + + add pip in yml to avoid wrong-version pip (#858) + +commit d3c5c831b46cc4a09c698b1b683e1205d6d73817 +Author: Eugene Vinitsky +Date: Tue Mar 17 12:21:37 2020 -0700 + + Add ballistic integration as an option (#873) + + * Add ballistic integration as an option + + * bug fix + + Co-authored-by: AboudyKreidieh + +commit f72760b1d383b4b1d5af04d4c4355b89dbde28a5 +Author: Eugene Vinitsky +Date: Tue Mar 17 11:01:03 2020 -0700 + + Add energy reward from benni/joy (#864) + + * Add energy reward from benni/joy + + * Add tests + +commit 4e47f7aae7e3e94e75afdafd92a1ce8a749710ce +Author: Lucia Cipolina Kun +Date: Tue Mar 17 16:00:23 2020 +0000 + + singleagent_traffic_light_grid (#871) + + Fix high value of traffic light + +commit 80f3c47f55ce167dcf27164783234894d43ddda0 +Author: Eugene Vinitsky +Date: Thu Mar 12 17:21:41 2020 -0700 + + I210 merge (#839) + + Add I210 network + +commit 2df2afd80ba6a72deae43f11d67cba18310bdf8f +Author: Kanaad Parvate +Date: Wed Mar 11 15:42:14 2020 -0700 + + train from checkpoint (#853) + +commit e2e50775c91352d7b7fc566b4bc77e0c05f25ae8 +Author: Kanaad Parvate +Date: Mon Mar 9 17:10:47 2020 -0700 + + rendering fix (#861) + +commit 7d632c7c3d0c01912020f14cff9212289f0edd94 +Author: Aboudy Kreidieh +Date: Wed Mar 4 20:56:08 2020 -0800 + + Add flag auto_color flag to SumoParams and disable coloring if flag is off. (#849) + + * color specification + + * keep backward compaitble try/except + + * auto_update -> force_color_update, false by default + + * not in flake8 + + * i'm stupid this is better + + * add color to type params + + * added comments + +commit d4886d957e2a1b6bd251b64a19d1b286aad2cbcc +Author: Aboudy Kreidieh +Date: Wed Mar 4 14:37:49 2020 -0800 + + Add a nonlocal example of follower stopper as requested (#846) + + * Add a nonlocal example of follower stopper as requested + + * Make v_des nonlocal + +commit 32927677e6db72c68393aa3433f9e813485619ac +Author: zpymyyn +Date: Sun Mar 1 23:33:20 2020 +0200 + + usage argument correction (#843) + + * usage argument correction + + * usage argument correction 2 + + * usage argument correction 3 + +commit 8dba645b7de4205b5558c6277b3d6507c1d0fbbb +Author: Aboudy Kreidieh +Date: Thu Feb 27 13:34:43 2020 -0800 + + removed dt parameter from IDMController (#837) + +commit 4cd30ee686a5dffcd05b3989bd76db1d75c11f83 +Author: Aboudy Kreidieh +Date: Thu Feb 27 13:34:26 2020 -0800 + + fixed sims_per_step done bug (#838) + + this was causing experiments to end prematurely if sims_per_step > 1 + +commit bc65245504e590604ffa3a49376e3367c318a475 +Author: Eugene Vinitsky +Date: Fri Feb 21 18:53:04 2020 -0800 + + Fix the extra ray windows that pop up (#836) + +commit 3e8fc0ccc5130012e54fc9b882b72a3f857ce75e +Author: Aboudy Kreidieh +Date: Tue Feb 18 16:31:20 2020 -0800 + + Multiagent environments (#818) + + * renamed MultiAgentAccelEnv -> AdversarialAccelEnv and it's dependents as well + + * added MultiAgentAccelPOEnv + + * bug fix + + * bug fix + + * added MultiAgentWaveAttenuationPOEnv + + * added MultiAgentMergePOEnv + + * added tests + + * test to observed + + * added reset to wave attenuation env + + * test to observed in wave attenuation env + + * added figure eight example + + * added multiagent merge example + + * renamed multiagent_ring -> lord_of_the_rings + + * added an additional test + + * added multiagent ring example + + * test not being hit + + * added time debugger + + * bug fix to done mask + + * bug associated with warmup steps + +commit 7dc20963f0db1cb0edf892611e88d6866866dd13 +Author: Eugene Vinitsky +Date: Mon Feb 17 08:44:41 2020 -0800 + + Update README.md (#832) + +commit 509791145866f933bc6647614d88c85291549a54 +Author: chendiw <31671291+chendiw@users.noreply.github.com> +Date: Mon Feb 10 18:39:27 2020 -0800 + + deleting unworking params from SumoChangeLaneParams, sublanes working (#830) + + * deleting unworking params from SumoChangeLaneParams + + * deleted unworking params, sublane working in highway + : + + * Apply suggestions from code review + + * bug fix + + Co-authored-by: Aboudy Kreidieh + +commit 363d003b47c71916dc6c736ff270c6e5b560fe0a +Author: Dominik Kleiser +Date: Fri Jan 31 19:35:38 2020 +0100 + + Fix path to ring simulation (#822) + + Signed-off-by: Dominik Kleiser + +commit 5eac69157ace8e691f951b6d6d39425d0a9711d6 +Author: Ashkan Y +Date: Tue Jan 21 01:18:23 2020 -0800 + + Tutorial for multiagent (#808) + + * Creating tutorial for multi-agent + + * some cleanup + + * Making sure the jupyter file runs completely + + Co-authored-by: Aboudy Kreidieh + +commit 1f015dfa040acd7f90d0e8612a930ebfd79d0a4b +Merge: 5ceaf085 47cf2891 +Author: Ashkan Y +Date: Fri Jan 10 11:41:27 2020 -0800 + + Merge pull request #814 from flow-project/update_experiment + + Make render true by default in examples + +commit 47cf289102fc0a915da73aa700496aaac27febf5 +Author: Ashkan Y +Date: Fri Jan 10 11:14:28 2020 -0800 + + make render true by default + +commit 5ceaf0857bd833ca1d1109bee3a06e9d5384e698 +Merge: 6930f1e3 e52e5314 +Author: Ashkan Y +Date: Thu Jan 9 14:05:30 2020 -0800 + + Merge pull request #805 from flow-project/traffic_light_tests + + traffic light grid examples + +commit 6930f1e3c02a0fa0fbf3c98bb1ea50c7de347d61 +Author: Ashkan Y +Date: Wed Jan 8 09:09:10 2020 -0800 + + Combine train_rllib.py and train_stable_baseline.py (#812) + + * Make train.py single file + + * flake8 + + * Fix remaining files + + * Few bug fixes + + * PR fix + + Co-authored-by: Aboudy Kreidieh + +commit 55e39f1119924191ec4f207159438899ee24eee9 +Author: Aboudy Kreidieh +Date: Wed Jan 8 19:08:48 2020 +0200 + + remove remaining rllab (#757) + + * removed most uses of rllab. Bug pending + + * added description that separate py files are needed + + * bug fix + + * cleanup to tutorials + + Co-authored-by: Ashkan Y. + +commit e52e53147704f319749cd5aea489b11ed577104b +Author: Ashkan Y +Date: Tue Jan 7 11:43:38 2020 -0800 + + Flake8 + +commit 9f1c990dbb4e832968392e47a9541d75fd735c28 +Author: Ashkan Y +Date: Tue Jan 7 11:29:55 2020 -0800 + + Fixed multi agent traffic light grid + +commit e85caf3afb6bda4c643bac164ad6b8b43b2e2dad +Merge: e46a5aa2 d61e0c99 +Author: AboudyKreidieh +Date: Sun Jan 5 23:02:48 2020 +0200 + + Merge branch 'master' of https://github.com/flow-project/flow into traffic_light_tests + +commit d61e0c99e95b882755d50a28a2137bbe23674c5c +Author: Aboudy Kreidieh +Date: Sun Jan 5 22:48:12 2020 +0200 + + added plotly 2.4.0 dependency (#758) + +commit f35f7b91e5dd16eed3250de26416597ad754691c +Author: Ashkan Y +Date: Sun Jan 5 12:27:09 2020 -0800 + + Update remaining files to match with new way of running experiments (#803) + + * Update evaluate.py to match with new way of runnign experiments + + * flake8 issues + + * bug fix + + * bug fix + + Co-authored-by: Aboudy Kreidieh + +commit 824c613bbc79daccee21e5ba7acc24fd6e99daf1 +Author: Ashkan Y +Date: Sun Jan 5 09:56:47 2020 -0800 + + Fix sim_params in the tutorials (#807) + + * Update tutorials + + * Update all tutorials + + * Apply suggestions from code review + + Co-authored-by: Aboudy Kreidieh + +commit d2cd8934599e7f27e6cf39b6563519bdedd841f8 +Author: Ashkan Y +Date: Sun Jan 5 09:56:01 2020 -0800 + + Update tutorials to match with the new way of running experiments (#802) + + * unused parameter + + * Update tutorials according to the new example folder + + * Adding final changes to the tutorials + + * Correct the env_name and network in flow_params + + * bug fix + + Co-authored-by: Aboudy Kreidieh + +commit 5bbbf88354219a5390e85c2a770e64c04beda79c +Author: Radu Stochitoiu +Date: Sun Jan 5 15:49:39 2020 +0200 + + Correct typo (#810) + +commit a876a55c8be3e10e0842bfdae72decc124c7d078 +Author: Radu Stochitoiu +Date: Sun Jan 5 15:49:11 2020 +0200 + + Correct typo (#809) + + Modified "founded" to "found". + +commit e46a5aa2c8b1ae4240462f39f5141a6bae46289d +Author: Ashkan Y +Date: Fri Dec 27 16:53:55 2019 -0800 + + Imrpove naming of the tests in test_examples + +commit 0007f89a40096a0cbd66a5af6cf8999a1380a6a7 +Author: Ashkan Y +Date: Fri Dec 27 16:44:43 2019 -0800 + + traffic light grid multiagent fix + +commit 1a44c3f2d1b889ff97a7e71e7b41b7fe1b30126c +Author: Aboudy Kreidieh +Date: Tue Dec 24 10:16:50 2019 +0200 + + New example folder (#720) + + * better file names for environments + + * change base_scenario.py to base.py for consistency + + * change WaveAttenuationMergePOEnv to MergePOEnv for consistency + + * initial pass at modifying examples page + + * changed "loop" to "ring" in envs + + * Renamed "loop" to "ring" in scenarios + + * More rename "loop" to "ring" + + * Final commit for "loop" to "merge" + + * merge multiagent_envs into envs + + * changed all apperance of green wave to traffic light grid + + * Fixed names for scenarios so that they match the environments. Everything is uniform now + + * moved scenario files to network and renamed Scenario->Network + + * removed all non-aimsun mentioned of scenario + + * added pending deprecation warning for scenario use + + * Removing cooperative_merge (later we called it "TwoRingsOneMerge" + + * pep8 + + * added deprecation warning for scenario to env input + + * Refactoring new files that are added after pulling from master + + * Change 'grid' to 'traffic_light_grid' across all files + + * addressed flake8 issues + + * PR fixes + + * PR fix + + * Fixed test_visualiszer.py errors + + * working version of simulate.py + + * bug fixes + + * fixed tests for simulate + + * cleanup + + * added script for running single agent rllib experiments + + * added multiagent rllib support to examples + + * Remove data.json + + * pydocstyle fixes + + * pep8 + + * modified some examples + + * added stable baselines support + + * bug fix + + * added aimsun template to exp_configs + + * added missing files + + * Update README.md + + * Update readme to reflect how to run examples, and to add all the examples + + * Renamed several files so the new naming matches our new naming convention + + * Update readme, flow_setup, change example paths in files + + * Update tutorial 00 for the new structure of examples + + * Rename density_exp and also update the ray_auoscale.yaml + + * fix train_rllib + + * fix pep8 issues + + * fix test for highway + + * check multiagent file name, remove HTTPS + + * properly update config dictionary + + * Fix the follwoing multiagent examples:{figure_eight, highway, ring} + + * Resolve flake8 issues + + * Fix errors in test_experiment_base_class + + * Fixing class TestCollisions with the new way of running experiments + + * pep8 + + * Fix errors in test_contollers + + * Fix the tests with ring_road_exp_setup + + * flake8 + + * Revert "flake8" + + This reverts commit 52d1a099fcc9c89a82a36362f4061cfa4451b8ce. + + * Revert "Fix the tests with ring_road_exp_setup" + + This reverts commit 1659fb3582b2078dd5a8cea56cd8817c810800b0. + + * Fix all tests that use setup_scripts + + * pep8 + + * Fix benchmark tests + + * (Thanks Kanaad) Fix the error that was causing many benchmarks and examples fail + + * Resolve merge conflict + + * Fix test_experiment_base_class errors + + * Fix test_collisions errors + + * Trying isolating bug + + * Testing to see if TestVisualizerRLlib is the issue + + * Testing if test_benchmarks is the problem + + * Revert "Testing if test_benchmarks is the problem" + + This reverts commit 050f5db2cf54f7ba69df08e367f430f393ba6c47. + + * Revert "Testing to see if TestVisualizerRLlib is the issue" + + This reverts commit 42978c49ec0ada00c78d9944780691e3f61febd1. + + * Revert "Trying isolating bug" + + This reverts commit c359d8fc9c8c32d000c102b5a2622a11e23660df. + + * trying to see if the error is in slow tests + + * Trying to see if test_examples or test_visualizers is the issue + + * Trying to see where the error occurs in fast_tests + + * See if example rename is the issue + + * typo + + * some minor cleanup + + * fixed some tests + + * resolved multiple registery calls bug + + * Fixing the random start of vehicles on ring + + * Fixing the bug that comes up randomly + + * Trying to remove randomness + + * flake8 issues + + * Remove unnecessary debugging code + + * update the hierarchy of exp_config to be more logical + + * Update examples/README.md + + Co-Authored-By: Aboudy Kreidieh + + * Update examples/README.md + + Co-Authored-By: Aboudy Kreidieh + + * Address aboudy's comments + + Co-authored-by: Nathan Lichtlé + Co-authored-by: Ashkan Y. + Co-authored-by: Kanaad Parvate + +commit 2a084f42ff3f625c8c5debec4913b8567b0cfa68 +Merge: ac23278f 99daa202 +Author: Ashkan Y +Date: Mon Dec 23 11:21:51 2019 -0800 + + Merge pull request #798 from flow-project/env_name_fix + + update tutorial 00 to reflect the new folder of multiagent env + +commit 99daa202742dc8ed74d2b7d3a0a76605503bd370 +Author: Ashkan Y +Date: Mon Dec 23 00:15:26 2019 -0800 + + update tutorial 00 to reflect the new folder of multiagent env + +commit ac23278fbb092e878d2d67d3ad6324eeef3ab9a3 +Author: Isaacb +Date: Tue Dec 17 21:19:01 2019 -0600 + + Checked for edge case where vehicle speeds is empty (#795) + +commit 97b962a48d054df1127b066dbef7b294b5d8cf9c +Author: Damian Dailisan +Date: Mon Dec 2 05:02:34 2019 +0800 + + render to video using sumo-gui (#784) + + * render to video using sumo-gui + + * flake + + * allow usage of sumo_gui in render + + * cleanup + +commit 7ff781588ff23f42af00b9b01a5720f85959d1d0 +Author: Zhongxia Yan +Date: Mon Nov 25 15:38:19 2019 -0500 + + changed visualizer rllib to not open SUMO unnecessarily (#788) + + * changed visualizer rllib to not open SUMO unnecessarily + +commit 44e21a3a711c8f08fc49bf5945fb074e9f41c61d +Author: Eugene Vinitsky +Date: Thu Nov 21 20:08:54 2019 -0500 + + (Bug): Change loop network to ring network in tutorial 8 (#786) + +commit 27f0cfd0b382b535736568b0f154add08b89c6ce +Author: GilbertBahati <41528944+gilbertbahati@users.noreply.github.com> +Date: Wed Nov 20 13:06:15 2019 -0800 + + added the Gipps car folowing model- first order model (#776) + + * added the Gipps car folowing model- first order model + + * added the Gipps car folowing model- first order model_ + + * tests for GippsController + +commit 7a99a567d9fbc8e857e49c42c5d539b29562fb6a +Author: Eugene Vinitsky +Date: Thu Nov 7 16:14:26 2019 -0800 + + Update README.md (#775) + +commit c6fcf4fa688d54a59fe3168e5e21c1fb58c222f5 +Author: Yashar Zeinali Farid <34227133+Yasharzf@users.noreply.github.com> +Date: Wed Nov 6 14:13:53 2019 -0800 + + Aimsun 8 4 install guide (#774) + + * added troubleshooting for Aimsun 8.4 installation + + * fixed bug - aimsun sitepackage installation guide + + * minor edits + +commit 2b9e7a2863f59836ba0f6a3f202787721afb75cb +Author: Damian Dailisan +Date: Mon Nov 4 20:16:08 2019 -0800 + + Running multiple aimsun instances while training (#766) + + * Use port to generate unique auxiliary files + + * open multiple copies of ang file to avoid conflict + + * flake + +commit 4ff791b3af6c7d06f9ccc8148e9c6b97bdd19745 +Author: Kathy Jang +Date: Wed Oct 30 13:59:07 2019 -0700 + + Updated versions for lxml and cloudpickle (#762) + + * Updated versions for lxml and cloudpickle + + * Updated lxml for environment.yml + +commit 61f36f2bdd1012a49df58f49b5aedfb447294551 +Author: Kathy Jang +Date: Mon Oct 28 21:51:37 2019 -0700 + + Fixed multi-agent open network __done__ bug (#767) + +commit f174056b29f5a3ffe789562eaf91f2820dca1235 +Author: Zhongxia Yan +Date: Sat Oct 26 16:50:04 2019 -0400 + + disable stdout when invoking flow scripts (#763) + +commit 0a188f500051a643edbac6d89b3adc1e0e2eccce +Author: Damian Dailisan +Date: Thu Oct 24 14:28:45 2019 -0700 + + Aimsun communication port no longer hardcoded (#761) + +commit 0b518f6d402f8369579c99a35dcb5fcf349d4763 +Author: Eugene Vinitsky +Date: Tue Oct 22 17:49:05 2019 -0700 + + (Bug): Fix the observation space in Multi wave attentuation env + +commit 4a27159dd92c818f9c23dac8d18e63b2a37d139e +Author: Nathan Lichtlé +Date: Tue Oct 15 06:24:14 2019 +0200 + + New visualization tutorial (#635) + + * start rewriting tuto5 + + * new visualization tutorial + + * Add example to visualization tutorial + + * Print path where emission file is generated + + * Add trained ring policy for visualization tutorial + + * Display path of CSV emission file generated by --gen-emission + + * Rename section + + * removed rllab, added updated trained policy + +commit 054d3937af3082595f074bb58067e23e48df93cb +Author: Damian Dailisan +Date: Mon Oct 14 21:09:10 2019 -0700 + + Aimsun fixes (#753) + + * get rid of save prompt in aimsun + + * bug: getLanesLength2D sums all lane lengths + + * was using wrong key for speed limit + + * add flow directory to PYTHONPATH + + * length2D is the proper way to get edge length + +commit 1906340e1fdfcd3623e718a6698b03fef04688b5 +Author: Ashkan Y +Date: Mon Oct 14 16:16:07 2019 -0700 + + Changed the remaining old names (#754) + +commit 84a7249a4378340080f6aadaf7a8a759df7302c8 +Author: kevin-thankyou-lin <33344633+kevin-thankyou-lin@users.noreply.github.com> +Date: Sat Oct 12 12:12:52 2019 -0700 + + Update tutorial 11 (#751) + + * modify flow/config for aimsum + + * fixed tutorial 11 typos and updated import modules + + * Fix tutorial 11 inflow depart_speed speedLimit param + + * Fixed tutorial 11, replaced speedLimit with max and set one departure speed as a constant + + * Revert "Fixed tutorial 11, replaced speedLimit with max and set one departure speed as a constant" + + This reverts commit 77ebb92af71daa38a35911b3864d6f4795e78259. + + * replace speedLimit with max and used a constant for a departure speed + +commit 5eaa30e8d759036e93bbe490081994a8bca8fbf2 +Author: Yashar Zeinali Farid <34227133+Yasharzf@users.noreply.github.com> +Date: Tue Oct 8 13:05:07 2019 -0700 + + Fixed Aimsun Bugs (#750) + + * Fix bugs in utils/aimsun/load.py + + 1. Updated the path to data.json + 2. Added a check before querying centroid_config.origin_centroids and centroid_config.destination_centroids to prevent erroring out when the model doesn't have origin or destination centroids set. + + * Fixed bug + + * bug fixed + + * deleted the json files + + * PR fixes + +commit 67d1a5298e55dcac83e77768348e6f6e61cfab97 +Author: Nicholas Liu +Date: Tue Oct 8 12:45:23 2019 -0700 + + Cleaned up tutorial07 run history and fixed LuSTScenario directories (#748) + +commit 375fac9b424ab3d5cb989030abfc9d49a2416ea8 (origin/routes) +Author: Umang Sharaf +Date: Fri Oct 4 16:45:11 2019 -0700 + + Fix bugs in utils/aimsun/load.py (#746) + + * Fix bugs in utils/aimsun/load.py + + 1. Updated the path to data.json + 2. Added a check before querying centroid_config.origin_centroids and centroid_config.destination_centroids to prevent erroring out when the model doesn't have origin or destination centroids set. + + * Fixed bug + + * Renamed in more places + +commit 2418b649a9c69a41abf0ae6d7780057273d53449 +Author: Alben Bagabaldo <36107964+albenbagabaldo@users.noreply.github.com> +Date: Wed Oct 2 19:07:16 2019 -0700 + + Update for setup_aimsun.sh (#744) + + * Addressing issue #743 + + This is a fix for Conda having removed support for Python 2.7.4 and not being able to run setup_aimsun.sh + + * Uncommented the two lines of code + + I've also changed the comment, so people know the purpose of adding the two lines of code. + +commit 0d425fb41af4b999520b10f08255a390d826b464 +Merge: fc76d031 4dadba3c +Author: Umang Sharaf +Date: Wed Oct 2 11:58:06 2019 -0700 + + Merge pull request #745 from flow-project/umangs94-patch-ring + + Change flow.networks.loop to ring to fix module error + +commit 4dadba3c55dd484306808b1735e4177049f7a13e +Author: Umang Sharaf +Date: Wed Oct 2 11:39:20 2019 -0700 + + Changing loop to ring to fix module error + + There is no flow.networks.loop anywhere, so this should be changed to flow.networks.ring + +commit fc76d03174cae3da2b1f84efffcec5a98c3980c6 +Author: kevin-thankyou-lin <33344633+kevin-thankyou-lin@users.noreply.github.com> +Date: Mon Sep 30 18:26:17 2019 -0700 + + Update Installation Instructions (#742) + + * Update flow_setup.rst: add python setup.py develop + + We need the line "python setup.py develop" for the SUMO GUI to load. Otherwise, we'll get a ModuleNotFound Error. + + * Update flow_setup.rst + + I've moved the command "python setup.py develop" up to the setup instructions itself (i.e. directly after activating the conda environment). + + I've also updated "source activate" and "source deactivate" to "conda activate" and "conda deactivate", since "source" no longer works for Anaconda versions >= 4.6. + + Finally, I've deleted the repeated instructions on "Testing your installation" for RLlib. There were two of the same sections for Testing your installation for RLlib, and the content of second one was just a shortened version of the first one. + +commit 180e063e2b77db17179e78a5d933d9601b736bbd +Author: Damian Dailisan +Date: Fri Sep 27 14:13:32 2019 -0700 + + use environment variables (#740) + + * use environment variables + +commit 3c010946fb6303c7ef6afd764532e6f3943875b7 +Merge: 26ffa1ca c73a8817 +Author: Damian Dailisan +Date: Wed Sep 25 15:03:41 2019 -0700 + + Merge pull request #719 from flow-project/passing_env_instances + + Allows passing of Env and Scenario instance through flow_params. + + Passing of strings will be deprecated, but backwards functionality is provided. + +commit c73a8817edc8b7ba75b4fb6dd4dd099122f00e33 +Author: AboudyKreidieh +Date: Tue Sep 24 14:14:30 2019 -0700 + + bug fixes to tests + +commit 30914f1557789d6aa7be743b7707d0b2e97c75e6 +Author: damian +Date: Tue Sep 24 13:27:01 2019 -0700 + + tests still assumed strings were being passed + +commit 9d78375cc772b9b3e5a0775ef88e74209a413bcb +Author: AboudyKreidieh +Date: Tue Sep 24 12:46:24 2019 -0700 + + updated tutorial + +commit 26ac0e3f0a9d3b01255ef06886bfa58151ae31ca +Author: AboudyKreidieh +Date: Tue Sep 24 12:38:34 2019 -0700 + + replaced strings with classes in all examples and benchmarks + +commit d8cc47b3567ef28dbfb448f9d6e1b3923e3794e5 +Merge: 7c4b2953 26ffa1ca +Author: AboudyKreidieh +Date: Mon Sep 23 21:22:34 2019 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow into passing_env_instances + +commit 7c4b2953539c74c7e89d208612e80c2dde2ee308 +Author: damian +Date: Mon Sep 23 15:12:17 2019 -0700 + + should not expect strings from `get_flow_params`. + +commit 26ffa1ca8c7bed12a6ad034c5aa019df3e8f4f0a +Author: Kanaad Parvate +Date: Mon Sep 23 14:30:57 2019 -0700 + + Upgrade ray to 0.7.3 (#732) + + * upgrade ray from master + + * pull kparvate/upgrade_ray_2 + + * update benchmark scripts to only run ppo, and set 14 cpus + + * length includes internal lengths, added no_internal_length + + * flake + + * make aboudy's changes + + * fix + + * checkout origin/master in autoscale.yaml + + * added upadted pkl results for rllib + + * updated obs space of multiagent highway, fixed multiagent features in visualizer_rllib + + * upgraded numpy, setuptools + + * bug fixes + +commit ae539f3d647b380f1984fbfccc7672a470355efb +Author: damian +Date: Mon Sep 23 14:25:30 2019 -0700 + + remove trailing whitespace + +commit 85f966d7e57065664d40e9a6ad65e9a036229269 +Author: damian +Date: Mon Sep 23 14:21:15 2019 -0700 + + cleaned up implementation, pass Network as a class + +commit b49d918f61c534a1b0914e7423e68967a7c493db +Author: Eugene Vinitsky +Date: Mon Sep 23 11:30:10 2019 -0700 + + Update README.md (#737) + +commit 5305911ae2e8667f58387c81a9d10d67120b6eec +Author: damian +Date: Wed Sep 18 11:05:15 2019 -0700 + + added line to comply with flake8 + +commit 5b1a0045f8f0a613be8d604169557af462e7982b +Author: damian +Date: Fri Sep 13 21:39:44 2019 -0700 + + encode whole module name for reloading with visualizer_rllib.py + +commit 9c3e08eded305fcd190462ecd469c8fa635f90ea +Merge: 8e270c5f bd49a788 +Author: damian +Date: Fri Sep 13 21:32:11 2019 -0700 + + merge scenario -> network changes + +commit bd49a7882fa645b9b2a706c60482e3236544766d +Author: Aboudy Kreidieh +Date: Thu Sep 12 01:36:05 2019 -0700 + + scenarios -> networks [do not merge] (#698) + + * better file names for environments + + * change base_scenario.py to base.py for consistency + + * change WaveAttenuationMergePOEnv to MergePOEnv for consistency + + * changed "loop" to "ring" in envs + + * Renamed "loop" to "ring" in scenarios + + * More rename "loop" to "ring" + + * Final commit for "loop" to "merge" + + * merge multiagent_envs into envs + + * changed all apperance of green wave to traffic light grid + + * Fixed names for scenarios so that they match the environments. Everything is uniform now + + * moved scenario files to network and renamed Scenario->Network + + * removed all non-aimsun mentioned of scenario + + * added pending deprecation warning for scenario use + + * Removing cooperative_merge (later we called it "TwoRingsOneMerge" + + * pep8 + + * added deprecation warning for scenario to env input + + * Refactoring new files that are added after pulling from master + + * Change 'grid' to 'traffic_light_grid' across all files + + * addressed flake8 issues + + * PR fixes + + * PR fix + + * Fixed test_visualiszer.py errors + + * bug fixes + + * Remove data.json + + * bug fix + + * added deprecation support + + - added a deprecation function for classes and functions + - renames deprecation_warning ->deprecated_attribute + - added deprecation warnings for all old names of environments + - updated version to 0.5.0.dev + + * pep8 + + * pydocstyle + + * added deprecation warnings to changed scenarios + + * added deprecation warning for the multiagnet environments + + * pydocstyle + + * cleanup + +commit 8e270c5f250c6c9c5ef9be1ffd533e88a51805be +Author: damian +Date: Wed Sep 11 20:55:42 2019 -0700 + + remove trailing whitespace + +commit 38cfb6cb260a81c370b44674f80246c7eb5e84e4 +Author: damian +Date: Wed Sep 11 20:38:51 2019 -0700 + + Allows passing of Env instance through flow_params + +commit f4ed943661f7d098813de759432b210136da7508 +Author: Nathan Lichtlé +Date: Tue Sep 10 22:35:29 2019 +0200 + + Better folder structure and file names (#625) + + * better file names for environments + + * change base_scenario.py to base.py for consistency + + * change WaveAttenuationMergePOEnv to MergePOEnv for consistency + + * changed "loop" to "ring" in envs + + * Renamed "loop" to "ring" in scenarios + + * More rename "loop" to "ring" + + * Final commit for "loop" to "merge" + + * merge multiagent_envs into envs + + * changed all apperance of green wave to traffic light grid + + * Fixed names for scenarios so that they match the environments. Everything is uniform now + + * Removing cooperative_merge (later we called it "TwoRingsOneMerge" + + * Refactoring new files that are added after pulling from master + + * Change 'grid' to 'traffic_light_grid' across all files + + * addressed flake8 issues + + * Fixed test_visualiszer.py errors + + * Remove data.json + + * added deprecation support + + - added a deprecation function for classes and functions + - renames deprecation_warning ->deprecated_attribute + - added deprecation warnings for all old names of environments + - updated version to 0.5.0.dev + + * pep8 + + * pydocstyle + + * added deprecation warnings to changed scenarios + + * added deprecation warning for the multiagnet environments + + * pydocstyle + + * added two missing deprecated files + +commit ad1bc36b5ef4cdbb492a2020441a4720fa4cf94b +Author: Aboudy Kreidieh +Date: Mon Sep 9 11:48:55 2019 -0700 + + added TRPO runner to benchmarks (#713) + + * added TRPO runner to benchmarks + + * added tests for TRPO runner + + * pep8 + + * delete created file + +commit b72040e1ab56e99b0a67b20cfb15eb5aa287acf1 (tag: v0.4.1) +Author: Aboudy Kreidieh +Date: Tue Sep 3 17:20:17 2019 -0700 + + modified version for release (#705) + +commit c696bcf74a3151720f44be528a8f9a925f79970d +Author: Eugene Vinitsky +Date: Fri Aug 30 15:28:04 2019 -0700 + + Fix departed id counting (#704) + +commit feea3abafe2b94b3b66f66939dba45792ffb32e5 +Author: Kathy Jang +Date: Fri Aug 23 19:22:52 2019 -0700 + + Deleted rllab tutorial, renumbered bottlenecks tutorial (#699) + + Renumbered tutorials to match title, also updated README + +commit 2b5a78fc159ebc87dfa9d54a312014ac3c00eb07 +Merge: 2931df5b 5a1ba0a2 +Author: Kathy Jang +Date: Tue Aug 20 17:21:43 2019 -0700 + + Merge pull request #597 from kjang96/issue_32 + + RLlib EC2 tutorial, issue 32 + +commit 5a1ba0a228d506bcabad26aa6dcfb93205d944e3 +Author: Kathy Jang +Date: Mon Aug 5 19:13:02 2019 -0700 + + Created RLlib EC2 tutorial + +commit 2931df5bf2ed3bb2f2a2203a58d262ae08c7831e +Author: Eugene Vinitsky +Date: Tue Aug 20 09:55:57 2019 -0700 + + Evinitsky/setupfix (#694) + + Remove stable baselines from environment and requirements file. + +commit 69ac2440b9c538fceb78b8dcf28a557525c2c4f0 +Merge: 72555dec dd8f7218 +Author: Ashkan Y +Date: Mon Aug 19 22:22:18 2019 -0700 + + Merge pull request #642 from flow-project/ashkan-development + + Improving Traffic Light Tutorial + +commit dd8f72186fdaf66e447c82ad5e1ca5ceaff9b8a6 +Merge: 4c8aab68 df405216 +Author: Ashkan Y +Date: Mon Aug 19 21:53:05 2019 -0700 + + Merge branch 'master' into ashkan-development + +commit 4c8aab6840c445f3911ebd1743035e734143c7a2 +Author: Ashkan Y +Date: Mon Aug 19 21:52:49 2019 -0700 + + Last change + +commit 7e400ce8e689921a804ec92379fdca53b66c118c +Author: Ashkan Y +Date: Mon Aug 19 21:45:05 2019 -0700 + + Addressed Eugene's comments + +commit 72555decd53e9f3611d02cbf66e316d7d0abb10f +Author: Fangyu Wu +Date: Mon Aug 19 17:57:20 2019 -0400 + + Add clipping for Tuple and update gym to 0.14.0. (#685) + + * Add clipping for Tuple and update gym to 0.14.0. + +commit a34865a9011bb4b6e25b365ce826f38613d7e5a6 +Author: Eugene Vinitsky +Date: Mon Aug 19 13:39:30 2019 -0700 + + Add bottleneck tutorial (#684) + + Tutorial for bottleneck. + +commit df40521613a0c773008c40bf50caff5eedc8e445 +Merge: dd64a1c0 966fa9fa +Author: Ashkan Y +Date: Sun Aug 18 16:16:19 2019 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow + +commit 966fa9fa7f5c2282ceecd80e4621c576984cb032 +Author: Aboudy Kreidieh +Date: Sun Aug 18 15:40:30 2019 -0700 + + removed redundant tutorials (#692) + +commit 2294c947b441471a968a3f26d95a52d56dafd368 +Author: Eugene Vinitsky +Date: Wed Aug 14 22:04:34 2019 -0700 + + Kill rllab (#690) + + * Remove 99.9% of rllab + + * removed final rllab script + + * updated version number and pep8 + + * Add the renamed tutorials + + * Actually remove rllab run scripts + +commit 6dcfb91dd36c6c33329d6f1f3df2cb84c3ccb1ec +Author: Eugene Vinitsky +Date: Wed Aug 14 16:56:50 2019 -0700 + + Remove 99.9% of rllab (#664) + + Remove RLlab + +commit 93f14512a267c7203f866879a3282260448b5033 +Author: Cathy Wu +Date: Tue Aug 13 20:51:57 2019 -0400 + + Fix vehicle accounting (for multi-agent settings) (#629) + + Update the counting of the number of vehicles in the system to be less error prone. + +commit 325b02ecb63566f89bd852973629b4ec5ea0f363 +Author: Eugene Vinitsky +Date: Tue Aug 13 17:38:35 2019 -0700 + + Evinitsky/add baselines (#668) + + * First pass at adding stable baselines + + * Added all examples for stable baselines + + * Fix command execution in mac osx + + * Upgrade gym + + * Update rllib registry to pass tests + + * Add stable baselines to travis + + * Freeze stable baselines version + + * Initial vehicles are distributed across lanes in the grid now + + * Changed parsing in stable baselines + +commit fde78a4214db1af5c45902e91ad16ee1ff3f4435 +Author: Kathy Jang +Date: Mon Aug 12 16:15:27 2019 -0700 + + Updated requirements.txt such that the pip or pip3 install will actually work (#683) + +commit b4e4fc94c689b70d873929d53092504845430d0e +Author: Marsalis Gibson +Date: Mon Aug 12 16:13:34 2019 -0700 + + Usage doc (#679) + + * Added usage doc to controllers + + * Adding usage doc to params.py + + * Finish usage doc + + * pep8 and cleanup + + * Remove usage examples from params.py + +commit eebcf7fa18db9465fe921c00e573efaaff9a28bc +Author: Cathy Wu +Date: Mon Aug 12 19:05:08 2019 -0400 + + missing matplotlib dependency (#677) + +commit 9793f8e8421f23c682f2281310a3d6519e55d97c +Merge: b7f126c1 4b19afff +Author: Ashkan Y +Date: Mon Aug 12 01:45:26 2019 -0700 + + Merge branch 'ashkan-development' of https://github.com/flow-project/flow into ashkan-development + +commit b7f126c1cade43cb1cbceefb025b447d0ca52167 +Author: Ashkan Y +Date: Mon Aug 12 01:45:24 2019 -0700 + + fix typos, thanks to Eugene + +commit 0e569be643706e92661c9a9bc28f3224b3c4e1bc +Author: Nathan Lichtlé +Date: Fri Aug 9 14:06:29 2019 -0700 + + Tutorial 0 - Introduction to Flow (#656) + + * introduction draft + + * wrote part 1 + + * add notes to introduction + + * add transition at end of part 2 + + * structured tutorial + + * quick fix + + * add environments section + + * modify environments according to better-file-names PR + + * tutorial0 + + * add image + + * fix old transition + + * Minor changes to tutorial + + * Language fix + + Co-Authored-By: Eugene Vinitsky + + * Improve tutorial 0 + + * Add tutorial 0 in README + + * Replace subsections titles by horizontal lines + + * Update tutorial00_flow.ipynb + + * Last modifications to tutorial 0 + + * Correction in spelling + + Changed "refere" to "refer" + +commit cb96463747988e4607eb8710195e55a5ff9caacb +Author: Nathan Lichtlé +Date: Fri Aug 9 09:14:37 2019 -0700 + + Multi-agent training on highway with ramps (#671) + + * Default num_vehicles to 0 when adding vehicle type + + * add color_vehicles param if we don't want auto vehicle coloration + + * Add color_vehicles param in docstring + + * More params and docstring for InFlows + + * Consider new inflow params period and number when adding them in sumo + + * Complete wrt changes and add examples to inflows tutorial + + * Add images for new inflow tutorial + + * Fix allowed value for 'begin' param + + * Add precisions for kwargs + + * Fix docstyle + + * Make attribute SimParams.color_vehicles back-compatible for tests + + * Fix test_environments that expects one vehicle of each type to be added by default + + * Fix bug in case inflow generates vehicles into several routes + + * Made new highway example with on and off ramps + + * Add angle for on and off ramps + + * Modify network parameters + + * Fix docstring + + * Fix docstring + + * Fix pep8 + + * Fix pep8 + + * Fix bug of vehicles colliding + + * test highway ramps + + * Fix vehicles collision + + * Add ramps angle in additional params + + * updated python version + + * updated rllib pkl data to match new python + + * added channel to conda + + * added different channels + + * Add csv and png files to .gitignoe + + * Multi agent highway first commit + + * Add highway scenario to __init__ + + * Add multiagent highway env to __init__ + + * Cleaned example file + + * Cleaned multi-agent highway environment + + * Fix name conflict + + * Fix copy/paste from single agent env + + * Modify SumoParams + + * Fix bug when RL vehicles are inserted and no reward for them is computed + + * Color the follower vehicle as well as the leader + + * Make sure get_follower returns the closest follower + + * Fix typo + + * Added lane changing to actions + + * Change parameters + + * Continue simulation in case of crash + + * Adjust parameters + + * Store observation when vehicles teleport + + * Comment lane changing out of action space + + * Make RL vehicles stay on highway + + * Adjust warmup steps + + * pep8 + + * pydocstyle + + * Update parameters + + * some bug fixes + + * pep8 + + * bug fix + + * added tests for highway env + + * another attempt at silencing something from coverage + + * removed @ray.remote methods from coverage + +commit 92b16feee3ee62cc176aa047dbb89d3b164b972a +Author: Eugene Vinitsky +Date: Mon Aug 5 15:43:51 2019 -0700 + + Fix command execution in mac osx (#670) + +commit 5b30957047b808128c4a6091099bebc73ff78757 +Author: Cathy Wu +Date: Fri Aug 2 15:02:00 2019 -0700 + + Exception handling (#654) + + * exception handling + + * Update flow/core/kernel/vehicle/traci.py + + Co-Authored-By: Aboudy Kreidieh + +commit 4b19afff2c5a6e983096b1536a6990bc1b320138 +Merge: 3b36cc17 681d200c +Author: AboudyKreidieh +Date: Fri Aug 2 14:56:53 2019 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow into ashkan-development + +commit 681d200c77f004f797f7f8f0ca4a650063217b3a +Author: Aboudy Kreidieh +Date: Mon Jul 29 18:35:39 2019 -0700 + + delete xml emission files if creating csv versions of them (#662) + + * delete xml emission files if creating csv versions of them + + * Delete .xml emission files in visualizer (CSV is generated by default) + + * pep8 + + * bug fix + +commit 0b8503fbbe531425d004fa89d9b2e122aeacb68f +Author: Nathan Lichtlé +Date: Mon Jul 29 17:39:46 2019 -0700 + + Generic highway scenario (#667) + + * Default num_vehicles to 0 when adding vehicle type + + * add color_vehicles param if we don't want auto vehicle coloration + + * Add color_vehicles param in docstring + + * More params and docstring for InFlows + + * Consider new inflow params period and number when adding them in sumo + + * Complete wrt changes and add examples to inflows tutorial + + * Add images for new inflow tutorial + + * Fix allowed value for 'begin' param + + * Add precisions for kwargs + + * Fix docstyle + + * Make attribute SimParams.color_vehicles back-compatible for tests + + * Fix test_environments that expects one vehicle of each type to be added by default + + * Fix bug in case inflow generates vehicles into several routes + + * Made new highway example with on and off ramps + + * Add angle for on and off ramps + + * Modify network parameters + + * Fix docstring + + * Fix docstring + + * Fix pep8 + + * Fix pep8 + + * Fix bug of vehicles colliding + + * test highway ramps + + * Fix vehicles collision + + * Add ramps angle in additional params + + * updated python version + + * updated rllib pkl data to match new python + + * added channel to conda + + * added different channels + +commit fd0ad46533e7d8a80603bc32633cf8db9849ba50 +Author: Ashkan Y +Date: Sat Jul 27 18:26:43 2019 -0700 + + Add "avg_delay_specified_vehicles" to rewards.py (#658) + + * Added function "avg_delay_specified_vehicles" to rewards + + * Fixed flake8 issues + + * Fixed numpy docstyle issues + +commit b991e83933f98ff4c341f470a64fc825dd048684 +Author: Nathan Lichtlé +Date: Sat Jul 27 18:26:00 2019 -0700 + + Inflows (more features + new tuto) (#666) + + * Default num_vehicles to 0 when adding vehicle type + + * add color_vehicles param if we don't want auto vehicle coloration + + * Add color_vehicles param in docstring + + * More params and docstring for InFlows + + * Consider new inflow params period and number when adding them in sumo + + * Complete wrt changes and add examples to inflows tutorial + + * Add images for new inflow tutorial + + * Fix allowed value for 'begin' param + + * Add precisions for kwargs + + * Fix docstyle + + * Make attribute SimParams.color_vehicles back-compatible for tests + + * Fix test_environments that expects one vehicle of each type to be added by default + + * Fix bug in case inflow generates vehicles into several routes + + * mild fixes + +commit a26cc6dd8ea6c33f4e9555537ddbd8a9ac3459df +Author: Eugene Vinitsky +Date: Sat Jul 27 18:25:07 2019 -0700 + + Update bottleneck docstrings, add missing brew warning to install ins… (#660) + + * Update bottleneck docstrings, add missing brew warning to install instructions + + * pep8 + +commit a855138261a2cc5d16573d4e25a409fd8b5cd2a1 +Author: Ashkan Y +Date: Sat Jul 27 18:23:29 2019 -0700 + + Document all attributes in classes (#661) + + * add doc in merge + + * Added attribute documentation for loop_accel.py + + * Added attribute documenation for green_wave_env.py + + * added attributes for kernel/simulation/aimsun.py + + * added attributes to LaneChangeAccelPOEnv in lane_changing.py + + * added attributes to kernel.scenario.aimsun + + * Add missing attributes for base env. + + * Add missing attribute documentation to base env. + + * Add missing attribute documentation to pyglet renderer. + + * Fix pip8. + + * removed private attributes from the docstring + + * changed to 'of str' + + * Added attributes for bottleneck env + + * pep8 + + * Apply suggestions from code review + +commit 47f04157923be2aaf95a1246a8a92a73e15506ef +Merge: 800cbba5 504b85c3 +Author: Aboudy Kreidieh +Date: Wed Jul 24 12:39:44 2019 -0700 + + Merge pull request #655 from flow-project/renderer-tests + + Renderer tests + +commit 504b85c3a01c8c05d661c3d751a30adff4dffa8e +Author: Fangyu Wu +Date: Tue Jul 23 16:48:36 2019 -0700 + + Improve documentation of pyglet renderer class and remove commented code. + +commit d82dba33b819e4cfda4623d33b933f9506a177c2 +Author: Fangyu Wu +Date: Tue Jul 23 16:21:34 2019 -0700 + + Update tests/fast_tests/test_pyglet_renderer.py + + Co-Authored-By: Aboudy Kreidieh + +commit 0f2eda7febe4195afa0e487e2fe85c77f064c4a7 +Author: Fangyu Wu +Date: Tue Jul 23 16:20:37 2019 -0700 + + Update flow/renderer/pyglet_renderer.py + + Co-Authored-By: Aboudy Kreidieh + +commit 78617d00c9bced9ee39049e5088f06341bd961f3 +Author: Fangyu Wu +Date: Tue Jul 23 16:19:12 2019 -0700 + + Update flow/renderer/pyglet_renderer.py + + Co-Authored-By: Aboudy Kreidieh + +commit 800cbba54cf207ec0a66c8390fba51f391ea8f3f +Merge: f7c9797c a9c102d9 +Author: Aboudy Kreidieh +Date: Tue Jul 23 11:28:20 2019 -0700 + + Merge pull request #578 from flow-project/remove_internal_links + + Remove no_internal_links + +commit a9c102d926fcef8b1d4d21284f3d5cb44ccad44a +Author: AboudyKreidieh +Date: Tue Jul 23 10:52:26 2019 -0700 + + bug fix + +commit b9d7395f82bc7110ad72c4ce032f371684cdbf01 +Merge: 06bd502a f7c9797c +Author: AboudyKreidieh +Date: Tue Jul 23 10:51:14 2019 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow into remove_internal_links + +commit 3b36cc175d36b74b5a1543b9fd79c34ab4300e3c +Author: Ashkan Y +Date: Sun Jul 21 21:26:25 2019 -0700 + + Revert the changes. Going to add this as a new PR + +commit e45940e3b3c5e1be59fe41cef2afe70b1cc3f85d +Author: Ashkan Y +Date: Sun Jul 21 21:22:53 2019 -0700 + + Added function avg_delay_specified_vehicles + +commit 06bd502adb43873710785f83d50af5f751d0f060 +Author: AboudyKreidieh +Date: Sat Jul 20 23:51:55 2019 -0700 + + removed magic numbers + +commit f7c9797c93d7442a9c18ccd3e53dd5e315d78452 +Merge: 1f68535e 46232210 +Author: Nathan Lichtlé +Date: Sat Jul 20 23:39:15 2019 -0700 + + Merge pull request #620 from flow-project/aimsun-load + + Aimsun load template + +commit 1f68535ebfe7eee8297a3a89bb0b845c847f3882 (tag: v0.4.0) +Merge: 8672844f e815320e +Author: Nathan Lichtlé +Date: Fri Jul 19 16:48:58 2019 -0700 + + Merge pull request #647 from flow-project/fix-grid-scenario + + Quick fix grid scenario + +commit 8672844f92e345f486ca62b0e6ae79453da7d7d6 +Merge: dc91f904 3038e452 +Author: Nathan Lichtlé +Date: Fri Jul 19 16:48:27 2019 -0700 + + Merge pull request #649 from flow-project/improve-tutorials + + add common error fix to tutorials README + +commit 54cda81ea265d3df10fae588140c36edbb6aecae +Author: Fangyu Wu +Date: Fri Jul 19 01:04:45 2019 -0700 + + Update travis for full tests. + +commit 803dcfdf93678c98c4c72b13cc74003a796f6cd0 +Author: Fangyu Wu +Date: Fri Jul 19 00:51:24 2019 -0700 + + Remove xvfb-run. + +commit 5b8b0db2a55a38ee2b019a2d7a7e33a1cf0e7003 +Merge: c29965a0 78123942 +Author: Fangyu Wu +Date: Fri Jul 19 00:50:33 2019 -0700 + + Merge branch 'renderer-tests' of https://github.com/flow-project/flow into renderer-tests + +commit c29965a0e775ea200000ca62f4f3ce6fb3a27a2a +Author: Fangyu Wu +Date: Fri Jul 19 00:49:14 2019 -0700 + + Test xenial xvfb service. + +commit 78123942bf3c65d425739a827db6d9523e6a1155 +Author: Fangyu Wu +Date: Thu Jul 18 23:53:08 2019 -0700 + + Engage ablation debugging [8]. + +commit 7c8e0ef0d972a2d8f907fadfe367d9ccab804738 +Author: Fangyu Wu +Date: Thu Jul 18 23:42:02 2019 -0700 + + Engage ablation debugging [7]. + +commit c392ea17f7e606f79aed3da993c8ab282d94bf2b +Author: Fangyu Wu +Date: Thu Jul 18 23:29:33 2019 -0700 + + Engage ablation debugging [6]. + +commit ad9bae0103ae834cf3e8547fc89d1dad3515b224 +Author: Fangyu Wu +Date: Thu Jul 18 23:12:14 2019 -0700 + + Engage ablation debugging [5]. + +commit 0a89b7cfd553d4d5ebbfdb5e92ee1aaf3a9f7b16 +Author: Fangyu Wu +Date: Thu Jul 18 23:01:01 2019 -0700 + + Engage ablation debugging [4]. + +commit f2f4348b054de95b47f1edf27ca2d9c1b479f5a0 +Author: Fangyu Wu +Date: Thu Jul 18 22:47:12 2019 -0700 + + Engage ablation debugging [3]. + +commit 34863526eb8a3f1e60dc6b2610083099e96c17db +Author: Fangyu Wu +Date: Thu Jul 18 22:29:59 2019 -0700 + + Engage ablation debugging [2]. + +commit 6e9f98dab1d038e84d1682062a590313f26d7d34 +Author: Fangyu Wu +Date: Thu Jul 18 22:20:03 2019 -0700 + + Engage ablation debugging [1]. + +commit 904fa4f27a8d94d346ca82b88a62c402c09654ec +Author: Fangyu Wu +Date: Thu Jul 18 21:58:31 2019 -0700 + + Enable only fast tests. + +commit 9bd7299f13af9d95a0f6c595b83020b5c6bda129 +Author: Fangyu Wu +Date: Thu Jul 18 21:08:43 2019 -0700 + + Recover original travis yml. + +commit a02610fbc26fe062eb3080a3174b229f3ac3fe04 +Author: Fangyu Wu +Date: Thu Jul 18 20:57:41 2019 -0700 + + Add more abalation task. + +commit 700766a95a04360426a92dd8282bb9805aece7a2 +Author: Fangyu Wu +Date: Thu Jul 18 20:48:32 2019 -0700 + + Temporarily disable other tests for debugging. + +commit 86de646075dbc42d7d02e75ba9990082f7213f67 +Author: Fangyu Wu +Date: Thu Jul 18 19:50:09 2019 -0700 + + Attempt again to fix GL dependency. + +commit dfef1005e5a4d1062535c3eca5e0d2e99400e088 +Author: Fangyu Wu +Date: Thu Jul 18 19:24:20 2019 -0700 + + Add glut as travis a dependency. + +commit 7391809d41c114758081e868c6594b079b88e312 +Author: Fangyu Wu +Date: Thu Jul 18 18:53:18 2019 -0700 + + Fix dependency on GL. + +commit e5373a83b1cc31e700bf2464501c388c5a70905e +Author: Fangyu Wu +Date: Thu Jul 18 18:13:18 2019 -0700 + + Fix unit test path. + +commit 97b6a6505e3c16ff540b1dee01c0c925a20473fc +Author: Fangyu Wu +Date: Thu Jul 18 17:32:06 2019 -0700 + + Fix coding style. + +commit 4fe6aa69fa245ad7a55dbb04e6a7deeb01113e2c +Author: Fangyu Wu +Date: Thu Jul 18 17:13:26 2019 -0700 + + Increase test coverage for renderer to 96%. + +commit dc91f904343bb622aecebb8e6bd3801dd49a1663 +Merge: 3beeeb24 86260ade +Author: Nathan Lichtlé +Date: Thu Jul 18 15:57:18 2019 -0700 + + Merge pull request #648 from flow-project/k_closest_to_intersection + + Add padding and docstring to `green_wave_env.k_closest_to_intersection` + +commit 86260ade1a10b2243b5a3120ba1b87d60bf26f83 +Author: nathanlct +Date: Thu Jul 18 15:00:07 2019 -0700 + + add return type + +commit 182ddf7cb49561490ca16d1766165f7318679e36 +Author: nathanlct +Date: Thu Jul 18 14:56:18 2019 -0700 + + fix pep8 + +commit 81702837c003c7cc76fa43e7097801ba7eef3631 +Author: nathanlct +Date: Thu Jul 18 14:52:00 2019 -0700 + + remove unnecessary max + +commit 1c629ebd6cdde4bde4f3edd287b0b8d24e37f0f6 +Author: nathanlct +Date: Thu Jul 18 14:51:30 2019 -0700 + + rename k into num_closest + +commit 0a209b91339be49a61ade629d77c7515394b972a +Author: nathanlct +Date: Thu Jul 18 14:51:11 2019 -0700 + + rename k_closest into get_closest + +commit 3beeeb24cb2beecf74f20f298df8d0a4d1c00d67 +Author: buechelmartin <51824326+buechelmartin@users.noreply.github.com> +Date: Thu Jul 18 18:34:39 2019 +0200 + + Calculation of standard deviation of mean velocity (#643) + + I guess this should be the standard deviation of the average velocities of each run? + In the visualizer_rrlib_py, the same calculation is done as: + + print('Average, std speed: {}, {}'.format( + np.mean(mean_speed), np.std(mean_speed))) + + + Maybe, on top of this, they could all share the same result evaluation methods. + +commit 3038e4524a04c1ff52928d933ffe8a4114bfdb71 +Merge: 7926787c 919a16c4 +Author: nathanlct +Date: Wed Jul 17 15:21:42 2019 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow into improve-tutorials + +commit 09e9e89f37b9905f1461e2bb9ddb47fba66aa9a0 +Author: nathanlct +Date: Wed Jul 17 15:10:50 2019 -0700 + + fix docstring + +commit ad83f2056755baf0247a06614f25053fd8154489 +Author: nathanlct +Date: Wed Jul 17 15:03:23 2019 -0700 + + fix docstring + +commit a818ed9926f78dc6e9b1e05b50690a4490ca53da +Author: nathanlct +Date: Wed Jul 17 14:59:17 2019 -0700 + + make padding optional + +commit c3f94ff0d4b4f60241f1a3e927a11ef88b7d8e42 +Author: nathanlct +Date: Wed Jul 17 14:49:35 2019 -0700 + + remove #FIXME + +commit 27dc862b0af1ef3e45a78e4bab41bbf8dce5a7c0 +Author: nathanlct +Date: Wed Jul 17 14:49:18 2019 -0700 + + complete docstring with example + +commit 08daa8876d2dfc9226d8a527880a57670675c842 +Author: nathanlct +Date: Wed Jul 17 14:49:03 2019 -0700 + + add padding to returned list + +commit e815320ef62264725c84e835bb1c395db2841644 +Author: nathanlct +Date: Wed Jul 17 14:20:21 2019 -0700 + + fix grid scenario + +commit 919a16c4c00fcad7440f4f7ed8b13b44e5e1e19f +Merge: 84da0db1 436aaac4 +Author: Aboudy Kreidieh +Date: Wed Jul 17 13:47:39 2019 -0700 + + Merge pull request #584 from flow-project/ACC_controller + + added Linear Adaptive Controller + +commit 436aaac406f0a2a460714ac99fea1babf10bf588 +Author: AboudyKreidieh +Date: Wed Jul 17 13:05:06 2019 -0700 + + bug fix + +commit 8af5b80064db361ca661a36f3f1680ee32595669 +Author: yhb08 +Date: Wed Jul 17 21:52:27 2019 +0300 + + fixed the previous file + +commit 1660ef9dae35b3bd830b593dcedb10600c24a267 +Author: yhb08 <46504488+yhb08@users.noreply.github.com> +Date: Wed Jul 17 07:23:53 2019 +0300 + + Delete test_controllers.py + +commit 0b454877a78084f2f0acc2add5294166bbdc3385 +Merge: 26579aac 771c2eb1 +Author: yhb08 +Date: Wed Jul 17 07:20:57 2019 +0300 + + Merge branch 'ACC_controller' of https://github.com/flow-project/flow into ACC_controller + +commit 26579aac1ad8a6d75d83f233bef8ae3407a28dbd +Author: yhb08 +Date: Wed Jul 17 07:20:26 2019 +0300 + + Modified the test controllers folder to include the LAC controller + +commit 4a72e81a6cca5d80ba41520f65447dbb92deca8b +Author: Ashkan Y +Date: Tue Jul 16 17:27:12 2019 -0700 + + Added reward and Apply RL actions + +commit 84da0db1d3ac20f9f0e1f88b55d1f5fae7ea7526 +Author: Cathy Wu +Date: Tue Jul 16 16:35:30 2019 -0700 + + Compute and display inflows and throughput efficiency (#632) + + Introduces an efficiency metric (between 0 and 1) which can be used to assess the optimality of our experiments. Efficiency of 1 means that the outflow (throughput) is as high as the inflow. We can't do much better than that. This is displayed when with the rllib visualizer. + + * compute and display inflows and throughput efficiency + + * fix: div/0 error + + * efficiency computation bug + +commit a5072ebc49b97cfa65b40ce9547e5302f5f9e253 +Author: Cathy Wu +Date: Tue Jul 16 15:59:34 2019 -0700 + + Multi-agent traffic light grid (#623) + + New multi-agent environment. + + ## Description + + - Introduces multi-agent version of `PO_TrafficLightsGridEnv`. + - Includes some updated, revised, and cleaned up documentation relating to multi-agent Flow. + - Includes parameterized run script, which supports different grid sizes, local vs cluster runs, different vehicle inflow rates. + + * revised multiagent documentation + + * PEP8 and documentation for PO_TrafficLightGridEnv + + * Add multiagent version of PO_TrafficLightGridEnv, including helper function for retreiving relative nodes + + * fix: observations should include num_observed vehicles from each incoming lane + + * fix conversion to edge numbers + + * prepare run script + + * cleaning + + * cleaning + + * documentation + + * PEP8 + + * add ES to multi-agent run script + + * missed some multi-agent params + + * probably can't use PPO policy graph for ES + + * ES --> PPO (multi-agent not supported, it seems) + + * bigger experiment, documentation + + * clean up docs + + * PEP8 + + * pydocstyle errors + + * Update multiagent_traffic_light_grid.py + + PEP8 + + * keep track of observed vehicles + + * add unit tests for get_relative_node + + * generalize multiagent grid run script + + * flake8 + + * fix unit tests for grid + + * flake8 + + * add inflow rate to arguments for multiagent grid script; expand parameter tuning grid search; minor tweaks + + * flake8 + + * add local vs cluster run mode + + * normalize per agent rewards + + * num edges fix + + * run script tweaks + + * multiagent grid test + + * disable autoscaling + + * refactor multi-agent grid run script + + * small fixes and tweaks + + * flake8 + + * flake8 + + * fix unit test for multiagent traffic light grid + + * docs + + * docs + + * remove ES + + * flake8 + + * exception handling + + * partial addressing of Eugene's comments + + * addressing remainder of Eugene's comments + +commit 771c2eb14c4c8aef2a866d3c561431e1ac3d354a +Author: AboudyKreidieh +Date: Tue Jul 16 14:54:16 2019 -0700 + + bug fix + +commit e3a3e168763f22f01991f311f7be5d83be405e8b +Merge: 0cee1b9c e1a435b2 +Author: Nathan Lichtlé +Date: Mon Jul 15 12:33:23 2019 -0700 + + Merge pull request #634 from flow-project/travis + + Make travis test for pep8 and docstyle first + +commit e1a435b2b494147a9f4e3586c748f0ac3699a66e +Author: nathanlct +Date: Mon Jul 15 10:44:28 2019 -0700 + + remove error + +commit 5fa4efc24bc87a886258a3d27aa17bc44fc56532 +Author: nathanlct +Date: Mon Jul 15 10:41:51 2019 -0700 + + test pep8 error + +commit bb41c2af8e669f92671d15b4a1adb956b2d8875a +Author: nathanlct +Date: Mon Jul 15 10:36:50 2019 -0700 + + test pydocstyle error + +commit bd47f68a2536b553964361de1b4d70a6276bbd2c +Author: nathanlct +Date: Mon Jul 15 10:36:17 2019 -0700 + + optimize order + +commit b056a0968c67537f5076716c26b19095a0cb12eb +Author: nathanlct +Date: Mon Jul 15 10:33:09 2019 -0700 + + install dependencies first + +commit e303c9a40c9a6da88fe553994a896a7fad7600e7 +Author: nathanlct +Date: Mon Jul 15 10:28:50 2019 -0700 + + test error + +commit 4623221047fb8e59089aa7e233a9ed57b08d65de +Merge: cf40fc74 0cee1b9c +Author: nathanlct +Date: Mon Jul 15 09:54:19 2019 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow into aimsun-load + +commit 0cee1b9cf427a409ec2fc5287626c6e28982d46d +Merge: 5c5a1240 d7849962 +Author: Aboudy Kreidieh +Date: Sat Jul 13 19:23:11 2019 -0700 + + Merge pull request #607 from flow-project/v0.4.0 + + final 0.4.0 commit + +commit 5c5a1240b3f1eb224834a256052f325a345e77ab +Merge: 4f4bd42a 1a83e377 +Author: Aboudy Kreidieh +Date: Sat Jul 13 13:38:14 2019 -0700 + + Merge pull request #630 from cathywu/visualizer + + Minor changes to RLlib visualizer + +commit 02e21fd5bde2d8dbc74c642a54917f76fffcd660 +Merge: d2e65860 4f4bd42a +Author: AboudyKreidieh +Date: Sat Jul 13 13:34:57 2019 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow into ACC_controller + +commit d2e658600e5c6d2dd0e75a39a9ce472a4927e6f5 +Author: AboudyKreidieh +Date: Sat Jul 13 13:34:53 2019 -0700 + + pep8 + +commit 4f4bd42af6419d39bf9e0b9f442105e454686455 +Merge: 3658f404 4d4e5d3b +Author: Aboudy Kreidieh +Date: Sat Jul 13 13:24:35 2019 -0700 + + Merge pull request #577 from flow-project/binder_logo + + Add experimental binder build + +commit 3658f404202dd2d7fed0d7f6c425ca4e4f1257b2 +Merge: c25a88bb 13e8a3d0 +Author: Aboudy Kreidieh +Date: Sat Jul 13 12:42:15 2019 -0700 + + Merge pull request #627 from cathywu/setup + + Installation refinement (SUMO setup) + +commit c25a88bb2bf466e5482aa21fad71ea1495f5e44c +Merge: d0e378b4 97c7ff95 +Author: Aboudy Kreidieh +Date: Sat Jul 13 12:41:16 2019 -0700 + + Merge pull request #631 from flow-project/nathanlct-patch-1 + + Remove obsolete link in benchmarks + +commit 97c7ff953ecd8323f70bc667e5837de2d826cea6 +Author: Nathan Lichtlé +Date: Fri Jul 12 17:31:30 2019 -0700 + + remove obsolete link + +commit 1a83e377820bd63f2e0641f63b46db7e060cefc9 +Author: Cathy Wu +Date: Fri Jul 12 16:54:38 2019 -0700 + + RLlib visualizer: updated documentation, prettyfied output metrics and added some more + +commit d0e378b4493da2a13489b322830148465767ff0b +Author: Cathy Wu +Date: Fri Jul 12 16:21:58 2019 -0700 + + RLlib visualizer tweaks (#587) + + Improve usage resilience of RLlib visualizer script. + + - Ignore hidden files when generate videos from image frames. Before, if hidden files were present, the visualizer script would crash. + - Improved consistency of command line arguments (use underscores, not dashes, with multi-word arguments). Also makes this consistent with usage in https://github.com/flow-project/flow/blob/master/flow/benchmarks/create_movies.sh. + + + * Ignore hidden files when generate videos from image frames; have consistent command line arguments + + * adjust the unit tests + +commit cf40fc74fd26aea6b666000ca2f5fd7eec9b2dee +Author: nathanlct +Date: Fri Jul 12 16:19:11 2019 -0700 + + add flow.ang to .gitignore + +commit 13e8a3d06e90d316b6041c0dc582d922946a50a7 +Author: Cathy Wu +Date: Fri Jul 12 13:03:48 2019 -0700 + + prioritizes this version of SUMO in PATH for users who already have a different instance of SUMO installed + +commit d5864206a222d249cbea563085de537a87123998 +Merge: e9d970f5 a715b485 +Author: Aboudy Kreidieh +Date: Fri Jul 12 09:57:52 2019 -0700 + + Merge pull request #626 from flow-project/fix-docstring + + Fix docstring (quick merge) + +commit 7926787ca24b457900c44cb855fa891542251214 +Author: nathanlct +Date: Fri Jul 12 01:06:55 2019 -0700 + + add common error fix to README + +commit a715b4852a8a46bae99d89299dce1a1ec2e8b667 +Author: nathanlct +Date: Fri Jul 12 00:55:36 2019 -0700 + + add docstring for get_initial_speed + +commit c079f4816818810f10c01bdb566815d90b83011a +Author: nathanlct +Date: Fri Jul 12 00:54:14 2019 -0700 + + fix docstring + +commit 929ec8f4ced626fa3dd236be582354792138e8f8 +Author: nathanlct +Date: Thu Jul 11 15:44:04 2019 -0700 + + remove unused import + +commit d91a5cf8f984bb86424a8a4ab0ad63d35788116f +Author: nathanlct +Date: Thu Jul 11 15:32:04 2019 -0700 + + fix for loading templates + +commit e179847627a18dbce5fbb27b99842a8673371e38 +Author: nathanlct +Date: Thu Jul 11 15:31:39 2019 -0700 + + add import os + +commit 211b8d37ff46edb692b36a13a82a1bcbbe77c0f6 +Author: nathanlct +Date: Thu Jul 11 15:30:59 2019 -0700 + + add small template loading example + +commit ce99f75bdfe9310621c8afe416e8a6bd905a197f +Author: nathanlct +Date: Thu Jul 11 15:28:44 2019 -0700 + + add all .sqlite files to .gitignore + +commit e9d970f5e717e8ecc23326c53a4d1cb986d81095 +Merge: d018ace3 9149d1f3 +Author: Aboudy Kreidieh +Date: Wed Jul 10 22:49:16 2019 -0700 + + Merge pull request #565 from flow-project/aimsun_bugs + + Fixed Aimsun bugs + +commit d018ace3c5e8dc103602b3d8da76d890904f7f68 +Merge: 39386ce4 3ba89ec9 +Author: Aboudy Kreidieh +Date: Wed Jul 10 16:20:53 2019 -0700 + + Merge pull request #580 from flow-project/travis-gui + + Enable GUI-based unit tests in travis + +commit 39386ce487f5286134913d16ea3b997341c66a59 +Merge: a4c710c0 3f379020 +Author: Aboudy Kreidieh +Date: Wed Jul 10 16:19:59 2019 -0700 + + Merge pull request #595 from kjang96/aimsun_docs + + Updated Aimsun docs + +commit a4c710c09c513dd2ac015e5f2ca7dd06b729a9a7 +Merge: 9df4fa5b 6b64dffe +Author: Aboudy Kreidieh +Date: Wed Jul 10 09:19:29 2019 -0700 + + Merge pull request #594 from flow-project/issue_42 + + issue 42 + +commit d7849962b5fae95c9aefeca48f982c8052e2511c +Author: AboudyKreidieh +Date: Wed Jul 10 06:23:14 2019 -0700 + + reduced min_gap of tests, since they check for large bunching values + +commit 6b64dffe4a81ec39dede2146f090be91cdedd7a8 +Author: Yasharzf +Date: Tue Jul 9 22:12:39 2019 -0700 + + minor - fixed style errors + +commit 9c9be36ff6c4f0f9039e8af084acbc0b3fcb5fb0 +Author: Yasharzf +Date: Tue Jul 9 21:31:55 2019 -0700 + + added docstrings in aimsun generator + +commit b4ad99627829b7804e3faed4680ea33afd5125dc +Author: AboudyKreidieh +Date: Tue Jul 9 20:51:31 2019 -0700 + + removed outdated test + +commit c69829b4a056548e88db9528fd4ee39110ed9719 +Author: AboudyKreidieh +Date: Tue Jul 9 20:26:44 2019 -0700 + + final 0.4.0 commit + + - renamed the versions in the setup scripts 0.3.1 -> 0.4.0 + - updated version 0.4.0.dev -> 0.4.0 + - removed minGap bug that was causing collisions in the figure eight and merge + - updated the minGap value for the ring, since it still needs a minGap of 0 + +commit d9fc0187a149dd5ab2ef864af4d0987d6e09cfc6 +Author: Ashkan Y +Date: Tue Jul 9 16:20:53 2019 -0700 + + Revised the wording of observation and action space + +commit 70a78d98c82795cb0b6219a487be41336cde3067 +Author: Ashkan Y +Date: Tue Jul 9 15:39:41 2019 -0700 + + Revised "Controlling Your Traffic Lights via RL" + +commit 9df4fa5b69bac5a039e69697c76d782da94e6398 +Merge: 15f24ff5 8e448cfa +Author: Aboudy Kreidieh +Date: Tue Jul 9 13:42:51 2019 +0300 + + Merge pull request #604 from flow-project/aimsun + + Delete temporary files after loading an Aimsun template + +commit 15f24ff59977ac270d54a4b8e82c3960566eb4be +Merge: 781d6fd2 192ccfdd +Author: Aboudy Kreidieh +Date: Tue Jul 9 13:41:54 2019 +0300 + + Merge pull request #602 from flow-project/fix-tutorial + + Code typo in tutorial (quick fix) + +commit 192ccfdd627ccb3709d263b83a5327c28099b766 +Author: Nathan Lichtlé +Date: Tue Jul 9 01:06:23 2019 -0700 + + fix code typo + +commit c8970951fed8ca6063a0da753587848598c1fe22 +Author: Ashkan Y +Date: Mon Jul 8 16:24:35 2019 -0700 + + Revised Section 5 (actuated baseline) + +commit 30d2456bb283d142538242b83760c3f81a79ad3e +Author: Ashkan Y +Date: Mon Jul 8 14:19:52 2019 -0700 + + Revised section 3 (static tl) and section 4 (actualted tl) + +commit b6842d913769ff515d8fcec95dace1ab6f128683 +Author: yhb08 +Date: Tue Jul 9 00:10:44 2019 +0300 + + fixed pep8 + +commit fab43d2aec58908d7c884447920b33a6f0ffe8ef +Author: Ashkan Y +Date: Mon Jul 8 13:57:59 2019 -0700 + + Reorder the ordering of the sections + +commit 9e90506a5a252b1788c8ea46e576abb50fd86367 +Author: Ashkan Y +Date: Mon Jul 8 13:18:57 2019 -0700 + + Fixed minor typo in readme + +commit dd64a1c0592961cabc1f79e5f9e3f4fe0645b073 +Merge: 9921ac10 781d6fd2 +Author: Ashkan Y +Date: Mon Jul 8 13:14:18 2019 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow + +commit 781d6fd239fb940a9d1e8c88d41aea49c42625a8 +Merge: 172dd0b9 9bc69221 +Author: Aboudy Kreidieh +Date: Mon Jul 8 16:29:44 2019 +0300 + + Merge pull request #586 from flow-project/issue_queston_template + + Added template for Issues (Bug, Feature, Question) + +commit 9bc69221595589120c1ff4f150371cfe3d4a0104 +Author: Ashkan Y +Date: Sun Jul 7 14:37:29 2019 -0700 + + Fixed minor typos + +commit 9921ac109908000e7dae81aa00bbdab62db8277c +Merge: 4aa39548 172dd0b9 +Author: Ashkan Y +Date: Sun Jul 7 14:21:58 2019 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow + +commit 172dd0b9213cea4d023da4cc8d1ca760a1b64f8f +Merge: 3e8897f9 78150a3e +Author: Aboudy Kreidieh +Date: Sun Jul 7 22:34:40 2019 +0300 + + Merge pull request #576 from flow-project/tutorial1_emission + + updates to tutorial + +commit 78150a3e70445e6d983b7a16eecd439f267989ba +Author: Nathan Lichtlé +Date: Sat Jul 6 14:26:19 2019 -0700 + + minor fixes + +commit 3e8897f94859f5bbc2b7053e66c9ec1565a50c1e +Merge: 08ce9a86 20131bb4 +Author: Nathan Lichtlé +Date: Sat Jul 6 14:01:12 2019 -0700 + + Merge pull request #575 from flow-project/simplify-grid-scenario + + Simplify grid scenario + +commit 20131bb4c8652c24d843ef532c094ce9abf09ec2 +Author: AboudyKreidieh +Date: Sat Jul 6 17:59:25 2019 +0300 + + minor documentation fixes + +commit 04ae2e134d559136897b2faf49a242a9418e32b0 +Author: AboudyKreidieh +Date: Sat Jul 6 17:50:07 2019 +0300 + + added more documentation and pydocstyle travis test + +commit 3f379020130470adc20b2d57b347b23a320cf44f +Author: Kathy Jang +Date: Fri Jul 5 14:38:54 2019 -0700 + + Updated Aimsun docs + +commit 777e9274df707d8faf44c3e871a22cf59278c8a8 +Author: AboudyKreidieh +Date: Sat Jul 6 00:02:43 2019 +0300 + + started getting rid of most remaining pydocstyle isssues + +commit 08ce9a861f46aa39f106c4af3ab6de54633990e3 +Merge: 9ae41bbe 46174ced +Author: Aboudy Kreidieh +Date: Fri Jul 5 13:51:14 2019 +0300 + + Merge pull request #589 from kjang96/update_sumo_install + + Updated SUMO installation on docs + +commit 46174ced221d3ae2085d196f65a8c3b4b6e24410 +Author: Kathy Jang +Date: Wed Jul 3 12:04:08 2019 -0700 + + Added additional instructions for building SUMO for source on OSX. cmake, which I added to this commit, works for me, while the instructions as they are do not + +commit 3009f3ac911008eb33a5d9ae850ce2282927422c +Author: nathanlct +Date: Tue Jul 2 21:55:30 2019 -0700 + + some changes to issue/PR templates + +commit 9ae41bbe8b83dd094c69f1ea8ebb0836eeca73b1 +Author: Cathy Wu +Date: Tue Jul 2 19:53:38 2019 -0700 + + minor OSX installation updates; apply environment variable changes immediately, for ease of testing SUMO installation (#585) + + - During installation of SUMO from OSX, applies environment variable changes immediately, so that of testing SUMO installation can happen without starting a few terminal window. + - Re-use environment variables. + - To support folks who use different shells (bash, zsh), print the commands to manually add to their preferred shell start scripts. + +commit 6b615c17859bc261b2557a1ad53a43df6f8d1379 +Author: Ashkan Y +Date: Tue Jul 2 16:18:32 2019 -0700 + + Made the Pull Request template simpler + +commit 4600a3e0066d2ea352d33ba80fd1f9a4311bac71 +Author: Ashkan Y +Date: Tue Jul 2 16:09:36 2019 -0700 + + Uncommenting the instructions + +commit 4385b8be85a8bc0bba0f5ba5062aa9f4d9baf690 +Author: Ashkan Y +Date: Tue Jul 2 16:09:07 2019 -0700 + + Uncommenting the instructions + +commit d3aae64781455d8909081fe6e604be1c7815f8d7 +Author: Ashkan Y +Date: Tue Jul 2 16:05:46 2019 -0700 + + Update bug.md + +commit 4fb06e9ef21e629c9fcffad766ed389f227c3883 +Author: Ashkan Y +Date: Tue Jul 2 16:05:13 2019 -0700 + + Added thank you note to the feature template + +commit 21a09e0458e3fab594f02be54b718da0c5f2484b +Author: Ashkan Y +Date: Tue Jul 2 16:03:22 2019 -0700 + + Adding thank you note on top of bug + +commit 12dc6d55ad501ac5e35705a44fb386a435437b99 +Author: Ashkan Y +Date: Tue Jul 2 16:00:55 2019 -0700 + + Change "problem" to "bug" + +commit 536e29e4d1ea06fb623886388e9bdaa3a99aa739 +Author: Ashkan Y +Date: Tue Jul 2 15:59:12 2019 -0700 + + Update bug.md + +commit fae9f577e7beb8db280a845069bdff9523994260 +Author: Ashkan Y +Date: Tue Jul 2 15:42:24 2019 -0700 + + Create `question' issue which points to Stack Overflow + +commit c1c545039ea9e3fd0fb9160689a1c0adfac463df +Author: yhb08 +Date: Wed Jul 3 01:32:57 2019 +0300 + + added Linear Adaptive Controller + +commit 0868f33718edc99cfc5c54c2fb7a4d57d5a7fa50 +Author: Ashkan Y +Date: Tue Jul 2 13:51:52 2019 -0700 + + renamed, and also added default label + +commit 17ef230320285d125c902d7bf55c2731203bfe55 +Author: Ashkan Y +Date: Tue Jul 2 13:30:22 2019 -0700 + + Update and rename issues.md to bug.md + +commit 48d8baa1b1dc250f6765eb4f388e418a9d4cd5af +Author: Ashkan Y +Date: Tue Jul 2 13:22:30 2019 -0700 + + Added template for features + +commit f6b5d20bf588851cd4ee5a803ca48919a5fe1ffe +Author: Nathan Lichtlé +Date: Tue Jul 2 12:52:09 2019 -0700 + + fix pr bug + +commit f9fc29f498134d7c10261d0f9adc8cf23689bb0e +Author: nathanlct +Date: Mon Jul 1 22:00:46 2019 -0700 + + add coverage + +commit 25211ba65e801a4cd82fb3737eb21337e16063aa +Merge: b88b1986 adae2396 +Author: Kathy Jang +Date: Mon Jul 1 20:49:05 2019 -0700 + + Merge pull request #561 from kjang96/issue_436 + + Documentation for bottleneck + +commit adae2396fc80bd52ce9370c60142ef4ece2986ca +Author: Kathy Jang +Date: Mon Jul 1 20:15:18 2019 -0700 + + minor + +commit 04b8b5c84d6cd816a370d4f06b91e3501d0c5fac +Author: Ashkan Y +Date: Mon Jul 1 16:59:44 2019 -0700 + + Update Section 3 of the tutorial + +commit cf244838b1cb1316a446292d044be5c301b720e0 +Author: nathanlct +Date: Mon Jul 1 16:32:12 2019 -0700 + + add fixme in k_closest_to_intersection + +commit 41ab4e641386a7892f5269ae36a44dbe91b4da91 +Merge: 4b28aaea 32b72d5f +Author: nathanlct +Date: Mon Jul 1 16:31:06 2019 -0700 + + Merge branch 'simplify-grid-scenario' of https://github.com/flow-project/flow into simplify-grid-scenario + +commit 4b28aaea9dcc239559df80a6f18f292bca4f5f6b +Author: nathanlct +Date: Mon Jul 1 16:30:54 2019 -0700 + + fix bug + +commit dbbf54971f2fdde82a476f5c270e452cc8025e7a +Author: Kathy Jang +Date: Mon Jul 1 15:48:30 2019 -0700 + + minor + +commit 32b72d5fdff90884ff2cc7e19fb5802ac85f0a33 +Merge: f7e42dd4 b88b1986 +Author: Nathan Lichtlé +Date: Mon Jul 1 14:31:55 2019 -0700 + + Merge branch 'master' into simplify-grid-scenario + +commit f7e42dd43849e06e110555a5095351ad3334155c +Author: nathanlct +Date: Mon Jul 1 14:27:40 2019 -0700 + + fix bugs + +commit 786960b3ac9c0b3e75a8319649d1987194844d46 +Author: nathanlct +Date: Mon Jul 1 14:15:41 2019 -0700 + + simplify k_closest_to_intersection function + +commit 4db119685bf29d442fabfe531d6942fb1e7ae297 +Author: Ashkan Y +Date: Mon Jul 1 13:46:46 2019 -0700 + + Revised the Section 2 + + Revised Section 2 of the tutorial, and removed the incorrect description of the traffic light phase + +commit cac2a868f0cfbb6f69fc148e5b094a2487363364 +Author: Kathy Jang +Date: Mon Jul 1 12:54:49 2019 -0700 + + Fixed all pep8 + +commit c79bbd106fb4e37ae69474a6c92894e1aa8f3816 +Merge: 8bce470d b88b1986 +Author: Kathy Jang +Date: Mon Jul 1 12:47:45 2019 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow into issue_436 + +commit b88b1986d60dece36d5540e1b7655e54aaf62c0f +Merge: 01cf30cb 4e12bacc +Author: Aboudy Kreidieh +Date: Mon Jul 1 21:44:23 2019 +0300 + + Merge pull request #555 from kjang96/issue_42 + + Issue 42 + +commit 4e12baccfca60d0d1f000f76f0861476d15b7f33 +Merge: 81d17159 254ded0a +Author: Kathy Jang +Date: Mon Jul 1 10:55:06 2019 -0700 + + Merge branch 'issue_42' of https://github.com/kjang96/flow-1 into issue_42 + +commit 81d1715931a7e7c40b92f58f835b2c7b501e995a +Author: Kathy Jang +Date: Mon Jul 1 10:54:10 2019 -0700 + + Fixed typo in docstring + +commit 3ba89ec9b896bd01029d46b9de45b815d1fbc2b8 +Author: Fangyu Wu +Date: Mon Jul 1 02:38:46 2019 -0700 + + Specify xvbf config. + +commit abb188ce8f3a95da443b1d981dd51a3b29a7a39d +Author: Fangyu Wu +Date: Mon Jul 1 01:20:54 2019 -0700 + + Add back xvbf-run with non-blocking plt.show(). + +commit c2f05bb9eaa6408daaff22834c6cfe4ad36ddefa +Author: Fangyu Wu +Date: Mon Jul 1 00:54:48 2019 -0700 + + Remove xvbf-run wrapper. + +commit de2cfd8ac5541ba29fce36fbea8224e8064f73c1 +Author: Fangyu Wu +Date: Mon Jul 1 00:27:54 2019 -0700 + + Add xvbf-run weapper. + +commit 4d4e5d3bbf6ca7545fc9fea06e3b3a64c002a699 +Author: Fangyu Wu +Date: Sun Jun 30 18:14:22 2019 -0700 + + Add experimental binder logo. + +commit ecd9a30263509d5165c36caf2b5f29f8a6e88247 +Author: AboudyKreidieh +Date: Sun Jun 30 20:01:14 2019 +0300 + + bug fixes + +commit 7f33f88e94164dd556c2daba979febf4e5c8da06 +Author: AboudyKreidieh +Date: Sun Jun 30 13:40:56 2019 +0300 + + bug fixes + + - added internal edge starts to loops + - modified broken tests + +commit 01cf30cb8b4a7e058ec8e3dae77abb2d816a582a +Merge: 5c0ec985 0a8276b8 +Author: Aboudy Kreidieh +Date: Sun Jun 30 10:43:13 2019 +0300 + + Merge pull request #560 from flow-project/docker-desktop + + Update docker installation instruction. + +commit 0a8276b890032d960003e875d0840797579b21b9 +Author: Ashkan Y +Date: Sat Jun 29 23:07:22 2019 -0700 + + Better title for docker installation + +commit d76b44cf1e28a597fe18f6ebacb1601e850f3b8d +Author: AboudyKreidieh +Date: Sat Jun 29 21:32:51 2019 +0300 + + removed methods of no_internal_links + +commit 9101c8ead486ecab9a9080388596d859d2d9921a +Author: nathanlct +Date: Sat Jun 29 09:59:40 2019 -0700 + + fix bug in node mapping + +commit 9149d1f3365ce8c02c2eb4afffe8f6cdce437d99 +Author: Yasharzf +Date: Sat Jun 29 09:56:38 2019 -0700 + + bug fix - changed SumoParams to AimsunParams + +commit 02d45bb17e4c9e4d68c94605a55c81585347c894 +Author: AboudyKreidieh +Date: Sat Jun 29 17:03:59 2019 +0300 + + updates to tutorial + + - added emission to tutotial 1 + - fixed a bug resulting in FileNotFound errors if the emission_path does not end with / + +commit fecd85ff91b02567ed4fd95489ec597d45e08331 +Author: Ashkan Y +Date: Fri Jun 28 23:18:37 2019 -0700 + + Change the intriduction paragraphs + +commit 873617e72a88ce2731b8a7c4f32074871d53d293 +Author: nathanlct +Date: Fri Jun 28 22:30:38 2019 -0700 + + fix test + +commit 87e622afb755ce02f6d1ea4c7ed72fdbdb7e89e3 +Author: nathanlct +Date: Fri Jun 28 22:05:10 2019 -0700 + + fix pep8 + +commit 72b9d29b284df6d624aeb617eb13827c4d16452f +Author: nathanlct +Date: Fri Jun 28 21:44:14 2019 -0700 + + fix bug + +commit 8b44993f0bbd2e7c525d0d65d47e038717aacf73 +Author: nathanlct +Date: Fri Jun 28 21:11:14 2019 -0700 + + fix some bugs + +commit 254ded0a82c60884ff896f78390ae22bd0761b2c +Merge: 9ea3194a 5c0ec985 +Author: Kathy Jang +Date: Fri Jun 28 15:44:30 2019 -0700 + + Merge branch 'master' into issue_42 + +commit 9ea3194a935b589fb6cead7b32bf640e09bf8b0b +Author: Kathy Jang +Date: Fri Jun 28 15:43:12 2019 -0700 + + Everything conforms to flake8 + +commit 8bce470db7c9aee7dd12a82b3915bb789bd58f4a +Author: Kathy Jang +Date: Fri Jun 28 15:28:04 2019 -0700 + + Removed incorrect docstring + +commit 29e3c0cb776f31c3fb5c3106726cbf961f07eeea +Author: nathanlct +Date: Fri Jun 28 14:30:29 2019 -0700 + + random grid improvements + +commit f367988ea895642b30f81ab5b51679710324a8e1 +Author: nathanlct +Date: Fri Jun 28 14:28:28 2019 -0700 + + better gen_custom_start_pos + +commit af5f1d44c04c52cf554427d735816e4e417ffd5d +Author: nathanlct +Date: Fri Jun 28 14:21:13 2019 -0700 + + improve specify_types + +commit dea227a991b3fafffdb4ac852fb0e4bd3b8c99e1 +Author: nathanlct +Date: Fri Jun 28 14:16:27 2019 -0700 + + improve specify_routes + +commit c95e672f5cb410cd4210d44626a42d579d374ac4 +Author: nathanlct +Date: Fri Jun 28 14:06:15 2019 -0700 + + remove useless method + +commit e6079bca05f6801d03693815b87e7e76a5345bd0 +Author: nathanlct +Date: Fri Jun 28 14:05:51 2019 -0700 + + improve grid init + +commit 92f4229e861f70252d62d91174453a2159fd3f05 +Author: nathanlct +Date: Fri Jun 28 12:15:31 2019 -0700 + + remove unused method + +commit d4507752aefb9482c29faf7afcc7364b84647677 +Author: nathanlct +Date: Fri Jun 28 12:10:58 2019 -0700 + + do we need specify_edge_starts? + +commit fc0a094f6ff40ade42af91f004ae8f74cf6ab1ee +Author: nathanlct +Date: Fri Jun 28 12:10:43 2019 -0700 + + improve specify_connections + +commit c0593dacdecb46d9499355861cbc97f4a7376df3 +Author: nathanlct +Date: Thu Jun 27 23:45:21 2019 -0700 + + simplify edges building + +commit 0223c3752d719284cd010e84b3c742ea16a6638a +Author: nathanlct +Date: Thu Jun 27 23:45:06 2019 -0700 + + simplify connections building + +commit f62da5f15b1d47ce913f08cedc5b9d8454a8868c +Author: nathanlct +Date: Thu Jun 27 23:44:23 2019 -0700 + + simplify how node_mapping is built and used + +commit 92acfe641eebc153730e98d12f64c133e1b9de38 +Author: Rayyan +Date: Thu Jun 27 20:49:44 2019 -0700 + + files commented on were 'examples/sumo/bottlenecks.py' and 'flow/envs/bottleneck_env.py'. + +commit 73533cbc820327800aeb0355f1360564ea22052b +Author: nathanlct +Date: Thu Jun 27 16:56:24 2019 -0700 + + convert to properties + +commit 5d50aad0bb63abd918e453ad6e35e4321d28f6e0 +Author: nathanlct +Date: Thu Jun 27 16:51:19 2019 -0700 + + better nodes building + +commit 5c0ec98524b7437bbd73faa96fc2dc5d2656f425 +Merge: 7ec2f684 ae71d939 +Author: Aboudy Kreidieh +Date: Thu Jun 27 16:28:47 2019 +0300 + + Merge pull request #552 from flow-project/tutorials-docs + + Improve tutorials + +commit 7ec2f6845981919cee59b09930a76a04e1cb95e4 +Merge: 694039f8 e3b66f27 +Author: Aboudy Kreidieh +Date: Thu Jun 27 14:45:32 2019 +0300 + + Merge pull request #554 from flow-project/fix-emission + + Fix emission path bug + +commit ae71d939e9267e5ef27d6ca9246d6b641062a9cb +Author: nathanlct +Date: Tue Jun 25 17:02:15 2019 -0700 + + fix pr + +commit e3b66f27c9eaa235cdad574de90ed79158146750 +Author: nathanlct +Date: Tue Jun 25 17:01:54 2019 -0700 + + fix pr + +commit bbf6757801a8299209a93027720cae60ed2b124b +Author: Yasharzf +Date: Tue Jun 25 16:47:00 2019 -0700 + + minor + +commit 2d2752d131144eb690f2f15b3ebd138935eeffbc +Author: Yasharzf +Date: Tue Jun 25 16:27:01 2019 -0700 + + commneted unused vars to resoleve travis issue + +commit 2b2421e7e79adef8efe46e07ea0141ad78c4b459 +Author: Yasharzf +Date: Tue Jun 25 16:00:14 2019 -0700 + + removed some files + +commit bbfdb9e629fb0745b2c72d56e9fb9381d094b01d +Merge: a5a03c1c 93856cf4 +Author: Yasharzf +Date: Tue Jun 25 15:57:17 2019 -0700 + + Merge branch 'aimsun_bugs' of https://github.com/flow-project/flow into aimsun_bugs + +commit 93856cf483f06b0815ef6d696a0ebe02d3221b5e +Author: nathanlct +Date: Tue Jun 25 15:56:08 2019 -0700 + + aimsun changes + +commit a5a03c1c5a1edf9520f1e09625917a3f1e9558cc +Author: Yasharzf +Date: Tue Jun 25 15:41:42 2019 -0700 + + removed veh_type from the veh deprart function + +commit 97bed8ecaaef406709909beaf8a2ac0ec35139c5 +Merge: 7673a312 1ce70ba6 +Author: nathanlct +Date: Tue Jun 25 15:37:37 2019 -0700 + + Merge branch 'aimsun-local' into aimsun_bugs + +commit 7673a3122143fd36c358381317c4ac0e7f416d1f +Author: Yasharzf +Date: Tue Jun 25 15:32:19 2019 -0700 + + fixed bugs + +commit 280ec078f8b05b9bf1b3ff39c7ae0456f048bc5f +Author: Yasharzf +Date: Tue Jun 25 09:45:15 2019 -0700 + + change sim step from 0.1 to 0.5 in Aimsun examples. Aimsun can not handle sim_step=.1 + +commit acc5cfc6d76896be03c4dc0dafa139aa75e03649 +Author: Yasharzf +Date: Tue Jun 25 09:32:19 2019 -0700 + + added get_initial_speed function to Aimsun vehicle + +commit c278ee852ada9c49183f666a479db0985a4ea0b7 +Author: Fangyu Wu +Date: Mon Jun 24 16:55:16 2019 -0700 + + Fix a typo. + +commit 150dfb892628042222609ab1d4b6af0e6f0fd0a8 +Author: Kathy Jang +Date: Mon Jun 24 00:13:58 2019 -0700 + + Added documentation to all but 2 more complicated functions, fixed pydocstyle. + +commit 4f4c22d555a7b30799babf4784b95d86db61ffa4 +Author: Fangyu Wu +Date: Sat Jun 22 19:06:07 2019 -0700 + + Update docker installation instruction. + +commit 4aa395488850e8f7b53ef0326e2f25294150e2f6 +Merge: 5717e866 694039f8 +Author: Ashkan Y +Date: Fri Jun 21 15:54:37 2019 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow + +commit 79c340c1dee268213a04ff2517a11a6bca02d8d0 +Author: nathanlct +Date: Fri Jun 21 14:44:33 2019 -0700 + + test + +commit 3a0a9a4e7c413c5dbdae419503bb29e4cb52e104 +Author: nathanlct +Date: Fri Jun 21 14:44:10 2019 -0700 + + test + +commit e86da28b171ea683fa081ffa82f4444df59da5e6 +Author: Nathan Lichtlé +Date: Fri Jun 21 09:42:48 2019 -0700 + + remove sugiyama.py from pr + +commit f8663b4d733c20f011ee020378296ef261f789dc +Merge: 55f3b727 694039f8 +Author: nathanlct +Date: Fri Jun 21 00:35:47 2019 -0700 + + Merge branch 'master' into tutorials-docs + +commit f2d7a0accf4336b2ef391188864aea67ea945dd1 +Author: nathanlct +Date: Fri Jun 21 00:33:10 2019 -0700 + + test + +commit 99682ccbb8418b77b972b55a4c0d7c40e11e1754 +Author: nathanlct +Date: Thu Jun 20 19:14:59 2019 -0700 + + test + +commit 55f3b727aaa76ec629dce487b6679e157a1b4d17 +Author: nathanlct +Date: Thu Jun 20 19:13:28 2019 -0700 + + add tests for plot_ray_results visualizer + +commit 166463b9e89bf754ed6285cc71b051c3fd89c87e +Author: nathanlct +Date: Thu Jun 20 19:13:01 2019 -0700 + + better error formatting + +commit a84c5070603ba3f18d9c00ddc81bc1ec4f4da9f3 +Author: nathanlct +Date: Thu Jun 20 17:52:08 2019 -0700 + + test + +commit 694039f8d9e9ab9c68960271b348832324a2478c +Merge: f5a8d1cc de414aa8 +Author: Aboudy Kreidieh +Date: Wed Jun 19 22:31:28 2019 +0300 + + Merge pull request #524 from flow-project/new_router + + New router + +commit de414aa81267dfdc09c6f5e67eeb3c77081bbb84 +Author: AboudyKreidieh +Date: Wed Jun 19 21:23:15 2019 +0300 + + PR fix + +commit b3b8e55ac2fb439c3cb76c0d8206b12b405301c2 +Author: Kathy Jang +Date: Tue Jun 18 17:18:22 2019 -0700 + + minor + +commit 9a961f4d0a4d7597824617fc9c57388a3555a735 +Author: Kathy Jang +Date: Tue Jun 18 17:16:33 2019 -0700 + + Fixed trivial pycodestyle errors for utils/aimsun files + +commit 6bbf41543486305d52f3bab4c81a7ddd837fa2dd +Author: Kathy Jang +Date: Tue Jun 18 17:11:53 2019 -0700 + + Fixed pycodestyle for all envs except for some functions in bottleneck_env and bay_bridge and loop/wave_attenuation.py + +commit 38dc955a3547f0f4e4a4a5423c3305cc4f16973f +Author: Kathy Jang +Date: Tue Jun 18 16:07:27 2019 -0700 + + Fixed pycodestyle for all files in core + +commit 553ebf5abf892fe060c55ba72035505572fa034c +Author: nathanlct +Date: Tue Jun 18 12:39:50 2019 -0700 + + add emission_path parameter in sumo tutorial + +commit 96bad25d9eda07851a85f852ebce4fda65711d96 +Author: nathanlct +Date: Tue Jun 18 12:38:39 2019 -0700 + + make sure emissions are generated if they are to be converted + +commit 1ce70ba6bf1e4dd43a7cdad789c05e76c1e433f1 +Author: nathanlct +Date: Tue Jun 18 10:40:15 2019 -0700 + + add helper scripts for aimsun + +commit 14f2e3f46c5d9fc7d619328e27269758c35824f8 +Merge: 5e6518ec f5a8d1cc +Author: AboudyKreidieh +Date: Tue Jun 18 09:56:14 2019 +0300 + + Merge branch 'master' of https://github.com/flow-project/flow into new_router + +commit 0bf0b73bcf11bd51189d3bfa0a02d180a7bdc9b5 +Author: nathanlct +Date: Mon Jun 17 19:51:05 2019 -0700 + + fix pep8 + +commit e2402a323fd7d32fa3fad416193a0840db797cae +Author: nathanlct +Date: Mon Jun 17 19:39:44 2019 -0700 + + remove python3.7 feature + +commit 59bf5f6b11a90cd6722ee8ec801d1dbdcdcd3979 +Author: nathanlct +Date: Mon Jun 17 19:27:56 2019 -0700 + + add section on restore from checkpoint in rllib tutorial + +commit 6785c6e1d30295c51d607c2585c3f2da13e3600c +Author: nathanlct +Date: Mon Jun 17 19:14:19 2019 -0700 + + add plot_ray_results file into visualize tutorial + +commit 423c9690908af17fc60a47f5ba5a03fcbc8d9094 +Author: nathanlct +Date: Mon Jun 17 19:11:57 2019 -0700 + + fix filename in plot_ray_results.py + +commit 3b154f737c797529cfb3794f8b1075a1370966c3 +Author: nathanlct +Date: Mon Jun 17 19:08:20 2019 -0700 + + add ray_results plotter + +commit 51a97ea5184e6626641c58eea82b4e95ba893d8a +Author: nathanlct +Date: Mon Jun 17 19:03:46 2019 -0700 + + mark the Aimsun installation section as optional + +commit 5650dccfc12ed1d935cc90ff2a81f9f25ba3a0b3 +Author: nathanlct +Date: Mon Jun 17 19:03:03 2019 -0700 + + add link to rllib installation tutorial + +commit 1de5c7aac78f2a9e1532380a7de8000c3fdc5249 +Author: nathanlct +Date: Mon Jun 17 19:00:05 2019 -0700 + + add checkpoint_at_end parameter in run_experiments + +commit 3a6004b54d6b42f9c816804953b2b3a6ef037732 +Author: nathanlct +Date: Mon Jun 17 18:55:19 2019 -0700 + + add precisions in aimsun tutorial + +commit 6c86970635c3343dda6e7070473d1f1d7bc4600b +Author: nathanlct +Date: Mon Jun 17 18:54:49 2019 -0700 + + add rllib visualization explanations in tutorials + +commit 11825b83c51b22ec45e95433c912b6eb4057d31b +Author: nathanlct +Date: Mon Jun 17 18:53:03 2019 -0700 + + add missing parameter in rllib visualizer example + +commit e7268aa73a7507404f4f10775437d34911c05bf3 +Author: Yasharzf +Date: Mon Jun 17 17:36:17 2019 -0700 + + bug fix + +commit 87cf3c84c1a8a6419fbfed2f9727be34628f3b2b +Author: Ashkan Y +Date: Wed Jun 12 17:41:54 2019 -0700 + + Remove 'bin' from SUMO_HOME + +commit 5717e86618242e35ade4720f7d51517e0e1847be +Merge: ab2198ec f5a8d1cc +Author: Ashkan Y +Date: Wed Jun 12 13:59:17 2019 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow + +commit f5a8d1cc9dd2323ace66c6b6ae98c28b6b9a1d6c +Merge: d085264d 56355420 +Author: Aboudy Kreidieh +Date: Wed Jun 12 12:46:03 2019 +0300 + + Merge pull request #293 from flow-project/new_sumo_pr + + New sumo pr + +commit 56355420f0e27901f3b147f74d9c45afbfab2094 +Merge: 82f2a37e d085264d +Author: Aboudy Kreidieh +Date: Wed Jun 12 12:16:22 2019 +0300 + + Merge branch 'master' into new_sumo_pr + +commit d085264dc62486216b25a09f91afdf2a21cf2983 +Merge: c8ea2b0c 2b5d2b36 +Author: Aboudy Kreidieh +Date: Wed Jun 12 12:13:02 2019 +0300 + + Merge pull request #530 from flow-project/rm_loop_merge + + Remove loop merge + +commit c8ea2b0cd35ecc811dcdd07b51d34a0766a0ed86 (tag: v0.3.1) +Merge: 3bfe67e5 748a67ba +Author: Aboudy Kreidieh +Date: Tue Jun 11 10:37:55 2019 +0300 + + Merge pull request #517 from flow-project/time_space_diagram + + Time space diagram + + - added a method for plotting time-space diagrams + - using the time-space diagrams to modify the vehicle parameters in the simulations to match expected behaviors in new sumo (more on this to come) + - tests for the new time-space diagram plotter + +commit 748a67ba895887246f56a616882c1fba5cbf3a80 +Author: AboudyKreidieh +Date: Tue Jun 11 09:42:35 2019 +0300 + + updated version number + +commit 3bfe67e51703c43d16a6e0276aa07924026087c6 +Merge: afe4f936 a8a0ef0f +Author: Aboudy Kreidieh +Date: Tue Jun 11 09:40:11 2019 +0300 + + Merge pull request #542 from flow-project/aimsun_cleanup + + Aimsun cleaning + +commit ab2198eca77174ce4756dd7fe3e254b052886ae7 +Merge: 9ea46cb0 afe4f936 +Author: Ashkan Y +Date: Mon Jun 10 21:59:30 2019 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow + +commit afe4f9360a28896776315c8cf57332efc47c8f07 +Merge: 65ab8b88 12c35646 +Author: Aboudy Kreidieh +Date: Mon Jun 10 19:51:49 2019 +0300 + + Merge pull request #544 from flow-project/clean_rewards + + Removed 4 unused reward functions + +commit bb00df455d394ec9c95af16e825a613d0f3b0e64 +Author: AboudyKreidieh +Date: Mon Jun 10 18:11:24 2019 +0300 + + updated merge scenario so that it's behavior will still work with new sumo + +commit 12c356468fc0507826d0e89f98870ffcd4c6899c +Author: AboudyKreidieh +Date: Mon Jun 10 17:04:38 2019 +0300 + + got rid of tests for removed reward functions + +commit 82f2a37e7f2d6d7eda60404c1db8703d844a090e +Author: AboudyKreidieh +Date: Mon Jun 10 16:54:03 2019 +0300 + + updated version + +commit ddc54c00bb1154223292e9650aac7febe445d726 +Merge: 90794da7 65ab8b88 +Author: AboudyKreidieh +Date: Mon Jun 10 16:50:52 2019 +0300 + + Merge branch 'master' of https://github.com/flow-project/flow into new_sumo_pr + +commit 6a98de289a02db6bd0c715affac9242a52c633e3 +Author: AboudyKreidieh +Date: Mon Jun 10 16:48:36 2019 +0300 + + bug fix to visualizers + +commit b5f392731832c9dba312d9db616d28ba237c6afa +Author: mtgibson2014 +Date: Sun Jun 9 22:55:45 2019 -0700 + + Removed 4 unused reward functions + +commit 9ea46cb02dce18551e56e307e8f8d4f0ab4b3ace +Merge: 7b0321a0 65ab8b88 +Author: Ashkan Y +Date: Sun Jun 9 14:15:05 2019 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow + +commit 8e448cfaa61f9eea7553b1756db6ff4c5b621872 +Author: nathanlct +Date: Sat Jun 8 11:43:07 2019 -0700 + + delete temporary files after loading Aimsun template + +commit a8a0ef0f4fdfa28bb52292b9efa8dcfb54d6097d +Author: Yasharzf +Date: Fri Jun 7 16:35:03 2019 -0700 + + deleted this because it was not supposed to be on this branch + +commit 90cc321404ccc1e90cd2563efba30f3a6269ba6f +Author: Yasharzf +Date: Fri Jun 7 16:12:22 2019 -0700 + + removed unnecessary comments + +commit 57abd6f105a85f0a8197d70935c93367d9d2fa0a +Author: Yasharzf +Date: Fri Jun 7 15:41:13 2019 -0700 + + removed unused find_node and find_turn functions + +commit 0f61b1fe544c2ad6bb886c65e1c163908871e3bb +Author: Yasharzf +Date: Fri Jun 7 15:34:36 2019 -0700 + + removed unused signal functions + +commit 5d257fbab55815454b5f0e2b067aa12ee09ede3f +Merge: c4457243 65ab8b88 +Author: Yasharzf +Date: Fri Jun 7 15:11:47 2019 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow into nn_controller + +commit 65ab8b88376485c6c0dd7a42843e154f2f325685 +Merge: cd701994 3afbf290 +Author: Aboudy Kreidieh +Date: Fri Jun 7 21:47:37 2019 +0300 + + Merge pull request #531 from flow-project/aimsun-scripting-api + + Scripting API for Aimsun + +commit cd701994908c1903e5b10d0f2ae8942f4ec13f47 +Merge: 492ad840 a5e51db3 +Author: Aboudy Kreidieh +Date: Fri Jun 7 21:35:25 2019 +0300 + + Merge pull request #541 from flow-project/clean-bottleneck + + Remove obsolete features from bottleneck environment + +commit 492ad84038bee4d6ce319cdb455275b1d825d02f +Merge: 876c2897 b7b64fe8 +Author: Aboudy Kreidieh +Date: Fri Jun 7 21:33:07 2019 +0300 + + Merge pull request #533 from flow-project/test_examples + + extended test coverage for grid examples + +commit 3afbf290d61a21e64f44590fb74c0ed2b59527e1 +Author: nathanlct +Date: Fri Jun 7 09:10:09 2019 -0700 + + add parameters to docstrings + +commit 876c289755317ddf5ab8fd62e64928a9fe72a61c +Merge: 6154a449 cd29143a +Author: Aboudy Kreidieh +Date: Fri Jun 7 14:41:23 2019 +0300 + + Merge pull request #539 from flow-project/ashkan-development + + Remove obsolete features from grid environment + +commit a5e51db3d7a18ecf50489d396c2f6c69bcf7f9fb +Author: nathanlct +Date: Thu Jun 6 17:24:29 2019 -0700 + + remove unused import + +commit 858c3e3e606df663a4832e9128118457ccaa4b04 +Author: nathanlct +Date: Thu Jun 6 17:17:19 2019 -0700 + + fix pep8 + +commit 04efb7ccad00854026fb0ef71349fb6f250a691d +Author: nathanlct +Date: Thu Jun 6 17:14:21 2019 -0700 + + removed unused functions + +commit 0c17b2330f679ac6b409c22a04b77edc64601f8e +Author: nathanlct +Date: Thu Jun 6 17:09:30 2019 -0700 + + clean bottleneck env + +commit cd29143af861267bbf38b54f6582727de286e5b4 +Author: Ashkan Y +Date: Thu Jun 6 16:32:55 2019 -0700 + + Remove obsolete features from grid + + Removed obsolete features from the grid. The function record_obs_var() is not called anywhere, and the function sort_by_intersection_dist() is only called by its tester. + +commit 311cece82b26ba3d90f2bbb0f862458199415773 +Author: nathanlct +Date: Thu Jun 6 16:05:22 2019 -0700 + + add default value to get + +commit 0c6168d6fa5dec0ee0222311ca8449392ed132dd +Merge: 11bab1b5 6154a449 +Author: AboudyKreidieh +Date: Fri Jun 7 00:04:47 2019 +0300 + + Merge branch 'master' of https://github.com/flow-project/flow into time_space_diagram + +commit 90794da744b074966e45582fab9e564bf4e743b8 +Merge: f926b3e7 6154a449 +Author: AboudyKreidieh +Date: Thu Jun 6 22:44:51 2019 +0300 + + Merge branch 'master' of https://github.com/flow-project/flow into new_sumo_pr + +commit 7b0321a0c5237dd3bb955db1f3de7b3fef9849bd +Merge: 6e42d679 6154a449 +Author: Ashkan Y +Date: Wed Jun 5 15:50:58 2019 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow + +commit 6154a4493c7a6a05dc1be60d877f4f24d7e9e054 +Merge: 6553be3c 1baf3035 +Author: Aboudy Kreidieh +Date: Wed Jun 5 09:33:50 2019 +0300 + + Merge pull request #535 from flow-project/improve-tutorial + + Add explanation on how to fix a bug when first installing flow + +commit 1baf3035730e2278d432e5d45236d4ff90853dc2 +Author: nathanlct +Date: Tue Jun 4 14:25:37 2019 -0700 + + add fix for notebook flow import bug when first installing flow + +commit e5021f4a4ef18ca7e0ef42f3b02be1debc29421d +Author: nathanlct +Date: Tue Jun 4 11:37:18 2019 -0700 + + complete tests for scripting_api.py up to 100% + +commit 05610bc92e7b5c961b842a52bb99e05268e9e8f9 +Author: nathanlct +Date: Tue Jun 4 11:23:05 2019 -0700 + + add load.py (requires Aimsun) to filed ignored by coverage + +commit 6553be3c69cd5f91ca0eccc6247f117616965a57 +Merge: 1cd55402 9e18e69a +Author: Aboudy Kreidieh +Date: Tue Jun 4 02:35:11 2019 -0400 + + Merge pull request #528 from flow-project/ashkan-development + + Update Readme with Stack Overflow tag information + +commit b7b64fe840d2d67d6c72128dd712fe86f35925f5 +Author: AboudyKreidieh +Date: Tue Jun 4 09:30:27 2019 +0300 + + extended test coverage for grid examples + + - modified the grid examples to accept as a input parameter + - added tests for both the cases when inflows are set on and off. In this way, we can make sure that both cases are not broken. + +commit 8d0fdac0ef8c59ab494c1f7193681c08aa26350e +Author: nathanlct +Date: Mon Jun 3 23:29:45 2019 -0700 + + add tests + +commit aea6a1895a17e01ad425c29bd37f0c6382147b21 +Author: nathanlct +Date: Mon Jun 3 23:29:36 2019 -0700 + + fix bug + +commit c4c095560b3f010f38397a35c44da69fbbe916a8 +Author: nathanlct +Date: Mon Jun 3 22:51:18 2019 -0700 + + fix bug with __setattr__ + +commit 383c4158fc77d36fea5706e7d7a38f22b4f9ee02 +Author: nathanlct +Date: Mon Jun 3 16:44:01 2019 -0700 + + useless change + +commit 6e42d679f3ab54063d5c7bbd1a7a430c3452ff67 +Merge: a30d1536 1cd55402 +Author: Ashkan Y +Date: Mon Jun 3 16:20:18 2019 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow + +commit 1cd5540258493ae486638df192a45cb315378c3d +Merge: 376034dc 8444d462 +Author: Nathan Lichtlé +Date: Mon Jun 3 09:27:14 2019 -0700 + + Merge pull request #532 from flow-project/pull-request-template + + Simplified PR template + +commit 7eb1ec3200ba03235229f0bc7fe1da2173f25005 +Author: nathanlct +Date: Sun Jun 2 02:19:43 2019 -0700 + + remove unwanted commit + +commit 66e0f28f49cd9ac24df2945fa7b973a3f60f3c49 +Author: nathanlct +Date: Sun Jun 2 01:38:40 2019 -0700 + + fix pep8 + +commit df5b802b3c2515a16f5855bae0cb4c780f863dd4 +Author: nathanlct +Date: Sun Jun 2 01:31:02 2019 -0700 + + fix pep8 + +commit 75fbdbc6009e238c663324422e8468f7a75aa8ab +Author: nathanlct +Date: Sun Jun 2 01:22:39 2019 -0700 + + fix syntax errors and pep8 + +commit 71fee1cc7ca8d6ae3c5162b5e272d554136fd2ad +Author: nathanlct +Date: Sun Jun 2 01:07:41 2019 -0700 + + fix syntax error + +commit 178298504928097f26e2c6514af82ee7c22eab84 +Author: nathanlct +Date: Sun Jun 2 00:34:11 2019 -0700 + + clean and fix pep8 + +commit b75e08eef6d0f95cf66f9952e1d4165c49635f4d +Author: nathanlct +Date: Sat Jun 1 23:47:59 2019 -0700 + + fix pep8 + +commit 84ad7a731f125ce997ef53235ad32bb017a031bd +Author: nathanlct +Date: Sat Jun 1 23:44:42 2019 -0700 + + fix syntax error + +commit 5a7fb4dae5a2be5b2998d91fbf7ebcb624732342 +Author: nathanlct +Date: Sat Jun 1 23:42:39 2019 -0700 + + fix pep8 + +commit abf966f8c137bc8c1985941fa547ffa92c8e9db6 +Author: nathanlct +Date: Sat Jun 1 01:25:13 2019 -0700 + + finis incorporating Aimsun scripting_api.py into load.py + +commit 6061b0a7ee4d76bc57875af13d2bbee8f5d61798 +Author: nathanlct +Date: Sat Jun 1 01:02:07 2019 -0700 + + incorporate Aimsun scripting_api.py into load.py (wip) + +commit 62265509a428adaa7a721ce3993373c6ad64e0bf +Author: nathanlct +Date: Sat Jun 1 00:44:47 2019 -0700 + + incorporate Aimsun scripting_api.py into load.py (wip) + +commit 176ac1ad34e4e08f0cabd1c8f23c71ed8da5fa7a +Author: nathanlct +Date: Sat Jun 1 00:28:20 2019 -0700 + + start incorporating Aimsun scripting_api.py into load.py + +commit 009149e36e8d8fdb23f2dd4678aa75e5d0af967d +Author: nathanlct +Date: Sat Jun 1 00:27:57 2019 -0700 + + add __setattr__ override to Aimsun objects + +commit aaa3be5c0a7562d34f230ee363a2eb965281ac02 +Author: nathanlct +Date: Fri May 31 20:04:45 2019 -0700 + + wrapper is functional + +commit c46f8b4df40ad9fc4ffb2fa7f77c8c795d8d4acc +Author: nathanlct +Date: Fri May 31 11:28:18 2019 -0700 + + first version of scripting api for Aimsun + +commit df41b2d9c06463867cd6a460efdd491f16f5c679 +Author: nathanlct +Date: Fri May 31 11:28:01 2019 -0700 + + add all Aimsun secondary files to .gitignore + +commit 4deb15c6a70a2ee5c25905b3b13f8f5b7a7c62fe +Author: nathanlct +Date: Thu May 30 13:31:06 2019 -0700 + + fix bug that was deleting template when loading it in Aimsun + +commit c9f65eb58d844c696f582d6d4ff9a449d4552985 +Author: nathanlct +Date: Thu May 30 12:58:33 2019 -0700 + + remove .ang Aimsun template from .gitignore + +commit b7d5ee49bcf229a2bb30c603fa095a75685c389c +Author: nathanlct +Date: Thu May 30 12:53:17 2019 -0700 + + add default Aimsun_Flow.ang template back + +commit 760dce4af431f6f14aee8d8daa5e0c4b9602780a +Author: nathanlct +Date: Thu May 30 12:42:46 2019 -0700 + + add .vscode folder in .gitignore + +commit a3025fd991b66ef3c19fb8a1ec18912b52d0fa2b +Author: AboudyKreidieh +Date: Mon Feb 4 14:47:15 2019 -0800 + + partial fix to aimsun kernel + +commit 8444d462ec5b7c62439ecbbbd57ba24594c83208 +Author: nathanlct +Date: Sun Jun 2 01:48:06 2019 -0700 + + simplify PR template + +commit 2b5d2b364067ca4bd50bbc3aab6004d09a22f327 +Author: AboudyKreidieh +Date: Wed May 29 12:18:38 2019 -0700 + + bug fix + +commit b9f423b1eacaf3bba5c974995ec5338291f09681 +Author: AboudyKreidieh +Date: Wed May 29 11:57:51 2019 -0700 + + removed obsolete tests + +commit 8c2c9b297aff87a84ece781dc58492bf674ab13d +Author: AboudyKreidieh +Date: Wed May 29 11:27:31 2019 -0700 + + Removed custom spacing from loop merge network. + + This method was using a parameter, cls, which acted as sort of a hack during the period when we were porting over Aimsun. This allows us to remove this parameter, since the loop merge scenario was the only scenario still using this. + +commit 9d0b03489e7a43cf8673bb1be0590583178d253f +Author: AboudyKreidieh +Date: Wed May 29 11:09:00 2019 -0700 + + removed loop merge environment + +commit 376034dc870b8b29792fcb1df5e724c06dce95b4 +Merge: 0d2a5e21 4a7cf6cb +Author: Aboudy Kreidieh +Date: Mon May 27 23:07:42 2019 -0700 + + Merge pull request #527 from flow-project/tutorial_template + + added template for tutorials + +commit 4a7cf6cbf4ecb80528f2dd390030585aa9ea2c38 +Author: Ashkan Y +Date: Mon May 27 09:35:50 2019 -0700 + + Added instuctions to add tutorial to the website + +commit 9e18e69ad83ee15415ffac62449486aaf8bccaa7 +Author: Ashkan Y +Date: Mon May 27 00:26:57 2019 -0700 + + Update Readme with Stack Overflow tag information + + ## Pull request information + + + + - **Status**: Ready to merge + - **Kind of changes**: enhancement + - **Code affected**: Readme.md + - **Related PR or issue**: None + + ## Description + + + + + General description + + - Added a section in Readme.md for asking questions on Stack overflow + +commit cf51ce431fb97e6886ed07af722a21afda7677b8 +Author: Ashkan Y +Date: Sun May 26 22:52:24 2019 -0700 + + Proof read the tutorial template + + Proof read the tutorial template and added more clarity to few sentences + +commit a30d1536a198092377e73958fad9636fcdf7e4e5 +Merge: 4c299ca1 0d2a5e21 +Author: Ashkan Y +Date: Sun May 26 22:34:37 2019 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow + +commit 11bab1b5ab5ded0f21ecd561e68ce702f0c04581 +Merge: 1662f156 0d2a5e21 +Author: AboudyKreidieh +Date: Sun May 26 15:38:08 2019 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow into time_space_diagram + +commit 18eff3a19a387c9ed3476f61b6c9fb3aaa51e577 +Author: AboudyKreidieh +Date: Sun May 26 13:29:45 2019 -0700 + + added template for tutorials + +commit 0d2a5e216a2ed110b45f79e399fe30aaff706ac6 +Merge: 0421ee31 1de1e29b +Author: Aboudy Kreidieh +Date: Sun May 26 03:58:32 2019 -0700 + + Merge pull request #483 from flow-project/remove_scenario + + Remove scenario + + - replaced `scenario.vehicles` in the environments with `initial_vehicles` + - updated the `initialize` procedure in the vehicle kernels so that they may be initialized with the correct number of initial vehicles + - moved `get_initial_speed` from `VehicleParams` to the vehicle kernel + +commit 1de1e29bba53ab5db19aedfd7b1343199ee568ea +Author: AboudyKreidieh +Date: Sun May 26 03:12:26 2019 -0700 + + cleanup + +commit 4c299ca1f602a429b6c686cfb92f3980299bfc27 +Merge: ed26471a 0421ee31 +Author: Ashkan Y +Date: Fri May 24 10:59:25 2019 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow + +commit 0421ee31b072cb2ac533357afe05adb0a6867463 +Merge: 2043a5b8 6802afd9 +Author: Aboudy Kreidieh +Date: Thu May 23 15:29:49 2019 -0700 + + Merge pull request #516 from flow-project/grid_doc + + added documentation to grid functions + +commit 6802afd906934c02ca643376a0c6097b60909733 +Author: AboudyKreidieh +Date: Thu May 23 14:51:26 2019 -0700 + + PR fix + +commit 2043a5b802774fb0fd997d9145ff460bed269d5f +Merge: 5ca98bbf 63859fe0 +Author: Aboudy Kreidieh +Date: Thu May 23 14:35:40 2019 -0700 + + Merge pull request #521 from flow-project/ashkan-development + + Better name for 'self.last_change' array + +commit 63859fe001568aa6f9c661aa98e3683097bb76e0 +Author: Ashkan Y +Date: Thu May 23 11:25:44 2019 -0700 + + Fixed tutorial 11 bug + + Fixed the accidental deletion of "}," in the code that had broken the tutorial + +commit 591fdca60412163c9985b10fe8b7ddf176a54183 +Author: Ashkan Y +Date: Wed May 22 15:57:15 2019 -0700 + + Removed ipdb trace code + +commit 0191e8ca79fff9d46dcbf1d1df1c97ff7dd0fe20 +Author: AboudyKreidieh +Date: Wed May 22 15:34:29 2019 -0700 + + bug fix + +commit 5ca98bbf095293c54d2840770cc3f93608c0680e +Merge: 0e940683 1096f508 +Author: Aboudy Kreidieh +Date: Wed May 22 13:29:00 2019 -0700 + + Merge pull request #513 from flow-project/removed_controller + + removed FeedBackController + +commit 0e94068377a4735a82123156a44b5d34b5f3a797 +Merge: 623b98b0 708758da +Author: Nathan Lichtlé +Date: Wed May 22 13:22:29 2019 -0700 + + Merge pull request #525 from flow-project/pr-template + + New pull request template + +commit 708758dab6bc1eb6f0d867e670e1adf74e3ffc5e +Author: Nathan Lichtlé +Date: Tue May 21 19:11:22 2019 -0700 + + cleaner PR template + +commit 741e90bef1fdc21ccbb5ccf476e40b951035ca7c +Author: Nathan Lichtlé +Date: Tue May 21 19:03:02 2019 -0700 + + added pull request template + +commit 623b98b07a81ff1ebedf7a7db08b47751ba6192a +Merge: 3cf37aab 08cc3c61 +Author: Aboudy Kreidieh +Date: Tue May 21 13:34:17 2019 -0700 + + Merge pull request #507 from flow-project/osm_test + + added test for osm files + +commit 08cc3c61407397ed439e249bdb3d898aa0580fa7 +Author: AboudyKreidieh +Date: Mon May 20 13:44:08 2019 -0700 + + pep8 + +commit 4d15c324561e4fa7fc49d009aee136630de20e69 +Author: AboudyKreidieh +Date: Mon May 20 13:38:39 2019 -0700 + + bug fixes + +commit 2418a6995dbeac39630d935575d8513dbd5b7782 +Merge: b3dd3a1e 3cf37aab +Author: AboudyKreidieh +Date: Mon May 20 13:21:10 2019 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow into grid_doc + +commit e44e339bc1ec626d570879cac41ce565bab0f194 +Merge: fa6356da 3cf37aab +Author: AboudyKreidieh +Date: Mon May 20 13:14:01 2019 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow into remove_scenario + +commit 9567f1ee2f8a47935a8c16ce354f97b1b0fb98b6 +Merge: 67a89c0e 3cf37aab +Author: AboudyKreidieh +Date: Mon May 20 13:09:07 2019 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow into osm_test + +commit 1662f156e85254b5d2fe8810579b50f1b0752fc0 +Merge: 0fd1da4f 3cf37aab +Author: AboudyKreidieh +Date: Mon May 20 13:07:31 2019 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow into time_space_diagram + +commit 0fd1da4f52b776cd23fe32912007233dd568a845 +Author: AboudyKreidieh +Date: Mon May 20 13:07:18 2019 -0700 + + bug fixes + +commit 3cf37aab3506694df347077db5c8ef438e7afbb1 +Merge: c544c4d0 b7f08f53 +Author: Aboudy Kreidieh +Date: Mon May 20 13:06:07 2019 -0700 + + Merge pull request #512 from flow-project/visualizer_tests + + new tests to visualizers + +commit e0499db7264a785d94556c0f15e056b9956ece12 +Author: AboudyKreidieh +Date: Sun May 19 17:25:08 2019 -0700 + + tests for the time space diagram visualizer and some cleanup + +commit bbe5e8a193caf34eeef7d58689a2409fda642886 +Author: Ashkan Y +Date: Sun May 19 14:51:15 2019 -0700 + + Remove ipdb + +commit 5e6518ec5f0377c08096e17a6329e1ca076286f6 +Author: AboudyKreidieh +Date: Sun May 19 13:23:22 2019 -0700 + + bug fix + +commit 0b7cd3c93cd54bb8162dcada440a52585bb9f821 +Author: AboudyKreidieh +Date: Sun May 19 13:15:43 2019 -0700 + + documented new routing methods in scenario tutorial + +commit b54cbb96074d4b2e85925d743e8065769df84a6d +Author: AboudyKreidieh +Date: Sun May 19 12:32:55 2019 -0700 + + modified ContinuousRouter to probabalistically adopt any of the routes available from a given starting edge + +commit 52ff9373e7be3093c2752a2dcb1c1e641cd7a91b +Author: Ashkan Y +Date: Sat May 18 23:33:22 2019 -0700 + + fixed pep8 issues :) + +commit 0b0bc56a33720fea91512752893b7bbe6f57a8c4 +Author: Ashkan Y +Date: Sat May 18 23:24:13 2019 -0700 + + Added ipdb for debug + +commit ed26471a86f854a3053ce7f6e1115d915dd864e4 +Merge: 6e40d099 c544c4d0 +Author: Ashkan Y +Date: Sat May 18 23:13:43 2019 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow + +commit 1fb8c5227855442c385fc2a7a63804ec03e58a78 +Author: AboudyKreidieh +Date: Sat May 18 21:08:24 2019 -0700 + + bug fixes + +commit b214aadbfcc203809ba8bbbc8d5e3481522b6701 +Author: AboudyKreidieh +Date: Sat May 18 14:55:14 2019 -0700 + + bug fixes + +commit 930326ace2e0b7aa236122161d31eb0720b96ed5 +Author: AboudyKreidieh +Date: Sat May 18 13:55:39 2019 -0700 + + some cleanup to changes + +commit 0c1f739f58d5bf9b239269e1e7a630412b250498 +Author: AboudyKreidieh +Date: Sat May 18 13:20:18 2019 -0700 + + pep8 + +commit 61749395931957860c576436e816b4ed0caa6dcf +Merge: 6d70435d c544c4d0 +Author: AboudyKreidieh +Date: Sat May 18 13:16:54 2019 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow into new_router + +commit fa6356daf5a31d12f7f7fb8e129d544b8f5adc00 +Author: AboudyKreidieh +Date: Fri May 17 18:59:45 2019 -0700 + + further removal of cases of scenario.vehicles + +commit 709850c2d4b39959beed43894667e453a2b2d083 +Merge: 5ed81b75 c544c4d0 +Author: AboudyKreidieh +Date: Fri May 17 11:02:42 2019 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow into remove_scenario + +commit c544c4d08bfceb50774dca5fa4c669e4581173d5 +Merge: 03fa1403 878ac3d1 +Author: Aboudy Kreidieh +Date: Fri May 17 10:51:46 2019 -0700 + + Merge pull request #523 from sotte/doc_multiagent_fix + + DOC fix indent and improve wording for multiagent + +commit 878ac3d1f145b9250bfb2cd13f89fe631e6aba5e +Author: Stefan Otte +Date: Fri May 17 10:53:15 2019 +0200 + + DOC fix indent and improve wording for multiagent + +commit 2e8615ad3a09d19786bfe8e1b6f525d7ec6129b7 +Author: Ashkan Y +Date: Wed May 15 17:42:32 2019 -0700 + + Fixed pep8 issues + +commit 513f702e15b29bae9ce9005326cf1a5b770618f3 +Author: Ashkan Y +Date: Mon May 13 18:44:20 2019 -0700 + + Better name for 'self.last_change' array + + -Split the 2D array self.last_change[num_traffic,3], into 3 arrays, that are described by better names + -Updated the file green_wave_env + -Updated the tutorial for traffic lights + +commit 6e40d099b3db190deb10a44df4ff87cdb709b934 +Merge: 1c1c284d 03fa1403 +Author: Ashkan Y +Date: Sun May 12 23:48:32 2019 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow + +commit 03fa1403e6b83671e987d57f69b9df448d78ed99 +Merge: ee9973b6 45a34db0 +Author: Aboudy Kreidieh +Date: Sun May 12 15:32:45 2019 -0700 + + Merge pull request #514 from flow-project/tests_cleanup + + some mods to unit-testability + +commit 5ed81b759fc11a4b95b6e526b5e4d5afe8c2fb51 +Merge: 4d0356ba ee9973b6 +Author: AboudyKreidieh +Date: Fri May 10 17:10:49 2019 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow into remove_scenario + +commit ee9973b6cca733da6f2e3b64c61bdb1fd018ebcc +Merge: 0c1a0d2e b97fb02b +Author: Aboudy Kreidieh +Date: Fri May 10 17:07:03 2019 -0700 + + Merge pull request #481 from flow-project/docstring_attributes + + extended documentation in docstrings + +commit b97fb02b76700d1e274dfd2fc814dd2e8422699a +Author: AboudyKreidieh +Date: Fri May 10 16:21:59 2019 -0700 + + PR fixes + +commit 246812514524287ac7aa43465975d68e97bb0b3a +Author: AboudyKreidieh +Date: Fri May 10 16:20:30 2019 -0700 + + PR fixes + +commit ce52713a694a938bb2ecd56f3e367fe17205e826 +Merge: 8d80bb4f 0c1a0d2e +Author: AboudyKreidieh +Date: Fri May 10 15:06:08 2019 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow into docstring_attributes + +commit 0c1a0d2e1ac83049ae0ef0e3effe8a7fe7bf805f +Merge: d1cf643c f6a0a592 +Author: Aboudy Kreidieh +Date: Wed May 8 21:31:19 2019 -0700 + + Merge pull request #492 from flow-project/LuST_pr + + LuSt pr + +commit f6a0a592c5342d59309c68daa4d3a20364e28a35 +Author: AboudyKreidieh +Date: Wed May 8 20:50:27 2019 -0700 + + added test for vehicles in .rou.xml + +commit 23e9ff3da0dc328c4088d3f2b0c4d10b0b621904 +Author: AboudyKreidieh +Date: Wed May 8 19:40:20 2019 -0700 + + added missing files + +commit 9816dc6e8e011dd62cbefa9ce93ffa034d4ea5ff +Author: AboudyKreidieh +Date: Wed May 8 19:11:54 2019 -0700 + + added tests for network templates + +commit dac74a734c50684cacb492d2ba28864e46c0f7e0 +Author: AboudyKreidieh +Date: Wed May 8 14:53:49 2019 -0700 + + bug fix for only one .rou file + +commit c66b2175529263832b7688b17728b9d5c122f7d7 +Merge: 4160009a d1cf643c +Author: AboudyKreidieh +Date: Wed May 8 13:21:56 2019 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow into LuST_pr + +commit 06fd1942936e95a29f7fe50690f5da8a0fac6db5 +Author: AboudyKreidieh +Date: Tue May 7 01:12:27 2019 -0700 + + added missing file + +commit 04627aeb50c82295bd9873d955b011b780cc8220 +Author: AboudyKreidieh +Date: Tue May 7 00:16:33 2019 -0700 + + added test for importing emission in time space diagram + +commit 1c1c284d8a9cbeb7d62c37e917492c27dbc89117 +Merge: 4324cab2 d1cf643c +Author: Ashkan Y +Date: Mon May 6 23:48:50 2019 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow + +commit 19c83f45f990f51797a0f98c7458d0819b0b9b4b +Merge: bcc511cc b7f08f53 +Author: AboudyKreidieh +Date: Mon May 6 23:40:56 2019 -0700 + + Merge branch 'visualizer_tests' of https://github.com/flow-project/flow into time_space_diagram + +commit 45a34db0ef9b625c93984414dea741a8753603cd +Author: AboudyKreidieh +Date: Mon May 6 23:32:15 2019 -0700 + + bug fix + +commit bcc511cc3eb81b660faebd262ffd7f1d8cd0293e +Author: AboudyKreidieh +Date: Sun May 5 09:36:59 2019 -0700 + + modified figure eight exps to improve behavior in new sumo + +commit bd04fc9ebe3e3ee012a13e175735f964eab08e4a +Author: AboudyKreidieh +Date: Sun May 5 09:36:05 2019 -0700 + + added a new method for plotting time space diagrams + +commit f926b3e7c5e09d2ea22334d78557075c82b04d38 +Merge: f4c70e14 d1cf643c +Author: AboudyKreidieh +Date: Fri May 3 13:07:22 2019 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow into new_sumo_pr + +commit d1cf643c309602fd31062abb42987f84b29ac4cb +Merge: a5dbd5d9 c2912c8e +Author: Aboudy Kreidieh +Date: Mon Apr 29 10:06:11 2019 -0700 + + Merge pull request #515 from romannv/master + + Update missing docs link in tutorial01_sumo + +commit f4c70e14cee540cd3d972df6ff7c7533005ba5b7 +Merge: 23ff77b0 a5dbd5d9 +Author: AboudyKreidieh +Date: Sun Apr 28 22:52:05 2019 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow into new_sumo_pr + +commit 777bc87dee61018982b56fd713ca54b1a66fb34f +Author: AboudyKreidieh +Date: Sun Apr 28 22:35:09 2019 -0700 + + removed additional_params + +commit 6d14051bddffdf75c5f7335acdb3cb5186a3829c +Author: AboudyKreidieh +Date: Sun Apr 28 22:34:55 2019 -0700 + + removed some features that were affecting unit test coverage + +commit c2912c8e78aec55db224260dee935cef6bf5b330 +Author: Alejandro Roman +Date: Sun Apr 28 14:34:23 2019 -0500 + + Add parenthesis for missing docs reference + + I think it looks better with a parenthesis, as it was originally placed. + +commit cb1528230734adc61a82b869bc933f1e35815786 +Author: Alejandro Roman +Date: Sun Apr 28 14:32:06 2019 -0500 + + Update missing readthedocs link in tutorial01_sumo + + There was a missing link with a placeholder text when referencing the docs for the VehicleParams.add function. + +commit 407170c7140c102767ccd9fd8f51e2c034b96c16 +Author: AboudyKreidieh +Date: Sun Apr 28 02:51:24 2019 -0700 + + some mods to unit-testability + + - replaced ZeroDivisionError checks with an epsilon term + - replaced check for None with an statement + - added tests for additional_params to all scenarios + +commit 1096f5082fc23b3d21c0d1c04bff4d6a1837ee31 +Author: AboudyKreidieh +Date: Sat Apr 27 15:44:13 2019 -0700 + + removed FeedBackController + +commit b7f08f535c051dc20b55c3e33bced568bdfb74b6 +Author: AboudyKreidieh +Date: Sat Apr 27 15:37:49 2019 -0700 + + new tests to visualizers + + - added a tests for capacity_diagram_generator.py + - modified capacity_diagram_generator to be unit testable and accept path to csv as input + +commit 23ff77b0e83ec40ebd05f68021266fdd573d10a1 +Merge: e921912e ba1a47fe +Author: AboudyKreidieh +Date: Fri Apr 26 16:43:56 2019 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow into new_sumo_pr + +commit a5dbd5d9fd99e953ba8ca1148c7c6fa1c5fd20b4 +Merge: ba1a47fe cc77f756 +Author: Aboudy Kreidieh +Date: Thu Apr 25 17:46:05 2019 -0700 + + Merge pull request #509 from flow-project/add-code-of-conduct-1 + + Create CODE_OF_CONDUCT.md + +commit cc77f756548b9c30b280ad05dd28e9d1ce7ccba3 +Author: Aboudy Kreidieh +Date: Tue Apr 23 16:18:44 2019 -0700 + + Create CODE_OF_CONDUCT.md + +commit 4324cab24d5d15807d162052c937601a47ae4506 +Merge: 92d142b6 ba1a47fe +Author: Ashkan Y +Date: Tue Apr 23 13:55:35 2019 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow + +commit ba1a47fe26317b7f051ef8c9a43dd685e20866a8 +Merge: 094098d7 8ccf94f7 +Author: Aboudy Kreidieh +Date: Mon Apr 22 21:15:57 2019 -0700 + + Merge pull request #505 from flow-project/wave_atten_env + + Wave atten env + +commit 094098d7eb1cd447814ec5616e64218ea4d9adfd +Merge: 043ec1a0 9d48f991 +Author: Aboudy Kreidieh +Date: Mon Apr 22 21:15:40 2019 -0700 + + Merge pull request #506 from flow-project/test_example + + Test example + +commit 4160009a0476a269b5219584cd05fa5af274fad5 +Merge: 12d9cae9 043ec1a0 +Author: AboudyKreidieh +Date: Mon Apr 22 16:56:42 2019 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow into LuST_pr + +commit 8ccf94f70e9dc1fa3f6a25230145d7348231e6d2 +Merge: 4e73437a 1d294744 +Author: AboudyKreidieh +Date: Mon Apr 22 14:03:52 2019 -0700 + + Merge branch 'wave_atten_env' of https://github.com/flow-project/flow into wave_atten_env + +commit 4e73437a756fde37c6e3d72c28b3e3b37fff5f93 +Merge: 1b7f7a46 043ec1a0 +Author: AboudyKreidieh +Date: Mon Apr 22 14:03:31 2019 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow into wave_atten_env + +commit 1d294744d84f9546267d2cab6935c24cab65e0a0 +Merge: 6e5008b3 1b7f7a46 +Author: Aboudy +Date: Sun Apr 21 23:04:15 2019 -0700 + + Merge branch 'wave_atten_env' of https://github.com/flow-project/flow into wave_atten_env + +commit 6e5008b336de70e2daf0fd7edd1f5c457e890175 +Author: Aboudy +Date: Sun Apr 21 23:03:49 2019 -0700 + + updated params to match paper + +commit 043ec1a0949547336ea217e5dac793fc4c1a8cda +Merge: f8d86344 7bd45bfe +Author: Aboudy Kreidieh +Date: Sun Apr 21 09:21:53 2019 -0700 + + Merge pull request #508 from flow-project/aimsun + + Aimsun + +commit 7bd45bfe099c6dd50ae0e3b9ead3e45d3a326b2b +Merge: 6a22e1d1 3f7ebf91 +Author: Aboudy Kreidieh +Date: Sat Apr 20 21:29:21 2019 -0700 + + Merge pull request #504 from nathanlct/flow-aimsun + + Aimsun-Flow interface + +commit 67a89c0e7d3f2ce3c2d24c1d84520dd4b991d9aa +Author: AboudyKreidieh +Date: Fri Apr 19 20:00:32 2019 -0700 + + more stable version of the test + +commit 3569535b3492b928d587838a2de3f13dc600f71b +Author: AboudyKreidieh +Date: Fri Apr 19 20:00:13 2019 -0700 + + more stable version of the test + +commit 3164a818e6a6f939276175bddf452b59667a60b5 +Author: AboudyKreidieh +Date: Fri Apr 19 19:35:13 2019 -0700 + + added test for osm files + +commit f8d86344b813a99e657c10e8aeaa69bf34dc1bb0 +Merge: 5b0c9b4a 7fdfd31d +Author: Aboudy Kreidieh +Date: Fri Apr 19 19:16:28 2019 -0700 + + Merge pull request #498 from flow-project/actions_single_veh + + modified apply vehicle actions to support single vehicles + +commit 5b0c9b4ab670900f60e5c404dece70224c626948 +Merge: 6a22e1d1 13d27822 +Author: Aboudy Kreidieh +Date: Fri Apr 19 19:15:56 2019 -0700 + + Merge pull request #503 from flow-project/rew_fix + + modified reward to match description + +commit 9d48f9916e864f7bc928d1f0b7b16ede06bd496c +Author: AboudyKreidieh +Date: Fri Apr 19 19:06:19 2019 -0700 + + pythonified some parameter updates + +commit 9e7c5b2a14b1ea2c1769a22d7af634562817b675 +Author: AboudyKreidieh +Date: Fri Apr 19 19:02:41 2019 -0700 + + added test for examples/sumo/density_exp.py + +commit 1b7f7a46208df0b94e66e6bfe2431829dd682402 +Author: AboudyKreidieh +Date: Fri Apr 19 18:31:50 2019 -0700 + + tests to wave attenuation env + +commit 12d9cae973fb570e50505a933493466f28b671e5 +Author: nathanlct +Date: Fri Apr 19 15:49:51 2019 -0700 + + added Aimsun part to tutorial 8 + +commit 3f7ebf91aef1633f2b3b71642d78fba6b4b80114 +Author: nathanlct +Date: Fri Apr 19 15:01:24 2019 -0700 + + fix tracking test + +commit 4d3e64daa2917a2c38d887c31907651894df9e32 +Author: nathanlct +Date: Fri Apr 19 15:00:30 2019 -0700 + + fix test + +commit 1b7bbb0d9de5862d141ea477ee952b6ac106b9f7 +Merge: a627bbd7 3eb3823f +Author: nathanlct +Date: Fri Apr 19 14:54:56 2019 -0700 + + merge + +commit 3eb3823f0b62d5c5d704351818b3af55347fcfd5 +Author: nathanlct +Date: Fri Apr 19 14:39:38 2019 -0700 + + fixed tracking info test + +commit 965c97f22230ba334ddcee5c2d56543b5b1e8385 +Author: nathanlct +Date: Fri Apr 19 13:54:17 2019 -0700 + + fix tests + +commit b14a2a0733aa645149b9cf317bf85945ccb6b3d9 +Merge: 311427e5 6b4e7b7a +Author: nathanlct +Date: Fri Apr 19 13:42:45 2019 -0700 + + Merge branch 'master' into flow-aimsun + +commit 45f0c7bfd53746f391ffe4ef266c9cb6a2fd0651 +Author: AboudyKreidieh +Date: Fri Apr 19 13:06:13 2019 -0700 + + bug fix + +commit a387dd0b5a257113e05a5f1efcdcf541e222d9d6 +Merge: ed2ecdf8 6a22e1d1 +Author: AboudyKreidieh +Date: Fri Apr 19 12:55:42 2019 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow into wave_atten_env + +commit 92d142b6b6847e435a4c253995e80ce02b426dca +Merge: 804b2293 6a22e1d1 +Author: Ashkan Y +Date: Thu Apr 18 12:49:28 2019 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow + +commit a627bbd77879040c6a5b2741a3259be8b54e731c +Author: Nathan Lichtlé +Date: Wed Apr 17 22:23:51 2019 -0700 + + Update tutorial08_network_templates.ipynb + +commit 311427e5bee082d6dacb6bac358b480f4e9ce417 +Author: nathanlct +Date: Wed Apr 17 22:13:25 2019 -0700 + + beautify code + +commit 228e0980cd6ddbff32083f8b641bd62be24e7dd3 +Author: nathanlct +Date: Wed Apr 17 21:05:54 2019 -0700 + + fixed indentation + +commit a5e6ee056b6c872771211b13b6de55811a8ea6a3 +Author: nathanlct +Date: Wed Apr 17 21:03:09 2019 -0700 + + simplify default call to specify_routes that now has a default value when not implemented + +commit c3c68187026793b4887e9baf4099feb2714147ba +Merge: b524edc6 05fbabbc +Author: nathanlct +Date: Wed Apr 17 20:57:53 2019 -0700 + + merge + +commit b524edc69194cba4fcd75a2b487d2128b84eb3da +Author: nathanlct +Date: Wed Apr 17 20:44:37 2019 -0700 + + fixed loading of scenario_data.json into scenario + +commit 6e970bbd1d742eb5431ced8e371629c91fb644df +Author: nathanlct +Date: Wed Apr 17 20:42:15 2019 -0700 + + fixed get_tracking_info function + +commit 05fbabbc560c286e1c8e891e88cddcfdd48db4a3 +Author: AboudyKreidieh +Date: Wed Apr 17 17:32:33 2019 -0700 + + removed code duplication + +commit b129d7cec6888c38b954e50b8a3484b7cc9a370e +Author: nathanlct +Date: Wed Apr 17 17:26:56 2019 -0700 + + added missing colon + +commit b01de7b385a1a726f713ca9fa2f89cd4376cf0eb +Author: AboudyKreidieh +Date: Wed Apr 17 17:18:37 2019 -0700 + + pep8 + +commit c0200c5bc2bbc537ede9b41d3355eb8f55670d51 +Author: AboudyKreidieh +Date: Wed Apr 17 17:07:50 2019 -0700 + + removed code duplication + +commit 59f335af0e2ceed9ef9812e859dfe19479801fe2 +Author: nathanlct +Date: Wed Apr 17 16:56:39 2019 -0700 + + removed unused import + +commit c8a6709dd92d40d8c486daa776d8cf2b134f54c2 +Author: nathanlct +Date: Wed Apr 17 16:46:19 2019 -0700 + + beautify code + +commit 7e01b4b9056fdfe956ceab1c1a380fa8c0289752 +Merge: 6e8b971a cebc6d81 +Author: nathanlct +Date: Wed Apr 17 16:22:57 2019 -0700 + + Merge branch 'flow-aimsun' of https://github.com/nathanlct/flow into flow-aimsun + +commit 6e8b971aed36025634084bce5e1ed8397224921c +Author: nathanlct +Date: Wed Apr 17 16:17:55 2019 -0700 + + beautify code + +commit cebc6d81d31817756525ef17a1dfe9754a99dce3 +Merge: 17a7d751 6a22e1d1 +Author: Nathan Lichtlé +Date: Wed Apr 17 15:24:56 2019 -0700 + + Merge branch 'aimsun' into flow-aimsun + +commit 17a7d75164ac0dbdc5939cf91e437d889bc090c3 +Author: nathanlct +Date: Wed Apr 17 14:29:56 2019 -0700 + + cleaning + +commit 6a22e1d135860575bd3f3be0a502a4f72a03f864 +Merge: 48a8f85d 22e65bd1 +Author: Aboudy Kreidieh +Date: Tue Apr 16 15:13:11 2019 -0700 + + Merge pull request #495 from flow-project/ashkan-development + + Update README.md + +commit 22e65bd15d11f437fbdc711aced9c1b4fd71487b +Merge: e1ef276d 48a8f85d +Author: AboudyKreidieh +Date: Tue Apr 16 13:51:28 2019 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow into ashkan-development + +commit 13d278226fce934696e11ed9e3900b7dea0a8105 +Author: AboudyKreidieh +Date: Tue Apr 16 13:50:54 2019 -0700 + + cleanup to tutorial + +commit db518a673611d86f975641e56196ff243a7c49e1 +Author: AboudyKreidieh +Date: Tue Apr 16 13:47:53 2019 -0700 + + cleaned up tutorial + +commit 48a8f85dd5a52c436536a19fdd9714199b93617c +Merge: 63281ef1 384bee0c +Author: Aboudy Kreidieh +Date: Tue Apr 16 13:39:55 2019 -0700 + + Merge pull request #502 from persianpros/patch-1 + + Make Travis CI faster with shallow clone. + +commit 6cea860b4a584cd508b28f99e2465ceff5f86c89 +Author: AboudyKreidieh +Date: Tue Apr 16 13:36:58 2019 -0700 + + modified reward to match description + + resolves #500 + +commit 384bee0cf6945f80f10274a514224083a1be2efc +Author: Persian Prince +Date: Wed Apr 17 00:39:22 2019 +0430 + + Make Travis CI faster with shallow clone. + +commit 786570076edd1f092f47949d37686136169f218b +Author: nathanlct +Date: Thu Apr 11 17:44:30 2019 -0700 + + everything + +commit 9314c5927df646b226362f35dcc0584bfcdaf92a +Author: nathanlct +Date: Thu Apr 11 17:43:48 2019 -0700 + + everything + +commit 7fdfd31d66ca2fdcdc2efb01fce58a27de49d3a0 +Author: AboudyKreidieh +Date: Thu Apr 11 00:15:14 2019 -0700 + + modified apply vehicle actions to support single vehicles + +commit 6d70435d3e47358d7d9bb09a6234321f455ec275 +Author: AboudyKreidieh +Date: Thu Apr 4 00:53:21 2019 -0700 + + added methods for including all possible routes + +commit 902462ace6254680ad3dee0f9802da7a59df3403 +Merge: aa5f1b92 63281ef1 +Author: AboudyKreidieh +Date: Thu Apr 4 00:45:43 2019 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow into new_router + +commit e1ef276d5c5762cae51a62a28cf4a6c7a582cc2a +Author: Ashkan Y +Date: Wed Apr 3 23:01:36 2019 -0700 + + Update README.md + + my apologies. I was using the last version of Readme. Here is the change with the updated readme. + +commit 804b2293f6fc57d28853357580f6af5c0fffd55b +Merge: eb95be58 63281ef1 +Author: Ashkan Y +Date: Wed Apr 3 22:59:04 2019 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow + +commit e9c1a491863550b3754cadb76575021469820385 +Author: Ashkan Y +Date: Wed Apr 3 22:55:54 2019 -0700 + + Update README.md + + Update the list of contributors, and link it to the contributors' webpage on the Flow website (so it's always updated) + +commit 63281ef1b22e360e0c825a9023afd7c6489246eb +Merge: e63a2278 4f71086d +Author: Aboudy Kreidieh +Date: Wed Apr 3 13:47:25 2019 -0700 + + Merge pull request #469 from flow-project/gen_emission + + Gen emission + +commit aa5f1b92e1555ba111512f359ebd2b6e7f55524f +Merge: 395457cc e63a2278 +Author: AboudyKreidieh +Date: Wed Apr 3 09:33:04 2019 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow into new_router + +commit 4f71086dedc64f8243c8db9051ad4d35e5ea4079 +Merge: b2986f70 e63a2278 +Author: AboudyKreidieh +Date: Wed Apr 3 09:32:30 2019 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow into gen_emission + +commit 395457cc317a248d5df84510bddbee3720054314 +Author: AboudyKreidieh +Date: Wed Apr 3 09:29:19 2019 -0700 + + documentation for new route + +commit e63a22783f2f08997973e2b36e1df2a567a7ea55 +Merge: 4a3731c8 16fe93e2 +Author: Aboudy Kreidieh +Date: Wed Apr 3 09:25:28 2019 -0700 + + Merge pull request #482 from flow-project/remove_intersec_edgestarts + + deprecated intersection_edgestarts + +commit 4a3731c876fbb305133f4a2826354c8677a9399c +Merge: 92cdbf49 60de4dd5 +Author: Aboudy Kreidieh +Date: Mon Apr 1 09:37:22 2019 -0700 + + Merge pull request #490 from flow-project/scenario_docs + + expanded documentation for the scenarios + +commit 92cdbf498e1ea397c9d117bf3ec3b5f5455a2ced +Merge: dfee97dd d6479960 +Author: Aboudy Kreidieh +Date: Mon Apr 1 09:36:13 2019 -0700 + + Merge pull request #493 from flow-project/terminate_fixes + + removed prints at termination + +commit e921912ee672c96c92d654c925d8e3e4bdec0a91 +Merge: 77d92097 dfee97dd +Author: AboudyKreidieh +Date: Sun Mar 31 15:06:31 2019 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow into new_sumo_pr + +commit 77d92097e343beadf2168cef2015f9395fcfc882 +Author: AboudyKreidieh +Date: Sun Mar 31 15:06:27 2019 -0700 + + updated version + +commit d6479960af77e551321da4e01e609009e5b4035e +Author: AboudyKreidieh +Date: Sun Mar 31 14:40:33 2019 -0700 + + removed prints at termination + + These are causing way too many print statements at the end of a test/experiment + +commit 8b832b592530f34d6bb8d6a5cd712caf907b8249 +Author: AboudyKreidieh +Date: Sun Mar 31 14:26:50 2019 -0700 + + minor updates and bug fixes + +commit 6f6b29ab7cedef763d5d6be8d9ed534cf2308982 +Author: AboudyKreidieh +Date: Sun Mar 31 14:13:59 2019 -0700 + + updated setup instructions + +commit 04829a425d46663b6a5faaf4761171dd6cb40f3c +Merge: 11c84d04 dfee97dd +Author: AboudyKreidieh +Date: Sat Mar 30 23:46:38 2019 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow into LuST_pr + +commit 8d5246f8c908c9de1eded1244e737e39c7170adf +Author: AboudyKreidieh +Date: Sat Mar 30 23:41:14 2019 -0700 + + updated setup scripts + +commit dfee97dd504231f723d141ad1159ab35ad77bdba +Merge: d6773e0f bf26c910 +Author: Aboudy Kreidieh +Date: Sat Mar 30 23:25:45 2019 -0700 + + Merge pull request #486 from flow-project/osm_tutorial + + tutorial for osm + +commit d245bdfa1942664877f376f8de25257e668bc870 +Author: AboudyKreidieh +Date: Sat Mar 30 23:22:26 2019 -0700 + + bug fixes and updated documentation + +commit 353a97e8efebb2cd37e153bf4c274381d9138b0a +Merge: 00fc2339 d6773e0f +Author: AboudyKreidieh +Date: Sat Mar 30 23:01:32 2019 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow into new_sumo_pr + +commit 60de4dd5bdf421d9735da38fb59d494d557dbea1 +Author: AboudyKreidieh +Date: Sat Mar 30 02:01:46 2019 -0700 + + expanded documentation for the scenarios + +commit 11c84d048c733e0817682f4a7995166c81fa7738 +Author: AboudyKreidieh +Date: Thu Mar 28 23:43:49 2019 -0700 + + pep8 + +commit b2285cad0e28c7e2f23578a600ecab584d5c75eb +Author: AboudyKreidieh +Date: Thu Mar 28 23:42:47 2019 -0700 + + typo + +commit b009a9bbfc51a92f3b9e2928b1ab33408452e4f3 +Merge: 07e502ff bf26c910 +Author: AboudyKreidieh +Date: Thu Mar 28 23:41:52 2019 -0700 + + Merge branch 'osm_tutorial' into LuST_pr + +commit bf26c910a6039c79bf4080ed206440921dfaf5f8 +Author: AboudyKreidieh +Date: Thu Mar 28 23:41:22 2019 -0700 + + bug fix + +commit 07e502ff787941488d784dd0587ff771ca78c7a5 +Author: AboudyKreidieh +Date: Thu Mar 28 23:37:01 2019 -0700 + + templates tutorial + + - created tutorial on running sims from templates + - modified the scenario and vehicles classes and kernels to support predefined routes from vtype files + +commit d6773e0ffd2add78f35dff59e1aaf850d3925656 +Merge: df2fa059 47aed243 +Author: Aboudy Kreidieh +Date: Thu Mar 28 20:01:44 2019 -0700 + + Merge pull request #457 from flow-project/env_horizon + + added horizon to termination in Env + +commit eb95be58f0441fecbae7d5b9f30257165f0dd753 +Merge: eefdb58a df2fa059 +Author: Ashkan Y +Date: Thu Mar 28 15:39:30 2019 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow + +commit eda1058748efdc9a3cdcc2131a88e0c29bc4cbb5 +Author: AboudyKreidieh +Date: Thu Mar 28 00:43:58 2019 -0700 + + undid some changes + +commit 1fb2341f20a2591a0da0c1bf133ffc404340db78 +Merge: 7a06eb64 f25fa762 +Author: AboudyKreidieh +Date: Thu Mar 28 00:29:47 2019 -0700 + + Merge branch 'template_tutorial' into LuST_pr + +commit f25fa76276ecb945c69a10f4462aa84b8b6db05e +Author: AboudyKreidieh +Date: Thu Mar 28 00:29:29 2019 -0700 + + renamed netfile -> template + +commit fa8bb692edb8d61b87aca6c5332fbc7acf6f8f62 +Author: AboudyKreidieh +Date: Wed Mar 27 23:02:15 2019 -0700 + + moved up old tutorials + +commit 7a06eb647a2001a08df4f06fddb3196a7806c63e +Merge: e58c5569 41d53eb4 +Author: AboudyKreidieh +Date: Wed Mar 27 19:04:32 2019 -0700 + + Merge branch 'osm_tutorial' of https://github.com/flow-project/flow into LuST_pr + +commit e58c5569f8735196e13bc33d33245889282dcbae +Merge: 027ef96e df2fa059 +Author: AboudyKreidieh +Date: Wed Mar 27 19:04:24 2019 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow into LuST_pr + +commit df2fa059996d7a802360af4be1b903c7bd8602d2 +Merge: 55f20c51 8381444b +Author: Aboudy Kreidieh +Date: Wed Mar 27 19:00:20 2019 -0700 + + Merge pull request #485 from CYBruce/patch-3 + + minor fix + +commit 41d53eb4d72a9ebd1408740ab5969d73f8188012 +Author: AboudyKreidieh +Date: Wed Mar 27 18:51:57 2019 -0700 + + added pic of getting edge names + +commit 2e687255aa64e337a2d8df1727c29ce2153a33ba +Author: AboudyKreidieh +Date: Wed Mar 27 18:46:25 2019 -0700 + + bug fix + +commit 01dc1de13db2cf74bd37e81995d7a04a7fa19568 +Author: AboudyKreidieh +Date: Wed Mar 27 18:43:43 2019 -0700 + + tutorial for osm + + - added a tutorial on importing networks from openstreetmap + - defaulted routes to consist of the current edge only (to make running osm files easier) + - updated the tutorials README + - added test for default scenario routes + +commit 8381444b7b5aad0b8e8fc28e07e4f760538f8be7 +Author: CYBruce +Date: Wed Mar 27 14:46:04 2019 +0800 + + minor fix + + It should be 'state space' instead of 'action space' + +commit 4d0356ba39a90f9eb0b383ba5fab69ad3d609fe7 +Author: AboudyKreidieh +Date: Tue Mar 26 01:35:53 2019 -0700 + + bug fixes + +commit 8206abcc96b473d78772ecbb3120a1d9c9c789cd +Merge: 853f3a4e 55f20c51 +Author: AboudyKreidieh +Date: Tue Mar 26 00:52:36 2019 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow into remove_scenario + +commit 16fe93e2c72be3317712943f9da1f63cb06c551c +Author: AboudyKreidieh +Date: Mon Mar 25 20:56:27 2019 -0700 + + deprecated intersection_edgestarts + + This is moving towards us removing specify_edgestarts + +commit 8d80bb4f07a9cf8db3fc463ea8123346a6218ea0 +Author: AboudyKreidieh +Date: Mon Mar 25 20:36:04 2019 -0700 + + extended documentation in docstrings + + - added attributes to Env and Scenario docstrings + - added an example usage to Scenario docstring + - minor docstring fixes and typos + +commit 55f20c512c868e5982f7d2ae82fc4047503c85fa +Merge: 197e455f 3393a5d0 +Author: Aboudy Kreidieh +Date: Sun Mar 24 19:59:01 2019 -0700 + + Merge pull request #458 from flow-project/aimsun_test + + added test for aimsun struct + +commit 197e455fceb410de4888488239dbd2281e1d60fc +Merge: ed5bb99f 7fa31811 +Author: Aboudy Kreidieh +Date: Sun Mar 24 19:58:42 2019 -0700 + + Merge pull request #477 from flow-project/examples_test + + uncommented examples test + +commit ed5bb99fa35cdb51c44ef8c10da32f892a16a217 +Merge: 808e59a0 01a4559b +Author: Aboudy Kreidieh +Date: Fri Mar 22 22:07:59 2019 -0700 + + Merge pull request #480 from flow-project/mock_imports + + final missing imports (hopefully) + +commit 01a4559b0a7fb116afab89b4638bc1b7e48af5b8 +Author: AboudyKreidieh +Date: Fri Mar 22 21:34:40 2019 -0700 + + final missing imports (hopefully) + +commit 808e59a08c2b1fb9ac92847b83ae0bc8230e5173 +Merge: 20d8f534 fd58a2ce +Author: Aboudy Kreidieh +Date: Fri Mar 22 21:25:04 2019 -0700 + + Merge pull request #479 from flow-project/mock_imports + + resolved further import issues + +commit fd58a2ce761d31f3d3cba0426202e72d016cfc99 +Author: AboudyKreidieh +Date: Fri Mar 22 20:52:56 2019 -0700 + + resolved further import issues + +commit 20d8f534525a6c065611e1403b61a1b4d8a3ddb4 +Merge: b9c5c4d1 e959b706 +Author: Aboudy Kreidieh +Date: Fri Mar 22 20:39:37 2019 -0700 + + Merge pull request #478 from flow-project/mock_imports + + added mock import to readthedocs + +commit e959b706136f3c4aeddb10cac43b0d1e339fe5bc +Author: AboudyKreidieh +Date: Fri Mar 22 20:15:13 2019 -0700 + + added mock import to readthedocs + +commit ed2ecdf81eaf4542920afad7e6a0b13770c0fc81 +Author: AboudyKreidieh +Date: Fri Mar 22 19:25:25 2019 -0700 + + bug fix + +commit 7fa318110c3860ba6d7b94b510b5fb8908669dfb +Author: AboudyKreidieh +Date: Fri Mar 22 19:22:40 2019 -0700 + + uncommented examples test + +commit 2f0938da2a4ae790ae2eb759e5b593909101d083 +Author: AboudyKreidieh +Date: Fri Mar 22 19:13:54 2019 -0700 + + test for clip_actions + +commit b9c5c4d124d8c5054a0f82f5ee51e5f23abe21b8 +Merge: b9b81f85 c34ef0c0 +Author: Aboudy Kreidieh +Date: Fri Mar 22 16:07:38 2019 -0700 + + Merge pull request #466 from flow-project/ashkan-development + + Fixed Grid traffic light problem + +commit aeee15f85d853fa3cbdad53c4dd0c7c36d418574 +Author: AboudyKreidieh +Date: Fri Mar 22 16:05:08 2019 -0700 + + changes to improve training on stabilizing exp + + this includes: + - added an expection to close in the scenario kernel for casese when the files were not created or are named differently + - added a clip_rewards attribute to EnvParams to allow the action to not be clipped before it is fed into the reward function. This might be leading to flat gradients + - modified the weights on the reward function for WaveAttenuationEnv + + These methods should resolve some regression issues in training + +commit c34ef0c002b9b808672f7445d2ae936b7ba8d868 +Author: AboudyKreidieh +Date: Fri Mar 22 15:49:28 2019 -0700 + + pep8 + +commit c30973f89dda0cff7a3070a58dc10de8b12ee850 +Merge: 0bee6f6b b9b81f85 +Author: AboudyKreidieh +Date: Fri Mar 22 15:45:00 2019 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow into ashkan-development + +commit b9b81f852d3ca668e2c4f78c8b278c39a2cd2b14 +Merge: 980f4c54 d3324a34 +Author: Aboudy Kreidieh +Date: Thu Mar 21 00:02:59 2019 -0700 + + Merge pull request #274 from flow-project/base_scenario_fix + + Base scenario fix + +commit d3324a34f70813197c99e8ff5c9b83c708053d70 +Author: AboudyKreidieh +Date: Wed Mar 20 23:34:59 2019 -0700 + + pep8 + +commit e2cef4c4fd4b8755259069840f7f07c21b19c82d +Author: AboudyKreidieh +Date: Wed Mar 20 23:05:18 2019 -0700 + + tests for edges distribution dict + +commit b0de5751911be71cbdd30b7cc4014fd1e4c57949 +Author: AboudyKreidieh +Date: Wed Mar 20 22:37:36 2019 -0700 + + added missing piece + +commit 5f31be08e9bbc7901a3100980c0b681b8bc91698 +Merge: 26e8c9d1 980f4c54 +Author: AboudyKreidieh +Date: Wed Mar 20 22:36:41 2019 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow into base_scenario_fix + +commit 00fc23395aab136edb0c329988300c17f97527e4 +Merge: e3323dd5 0b631352 +Author: AboudyKreidieh +Date: Wed Mar 20 21:05:58 2019 -0700 + + Merge branch 'new_sumo' of https://github.com/flow-project/flow into new_sumo_pr + +commit b2986f702595c045251727a5dcbc4a36a3adb3ff +Author: AboudyKreidieh +Date: Wed Mar 20 19:53:40 2019 -0700 + + remove emission-to-csv + +commit f932683e177f7066d2d5d896755fbe9fa951f470 +Author: AboudyKreidieh +Date: Wed Mar 20 19:35:11 2019 -0700 + + added gen_emission option + +commit 0bee6f6b35117f2d6862764c36cb073ed5bce43e +Author: Ashkan Y +Date: Tue Mar 19 18:18:48 2019 -0700 + + Fixed data path problem in visualization + + Fixed data path problem in visualization + +commit 624ad4e3990bedf1c911a51e16bcec1bd2c9d8fe +Author: nathanlct +Date: Tue Mar 19 16:09:49 2019 -0700 + + add junctions loading in scenario + +commit ae048b47c89cfe471723230afbb791e027236dd2 +Merge: 7654fd2b 768cd7e2 +Author: nathanlct +Date: Tue Mar 19 15:54:21 2019 -0700 + + Merge branch 'load-aimsun-template' of https://github.com/nathanlct/flow into load-aimsun-template + +commit 7654fd2be0ad3fb550e565276e3ce17bd66f78ed +Author: nathanlct +Date: Tue Mar 19 15:54:06 2019 -0700 + + add junctions + +commit 768cd7e253512c5f4c90da5f35d13b367d2f55c2 +Author: Nathan Lichtlé +Date: Tue Mar 19 15:49:01 2019 -0700 + + delete load_template.py + +commit 39f3b366621bdc21352a6b568271d5f6835ffad0 +Author: nathanlct +Date: Tue Mar 19 15:48:15 2019 -0700 + + fix for travis + +commit 2fba29b90156e844d7d61a15c9ad9c37e2b5dfe2 +Author: nathanlct +Date: Tue Mar 19 15:15:10 2019 -0700 + + load template + +commit 603b7a16efcec633230eae33dc159c7f39732ee3 +Author: nathanlct +Date: Tue Mar 19 15:13:42 2019 -0700 + + fix not to call not implemented specify_routes when loading Aimsun template + +commit f09c655e2735129e5f0766d3344158fe05b96976 +Author: nathanlct +Date: Tue Mar 19 15:10:50 2019 -0700 + + fix indentation + +commit 4d99fb299b3f235d6db16d6c45db43f2f230df38 +Author: nathanlct +Date: Tue Mar 19 15:07:47 2019 -0700 + + fix indentation + +commit 5c5086a903280ab5b3286d12daef7152d9a9634c +Author: nathanlct +Date: Tue Mar 19 14:42:55 2019 -0700 + + fix for travis + +commit 7ff62bb6d121e9b5bdcd8539d9429b322377d503 +Author: Ashkan Y +Date: Tue Mar 19 13:06:25 2019 -0700 + + Fixed Grid traffic light problem + + Fixed Grid traffic light problem where the 3 traffic lights on the bottom row of the grid were not synced (3 were green at the same time in one intersection) + +commit 24d7dde085326c37d9f3aa5d11b7396662a0a9e2 +Author: nathanlct +Date: Mon Mar 18 19:25:24 2019 -0700 + + fix for travis + +commit eefdb58a1ef6bae6336e412a3ef731c17b045862 +Merge: a821c9a7 980f4c54 +Author: Ashkan Y +Date: Mon Mar 18 19:21:30 2019 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow + +commit 1117716b7a0703936f1444ea595ad3349e4c7b40 +Author: nathanlct +Date: Mon Mar 18 18:31:01 2019 -0700 + + created script to load Aimsun templates (whole network or subnetwork) + +commit 6f1cf418cc8304b7cabf437de4663855719a6bcc +Author: nathanlct +Date: Mon Mar 18 18:30:11 2019 -0700 + + replaced hard coded Aimsun params by settings in generate.py + +commit 56829fadd5915986c2ade91702bbc38170493ad8 +Author: nathanlct +Date: Mon Mar 18 18:28:10 2019 -0700 + + removed call to specify_routes when loading Aimsun template + +commit ad5b931fd6175b59f2fbf4d16a6f1c28ce79abe0 +Author: nathanlct +Date: Mon Mar 18 18:23:37 2019 -0700 + + read scenario data file written by load.py + +commit ee6083e8583c2ce636c31b7242f43819f58d4987 +Author: nathanlct +Date: Mon Mar 18 18:21:50 2019 -0700 + + write path to Aimsun's scenario in a file so it can be read by load.py + +commit f86671eeeab7c03113ab956b9a0897b8f8e098b4 +Author: nathanlct +Date: Mon Mar 18 18:20:21 2019 -0700 + + call load.py instead of generate.py when template_path is specified + +commit a6ad99b7c191fc0adf01d6f315cc750dded69b81 +Author: nathanlct +Date: Mon Mar 18 18:17:52 2019 -0700 + + add aimsun params in data.json file + +commit 87ffa6695b3a52a03e3694bdc24d354e0a57b172 +Author: nathanlct +Date: Mon Mar 18 18:16:33 2019 -0700 + + add aimsun template parameters in AimsunParams class + +commit b3dd3a1ed0741a24817dda6b48c249c77634b0a7 +Author: AboudyKreidieh +Date: Sun Mar 17 20:14:04 2019 -0700 + + added documentation to grid functions + +commit e3323dd5a73aab07f03462be6df6dd8e8c1fff9c +Author: AboudyKreidieh +Date: Sun Mar 17 19:46:46 2019 -0700 + + bug fixes + +commit 6b4e7b7a239434bdcac4c548259eb32ede39b5d1 +Author: nathanlct +Date: Wed Mar 13 14:23:16 2019 -0700 + + removed trailing spaces + +commit b7ea91d3cfa6c493e669e5469cf791b5aee3072e +Author: nathanlct +Date: Wed Mar 13 12:52:07 2019 -0700 + + added experiment and replication name in config.py + +commit 5cdcefc514f8df6aa91058ca7fb08141a9761f29 +Author: nathanlct +Date: Tue Mar 12 16:57:55 2019 -0700 + + renamed netfile into template + +commit 5459d76da784e8f02aa94ebbef8b848119b52c40 +Author: nathanlct +Date: Tue Mar 12 16:44:57 2019 -0700 + + removed unused variable + +commit fe71b92ec206e377c69da61af8e4ca12030386af +Merge: 5f738d63 edec40a0 +Author: Nathan Lichtlé +Date: Tue Mar 12 12:56:04 2019 -0700 + + Merge pull request #1 from nathanlct/flow-aimsun-api + + Flow aimsun api + +commit edec40a02e7ad1eeb851e2f929cfcb4247dc332b +Merge: 71ec8388 980f4c54 +Author: nathanlct +Date: Tue Mar 12 09:11:01 2019 -0700 + + Merge https://github.com/flow-project/flow into flow-aimsun-api + +commit ae59079679122acdc8cf318e9593d4853b5abe5c +Merge: d8d5a71c 980f4c54 +Author: AboudyKreidieh +Date: Tue Mar 12 02:43:01 2019 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow into new_sumo_pr + +commit 3393a5d02dd33d33c85ab258665bad4b2ceee5de +Merge: 0b0182e7 980f4c54 +Author: AboudyKreidieh +Date: Tue Mar 12 02:24:07 2019 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow into aimsun_test + +commit 980f4c54f327127eb3f81f8413b1c1e549101b12 +Merge: 922997e6 37769518 +Author: Aboudy Kreidieh +Date: Tue Mar 12 02:22:52 2019 -0700 + + Merge pull request #417 from MouvementMondial/master + + Bug fixed: use render args + +commit 47aed243fd7be0ffa4059f8552fa316c2c86dbda +Author: AboudyKreidieh +Date: Tue Mar 12 02:15:30 2019 -0700 + + added horizon to termination in Env + +commit 922997e64261c7f3713ae329decac381c7769d7f +Merge: fae17180 f77c2b3c +Author: Aboudy Kreidieh +Date: Tue Mar 12 01:56:10 2019 -0700 + + Merge pull request #452 from kjang96/issue_451 + + Modified SimpleGridScenario's gen_custom_start_pos function + +commit fae1718044f68577e9a5eda0322679c513adecf3 +Merge: e1add137 5f738d63 +Author: Aboudy Kreidieh +Date: Tue Mar 12 01:54:28 2019 -0700 + + Merge pull request #453 from nathanlct/master + + fixed Aimsun API for OS X + +commit e1add13741950063b1117fcf428de4cab27bfe0d +Merge: bca08479 22763bfe +Author: Aboudy Kreidieh +Date: Mon Mar 11 23:09:44 2019 -0700 + + Merge pull request #456 from flow-project/new_logo_placement + + New logo placement + +commit 22763bfebeabef464f7c8b64b8b164fa5770b19d +Author: AboudyKreidieh +Date: Mon Mar 11 19:07:36 2019 -0700 + + shrunck the logo and added logo without words + +commit 636326689df66f0d40a20f75ffa53c62a67cc558 +Author: AboudyKreidieh +Date: Mon Mar 11 19:02:18 2019 -0700 + + shrunk the image slightly + +commit 5362c7507188e67b9b7e9031c7ed322eebde23e9 +Author: AboudyKreidieh +Date: Mon Mar 11 19:01:01 2019 -0700 + + moved logo to the side + +commit bca08479acc77a17572388a3468074d5bed08116 +Merge: 1f8e770a b8922aeb +Author: Aboudy Kreidieh +Date: Mon Mar 11 18:52:20 2019 -0700 + + Merge pull request #455 from flow-project/ashkan-development + + Add Flow Logo + +commit b8922aeb5c306940a05fe90674eed7e91583f5cd +Author: Ashkan Y +Date: Mon Mar 11 15:44:38 2019 -0700 + + Revert tutorial10_inflows back + + Revert tutorial10_inflows back to what it was before the pull request + +commit a821c9a7f46c395746fd54d52881007e64ffadbf +Merge: 1f8e770a e799e2bf +Author: Ashkan Y +Date: Mon Mar 11 14:53:24 2019 -0700 + + Merge branch 'ashkan-development' + +commit e799e2bfc1df9b5c77f3c5baee5e19962c8da9a3 +Author: Ashkan Y +Date: Mon Mar 11 14:46:13 2019 -0700 + + Add Flow Logo + +commit f77c2b3c84d3bcaabd127d5af97442859ec83ef6 +Author: Kathy Jang +Date: Mon Mar 11 15:39:20 2019 -0400 + + Fixed bug in testing setup scripts for the grid + +commit 71ec838835b53814aade1f7819f0ee48f8a156ba +Author: nathanlct +Date: Mon Mar 11 11:33:05 2019 -0700 + + fixed connection to server + +commit 5f738d633104b44439b8e4f9c15f7086c0ef77ae +Author: nathanlct +Date: Sat Mar 9 12:29:20 2019 -0800 + + fixed coding style + +commit 56c13365808c59f66656470b187619ac7a25775a +Merge: df6351b9 1f8e770a +Author: nathanlct +Date: Fri Mar 8 17:34:18 2019 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow + +commit df6351b900cafa3e8dbbeda74128faa6cc56c66b +Author: nathanlct +Date: Fri Mar 8 17:26:05 2019 -0800 + + fixed Aimsun API for OS X + +commit 605228db1632d495a139d9261165eb799a300d1b +Author: Kathy Jang +Date: Fri Mar 8 19:43:03 2019 -0500 + + Modified SimpleGridScenario's gen_custom_start_pos function to provide more flexibility on how many vehicles are on each edge, and fixes bug which averages the total number of vehicles/start edges + +commit 1f8e770a2a18c2e21185d7d299bb8f42aff2b853 +Merge: 32a0ecc7 693b60e4 +Author: Aboudy Kreidieh +Date: Fri Mar 8 16:23:56 2019 -0800 + + Merge pull request #450 from flow-project/docker_0.3.0 + + Add Dockerfile for release 0.3.0 and remove outdated docker folder + +commit 693b60e41a5c6d71228678a133102ad83a7cde1e +Author: Fangyu Wu +Date: Thu Mar 7 22:28:22 2019 -0800 + + Add Dockerfile for release 0.3.0 and remove outdated docker folder. + +commit 0b0182e7de0679c5f03c65b45589227292bfa564 +Author: AboudyKreidieh +Date: Thu Mar 7 12:13:17 2019 -0800 + + added test for aimsun struct + +commit 32a0ecc79f943f191e1dc8bfbe9d26e0edcc4e41 (tag: v0.3.0) +Merge: 2397a15c fb17351f +Author: Aboudy Kreidieh +Date: Thu Mar 7 08:57:40 2019 -0800 + + Merge pull request #441 from kjang96/visualizer_fix + + Minor fixes + +commit 2397a15cb42be77b79064cd65a51c4b747ce5ef1 +Merge: f8cc6c16 533a0361 +Author: Aboudy Kreidieh +Date: Thu Mar 7 08:56:41 2019 -0800 + + Merge pull request #438 from flow-project/velocity_bottleneck_tests + + Velocity bottleneck tests + +commit fb17351f75ba3729861f6cfa8e273b49efdc7bb6 +Author: Kathy Jang +Date: Tue Mar 5 18:06:14 2019 -0500 + + 2 minor fixes: 1) Added line to restart_simulation such that the GUI can be activated, and 2) Reworded an if statement header to avoid KeyError by using the built-in get method instead of directly accessing a dictionary member + +commit f8cc6c16bd8eed13cff0914510e9194a8f8f3970 +Merge: dcf97862 c7aa4908 +Author: Aboudy Kreidieh +Date: Tue Mar 5 00:20:17 2019 -0800 + + Merge pull request #440 from flow-project/flow_exceptions + + Flow exceptions + +commit dcf978627168d9ab94f09b1f186bd795fab9d9fb +Merge: 0356f127 6dc5598f +Author: Aboudy Kreidieh +Date: Tue Mar 5 00:20:00 2019 -0800 + + Merge pull request #439 from flow-project/num_vehicles_fix + + bug fix to number of vehicles + +commit 0356f127da4294cd8731c94904fe32c1eb930e53 +Merge: 27cf0889 bfb52286 +Author: Aboudy Kreidieh +Date: Tue Mar 5 00:19:31 2019 -0800 + + Merge pull request #437 from flow-project/bottleneck_documentation + + Some cleanup to bottleneck environments + +commit 027ef96e5380ad2fcaeb82cc8b39ccb25940d6e2 +Merge: 8e0f38f3 27cf0889 +Author: AboudyKreidieh +Date: Sun Mar 3 13:42:26 2019 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into LuST_pr + +commit c7aa4908b341065d6c93e9828339ebd174faf6b7 +Merge: a2701eda 27cf0889 +Author: AboudyKreidieh +Date: Sun Mar 3 11:11:20 2019 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into flow_exceptions + +commit 6dc5598fb30d28004bbd113e2b970a21a6ccc8f8 +Author: AboudyKreidieh +Date: Sun Mar 3 11:05:11 2019 -0800 + + bug fix to number of vehicles + + It seems that vehicles are sometimes removed twice during reset. The number of vehicles in the list is not affected though, so calculating the length now instead of decrementing the values. + + resolves #387 + +commit 533a03615d230faa8ada904689a7ee7eb7aabb36 +Author: AboudyKreidieh +Date: Sun Mar 3 02:54:30 2019 -0800 + + test + +commit f375fad9d54132d69bffefe3e7bea32f4959219e +Author: AboudyKreidieh +Date: Sun Mar 3 02:52:43 2019 -0800 + + changes to the velocity controllers + + * added a test for PISaturation + * removed HandTunedController + +commit 3fc392219fcffb85d8355f1911da1361b591d9c6 +Author: AboudyKreidieh +Date: Sun Mar 3 00:28:52 2019 -0800 + + bug fix + +commit dfb7900eeb3c449d8fa1cb69a61a73f7941d955d +Author: AboudyKreidieh +Date: Sun Mar 3 00:22:45 2019 -0800 + + tests for FollowerStopper controller + +commit bfb5228692dd9b58203199c8b7e72fea8b4f96fc +Author: AboudyKreidieh +Date: Sat Mar 2 23:56:12 2019 -0800 + + Some cleanup to bottleneck environments + + * added documentation to some methods + * removed unused attributes + * added a few more unit tests + +commit 27cf0889ab4e11a08a457e57553ccd26aa5523af +Merge: 9f36d653 38cadc01 +Author: Aboudy Kreidieh +Date: Sat Mar 2 22:37:43 2019 -0800 + + Merge pull request #435 from flow-project/green_wave_bug_fix + + Green wave env bug fix + +commit 38cadc01e0b801879e99afe75f60f20c7dac9b46 +Author: AboudyKreidieh +Date: Thu Feb 28 15:09:05 2019 -0800 + + Green wave env bug fix + + resolves #422 + +commit d8d5a71c7d4906814f6887cc3ffb151469967beb +Author: AboudyKreidieh +Date: Wed Feb 27 20:21:20 2019 -0800 + + vehicles that are in the network are only unubscribed + +commit 9f36d65375de93138082dd6e8b67feae66a6789e +Merge: 639625ba ce5c8acd +Author: Aboudy Kreidieh +Date: Sun Feb 24 11:37:07 2019 -0800 + + Merge pull request #414 from flow-project/vehicle_junctions_dynamics + + modified driving behavior by our controllers + +commit 639625bae0d21bc1dcb9ba420b62f286c5e8fa95 +Merge: c437f556 e671afbe +Author: Aboudy Kreidieh +Date: Sun Feb 24 11:35:55 2019 -0800 + + Merge pull request #416 from flow-project/mock_imports + + added mock imports + +commit c437f556d7fbd3046eff02b59fbb271436618b07 +Merge: a119baf5 a5e182d7 +Author: Aboudy Kreidieh +Date: Sun Feb 24 11:35:34 2019 -0800 + + Merge pull request #420 from flow-project/bottleneck_env_fix + + Bug fixes to BottleNeckAccelEnv + +commit e84e2a42f3dbe25127363f28f4441851ff90b16b +Author: AboudyKreidieh +Date: Sat Feb 23 01:09:27 2019 -0800 + + bug fixes + +commit c65b7de89d410c15a8a5da20d030d5136bf4d0e6 +Merge: f7c05d58 a119baf5 +Author: AboudyKreidieh +Date: Sat Feb 23 00:09:14 2019 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into new_sumo_pr + +commit a119baf5e69bf7bca45dc92e6befc0e684c4aaa7 +Merge: 2b965e1a 00aea40a +Author: Aboudy Kreidieh +Date: Thu Feb 21 18:02:48 2019 -0800 + + Merge pull request #415 from flow-project/remove_cls + + Remove cls + +commit 2b965e1a9efacffc5cad12d328233ffdc3fd3c6f +Merge: 4e8c8447 9c57037c +Author: Aboudy Kreidieh +Date: Thu Feb 21 18:01:42 2019 -0800 + + Merge pull request #406 from flow-project/flow_example_readme + + modified flow examples README + +commit 4e8c8447a17b16f42e875d9c9b7d4ef235078d1d +Merge: 6117b0ca 73efb86c +Author: Aboudy Kreidieh +Date: Thu Feb 21 18:01:04 2019 -0800 + + Merge pull request #412 from flow-project/zero_division_fix + + resolves ZeroDivisionError bugs in some rewards + +commit a5e182d7843530eace60aa16c113e9455ccc12f3 +Author: AboudyKreidieh +Date: Thu Feb 21 02:22:13 2019 -0800 + + Bug fixes to BottleNeckAccelEnv + + - adding action space + - added missing class attributes + +commit 3776951824937a0c8f36670d14d8bc6b338d8fe6 +Author: MouvementMondial +Date: Tue Feb 19 12:20:41 2019 +0100 + + Bug fixed: use render args + +commit e671afbe6659a597f1c3597ab08f757f3f29e806 +Author: AboudyKreidieh +Date: Mon Feb 18 01:16:50 2019 -0800 + + added mock imports + + This should help the generation of documentation in readthedocs + +commit 00aea40a2d01c250c701e4cd4f89b3050da98066 +Author: AboudyKreidieh +Date: Sun Feb 17 11:12:24 2019 -0800 + + bug fix + +commit 27d568c5cf6c5b011d075ea8113288a852170b32 +Author: AboudyKreidieh +Date: Sun Feb 17 11:02:22 2019 -0800 + + removed final instance of cls.network + +commit f1ff49b575cef3c8d083a04a076c404ee2e78245 +Merge: 99ecce13 6117b0ca +Author: AboudyKreidieh +Date: Sun Feb 17 10:53:03 2019 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into remove_cls + +commit ce5c8acdedef47d0bc7cd51c335c6780f0c54f1a +Author: AboudyKreidieh +Date: Sun Feb 17 10:48:08 2019 -0800 + + modified driving behavior by our controllers + - at junctions, the car following behavior is dictated by the simulator instead of us + - if a car just enters, in new sumo it may not be subscribed. Added a fix to support new sumo in the near future + +commit 6117b0cae8c43b00cfac36efcf1bb4f5b0f0c795 +Merge: 81099ebf 4afe2f6b +Author: Aboudy Kreidieh +Date: Sun Feb 17 02:54:25 2019 -0800 + + Merge pull request #409 from flow-project/green_wave_examples + + Green wave examples + +commit 4afe2f6b90fb27d47e34a230ff5a1352d639a8a2 +Author: AboudyKreidieh +Date: Sat Feb 16 23:30:41 2019 -0800 + + bug fix + +commit edfcbd1910cacf6ae459a03fae5b400f8fc4888e +Merge: bcf3b881 81099ebf +Author: AboudyKreidieh +Date: Sat Feb 16 23:02:41 2019 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into green_wave_examples + +commit 73efb86cee15812458c894c4f9d289d28c6ebaa1 +Author: AboudyKreidieh +Date: Sat Feb 16 14:17:18 2019 -0800 + + resolves ZeroDivisionError bugs in some rewards + +commit bcf3b881eca9f0dc11dad7f625a327cf7d8289fe +Author: AboudyKreidieh +Date: Thu Feb 7 23:26:42 2019 -0800 + + reverted some changes + +commit c445724398ff20310c8c6c392b0bf188e0be95b2 +Author: Yasharzf +Date: Wed Feb 6 17:04:58 2019 -0800 + + added Arizona example + +commit 81099ebf4b7c8e60e1624b9c984e2a52b663aef7 +Merge: f626cc5f b4448cbe +Author: Aboudy Kreidieh +Date: Wed Feb 6 11:18:03 2019 -0800 + + Merge pull request #408 from flow-project/rllib_tutorial_fix + + modified tutorial 3 to be compatible with ray 0.6.1 + +commit 5d6fd4700485d029b6e6b637aa1291c506264b88 +Author: AboudyKreidieh +Date: Tue Feb 5 15:23:15 2019 -0800 + + more transparency to usage to green wave examples + +commit b4448cbe73a25da1e36809d7705becaae892e3ae +Author: AboudyKreidieh +Date: Tue Feb 5 15:01:50 2019 -0800 + + modified tutorial 3 to be compatible with ray 0.6.1 + +commit f626cc5f030247471cd9ecdd32b6686c76d8ac3a +Merge: 02ff9633 53c2d550 +Author: Aboudy Kreidieh +Date: Tue Feb 5 14:27:00 2019 -0800 + + Merge pull request #407 from flow-project/docs_fix + + added numpydoc to requirements.txt + +commit 53c2d5506d23714b469a1c9d08ef846e71151e63 +Author: AboudyKreidieh +Date: Tue Feb 5 13:30:40 2019 -0800 + + added numpydoc to requirements.txt + + This is meant to resolve an issue causing the readthedocs documentation to fail + +commit 02ff96331283aeb4a0f1c6de15dbba638a4501b3 +Merge: be752ab5 5c21ef08 +Author: Aboudy Kreidieh +Date: Tue Feb 5 11:03:24 2019 -0800 + + Merge pull request #398 from flow-project/numpydoc + + Numpydoc + - resolves #381 + - added missing documentation to the readthedocs autogenerator + - moved param specifications from init to the class definition so that it is visible in readthedocs + - modifications to the documentation to make it compliant with numpydoc + +commit 5c21ef08f18983036fd56088e08255f0aeb4865e +Merge: f7340602 be752ab5 +Author: AboudyKreidieh +Date: Tue Feb 5 10:39:07 2019 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into numpydoc + +commit 9c57037cba4daeb0639b0c151408c34eb1804272 +Author: AboudyKreidieh +Date: Tue Feb 5 00:24:24 2019 -0800 + + modified flow examples README + +commit be752ab58ec07c98c9033a2de9c6d4cca2b14677 +Merge: 534850bb 374b6a77 +Author: Aboudy Kreidieh +Date: Tue Feb 5 00:18:28 2019 -0800 + + Merge pull request #405 from flow-project/gifs + + resized gifs + +commit 374b6a77d4e41a269e6b5889d930508eecd00c0d +Author: AboudyKreidieh +Date: Tue Feb 5 00:17:29 2019 -0800 + + resized gifs + +commit 534850bb87ee7ad67d6712517f8af0279b384353 +Merge: 3de47154 ccc3a4ed +Author: Aboudy Kreidieh +Date: Mon Feb 4 23:45:53 2019 -0800 + + Merge pull request #404 from flow-project/gifs + + added gifs + +commit ccc3a4edc78b66a7e5777da3dc69965b4d0c3514 +Author: AboudyKreidieh +Date: Mon Feb 4 23:13:53 2019 -0800 + + added gifs + +commit 3de47154f11e268fe46f671bd974ef652cde880b +Merge: 7b5a8818 aa2c1f48 +Author: Aboudy Kreidieh +Date: Mon Feb 4 21:15:45 2019 -0800 + + Merge pull request #396 from flow-project/obey_no_collide + + rename "no_collide" -> "obey_safe_speed" and then move "no_collide" = 7 + +commit 7b5a8818e0b52766f8c8b01bb6f200c07a8e2f9d +Merge: 5b772e7a f6a77288 +Author: Aboudy Kreidieh +Date: Mon Feb 4 20:24:38 2019 -0800 + + Merge pull request #300 from flow-project/remove_clipping + + Remove clip_action from ray run scripts + - Ray's clip_actions is currently buggy for continuous spaces, we temporarily set it to False since we clip on our own end. + - Adds Ray 0.6.1 to the environment.yml + - Upgrades test_visuallizers to ray 0.6.1 + +commit f6a772885b04a988f5b0601ed93b2ac8f0a171e1 +Author: AboudyKreidieh +Date: Mon Feb 4 20:04:12 2019 -0800 + + bug fix + +commit c04e4896b14be5b422fdefe214b05cef0712cb3e +Merge: 02c16173 5b772e7a +Author: AboudyKreidieh +Date: Mon Feb 4 19:18:16 2019 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into remove_clipping + +commit 853f3a4e792e838faa67f00227aae5669f1931a0 +Author: AboudyKreidieh +Date: Mon Feb 4 14:47:15 2019 -0800 + + partial fix to aimsun kernel + +commit 93edbe5b4f19e76f5db2f07917383f648f4ff011 +Author: AboudyKreidieh +Date: Mon Feb 4 14:41:53 2019 -0800 + + bug fix + +commit d19cd53b06072b2be03985ca618b21785e859e93 +Author: AboudyKreidieh +Date: Mon Feb 4 14:00:12 2019 -0800 + + moved initial_speed and type from VehicleParams and to the Vehicles kernel + +commit a2701eda6b826d5008017fa2dbb050e0821e9e6d +Author: AboudyKreidieh +Date: Mon Feb 4 13:34:24 2019 -0800 + + replaced instances of ValueError with FatalFlowError + +commit 1fafa65abe9302456575ae6071210a903145e459 +Merge: b98f53f3 5b772e7a +Author: AboudyKreidieh +Date: Fri Feb 1 01:01:52 2019 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into remove_scenario + +commit 5b772e7af59d575ab11440c388cc557a66ea7e6f +Merge: 1b6dd514 8ffc0c63 +Author: Aboudy Kreidieh +Date: Fri Feb 1 00:57:02 2019 -0800 + + Merge pull request #391 from flow-project/veq_fix + + Veq fix + +commit f73406027a640fec1c792a0f27bdaa70b7df18e1 +Merge: 21c0354c 1b6dd514 +Author: AboudyKreidieh +Date: Thu Jan 31 22:24:27 2019 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into numpydoc + +commit 8ffc0c63071582c658d3665cc27df69f0ad0b340 +Merge: a15a7b0d 1b6dd514 +Author: AboudyKreidieh +Date: Thu Jan 31 22:22:01 2019 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into veq_fix + +commit aa2c1f48d0609b9b01d74be9de52081bab46399d +Author: AboudyKreidieh +Date: Thu Jan 31 22:16:56 2019 -0800 + + rename "no_collide" -> "obey_safe_speed" and then move "no_collide" = 7 + +commit 1b6dd514b22e98e2ca93a8c66d4862e64a57330f +Merge: 1067b8c6 d577ff64 +Author: Aboudy Kreidieh +Date: Thu Jan 31 22:05:13 2019 -0800 + + Merge pull request #393 from flow-project/converage_cleanup + + extended unit test coverage + +commit d577ff645a700e6f615e6b5272ac12f17866f4bb +Author: AboudyKreidieh +Date: Thu Jan 31 21:44:01 2019 -0800 + + pep8 + +commit a15a7b0dcfe27fc9e9a615f3c679ad9b85cf89aa +Merge: 600b9462 1067b8c6 +Author: AboudyKreidieh +Date: Thu Jan 31 21:34:06 2019 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into veq_fix + +commit 86f814824ee6e8dfd72e9c18f323992255a29a73 +Author: AboudyKreidieh +Date: Thu Jan 31 21:29:43 2019 -0800 + + bug fix + +commit 21c0354cda16cbad9b004523c75c2f532ca9ac69 +Author: AboudyKreidieh +Date: Thu Jan 31 21:25:38 2019 -0800 + + pep8 + +commit e9a0ed2ec4d313cbb77e3ca25ebbcc9f3847d13a +Author: AboudyKreidieh +Date: Thu Jan 31 21:21:25 2019 -0800 + + modified documentation + +commit 61ff5209f6791125d6e9ea5fb7a44e0f8b8f9103 +Author: Aboudy +Date: Wed Jan 30 15:08:39 2019 -0800 + + numpydoc changes + +commit f7c05d58cfbf7bb3e24bef1890079e7bd09810e6 +Author: AboudyKreidieh +Date: Mon Jan 28 22:15:10 2019 -0800 + + pep8 + +commit 0b767751d22bd87d73399e49771bbc84803849b8 +Author: AboudyKreidieh +Date: Mon Jan 28 22:08:21 2019 -0800 + + minor fixes + +commit 6883cbf61cdf0e213d27658f8c5f210c1d6227b5 +Merge: 6d7fd072 1067b8c6 +Author: AboudyKreidieh +Date: Mon Jan 28 22:03:16 2019 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into new_sumo_pr + +commit b98f53f3afe2064cf6b0167e1eccdda8d13611e2 +Author: AboudyKreidieh +Date: Mon Jan 28 20:57:20 2019 -0800 + + removed some instances of self.scenario + +commit 1067b8c690c42d4326bb960ec67e2483535b35e1 +Merge: 4d0106a9 e896da53 +Author: Aboudy Kreidieh +Date: Mon Jan 28 20:44:36 2019 -0800 + + Merge pull request #251 from flow-project/tests_examples_extended + + Tests examples extended + +commit 99ecce138286e2bbbc3b6fbd6ef8a3755f91738d +Merge: 58b6d23d 4d0106a9 +Author: AboudyKreidieh +Date: Mon Jan 28 20:05:01 2019 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into remove_cls + +commit 4d0106a99d9b69e92e7b2e8fc9c56b6668094b37 +Merge: b4eafc29 2c179241 +Author: Aboudy Kreidieh +Date: Thu Jan 24 15:27:58 2019 -0800 + + Merge pull request #392 from flow-project/docstring_fix + + modifications to support autodoc in readthedocs + +commit edd09b17aba129d3b48a8a1fa3f748731bcef6e8 +Author: AboudyKreidieh +Date: Wed Jan 23 00:05:47 2019 -0800 + + pep8 + +commit 4b9034e1adc045d0b5e0db6a33e70157198fcbf9 +Author: AboudyKreidieh +Date: Tue Jan 22 23:15:24 2019 -0800 + + extended unit test coverage + + - removed FutureDeprecationWarning messages from params that have been changed over a significantly large enough period of time + - added a test to the reset of wave_attenuation that was introduced during the Aimsun changes + +commit 600b94620e48214a97b048b4118ef38adaff46c5 +Author: AboudyKreidieh +Date: Tue Jan 22 22:22:43 2019 -0800 + + minor bug fix + +commit 2c17924191b1ef3272c9906b20806ba61a7ca1ba +Author: AboudyKreidieh +Date: Tue Jan 22 22:18:29 2019 -0800 + + modifications to support autodoc in readthedocs + +commit 2181770686e53cb8f7c02dec553e00a89cbafe08 +Author: AboudyKreidieh +Date: Tue Jan 22 21:26:04 2019 -0800 + + bug fix + +commit 86f06aad880b2d8d8f8fd352c4f55e112a597bce +Merge: d5cdd358 b4eafc29 +Author: AboudyKreidieh +Date: Tue Jan 22 20:54:06 2019 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into veq_fix + +commit d5cdd358737e045000beae53562be2ec9e13465d +Author: AboudyKreidieh +Date: Tue Jan 22 20:53:49 2019 -0800 + + resolved issue where v_eq was not being calculated correctly + +commit b4eafc2986d0da3581cfff1be5fc2ecf402f6136 +Merge: 422992ac c99c8321 +Author: Aboudy Kreidieh +Date: Tue Jan 22 20:31:59 2019 -0800 + + Merge pull request #390 from flow-project/tutorial_fix + + fixed tutorial 3 + +commit c99c832149439a2d534d044a5ce256e01c11a184 +Author: AboudyKreidieh +Date: Mon Jan 21 15:00:17 2019 -0800 + + fixed tutorial 3 + +commit 422992ac36b35804f332bfaf233dd32b64a0b848 +Merge: ab7ee798 c1a2bb4d +Author: Aboudy Kreidieh +Date: Mon Jan 21 14:43:32 2019 -0800 + + Merge pull request #287 from flow-project/visualize_benchmarks + + Visualize benchmarks + +commit c1a2bb4d2754fb79ad6e5efb5d9d1cb9c3b6933b +Merge: 7fef0222 ab7ee798 +Author: AboudyKreidieh +Date: Mon Jan 21 14:16:53 2019 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into visualize_benchmarks + +commit e896da53068e60735ef476a6c45aa51d5f2fcd6b +Merge: f0913ec5 ab7ee798 +Author: AboudyKreidieh +Date: Mon Jan 21 13:53:58 2019 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into tests_examples_extended + +commit ab7ee7986572fbd0d83f2683777d1b397df6b30b +Merge: be06f6f1 da40d608 +Author: Aboudy Kreidieh +Date: Wed Jan 16 13:40:57 2019 -0800 + + Merge pull request #388 from flow-project/eugenevinitsky-patch-1 + + fix for sims_per_step > 1 + +commit da40d608712565b0ae65ee980bbeb11f3cd8ffe2 +Author: Eugene Vinitsky +Date: Wed Jan 16 12:52:15 2019 -0700 + + fix for sims_per_step > 1 + + If sims_per_step > 1 then it's possible that a vehicle has left the system when you try and apply the action to it a second time. Hence, you have to check that the vehicle is actually in the system before you apply the action. + +commit be06f6f18311dcd154a45aaaedd047b1acba09ac +Merge: 9f60f957 142e1aec +Author: Kathy Jang +Date: Tue Jan 15 20:21:15 2019 -0500 + + Merge pull request #386 from kjang96/tl_fix + + TL phase fix + +commit 9f60f957cd7be8f9c17c99b4c90d764e5898e989 +Author: Eugene Vinitsky +Date: Tue Jan 15 17:06:57 2019 -0700 + + refactor(MultiAgentEnv): MultiAgentEnv was lagging some upgrades in base_env for the kernel refactor. It was also not pythonic in its for loops and slower as a consequence (#384) + +commit 142e1aec194303dd7573411987048c29dfbe3419 +Author: Kathy Jang +Date: Tue Jan 15 12:58:01 2019 -0500 + + Fixed traffic light phases not being set correctly. Four a 2-way intersection with 4 roads converging at one interesection, instead of having phase strings of length 4*3=12 as it was before, they should be length 4 + +commit d0311dde958dae8441b4dec16e74d54eca8743d7 +Merge: bb778f52 baf65d3c +Author: Aboudy Kreidieh +Date: Mon Jan 14 00:09:38 2019 -0800 + + Merge pull request #380 from flow-project/aimsun_examples_tutorials + + Aimsun examples tutorials + +commit baf65d3ccba86334befd5dcc787200a7e18d88c0 +Author: AboudyKreidieh +Date: Sun Jan 13 20:55:13 2019 -0800 + + PR fixes + +commit d136cc01e9d4b392d1d5bf2bcb4b7950440cb90a +Author: AboudyKreidieh +Date: Sat Jan 12 12:42:46 2019 -0800 + + pep8 + +commit c0ddf8aa0644b055dd9d3763b933abc48c20be36 +Author: AboudyKreidieh +Date: Sat Jan 12 12:35:58 2019 -0800 + + added restart_instance support + +commit 9bb272abf90665768d43445a419d7eb12212a947 +Author: AboudyKreidieh +Date: Sat Jan 12 02:19:04 2019 -0800 + + updated README to match new changes + +commit 2dea66bf8c94ae5e7aad1ab54415f6508d33f14b +Author: AboudyKreidieh +Date: Sat Jan 12 02:13:03 2019 -0800 + + added image + +commit 141c0c0a32351cc861f81f72e3bd0aad2a8e20a4 +Author: AboudyKreidieh +Date: Sat Jan 12 02:11:47 2019 -0800 + + updated aimsun setup instructions + +commit 07719140526d6c83963ec77ff77ff7b8d3eea8a0 +Author: AboudyKreidieh +Date: Sat Jan 12 01:51:47 2019 -0800 + + added aimsun examples and tutorials + +commit bb778f5233364ccac69194b12d66e66efe3dbd25 +Merge: 4032478b 75d16cb7 +Author: Aboudy Kreidieh +Date: Sat Jan 12 01:38:01 2019 -0800 + + Merge pull request #379 from flow-project/aimsun_kernel + + Aimsun kernel + +commit 75d16cb7a75efccb982f6aeabcfc63796b7a614b +Author: AboudyKreidieh +Date: Fri Jan 11 23:51:01 2019 -0800 + + ignoring aimsun in coverage + +commit 69a50aded8530e941bc6b22576f92700378601f3 +Author: AboudyKreidieh +Date: Fri Jan 11 23:32:21 2019 -0800 + + ignoring aimsun in coverage + +commit 73a526de48848d8732cd490d20deebba60ea4f8c +Author: AboudyKreidieh +Date: Fri Jan 11 23:10:58 2019 -0800 + + bug fixes + +commit 89c7331342f409103ac91c98b2f7d209d666a5a3 +Author: AboudyKreidieh +Date: Fri Jan 11 22:18:15 2019 -0800 + + bug fixes and features + +commit e98f8847c84f83f312421506b9d4f9524c4422cc +Author: AboudyKreidieh +Date: Fri Jan 11 20:27:29 2019 -0800 + + add aimsun RL example + +commit e653e79c4ac5af56a742fc2b3946e70013ed11c2 +Merge: 855fc356 9ae1b128 +Author: AboudyKreidieh +Date: Fri Jan 11 20:27:08 2019 -0800 + + Merge branch 'aimsun_kernel' of https://github.com/flow-project/flow into aimsun_kernel + +commit 855fc356f6948ef56639c983daa9a732dd922386 +Author: AboudyKreidieh +Date: Fri Jan 11 20:27:02 2019 -0800 + + bug fixes + +commit 9ae1b128c5e067b050fd7f824035e380daa2414f +Merge: 721232c0 b3236dec +Author: Yasharzf +Date: Fri Jan 11 20:17:09 2019 -0800 + + Merge branch 'aimsun_kernel' of https://github.com/flow-project/flow into aimsun_kernel + +commit 721232c090c316b5cdf4bb9b12291b4c3608a705 +Author: Yasharzf +Date: Fri Jan 11 20:16:12 2019 -0800 + + added traffic light api + +commit b3236dece1b62c961993b05179caec1f7181521e +Author: AboudyKreidieh +Date: Fri Jan 11 19:47:07 2019 -0800 + + pep8 + +commit 754288aecd03a7b36dbc883f27a8b68d809c2f76 +Author: AboudyKreidieh +Date: Fri Jan 11 19:40:30 2019 -0800 + + compatibility changes + +commit 50896c2bc2b9b4b87939e96f23738938b43854e8 +Author: AboudyKreidieh +Date: Fri Jan 11 17:58:55 2019 -0800 + + cleanup + +commit dd6b3de883308b710dea5e0a27fe1f7edf42eaa1 +Author: AboudyKreidieh +Date: Fri Jan 11 17:27:36 2019 -0800 + + removed un-needed files + +commit 66dad9bf3a2b00f62884e90c17651330a8fef893 +Merge: bf656ad6 c3ab6775 +Author: AboudyKreidieh +Date: Fri Jan 11 17:22:36 2019 -0800 + + Merge branch 'aimsun_kernel' of https://github.com/flow-project/flow into aimsun_kernel + +commit bf656ad6c4e3cb3dadc55927bba4a48aa1046176 +Author: AboudyKreidieh +Date: Fri Jan 11 17:21:19 2019 -0800 + + minor bug fixes + +commit c3ab67753f9d48c3cc5cfbd74715fd1871fd82df +Author: Yasharzf +Date: Thu Jan 10 18:42:54 2019 -0800 + + modified traffic lights + +commit 88ccfa256e65c5ce5a98755d06dd6e2e98a25a9c +Merge: 66ab99c1 54249aec +Author: Yasharzf +Date: Thu Jan 10 16:19:34 2019 -0800 + + minor + +commit 66ab99c186ff99d21cd6137b1feae381a2260601 +Author: Yasharzf +Date: Thu Jan 10 16:13:04 2019 -0800 + + minor + +commit 292bf5111d79f19a1ceafc67fb17add1df69702a +Author: Yasharzf +Date: Thu Jan 10 16:11:50 2019 -0800 + + added sim step, modified grid connections + +commit 54249aeca92d1ac987da6c5818a3a7af22d68ba8 +Merge: cdb3c220 4032478b +Author: AboudyKreidieh +Date: Thu Jan 10 02:50:08 2019 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into aimsun_kernel + +commit 4032478ba81eabec48a921c91ef6ad051471428b +Merge: fb1936ce 3dfa9168 +Author: Aboudy Kreidieh +Date: Thu Jan 10 02:44:25 2019 -0800 + + Merge pull request #376 from flow-project/coverage_cleanup + + Coverage cleanup + - removed features that are unused and conflict in some way with Aimsun + - some cleanup to the Loop merge environment + - created a `FatalFlowError` exception that mimics sumo's `FatalTraCIError` + - added test to ensure that when not enough vehicles emerge in the network an error is raised + +commit 3dfa916898f3394cce427d5f9baceb5637cdbef0 +Merge: 87ecd4ee fb1936ce +Author: AboudyKreidieh +Date: Thu Jan 10 02:19:19 2019 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into coverage_cleanup + +commit fb1936ce6c02de4d80b682c5f9b04d517b550d02 +Merge: ce532bc1 f0a228df +Author: Aboudy Kreidieh +Date: Thu Jan 10 02:16:08 2019 -0800 + + Merge pull request #375 from flow-project/kernel_vehicle + + Kernel vehicle + - moved relevant components of the vehicles class to the vehicle kernel + - moved `apply_acceleration`, `apply_lane_change`, `get_x_by_id`, `choose_routes`, and `update_vehicle_colors` from the base environment class to the vehicles kernel + - removed all `traci_connection` calls (some hacks still need to be fixed though, but should not break anything) + - added methods to set/get max speed and color (in order to remove some traci calls) + - replaced `self.vehicles` -> `self.k.vehicle` + +commit 87ecd4eecc8ef630d32b18a937f09ca1a9f7ce9f +Author: AboudyKreidieh +Date: Thu Jan 10 02:00:18 2019 -0800 + + moved error to exceptions + +commit f0a228df5cc874145f3cd77fa68da67f5de77cc9 +Author: AboudyKreidieh +Date: Thu Jan 10 01:56:47 2019 -0800 + + PR fix + +commit 32484965453b43c44b1d9a0a1e9757b8f0be8e5d +Merge: 340efd6a ce532bc1 +Author: AboudyKreidieh +Date: Wed Jan 9 17:31:54 2019 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into kernel_vehicle + +commit cdb3c220e5beb4c0ec874c3cab5533c5a8da7c84 +Author: AboudyKreidieh +Date: Wed Jan 9 17:30:16 2019 -0800 + + minor + +commit 3f5718f8e40fa7207c7b547f3875f0076813e2b4 +Author: AboudyKreidieh +Date: Wed Jan 9 16:43:27 2019 -0800 + + major modifications + +commit ce532bc1da4bf6a035f71652202521a02ddeaf9a +Merge: 66e802c3 43c7afa3 +Author: Aboudy Kreidieh +Date: Wed Jan 9 15:00:27 2019 -0800 + + Merge pull request #377 from flow-project/cleanup_rllab_visualizer + + removed plotting from visualizer_rllab + +commit 66e802c30319b89b0cf071ba76f24892834a5e71 +Merge: 2ba4713b d933bed6 +Author: Aboudy Kreidieh +Date: Wed Jan 9 14:59:42 2019 -0800 + + Merge pull request #378 from flow-project/less_edges_fig8 + + added connection mod, radius, and modified fig8 edges + + changes: + - merged the six quarter rings for the figure eight into two 3/4 rings. Was having some issues with AImsun's headway, and this was the quickest fix + - added a "radius" term to many of the nodes. This is to make the scenarios compatible with both sumo and Aimsun + - converted connections into a dictionary, with sumo unfolding it back into a list. This, again, is to make it compatible with Aimsun. + + Note: + - since junctions and connections are becoming for involved, I will be created a tutorial on this in a near future PR + +commit 2ba4713b082a15a15a9c8b1d70b8da53a180428e +Merge: 395cba63 22d5f2bb +Author: Fangyu Wu +Date: Wed Jan 9 10:44:10 2019 -0800 + + Merge pull request #372 from flow-project/visualizer_rllib_patch + + Patch visualizer_rllib for ray 0.6.1. + +commit 8ce489f3879bf8a5cb5fb499253921c749f0487b +Merge: ebac4751 340efd6a +Author: AboudyKreidieh +Date: Wed Jan 9 00:09:53 2019 -0800 + + Merge branch 'kernel_vehicle' into aimsun_kernel + +commit 340efd6a316ee661c2005f7365cb0a069d8c071a +Author: AboudyKreidieh +Date: Wed Jan 9 00:09:15 2019 -0800 + + modified tutorials + +commit d933bed6fdec98a3a9156b6b4a83d7ba603138a0 +Author: AboudyKreidieh +Date: Tue Jan 8 23:41:15 2019 -0800 + + bug fix + +commit 3f8a7f474e388654981a5f3c305c09d04dfce134 +Author: AboudyKreidieh +Date: Tue Jan 8 23:19:47 2019 -0800 + + added connection mod, radius, and modified fig8 edges + +commit 43c7afa33256e17b55cb95bc0b3f7e312e56adfb +Author: AboudyKreidieh +Date: Tue Jan 8 21:34:14 2019 -0800 + + removed plotting from visualizer_rllab + +commit ebac4751478d70e942b8901b0a9355938c1bcf83 +Merge: 7ece5b82 2360dc65 +Author: AboudyKreidieh +Date: Tue Jan 8 21:20:27 2019 -0800 + + Merge branch 'coverage_cleanup' into aimsun_kernel + +commit 7ece5b8269676307c07f2c43d0dee14a8598825e +Merge: d6227c11 397c7bf9 +Author: AboudyKreidieh +Date: Tue Jan 8 21:15:14 2019 -0800 + + Merge branch 'kernel_vehicle' into aimsun_kernel + +commit d6227c11367262c61bb8f26541f1ffa255e9d2f1 +Author: AboudyKreidieh +Date: Tue Jan 8 21:15:07 2019 -0800 + + pep8 + +commit de5f3c55fefe93775b7044dfb5f3d2a307855db3 +Author: Yasharzf +Date: Tue Jan 8 17:40:55 2019 -0800 + + added osm, fixed bugs + +commit 5c0ad91ac3f997f6715d776b46296c70460469fc +Author: AboudyKreidieh +Date: Tue Jan 8 14:19:11 2019 -0800 + + bug fix + +commit 6e2c1f7c86d76554872d290f6e8f71650fadaec5 +Author: AboudyKreidieh +Date: Tue Jan 8 13:38:40 2019 -0800 + + changes to support visualization + +commit ed5f6f5e0fa4d2a55178c2a99fc87eeacd16f29c +Merge: 18076500 68f97932 +Author: AboudyKreidieh +Date: Mon Jan 7 21:26:37 2019 -0800 + + Merge branch 'aimsun_kernel' of https://github.com/flow-project/flow into aimsun_kernel + +commit 18076500fd5e6dc492b2f05cf1cb3f85638e29ab +Author: AboudyKreidieh +Date: Mon Jan 7 21:01:04 2019 -0800 + + minor + +commit 68f979326434a290036da3a005277b6741c68ddd +Author: Yasharzf +Date: Mon Jan 7 20:45:49 2019 -0800 + + fixed bugs + +commit 395cba6303d86ebdac8d7420af2b05a14e70ee3c +Merge: a03abdbc 121b8713 +Author: Aboudy Kreidieh +Date: Mon Jan 7 18:52:45 2019 -0800 + + Merge pull request #373 from flow-project/minor_fix2 + + added missing figure + +commit 3246475f1f899588a125389ecf8f70ac344a6a0b +Merge: 6cb4c90a ecc9b88c +Author: Yasharzf +Date: Mon Jan 7 15:26:32 2019 -0800 + + Merge branch 'aimsun_kernel' of https://github.com/flow-project/flow into aimsun_kernel + +commit 6cb4c90a766064756d495c99e82a05a2002c4d9b +Author: Yasharzf +Date: Mon Jan 7 15:26:15 2019 -0800 + + changed speed + +commit 22d5f2bb5e5ba1c6ed28871e14d72c66c1a242bc +Author: Fangyu Wu +Date: Sun Jan 6 23:50:08 2019 -0800 + + Fix pep8. + +commit 397c7bf9b536583baa8e82140763c9d23de7a154 +Author: AboudyKreidieh +Date: Sun Jan 6 23:36:54 2019 -0800 + + undo + +commit 02c1617331b6ff554d08e29d3f7efba3b7eb45a5 +Merge: 860fb90e a03abdbc +Author: Eugene Vinitsky +Date: Mon Jan 7 02:14:54 2019 -0500 + + Merge branch 'master' into remove_clipping + +commit 121b8713ade389e1e48251f794710bf7ec07fde0 +Author: eugenevinitsky +Date: Mon Jan 7 02:13:17 2019 -0500 + + added missing figure + +commit 458fc6e27566b374214e2717bfecb004a4410731 +Author: Fangyu Wu +Date: Sun Jan 6 23:12:53 2019 -0800 + + Fix a typo. + +commit a03abdbc8b31b8ab6046251d1a691ab18b236e74 +Author: Eugene Vinitsky +Date: Mon Jan 7 02:04:23 2019 -0500 + + Upgrade autoscaler script to simplify change process (#371) + + * started changing the autoscaler file + + * set up that copies local ray + + * minor removal of comments + + * changed branch name that is pulled by default + + * Update environment.yml + + Co-Authored-By: eugenevinitsky + +commit 860fb90ea7859923ddf40b032609e5595f8df540 +Merge: 0b852e36 5ea53d2e +Author: Eugene Vinitsky +Date: Mon Jan 7 01:59:51 2019 -0500 + + Merge branch 'master' into remove_clipping + +commit c6ee106e2e86340a59b3fb713977eb145fd96b8c +Author: Fangyu Wu +Date: Sun Jan 6 22:28:17 2019 -0800 + + Patch visualizer_rllib for ray 0.6.1. + +commit 93cbcb8014f25698d30036a7b2b82a2f193b9a59 +Author: AboudyKreidieh +Date: Sun Jan 6 03:50:34 2019 -0800 + + added pass to coverage ignore + +commit 2360dc653246de2e23237dfaaa92318aaadf47d3 +Author: AboudyKreidieh +Date: Sun Jan 6 00:58:35 2019 -0800 + + cleaned up some features in params + +commit e1584acf7c7dfc053678e08e13db312a790a4097 +Author: AboudyKreidieh +Date: Sun Jan 6 00:36:01 2019 -0800 + + extended tests to base scenario kernel: + +commit a2dadc8371a3a8359f40af2ff42e5dc5e2e68952 +Author: AboudyKreidieh +Date: Sat Jan 5 23:50:15 2019 -0800 + + minor fixes to improve unit test coverage + +commit 7df71c170df9f15342c31c7fe8158d47cbeafa40 +Author: AboudyKreidieh +Date: Sat Jan 5 23:13:16 2019 -0800 + + some speedups + +commit ecc9b88c4a45844b6d4e8c972e7b7e54e4a023a5 +Merge: 9da01ca4 cb9ff3fb +Author: AboudyKreidieh +Date: Sat Jan 5 15:49:29 2019 -0800 + + Merge branch 'aimsun_kernel' of https://github.com/flow-project/flow into aimsun_kernel + +commit 9da01ca451f7c167fe19e489fd3d5538a8c5e189 +Merge: b9ce08e1 ad908b53 +Author: AboudyKreidieh +Date: Sat Jan 5 15:48:51 2019 -0800 + + Merge branch 'kernel_vehicle' into aimsun_kernel + +commit ad908b536661cdc780c6d4cb1521fef5a12688d7 +Author: AboudyKreidieh +Date: Sat Jan 5 15:46:27 2019 -0800 + + cleanup + +commit a8c8fb07c96f8e4174fa373c6c22525ee9fd5481 +Author: AboudyKreidieh +Date: Sat Jan 5 15:14:09 2019 -0800 + + minor + +commit 9dae176924fff06fda7629d0fd484750e443785a +Author: AboudyKreidieh +Date: Sat Jan 5 15:01:33 2019 -0800 + + bug fixes + +commit d0d29455361864de1670506d3c8fa8f2a3ead3c7 +Merge: a9f61b22 5ea53d2e +Author: AboudyKreidieh +Date: Fri Jan 4 23:42:12 2019 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into kernel_vehicle + +commit 5ea53d2e48586cd59444656dd7dee21dcd4b20ee +Merge: 4a336977 718170e7 +Author: Aboudy Kreidieh +Date: Fri Jan 4 23:40:17 2019 -0800 + + Merge pull request #367 from flow-project/remove_abs_position + + Remove abs position + - removed `get_absolute_position` from the vehicles class and moved it to the environments that actually use it. This variable is essentially broken in environments that don't have a single path, so better not to treat it as a variable for every environment + - removed sorting, and left it in the environments that originally used it (i.e. the CoRL 2017 environments) + +commit 718170e729c08b7c651a8f49a0416f34df60e63c +Author: AboudyKreidieh +Date: Fri Jan 4 19:31:08 2019 -0800 + + bug fix + +commit c6f36b9d51138b89ebcaac2d3dc3d131190aa427 +Merge: e938724c 4a336977 +Author: AboudyKreidieh +Date: Fri Jan 4 19:13:27 2019 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into remove_abs_position + +commit b9ce08e14a93b4d290b9dfcbce74b27b6b9d8ec3 +Author: AboudyKreidieh +Date: Fri Jan 4 19:07:55 2019 -0800 + + speedups + +commit 4a33697730efdb3de08c6862f8725a1cc6548eb2 +Author: Eugene Vinitsky +Date: Fri Jan 4 20:45:48 2019 -0500 + + Example docs (#368) + + * files for capacity diagram generation + + * pep8 + + * bug fix to incorrectly named method in bottleneck_exps + + * pep8 + + * pep8 + + * pep8 + + * added example docs + + * bug fix + + * more misnamed variables + + * Update docs/source/examples.rst + + Co-Authored-By: eugenevinitsky + + * resolved nits + +commit cb9ff3fbab393b6b4fe7cc199e23f0df59b479f7 +Author: Yasharzf +Date: Fri Jan 4 17:23:47 2019 -0800 + + added aimsun API setup + +commit 3fdc5cd10e319cdeefecf84cccefa0d9d04c944c +Author: Yasharzf +Date: Fri Jan 4 16:29:49 2019 -0800 + + aimsun template path + +commit d34741fb20c05c205181b1745db09692e85de212 +Author: AboudyKreidieh +Date: Fri Jan 4 16:21:09 2019 -0800 + + ignore aimsun generated files + +commit d5391ba0f2717f89d9de0600ea7752debd077e39 +Merge: 171b4c1f 978839d7 +Author: AboudyKreidieh +Date: Fri Jan 4 16:17:04 2019 -0800 + + Merge branch 'aimsun_kernel' of https://github.com/flow-project/flow into aimsun_kernel + +commit a9f61b226de1fb726458947fe2e192a09b06ca7a +Author: AboudyKreidieh +Date: Fri Jan 4 15:58:35 2019 -0800 + + added get_color and set_color + +commit 40cf70e31b912f88413b30617c19ed3bf2fdb19c +Author: AboudyKreidieh +Date: Fri Jan 4 15:36:31 2019 -0800 + + cleanup + +commit 8e992250f18b096ddb452279804a3b69d7fe79bc +Merge: d171ac86 95b712cb +Author: AboudyKreidieh +Date: Fri Jan 4 15:01:54 2019 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into kernel_vehicle + +commit 95b712cb96ce1790f5d3127eafe65651ebc888d6 +Merge: baad5bb0 a8ceca26 +Author: Aboudy Kreidieh +Date: Fri Jan 4 15:00:34 2019 -0800 + + Merge pull request #366 from flow-project/kernel_scenario + + Kernel scenario + +commit a8ceca26ecf4dfdf2661bb8015fe057f809cc4a1 +Author: AboudyKreidieh +Date: Fri Jan 4 14:11:18 2019 -0800 + + PR fixes + +commit 0b852e3623869bb8c99f542815e4edc2962accaa +Author: eugenevinitsky +Date: Fri Jan 4 16:50:57 2019 -0500 + + maybe this makes the test pass oh my goodness + +commit 8ad690d4c18f1cf08a180dbaf2c0fdb57f0a8e41 +Merge: 5cb6eaa5 baad5bb0 +Author: AboudyKreidieh +Date: Fri Jan 4 13:48:14 2019 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into kernel_scenario + +commit 978839d7729e0fdba0b2168e435060d477b6b592 +Author: Yasharzf +Date: Fri Jan 4 12:24:33 2019 -0800 + + added simulation run commandand modified connection + +commit baad5bb0b70c56131adf30204edc0a3baa6005af +Author: Eugene Vinitsky +Date: Fri Jan 4 14:58:04 2019 -0500 + + files for capacity diagram generation (#363) + + * files for capacity diagram generation + + * pep8 + + * bug fix to incorrectly named method in bottleneck_exps + + * pep8 + + * pep8 + + * pep8 + + * Update examples/sumo/bottlenecks.py + + Co-Authored-By: eugenevinitsky + + * Update flow/envs/bottleneck_env.py + + Co-Authored-By: eugenevinitsky + + * resolved nits + +commit 204c69f30fd84b1c5e0ec1e34383ac4355e004e2 +Author: eugenevinitsky +Date: Fri Jan 4 14:46:33 2019 -0500 + + removed nits and changed example needed to pass the tests + +commit ed6bef65101e66baa2a519080eba338d851b8a19 +Author: eugenevinitsky +Date: Fri Jan 4 14:31:44 2019 -0500 + + changed out pkl files for test visualizer + +commit 12bee1f60f1f629c4a148c1121c0026435b4b0aa +Author: Yasharzf +Date: Fri Jan 4 10:24:06 2019 -0800 + + modified connections + +commit 4ee5a24ccaeb0c387f3ad3fc868558291ba8dd1c +Author: eugenevinitsky +Date: Thu Jan 3 23:51:43 2019 -0500 + + replaced saved pkl files to conform to new flow names for lane change controllers + +commit ce65cc3b982e9c0ebd98058d11438fb1ec37f30b +Author: eugenevinitsky +Date: Thu Jan 3 23:20:57 2019 -0500 + + pep8 + +commit bc260e3cc94cdc20919ba1bde33447e958b5845f +Author: eugenevinitsky +Date: Thu Jan 3 23:18:36 2019 -0500 + + bug fix + +commit 50c9c519b725986c2126c43c3b9a1cc8605589bf +Author: eugenevinitsky +Date: Thu Jan 3 23:02:51 2019 -0500 + + left comment to remind to put test back + +commit 6dfa4fd36edbc0d619bc019a22d462a7a3ba9a25 +Merge: af8795c7 5b78a9aa +Author: eugenevinitsky +Date: Thu Jan 3 23:02:30 2019 -0500 + + Merge branch 'remove_clipping' of https://github.com/flow-project/flow into remove_clipping + +commit af8795c7b7298420e51292670068344e28bf6a98 +Author: eugenevinitsky +Date: Thu Jan 3 23:02:19 2019 -0500 + + tests passing, but had to disable a test to do it + +commit 8e228e1726f3122587a072c22a2968b44a2a7fdf +Author: eugenevinitsky +Date: Thu Jan 3 22:19:53 2019 -0500 + + minor + +commit 5b78a9aa2f6f368b58ead2cebbf650b062362d48 +Merge: 652be4f6 777a6fc9 +Author: Eugene Vinitsky +Date: Thu Jan 3 22:01:59 2019 -0500 + + Merge branch 'master' into remove_clipping + +commit 777a6fc9febe42f183ebf3e5a414fddc659190e1 +Author: Cathy Wu +Date: Thu Jan 3 18:57:53 2019 -0800 + + downgrade tensorflow version in requirements to 1.9.0 (to be compatible with OSX El Capitan) (#352) + +commit 171b4c1fe628e7f5e848f739e11edd48429d469b +Merge: 24b66b1e d171ac86 +Author: AboudyKreidieh +Date: Thu Jan 3 18:02:12 2019 -0800 + + Merge branch 'kernel_vehicle' into aimsun_kernel + +commit d171ac86df0ee51cfb9f67d927dc8c797c01253f +Merge: 53130764 e938724c +Author: AboudyKreidieh +Date: Thu Jan 3 18:01:57 2019 -0800 + + Merge branch 'remove_abs_position' into kernel_vehicle + +commit e938724c52ac6c2f28590285f83e2a42fff166ff +Author: AboudyKreidieh +Date: Thu Jan 3 18:01:18 2019 -0800 + + False -> false + +commit 24b66b1ed0e00f576062152a136087a1e5b9b30b +Merge: f5c99279 53130764 +Author: AboudyKreidieh +Date: Thu Jan 3 17:53:39 2019 -0800 + + Merge branch 'kernel_vehicle' into aimsun_kernel + +commit 1b0d483cf8bf23648185dd27537b33487ce82502 +Author: Yasharzf +Date: Thu Jan 3 17:51:54 2019 -0800 + + added specify_connections function + +commit 53130764f51e02b3d4918f29a7fe0a0118d6aa5b +Merge: c48c74d9 fabbdf57 +Author: AboudyKreidieh +Date: Thu Jan 3 17:48:04 2019 -0800 + + Merge branch 'remove_abs_position' into kernel_vehicle + +commit fabbdf572a3349de84a087c629403c76023702a3 +Author: AboudyKreidieh +Date: Thu Jan 3 17:42:48 2019 -0800 + + bug fixes + +commit c48c74d9e24229d38dbe7343f03af2fbaab803ee +Merge: 2d0ef2a6 d20f00fb +Author: AboudyKreidieh +Date: Thu Jan 3 17:33:55 2019 -0800 + + Merge branch 'remove_abs_position' into kernel_vehicle + +commit d20f00fb6ee569af47622b6fdc7b1c0998699f77 +Author: AboudyKreidieh +Date: Thu Jan 3 17:04:37 2019 -0800 + + bug fix + +commit 073b4576319e293e7dd97c79f0a7e4b059985a82 +Author: AboudyKreidieh +Date: Thu Jan 3 16:41:25 2019 -0800 + + converted sorted_ids to a property + +commit dd71e6c6fc87ad95dd8f2e13e6045dfc24a4d893 +Merge: 977fce4c 1a99ca9b +Author: AboudyKreidieh +Date: Thu Jan 3 16:22:30 2019 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into remove_abs_position + +commit 1a99ca9b1cc29e0588a25e3aba14f5eacbad7a2c +Merge: 3324be00 bc20c7cd +Author: Aboudy Kreidieh +Date: Thu Jan 3 16:19:37 2019 -0800 + + Merge pull request #355 from flow-project/robustness_boost + + Robustness boost + +commit 2d0ef2a6d4411fdb29451971f6e8defca019f821 +Merge: d3f9151d 5cb6eaa5 +Author: AboudyKreidieh +Date: Thu Jan 3 16:17:22 2019 -0800 + + Merge branch 'kernel_scenario' into kernel_vehicle + +commit 5cb6eaa5767cb95ea2a689697f88bf5a803e0ac7 +Merge: 4ec8f1fd 3324be00 +Author: AboudyKreidieh +Date: Thu Jan 3 16:12:38 2019 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into kernel_scenario + +commit 3324be002dce373ed0c2030392bb8dce56fc9fc2 +Merge: 6aebd0d6 3dde060b +Author: Aboudy Kreidieh +Date: Thu Jan 3 16:10:51 2019 -0800 + + Merge pull request #361 from flow-project/aimsun_tcp_api + + Aimsun tcp api + - added an api that can be used to communicate commands to Aimsun. Since aimsun is written in Python2.7, we cannot generically send commands to it, so a tcp connection has been created instead (similar to the setup used by sumo). + - added some tests to ensure that the API is received messages from a dummy server as expected. The dummy server mimics our Aimsun-server is many ways (while not calling the aimsun api methods), so this test allows us to test the `FlowAimsunAPI` specifically while not trying to validate the AImsun side of things. + +commit 58b6d23dac711cb7f9f587e3ce60c00ac110dc38 +Author: AboudyKreidieh +Date: Thu Jan 3 15:55:31 2019 -0800 + + removed more instances of cls.network + +commit 5c33ff58957bf4668d72237b8e6249a4a1e218a2 +Author: AboudyKreidieh +Date: Thu Jan 3 15:49:04 2019 -0800 + + bug fixes + +commit bcfff3a18c666e4191d61f3e9b78017074ea275c +Author: AboudyKreidieh +Date: Thu Jan 3 15:30:14 2019 -0800 + + added net_params to custom start pos + +commit 2edc70f94b3cfb851ceea47b256acf73ef1f877f +Author: Yasharzf +Date: Thu Jan 3 12:52:01 2019 -0800 + + bug fixed + +commit 7fef0222fda3ed34a29d6a5cdcbc9b4571fbc235 +Author: eugenevinitsky +Date: Thu Jan 3 14:45:46 2019 -0500 + + swapped out flag + +commit 722ec38c448b6055eb4457efffd4a9e7d4bc93e4 +Merge: c5a11710 51b5977b +Author: eugenevinitsky +Date: Thu Jan 3 14:39:30 2019 -0500 + + merged in upstream + +commit c5a11710eb52bf2423edb775578c6a93de5a1f70 +Merge: 35b28c16 6aebd0d6 +Author: eugenevinitsky +Date: Thu Jan 3 14:37:45 2019 -0500 + + merged in master + +commit 977fce4c2a1553cbbc8daee7bafd425281350e21 +Merge: 10643bb5 6aebd0d6 +Author: AboudyKreidieh +Date: Thu Jan 3 11:09:01 2019 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into remove_abs_position + +commit 10643bb504949016dd589883af3e70ef5c091f3d +Author: AboudyKreidieh +Date: Thu Jan 3 11:07:40 2019 -0800 + + minor + +commit 4ec8f1fda84f72e5cb6a5802cab8c768a50ed430 +Merge: 5e803974 6aebd0d6 +Author: AboudyKreidieh +Date: Thu Jan 3 11:05:44 2019 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into kernel_scenario + +commit 35b28c16e95750ed5cea4584a01cd9e95c25874a +Author: eugenevinitsky +Date: Thu Jan 3 14:01:13 2019 -0500 + + started regression test explanation in docs + +commit cd4c262847fa6b85b33f8baa64f88deed065fecd +Author: eugenevinitsky +Date: Thu Jan 3 13:58:53 2019 -0500 + + attempt to resolve tests + +commit 6aebd0d609ce2cbbf8bcd2d9a964ee192e3e60a8 +Merge: f234d4a3 5083c1e3 +Author: Aboudy Kreidieh +Date: Thu Jan 3 10:43:39 2019 -0800 + + Merge pull request #358 from flow-project/tests_speedup + + moved multiagent environment to a new folder + +commit 3dde060b083c7bcc000e9f75361510ed639b3f71 +Author: AboudyKreidieh +Date: Thu Jan 3 10:42:05 2019 -0800 + + added test for traffic ligt ids + +commit f5c992790dff3fc5987b1f8a9145a9fcfa713ee5 +Author: AboudyKreidieh +Date: Wed Jan 2 23:57:36 2019 -0800 + + minor changes + +commit cd3cb111888321e3a840e1711663ac8402e92b9c +Author: AboudyKreidieh +Date: Wed Jan 2 21:21:25 2019 -0800 + + bug fixes + +commit 5e803974d2ee3b7a6cd70d6949ef59e4bddfd5bd +Author: AboudyKreidieh +Date: Wed Jan 2 19:55:04 2019 -0800 + + cleanup + +commit f1c289247d62ba56ea9dc63f5223551f4648cf0c +Author: Yasharzf +Date: Wed Jan 2 17:07:27 2019 -0800 + + fixed traffic light bug + +commit d4af10029d4959f2dc8a45ef3ba66650f68cbaff +Author: Yasharzf +Date: Wed Jan 2 16:26:00 2019 -0800 + + added metering settings + +commit 3b5fa742f24f5fbca259a11ec29eaa9e183bb7f3 +Merge: 2c5534a0 c4ef0b44 +Author: AboudyKreidieh +Date: Wed Jan 2 15:58:09 2019 -0800 + + Merge branch 'remove_abs_position' into aimsun_kernel + +commit 2c5534a0b4f05f722a76ea070781abec7262cb5d +Author: AboudyKreidieh +Date: Wed Jan 2 15:48:23 2019 -0800 + + removed print + +commit ba61a0a6f6d2cb73c1738b27d8ed4370904a109e +Merge: 02a72828 b6f59254 +Author: AboudyKreidieh +Date: Wed Jan 2 15:12:46 2019 -0800 + + Merge branch 'aimsun_tcp_api' into aimsun_kernel + +commit 69ff453f4cfd1cc7f98b13688645b2b47102d536 +Author: Yasharzf +Date: Tue Jan 1 22:27:11 2019 -0800 + + added metering control functions + +commit b6f592549e97943c93d354f177069da2814064f4 +Author: AboudyKreidieh +Date: Tue Jan 1 14:35:17 2019 -0800 + + extended tests + +commit f234d4a32b49d002c7ce8dfa266196a4e6b348af +Merge: f47274b1 a05f8d05 +Author: Fangyu Wu +Date: Tue Jan 1 13:07:40 2019 -0800 + + Merge pull request #356 from flow-project/pip_install + + Propose pip for installation. + +commit 77e6655d48ac1426619de39d3c787f814a2c34d0 +Author: AboudyKreidieh +Date: Tue Jan 1 11:40:15 2019 -0800 + + using absolute path + +commit 873cfef7cef5eaf6b250b8b65c518f12f0a50172 +Author: AboudyKreidieh +Date: Tue Jan 1 11:16:22 2019 -0800 + + added project path to dummy server + +commit 89848784b2e8b27bf80ec9018d18b1ff1cf91e41 +Author: AboudyKreidieh +Date: Tue Jan 1 10:35:44 2019 -0800 + + maybe this is the issue? + +commit 6731d8f3c2a22d9e31372760ee5023b3437dce88 +Author: AboudyKreidieh +Date: Tue Jan 1 09:58:15 2019 -0800 + + modified to not as for confirmation + +commit 28bda07eb692fba9a105d61b0f7a5dca30a8602a +Author: AboudyKreidieh +Date: Tue Jan 1 02:24:40 2019 -0800 + + bug fix + +commit 14a70af7b7ef413fd99272e3c75dbff32e649ea3 +Author: AboudyKreidieh +Date: Tue Jan 1 02:15:59 2019 -0800 + + added conda env to travis + +commit 02a72828f609dcad8aed18dfd931ab2f4e31d523 +Author: AboudyKreidieh +Date: Tue Jan 1 01:54:56 2019 -0800 + + bug fix + +commit 2f7c2ddc76ad41f52e864312dc3a6c6a371bacf9 +Author: AboudyKreidieh +Date: Tue Jan 1 01:53:36 2019 -0800 + + bug fix + +commit c4ef0b44b9d2d501f368f568fc7f45c1c7242f58 +Author: AboudyKreidieh +Date: Tue Jan 1 01:06:51 2019 -0800 + + moved absolute_position and soring to the correct environments + +commit a05f8d05001f705e405174cbb6fbcd7e7cc6d4ce +Merge: 1f596d27 f47274b1 +Author: Fangyu Wu +Date: Mon Dec 31 23:15:43 2018 -0800 + + Merge branch 'master' into pip_install + +commit f47274b103a0f8e0a248c0a799968908389bd6d2 +Merge: 7b120807 819c4e44 +Author: Aboudy Kreidieh +Date: Mon Dec 31 18:29:24 2018 -0800 + + Merge pull request #354 from cathywu/raydocs + + Update ray cluster docs + +commit 5083c1e33a371884b194cfe9e820a37c107328ee +Author: AboudyKreidieh +Date: Mon Dec 31 17:46:50 2018 -0800 + + moved multiagent environment to a new folder + +commit ba07af324f9a71fb203f0f19570a8d4be98422ed +Merge: a283b60b d3f9151d +Author: AboudyKreidieh +Date: Mon Dec 31 16:30:51 2018 -0800 + + Merge branch 'kernel_vehicle' into aimsun_kernel + +commit 535038f31ae4f1b195edea59738067de11fa1fff +Merge: 113954db 7b120807 +Author: AboudyKreidieh +Date: Mon Dec 31 16:29:39 2018 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into aimsun_tcp_api + +commit d3f9151d068fbed5a9be883ca956bc7d39f729f7 +Merge: 68940857 5cc0d1e1 +Author: AboudyKreidieh +Date: Mon Dec 31 16:24:13 2018 -0800 + + Merge branch 'kernel_scenario' into kernel_vehicle + +commit 5cc0d1e114953fc5e91c3da75cba6864f687f60e +Author: AboudyKreidieh +Date: Mon Dec 31 14:53:14 2018 -0800 + + pep8 + +commit 1dcd6432918e61231fe91cbceb3a8d946a237a9e +Author: AboudyKreidieh +Date: Mon Dec 31 14:42:43 2018 -0800 + + cleanup + +commit a366f4c675bab4f84e4442cb89e7b77f48cc6333 +Merge: a0f293dd 7b120807 +Author: AboudyKreidieh +Date: Mon Dec 31 13:18:48 2018 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into kernel_scenario + +commit 7b120807b779aca3db93a183dc19a38f7b1097ad +Merge: a4b32b7e cebacc65 +Author: Aboudy Kreidieh +Date: Mon Dec 31 13:18:22 2018 -0800 + + Merge pull request #344 from flow-project/aimsun_install + + Aimsun install + - renamed `config_default.py` -> `config.py` + - added setup instructions for Aimsun support + +commit a4b32b7e91a60f63ab02e41a22467d748869deae +Merge: 5aa1b980 f98b12a9 +Author: Aboudy Kreidieh +Date: Mon Dec 31 13:17:40 2018 -0800 + + Merge pull request #325 from flow-project/remove_make_routes + + Remove make routes + - stopped adding vehicles to the network before the environment is created (in `make_routes`). Vehicles are now only imported in the environment's `reset` method, which is more compatible with aimsun. Now `generate_starting_positions` is only called within the environment. + - removed `vehicle_arrangement_shuffle` and `starting_position_shuffle`, and replaced them with `shuffle` from `InitialConfig` (which essentially exists to perform the same task) + + Note: + - some of the tests needed to be modified by calling `reset` before they start since there are no cars in the network before reset. + +commit f98b12a9c52823f0038c473d1a615e8bf9c1a28b +Author: AboudyKreidieh +Date: Mon Dec 31 12:36:37 2018 -0800 + + undid rendering + +commit cebacc65ce9a476e1d90de2da1f9bf54983bb5b6 +Author: AboudyKreidieh +Date: Mon Dec 31 12:12:06 2018 -0800 + + minor + +commit 4cd4fd1b97c691b271fb1ce5ec9980c3b3ab91d3 +Author: AboudyKreidieh +Date: Mon Dec 31 12:04:49 2018 -0800 + + bug fixes + +commit 23b1a884a535ca03a31712b18f3e05e26afcdee4 +Author: AboudyKreidieh +Date: Mon Dec 31 11:19:16 2018 -0800 + + removed config from gitignore + +commit 26cbf7a9c8d2cd1f4f9391397434d030dcf84ad3 +Author: AboudyKreidieh +Date: Mon Dec 31 11:18:09 2018 -0800 + + final bug fixes + +commit 113954db7de2dc40c639692e8989191ce77f61fe +Author: AboudyKreidieh +Date: Mon Dec 31 11:15:10 2018 -0800 + + added aimsun apis and started writing tests + +commit 1f596d27114f62e340dfd7f23308e1ddbddf3d00 +Author: Fangyu Wu +Date: Mon Dec 31 00:25:40 2018 -0800 + + Propose pip for installation. + +commit bc20c7cdd6b745c9443f7d2fe28d1d26de8f2d41 +Author: Fangyu Wu +Date: Sun Dec 30 23:22:13 2018 -0800 + + Fix pep8. + +commit 2cfadb1c86a73c7f6169a36d087d7e7ed821a28f +Author: Fangyu Wu +Date: Sun Dec 30 23:10:42 2018 -0800 + + Add automatic garbage collection to base env. + +commit ae9ada9fd8f126de3ff87c4446f4e4f4be67b131 +Author: Fangyu Wu +Date: Sun Dec 30 23:10:01 2018 -0800 + + Support ray API change on get_agent_class. + +commit 819c4e44425a76773570fa366fbbda86083830e5 +Author: Cathy Wu +Date: Sun Dec 30 15:40:39 2018 -0800 + + update ray cluster docs + +commit f805ecfa4f847e08b3618cada3cfb7038d387754 +Author: AboudyKreidieh +Date: Sun Dec 30 13:01:43 2018 -0800 + + final PR fix + +commit a0f293dd19b177c34819beb261bb0a89cf90eecb +Merge: 84895e88 fe0d3044 +Author: AboudyKreidieh +Date: Sun Dec 30 12:56:35 2018 -0800 + + Merge branch 'remove_make_routes' into kernel_scenario + +commit fe0d3044961ba86b5cc477c1d3242e903f89b150 +Author: AboudyKreidieh +Date: Sun Dec 30 12:51:56 2018 -0800 + + PR fixes + +commit ce1ec01875fbef74a6afa15b2683086fd252b1dc +Merge: 9a9a7b7b 5aa1b980 +Author: AboudyKreidieh +Date: Sun Dec 30 11:43:10 2018 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into remove_make_routes + +commit a283b60b6a577c24af0439be06dbe9db443c59ed +Author: AboudyKreidieh +Date: Sun Dec 30 11:32:57 2018 -0800 + + added method for storing runtime data + +commit 66533e85c0f2caab50aba671ee9c8adc6a38c528 +Author: AboudyKreidieh +Date: Sat Dec 29 00:03:00 2018 -0800 + + functioning flow-aimsun api + +commit f0143c6fec399225f9123eff4cfbd6ab01df97bd +Merge: f2898f28 460ada08 +Author: AboudyKreidieh +Date: Fri Dec 28 12:24:31 2018 -0800 + + Merge branch 'aimsun_kernel' of https://github.com/flow-project/flow into aimsun_kernel + +commit f2898f28ec613f3086759a38d25e82c16e8625e4 +Author: AboudyKreidieh +Date: Fri Dec 28 12:22:41 2018 -0800 + + started adding tcp connection + +commit 460ada085158d9fe37981c4b6c9929c92b50a398 +Author: Yasharzf +Date: Fri Dec 28 12:20:11 2018 -0800 + + fixed node bugs + +commit 5aa1b98008b73544894f775ef88b55efff768d91 +Merge: 16078ea2 fbf0e433 +Author: Aboudy Kreidieh +Date: Thu Dec 27 22:33:20 2018 -0800 + + Merge pull request #316 from flow-project/custom_start_pos + + converted gen_custom_start_pos to a staticmethod + +commit a516f419f2db01442239b698357257d02fefd555 +Merge: 82810570 305f23b4 +Author: AboudyKreidieh +Date: Thu Dec 27 20:55:12 2018 -0800 + + Merge branch 'aimsun_install' of https://github.com/flow-project/flow into aimsun_kernel + +commit 8ea5aa1fe2d05d85fb7bc5620e8946bb745b97e8 +Merge: 5fc80824 82810570 +Author: Yasharzf +Date: Thu Dec 27 17:14:23 2018 -0800 + + Merge branch 'aimsun_kernel' of https://github.com/flow-project/flow into aimsun_kernel + +commit 5fc80824bcbfc2e6d200efe1d1b0efc49c536103 +Author: Yasharzf +Date: Thu Dec 27 17:13:51 2018 -0800 + + what + +commit 82810570661035911c5d4c257327019389a4a9a9 +Merge: 77e66056 b343621a +Author: AboudyKreidieh +Date: Thu Dec 27 17:09:29 2018 -0800 + + Merge branch 'aimsun_kernel' of https://github.com/flow-project/flow into aimsun_kernel + +commit 77e660566176130d5363afca095d9cc6587c4cf5 +Author: AboudyKreidieh +Date: Thu Dec 27 17:04:39 2018 -0800 + + type conversion in vehicles kernel + +commit b343621ac658b41a788d6e2742c26c5946e0b07f +Author: Yasharzf +Date: Thu Dec 27 17:04:26 2018 -0800 + + changed nodes, views, veh types + +commit 22bf6a369c40e461cb65ed32f19fe6e4fb578255 +Merge: cf83298a 68940857 +Author: AboudyKreidieh +Date: Thu Dec 27 15:50:19 2018 -0800 + + Merge branch 'kernel_vehicle' into aimsun_kernel + +commit 689408573075c4324149cc71b08809da5fc7a531 +Merge: 6f37124a 84895e88 +Author: AboudyKreidieh +Date: Thu Dec 27 15:45:09 2018 -0800 + + Merge branch 'kernel_scenario' into kernel_vehicle + +commit 84895e88bcb053a19528d4449fd747d3c5cbe6ec +Merge: 048cda3c 16078ea2 +Author: AboudyKreidieh +Date: Thu Dec 27 15:42:21 2018 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into kernel_scenario + +commit 16078ea263871a0e91009f1a1764fb166e753754 +Merge: b9272af5 9fe5be23 +Author: Aboudy Kreidieh +Date: Thu Dec 27 15:41:03 2018 -0800 + + Merge pull request #330 from flow-project/params_abstraction + + Params abstraction + +commit 6f37124abec448fa3b4e29a2ee306e2ec55fbb99 +Author: AboudyKreidieh +Date: Thu Dec 27 15:38:37 2018 -0800 + + bug fix + +commit a9e1577ba8b5d72b38aef6e38f77c9a0c9ac7655 +Merge: 0a162188 048cda3c +Author: AboudyKreidieh +Date: Thu Dec 27 15:36:10 2018 -0800 + + Merge branch 'kernel_scenario' into kernel_vehicle + +commit 9fe5be23adeb3a107abb74b1ef06e57876717479 +Merge: f8e31c42 b9272af5 +Author: AboudyKreidieh +Date: Thu Dec 27 14:56:08 2018 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into params_abstraction + +commit 048cda3cd0d2a29eb121a6869d96b6a6e1e74f14 +Merge: 88854d11 b9272af5 +Author: AboudyKreidieh +Date: Thu Dec 27 14:47:16 2018 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into kernel_scenario + +commit b9272af51eba518b2d3e5b5cd5f819f965c1021e +Merge: 1d608453 48bd8bde +Author: Aboudy Kreidieh +Date: Thu Dec 27 14:38:48 2018 -0800 + + Merge pull request #340 from flow-project/vehicle_params + + Vehicle params + + **Note**: don't let the size scare you, it's just because I cut and pasted a large chunk of code. + + changes + - renamed `Vehicles` -> `VehicleParams` + - moved the vehicles class to flow/core/params.py + + This is a prelude to the vehicles kernel, and mimics what we did to the traffic lights class + +commit 48bd8bde85bf7a82d60c02f6cd2df82571f40379 +Merge: 7a94bf75 1d608453 +Author: AboudyKreidieh +Date: Thu Dec 27 14:21:27 2018 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into vehicle_params + +commit 1d6084533fb014f9f43e7656d895d37a4a42c4cf +Merge: 2f718fe1 8889d082 +Author: Aboudy Kreidieh +Date: Thu Dec 27 14:13:30 2018 -0800 + + Merge pull request #343 from flow-project/aimsun_struct + + created objects that are used when passing data from aimsun + +commit 8889d0823cb38cf128a297f16b47e3d5c6601b1d +Author: AboudyKreidieh +Date: Thu Dec 27 13:48:49 2018 -0800 + + pep8 + +commit cf83298a74ccfd2c1a7c4b4fa14eac54ae68f65e +Author: AboudyKreidieh +Date: Thu Dec 27 13:45:00 2018 -0800 + + add_departed + +commit 5405898e13d77fb6b42303214c7cfc916ddad781 +Author: Yashar Zeinali Farid <34227133+Yasharzf@users.noreply.github.com> +Date: Thu Dec 27 13:36:51 2018 -0800 + + Apply suggestions from code review + + Co-Authored-By: AboudyKreidieh + +commit 2f718fe18602b72e819e38f55ddc64089aab8349 +Merge: ab5cb225 60007d66 +Author: Aboudy Kreidieh +Date: Thu Dec 27 13:32:48 2018 -0800 + + Merge pull request #341 from flow-project/cf_lc_params_abstractions + + Cf lc params abstractions + +commit 652be4f648a1c0135e695d1e8e721864bcf722ef +Author: eugenevinitsky +Date: Wed Dec 26 23:49:01 2018 -0500 + + revert changes to environment yml + +commit dca55d87c49698100bbfe9e3fa29b63471eaa3c9 +Author: eugenevinitsky +Date: Wed Dec 26 23:39:48 2018 -0500 + + change in travis + +commit e56d508c0e0934511b9e18fc65714edc9f2d5cdf +Author: eugenevinitsky +Date: Wed Dec 26 23:26:05 2018 -0500 + + added lz4 and psutil so rllib would stop complaining + +commit c7827835ca13b1b2620b0f82cd8fcea233c7bbc0 +Author: eugenevinitsky +Date: Wed Dec 26 23:20:17 2018 -0500 + + fixed pkl files for visualizer test + +commit 89dfe67883b64f0e48345a0fa8c32417851f0b34 +Author: eugenevinitsky +Date: Wed Dec 26 22:12:08 2018 -0500 + + importing get_agent_class from the wrong place, too many cpus called by default in the rllib runner scripts + +commit f2db165badeeaf560e44b99602b386537379fba0 +Author: eugenevinitsky +Date: Wed Dec 26 21:55:58 2018 -0500 + + temporary pointing at old branch of ray + +commit a0bbd3cc87f8004b2573448e8c9fd842d956ab61 +Author: eugenevinitsky +Date: Wed Dec 26 21:55:34 2018 -0500 + + fix for visualizer to update to ray 0.6.1 + +commit a66ae05f44343436818ecd245947fd01d760836e +Merge: 361d5c74 ab5cb225 +Author: eugenevinitsky +Date: Wed Dec 26 21:40:24 2018 -0500 + + Merge branch 'master' into remove_clipping + +commit 305f23b45ce43758e719134af181a19644430614 +Author: AboudyKreidieh +Date: Wed Dec 26 18:25:54 2018 -0800 + + bug fix + +commit 0ab15e5c6d96c42e5444a0a6b8d9a223af1725db +Author: AboudyKreidieh +Date: Wed Dec 26 18:14:59 2018 -0800 + + created setup instructions for Aimsun + +commit 275bf3ac009decdafadf6684e502dd71584de9f2 +Author: AboudyKreidieh +Date: Wed Dec 26 17:38:22 2018 -0800 + + renamed config_default -> config + +commit 64717b672daa1f2d0cd3b5c753795c52150e93ad +Author: AboudyKreidieh +Date: Wed Dec 26 17:33:38 2018 -0800 + + added support for entering and exiting vehicles, as well as getting edge names + +commit fbf0e43366402003d64b04b742a2402028c1afc7 +Merge: eee49293 ab5cb225 +Author: AboudyKreidieh +Date: Wed Dec 26 10:01:44 2018 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into custom_start_pos + +commit da821835446f5f0ac9b828a12483fa08f5f8d99f +Author: AboudyKreidieh +Date: Wed Dec 26 09:56:38 2018 -0800 + + created objects that are used when passing data from aimsun + +commit fe4757defb963f428f75f65bfbbf36a88194d72e +Author: AboudyKreidieh +Date: Wed Dec 26 09:54:01 2018 -0800 + + major modifications to aimsun tcp connection + +commit 370942588218012d534afc5f6db6a4a8e7e830cf +Author: Yasharzf +Date: Tue Dec 25 17:57:34 2018 -0800 + + modified junctions + +commit ab5cb2251d7767882dedb450d8f69e2d42a206f7 +Merge: fe0aba8d b73cdfb2 +Author: Aboudy Kreidieh +Date: Tue Dec 25 02:09:48 2018 -0800 + + Merge pull request #333 from cathywu/docsfix + + Re-org and fixes of setup instructions + +commit fe0aba8d8dac9452592ff4a6b05fa936bb247313 +Merge: 61353cea bf7d089c +Author: Aboudy Kreidieh +Date: Tue Dec 25 01:55:26 2018 -0800 + + Merge pull request #339 from cathywu/typos + + Tiny typos + +commit bf7d089cb8867c32a086acd718730a77efc2eee0 +Author: Cathy Wu +Date: Tue Dec 25 00:30:03 2018 -0800 + + SUMO capitalization + +commit 1ea644f10f937877f6544a28d638b39354b7b6cd +Author: Cathy Wu +Date: Tue Dec 25 00:28:35 2018 -0800 + + tiny typos + +commit 7a94bf75707f85fc42bb90b75e50057961f1bfc6 +Author: AboudyKreidieh +Date: Mon Dec 24 18:03:49 2018 -0800 + + bug fixes + +commit 88854d11ac68cde4931d7879da88c0ec8b6efd4a +Merge: f14ccbd7 dfbd4e41 +Author: AboudyKreidieh +Date: Mon Dec 24 18:00:43 2018 -0800 + + Merge branch 'vehicle_params' into kernel_scenario + +commit dfbd4e41283c1194720532e134825788b96af3a2 +Author: AboudyKreidieh +Date: Mon Dec 24 17:50:06 2018 -0800 + + renamed Vehicles -> VehicleParams + +commit 0a162188c2519fc19a0339a77e2b96262de6c658 +Author: AboudyKreidieh +Date: Mon Dec 24 17:13:54 2018 -0800 + + minor cleanup + +commit ebf39920ac018372b6f10b487c07feaaf7525fa4 +Author: AboudyKreidieh +Date: Mon Dec 24 17:11:42 2018 -0800 + + more tcp changes + +commit 327c886a6d204e60cd7367afa273589771dcd8ad +Author: AboudyKreidieh +Date: Mon Dec 24 14:32:19 2018 -0800 + + started adding tcp connection + +commit b73cdfb261185cc7e03bcbbe408da5c3fb4e86dc +Author: Cathy Wu +Date: Mon Dec 24 14:28:49 2018 -0800 + + Internal hyperlink fix; minor docs update + +commit 053b51b0900c28ce323120962b403cf0b3035fe2 +Author: Cathy Wu +Date: Mon Dec 24 13:59:03 2018 -0800 + + reordered sections to follow installation logic; cleaned up and added sub-section headers + +commit ea1b7b2e419c63f888191537f098ffdcd9b5ba89 +Author: Cathy Wu +Date: Mon Dec 24 13:34:17 2018 -0800 + + Small fixes to setup instructions + +commit c45c92c7ad747dc39d534d65994be0013af27882 +Author: AboudyKreidieh +Date: Sun Dec 23 19:44:31 2018 -0800 + + random changes + +commit fc3e69cf81b90b82df691cc5ab6d2fe6887a5c0d +Author: Yasharzf +Date: Sun Dec 23 11:24:42 2018 -0800 + + added edge with no shape + +commit 36e8afe8d5f7dc3d719ca1c041dd11e68122f56f +Merge: 6786657f b2217cae +Author: AboudyKreidieh +Date: Sat Dec 22 19:35:34 2018 -0800 + + Merge branch 'kernel_vehicle' into aimsun_kernel + +commit b2217cae69ca0b83be194027cc57fced94a63aa0 +Author: AboudyKreidieh +Date: Sat Dec 22 19:32:03 2018 -0800 + + bug + +commit f14ccbd7ee6c13f0453ea5a2b2b801d4a633f182 +Author: AboudyKreidieh +Date: Sat Dec 22 19:28:00 2018 -0800 + + bug fix + +commit ac67ef0ad6e88bb32856787a1b20fa303949776d +Author: AboudyKreidieh +Date: Sat Dec 22 19:27:08 2018 -0800 + + bug fix + +commit 2eb5e6bc1d14248c5c76bd0a9f0c34bea04173b3 +Merge: 3eb58e1a 80edce3f +Author: AboudyKreidieh +Date: Sat Dec 22 19:17:02 2018 -0800 + + Merge branch 'kernel_scenario' into kernel_vehicle + +commit 80edce3f51ed3afe8d0fab6c7375702f82b5f9d1 +Merge: 2e071be1 60007d66 +Author: AboudyKreidieh +Date: Sat Dec 22 19:07:30 2018 -0800 + + Merge branch 'cf_lc_params_abstractions' into kernel_scenario + +commit 61353ceaa11e21276941603a35ad52f6f7fe55d6 +Merge: d2046023 1df44e25 +Author: Aboudy Kreidieh +Date: Sat Dec 22 19:00:49 2018 -0800 + + Merge pull request #326 from CYBruce/master + + Update tutorial04_visualize.ipynb + +commit 6786657f5cc5fc2fcc9a299ee3d27c727548ce91 +Merge: 82fc4885 06ec45ee +Author: Yasharzf +Date: Sat Dec 22 18:15:42 2018 -0800 + + aimsun changes + +commit 3eb58e1ac23a94358a82f5a6e184934f62f5348e +Author: AboudyKreidieh +Date: Sat Dec 22 16:09:37 2018 -0800 + + pep8 + +commit 60007d66a797a2c11a9ecb281db14350bce7e46f +Author: AboudyKreidieh +Date: Sat Dec 22 15:58:27 2018 -0800 + + replaced sumo_lc_params with lane_change_params + +commit 6d3420d676e68cc475fffc1217e2ab847c71ac4c +Author: AboudyKreidieh +Date: Sat Dec 22 15:52:07 2018 -0800 + + replaced sumo_cf_params with car_following_params + +commit 7ae474bddbba99717790ccbc8bfafe5a44ded3f4 +Merge: d13135b1 2e071be1 +Author: AboudyKreidieh +Date: Sat Dec 22 15:23:02 2018 -0800 + + Merge branch 'kernel_scenario' into kernel_vehicle + +commit 2e071be1608b277ff3c4bce4319374969b27120e +Author: AboudyKreidieh +Date: Sat Dec 22 15:14:16 2018 -0800 + + fixed a test + +commit db2b9ca3d19ac95a7e1ecf171e3016b3a4386189 +Author: AboudyKreidieh +Date: Sat Dec 22 15:09:45 2018 -0800 + + rename simulation controllers + +commit 2f5432b636529831417a06a019be02ead817083a +Merge: 218a2440 f8e31c42 +Author: AboudyKreidieh +Date: Sat Dec 22 14:51:53 2018 -0800 + + Merge branch 'params_abstraction' into kernel_scenario + +commit f8e31c42f169fac592ef1a650477101994f7291a +Merge: 33730b34 d2046023 +Author: AboudyKreidieh +Date: Sat Dec 22 14:41:55 2018 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into params_abstraction + +commit d2046023fbdb1f901db5e6553f046d130d6dbd61 +Merge: 931aa2cf 9fcf346b +Author: Aboudy Kreidieh +Date: Sat Dec 22 14:37:24 2018 -0800 + + Merge pull request #329 from flow-project/easy_install_update + + flipped sumo installation instructions + +commit 931aa2cfcc58d46044e19589e5fa6a43d9c55050 +Merge: cae79fab e9c49c5c +Author: Aboudy Kreidieh +Date: Sat Dec 22 14:37:10 2018 -0800 + + Merge pull request #328 from flow-project/exp_abstraction + + replaced SumoExperiment with Experiment + +commit 33730b34638de5bd18f72efa626ef72f8a627a6c +Author: AboudyKreidieh +Date: Sat Dec 22 14:04:49 2018 -0800 + + replaced restart_sumo with restart_simulation + +commit 9fcf346bc84e61a5fb59deb2d6e026361c261161 +Author: AboudyKreidieh +Date: Sat Dec 22 14:02:01 2018 -0800 + + PR fix + +commit 5a7af32266c9104b7358f27bf4ce8e7b82da743b +Author: AboudyKreidieh +Date: Sat Dec 22 13:57:27 2018 -0800 + + flipped sumo installation instructions + +commit e9c49c5c818952ff0e5e613196283ed8425c40c1 +Author: AboudyKreidieh +Date: Sat Dec 22 13:47:39 2018 -0800 + + PR fix + +commit 7e8165619f60f1314a29b2393bc1c70973136909 +Author: AboudyKreidieh +Date: Sat Dec 22 13:39:44 2018 -0800 + + more parameter changes + +commit 1d634ea12fd14955b66c02f9c2666fb93c9653f6 +Author: AboudyKreidieh +Date: Sat Dec 22 13:31:13 2018 -0800 + + bug fixes + +commit a21f6bdfbfd3339be588f9fc433374ff0722a46f +Author: AboudyKreidieh +Date: Sat Dec 22 13:25:49 2018 -0800 + + replaced SumoExperiment with Experiment + +commit 2c53124caf018364fcf4243f2bbc4092df877998 +Author: AboudyKreidieh +Date: Sat Dec 22 13:10:28 2018 -0800 + + bug fix + +commit e6d619c80922b931cdaab349ee10efc5821e19bd +Author: AboudyKreidieh +Date: Sat Dec 22 13:09:02 2018 -0800 + + replaced sumo_params wit sim_params + +commit 82fc4885b847a2bd8f7048115973e4088f571232 +Author: Yasharzf +Date: Sat Dec 22 10:27:49 2018 -0800 + + Changes to Aimsun simulation + +commit 06ec45ee38b4f9a5e2f6f5f3f8ac8c6b428869ac +Author: AboudyKreidieh +Date: Sat Dec 22 00:08:57 2018 -0800 + + added comments + +commit 96146dbb4867cc006dece154e49c97d68f3c0364 +Author: AboudyKreidieh +Date: Fri Dec 21 23:57:15 2018 -0800 + + minor changes + +commit 1df44e25bc4433cb0ca349c2fe9581539f9abf69 +Author: CYBruce +Date: Sat Dec 22 15:49:55 2018 +0800 + + Update tutorial04_visualize.ipynb + +commit e45938eb6e83e16653793d2cad88f0f89550fcc7 +Merge: 59f39c4a d13135b1 +Author: AboudyKreidieh +Date: Fri Dec 21 23:08:15 2018 -0800 + + Merge branch 'kernel_vehicle' into aimsun_kernel + +commit d13135b14abe33653d0ad30ead2cd3147280837e +Merge: baa3daa6 218a2440 +Author: AboudyKreidieh +Date: Fri Dec 21 23:01:21 2018 -0800 + + Merge branch 'kernel_scenario' into kernel_vehicle + +commit 218a2440040da22101b64cc63c6b4c4135d569a7 +Author: AboudyKreidieh +Date: Fri Dec 21 23:00:18 2018 -0800 + + more bug fixes + +commit b24e76448ab289b368a900ef6d5bfa761873082d +Author: AboudyKreidieh +Date: Fri Dec 21 21:53:56 2018 -0800 + + bug fix + +commit baa3daa6ca0705daa71a5b0a0c0668cfd22b11bf +Author: AboudyKreidieh +Date: Fri Dec 21 21:52:34 2018 -0800 + + bug fix + +commit f3e09b19fc832d626fcf9f885f467baf3386a687 +Merge: 7d4f75ad 0fa7a8b8 +Author: AboudyKreidieh +Date: Fri Dec 21 21:50:01 2018 -0800 + + Merge branch 'kernel_scenario' into kernel_vehicle + +commit 0fa7a8b84b7e9ed18a13d46465585c7c48b40528 +Author: AboudyKreidieh +Date: Fri Dec 21 21:38:42 2018 -0800 + + more changes + +commit a833fc05f7b26b52abd5ae7fa44d57ca3f15bb48 +Merge: d0ef13e8 9a9a7b7b +Author: AboudyKreidieh +Date: Fri Dec 21 21:37:01 2018 -0800 + + Merge branch 'remove_make_routes' into kernel_scenario + +commit 9a9a7b7bb50b64e2939ecc7afe4ee82f5f4145af +Author: AboudyKreidieh +Date: Fri Dec 21 20:56:59 2018 -0800 + + bug fixes + +commit cae79fabd6f7245edaff810048b215118ba06d9a +Merge: 05d702bd 496b91c4 +Author: Aboudy Kreidieh +Date: Fri Dec 21 20:03:19 2018 -0800 + + Merge pull request #285 from flow-project/redis_error + + Redis error + +commit 70f7cace1fccbe8eacdfc5dd291012c1068ed063 +Author: AboudyKreidieh +Date: Fri Dec 21 20:01:00 2018 -0800 + + bug fixes + +commit d0ef13e83a608b84dc2c900a0267c5ae0c84b715 +Author: AboudyKreidieh +Date: Fri Dec 21 19:02:23 2018 -0800 + + pep8 + +commit a569a7db4d68c50fcf85dcc2498a5f8ff94db4a9 +Author: AboudyKreidieh +Date: Fri Dec 21 18:59:02 2018 -0800 + + minor cleanup + +commit 496b91c42352a288684d3a19a5de66e057cf6b77 +Merge: 882117dd 05d702bd +Author: AboudyKreidieh +Date: Fri Dec 21 18:45:48 2018 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into redis_error + +commit 882117ddb7cc5b191b16dc785c28f20d6814b624 +Author: AboudyKreidieh +Date: Fri Dec 21 18:45:44 2018 -0800 + + fixed parser bug + +commit e5ec930b041687421e880e0832d72da73cec03b0 +Author: AboudyKreidieh +Date: Fri Dec 21 18:38:43 2018 -0800 + + bug fix + +commit 552c0967ac171109c1b551bd43d05daaa1893998 +Author: AboudyKreidieh +Date: Fri Dec 21 18:17:10 2018 -0800 + + minor + +commit 2ea832212370602367367ca48886be7fc14ba528 +Author: AboudyKreidieh +Date: Fri Dec 21 18:09:38 2018 -0800 + + modified make_routes and removed shuffling methods: + +commit 59f39c4a5559cc4bb66895a931a83b58f4f97d8a +Merge: 77c88a46 f40bdb01 +Author: Yasharzf +Date: Fri Dec 21 15:31:50 2018 -0800 + + Merge branch 'kernel_scenario' of https://github.com/flow-project/flow into aimsun_kernel + +commit 77c88a46911e0b09bfc8a23f686d35e3cb894fb0 +Author: Yasharzf +Date: Fri Dec 21 15:30:20 2018 -0800 + + new changes + +commit f40bdb01512000322b1806904c96ce1ef6f831db +Merge: 08e746c3 05d702bd +Author: AboudyKreidieh +Date: Fri Dec 21 15:28:12 2018 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into kernel_scenario + +commit 05d702bd5eccea371046a3129f33d6c69d73e9ab +Merge: eb091514 d6e3a8b2 +Author: Aboudy Kreidieh +Date: Fri Dec 21 15:26:30 2018 -0800 + + Merge pull request #323 from flow-project/netfile_osm_merge + + Netfile osm merge + +commit d6e3a8b220089eef8c8aa34a9b937f83cc630c6a +Author: AboudyKreidieh +Date: Fri Dec 21 14:38:33 2018 -0800 + + bug fix + +commit 955ff8443e2d1cfb082a8d4c15ff998081ec698b +Author: AboudyKreidieh +Date: Fri Dec 21 14:13:58 2018 -0800 + + PR fixes + +commit 77027bd8b466ded40d148bc68877f9af0af3ee4e +Author: AboudyKreidieh +Date: Fri Dec 21 14:10:02 2018 -0800 + + some docstring cleanup + +commit 6346b9b49840c0e19b176d7fb46997efa2d7cfd2 +Merge: 99fdea14 eb091514 +Author: AboudyKreidieh +Date: Fri Dec 21 14:05:55 2018 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into netfile_osm_merge + +commit 08e746c3f358599803c5031a2401d7ee4221d159 +Merge: 4c81bb56 eb091514 +Author: AboudyKreidieh +Date: Fri Dec 21 13:58:15 2018 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into kernel_scenario + +commit eb091514d49bf3480aa47e9d7bf3c32070946fe6 +Merge: b41c0083 39b5658b +Author: Aboudy Kreidieh +Date: Fri Dec 21 13:57:40 2018 -0800 + + Merge pull request #310 from flow-project/kernel_traffic_lights + + Kernel traffic lights + +commit 794ed8bf67e1e952ddd58cb0a30c071823131d95 +Merge: 17b305b5 7d4f75ad +Author: AboudyKreidieh +Date: Thu Dec 20 23:54:28 2018 -0800 + + Merge branch 'kernel_vehicle' into aimsun_kernel + +commit 7d4f75adf9f7ef34490b0cd0f05ae62613cb7dba +Author: AboudyKreidieh +Date: Thu Dec 20 23:35:43 2018 -0800 + + more bug fixes + +commit c9dff8387151b61141779f7da22ef70ec730141a +Author: AboudyKreidieh +Date: Thu Dec 20 23:02:08 2018 -0800 + + more bug fixes + +commit a7e4cdbe428057f8cc4356bbfd4c67c0b2fdf9e8 +Author: AboudyKreidieh +Date: Thu Dec 20 22:03:10 2018 -0800 + + many bug fixes + +commit a9323c3b8f51c97e3c90796f599a66ae29b0176b +Author: AboudyKreidieh +Date: Thu Dec 20 21:24:50 2018 -0800 + + ugh + +commit f4380f978bbadcbcf29b42409729cbd3c6384735 +Author: AboudyKreidieh +Date: Thu Dec 20 21:12:59 2018 -0800 + + ugh + +commit bf5245900cb27696b9b6cd08f8941f894b12df7e +Author: AboudyKreidieh +Date: Thu Dec 20 21:01:49 2018 -0800 + + ugh + +commit b82428faaaca47cbd6cc946899e153d2cd8d3ae6 +Author: AboudyKreidieh +Date: Thu Dec 20 20:40:04 2018 -0800 + + another hacky fix + +commit 4aae6988d34eb9aa700bfde6dbf85d07767335cc +Author: AboudyKreidieh +Date: Thu Dec 20 20:16:19 2018 -0800 + + another hacky fix + +commit f0b8775fd2bd23715f71e8850e90c6a3ea8e1d2d +Author: AboudyKreidieh +Date: Thu Dec 20 20:07:21 2018 -0800 + + hacky solution: + +commit 18a93e26c6aa0889d18355a9aebf1e9e8d31c1b8 +Author: AboudyKreidieh +Date: Thu Dec 20 19:51:39 2018 -0800 + + using .get on some dicts + +commit 9028aa2bca0144c7943033594815452189517e65 +Author: AboudyKreidieh +Date: Thu Dec 20 19:40:28 2018 -0800 + + bug fixes + +commit c3b15a1f8a7e39eef0bd82a492317435b4d75cd4 +Author: AboudyKreidieh +Date: Thu Dec 20 19:32:46 2018 -0800 + + bug fixes + +commit 5dd7052dc5ff9dba0543aa83871449775d9d7f20 +Author: AboudyKreidieh +Date: Thu Dec 20 19:00:35 2018 -0800 + + bug fix + +commit ff38e817acfab48c5d8af43d96db0e2fe4837c30 +Author: AboudyKreidieh +Date: Thu Dec 20 18:59:52 2018 -0800 + + bug fix + +commit d2945982aaf90e34913eb88f8f48a03d2282282d +Author: AboudyKreidieh +Date: Thu Dec 20 17:57:10 2018 -0800 + + added changes from master + +commit 17b305b50651f4b33e19f309c9da9c0f36fcd508 +Author: AboudyKreidieh +Date: Thu Dec 20 17:55:33 2018 -0800 + + added changes from master + +commit ab1c963bf7c3dd8c003c9d0a7088e86ca9d93816 +Merge: ac30253d c6dffc8c +Author: AboudyKreidieh +Date: Thu Dec 20 17:42:11 2018 -0800 + + Merge branch 'kernel_vehicle' into aimsun_kernel + +commit c6dffc8c590171b4ec0dd123124a2352f16036ff +Author: AboudyKreidieh +Date: Thu Dec 20 17:41:03 2018 -0800 + + bug fixes + +commit 6a9bfb89ab94e943f5770d47a9e2c4a701e43e97 +Merge: 51bd153d 4c81bb56 +Author: AboudyKreidieh +Date: Thu Dec 20 15:17:38 2018 -0800 + + Merge branch 'kernel_scenario' into kernel_vehicle + +commit 4c81bb56d78eb2ac0540f1bab6bf06d79b7ce4d9 +Author: AboudyKreidieh +Date: Thu Dec 20 15:17:15 2018 -0800 + + pep8 + +commit 51bd153d2ceeb59f633045241803539e9c842bce +Merge: 92daad50 7ee4994b +Author: AboudyKreidieh +Date: Thu Dec 20 15:13:33 2018 -0800 + + Merge branch 'kernel_scenario' into kernel_vehicle + +commit 7ee4994b88ff35b748f998cd96268e175ba388d7 +Author: AboudyKreidieh +Date: Thu Dec 20 15:10:18 2018 -0800 + + bug fixes + +commit d806dbed704922e1d03e09dab54b7200f9723e10 +Author: AboudyKreidieh +Date: Thu Dec 20 11:36:40 2018 -0800 + + more bug fixes + +commit b41c008362cfd908e00eb3e5fe216d65fac4d625 +Merge: 8b760a64 c7d591cb +Author: Aboudy Kreidieh +Date: Thu Dec 20 10:41:07 2018 -0800 + + Merge pull request #322 from flow-project/check_junction + + Enable collision checks at intersections + +commit 485d9d79e3ce56dc6774e2688528326e0afda4bf +Merge: 92ea2e7c 99fdea14 +Author: AboudyKreidieh +Date: Thu Dec 20 10:30:40 2018 -0800 + + Merge branch 'netfile_osm_merge' into kernel_scenario + +commit 92ea2e7cb9c0efc20c6d6a1132bdcd0cf65d6657 +Author: AboudyKreidieh +Date: Thu Dec 20 09:52:49 2018 -0800 + + bug fixes + +commit c7d591cb62d94c946e5696413b07b745739fbb88 +Author: Fangyu Wu +Date: Wed Dec 19 23:33:21 2018 -0800 + + Enable collision checks at intersections. + +commit bb8edb5e03873eb962f6141b7fb24d1bf6a58a13 +Author: AboudyKreidieh +Date: Wed Dec 19 23:05:47 2018 -0800 + + some mods + +commit eee492930907dec7423f5ad99be14051b57c75f1 +Merge: 84ea1184 8b760a64 +Author: AboudyKreidieh +Date: Wed Dec 19 21:05:58 2018 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into custom_start_pos + +commit 92daad508208b2c07449cc1d741242d10ec8ba54 +Merge: 46a98639 abf7907d +Author: AboudyKreidieh +Date: Wed Dec 19 20:50:55 2018 -0800 + + Merge branch 'kernel_scenario' into kernel_vehicle + +commit abf7907db022d25ae729183a7ad2cf1b1157c1db +Merge: b1d134bb 39b5658b +Author: AboudyKreidieh +Date: Wed Dec 19 20:32:47 2018 -0800 + + Merge branch 'kernel_traffic_lights' into kernel_scenario + +commit 39b5658ba5c1d6b0417777390b318d35cdcc365a +Author: AboudyKreidieh +Date: Wed Dec 19 20:26:15 2018 -0800 + + renamed TrafficLights -> TrafficLightParams + +commit 408306eb49d4d31f00c2d21df17123762fa6f78b +Merge: 324707fd 8b760a64 +Author: AboudyKreidieh +Date: Wed Dec 19 17:41:20 2018 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into kernel_traffic_lights + +commit 8b760a645782cdc6cfaf7fdff3a9ec13d5d08161 +Merge: f39a7853 f82a1926 +Author: Aboudy Kreidieh +Date: Wed Dec 19 17:38:26 2018 -0800 + + Merge pull request #320 from flow-project/scenario_compatibility + + Scenario compatibility + +commit f39a785383d6125e5f8bd3b6b5188f2606a0a1ef +Merge: c53a3f44 ef27abcd +Author: Aboudy Kreidieh +Date: Wed Dec 19 17:32:09 2018 -0800 + + Merge pull request #313 from flow-project/tests_cleanup + + removed a redundant test + +commit 564ad5a3e4e3c94cd26cca9ed56b9ee0fc599cc2 +Merge: 3d342470 c53a3f44 +Author: AboudyKreidieh +Date: Wed Dec 19 17:21:27 2018 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into redis_error + +commit c53a3f44f5495cb0d88d137dcb67912290eea83f +Merge: 802a2c68 9f81931b +Author: Aboudy Kreidieh +Date: Wed Dec 19 17:11:20 2018 -0800 + + Merge pull request #281 from flow-project/kernel_simulation + + Kernel simulation + - added traci vehicle simulation kernel + - replaced `start_sumo` with kernel call + - replaced simulation-based traci calls with kernel calls + +commit f82a19267d6e54acdf5c57cd3e0a90de8b010e9c +Author: AboudyKreidieh +Date: Wed Dec 19 17:05:16 2018 -0800 + + PR fix + +commit ef27abcd74be04222d9a1b4079456fbc3284a91b +Merge: a5c4eab7 802a2c68 +Author: AboudyKreidieh +Date: Wed Dec 19 17:03:22 2018 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into tests_cleanup + +commit 99fdea14182bac7de64205e4d13520712aeeac57 +Author: AboudyKreidieh +Date: Wed Dec 19 11:44:02 2018 -0800 + + converted edges_distribution into a variable + +commit f1d6a1884b10c5394086e7f4727057b7612a893c +Author: AboudyKreidieh +Date: Wed Dec 19 11:20:36 2018 -0800 + + defined default edge_starts within base scenario class + +commit 802a2c683307776b9f7e11e963f56bfe4b8f3e9a +Author: Aboudy Kreidieh +Date: Wed Dec 19 11:09:01 2018 -0800 + + Sumo exp cleanup (#311) + + * removed scenario parameter from SumoExperiment objects + + * modified tutorials to be compatible with parameter removal from SumoExperiment + +commit dc57462112fe7a2232a1d9c6fdce9de7f6a921b4 +Author: Aboudy Kreidieh +Date: Wed Dec 19 11:06:34 2018 -0800 + + added a get_type method to the vehicles class (#312) + + * added a get_type method to the vehicles class + + * bug fix + +commit 1842d83c801e8f6df66e80514b95a4e01235fffe +Author: AboudyKreidieh +Date: Wed Dec 19 11:05:23 2018 -0800 + + moved generate_net methods of osm and net sceanrios to base scenario class + +commit 98d0fd6d1310a927d90930b62db44f1d7f82a105 +Author: Aboudy Kreidieh +Date: Wed Dec 19 11:03:54 2018 -0800 + + added test for wave attenuation reset (#314) + +commit 456d3cf4aaa6df9cd43753b5dc523b61e75ba2d4 +Author: Aboudy Kreidieh +Date: Wed Dec 19 11:03:15 2018 -0800 + + added test for reset in bottleneck env (#315) + +commit 324707fdb881a931c9ba90d3b474ebb512fd220f +Merge: 94920de7 cfaa64a6 +Author: AboudyKreidieh +Date: Tue Dec 18 21:45:52 2018 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into kernel_traffic_lights + +commit 9f81931bb12d65b455f597da602364f8c6d238d6 +Merge: 54190469 cfaa64a6 +Author: AboudyKreidieh +Date: Tue Dec 18 21:45:19 2018 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into kernel_simulation + +commit 33f10af275b3021a8881806c80aa80f2670ea97c +Merge: a6671e07 cfaa64a6 +Author: AboudyKreidieh +Date: Tue Dec 18 21:40:35 2018 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into scenario_compatibility + +commit cfaa64a6a99b473d7f7fe584663b1818afecb056 +Merge: 9b0fcc64 e52aad86 +Author: Aboudy Kreidieh +Date: Tue Dec 18 21:39:38 2018 -0800 + + Merge pull request #303 from flow-project/clip_rewards + + added action clipping for rewards + +commit e52aad8657f7a5bb36e9e3429aaffc61dafdb496 +Author: AboudyKreidieh +Date: Tue Dec 18 21:22:20 2018 -0800 + + docstring + +commit dbedbb78bd9fb4e616c1b43dd6b38509469be07f +Merge: a9689c27 c8805bcb +Author: AboudyKreidieh +Date: Tue Dec 18 21:22:00 2018 -0800 + + Merge branch 'travis_fix' into clip_rewards + +commit a9689c2790c29c5af2f5bd4caecb291518a07898 +Author: AboudyKreidieh +Date: Tue Dec 18 21:18:46 2018 -0800 + + minor cleanup to documentation + +commit 804ffe8e9c886c23900f4b53bded368f0fa8f7f5 +Author: AboudyKreidieh +Date: Tue Dec 18 21:16:01 2018 -0800 + + minor cleanup to documentation + +commit 94920de7983bdaf4da5fbab5cf3f851d91d85452 +Merge: 8ab584a1 54190469 +Author: AboudyKreidieh +Date: Tue Dec 18 12:38:28 2018 -0800 + + Merge branch 'kernel_simulation' into kernel_traffic_lights + +commit a6671e0702159bbc78bba9706d39a6a77f72b692 +Author: AboudyKreidieh +Date: Tue Dec 18 12:32:05 2018 -0800 + + bug fixes + +commit 8ab584a1c213ab0b991cd0aea08880fad82b56e0 +Merge: 22509745 c8805bcb +Author: AboudyKreidieh +Date: Tue Dec 18 12:25:24 2018 -0800 + + Merge branch 'travis_fix' into kernel_traffic_lights + +commit 541904690c01e92e74cbc2d5261087e81c67869a +Merge: 7e87b2e0 c8805bcb +Author: AboudyKreidieh +Date: Tue Dec 18 12:20:43 2018 -0800 + + Merge branch 'travis_fix' into kernel_simulation + +commit 46a986394f957c21690b01a59d27ff1d5a767374 +Merge: 7da86b0c b1d134bb +Author: AboudyKreidieh +Date: Tue Dec 18 11:35:55 2018 -0800 + + Merge branch 'kernel_scenario' into kernel_vehicle + +commit b1d134bb2c2e4227fae0ce24ee160daf8b739b8e +Merge: 3970b54b a481852e +Author: AboudyKreidieh +Date: Tue Dec 18 11:35:22 2018 -0800 + + Merge branch 'scenario_compatibility' into kernel_scenario + +commit a481852ea44f0c89e2bef72f87531560fdda610f +Author: AboudyKreidieh +Date: Tue Dec 18 11:33:00 2018 -0800 + + bug fixes + +commit ac30253d0b4384b8c025ac17cf368eccfe0eab2c +Author: AboudyKreidieh +Date: Tue Dec 18 11:27:46 2018 -0800 + + some modifications + +commit 908506a1d38023c89eb360b526dc3a73dc90dea1 +Merge: 3620da1a 7da86b0c +Author: AboudyKreidieh +Date: Tue Dec 18 11:02:01 2018 -0800 + + Merge branch 'kernel_vehicle' into aimsun_kernel + +commit 7da86b0cd6ce89ee7bca0471423bd272a31f945c +Merge: d2106254 3970b54b +Author: AboudyKreidieh +Date: Tue Dec 18 10:53:41 2018 -0800 + + Merge branch 'kernel_scenario' into kernel_vehicle + +commit 3970b54bc6dc5b049268aabe172142d7d164eaef +Merge: bd8bd182 4fafa333 +Author: AboudyKreidieh +Date: Tue Dec 18 10:52:35 2018 -0800 + + Merge branch 'scenario_compatibility' into kernel_scenario + +commit 4fafa333d7f3d0e41275959507747b6750a5bb34 +Merge: 6502c701 c8805bcb +Author: AboudyKreidieh +Date: Tue Dec 18 10:31:10 2018 -0800 + + Merge branch 'travis_fix' into scenario_compatibility + +commit c8805bcbb2b41e3ff06a683e97c28b351c5b522a +Author: AboudyKreidieh +Date: Tue Dec 18 10:30:44 2018 -0800 + + fixed miniconda issues in travis + +commit 6502c701b3a91f7661e0db15904ac9372d21934e +Author: AboudyKreidieh +Date: Tue Dec 18 10:27:51 2018 -0800 + + modified definition of node, edge, connections, and types + +commit 3620da1a8c8f8f9af4045136075602999bbb4423 +Author: Yasharzf +Date: Mon Dec 17 15:55:45 2018 -0800 + + added aimsun kernel components + +commit d21062541b5d74bc5d5aee410c100c71f57c8f39 +Merge: 0633ef11 48664478 +Author: AboudyKreidieh +Date: Mon Dec 17 13:17:28 2018 -0800 + + Merge branch 'vehicle_params_2' into kernel_vehicle + +commit bd8bd182b1691d15a1871c81a706d93ce91539a9 +Merge: 19d871f0 48664478 +Author: AboudyKreidieh +Date: Mon Dec 17 13:16:58 2018 -0800 + + Merge branch 'vehicle_params_2' into kernel_scenario + +commit 4866447812b35b96b66f8c9ffcab13ba54bfea7e +Author: AboudyKreidieh +Date: Mon Dec 17 13:16:01 2018 -0800 + + remove comment + +commit 20b6ea517ab8a0f32305e24c468cbedbdbece6ae +Author: AboudyKreidieh +Date: Mon Dec 17 13:04:11 2018 -0800 + + cleanup travis + +commit 7e87b2e06a3ee2730edaf16c6f464961b6aaa069 +Author: AboudyKreidieh +Date: Mon Dec 17 12:46:13 2018 -0800 + + bug fix + +commit 16aa96abed81dd854cdee827952ac24b852a49c1 +Merge: e3e835c9 9b0fcc64 +Author: AboudyKreidieh +Date: Mon Dec 17 12:41:35 2018 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into kernel_simulation + +commit 9f8b2cf8798093aaf7caaf388c918d9010b7e46a +Merge: ceb51eeb 9b0fcc64 +Author: AboudyKreidieh +Date: Mon Dec 17 12:41:07 2018 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into vehicle_params_2 + +commit 9b0fcc6478cb02f8b47c53d321893368498701e0 +Merge: e89684ea b7be1ec0 +Author: Aboudy Kreidieh +Date: Mon Dec 17 12:40:20 2018 -0800 + + Merge pull request #254 from flow-project/vehicle_params + + Vehicle params + + In this PR, the sumo speed and lane change modes are moved from the `add` method of the vehicles class and into the `SumoCarFollowingParams` and `SumoLaneChangeParams` objects, respectively. This is meant to move all sumo-specific vehicle parameters to a few set of objects, and keep it out of the `Vehicles` class as a whole. + + Example usage: + + Before: + + ``` + vehicles.add( + veh_id="test", + sumo_car_following_params=SumoCarFollowingParams(), + sumo_lc_params=SumoLaneChangeParams(), + speed_mode=9, + lane_change_mode=0 + ) + ``` + + After: + + ``` + vehicles.add( + veh_id="test", + sumo_car_following_params=SumoCarFollowingParams( + speed_mode=9, + ), + sumo_lc_params=SumoLaneChangeParams( + lane_change_mode=0, + ), + ) + ``` + +commit 0633ef111e2fd493877c12c6003a1ff681987f7f +Merge: 357db27a e89684ea +Author: AboudyKreidieh +Date: Mon Dec 17 01:00:19 2018 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into kernel_vehicle + +commit 19d871f0982851f4810d67c3a3465e875368ac05 +Merge: e5bfdfc2 e89684ea +Author: AboudyKreidieh +Date: Mon Dec 17 00:59:49 2018 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into kernel_scenario + +commit 22509745f496bbc25a83bef85a192641cae25166 +Merge: 4c9e7c2e e89684ea +Author: AboudyKreidieh +Date: Mon Dec 17 00:59:11 2018 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into kernel_traffic_lights + +commit e3e835c93329494ebef2637e7831700c5188b5d6 +Merge: 0290fd0f e89684ea +Author: AboudyKreidieh +Date: Mon Dec 17 00:58:33 2018 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into kernel_simulation + +commit e89684ead97822f6cdecc7433b0dd95812444937 +Merge: 473154ae 71bb00e1 +Author: Aboudy Kreidieh +Date: Mon Dec 17 00:57:52 2018 -0800 + + Merge pull request #253 from flow-project/kernel_abstract + + Kernel abstractions + +commit b7be1ec0e571c1bbc9e615805392693faf765f08 +Author: AboudyKreidieh +Date: Mon Dec 17 00:48:53 2018 -0800 + + PR fix + +commit 71bb00e12af959cb643f9e127a35865dedf72201 +Author: AboudyKreidieh +Date: Mon Dec 17 00:40:02 2018 -0800 + + changes from newer flow commits + +commit e5bfdfc278c886aefc513ec27a6d92e44cd50230 +Author: AboudyKreidieh +Date: Sun Dec 16 15:40:31 2018 -0800 + + bug fixes + +commit 357db27a099bb2b4780dce3e129dbc98792b12ce +Author: AboudyKreidieh +Date: Sun Dec 16 15:37:26 2018 -0800 + + bug fixes + +commit 58834b94ff81710a214b703f4c041d0a883f8d4a +Author: AboudyKreidieh +Date: Sat Dec 15 23:32:12 2018 -0800 + + pep8 + +commit 5c8b32f86e69e992b2110f8e2f88efe74cb5ecb2 +Author: AboudyKreidieh +Date: Sat Dec 15 22:32:24 2018 -0800 + + bug fixes + +commit 66f3ab9c6e32ccaca3998ca6cadc54bd2cea7239 +Author: AboudyKreidieh +Date: Sat Dec 15 22:29:07 2018 -0800 + + more traci cleanup + +commit d464177ba14d63d5b4532340741ed75989fb0093 +Merge: bf88123a d480ed0a +Author: AboudyKreidieh +Date: Sat Dec 15 22:18:25 2018 -0800 + + Merge branch 'traci_cleanup' into kernel_vehicle + +commit d480ed0a865d8041dfa231f15156202edd3ef694 +Author: AboudyKreidieh +Date: Sat Dec 15 22:10:05 2018 -0800 + + removed some traci calls + +commit bf88123a01fce532e6d3ecfe6879b4896836a8f3 +Author: AboudyKreidieh +Date: Sat Dec 15 20:28:16 2018 -0800 + + minor bug fixes + +commit 758c61eda0730a3b94d7664ee23e9d1a86b3eea5 +Merge: 41b75b90 473154ae +Author: AboudyKreidieh +Date: Sat Dec 15 20:09:26 2018 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into kernel_vehicle + +commit 41b75b90719816bff2766d4120ed62bc0f4851fd +Author: AboudyKreidieh +Date: Sat Dec 15 20:05:09 2018 -0800 + + replaced many of the vehicle class calls + +commit ceac732c62b7975fcb33ae9c2af05c21de1bca20 +Author: AboudyKreidieh +Date: Sat Dec 15 18:09:03 2018 -0800 + + moved the Vehicles class to params.py + +commit 3fe2f0160de20fe95db7a30db06c0132409da360 +Merge: 5c6229b4 4c9e7c2e +Author: AboudyKreidieh +Date: Sat Dec 15 17:56:03 2018 -0800 + + Merge branch 'kernel_traffic_lights' into kernel_vehicle + +commit 5c6229b4d9587bb86bb97ae0f96a5b93c490b729 +Author: AboudyKreidieh +Date: Sat Dec 15 16:35:45 2018 -0800 + + started adding vehicles kernel + +commit 84ea118447728573e1a2e1f314c74df29f723448 +Author: AboudyKreidieh +Date: Sat Dec 15 16:07:32 2018 -0800 + + bug fixes + +commit 22f9bdf2ac3bd1da51b5465708cd6e9fa23d5a4d +Merge: b6bbda14 473154ae +Author: AboudyKreidieh +Date: Sat Dec 15 16:04:59 2018 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into custom_start_pos + +commit 473154ae156e8aad8bba8828fa6f442aee28366b +Merge: ed11d58a d0d540e4 +Author: Aboudy Kreidieh +Date: Sat Dec 15 16:02:41 2018 -0800 + + Merge pull request #248 from flow-project/tests_rewards + + Tests rewards + +commit d0d540e4a182fa147e7273fae391a7fb7fb787a4 +Author: AboudyKreidieh +Date: Sat Dec 15 15:21:34 2018 -0800 + + PR fixes + +commit 5754a2f602963f2c3243e9dd923c5d178f657d5c +Merge: 1e4b0f07 5f1708c1 +Author: AboudyKreidieh +Date: Sat Dec 15 11:58:03 2018 -0800 + + Merge branch 'vehicle_params' into kernel_scenario + +commit ceb51eeb80467846ff663b77a6cb7d2e20632933 +Merge: cd1d8c36 5f1708c1 +Author: AboudyKreidieh +Date: Sat Dec 15 11:57:18 2018 -0800 + + Merge branch 'vehicle_params' into vehicle_params_2 + +commit 5f1708c1abbf3e7bc8ab43433abe6dd7c86fdbb1 +Author: AboudyKreidieh +Date: Sat Dec 15 11:56:32 2018 -0800 + + bug fix + +commit b6bbda14655bfb5f0699dd5a71b50a8261787a4c +Author: AboudyKreidieh +Date: Sat Dec 15 11:12:54 2018 -0800 + + bug fixes + +commit 1e4b0f073d18b75ffdb2f34553fe7ac787984da7 +Author: AboudyKreidieh +Date: Sat Dec 15 11:10:35 2018 -0800 + + custom spacing for grid + +commit a5c4eab7e98e586e41f827655769fcf860e6110d +Author: AboudyKreidieh +Date: Sat Dec 15 11:02:09 2018 -0800 + + minor cleanup + +commit 233b03907559134d0b0c0cc62a818a7d66a50969 +Author: AboudyKreidieh +Date: Sat Dec 15 10:46:17 2018 -0800 + + some compatibility issues + +commit 65045549d9c3dec9c97e350e992caf82c80f9ec3 +Author: AboudyKreidieh +Date: Fri Dec 14 23:23:43 2018 -0800 + + cleanup + +commit dbda3a7cc2c15c89d56a8eefe4deba5eac695a60 +Author: AboudyKreidieh +Date: Fri Dec 14 23:16:58 2018 -0800 + + converted gen_custom_start_pos to a staticmethod + +commit 622b66132cd49fcf808a23f8f8136699a959a109 +Author: AboudyKreidieh +Date: Fri Dec 14 22:54:09 2018 -0800 + + modified grid to support custom spacing + +commit f5635829bba6bf9f2ea5a3005e49bde1e26896eb +Author: AboudyKreidieh +Date: Fri Dec 14 19:59:40 2018 -0800 + + turned gen_custom_start_pos to staticmethod + +commit a7f5c7e84a1338460bc56299528e6daac5735f36 +Merge: da14fecd fe9b26f1 +Author: AboudyKreidieh +Date: Fri Dec 14 19:16:44 2018 -0800 + + Merge branch 'test_bottleneck_reset' into kernel_scenario + +commit fe9b26f18a89e7035f5ac2a84fab61241c79d54f +Author: AboudyKreidieh +Date: Fri Dec 14 17:23:52 2018 -0800 + + added test for reset in bottleneck env + +commit da14fecd395df2c8db42b9504fd92c2d992220b2 +Author: AboudyKreidieh +Date: Fri Dec 14 16:51:43 2018 -0800 + + passing the custom start pos to the scenario kernel + +commit e1b628ef8e8765382dc2ef73a3fa059493a875ab +Author: AboudyKreidieh +Date: Fri Dec 14 15:21:29 2018 -0800 + + more minor + +commit e6c5724e3e18489b104aac0a2c257afacf1be169 +Author: AboudyKreidieh +Date: Fri Dec 14 15:09:34 2018 -0800 + + minor + +commit 80db85e36ae03d6300f0af5d8d4b36e25cc31fe2 +Merge: f970aeb0 af9d0e87 +Author: AboudyKreidieh +Date: Fri Dec 14 14:53:47 2018 -0800 + + Merge branch 'tests_wave_attenuation' into kernel_scenario + +commit af9d0e876abc82a14e03e6cc82339bb695ac5b03 +Author: AboudyKreidieh +Date: Fri Dec 14 14:52:20 2018 -0800 + + added test for wave attenuation reset + +commit f970aeb0e133b7b5cfcb0a8b3477f92d7862e2a9 +Author: AboudyKreidieh +Date: Fri Dec 14 14:33:52 2018 -0800 + + more fixes + +commit 00e6dcb2a3b8dd3bbd6db57d476fcee19b72657b +Author: AboudyKreidieh +Date: Fri Dec 14 11:44:00 2018 -0800 + + some tests for mods + +commit 1d8cc480e08c59fe07366fad118a35fa12b27f25 +Merge: f8c405cb cd1d8c36 +Author: AboudyKreidieh +Date: Fri Dec 14 11:33:47 2018 -0800 + + Merge branch 'vehicle_params_2' into kernel_scenario + +commit f8c405cbce43d1f4ff03d8e7f6646ba6cba8826d +Author: AboudyKreidieh +Date: Fri Dec 14 11:28:10 2018 -0800 + + some more minor changes + +commit c57c2f424935cb7b4332a8d4b590a88a774d30c7 +Merge: 2922720e 0290fd0f +Author: AboudyKreidieh +Date: Fri Dec 14 11:20:22 2018 -0800 + + Merge branch 'kernel_simulation' into kernel_scenario + +commit 0290fd0f15cba724e96478d6cc21842b5bf5fc62 +Author: AboudyKreidieh +Date: Fri Dec 14 11:19:32 2018 -0800 + + moved simulation subscription to the kernel + +commit 2922720e56617b5464c7de36a7f73743a2b8bd16 +Author: AboudyKreidieh +Date: Fri Dec 14 11:17:34 2018 -0800 + + started trying to resolve tests + +commit 00115cc376112037f2c6620f66041603d24733fb +Merge: 000e643f 8921dce6 +Author: AboudyKreidieh +Date: Fri Dec 14 11:11:23 2018 -0800 + + Merge branch 'tests_cleanup' into kernel_scenario + +commit 8921dce6099b39b65f74475fa694c8f7f348a749 +Author: AboudyKreidieh +Date: Fri Dec 14 11:08:49 2018 -0800 + + removed a redundant test + +commit 000e643f277ad6dee3fea654869a6badcf1cb4ae +Author: AboudyKreidieh +Date: Fri Dec 14 11:07:52 2018 -0800 + + more changes for scenario kernel + +commit a6939405f94ce986f6e37e9106bff7750929755b +Author: AboudyKreidieh +Date: Thu Dec 13 23:52:19 2018 -0800 + + more fixes to support integration + +commit b42a2d39dc425aa60f75bede5ecef4a954bfdbb6 +Merge: ecb59630 721e5273 +Author: AboudyKreidieh +Date: Thu Dec 13 23:38:29 2018 -0800 + + Merge branch 'get_type' into kernel_scenario + +commit 721e52730c298a1f891f9acbf43a3e79706eb2df +Author: AboudyKreidieh +Date: Thu Dec 13 23:38:06 2018 -0800 + + bug fix + +commit ecb596308dc381ae26f0130aa721a9f440705a01 +Merge: 1f01d602 bffc2ee6 +Author: AboudyKreidieh +Date: Thu Dec 13 23:36:20 2018 -0800 + + Merge branch 'get_type' into kernel_scenario + +commit bffc2ee691bb5a9cb6b8a284b0a674d13ea9250c +Author: AboudyKreidieh +Date: Thu Dec 13 23:32:51 2018 -0800 + + added a get_type method to the vehicles class + +commit ed11d58ad66dd5b8f3a5a958d1178f833be3a4d7 +Merge: bd1d75d7 18548438 +Author: Aboudy Kreidieh +Date: Thu Dec 13 23:14:10 2018 -0800 + + Merge pull request #309 from CYBruce/patch-2 + + some trivial edit. + +commit 1f01d602b090843522eacc2031fba1f4b5ae87a2 +Author: AboudyKreidieh +Date: Thu Dec 13 19:07:04 2018 -0800 + + more changes for scenario kernel + +commit 5eac1ca70cce59c57655e5520c814eaba05f5c83 +Merge: c7a72cee 9d043758 +Author: AboudyKreidieh +Date: Thu Dec 13 18:42:51 2018 -0800 + + Merge branch 'sumo_exp_cleanup' into kernel_scenario + +commit 9d043758f8f16a62012e6b163b25e45113e127bc +Author: AboudyKreidieh +Date: Thu Dec 13 18:37:57 2018 -0800 + + modified tutorials to be compatible with parameter removal from SumoExperiment + +commit c05c4c5cbd58c92520a6393e43d604f17c7b7aba +Author: AboudyKreidieh +Date: Thu Dec 13 18:30:31 2018 -0800 + + removed scenario parameter from SumoExperiment objects + +commit c7a72ceeb5d8b7ee379fac48ccca22790fcc0704 +Author: AboudyKreidieh +Date: Thu Dec 13 18:01:55 2018 -0800 + + started adding scenario kernel + +commit 4c9e7c2eb76fb5e28f8ce7bb8d48563615585e03 +Author: AboudyKreidieh +Date: Thu Dec 13 13:46:49 2018 -0800 + + compatibility with utils test + +commit bcf01852bc7d587633da492593d0ddbaa6a31d40 +Author: AboudyKreidieh +Date: Thu Dec 13 13:24:38 2018 -0800 + + changed traffic light to kernel calls + +commit bd1d75d77d39a53bf8eacf42774ba0ad0a22837e +Author: CYBruce +Date: Fri Dec 14 05:24:06 2018 +0800 + + Update tutorial06_environments.ipynb (#308) + +commit a64dcbd5d509593876a13c3d14af2f9f540e949d +Author: AboudyKreidieh +Date: Thu Dec 13 12:59:53 2018 -0800 + + more bug fixes + +commit 18548438e3cecabb8c8de145aab7d59370951708 +Author: CYBruce <34786389+CYBruce@users.noreply.github.com> +Date: Thu Dec 13 16:26:13 2018 +0800 + + some trivial edit. + + Actually, the edge0 is not a node (from my understanding). So, I think this sentence may confuse some new reader like me. + +commit 741daba35dead5684ca00cb6ec32486f0bd0973f +Author: AboudyKreidieh +Date: Thu Dec 13 00:09:01 2018 -0800 + + bug fixes + +commit 9f9bb1e58619e48defdc33ca082783b57c588d1b +Author: AboudyKreidieh +Date: Wed Dec 12 23:54:23 2018 -0800 + + added traffic light kernel + +commit 0ca137125b987ed5f3489291437c159fccf21cd0 +Author: AboudyKreidieh +Date: Wed Dec 12 23:25:30 2018 -0800 + + moved the traffic light class to params.py + +commit 564c1e5540f7c52b7f34d30febeec5c0a0184f47 +Author: AboudyKreidieh +Date: Wed Dec 12 21:41:43 2018 -0800 + + bug fix + +commit 7e1e729335d78e7bd748d50c56031a9b67f967cb +Merge: 7dd90a01 f028e824 +Author: AboudyKreidieh +Date: Wed Dec 12 18:08:15 2018 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into kernel_simulation + +commit cd1d8c36ff290fbb82d70607dea312a18cbe5cac +Author: AboudyKreidieh +Date: Wed Dec 12 11:59:09 2018 -0800 + + fixed tests + +commit f028e8245a112d871c6226ba475674af5fd4ce40 +Merge: 69b66935 2d3e57c2 +Author: Aboudy Kreidieh +Date: Wed Dec 12 11:35:52 2018 -0800 + + Merge pull request #190 from flow-project/cloudpickleversion + + cloudpickle 0.5.3 doesn't work + +commit 2d3e57c2d4332789500be202d717da4e5da086e9 +Merge: 67cb9930 69b66935 +Author: AboudyKreidieh +Date: Wed Dec 12 00:47:34 2018 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into cloudpickleversion + +commit 695580a01cf6fe0ed93e43fd2e10036545e9fe13 +Author: AboudyKreidieh +Date: Wed Dec 12 00:40:47 2018 -0800 + + bug fixes + +commit f713b0c9f258067e5761de9b7f028bd8d1eba919 +Merge: a12e5e26 d012d4cd +Author: AboudyKreidieh +Date: Tue Dec 11 22:03:54 2018 -0800 + + Merge branch 'vehicle_params' into vehicle_params_2 + +commit d012d4cd9578ad13b965b28a314ec66ed33d36ef +Author: AboudyKreidieh +Date: Tue Dec 11 21:46:04 2018 -0800 + + bug fixes + +commit 69b66935ec9f76445461a43d8985522208aebcb7 +Author: Kanaad Parvate +Date: Tue Dec 11 21:10:42 2018 -0800 + + Benchmark regression tests (#258) + + * added regression test autoscale script, and modified rllib runners to be more general + + * added run all benchmarks script + + * pep8 + + * added special case for grid0, grid1, clean up runscript + + * addressed PR comments + + * spot price + + * flake8 + + * Update README.md + + * Update benchmark_autoscale.yaml + + * Update es_runner.py + +commit 51b5977ba92d0a1854aa65727d15faf8b374dd50 +Author: Eugene Vinitsky +Date: Tue Dec 11 21:09:16 2018 -0800 + + Update .coveragerc + +commit 81159e096f90b9ed523016b4dfe5bcb9c7ba9126 +Author: AboudyKreidieh +Date: Tue Dec 11 20:46:23 2018 -0800 + + modifications to the jsons for new params + +commit 4dc462510ec53791ec6ed06189ff8c68ca3e84e2 +Author: AboudyKreidieh +Date: Tue Dec 11 20:41:44 2018 -0800 + + bug fix + +commit c9838a8a77e213049972789bd377fec4f92cbf7e +Merge: 42488371 d0633429 +Author: AboudyKreidieh +Date: Tue Dec 11 20:39:28 2018 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into vehicle_params + +commit f442d57f8cde97d89b51780d741bbf4a0e1f71b4 +Author: AboudyKreidieh +Date: Tue Dec 11 20:25:11 2018 -0800 + + PR fixes + +commit 3304e7c9737c5da0b4e838f53c89bb4d0c23f513 +Merge: 8bd7ba53 d0633429 +Author: AboudyKreidieh +Date: Tue Dec 11 20:07:38 2018 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into tests_rewards + +commit d06334298be2770968085eb5cb81f7f2eec56d33 +Merge: 2b16f6f2 02618ab6 +Author: Aboudy Kreidieh +Date: Tue Dec 11 19:47:40 2018 -0800 + + Merge pull request #295 from flow-project/debugger + + Minor bug fixes + +commit 2b16f6f2d37f1e369c03d0b00dee7f210dadc18d +Merge: 77da84e7 61c46ad8 +Author: Aboudy Kreidieh +Date: Tue Dec 11 19:39:59 2018 -0800 + + Merge pull request #297 from flow-project/config_sync_s3 + + added flow/config to gitignore, and fixed scripts/syncs3 + +commit 8e7e14e0a663ea81eb08a4234da5608b52387211 +Author: eugenevinitsky +Date: Fri Dec 7 18:15:17 2018 -0800 + + bug fix + +commit 8abab0b858b33a7e270f033df4da92d74210b37e +Author: eugenevinitsky +Date: Fri Dec 7 17:50:13 2018 -0800 + + added action clipping for rewards + +commit 361d5c746e5513fb353daede6b5c4679ebd5042d +Author: eugenevinitsky +Date: Fri Dec 7 14:43:09 2018 -0800 + + pep8 again + +commit c5d53a54f9c95dd369acaaceb7a13af13d1a208b +Author: eugenevinitsky +Date: Fri Dec 7 14:34:53 2018 -0800 + + pep8 + +commit 7b04b9e55469c7063521c862c64e6094b5aa3eea +Author: eugenevinitsky +Date: Fri Dec 7 14:26:46 2018 -0800 + + added fixme flag + +commit 6d7fd07281d0772ee5adb7db81486f5a428aa00c +Author: eugenevinitsky +Date: Wed Dec 5 13:33:20 2018 -0800 + + changed bottleneck values up + +commit e2c85691aec93bc057499da206cfab9f85fe6201 +Author: eugenevinitsky +Date: Tue Dec 4 14:04:45 2018 -0800 + + updated ubuntu1604 path + +commit 4451d54aa025dd5f0b5960744fb5238fa39d4a30 +Merge: db7d5b4d 77da84e7 +Author: eugenevinitsky +Date: Tue Dec 4 12:41:11 2018 -0800 + + master merge + +commit db7d5b4dceaa2751c89285f6153294fa550dd989 +Author: eugenevinitsky +Date: Tue Dec 4 12:03:24 2018 -0800 + + minor + +commit 77da84e768958c823ea191dc0508369319858bbe +Merge: e19d0bad 37c97786 +Author: Aboudy Kreidieh +Date: Tue Dec 4 01:20:22 2018 -0800 + + Merge pull request #263 from kjang96/benchmark_baseline_tests + + Tests for benchmarks and baselins + +commit e19d0bad1f0c8e4503be6163c7a5c457dfc4ba30 +Merge: 0ee8ce91 37f695d4 +Author: Aboudy Kreidieh +Date: Mon Dec 3 23:20:06 2018 -0800 + + Merge pull request #256 from flow-project/base_env_cleanup + + Base env cleanup + +commit 0ec94a046b34f043ea609ba244390e6ba837b46a +Author: eugenevinitsky +Date: Mon Dec 3 21:41:24 2018 -0800 + + minor + +commit 465d765d9d035899fc2a0b6ea52467f052ee0687 +Author: eugenevinitsky +Date: Mon Dec 3 21:40:20 2018 -0800 + + found missing error + +commit 68240688d5c005ff08db23bc0eb5a52bcc07c81e +Author: eugenevinitsky +Date: Mon Dec 3 21:38:23 2018 -0800 + + minor + +commit 1859c9fe57de5e9d908f9992c8d48fc4a742663f +Author: eugenevinitsky +Date: Mon Dec 3 20:55:36 2018 -0800 + + changed 1804 s3 path + +commit 21e174684ca2e6fb3d8c5bdaf59a23610ded6128 +Author: eugenevinitsky +Date: Mon Dec 3 20:02:02 2018 -0800 + + changed where files are pulled from + +commit 0ee8ce914917c31c58fe4f7429887a338c2b9b19 +Merge: ee82a5a1 ef93f596 +Author: nskh +Date: Mon Dec 3 19:02:10 2018 -0800 + + Merge pull request #40 from nskh/rllab_tutorial + + rllab ec2 tutorial + +commit ef93f5966e42a51fdaed2fcd6f416ebd8f907c8a +Author: Nishant Kheterpal +Date: Mon Dec 3 17:08:47 2018 -0800 + + localdocker + +commit c48e077cc671ceee52590ba9312e18b06320e3f4 +Merge: 00671ce9 ee82a5a1 +Author: Nishant Kheterpal +Date: Mon Dec 3 16:32:10 2018 -0800 + + pulled in master + +commit 8e0f38f373189458d1aaf8d4533c548660c39b7e +Author: Umang Sharaf +Date: Mon Dec 3 15:14:35 2018 -0800 + + commit for no collision + +commit 96863eb207675f4c1343f6ad6e3f102dd0a0881d +Author: eugenevinitsky +Date: Mon Dec 3 13:50:04 2018 -0800 + + not a global install + +commit 915288e06847164c7b886bc395508764a3bfff6f +Author: eugenevinitsky +Date: Mon Dec 3 13:43:54 2018 -0800 + + minor + +commit fddfc501bb75b28c05dfe01c78590024fbca228a +Author: eugenevinitsky +Date: Mon Dec 3 13:35:54 2018 -0800 + + bug in flake8 + +commit 0ceda40465f03b99abaec3b6c8d0c9fcd7ae76dd +Author: eugenevinitsky +Date: Mon Dec 3 13:29:01 2018 -0800 + + minor + +commit bba89139e593226146dd18ba756ecfbbc6963fb9 +Author: eugenevinitsky +Date: Mon Dec 3 12:35:46 2018 -0800 + + attempted to swap out sumo binaries + +commit a7886afbeb1f9f5b85e81de11c98a2e4817594b9 +Author: eugenevinitsky +Date: Sun Dec 2 19:46:31 2018 -0800 + + temporary + +commit 24796713211148cd8ded10b6c4affb1a006b1b7c +Author: eugenevinitsky +Date: Sun Dec 2 17:02:31 2018 -0800 + + minor + +commit 184f2b9962c74ccca1b860cf163447a3ef8e6459 +Author: eugenevinitsky +Date: Sun Dec 2 16:54:53 2018 -0800 + + minor + +commit 3f1bf1364c572085d97c67ad9fc5f07bfc10948f +Merge: 48058618 5a80599f +Author: eugenevinitsky +Date: Sun Dec 2 16:32:05 2018 -0800 + + Merge branch 'new_sumo_pr' of https://github.com/flow-project/flow into new_sumo_pr + +commit 480586185b79f5a5c8ec64057ccaa4ea9508c59d +Author: eugenevinitsky +Date: Sun Dec 2 16:31:54 2018 -0800 + + fixes for tests + +commit ee82a5a1d27c451b75e7d6e49ee9eba8d247cc4f +Author: yunerzxy +Date: Sun Dec 2 15:54:01 2018 -0800 + + solve naming conflict for new sumo (#292) + +commit 5a80599f0a76c69de290b5718b173c565beba59c +Author: Kanaad Parvate +Date: Fri Nov 30 21:28:23 2018 -0800 + + udpated ami in autoscale script + +commit 61c46ad8ddb49bcc70516763aa1b40f38cb5e518 +Author: Kanaad Parvate +Date: Fri Nov 30 20:30:46 2018 -0800 + + added flow/config to gitignore, and fixed scripts/syncs3 + +commit cb1f453e738ee644c6c49d4214c3d7d44a65cff4 +Merge: 85406913 0e1f7791 +Author: Fangyu Wu +Date: Fri Nov 30 17:55:48 2018 -0800 + + Merge pull request #294 from flow-project/pyglet_renderer_docs + + Add pyglet renderer to docs. + +commit 02618ab66c8bb87f5f1f36d8609460e76dade599 +Author: Fangyu Wu +Date: Fri Nov 30 17:03:03 2018 -0800 + + Fix test_examples import error. + +commit 0e1f779154dc6a5f797858cc6d6caddb33f082dc +Author: Fangyu Wu +Date: Fri Nov 30 16:57:15 2018 -0800 + + Fix typos and add a grayscale example. + +commit ec6b04702b88fcd64347953a18d6f40bb477c8a2 +Author: eugenevinitsky +Date: Fri Nov 30 16:42:52 2018 -0800 + + minor + +commit d3a08fd4ed53a95a9485c9e4a12d7636083f6373 +Author: eugenevinitsky +Date: Fri Nov 30 16:21:35 2018 -0800 + + missing methods in figure eight scenario + +commit 923b9c7925159e78ecea2111eff485153240e1cb +Author: Fangyu Wu +Date: Fri Nov 30 16:13:13 2018 -0800 + + Make sure number of lanes is properly reset. + +commit 3e2160a30593190ad33b1820f7c313f8271012c3 +Author: Fangyu Wu +Date: Fri Nov 30 16:09:35 2018 -0800 + + Rename to avoid conflict with pandas. + +commit 5a242d105b6c4156fcdf3bd8802e11ce76244ce5 +Author: Fangyu Wu +Date: Fri Nov 30 16:04:53 2018 -0800 + + Add pyglet renderer to docs. + +commit 5e2c6309fa245cfa016138086c625366792c1c34 +Author: eugenevinitsky +Date: Fri Nov 30 16:00:08 2018 -0800 + + pep8 + +commit dbc9a69665bf2e7c1b57a0339907beeb191f68b7 +Merge: a2d0d409 85406913 +Author: eugenevinitsky +Date: Fri Nov 30 15:45:36 2018 -0800 + + merged in master + +commit 37c977864442c17e8e3b493d20da21b92c95e83d +Author: Kathy Jang +Date: Fri Nov 30 15:05:20 2018 -0800 + + got rid of useless config and decreased batch size + +commit a35a1bd0d548fc7cda7b255e305b5306b47d7e15 +Merge: 10264c6f 85406913 +Author: eugenevinitsky +Date: Fri Nov 30 13:23:21 2018 -0800 + + Merge branch 'master' into visualize_benchmarks + +commit 8540691388a4eaea8a1207154158adb1079f6cb0 +Author: eugenevinitsky +Date: Fri Nov 30 13:18:35 2018 -0800 + + added save movie option to visualizer rllib (#283) + + * added save movie option to visualizer rllib + + * saved as datetime file + + * pep8 + + * made changes to pass tests and rename files + + * removed unneeded parser arg + + * consistent flags with bash + + * more descriptive + + * fix for code review + +commit 10264c6feff0c0d556ea06f03003e63bce764528 +Merge: 2f6451dd a0543907 +Author: eugenevinitsky +Date: Fri Nov 30 12:59:56 2018 -0800 + + Merge branch 'master' into visualize_benchmarks + +commit a0543907238063e31268bb4d7f7d11be30d3aaa9 +Merge: 37c01303 136a0b22 +Author: Aboudy Kreidieh +Date: Fri Nov 30 12:55:06 2018 -0800 + + Merge pull request #291 from flow-project/bug_fix + + Fix for accidental Ray dependencies + +commit 136a0b22b20d58a82f4c4b83adb2da4ecbc7d040 +Author: eugenevinitsky +Date: Fri Nov 30 11:24:42 2018 -0800 + + minor + +commit 262464d72c06d87ea15468f8e5e7a46efd4beaae +Author: eugenevinitsky +Date: Fri Nov 30 10:29:07 2018 -0800 + + minor + +commit 0ef70aff19078bde7b5f8b8b5fcceee49a016b84 +Author: eugenevinitsky +Date: Fri Nov 30 10:15:53 2018 -0800 + + minor + +commit 46ffaf7ef393595b17c8fcaf9d600c74b8490ad0 +Author: eugenevinitsky +Date: Fri Nov 30 10:14:58 2018 -0800 + + bug fix for issue + +commit 2f6451ddaeec52f69260dbfd47eea0dad0c643f1 +Author: eugenevinitsky +Date: Thu Nov 29 19:14:18 2018 -0800 + + working visualization and benchmark metric script + +commit 3c678a3441d39a01474e26f7e51e9aeb2abc3661 +Author: eugenevinitsky +Date: Thu Nov 29 14:29:27 2018 -0800 + + minor + +commit 25744592c6cf315036a8e055c7e8cad32472507e +Author: eugenevinitsky +Date: Thu Nov 29 13:44:16 2018 -0800 + + minor + +commit 42ee63bad94ef9cdb31da18e31192c7ecaffae26 +Author: eugenevinitsky +Date: Thu Nov 29 13:42:52 2018 -0800 + + better output flags + +commit c5facf457b9210db368d6cd0edfe6c334e63ed8f +Author: eugenevinitsky +Date: Thu Nov 29 13:21:44 2018 -0800 + + added benchmark tests to script + +commit 9f909a003676f3164c1e20def5a54bada155efbc +Author: eugenevinitsky +Date: Thu Nov 29 11:50:02 2018 -0800 + + minor + +commit df6b724740e8fa962de4fc59b1daac4a47d49af7 +Author: eugenevinitsky +Date: Thu Nov 29 10:56:00 2018 -0800 + + renamed + +commit 0abdb5d64b772581496f2af90250e2621d005837 +Author: eugenevinitsky +Date: Thu Nov 29 10:53:29 2018 -0800 + + moved visualization script + +commit 3d342470f0676d544587f275abb0d0e0e8c1b245 +Author: eugenevinitsky +Date: Thu Nov 29 10:51:14 2018 -0800 + + pep8 + +commit 37c013030393f563179e76f15460703d6a47cea3 +Author: Kathy Jang +Date: Thu Nov 29 10:50:06 2018 -0800 + + minor visualizer_rllib.py bug (#288) + +commit d39cd4c5962e75c6c1d24e1334b61baa452ed8d0 +Author: eugenevinitsky +Date: Thu Nov 29 10:49:03 2018 -0800 + + script is working + +commit 5ef7293343dec8ae2b5545ec919e56d22806a395 +Author: eugenevinitsky +Date: Thu Nov 29 10:46:38 2018 -0800 + + script to generate videos is working, need to find silent mode so that it can run in the background + +commit 753fa2527051d602cd962a515cb105b321cb735b +Merge: c495165e 8e9455b1 +Author: eugenevinitsky +Date: Thu Nov 29 10:44:17 2018 -0800 + + Merge branch 'save_movie' into visualize_benchmarks + +commit c495165e035c433fb48f7e1b52d51ef34d01b259 +Author: eugenevinitsky +Date: Wed Nov 28 17:56:13 2018 -0800 + + benchmark movie saving script + +commit 2e58f35fc381f8c793e8231e4e9efaf27729e3a7 +Author: eugenevinitsky +Date: Wed Nov 28 17:50:46 2018 -0800 + + start of benchmark visualization script + +commit 7dd90a01e780e17585d69f29b2dd395f5624ff8c +Author: AboudyKreidieh +Date: Wed Nov 28 17:17:10 2018 -0800 + + bug fix + +commit 462f1ef70bf2b8331b7ba2181f26b5e7a2318486 (tag: v0.2.1) +Author: Aboudy Kreidieh +Date: Wed Nov 28 16:17:18 2018 -0800 + + modified version to freeze for renderer (#286) + +commit 37f695d45ef35dbab0cd8c600df0f4adbe70bd4e +Author: AboudyKreidieh +Date: Wed Nov 28 12:20:14 2018 -0800 + + bug fix + +commit bf72dd08552c9ae1fbcafaabdac8cf97292d5fca +Merge: 1942999e 2e7fa4b0 +Author: AboudyKreidieh +Date: Wed Nov 28 12:18:42 2018 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into base_env_cleanup + +commit 2c502ef0372755c63daf44a2b1fb4c1b24b523a4 +Author: AboudyKreidieh +Date: Wed Nov 28 12:14:17 2018 -0800 + + bug fix + +commit 8962a57595ffb5c600d1ebfe1efac4cd664ed459 +Author: AboudyKreidieh +Date: Wed Nov 28 12:13:02 2018 -0800 + + bug fix + +commit 57c74e91ed935577c98cfd1bcd0e3a343f8f8a75 +Merge: 569321bd bc1a23ad +Author: AboudyKreidieh +Date: Wed Nov 28 12:11:44 2018 -0800 + + Merge branch 'kernel_abstract' into kernel_simulation + +commit 2e7fa4b01e6a1c393d7719dd6734c7c9ce426b01 +Merge: 21144b71 9b1ae704 +Author: Aboudy Kreidieh +Date: Wed Nov 28 12:10:01 2018 -0800 + + Merge pull request #267 from kjang96/registry_vehicles + + Deep copy vehicles variable in create_env, which will allow for clean… + +commit bc1a23ad39a99dc4227a8be95596dcabecce30dd +Merge: 74343a29 21144b71 +Author: AboudyKreidieh +Date: Wed Nov 28 12:06:16 2018 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into kernel_abstract + +commit ff35e49cde91a73735c6d54bf7c694185cfa3662 +Author: Kathy Jang +Date: Wed Nov 28 10:15:17 2018 -0800 + + Removed flow_params args from baseline + +commit 9715fee3718ed31c4d6d905595616aaa94db924e +Author: Kathy Jang +Date: Wed Nov 28 00:07:48 2018 -0800 + + pep8 + +commit 9b1ae704998a83d9341b07d0b5ec9b690c498ba5 +Author: Kathy Jang +Date: Tue Nov 27 22:17:49 2018 -0800 + + minor fix + +commit 2a15f358328abd357b33054cd5b2ee7be82c7b55 +Merge: 9825708a d97d8c89 +Author: Kathy Jang +Date: Tue Nov 27 22:17:25 2018 -0800 + + Merge branch 'registry_vehicles' of https://github.com/kjang96/flow-1 into registry_vehicles + +commit 9825708a5379c8b3b69bc61ca5b6a06bff63a5ae +Author: Kathy Jang +Date: Tue Nov 27 22:16:48 2018 -0800 + + got rid of redudant line + +commit dcde23a4ba2ca1d5ffca2863af94d3aab11d2c89 +Author: Kathy Jang +Date: Tue Nov 27 22:12:29 2018 -0800 + + added teardown and setup to unittests + +commit fb8d6a2c5ce93cf4de7d504c61fe1d5e13932dcf +Author: eugenevinitsky +Date: Tue Nov 27 21:16:06 2018 -0800 + + moved redis incompatibility over + +commit d18e3717283b8d2ec23cb695f6d15cb3bf2f54b7 +Merge: b0e37aa3 21144b71 +Author: Kathy Jang +Date: Tue Nov 27 21:15:45 2018 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into benchmark_baseline_tests + +commit 21144b719d34315ee35560525f4f9a845f5f9ce2 +Author: Aboudy Kreidieh +Date: Tue Nov 27 21:10:25 2018 -0800 + + Coverage cleanup (#269) + + * added ignores to coverage + + * decreased the number of vehicles in bay bridge + + * fix to coverage + + * cleanup to tests + + * undo change + + * removed setup from coverage + + * removing rllab from coverage report + +commit 8e9455b18e69f0a3559715fd215612c42dee2f38 +Author: eugenevinitsky +Date: Tue Nov 27 20:58:35 2018 -0800 + + removed unneeded parser arg + +commit 1affcae1532fe11831bd4bacb75f251760840e1c +Author: eugenevinitsky +Date: Tue Nov 27 20:39:03 2018 -0800 + + made changes to pass tests and rename files + +commit 50d1af9f81383c7b4cb961434ff394aa64d3cbd3 +Author: eugenevinitsky +Date: Tue Nov 27 20:18:25 2018 -0800 + + pep8 + +commit 12271b5ca61b545aeefcaa71bd3f04728de01f06 +Author: eugenevinitsky +Date: Tue Nov 27 20:11:28 2018 -0800 + + saved as datetime file + +commit 43412ae9fd469540c24f8308b6adef65c7e728a3 +Author: eugenevinitsky +Date: Tue Nov 27 20:09:05 2018 -0800 + + added save movie option to visualizer rllib + +commit 569321bd91be2a78cc16084e282bb2ebff418997 +Author: AboudyKreidieh +Date: Tue Nov 27 02:37:46 2018 -0800 + + bug fix + +commit 1942999eecf5441a64b15359d8d0841aa75116bf +Author: AboudyKreidieh +Date: Tue Nov 27 02:30:44 2018 -0800 + + pep8 + +commit 0a93c3ccf150eecab84008ee15dbe6a1b9849346 +Author: AboudyKreidieh +Date: Tue Nov 27 02:26:50 2018 -0800 + + pep8 + +commit 42488371510675d5cd1253278f194b30f2a2e241 +Author: AboudyKreidieh +Date: Tue Nov 27 02:24:35 2018 -0800 + + bug fix + +commit 288334e7c4448ad15232d9765e991f5e691efc6d +Author: AboudyKreidieh +Date: Tue Nov 27 00:49:14 2018 -0800 + + added simulation kernel + +commit 22d7652e42654d1df83bedf1ceb0bc5238c3e939 +Merge: 7b88f4ab a0d44389 +Author: AboudyKreidieh +Date: Mon Nov 26 23:50:31 2018 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into base_env_cleanup + +commit 74343a2916336841f2f7ae10ae654234981f991f +Author: AboudyKreidieh +Date: Mon Nov 26 23:45:31 2018 -0800 + + pep8 + +commit a12e5e26e555e158c9e7d3e60452d1291abb99cc +Merge: 8cf89f23 5e02b831 +Author: AboudyKreidieh +Date: Mon Nov 26 23:43:51 2018 -0800 + + Merge branch 'vehicle_params' into vehicle_params_2 + +commit 5e02b831189e7179dc59b6c4395f854d3540760c +Merge: 3a93d375 a0d44389 +Author: AboudyKreidieh +Date: Mon Nov 26 23:41:54 2018 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into vehicle_params + +commit 86f390a109b43d7d1c1fc7a46a85ce37f69859ec +Author: AboudyKreidieh +Date: Mon Nov 26 23:36:41 2018 -0800 + + doc fix + +commit 835f8818c709e35e2e04e98427c549c128e06002 +Merge: 984fec16 a0d44389 +Author: AboudyKreidieh +Date: Mon Nov 26 23:35:35 2018 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into kernel_abstract + +commit a0d443896becb7455cff5cc568d1b1c4b873f483 +Merge: 1abebb02 07c94f4d +Author: Aboudy Kreidieh +Date: Mon Nov 26 13:51:35 2018 -0800 + + Merge pull request #280 from flow-project/multiagent_change + + Multiagent change + +commit 07c94f4dd34c2de427e432c8ca050fc57eec0ef3 +Author: eugenevinitsky +Date: Mon Nov 26 14:52:03 2018 -0500 + + backwards compatibility hack for ray pip install + +commit 58df521d0e92308b348bb9a8d2fda92873a62dc3 +Author: eugenevinitsky +Date: Mon Nov 26 14:50:40 2018 -0500 + + adds a multiagent flag + +commit 1abebb020916e18bdce91319d2cf17246b4f1ec2 +Author: eugenevinitsky +Date: Mon Nov 26 13:22:14 2018 -0500 + + Sumo web3d upgrade (#278) + + * added in sumo web 3d things + + * added use and instructions for sumo web3d + + * added documentation + + * pep8 + + * hack for old pkl files to pass tests + +commit fbafbad278ee99def80a8670b5085e14d051659a +Author: eugenevinitsky +Date: Mon Nov 26 11:26:41 2018 -0500 + + Multiagent pr 2 (#270) + + * some reversions in base env for sumo 0.31.0 + + * more reversions + + * bug fix + + * updated utils + + * added dill + + * minor + + * minor + + * minor fix in visualizer_rllib + + * revert vehicles change + + * bug fix + + * flake8 + + * added relevant files + + * minor + + * tests pass locally + + * removed extra files + + * added pep8 for exceptions + + * missed a merge conflict + + * tests are passing locally again + + * pep8 + + * pep8 + + * shaved 20 seconds off visualizer test + + * decreased num samples in test_examples + + * pep8 + + * pep8 for vehicles + + * added tutorial + + * vehicle class fix as per code review + +commit eb00d06585f4f8ebaea65415d79322d928792e8d +Merge: efdf050e 4269de14 +Author: Aboudy Kreidieh +Date: Sun Nov 25 14:02:04 2018 -0800 + + Merge pull request #276 from flow-project/eugenevinitsky-patch-1 + + Update visualizing.rst + +commit 4269de14164ced6f7ada69777656de8242bd9b08 +Author: eugenevinitsky +Date: Sun Nov 25 15:30:00 2018 -0500 + + Update visualizing.rst + + This file is out of date and is now updated. + +commit 26e8c9d1bfddeaf7c8875d4407b8be17cc31803e +Author: yunerzxy +Date: Fri Nov 23 21:21:10 2018 -0800 + + add param.py docs + +commit 19779e65c83fba2a7cae59f1e5684410096c35cc +Author: yunerzxy +Date: Fri Nov 23 21:18:02 2018 -0800 + + add new features to base_scenario + +commit efdf050e6d8667f612a8f6cb550fbb6b4496879d +Merge: af89d271 f82cdc17 +Author: Aboudy Kreidieh +Date: Fri Nov 23 18:41:51 2018 -0800 + + Merge pull request #261 from flow-project/pyglet_renderer + + Add Pyglet renderer. + +commit f82cdc173a1302ba42f5b3a7e39017d09ff22602 +Author: Fangyu Wu +Date: Fri Nov 23 18:08:58 2018 -0800 + + Improve styles. + +commit ae838ba44033e67d16be979febd3ace32111540c +Author: AboudyKreidieh +Date: Fri Nov 23 16:59:33 2018 -0800 + + pep8 + +commit c9443d34c6ef185339750692b40a97ee48c104e3 +Author: Fangyu Wu +Date: Fri Nov 23 16:16:17 2018 -0800 + + Fix a minor bug. + +commit d1aa668fe1ffe3347a4de30333416aca44a02581 +Author: Fangyu Wu +Date: Fri Nov 23 16:08:06 2018 -0800 + + Fix minor bugs. + +commit 49d6c04e3e358b2d04f0e4d42e07451403f30ee0 +Merge: 384f2924 42920285 +Author: Fangyu Wu +Date: Fri Nov 23 15:56:13 2018 -0800 + + Merge branch 'pyglet_renderer' of https://github.com/flow-project/flow into pyglet_renderer + +commit 384f29248b03f9ff1840c396afa3db464e7b8f7a +Author: Fangyu Wu +Date: Fri Nov 23 15:55:24 2018 -0800 + + Improve styles. + +commit 42920285a8048eba7b505e143ff0d3947cc3d336 +Author: AboudyKreidieh +Date: Fri Nov 23 15:44:07 2018 -0800 + + temporarily commenting bay bridge example + +commit 6884ff4dede4ad244c582f800d98d1fb618fd5a5 +Author: Fangyu Wu +Date: Fri Nov 23 15:33:01 2018 -0800 + + Refactor code and add documentation. + +commit af89d2711dd180debbfcf2692528827c038231e4 +Merge: 842b27d3 71a34594 +Author: Aboudy Kreidieh +Date: Fri Nov 23 15:25:00 2018 -0800 + + Merge pull request #273 from flow-project/minicity_fix2 + + fix and refine minicity + +commit 71a3459408a53a1e85103f342b984a0ef08592cd +Author: yunerzxy +Date: Fri Nov 23 15:04:14 2018 -0800 + + fix pep8 for minicity scenario + +commit b33c9185c79ed7b33d40580702b77f9c5dd18a1d +Author: yunerzxy +Date: Thu Nov 22 22:55:58 2018 -0800 + + fix and refine minicity + +commit 578f031d74c9fa22d591a367345ebc36497ef7b9 +Author: Fangyu Wu +Date: Thu Nov 22 22:02:36 2018 -0800 + + Handle Travis test exception. + +commit d5ac6aa7002cfa96061f4d93a616ac395f6c3d9f +Author: Fangyu Wu +Date: Thu Nov 22 21:43:40 2018 -0800 + + Fix pep8. + +commit 1df81d71bb5525231c2ee2ff1f19bb8cf2fe1fab +Author: Fangyu Wu +Date: Thu Nov 22 21:25:27 2018 -0800 + + Add unit tests for PygletRenderer and SumoParams. + +commit b88e1a0bab0d0bf8abf2b1598ef0d4c42590460d +Author: Fangyu Wu +Date: Wed Nov 21 16:10:05 2018 -0800 + + Package majority of pyglet render code into a method. + +commit d4efed9343235e1cdccb6a6b6f5691410e4daad2 +Merge: 89ab7dc0 842b27d3 +Author: Fangyu Wu +Date: Wed Nov 21 00:13:24 2018 -0800 + + Merge branch 'master' into pyglet_renderer + +commit 89ab7dc079c99dd062ed6b4657095d2d6da74c3f +Author: Fangyu Wu +Date: Wed Nov 21 00:03:34 2018 -0800 + + Attempt again. + +commit da9b8f5b64b2415e11515560066ef8fbfe1a2e91 +Author: Fangyu Wu +Date: Tue Nov 20 23:58:46 2018 -0800 + + Add imutils to requirements.txt. + +commit 2b50d65ec645544e6720b8a83fa8ebb20ef4bb6e +Author: Fangyu Wu +Date: Tue Nov 20 23:54:09 2018 -0800 + + Attempt again. + +commit 8a0ef87c665287c92eb073bedf9b1bda416f54f0 +Author: Fangyu Wu +Date: Tue Nov 20 23:48:36 2018 -0800 + + Attempt again. + +commit ab9df54d2c27c6398fa717dc95878b3cd90bd35d +Author: Fangyu Wu +Date: Tue Nov 20 23:43:22 2018 -0800 + + Another attempt to fix pyglet test errors. + +commit b38aeda7f1a93a98fccdf57f5357d9fa7d25381f +Author: Fangyu Wu +Date: Tue Nov 20 23:35:55 2018 -0800 + + Attempt to fix test failures caused by importing glClearColor. + +commit c58280c3fcfc29c061bc368ec4c964d5369d7ebe +Author: Fangyu Wu +Date: Tue Nov 20 23:00:00 2018 -0800 + + Fix more pep8 error. + +commit 0b13175247aec11a4afd5535c9a25bad63db6919 +Author: Fangyu Wu +Date: Tue Nov 20 22:51:33 2018 -0800 + + Fix pep8 error. + +commit 34ca21a6b7ad81e33fc08f5fa00f07f8cce94cee +Author: Fangyu Wu +Date: Tue Nov 20 22:15:54 2018 -0800 + + Add docstring and fix various misc. issues. + +commit 0b631352e218764c08d8553d8842f56f439dd61e +Merge: 65a0af98 842b27d3 +Author: AboudyKreidieh +Date: Tue Nov 20 00:34:47 2018 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into new_sumo + +commit 842b27d3c278c75ede61d9282fee13a4ad04a13c +Merge: 9e36963c 67c8cafd +Author: Aboudy Kreidieh +Date: Mon Nov 19 23:31:13 2018 -0800 + + Merge pull request #268 from flow-project/minicity_pr + + Minicity Scenario + +commit 67c8cafdb17082bfeb64b08879b3aafdd2a12e9f +Author: AboudyKreidieh +Date: Mon Nov 19 22:52:35 2018 -0800 + + added test + +commit a93676f8e2989a17afc60e4bc8834be6c7198460 +Author: AboudyKreidieh +Date: Mon Nov 19 22:42:00 2018 -0800 + + pep8 + +commit bb467c398d36c1696680fa2dd16c6bd422b79436 +Author: yunerzxy +Date: Mon Nov 19 21:16:39 2018 -0800 + + remove print + +commit c4bc793e78e050885ca0f27e59572208d3fc6a11 +Author: yunerzxy +Date: Mon Nov 19 20:35:56 2018 -0800 + + add minicity router and fix base_scenario + +commit 7930fb2a6e223c351c1930c8a0fb4b45e1f110cb +Author: yunerzxy +Date: Mon Nov 19 20:26:35 2018 -0800 + + add minicity scenario + +commit d97d8c899d1b733f08d26bb3c5e5cd3ef0dcf54c +Author: Kathy Jang +Date: Mon Nov 19 16:41:15 2018 -0800 + + Fixed build error + + Fixed build error. Noticed redundant line which I hadn't in previous commit + +commit 7bb18a20541b002ad811d1caa09935e8ea6f9c86 +Author: Kathy Jang +Date: Mon Nov 19 16:20:42 2018 -0800 + + Fixing pep8 error + + It says the variable vehicles which I created and passed into the scenario initializer is not being used. It clearly is? Whatever the case is, that should be fixe dhere + +commit 748723e1db9aedaead07728fbab4bbe0eb0b7990 +Author: Kathy Jang +Date: Mon Nov 19 15:39:32 2018 -0800 + + Deep copy vehicles variable in create_env, which will allow for clean resets + +commit 9e36963c6312813eb3b031a0ddc85f08b55ec45d +Author: eugenevinitsky +Date: Sun Nov 18 20:03:50 2018 -0800 + + Visualizer test (#231) + + * minor + + * working visualizer tests + + * flake8 fixes + + * flake8 and docstrings + + * added to travis for tests + + * removed rllab test until we get it on traci + + * removed rllab tests for now + + * fix + + * flake8 fix + + * flake8 fixes + + * added data for visualizer tests + + * swapped python version + + * minor + + * added tests for rllib examples + + * flake8 + + * fixed wheel name + + * attempted segfault fix + + * test of the problem + + * put it back + + * travis only has 2 cores + + * trying out the upstream branch of ray + + * updated to ray 0.5.3 + + * flake8 + + * fixed numpy version + + * added correct pkl files and queued trials + + * syntax fix + + * minor + + * added queue trials in right position + + * attempted reduction of cpu usage for rllib tests + + * minor + + * trying to give ray an address to work with + + * trying to fix the redis address issue + + * minor travis changes + + * updated data files + + * minor changes to travis + + * pep8 + + * maybe fix to rllib tests + + * updated location of README + + * decreased minibatch size + + * reintroduced redis + + * added ray inits and shutdowns to tests + + * ray init fix + + * pep8 + + * ray shutdown removed + + * maybe + + * added jupyter + + * trying to remove the redis address + + * attempt to resolve redis incompatibility + + * removed conda env for speed + + * minor + + * reset the changes + +commit b0e37aa3749171bb633449af7efd25afcd96a8f9 +Author: Kathy Jang +Date: Sun Nov 18 19:31:58 2018 -0800 + + More style oops + +commit 65a0af98882dedf71d0f4879c664b87e3723ee31 +Merge: ab39868a 65151a90 +Author: Kanaad Parvate +Date: Sun Nov 18 19:07:41 2018 -0800 + + Merge branch 'benchmark_regression_tests' into new_sumo + +commit 65151a902e00290b0512a14ef4f9f8dedf6827af +Author: Kanaad Parvate +Date: Sun Nov 18 19:07:28 2018 -0800 + + added special case for grid0, grid1, clean up runscript + +commit 58a72c3afee64b5c2a8bc540d7d0524395845566 +Merge: dfac778c 88f07214 +Author: Kathy Jang +Date: Sun Nov 18 18:56:21 2018 -0800 + + Merge branch 'benchmark_baseline_tests' of https://github.com/kjang96/flow-1 into benchmark_baseline_tests + +commit dfac778ce0466ae2b7680a2af7101e75e5d8b105 +Author: Kathy Jang +Date: Sun Nov 18 18:55:54 2018 -0800 + + Style errors fixed + +commit 88f072144beec5c84157c0f873f8cebc21b9db93 +Merge: dd5bc7c7 fce5fae1 +Author: Kathy Jang +Date: Sun Nov 18 18:00:11 2018 -0800 + + Merge branch 'master' into benchmark_baseline_tests + +commit 4f6c3593131debb44af7775ff500fa567a127aff +Merge: fce5fae1 ac1ff04f +Author: Aboudy Kreidieh +Date: Sun Nov 18 15:59:47 2018 -1000 + + Merge pull request #250 from flow-project/tests_envs_2 + + Tests envs 2 + +commit dd5bc7c7d6297e5b552d6c64236352614a6ae09b +Author: Kathy Jang +Date: Sun Nov 18 17:57:46 2018 -0800 + + Added tests for running all benchmarks and rename test_benchmarks.py to test_baselines.py, which is what it actually is + +commit ac1ff04f9da2efe9b054cf137b71b74bdca6b59d +Author: AboudyKreidieh +Date: Sun Nov 18 17:46:48 2018 -0800 + + PR fix + +commit 984fec16b428d1ca7dbbaed23140ae775be48db6 +Author: AboudyKreidieh +Date: Sun Nov 18 17:44:36 2018 -0800 + + added empty test + +commit 7b88f4ab37a7fadaec8c4badf940cc5e4467f934 +Merge: 8ad5e525 fce5fae1 +Author: AboudyKreidieh +Date: Sun Nov 18 17:13:39 2018 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into base_env_cleanup + +commit 8cf89f23cd0938706d7dc78e894f332543751190 +Merge: edfc42aa fce5fae1 +Author: AboudyKreidieh +Date: Sun Nov 18 17:13:01 2018 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into vehicle_params_2 + +commit a33fa05ef83c137fdd85a8c229a32a7a42139ca8 +Merge: b867ebc5 fce5fae1 +Author: AboudyKreidieh +Date: Sun Nov 18 16:51:35 2018 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into tests_envs_2 + +commit 688174b38cebe00d119ff904529f0d2f1cb9cdc0 +Author: Fangyu Wu +Date: Sun Nov 18 16:48:17 2018 -0800 + + Add Pyglet renderer. + +commit 8bd7ba536f9a576ca2f068bbca9422efc9d4e702 +Merge: c1620d53 fce5fae1 +Author: AboudyKreidieh +Date: Sun Nov 18 16:47:05 2018 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into tests_rewards + +commit fce5fae1ca02a265ef259312568b5bd724565156 +Author: eugenevinitsky +Date: Sun Nov 18 16:41:37 2018 -0800 + + Update README.md (#260) + +commit 3dac25356de2eeb129ec7437c3aa1efe334421fa +Author: eugenevinitsky +Date: Sun Nov 18 16:23:24 2018 -0800 + + Update README.md + +commit dcef2beb1ba78c001a6d13d36af5e6e0ee74ae16 +Author: Aboudy Kreidieh +Date: Sun Nov 18 13:47:13 2018 -1000 + + Tests envs (#235) + + * testing lane change env is working + + * empty tests for environments + + * fixed TestEnv and added tests + + * fixed 0 initial vehicles bug + + * added tests for keyerrors + + * pep8 + + * bug fixes + + * more tests to envs + + * pep8 + + * converted tests into utility methods + +commit ab39868af50d4575f3ae23a31f7e956ce0eb742c +Merge: e0f20d68 3c65b22a +Author: Kanaad Parvate +Date: Sun Nov 18 15:42:43 2018 -0800 + + Merge branch 'benchmark_regression_tests' into new_sumo + +commit e0f20d68410576a5f2f9dede327193aac21bb1a8 +Merge: 730e5bb1 257420b6 +Author: Kanaad Parvate +Date: Sun Nov 18 15:40:25 2018 -0800 + + merge master + +commit c1620d538d535000bd78b26e93d3bb2a255e9286 +Merge: df9ef238 82f443b0 +Author: AboudyKreidieh +Date: Sun Nov 18 15:35:44 2018 -0800 + + Merge branch 'tests_rewards' of https://github.com/flow-project/flow into tests_rewards + +commit df9ef238b6e657ff52f9c3b2a1f86e77a2ece877 +Merge: d5395887 257420b6 +Author: AboudyKreidieh +Date: Sun Nov 18 15:35:25 2018 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into tests_rewards + +commit f0913ec56e55babc56aee1b4cb8ed6a826eeca15 +Merge: b3893418 257420b6 +Author: AboudyKreidieh +Date: Sun Nov 18 15:34:44 2018 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into tests_examples_extended + +commit b867ebc5cdcf65046bcfc6a3ee81c898b0f7a972 +Author: AboudyKreidieh +Date: Sun Nov 18 15:33:48 2018 -0800 + + added util for checking shape + +commit 730e5bb148040c78e874e8793d9d8a7f3fa917cd +Author: Kanaad Parvate +Date: Sun Nov 18 15:31:59 2018 -0800 + + undid changes for merge + +commit 3c65b22a226808b50cb5ab9cc5ae84f4b390a5e1 +Author: Kanaad Parvate +Date: Sun Nov 18 15:10:40 2018 -0800 + + added run all benchmarks script + +commit a6830e13cfa61a07777ad310482a9d22a7555c1b +Author: Kanaad Parvate +Date: Sun Nov 18 15:10:05 2018 -0800 + + remove runscript from this branch + +commit 41335c5028a81c8e041ed49f9459a1a4ee4232e5 +Author: Kanaad Parvate +Date: Sun Nov 18 15:09:03 2018 -0800 + + added regression test autoscale script, and modified rllib runners to be more general + +commit e0bf2bc0448b6e8fe75d443a3489abb4e537a5c5 +Author: Kanaad Parvate +Date: Sun Nov 18 15:00:08 2018 -0800 + + progress on benchmarks script + +commit 672254864aa273481399e74267f11ede516e4ef7 +Merge: 30f6a146 d18d1387 +Author: AboudyKreidieh +Date: Sun Nov 18 14:07:52 2018 -0800 + + Merge branch 'tests_envs' of https://github.com/flow-project/flow into tests_envs_2 + +commit d18d13879fb31452457c2e4b4622fddbda5e968f +Merge: f313d980 257420b6 +Author: AboudyKreidieh +Date: Sun Nov 18 13:42:20 2018 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into tests_envs + +commit 8ad5e525491b9161dbec6e8ddebf53d5ae23f99a +Merge: 001a4908 257420b6 +Author: AboudyKreidieh +Date: Sun Nov 18 13:39:57 2018 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into base_env_cleanup + +commit edfc42aa1863aba12c0ac33bdaba89b05c626bf2 +Merge: bd1d4fd0 3a93d375 +Author: AboudyKreidieh +Date: Sun Nov 18 13:39:09 2018 -0800 + + Merge branch 'vehicle_params' of https://github.com/flow-project/flow into vehicle_params_2 + +commit 3a93d37548413c52f1a443ccc95dd75329110cb7 +Merge: d41d46d5 257420b6 +Author: AboudyKreidieh +Date: Sun Nov 18 13:38:03 2018 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into vehicle_params + +commit 9f60836bf678ede753f857254647a1ab31c56d17 +Merge: 2ace5e25 257420b6 +Author: AboudyKreidieh +Date: Sun Nov 18 13:24:22 2018 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into kernel_abstract + +commit 257420b6eec0bb18218967f737566e8c2f42e0ef +Merge: 3d2bc6d0 3ee7b34e +Author: Aboudy Kreidieh +Date: Sun Nov 18 11:09:53 2018 -1000 + + Merge pull request #245 from flow-project/tests_base_env + + Tests base env + - removed a hack from base_env + - added tests to the abstraction in base_env + - added tests to the coloring aspect of base_env + +commit 3d2bc6d0b497e898b9748601e06c816371f37bb5 +Merge: 8a47af3b 181b08cc +Author: Aboudy Kreidieh +Date: Sun Nov 18 11:09:24 2018 -1000 + + Merge pull request #247 from flow-project/tests_experiments + + test xml->csv conversion + +commit 8a47af3b505dc41205a29b703490c991d3c14e76 +Merge: 15de37a4 715da1f8 +Author: Aboudy Kreidieh +Date: Sun Nov 18 11:07:21 2018 -1000 + + Merge pull request #249 from flow-project/tests_benchmarks_2 + + added benchmark flow_params to the baseline simulations + + By moving the `flow_params` dict to the simulations, we are added some coverage and certainty that these dictionaries are not broken (i.e. leading to failing simulations). This still needs to be complemented by tests regression tests, and ideally tests to ensure the baselines are receiving expected returns (although this is a bit difficult given the stochastic nature of some of the simulations). + +commit 715da1f87d138b86794166b910c492e43488cb10 +Author: AboudyKreidieh +Date: Sun Nov 18 12:45:28 2018 -0800 + + PR fixes + +commit bb2677bf9f88b82b1379985c5b64da28d7cdca92 +Merge: 23be95c2 17ad1b45 +Author: AboudyKreidieh +Date: Sun Nov 18 12:40:11 2018 -0800 + + Merge branch 'tests_benchmarks_2' of https://github.com/flow-project/flow into HEAD + +commit 23be95c2d3bc5b284c22a4af64825b261ed0bfdf +Author: AboudyKreidieh +Date: Sun Nov 18 12:35:31 2018 -0800 + + replaced double with single quotes + +commit 3ee7b34e9dd269095c7ff63b1465009a4d79e988 +Author: AboudyKreidieh +Date: Sun Nov 18 12:04:06 2018 -0800 + + PR fixes + +commit f313d980848a4a1d0f5206143424dca2984abd9f +Author: AboudyKreidieh +Date: Sun Nov 18 12:01:33 2018 -0800 + + converted tests into utility methods + +commit 82f443b0502138cf2441f0b5b4f5b3377911041c +Author: Kathy Jang +Date: Sun Nov 18 11:17:36 2018 -0800 + + Got rid of some useless comments + +commit 17ad1b457c5c96eb1df1843263aa4e82940a168d +Merge: 798becc2 b7dfa300 +Author: eugenevinitsky +Date: Sun Nov 18 11:09:51 2018 -0800 + + Merge branch 'tests_benchmarks_2' of https://github.com/flow-project/flow into tests_benchmarks_2 + +commit 798becc2d4b3a4a5a372d988b24e97b7eee302ca +Author: eugenevinitsky +Date: Sun Nov 18 11:09:38 2018 -0800 + + pep8 + +commit 181b08ccbd13ac13fded626f23faff1292e56c4b +Author: AboudyKreidieh +Date: Sun Nov 18 11:02:36 2018 -0800 + + typo + +commit d04a3e9ed3b81beecb39e84a042cf7a290e40b32 +Author: AboudyKreidieh +Date: Sun Nov 18 11:01:05 2018 -0800 + + removed magic numbers + +commit b7dfa300bcbb4505bad521c14424d46177f96f8f +Author: eugenevinitsky +Date: Sun Nov 18 10:59:41 2018 -0800 + + Update bottleneck1.py + +commit 0b20d4c918aabcf60e7b4d8d30ead162253a2cf5 +Author: eugenevinitsky +Date: Sun Nov 18 10:59:12 2018 -0800 + + Update bottleneck0.py + +commit 15de37a4bdbc0ac6ccd7fef6f92741a550f2a4ae +Author: Aboudy Kreidieh +Date: Sun Nov 18 08:31:20 2018 -1000 + + extended unit test coverage of utils (#246) + +commit 001a490826fbec8c12d16c49bf63cf83d275c805 +Author: AboudyKreidieh +Date: Sat Nov 17 21:08:20 2018 -0800 + + removed some traci calls + +commit 2ace5e25a9e05811bdbbf05c7c56309cc28bf974 +Author: AboudyKreidieh +Date: Sat Nov 17 20:21:50 2018 -0800 + + added abstractions to the kernel + +commit ef7d14647b3499522c28d4d2610f0296992c78db +Author: Kanaad Parvate +Date: Sat Nov 17 19:20:59 2018 -0800 + + run all benchmark script with correct num itr + +commit af155c2ec696a76748496a4daee95e7acb7a08c3 +Author: Kanaad Parvate +Date: Sat Nov 17 19:08:51 2018 -0800 + + pls im still stupid + +commit 441eb98b25fb9db49d5bca1159c62731f6c9a4e0 +Author: Kanaad Parvate +Date: Sat Nov 17 18:55:57 2018 -0800 + + i'm stupid + +commit b220e9483f434f9d3d4d17f65dca51cbe77bb8be +Author: Kanaad Parvate +Date: Sat Nov 17 18:22:13 2018 -0800 + + run all benchmarks script + +commit bd1d4fd02566beae42ce84fcedfd85f76cbdce90 +Author: AboudyKreidieh +Date: Sat Nov 17 02:06:35 2018 -0800 + + merge issue + +commit f38411ba1406427d557660492f9114fe2f9cbf8f +Merge: 96ae5d64 d41d46d5 +Author: AboudyKreidieh +Date: Sat Nov 17 02:03:25 2018 -0800 + + Merge branch 'vehicle_params' into vehicle_params_2 + +commit d41d46d5ad8c70d24d726c8cdde484e98569f797 +Merge: a8a35e76 e122bd12 +Author: AboudyKreidieh +Date: Sat Nov 17 01:56:38 2018 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into vehicle_params + +commit 0036c891abc2076a9e747a5d670e5f2938fd44f4 +Author: AboudyKreidieh +Date: Sat Nov 17 01:48:51 2018 -0800 + + slight cleanup + +commit d5395887b63763d1ef55ad88c10ddf238e14643e +Author: AboudyKreidieh +Date: Sat Nov 17 01:33:45 2018 -0800 + + test for boolean action reward + +commit 5c262cf503e25e0692f782c8ad877a20569ee963 +Author: AboudyKreidieh +Date: Sat Nov 17 01:33:29 2018 -0800 + + removed redundant reward function + +commit 6eb59c1eed63ceb8d2bba3579b6247e252dfd02b +Author: AboudyKreidieh +Date: Sat Nov 17 01:23:32 2018 -0800 + + added tests for rl headway reward + +commit c6ff30527cc949b85bd0143e37369fcb2ea5ef3c +Author: AboudyKreidieh +Date: Sat Nov 17 01:11:11 2018 -0800 + + removed prints from rl headway reward + +commit 2f5baa718fca90f2a09284284c75125b4eba51be +Author: AboudyKreidieh +Date: Sat Nov 17 01:08:50 2018 -0800 + + added option to choose with flow_params to simulate in merge and figure eight + +commit b3893418a75c750c44de80bce00d5b14d31fe772 +Author: AboudyKreidieh +Date: Fri Nov 16 17:33:08 2018 -0800 + + undid some changes + +commit 95e0b81af8e067bc0fc855e3662adfa62cd35685 +Author: AboudyKreidieh +Date: Fri Nov 16 17:11:15 2018 -0800 + + pep8 + +commit 4ed4423572d8b7dbe3e27f3fc2ff9b030381f3d8 +Author: AboudyKreidieh +Date: Fri Nov 16 17:06:19 2018 -0800 + + extended coverage of bay_bridge example + +commit 30f6a146a5244ff268ad76661bcb6af9a71b79e0 +Author: AboudyKreidieh +Date: Fri Nov 16 16:20:43 2018 -0800 + + pep8 + +commit b1b953b99ec03046a3cbd0c78a789791bf7988db +Author: AboudyKreidieh +Date: Fri Nov 16 16:16:09 2018 -0800 + + tests to TwoLoopsMergeEnv + +commit f13ce93aa61999e0fa7d99c0467982cdee6cc70d +Author: AboudyKreidieh +Date: Fri Nov 16 15:10:42 2018 -0800 + + added evaluate to the baselines + +commit a803aada09c89c4297870321d61e5d6d4f38e701 +Author: AboudyKreidieh +Date: Fri Nov 16 14:37:41 2018 -0800 + + bug fix + +commit 9ddb3d31c8d265fc1904514fdf4152f93fb374dc +Author: AboudyKreidieh +Date: Fri Nov 16 14:27:45 2018 -0800 + + bug fixes + +commit 57620dad729d59f27ee7745fa3a48491045f7c0c +Author: AboudyKreidieh +Date: Fri Nov 16 13:39:30 2018 -0800 + + added benchmark flow_params to the baseline simulations + +commit 7a474d5d5ffade9cd069b6154a6550999469d036 +Author: AboudyKreidieh +Date: Fri Nov 16 11:29:08 2018 -0800 + + more tests to reward functions + +commit 8c118902b507c9bf0a906dad26b206ea4ba56a37 +Author: AboudyKreidieh +Date: Fri Nov 16 10:55:52 2018 -0800 + + more tests to reward functions + +commit e385572f6e6da5fcc405e17ab88300e9e14d8d35 +Author: AboudyKreidieh +Date: Fri Nov 16 01:54:04 2018 -0800 + + test to xml->csv conversion + +commit 52f3bddad8e435cf5e96ee865f7e11894494dc5b +Author: AboudyKreidieh +Date: Fri Nov 16 01:12:29 2018 -0800 + + pep8 + +commit 9b8a098c59a37ec4396e7592442af4bc4d025c09 +Author: AboudyKreidieh +Date: Fri Nov 16 01:06:39 2018 -0800 + + more tests for base_env + +commit 2f0abfbc3974bf212aafddda66cc7944f943defd +Author: AboudyKreidieh +Date: Fri Nov 16 01:06:22 2018 -0800 + + slight cleanup to base_env + +commit a2f4c8f117495115894bfeb241a69dad1ed2f439 +Author: AboudyKreidieh +Date: Thu Nov 15 23:48:32 2018 -0800 + + more tests + +commit 90f2d83416f38c91ec15ac514d9069226c47c90e +Merge: 14be28b7 e122bd12 +Author: AboudyKreidieh +Date: Thu Nov 15 23:38:39 2018 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into tests_envs_2 + +commit 83daec4881ea9666ad79d82776e944ccfee82ad9 +Author: Kanaad Parvate +Date: Thu Nov 15 17:42:21 2018 -0800 + + benchmark testing + +commit e122bd12464fd87ca1eeb4c6ddc94b57b620a5f9 +Merge: 653bc670 7d404030 +Author: Aboudy Kreidieh +Date: Thu Nov 15 12:55:26 2018 -1000 + + Merge pull request #238 from flow-project/eugenevinitsky-patch-1 + + Update README.md + +commit 14be28b7100ffebe2edd7dccfb94fc6d5eecc9b2 +Author: AboudyKreidieh +Date: Thu Nov 15 14:54:16 2018 -0800 + + pep8 + +commit 34447a418b6c9e88097d42877142961b0f68912b +Author: AboudyKreidieh +Date: Thu Nov 15 14:49:22 2018 -0800 + + more tests to envs + +commit 7d404030f1465baefd7e88b9f803f03395f36ccd +Author: eugenevinitsky +Date: Thu Nov 15 14:04:53 2018 -0800 + + Update README.md + +commit c64a030629f54dc3538ab856b12e5089bb4baa4f +Merge: c75766d8 653bc670 +Author: AboudyKreidieh +Date: Thu Nov 15 13:42:20 2018 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into tests_envs + +commit 653bc6709f580804e7e07922bf56b644030c45c3 +Author: Aboudy Kreidieh +Date: Thu Nov 15 11:37:25 2018 -1000 + + fixed coverage badge (#234) + +commit 291679c3e10782509251401808637432103ec711 +Author: eugenevinitsky +Date: Tue Nov 13 16:48:23 2018 -0800 + + Update README.md + + Updated author list on readme + +commit 04448fabf61a11b3731f12bdef5f3fecf088948a +Merge: c22f2d0f db753400 +Author: Kanaad Parvate +Date: Sun Nov 11 12:42:12 2018 -1000 + + merged master + +commit db753400f11d69580c881642a093b929e45ef55c +Merge: 0b625475 25145eee +Author: Aboudy Kreidieh +Date: Sun Nov 11 07:56:08 2018 -1000 + + Merge pull request #228 from flow-project/tests_rewards + + tests for some rewards + +commit 25145eee25435b87aadebb66617f2ce2718504c4 +Author: AboudyKreidieh +Date: Sat Nov 10 20:44:22 2018 -0800 + + typo + +commit 1891f07dbd335f4770bd748bc250f2ef78cbdb1c +Merge: df2de338 0b625475 +Author: AboudyKreidieh +Date: Sat Nov 10 20:43:48 2018 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into tests_rewards + +commit c75766d839faecf105afe58131b9880ebcc3cf1b +Merge: ef779260 0b625475 +Author: AboudyKreidieh +Date: Sat Nov 10 20:38:50 2018 -0800 + + Merge branch 'master' of https://github.com/flow-project/flow into tests_envs + +commit 0b6254755a40e84f853ee4132b63b9d5ca3cd823 +Author: Aboudy Kreidieh +Date: Sat Nov 10 18:29:17 2018 -1000 + + removed unused and broken component of lc controller (#227) + +commit cc340b0651753a5a14a6fd2735e7da53318e3d6f +Author: Aboudy Kreidieh +Date: Sat Nov 10 18:26:48 2018 -1000 + + removed unused utility methods (#229) + +commit ef7792602fe43934028dbe53d319bf8ff79b42a3 +Author: AboudyKreidieh +Date: Sat Nov 10 16:56:22 2018 -0800 + + pep8 + +commit 64a15a54a8552087879f0919f9a3a2bd5208e79d +Author: AboudyKreidieh +Date: Sat Nov 10 16:35:21 2018 -0800 + + more tests to envs + +commit c6434a525d3ad6b6e3c0b12785294bd480252d60 +Author: AboudyKreidieh +Date: Sat Nov 10 16:35:10 2018 -0800 + + bug fixes + +commit dd74441c9fe4ed76394606c4caab67eed25bc47f +Merge: 5449dd3c 48d1d14c +Author: Kevin Chien +Date: Fri Nov 9 16:49:36 2018 -0800 + + Merge pull request #214 from flow-project/benchmark-desc + + added flow benchmark descriptions for flow-garden + +commit 48d1d14cc1c7a256518b301441d1c5051269f839 +Author: Kevin Chien +Date: Fri Nov 9 15:44:26 2018 -0800 + + temp explanation link for benchmarks + +commit c8edbfe2cf83bc54b0ea2f7518d4f7d72773eccf +Author: AboudyKreidieh +Date: Wed Nov 7 23:39:44 2018 -0800 + + pep8 + +commit 37ea3991ba40dfacc7f643d0581b0b8bf659c230 +Author: AboudyKreidieh +Date: Wed Nov 7 23:17:32 2018 -0800 + + added tests for keyerrors + +commit f387c9b74b91edc4a8c628cdf89a29c2211583e1 +Author: AboudyKreidieh +Date: Wed Nov 7 23:00:30 2018 -0800 + + fixed 0 initial vehicles bug + +commit 00de7306f7f549c6e8ee3cc085b24317f0094254 +Author: AboudyKreidieh +Date: Wed Nov 7 22:14:17 2018 -0800 + + fixed TestEnv and added tests + +commit 0eada0713c76f7b536a04f145f7b9ba49e3f1f81 +Author: AboudyKreidieh +Date: Wed Nov 7 21:44:47 2018 -0800 + + empty tests for environments + +commit 897f712dedc72d5bd6b4c976f59146dbcca339fb +Author: AboudyKreidieh +Date: Wed Nov 7 15:24:28 2018 -0800 + + testing lane change env is working + +commit 5449dd3cdbe15295cc45262583360ac88b92d8a9 +Author: eugenevinitsky +Date: Sun Nov 4 18:10:30 2018 -1000 + + Rllib fi (#226) + + * removed old rllib config param + + * minor + +commit d25f31006ae8bd5b5be58c853bff1f3d6b4be146 +Author: eugenevinitsky +Date: Sun Nov 4 08:16:56 2018 -1000 + + point travis at correct ray repo (#225) + +commit df2de33821bc8899888d3d3c77aa9b17771cf81a +Author: AboudyKreidieh +Date: Sat Nov 3 06:02:35 2018 -0700 + + tests for some rewards + +commit 985e51cdb3192fbdbe1c08af8fef0ee851ce95e3 +Merge: 56ec6b36 ca8de620 +Author: Aboudy Kreidieh +Date: Fri Nov 2 22:58:36 2018 -0700 + + Merge pull request #202 from flow-project/coverage + + Coverage + +commit ca8de620e4d5c12422ad24e8bdee803a2a2aef0a +Merge: 125c7fba 56ec6b36 +Author: AboudyKreidieh +Date: Fri Nov 2 22:46:33 2018 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow into coverage + +commit 56ec6b36f7e04c595b6a2a82be07bb20ff2fb55d +Merge: 9312d89f e7f38289 +Author: Aboudy Kreidieh +Date: Fri Nov 2 22:43:17 2018 -0700 + + Merge pull request #224 from flow-project/moved_ray + + pointed at the flow-project version of ray + +commit 9312d89ffc8249e52ab8f27c256ccac584a9ff66 +Merge: c64af60c cbe820fc +Author: Aboudy Kreidieh +Date: Fri Nov 2 22:40:58 2018 -0700 + + Merge pull request #223 from flow-project/experiment_checkup + + Experiment checkup + +commit ee320ba67bae3777c0f1c438356edf6b6b79bc9a +Author: Umang Sharaf +Date: Fri Nov 2 19:54:27 2018 -0700 + + Thanks Aboudy + +commit e7f38289f7d91cad50fdfeb385e8fd0c1cca2c2e +Author: eugenevinitsky +Date: Fri Nov 2 19:25:26 2018 -0700 + + pointed at the flow-project version of ray + +commit cbe820fc39cdffe9a17854f4bc66409396b066a0 +Author: eugenevinitsky +Date: Fri Nov 2 19:09:27 2018 -0700 + + flake8 + +commit d593a1bc8a8ede5b2a04fbd374bcfd0cf4c01d43 +Author: eugenevinitsky +Date: Fri Nov 2 18:59:47 2018 -0700 + + flake8 fixes + +commit f713982b7850fe64e6f8e1a0a91813733d857936 +Author: eugenevinitsky +Date: Fri Nov 2 18:36:15 2018 -0700 + + Update stabilizing_highway.py + + rllib experiments should not render + +commit 60a8ffaec65d0de081867e533fe35497d67f642b +Merge: d84725f3 c64af60c +Author: eugenevinitsky +Date: Sat Nov 3 01:57:50 2018 +0100 + + Merge branch 'master' into experiment_checkup + +commit c64af60c15b7afe68be54125209d1498ca273bfa +Author: Aboudy Kreidieh +Date: Fri Nov 2 17:56:53 2018 -0700 + + Gen scenario merge (#212) + + * removed 'state' from compute_reward + + * pep8 + + * moved generator components to scenario + + * removed all mentions of generators + + * removed generators from the tutorials + + * minor + +commit d84725f37177ddc569acacad1e2d0a80a36254dd +Author: eugenevinitsky +Date: Fri Nov 2 17:47:03 2018 -0700 + + Update velocity_bottleneck.py + +commit 3cae3c0181a2f7123f23ea924255f572bdb042f7 +Author: eugenevinitsky +Date: Fri Nov 2 17:46:23 2018 -0700 + + Update stabilizing_the_ring.py + +commit cfddae663fa79b6a394efc03d13df01aeea463ad +Merge: 20aa72e5 26c7d860 +Author: Umang Sharaf +Date: Fri Nov 2 17:42:17 2018 -0700 + + Merge branch 'gen_scenario_merge' into MENG-LustBranch + +commit 727725eaa07c2eb76d87910ab8dc226c63d0f19f +Merge: f4273c33 be5f2e89 +Author: Kevin Chien +Date: Fri Nov 2 17:40:38 2018 -0700 + + Merge branch 'master' into benchmark-desc + +commit 26c7d8607b2dbe6544a17b4fdd401e3d7fbab9d2 +Merge: a521015e be5f2e89 +Author: Umang Sharaf +Date: Fri Nov 2 17:36:58 2018 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow into gen_scenario_merge + +commit 20aa72e564c53006d1568670fc333ad7e5363c36 +Author: Lucfisc +Date: Fri Nov 2 17:21:50 2018 -0700 + + Aboudy helped + +commit 4f75d5ee45ca0b1292fb0d32fe8a0281c87c13f8 +Author: Kathy Jang +Date: Fri Nov 2 14:42:04 2018 -0700 + + All examples are in working condition, added bay_bridge and bay_bridge_toll to test_examples.py + +commit be5f2e89e4fee9769eb819224d0fbe2e18ca1585 +Merge: 8a621f5c 15bf1091 +Author: Aboudy Kreidieh +Date: Fri Nov 2 13:01:56 2018 -0700 + + Merge pull request #220 from flow-project/issue-templates + + Update issue templates + +commit 125c7fbaaa1cf9feb750e495d645c1e75ff383c2 +Merge: ccccd992 508baf25 +Author: AboudyKreidieh +Date: Fri Nov 2 12:59:48 2018 -0700 + + Merge branch 'coverage' of https://github.com/flow-project/flow into coverage + +commit ccccd9924e4af733e15678eb8d95387e41b162c0 +Merge: 2627a61c 8a621f5c +Author: AboudyKreidieh +Date: Fri Nov 2 12:58:53 2018 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow into coverage + +commit 508baf2598082e4b9d4cadcf235c808dbb360b45 +Merge: 2627a61c 8a621f5c +Author: eugenevinitsky +Date: Thu Nov 1 06:21:21 2018 +0100 + + Merge branch 'master' into coverage + +commit 8a621f5c64f2d524a6c650b15b612d9baf88e71c +Merge: 834d7d31 3bcc6313 +Author: Aboudy Kreidieh +Date: Wed Oct 31 12:13:21 2018 -0700 + + Merge pull request #215 from flow-project/eugenevinitsky-patch-1 + + Update README.md + +commit 834d7d31deaadca4c7909b6ec0300a7fba012f9d +Merge: b262f2c6 110f572a +Author: Aboudy Kreidieh +Date: Wed Oct 31 11:09:52 2018 -0700 + + Merge pull request #208 from flow-project/remove_state_comp_reward + + removed 'state' from compute_reward + +commit b262f2c6b52711b735e8061211d9f77104dfdcd2 +Merge: b73cde22 3a11e253 +Author: Aboudy Kreidieh +Date: Wed Oct 31 11:08:15 2018 -0700 + + Merge pull request #221 from flow-project/config_fix + + Config fix + +commit b73cde22d29d9a301f057d187ce980d8abc111bb +Merge: fab07b97 7ccf49c2 +Author: Aboudy Kreidieh +Date: Wed Oct 31 10:42:53 2018 -0700 + + Merge pull request #219 from flow-project/tutorial_06_fix + + Fixes get_rl_ids in tutorial06 + +commit 3a11e25375d0bc76d887f3d8259a336ba56d80e0 +Author: eugenevinitsky +Date: Wed Oct 31 14:27:54 2018 +0100 + + pointed to correct config defualt + +commit 57ed749bfe7b0cc6f4d7b2b4cc01e4573358a17a +Author: eugenevinitsky +Date: Wed Oct 31 14:25:04 2018 +0100 + + removed extra config file, made script pull from correct config + +commit 15bf10918894ea60e7e41063d9a18deab139fece +Author: eugenevinitsky +Date: Wed Oct 31 14:20:31 2018 +0100 + + Update and rename bug_report.md to issues.md + +commit 85c2eeda935a6dfaa1ad55c63adab2bc1716f69d +Author: eugenevinitsky +Date: Wed Oct 31 14:16:03 2018 +0100 + + Update issue templates + + I've created a template for issue submission. Thoughts? + +commit 7ccf49c2b86ec35e855e40331073ca2567734f23 +Author: eugenevinitsky +Date: Wed Oct 31 14:11:37 2018 +0100 + + fix comment + +commit 219092707ba2c9e5cc72b75be4ff7403fab97ea6 +Author: eugenevinitsky +Date: Wed Oct 31 14:09:29 2018 +0100 + + fix for bug marsalis noticed + +commit 3bcc6313afdd8953f9af38d7cac01af9921d9d1c +Author: eugenevinitsky +Date: Mon Oct 29 22:38:49 2018 +0100 + + Update README.md + + Remove google groups from the ReadME + +commit f4273c33614b16ef09c59f8cb95a236c772370b3 +Author: Kevin Chien +Date: Fri Oct 26 17:40:21 2018 -0700 + + added flow benchmark descriptions for flow-garden + +commit fab07b976412d0de94c192e9b754a30b76c7086b +Merge: 4ef3f962 59511557 +Author: Aboudy Kreidieh +Date: Wed Oct 24 17:00:04 2018 -0700 + + Merge pull request #211 from kjang96/issue_44 + + Changed the default value of detector gap to resolve the warning + +commit 5951155772e58cfe583d2f9443f79e25a69dcd23 +Author: Kathy Jang +Date: Wed Oct 24 14:39:37 2018 -0700 + + Changed the default value of detector gap to resolve the warning + +commit 4ef3f96253a05b3b56b2a1f04aefdc97c1a1df18 +Merge: 0e79abef 16636841 +Author: Mahesh Murag +Date: Wed Oct 24 14:32:07 2018 -0700 + + Merge pull request #204 from flow-project/checksum-bug + + Added print before SUMO Termination + +commit 1663684108bf8f58732db5c185436b8fe1155b18 +Author: maheshmurag +Date: Tue Oct 23 21:28:35 2018 -0700 + + Updated + + testing + + testing + + testing + + testing + + testing + + testing + + testing + + testing + + temp + +commit 14d781aa3363200402dd7fe905b4187edb2fb88e +Author: maheshmurag +Date: Mon Oct 22 16:50:08 2018 -0700 + + added print before termination + +commit 0e79abef03013cb02ce533444e245f4693840a2b +Author: Mahesh Murag +Date: Wed Oct 24 14:19:26 2018 -0700 + + Added caching and ensured flake8 runs on Python3 (#210) + +commit a521015e8f5a107dbcc2392e57ee9650339b2df8 +Author: AboudyKreidieh +Date: Wed Oct 24 14:19:04 2018 -0700 + + minor + +commit 63a186644fe383d9bbc7c8bd4044be0c03608b50 +Author: AboudyKreidieh +Date: Wed Oct 24 14:18:37 2018 -0700 + + removed generators from the tutorials + +commit 16a92308ab3f6b167d8f367e6a62843d4da51b91 +Author: AboudyKreidieh +Date: Wed Oct 24 13:21:35 2018 -0700 + + removed all mentions of generators + +commit 4c3478e32f0c83d314310bf673d70c0dbff1a5d7 +Author: AboudyKreidieh +Date: Wed Oct 24 13:17:04 2018 -0700 + + moved generator components to scenario + +commit 110f572af874f12700674761ce1b2b07c24985a9 +Author: AboudyKreidieh +Date: Tue Oct 23 23:48:02 2018 -0700 + + pep8 + +commit a9cf902ca6f0d5d157fea7e57938a6c89923faaa +Author: AboudyKreidieh +Date: Tue Oct 23 23:38:31 2018 -0700 + + removed 'state' from compute_reward + +commit 94e72e3242282a697f291a8e9398bc443b3f4b34 +Merge: bc44b212 ed03b96b +Author: Aboudy Kreidieh +Date: Tue Oct 23 23:16:44 2018 -0700 + + Merge pull request #188 from flow-project/save_rllib_alg_replay + + Save rllib algorithm and accessing param in visualizer_rllib + +commit 2627a61c24897ed63109bfee490a67bc5face5f2 +Author: AboudyKreidieh +Date: Sat Oct 20 00:18:33 2018 -0700 + + added coverage badge + +commit 1da8bfcca07954a73dcff29ad24270368c07d7be +Author: Lucfisc +Date: Fri Oct 19 19:41:33 2018 -0700 + + Netfile working for Luxembourg on my computer + +commit a12cb558e713e51e01767ba9a197f5477236da3a +Author: Lucfisc +Date: Fri Oct 19 18:52:53 2018 -0700 + + 'fixex Crystal import routes from net + +commit 299f551ac59b538f57790e242aca3f3896052525 +Author: Crystal Yan +Date: Fri Oct 19 18:26:15 2018 -0700 + + Adding Crystal's route extractor to scenario loading + +commit d095c82f2c80e6afcff725d3abce41ce95e80a11 +Author: Umang Sharaf +Date: Fri Oct 19 17:33:48 2018 -0700 + + Aboudy's changes + +commit 2eb5f457279fbb2505c684a57d74c9c37a0be0dd +Author: Lucfisc +Date: Fri Oct 19 17:02:01 2018 -0700 + + fixed a self._import_routes_from_net + +commit 9d0c589d80ef634ee6ae6e31b6f9914c136f675b +Author: Lucfisc +Date: Fri Oct 19 16:57:23 2018 -0700 + + changed some named in the list + +commit 79ac6a3b5690fb297efa0dea7fd60a1fb1b80065 +Author: AboudyKreidieh +Date: Fri Oct 19 02:23:14 2018 -0700 + + maybe? + +commit 66c3cccc66ac3154ba611fea093e0924a1733b05 +Author: AboudyKreidieh +Date: Fri Oct 19 01:25:48 2018 -0700 + + coverage report + +commit 65579898a72c3ab13fa8c22bf7c51b87374846ab +Author: AboudyKreidieh +Date: Fri Oct 19 01:12:10 2018 -0700 + + mod + +commit 1a30516b811521eb7042393ceb12a043be04febb +Author: AboudyKreidieh +Date: Fri Oct 19 01:03:59 2018 -0700 + + mod + +commit 69e823cb2fb5c116661cc05c0d204aa85364066c +Author: AboudyKreidieh +Date: Fri Oct 19 01:03:01 2018 -0700 + + coverage + +commit 6ef49db8962ff0c26847d0109ddf93cd050c7640 +Author: Lucfisc +Date: Thu Oct 18 18:15:20 2018 -0700 + + Typo fixed + +commit 35759cff6f41a00808a34d6d1f1adbd4397e6fa4 +Author: Lucfisc +Date: Thu Oct 18 17:30:32 2018 -0700 + + added vehicle information + +commit 448b2052a1a65ca3dadd5d5cd90ff22d1bbef0f5 +Author: Lucfisc +Date: Thu Oct 18 17:07:01 2018 -0700 + + deleted an import cmd not necessary + +commit 5b748dc84200576df5ad63f243b5f2c091e858f0 +Author: Lucfisc +Date: Thu Oct 18 17:04:51 2018 -0700 + + vehicle type added from vtypes.add.xml + +commit 4b4a1595b48b38ddbf0b2ef828a0a99cbb3df519 +Author: Lucfisc +Date: Thu Oct 18 15:26:13 2018 -0700 + + bug fixes + +commit d071ef29dd731ce6eafffc38c308d4de8dd14ebd +Author: Lucfisc +Date: Thu Oct 18 15:18:24 2018 -0700 + + typo indent fixes + +commit 9b7c1dd00f195901d59d22a827056e07a304cf18 +Author: Lucfisc +Date: Thu Oct 18 15:11:28 2018 -0700 + + typo fixes + +commit 79a81155dcacbae0852bb95cdc35615caaff11ae +Author: Lucfisc +Date: Wed Oct 17 22:51:34 2018 -0700 + + minor changes, load Traffic Light from Flow repo + +commit 010ed9d327e26616c655af93433c81dc8896daee +Author: Lucfisc +Date: Wed Oct 17 22:01:14 2018 -0700 + + merged with Umang TrafficLight + +commit ed03b96b0a3925359112c79a1a6726d746d6b806 +Author: Kevin Chien +Date: Tue Oct 16 17:35:10 2018 -0700 + + fixes flake8 whitespace + +commit cd3f1cefa6e9032ad103ff8eb15fc7141c6d4d6d +Author: Kevin Chien +Date: Mon Oct 15 18:02:41 2018 -0700 + + Updated examples, other files with save alg name usage for rllib + +commit e602f8dcf5ff1c6ab421a82152731eb4513677ad +Author: Lucfisc +Date: Fri Oct 12 17:59:10 2018 -0700 + + netfile update routes + +commit 67cb99303c45ecc070a9f87f04662858879febc8 +Author: Kanaad Parvate +Date: Fri Oct 12 13:29:05 2018 -0700 + + cloudpickle 0.5.3 doesn't work + +commit 96ae5d644d2a04f60292855d55d6a92840cf1cd8 +Author: AboudyKreidieh +Date: Sat Oct 6 20:37:22 2018 -0700 + + moved initial_speeds to the make_routes + +commit a8a35e760dbe2540f0f51ce719f12cda6f5108bb +Author: AboudyKreidieh +Date: Sat Oct 6 20:03:25 2018 -0700 + + bug fix + +commit 389325cbcdb50468532b10ffa2a5fa88aaf3d862 +Author: AboudyKreidieh +Date: Sat Oct 6 19:56:33 2018 -0700 + + moved speed_mode and lc_mode to the sumo-specific parameters + +commit 2d310b83b1cd5a733bc8db13013f6b171ebbfa10 +Author: Lucas Fischer +Date: Fri Oct 5 18:22:00 2018 -0700 + + Create routes from xml file + +commit 48b2f9166675734fdbf1232d56b3930b3727c33d +Author: Kevin Chien +Date: Fri Oct 5 17:47:18 2018 -0700 + + Moved run from flow_params to env_config + +commit 0d04285f08bd976dfbcbe87dbb83344d38714ed9 +Author: Kevin Chien +Date: Fri Oct 5 17:16:06 2018 -0700 + + Fixed Pep8 style issues + +commit b98b27e07f982e33f4015bbe994a315f8f62b2d1 +Author: Kevin Chien +Date: Fri Oct 5 02:01:11 2018 -0700 + + Added run param to usage example so visualizer can access + +commit 7a546733d91c4c40639c8e9d3870efecafe95102 +Author: Kevin Chien +Date: Fri Oct 5 01:57:30 2018 -0700 + + RLLib visualizer now checks for alg name in params.json of results + +commit bc44b212cd96cdaf8fb02b12a676977565f1bf09 +Merge: 2f547105 36dcbac6 +Author: AboudyKreidieh +Date: Sun Sep 30 21:32:24 2018 -0700 + + Merge pull request #180 from flow-project/corl_final + + CORL final version for flow 0.3.0 + +commit 36dcbac6e8c98ce00394056ad31e1ccea2410b99 +Author: AboudyKreidieh +Date: Sun Sep 30 21:10:24 2018 -0700 + + PR fixes + +commit 277f1ea3964c7b251435df51f3bcfdd41e8afea4 +Author: AboudyKreidieh +Date: Sun Sep 30 20:41:39 2018 -0700 + + pep8 + +commit 70281193201c692fa38498b926af6f9e3730d0ce +Author: eugenevinitsky +Date: Sun Sep 30 20:27:38 2018 -0700 + + more commits for corl final + +commit 65395b8b8f031f9b50160f4b9df022f1aadee16d +Author: eugenevinitsky +Date: Sun Sep 30 16:10:11 2018 -0700 + + flake8 + +commit 2a21e05749b38c6bf805c8c251490f9b2bb107a2 +Author: eugenevinitsky +Date: Sun Sep 30 16:01:05 2018 -0700 + + removed some changes + +commit b1949ed5acb3a631b3a45b1d0ae4976896bffd4d +Author: eugenevinitsky +Date: Sun Sep 30 15:48:36 2018 -0700 + + commit for flow 0.3.0 + +commit 91e4fcf72c8a35510a2c6db6953f13049ba5687d +Author: eugenevinitsky +Date: Sat Sep 29 07:59:30 2018 -0700 + + commit for lr 5e-4 lambda 0p3 gae true grid 0 ppo + +commit 8c1726e55ef9988aaf033744684931d231fb3135 +Author: eugenevinitsky +Date: Sat Sep 29 07:56:24 2018 -0700 + + commit for lr 5e-3 lambda 0p3 gae true grid 0 ppo + +commit 2b47819225dec1ebaeff2845a7bd362ee7a36228 +Author: eugenevinitsky +Date: Sat Sep 29 07:55:45 2018 -0700 + + commit for lr 1e-3 lambda 0p3 gae true grid 0 ppo + +commit ab610182c85b8d3c16161bb28d0b02a7d37c860f +Author: eugenevinitsky +Date: Sat Sep 29 07:53:38 2018 -0700 + + commit for lr 1e-2 lambda 0p3 gae true grid0 + +commit 9e3c9d874a5c722e0bba28c265f41f43eb852d4e +Author: eugenevinitsky +Date: Sat Sep 29 07:47:26 2018 -0700 + + commit for lambda 0.3 grid 1 gae true + +commit 2d6dcfb50cbcc1dbb5d82c98b371185b741dc8c0 +Author: eugenevinitsky +Date: Sat Sep 29 07:41:43 2018 -0700 + + commit for grid 1 lambda 0.1 gae true ppo + +commit 4e32e69945e0633b115f988762fb2027c4747f7f +Author: eugenevinitsky +Date: Sat Sep 29 07:37:28 2018 -0700 + + commit for grid 1 lambda 0.1 + +commit 76293fa4bcbeb5e52928fd36eef69dc52f1713af +Author: eugenevinitsky +Date: Sat Sep 29 00:00:24 2018 -0700 + + commit for grid 0 lambda p 05 gae true ppo + +commit a98dfc4317a52a02dd838fef51f2be63e24fa797 +Author: eugenevinitsky +Date: Fri Sep 28 23:55:38 2018 -0700 + + commit for grid 0 lambda p 05 gae false ppo + +commit b6b54e851730a062d171c05f8b46eb3bdd9214fb +Author: eugenevinitsky +Date: Fri Sep 28 23:53:44 2018 -0700 + + commit for grid 0 lambda p 05 gae true ppo + +commit 8e356d55957e645083f7687b607bf55380562113 +Author: eugenevinitsky +Date: Fri Sep 28 23:41:51 2018 -0700 + + comment for no gae grid 1 ppo experiments + +commit 0995986ae425402c690a6abdff365bb64cd2d24c +Author: eugenevinitsky +Date: Fri Sep 28 23:33:31 2018 -0700 + + decreased lambda for ppo grid 1 + +commit a24869430bb13d5353f5fbfa4e2698e59a8352dd +Author: eugenevinitsky +Date: Fri Sep 28 22:49:48 2018 -0700 + + commit for grid 1 lr .01 ppo + +commit 50150fb55fa317203522ef51abab3988a200bc93 +Author: eugenevinitsky +Date: Fri Sep 28 22:44:00 2018 -0700 + + commit for grid 1 lr 5e-3 lr te-2 + +commit 5d3c86e44c8cc8a8aed34b0f9a441a0786542077 +Author: eugenevinitsky +Date: Fri Sep 28 22:41:28 2018 -0700 + + commit for grid - lr5e-3 ppo + +commit a38284c838a241826b18db69d4917c9b7cdf9e8b +Author: eugenevinitsky +Date: Fri Sep 28 22:38:57 2018 -0700 + + commit for grid 0 lr 5e-2 ppo + +commit 6e2fa2b4a5d7e4afa51a020102019fc31ae64c4d +Author: eugenevinitsky +Date: Fri Sep 28 14:05:02 2018 -0700 + + commit for grid 1 s0 ppo + +commit f102ff1c01e97f840f0e257c8e1ff507252e6736 +Author: eugenevinitsky +Date: Fri Sep 28 14:02:45 2018 -0700 + + commit for grid 0 lr5e-5 ppo + +commit 2e97778640068dc1041445c96314043f1e1a39af +Author: eugenevinitsky +Date: Fri Sep 28 14:00:31 2018 -0700 + + commit for grid 0 s1 lr5e-4 ppo + +commit 16cfba99dabce7ad8055f22c5a836fd5c3329014 +Author: eugenevinitsky +Date: Fri Sep 28 13:53:16 2018 -0700 + + commit for grid 1 s0 es + +commit 1e0c4be59cfe7a4452fc20834949687e9ed56231 +Author: eugenevinitsky +Date: Fri Sep 28 13:51:15 2018 -0700 + + commit for grid 0 s1 sgd 0.02 es + +commit 002ebd855534e2388d6e471274881d5abae1e679 +Author: eugenevinitsky +Date: Fri Sep 28 13:48:30 2018 -0700 + + commit for grid 0 s0 es + +commit c21bab716fd2046f2f3a8208c88b23c12a0f66ab +Author: eugenevinitsky +Date: Fri Sep 28 13:42:03 2018 -0700 + + commit for grid 1 s0 ars + +commit 78ebc51e88338ff6f3ac59e5c06b11a18b750f00 +Author: eugenevinitsky +Date: Fri Sep 28 13:39:22 2018 -0700 + + commit for grid 0 s1 ars + +commit df23f99de057064ea6d57e1f7dab00215adfd72a +Author: eugenevinitsky +Date: Fri Sep 28 13:34:47 2018 -0700 + + commit for grid 0 s0 ars + +commit adb9397145caa5a858ad5f0f46a708fa2e4aa955 +Author: eugenevinitsky +Date: Fri Sep 28 02:57:20 2018 -0700 + + commit for merge2 lr5e-5 ppo + +commit 0cbc3cf4ba7edfa528abc56954a8e7491c9e05d0 +Author: eugenevinitsky +Date: Fri Sep 28 02:55:18 2018 -0700 + + commit for merge 2 lr5e-4 ppo + +commit e7208968560b83f81f87f2a3248313daef845700 +Author: eugenevinitsky +Date: Fri Sep 28 02:53:10 2018 -0700 + + commit for merge1 lr 5e-5 ppo + +commit 6346bdd073fb8f8c6995f1aedf4c8840dc625715 +Author: eugenevinitsky +Date: Fri Sep 28 02:50:20 2018 -0700 + + commit for merge 1 lr5e-4 ppo + +commit b83559b30223a3131c749d9fcbce2a5fa4bfc4db +Author: eugenevinitsky +Date: Fri Sep 28 02:47:15 2018 -0700 + + commit for merge 0 lr5e-5 ppo + +commit e2ec90aa456d30ba92386776d015691b70b4ab09 +Author: eugenevinitsky +Date: Fri Sep 28 02:44:57 2018 -0700 + + upped cpus for merge 0 lr5e-4 ppo + +commit 1a6d3d71221116daf11bfd578246accc544ee5cc +Author: eugenevinitsky +Date: Fri Sep 28 02:42:19 2018 -0700 + + commit for merge 0 lr5e-4 ppo + +commit c5bbe73c51d6edb1af5bd054e3319a9012702c0e +Author: eugenevinitsky +Date: Fri Sep 28 02:35:37 2018 -0700 + + commit for grid 1 seed 0 ppo + +commit 0ac93267f45f96562f4a144ce9dc476f58cc0f4d +Author: eugenevinitsky +Date: Fri Sep 28 02:33:02 2018 -0700 + + commit for grid0 lr5e-5 ppo + +commit 9dbf9091d79e4817c02bc0e733a103204988e1f3 +Author: eugenevinitsky +Date: Fri Sep 28 02:30:10 2018 -0700 + + commit for grid 0 lr5e-4 ppo + +commit 3262b7b1a8b591eb39cea511f7ee0dc053d2054b +Author: eugenevinitsky +Date: Fri Sep 28 02:28:04 2018 -0700 + + commit for figure eight 2 ppo + +commit 3bfe9eb0be37090f3c67ded5c7446a34d8c66dbd +Author: eugenevinitsky +Date: Fri Sep 28 02:25:47 2018 -0700 + + commit for figure eight 2 ppo + +commit b974e194fc30757883f22b901e1f7bcd0e9b0518 +Author: eugenevinitsky +Date: Fri Sep 28 02:23:30 2018 -0700 + + commit for figure eight 1 ppo + +commit 1964a90cd72aa63f0e122dc6c7a2b31f8bb11836 +Author: eugenevinitsky +Date: Fri Sep 28 02:13:16 2018 -0700 + + commit for figure eight 0 ppo + +commit b5e06791ccb01cb2a8504ed4a655d72689594b4e +Author: eugenevinitsky +Date: Fri Sep 28 02:03:27 2018 -0700 + + commit for bottleneck2 lr 5e-5 ppo + +commit 6f20ff7022913ba12534f1a8d3691030fbcb0a58 +Author: eugenevinitsky +Date: Fri Sep 28 01:41:26 2018 -0700 + + commit for bottleneck 2 lr 5e-4 ppo + +commit c829c9a48544175712bcbe29f01b3fab2f237f6b +Author: eugenevinitsky +Date: Fri Sep 28 01:37:47 2018 -0700 + + commit for bottleneck 1 5e-4 ppo + +commit 8a993dff450cb24bd46ec5af6c6655b8ecfc2a71 +Author: eugenevinitsky +Date: Fri Sep 28 01:27:22 2018 -0700 + + commit for bottleneck 1 lr 5e-4 ppo + +commit 9b0d9e09420f50bb1ea4bdf41091b01b5d85372e +Author: eugenevinitsky +Date: Fri Sep 28 01:21:33 2018 -0700 + + commit for bottleneck 1 lr5e-5 ppo + +commit 77cbde8107e4abdbdefabaa2c59b38df59e59cb9 +Author: eugenevinitsky +Date: Fri Sep 28 01:11:25 2018 -0700 + + commit for bottleneck 1 lr 5e-4 ppo + +commit 4886cedcadeaeff99da2b4ea713fe3dfb5887bb6 +Author: eugenevinitsky +Date: Fri Sep 28 01:03:54 2018 -0700 + + commit for bottleneck 1 lr 5e-5 ppo + +commit 53092ef3c034e5339029e241822079c96711d45b +Author: eugenevinitsky +Date: Fri Sep 28 00:56:04 2018 -0700 + + commit for bottleneck 0 lr 5e-4 ppo + +commit 599d3717e7aea0e89ee64cceec28f5eb10a0d736 +Author: eugenevinitsky +Date: Fri Sep 28 00:53:43 2018 -0700 + + minor downgrade in rollout number + +commit 17b00dd2691973e8f0265d7c0c6bb67c8eeda19a +Author: eugenevinitsky +Date: Fri Sep 28 00:51:55 2018 -0700 + + commit for merge 2 sgd 0.02 + +commit f1890ccbc37efc61b17f26e8e4f97587e14736e7 +Author: eugenevinitsky +Date: Fri Sep 28 00:49:17 2018 -0700 + + commit for merge 2 sgd 0.01 ars + +commit 1dcf8b7744fe99a21ad36b9151df499553c1e40f +Author: eugenevinitsky +Date: Fri Sep 28 00:46:49 2018 -0700 + + commit for merge1 sgd 0.02 ars + +commit bf145089fee212c021954344484bea49870d3742 +Author: eugenevinitsky +Date: Fri Sep 28 00:44:21 2018 -0700 + + commit for merge 1 sgd 0.01 ars + +commit fd027248f176b3b5c4ee85beaa68af317001e866 +Author: eugenevinitsky +Date: Fri Sep 28 00:40:56 2018 -0700 + + commit for merge 0 sgd 0.02 ars + +commit 0c4f88c97da41bbfb196e2c6356baef93ec71745 +Author: eugenevinitsky +Date: Fri Sep 28 00:35:12 2018 -0700 + + commit for merge 0 sgd 0.01 + +commit 3a163e547b4b9a086248ec8df7537b8d8ef9a5d6 +Author: eugenevinitsky +Date: Fri Sep 28 00:32:02 2018 -0700 + + commit for merge1 sgd 0.01 ars + +commit 6261cefd4a16df297221ec4108be108aec7bac02 +Author: eugenevinitsky +Date: Fri Sep 28 00:30:02 2018 -0700 + + commit for merge 0 sgd0.02 ars + +commit a749f14018d7f5d8430eafe0ecfd19f7b18f69d2 +Author: eugenevinitsky +Date: Fri Sep 28 00:26:04 2018 -0700 + + commit for merge 0 sgd 0.01 ars + +commit a8a3278ee135573eed2733d78840f3b673d72336 +Author: eugenevinitsky +Date: Fri Sep 28 00:19:49 2018 -0700 + + commit for grid 1 seed 0 ars + +commit 70253f9c9088ee6339d5ba561a5f0d6b6a41896f +Author: eugenevinitsky +Date: Fri Sep 28 00:17:40 2018 -0700 + + commit for grid 0 sgd 0.02 ars + +commit f49c5ee67d340d8a6e73b356e0a3920d00cc7f4d +Author: eugenevinitsky +Date: Fri Sep 28 00:14:12 2018 -0700 + + commit for grid 0 sgd 0.01 ars + +commit eddf915fd624e60a903af6bfaa78d274707af7bd +Author: eugenevinitsky +Date: Fri Sep 28 00:08:46 2018 -0700 + + commit for bottleneck2 sgd 0.02 ars + +commit 25c3603517afdf102278f08ecf739332c2315e6b +Author: eugenevinitsky +Date: Fri Sep 28 00:00:40 2018 -0700 + + commit for bottleneck 2 sgd 0 ars + +commit 0e75a8d3d8e043c2a9dc0b10def64ba3e863a223 +Author: eugenevinitsky +Date: Thu Sep 27 23:54:54 2018 -0700 + + commit for bottleneck 0 sgd 0.02 + +commit 192918bedd1d6a98740d984c50f8bf449f960ef1 +Author: eugenevinitsky +Date: Thu Sep 27 23:45:59 2018 -0700 + + commit for bottleneck 1 sgd 0.01 ars + +commit 33bc31d95d7d4190713c42d34836bbfb12d778b8 +Author: eugenevinitsky +Date: Thu Sep 27 23:29:06 2018 -0700 + + commit for bottleneck 0 sgd 0.02 + +commit d2f4c08fced8e7e2abf9dac63efd8727b9352486 +Author: eugenevinitsky +Date: Thu Sep 27 23:06:08 2018 -0700 + + commit for bottleneck 0 sgd 0.01 ars + +commit e127d83eab376d5a7b2c6d66765a7281b6588480 +Author: eugenevinitsky +Date: Thu Sep 27 23:01:17 2018 -0700 + + commit for grid0 sgd 0.02 es + +commit 070aeeace5e549f61b958f04c7f3545b3c089054 +Author: eugenevinitsky +Date: Thu Sep 27 22:59:16 2018 -0700 + + commit for grid 0 sgd 0.01 es + +commit a5f8a879d1a886630671b13842fdb6aea789c777 +Author: eugenevinitsky +Date: Thu Sep 27 22:56:20 2018 -0700 + + bug fix + +commit e51e8f101137765396e06c9a07ad82f02f1b36c3 +Author: eugenevinitsky +Date: Thu Sep 27 22:52:03 2018 -0700 + + commit for grid 1 sgd .02 es + +commit 6ed6e68ebe2b522623282a6103ceae5d51eeb713 +Author: eugenevinitsky +Date: Thu Sep 27 22:46:05 2018 -0700 + + commit for grid 0 sgd 0.01 es + +commit 3d8e45978a4f43b25cb62ff1e8c9066e47e7662f +Author: eugenevinitsky +Date: Thu Sep 27 22:43:40 2018 -0700 + + commit for merge 2 sgd 0.02 es + +commit 0697e59a50ea6b565032d68db559d99006d50612 +Author: eugenevinitsky +Date: Thu Sep 27 22:39:48 2018 -0700 + + commit for merge 2 sgd 0.01 es + +commit 97897cf43bf0b9423b53970de346aad38068354c +Author: eugenevinitsky +Date: Thu Sep 27 22:37:39 2018 -0700 + + commit for merge 1 sgd 0.02 es + +commit db6b2f7a9a5637e971ef6d8dd69504b77f179a32 +Author: eugenevinitsky +Date: Thu Sep 27 22:32:19 2018 -0700 + + commit for merge 1 sgd 0.01 es + +commit 2f093c1f0d2aab4df6d2aeb2e7d17b8bcb92bd4a +Author: eugenevinitsky +Date: Thu Sep 27 22:25:57 2018 -0700 + + commit for merge 0 sgd 0.02 es + +commit 6fabbc2796954ac8a548612f50e0f31990541e36 +Author: eugenevinitsky +Date: Thu Sep 27 22:23:45 2018 -0700 + + commit for merge 0 s0 es + +commit f8e02b26fb3cd757f11a0b3ed501a23985136d64 +Author: eugenevinitsky +Date: Thu Sep 27 22:16:57 2018 -0700 + + commit for grid 1 s0 es + +commit e8fe868d864fc4887d295606d3931bbaa02d177f +Author: eugenevinitsky +Date: Thu Sep 27 22:14:39 2018 -0700 + + commit for grid0 sgd .02 es + +commit dfaa9a02be1bbbfa83994cc17cb9b794ae8ab0db +Author: eugenevinitsky +Date: Thu Sep 27 22:12:29 2018 -0700 + + commit for grid 0 es + +commit 8683d4f9d5bac28657099302f7515f2d02680072 +Author: eugenevinitsky +Date: Thu Sep 27 22:09:23 2018 -0700 + + commit for figure eight 2 es + +commit 216e06f2ed2138d566976554110879c4dff1e7c8 +Author: eugenevinitsky +Date: Thu Sep 27 22:07:19 2018 -0700 + + commit for figure eight 1 es + +commit 050fee72a8fd5347cd19d2c87630f77c891bc7ef +Author: eugenevinitsky +Date: Thu Sep 27 22:03:37 2018 -0700 + + commit for figure eight 0 es + +commit c794206de4f0e5741de0d89b9d45cc31514345dc +Author: eugenevinitsky +Date: Thu Sep 27 21:58:13 2018 -0700 + + commit for bottleneck 2 sgd .02 es + +commit 66b52cb4bb644f14f7e7ec5e83fe79c3ecbc2ea2 +Author: eugenevinitsky +Date: Thu Sep 27 21:51:22 2018 -0700 + + commit for bottleneck 2 es + +commit ae8290a4584d17baff220a613841d00821ddc7fa +Author: eugenevinitsky +Date: Thu Sep 27 21:44:48 2018 -0700 + + commit for bottleneck 1 sgd .02 es + +commit 2ad20e1e9517463dbf49c254b522507dcd8f0d47 +Author: eugenevinitsky +Date: Thu Sep 27 21:37:04 2018 -0700 + + commit for ars figure eight 2 + +commit f7417da2c26ddef0c7fdb28a8f6b71234549e686 +Author: eugenevinitsky +Date: Thu Sep 27 21:35:09 2018 -0700 + + commit for figure eight 1 ars + +commit ade29067862e003ac538cae4fb2d295831d2d70f +Author: eugenevinitsky +Date: Thu Sep 27 21:32:37 2018 -0700 + + commit for figure eight 0 ars + +commit 74cf71a546641e2300aa3cb1354fdde9e2865d66 +Author: eugenevinitsky +Date: Thu Sep 27 21:24:52 2018 -0700 + + commit for figure eight 2 ars + +commit c034453c4372bf043c01c63f42f70171a4b5073a +Author: eugenevinitsky +Date: Thu Sep 27 21:22:45 2018 -0700 + + commit for figure eight 1 ars + +commit c383aa53263a0e2e5f558786f3f568cf89a1caca +Author: eugenevinitsky +Date: Thu Sep 27 21:18:36 2018 -0700 + + commit for figure eight 0 ars + +commit 136f84b567b399b1472dd52fa3cf1efebf7be903 +Author: eugenevinitsky +Date: Thu Sep 27 21:13:50 2018 -0700 + + commit for bottleneck 1 s0 es + +commit cfd275eb8c6b0967dc016af0c32383706c8df9dc +Author: eugenevinitsky +Date: Thu Sep 27 21:08:37 2018 -0700 + + commit for bottleneck 0 s3 es + +commit 6762766b6d26ae74550a5cc7760251fd5981aaf2 +Author: eugenevinitsky +Date: Thu Sep 27 21:03:06 2018 -0700 + + commit for bottleneck 0 s0 es + +commit 2942d6f8a030d091f367e1523a2145f9ea82586a +Author: eugenevinitsky +Date: Thu Sep 27 21:01:58 2018 -0700 + + commit for bottleneck 0 s3 es + +commit 9ddf9839abfa2ca00c3d3fb5b17ceb41a08e77f4 +Author: eugenevinitsky +Date: Thu Sep 27 20:58:46 2018 -0700 + + comment for bottleneck 0 s0 es + +commit a7399bf301504881873a0499d1f5f18d41473de2 +Author: eugenevinitsky +Date: Thu Sep 27 20:53:56 2018 -0700 + + comment for bottleneck 0 s0 es + +commit 8c8329f28043436995a2d9b56754053cf1babf98 +Author: eugenevinitsky +Date: Thu Sep 27 20:50:32 2018 -0700 + + comment for bottleneck 0 s0 es + +commit f2d21c1e6796dc02fa5174c2be03ce86c6bc9fa2 +Author: eugenevinitsky +Date: Thu Sep 27 20:42:04 2018 -0700 + + commit for bottleneck0_s0_es + +commit 2e379f5b9176e6934bdbd0619d22d335ca34b213 +Author: eugenevinitsky +Date: Thu Sep 27 20:08:06 2018 -0700 + + commit for bottleneck0_s0_es + +commit b8377fadafbdea7748d4dde4041a852722df1656 +Author: eugenevinitsky +Date: Thu Sep 27 20:04:30 2018 -0700 + + commit for es bottleneck0_s0 + +commit 1cad1b4f8d2e7c1a6803d526cc6daccea75b09be +Author: eugenevinitsky +Date: Thu Sep 27 19:57:24 2018 -0700 + + commit for final exps + +commit 96f22465d676f086aff170e8a1312f7be85ae3cc +Author: eugenevinitsky +Date: Thu Sep 27 18:45:10 2018 -0700 + + commit for first run of all aws experiments + +commit c22f2d0f2febcd6dae389338dd3676b05c8e198a +Merge: 7244c137 826400d6 +Author: AboudyKreidieh +Date: Wed Sep 26 14:47:27 2018 -0700 + + Merge branch 'new_sumo' of https://github.com/flow-project/flow into new_sumo + +commit 826400d68875e1fd9f6cb16cba22404bf0f7e40a +Author: eugenevinitsky +Date: Wed Sep 26 14:44:17 2018 -0700 + + changed upload folder + +commit 7244c137fbb2ae24e9a55c4802ca48b38588c6f6 +Author: AboudyKreidieh +Date: Wed Sep 26 14:37:44 2018 -0700 + + prevents non-sumo vehicles from colliding + +commit 4c3b85a58b673c375a4cc387289bf52abc46927d +Author: eugenevinitsky +Date: Wed Sep 26 14:33:05 2018 -0700 + + added standstill penalty + +commit 1385b9bf01832d89dceb00d1ede0173d4cd469f9 +Author: eugenevinitsky +Date: Wed Sep 26 13:56:24 2018 -0700 + + removed unnecessary line + +commit d26699f08e45a0b6e85a4996ada95e233b1fcbb4 +Author: eugenevinitsky +Date: Wed Sep 26 13:56:08 2018 -0700 + + updated params for bottleneck and merge + +commit e21266aec28c66e37fdd7f9e1b6e5e8910a34255 +Author: eugenevinitsky +Date: Wed Sep 26 13:16:50 2018 -0700 + + fixed visualizer rllib for ppo + +commit adc5a0ff1ec19363cc0f14e03c5f797b29bd0ab9 +Author: eugenevinitsky +Date: Wed Sep 26 10:44:58 2018 -0700 + + fixed up baselines to print outflow over the last 500 seconds + +commit 1d6bbd88b507f7bc4f38a10b01b69d43baee4a8e +Author: eugenevinitsky +Date: Wed Sep 26 10:29:33 2018 -0700 + + added more output to visualizer rllib + +commit 2b26de467b35d40d667ba1a08945b2f1c5bc5568 +Author: eugenevinitsky +Date: Tue Sep 25 21:39:58 2018 -0700 + + commit for merge 2 ppo + +commit a7d5cac67282756f9a1e0268c8c036130d1ebe0a +Author: eugenevinitsky +Date: Tue Sep 25 21:37:50 2018 -0700 + + commit for merge 1 + +commit c5c56bc6e50b2efad48b29cff7b7a26b240319c7 +Author: eugenevinitsky +Date: Tue Sep 25 21:34:55 2018 -0700 + + commit for merge 0 ppo + +commit 214f96a8e576d6a00767791d8690fb2c02d92f9e +Author: eugenevinitsky +Date: Tue Sep 25 21:30:32 2018 -0700 + + commit for grid 1 ppo + +commit c74816caff497c2d783e24194446f01ff0840f98 +Author: eugenevinitsky +Date: Tue Sep 25 21:26:54 2018 -0700 + + commit for grid 0 ppo + +commit 8ed20aebc025f642eea943d167d7edfc98d17d2a +Author: eugenevinitsky +Date: Tue Sep 25 21:23:55 2018 -0700 + + commit for bottleneck 2 ppo + +commit ccdf77e71fdb7928f46a90d1846097d3175a2d8c +Author: eugenevinitsky +Date: Tue Sep 25 21:21:49 2018 -0700 + + commit for bottleneck 1 ppo + +commit 3463ccf80810b764fdde04765f7d03029f9c563b +Author: eugenevinitsky +Date: Tue Sep 25 21:19:08 2018 -0700 + + commit for bottleneck 0 ppo + +commit d1ff092ffd566cd3b04df19630d383f5f67a8c46 +Author: eugenevinitsky +Date: Tue Sep 25 21:16:35 2018 -0700 + + figure eight 2 ppo commit + +commit f9d2f59bbb5d7d1b05901562220ca5204697891d +Author: eugenevinitsky +Date: Tue Sep 25 21:14:35 2018 -0700 + + commit for figure eight 1 ppo + +commit fa08ac4c1f715fb582aa746f3ad06f0c231580b3 +Author: eugenevinitsky +Date: Tue Sep 25 21:03:18 2018 -0700 + + commit for figure eight 0 ppo + +commit 1e21c6ead70deb96ba3ecb8a3770f8360f985b4c +Author: eugenevinitsky +Date: Tue Sep 25 20:55:26 2018 -0700 + + merge 2 commit for es + +commit d3aa83412f8627946f3f34bc0b2c7a20fd3e4e56 +Author: eugenevinitsky +Date: Tue Sep 25 20:51:36 2018 -0700 + + commit for merge 1 es + +commit 2a2457f126e835246987ab7b0bbf8810cdb47aee +Author: eugenevinitsky +Date: Tue Sep 25 20:49:01 2018 -0700 + + commit for es merge0 + +commit bb27c815b6a45c3de2f5d901ee35c020b17e41d1 +Author: eugenevinitsky +Date: Tue Sep 25 20:45:08 2018 -0700 + + commit for es grid1 + +commit 0dc6f71cf120ed5035729501f019acbc2156ffb4 +Author: eugenevinitsky +Date: Tue Sep 25 20:42:42 2018 -0700 + + commit for grid 0 es + +commit 66873c4bee4de5f4f8cc116d21d6e7d6191de09d +Author: eugenevinitsky +Date: Tue Sep 25 20:39:35 2018 -0700 + + commit for bottleneck 2 for es + +commit 13c1cd1a4364d58994290ea6b757d241fc49a5ce +Author: eugenevinitsky +Date: Tue Sep 25 20:36:58 2018 -0700 + + commit for bottleneck 1 es + +commit e483fbe41f5864ce23e299b30cdf019e87501034 +Author: eugenevinitsky +Date: Tue Sep 25 20:33:59 2018 -0700 + + commit for bottleneck 0 es + +commit abb3427ab309d6bced7b8e3a519edb526ac7728a +Author: eugenevinitsky +Date: Tue Sep 25 20:31:54 2018 -0700 + + commit for figure eight 2 es + +commit 42e4bf72ca414da3cb41bfc08fd0455567d8e1a1 +Author: eugenevinitsky +Date: Tue Sep 25 20:28:44 2018 -0700 + + figure eight 1 for es + +commit d7b01ca4b8cf05e6d3b4d78abf6deb76edefc44b +Author: eugenevinitsky +Date: Tue Sep 25 20:26:51 2018 -0700 + + commit for figure eight 0 es + +commit 20975ecc12a0c69dbd8b1975283ecf212f370acc +Author: eugenevinitsky +Date: Tue Sep 25 20:21:04 2018 -0700 + + commit for figureeight0 es + +commit 59b5a7909946eb8e74e9f56c02a7b75a9d427a66 +Author: eugenevinitsky +Date: Tue Sep 25 20:17:23 2018 -0700 + + commit for merge 2 for ars + +commit 43b831274ccf7e4a7b335a415ed4c4275856ab54 +Author: eugenevinitsky +Date: Tue Sep 25 20:15:20 2018 -0700 + + commit for merge1 ars + +commit 7fbaa2d3b9c422d166a174e577097923f5d28b55 +Author: eugenevinitsky +Date: Tue Sep 25 20:13:10 2018 -0700 + + commit for merge0 + +commit ea638c0b2689c061514244c13678b8435029d16d +Author: eugenevinitsky +Date: Tue Sep 25 20:09:20 2018 -0700 + + commit for grid 1 ars + +commit 8420c737d07eaf56c75f33da3e1e2cf41772b614 +Author: eugenevinitsky +Date: Tue Sep 25 20:06:33 2018 -0700 + + commit for grid0 + +commit b50a361213d36b4e7612d42d8955e6029635b243 +Author: eugenevinitsky +Date: Tue Sep 25 20:03:04 2018 -0700 + + commit for bottleneck2 ars + +commit 9c530c1cd2d346bd97543b1b7bd8e48950bc3267 +Author: eugenevinitsky +Date: Tue Sep 25 20:00:09 2018 -0700 + + commit for bottleneck0 ars + +commit 597ce00902948e9a3c9b997896e5660be072185b +Author: eugenevinitsky +Date: Tue Sep 25 19:57:43 2018 -0700 + + commit for bottleneck0 + +commit dafcb6552758b1e4bbcf3926ac5a298a0aa45ee7 +Author: eugenevinitsky +Date: Tue Sep 25 19:54:06 2018 -0700 + + commit for figure eight 2 + +commit 632468bb59b58804e64b8fe875e137e759e4d32f +Author: eugenevinitsky +Date: Tue Sep 25 19:51:10 2018 -0700 + + figure eight 1 commit for ars + +commit 7a766699e2a8169e40d14755bb361e6622e8a793 +Author: eugenevinitsky +Date: Tue Sep 25 19:48:59 2018 -0700 + + commit for figure_eight_0_ars + +commit e97f32a22d160a8197d27360dac15cc172da8855 +Author: eugenevinitsky +Date: Tue Sep 25 19:43:50 2018 -0700 + + commit for figure_eight_0_ars + +commit 2f55718f4e1bdd0248cd1366af406c5c888039ee +Author: eugenevinitsky +Date: Tue Sep 25 19:35:35 2018 -0700 + + test commit + +commit 55644e54db6732a06be3b699d123a38291f772fa +Author: eugenevinitsky +Date: Tue Sep 25 19:27:06 2018 -0700 + + commit for figure_eight_0 + +commit 84b2c177c685c0ddb3a002da5ca98f1bf25af467 +Author: eugenevinitsky +Date: Tue Sep 25 19:19:23 2018 -0700 + + final params for all run scripts + +commit 1c8110725f0e0547604ecb6218ac645e56ff55a7 +Author: eugenevinitsky +Date: Tue Sep 25 14:50:26 2018 -0700 + + modified bottleneck values back + +commit e6d2420e5a9e1f889af69e3cb35bb2b1817087ff +Merge: 3e583ecf 31cf1016 +Author: eugenevinitsky +Date: Tue Sep 25 14:44:55 2018 -0700 + + Merge branch 'corl_exps2' into new_sumo + +commit 31cf1016e8bad7eff182ecff1f99a81933c1c767 +Author: eugenevinitsky +Date: Tue Sep 25 14:44:50 2018 -0700 + + exp params + +commit 2f547105886458a62a99f2e753b6f6a34441a06f +Merge: d5e722af 7a6da63a +Author: AboudyKreidieh +Date: Tue Sep 25 11:45:41 2018 -0700 + + Merge pull request #75 from flow-project/leaderboard + + Leaderboard + +commit 7fb8a4705218138dcb9897fa65b6cdb71d713ea5 +Author: eugenevinitsky +Date: Mon Sep 24 23:54:28 2018 -0700 + + es for bottleneck0 + +commit 04b0117bd1f8440075679ad2b1cacba4a774f145 +Author: eugenevinitsky +Date: Mon Sep 24 23:48:40 2018 -0700 + + grid0 for es + +commit f3ac21116fb5d14cb8a7cb7e74fd1a314428e8b1 +Author: eugenevinitsky +Date: Mon Sep 24 23:48:24 2018 -0700 + + fix to es_runner + +commit 7d07fd6552adc1fd44b6b24be6974df15f0cff7a +Author: eugenevinitsky +Date: Mon Sep 24 23:41:57 2018 -0700 + + bottleneck0 ppo + +commit 8aa1be22d81c4b05246fec8f6b48091df32544bb +Author: eugenevinitsky +Date: Mon Sep 24 23:37:55 2018 -0700 + + switched to grid0 for ppo + +commit ed457116d98a9f5995a545ad6a637ec7d65117fd +Author: eugenevinitsky +Date: Mon Sep 24 23:33:57 2018 -0700 + + minor + +commit 7f0a824a8d6fbf50136717b6a3fc27c47f5a1ba2 +Author: eugenevinitsky +Date: Mon Sep 24 23:33:12 2018 -0700 + + updated ppo_config + +commit 3e583ecf6f36c836f8145f38afdce2c5975cd214 +Merge: 7f8aea6c b0b16335 +Author: eugenevinitsky +Date: Mon Sep 24 20:39:21 2018 -0700 + + Merge branch 'corl_exps2' into new_sumo + +commit b0b16335acd06d2376fb2cd51bc4c24acff14ab1 +Author: eugenevinitsky +Date: Mon Sep 24 20:38:57 2018 -0700 + + consistent max speed + +commit ce56d5fd2e393dc104b703d655fadcb676d4bd0c +Author: eugenevinitsky +Date: Mon Sep 24 20:37:28 2018 -0700 + + modified accel for the bottleneck env + +commit 7f8aea6cfe833e27ad1ffb48717fe18f20053179 +Author: eugenevinitsky +Date: Mon Sep 24 20:19:25 2018 -0700 + + removed branch name + +commit 716eaf1c06583d6aea2447a9d29ad6fd054f4e6b +Author: eugenevinitsky +Date: Mon Sep 24 20:17:59 2018 -0700 + + updated bottleneck params + +commit 1a0fe2eb1e8f900300f0c91e4676c44f7ed6057a +Author: eugenevinitsky +Date: Mon Sep 24 19:58:22 2018 -0700 + + changed out accel values to be sumo default values + +commit b843e91f085040381758c68e613ecd61c2b765d6 +Merge: d1393d90 74d77770 +Author: eugenevinitsky +Date: Mon Sep 24 10:40:18 2018 -0700 + + Merge branch 'new_sumo' into corl_exps2 + +commit 74d7777094bfcfb573d5e9884f0036f4a6f30ae5 +Author: eugenevinitsky +Date: Mon Sep 24 10:39:03 2018 -0700 + + fixed accel in bottleneck ernv to standard values + +commit b0a1edff6457971bc7457fa7b693d9892a4de442 +Author: eugenevinitsky +Date: Mon Sep 24 10:37:48 2018 -0700 + + upgraded bottleneck values + +commit d1393d902016288c01503a1943f416259851aa49 +Author: eugenevinitsky +Date: Sun Sep 23 23:35:25 2018 -0700 + + minor + +commit e68a67c4cd81a31b830c0dda3f78f67e377b75ba +Author: eugenevinitsky +Date: Sun Sep 23 17:58:20 2018 -0700 + + added a yellow time of 3 + +commit f0a34e84813bd20adf7b10a3ba30fefffd185770 +Author: eugenevinitsky +Date: Sun Sep 23 17:53:55 2018 -0700 + + grid0 + +commit 2fa48f3be02554d8a07dbef76d6c24c1783ec609 +Author: eugenevinitsky +Date: Sun Sep 23 17:51:23 2018 -0700 + + minor + +commit 5b141da55f717f4ea9d02b68f5a6004e89dbc5c5 +Author: eugenevinitsky +Date: Sun Sep 23 17:49:48 2018 -0700 + + minor + +commit c0502bcb31ba3e9b7fde5f821377f666a8433373 +Author: eugenevinitsky +Date: Sun Sep 23 17:44:23 2018 -0700 + + upgraded instance type + +commit 0884a987971d94a4bbb32d0fadee28244dce34aa +Author: eugenevinitsky +Date: Sun Sep 23 17:43:01 2018 -0700 + + fixed ars params + +commit 18bd42ac75acc656e3abfc8516357dbd1a47bae7 +Author: eugenevinitsky +Date: Sun Sep 23 17:21:34 2018 -0700 + + minor updates to travis + +commit 531fc959be4fac5adf6d27d475c9643b65072220 +Author: eugenevinitsky +Date: Sun Sep 23 17:04:34 2018 -0700 + + bug fix + +commit d04dbadc6eadb866eed70f1ab387231d7a9a4ab1 +Author: eugenevinitsky +Date: Sun Sep 23 16:21:15 2018 -0700 + + added correct inflow values to bottleneck + +commit f6a72eea7b44e8aaf0e6017afd03485e994a2c24 +Author: eugenevinitsky +Date: Sun Sep 23 16:18:17 2018 -0700 + + flake8 + +commit 8e0cb105f9fa3d2ffb5a3103cdc3b2a6932c6f5f +Author: eugenevinitsky +Date: Sun Sep 23 16:02:55 2018 -0700 + + minor + +commit 49ab98148cf19b9b4df97ba3c8d8ed5cbc399834 +Author: eugenevinitsky +Date: Sun Sep 23 16:02:26 2018 -0700 + + fixed traffic light baselines + +commit 4607f0bcdc0b3ae0f7c2ede4516c14604dd5f396 +Author: eugenevinitsky +Date: Sun Sep 23 15:33:03 2018 -0700 + + partial fix to traffic light actuated bug + +commit 8fcd1c2a2b6fbeaf15f5844f2b27658f21f76616 +Author: eugenevinitsky +Date: Sun Sep 23 14:12:21 2018 -0700 + + added capacity curve computation + +commit 7a6da63a935cfa77112c6b6945ec009fa7715078 +Merge: fc4278ab d5e722af +Author: AboudyKreidieh +Date: Sun Sep 23 00:29:47 2018 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow into leaderboard + +commit fc4278ab246ce4e0363a03d8b47cf18f669ddd4f +Author: Fangyu Wu +Date: Sat Sep 22 23:22:20 2018 -0700 + + Remove branch checkout and test installation with new SUMO. + +commit a2d0d40983eddfe3e63fcc0aca89cc5f49cfcf02 +Author: AboudyKreidieh +Date: Sat Sep 22 15:47:45 2018 -0700 + + fixed black cars bug + +commit 330b598a80dfc6581fd2fb221d7ad0b6c5438975 +Author: AboudyKreidieh +Date: Sat Sep 22 15:38:31 2018 -0700 + + subscriptions are immediately collected from new vehicles + +commit 0a2ae7f1000f4a963829b6b4ee894cc426057604 +Author: AboudyKreidieh +Date: Sat Sep 22 15:19:56 2018 -0700 + + fixed tests + +commit 786b4f24bc57ab150010b1cc7b8c604480427abb +Author: AboudyKreidieh +Date: Sat Sep 22 14:30:30 2018 -0700 + + removed debugger + +commit 18c2a0e66f757184176aa1974ab8884f7a7b9de4 +Author: AboudyKreidieh +Date: Sat Sep 22 14:28:42 2018 -0700 + + removed turns from figure eight network + +commit ff6b78cb88aa9d7737411d2e0fb242e013646772 +Merge: e4dd76a7 defc5483 +Author: AboudyKreidieh +Date: Sat Sep 22 14:16:57 2018 -0700 + + Merge branch 'new_sumo' of https://github.com/flow-project/flow into new_sumo + +commit e4dd76a785638223371b749a50f13d5602f00029 +Author: AboudyKreidieh +Date: Sat Sep 22 14:16:48 2018 -0700 + + dealt with subscriptions of entering/exiting vehicles + +commit defc54835e9fa7d3d0a1c9833cdd2c6b4edfa85b +Author: eugenevinitsky +Date: Fri Sep 21 19:23:02 2018 -0700 + + changed traffic lights to account for no left and right turns + +commit 8436249eb8032d70264acbb6cd5794061898fc24 +Author: AboudyKreidieh +Date: Fri Sep 21 17:19:41 2018 -0700 + + accel behavior in junctions by sumo + +commit d5e722af090a5f0bdbd4d1e228eec75a8ca2a4eb +Author: Kevin Chien +Date: Fri Sep 21 17:17:38 2018 -0700 + + fixed ppo and ray imports (#168) + +commit 7385f3d765ffeb769fa620ba3c869f9215b8a2c0 +Author: AboudyKreidieh +Date: Fri Sep 21 16:59:39 2018 -0700 + + modified connections in grid to not accept turns + +commit cbc6da81ef730c58b6c78f0caebc3e6df195dc8a +Merge: 5ac8570f fa6c702c +Author: AboudyKreidieh +Date: Fri Sep 21 14:01:01 2018 -0700 + + Merge branch 'new_sumo' of https://github.com/flow-project/flow into new_sumo + +commit 5ac8570f9b62a457bc49d260b6cc8fa001c1b641 +Merge: 00ca4c89 a1872418 +Author: AboudyKreidieh +Date: Fri Sep 21 13:58:24 2018 -0700 + + Merge branch 'sumo_wheel_instructions' into new_sumo + +commit a1872418f6bdd998fab40acb41ac3f56ad3e1c37 +Author: AboudyKreidieh +Date: Fri Sep 21 13:56:29 2018 -0700 + + changed setup with new sumo + +commit 85cb4f8b9be48c31e0e06ec0dcf990b6031e363a +Merge: 0e702e43 3f59f073 +Author: AboudyKreidieh +Date: Fri Sep 21 13:55:17 2018 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow into sumo_wheel_instructions + +commit 0e702e434adbae82254981a3cbae84d37b18a70d +Author: AboudyKreidieh +Date: Fri Sep 21 13:55:06 2018 -0700 + + minor updates + +commit 3f59f07319d28a0489897f84eb9bc5d99189a32c +Author: Kevin Chien +Date: Fri Sep 21 13:20:01 2018 -0700 + + Clarified tensorboard setup (#166) + +commit fa6c702c1a8a9c192115141b58a5a46f276cacbb +Author: eugenevinitsky +Date: Fri Sep 21 09:54:05 2018 -0700 + + Update ray_autoscale.yaml with upgraded sumo image + +commit 560b8b450da344aff0b9d6ff9751c1230c1b07ec (tag: v0.2.0) +Author: Kathy Jang +Date: Thu Sep 20 17:15:24 2018 -0700 + + Addressing issue 145 (#160) + + * Addressing issue 145 + + * Fixed setup script env_params to reflect new changes + + * Fixed pep8 issues + + * Added new green_wave_env requirements to rllib/green_wave.py + + * Added new env params to the benchmark experiments as well + + * Added env params to baseline as well. nose2 not passing for some figure_eight scenarios + +commit 4eb9b800dcac2af407b585dbde3369f522535432 +Merge: f2bf4783 f0f6cf3a +Author: AboudyKreidieh +Date: Thu Sep 20 13:24:11 2018 -0700 + + Merge pull request #152 from flow-project/sumo_wheel_instructions + + Sumo wheel instructions + - resolves #103 + - removed some unused files from docs/ + +commit f2bf4783c0530abe87076fc0e4027b60ba7c35f2 +Author: eugenevinitsky +Date: Thu Sep 20 13:19:52 2018 -0700 + + Script for syncing s3 files (#161) + + * removed whitespace error + + * a few more instructions + + * pep8 fixes + +commit f0f6cf3a6c15d0cde25a381b2e214360f39cc6e5 +Author: AboudyKreidieh +Date: Thu Sep 20 13:11:42 2018 -0700 + + a bit more cleanup + +commit 1dd289fbb0cbca4289bacb710f89f1436563776e +Author: AboudyKreidieh +Date: Thu Sep 20 13:08:42 2018 -0700 + + bit of PR cleanup + +commit 3c760cb327251f9ab40224652b8e0a42b5f5e591 +Merge: 1a53b251 1bbd6e5a +Author: AboudyKreidieh +Date: Thu Sep 20 12:58:37 2018 -0700 + + Merge pull request #162 from flow-project/ppo_remove + + removed PPO as a default from from visualizer_rllib + +commit 00ca4c89cfd213da08570d013023506bec66f8f6 +Author: AboudyKreidieh +Date: Thu Sep 20 12:57:38 2018 -0700 + + new sumo commit + +commit a2268630f47db9f6e5db5e63bf8da2ac047181be +Merge: 98ba8b3b 1a53b251 +Author: AboudyKreidieh +Date: Thu Sep 20 11:29:31 2018 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow into new_sumo + +commit 1bbd6e5ab01d1bd4e3f2ecb60b06bba234fcdbea +Author: eugenevinitsky +Date: Thu Sep 20 10:42:37 2018 -0700 + + removed PPO as a default from from visualizer_rllib + +commit 1a53b25125765c56fa9b826db7a4d57eecba022b +Author: AboudyKreidieh +Date: Wed Sep 19 11:43:40 2018 -0700 + + made setup_sumo_ubuntu1804 executable (#134) + +commit 27d13ed3d5c17333e4ca3084367741f2d40a77e3 +Merge: ce8634c6 9a7a29f1 +Author: AboudyKreidieh +Date: Tue Sep 18 12:28:39 2018 -0700 + + Merge pull request #149 from flow-project/pip_wheel + + moved wheel from scripts/ to setup.py + +commit ce8634c6907d8049fc7faf451aa5519ad6615c29 +Author: AboudyKreidieh +Date: Tue Sep 18 12:23:20 2018 -0700 + + some clarity to setup instructions (#135) + +commit 47106a91b8820a77aa8873c1cec878b83c77fa14 +Author: eugenevinitsky +Date: Tue Sep 18 12:05:36 2018 -0700 + + Update flow_setup.rst + + Updated checkout number in docs + +commit 0869f8789e65defa41d2b28254cf293b0d53900a +Author: AboudyKreidieh +Date: Mon Sep 17 22:04:53 2018 -0700 + + added image to visualizer.rst (#151) + + * added image to visualizer.rst + + * rst support + + * minor + + * minor + + * minor + +commit fb4195a0e961d4879e782fc396859b8b8eef0d5e +Merge: b34cf54e d0935c3a +Author: AboudyKreidieh +Date: Mon Sep 17 21:46:25 2018 -0700 + + Merge pull request #153 from flow-project/multi_lane_bug_fix + + Multi lane bug fix + +commit d0935c3aa3517bcdfea4d00c446581071e02bbe5 +Author: eugenevinitsky +Date: Mon Sep 17 14:54:10 2018 -0700 + + once more + +commit 698246464026489c83e0d999bbf189d5c352cf42 +Author: eugenevinitsky +Date: Mon Sep 17 14:50:42 2018 -0700 + + flake8 + +commit b9b2228726ae9bebcfccc56c81a552e0b71010a6 +Author: eugenevinitsky +Date: Mon Sep 17 14:37:22 2018 -0700 + + more flake8 + +commit 33b394a4cc1aab9c4f9d6d4386bdc2434d24d31f +Author: eugenevinitsky +Date: Mon Sep 17 14:31:36 2018 -0700 + + simplified code, props to aboudy + +commit 1809b06b582c6801c0746d6dbcbfb5be3b35e9ab +Author: eugenevinitsky +Date: Mon Sep 17 14:17:26 2018 -0700 + + another flake8 + +commit ae7ecb220f25f89913b92a3a2bcdf6bb2735eceb +Author: eugenevinitsky +Date: Mon Sep 17 14:10:30 2018 -0700 + + more flake8 + +commit 7736472e3553a9ec1954a5a7cfad3d4565e5939d +Author: eugenevinitsky +Date: Mon Sep 17 14:00:38 2018 -0700 + + flake8 fixes + +commit 1357bf679d03504d33309128cc077bd3f18a7f18 +Author: eugenevinitsky +Date: Mon Sep 17 13:54:44 2018 -0700 + + removed extra breakpoint + +commit c0c17f23b634c26cb20fe39dec10967782991cde +Author: eugenevinitsky +Date: Mon Sep 17 13:52:05 2018 -0700 + + passing multi lane tests + +commit d21f812078ad47237b492e6e0ff838f7f60a7cc7 +Author: eugenevinitsky +Date: Mon Sep 17 10:16:34 2018 -0700 + + added more tests for _multi_lane_headways_util + +commit 98ba8b3b0ca5289de331098a64bf3bf35a9a256f +Author: AboudyKreidieh +Date: Sun Sep 16 23:13:38 2018 -0700 + + travis fix + +commit 0c8d73ceaabdb218215694a727e4a6e20774fd69 +Author: AboudyKreidieh +Date: Sun Sep 16 23:10:09 2018 -0700 + + removed the try, which will cause issues + +commit 32904c58dd6b8168025502f75512d4539d074d49 +Author: AboudyKreidieh +Date: Sun Sep 16 23:09:19 2018 -0700 + + updated sumo wheel + +commit e30ee310ce9897f3d131b2636565132ea8df6316 +Merge: d9fb4cf5 9a7a29f1 +Author: AboudyKreidieh +Date: Sun Sep 16 23:08:02 2018 -0700 + + Merge branch 'pip_wheel' into new_sumo + +commit d9fb4cf5c476d18c5497e0b8461be62150657059 +Author: AboudyKreidieh +Date: Sun Sep 16 23:07:10 2018 -0700 + + updated scripts for sumo binaries + +commit 56373e4ff1a013c88467018bf10b639c87c51a10 +Author: AboudyKreidieh +Date: Sun Sep 16 22:28:54 2018 -0700 + + minor cleanup + +commit 90c70ecb0fe1e8968037e5dc00b88b2d2611e852 +Author: AboudyKreidieh +Date: Sun Sep 16 22:07:48 2018 -0700 + + tested and modified sumo wheel instructions + +commit 3c261d3af1c49b1a45f424c75f1179ca13930b3c +Merge: 5df0f023 b34cf54e +Author: AboudyKreidieh +Date: Sun Sep 16 21:34:23 2018 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow into sumo_wheel_instructions + +commit b34cf54e4a9da053fd2601e42a019e382103a4bc +Merge: 165b9391 1706da34 +Author: AboudyKreidieh +Date: Sun Sep 16 20:09:59 2018 -0700 + + Merge pull request #143 from flow-project/update_sumo_instructions + + added brew instructions + +commit 2c2004918c6ee34c997e6d8309fcbbe5f1146776 +Author: eugenevinitsky +Date: Sun Sep 16 19:07:55 2018 -0700 + + start of tests + +commit 7de23459b75b64277b7436cd3f0b689d2928e11e +Merge: ac0f1932 165b9391 +Author: AboudyKreidieh +Date: Sun Sep 16 19:06:51 2018 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow into new_sumo + +commit 9a7a29f1738543e5d94b70c84f43f4cb8550c641 +Author: AboudyKreidieh +Date: Sun Sep 16 19:01:42 2018 -0700 + + moved wheel from scripts/ to setup.py + +commit 1706da348991838be2d3e7c1e654b9c867852ed6 +Author: AboudyKreidieh +Date: Sun Sep 16 18:50:59 2018 -0700 + + PR fix + +commit 165b9391eff78febf266dfa2fa48d27732cde81c +Merge: ed3113d5 940f851f +Author: AboudyKreidieh +Date: Sun Sep 16 18:49:35 2018 -0700 + + Merge pull request #136 from flow-project/render + + Render + +commit ed3113d5096d1b448684b5b0f1a1218401f9e4f1 +Merge: 272e5183 7dae5547 +Author: AboudyKreidieh +Date: Sun Sep 16 18:49:20 2018 -0700 + + Merge pull request #148 from flow-project/reward_fix + + inverted reward + +commit 5df0f023a867338e1f4175ad4d0bfa5b72dda6d9 +Author: AboudyKreidieh +Date: Sun Sep 16 18:48:44 2018 -0700 + + first pass at documenting creating sumo wheels + +commit 855fb558e55f106dc88b3e964a31860f87f9ffc3 +Author: eugenevinitsky +Date: Sun Sep 16 18:11:47 2018 -0700 + + modified usage of initial config to make it possible to actually pass things to gen_custom_start_pos + +commit 940f851f61cb773c8bb5649d5bcac35c0f1a0c19 +Author: AboudyKreidieh +Date: Sun Sep 16 17:35:31 2018 -0700 + + PR fix + +commit 7dae5547e9ddf94fa3c66a0fba484ce5cbd736fb +Author: AboudyKreidieh +Date: Sun Sep 16 17:33:18 2018 -0700 + + inverted reward + +commit d5156f25bef6740b5b4b9c454f0ec051faf775d9 +Author: eugenevinitsky +Date: Sun Sep 16 17:26:37 2018 -0700 + + working highway + +commit 323705e693c99255874650a83aaad36057ae4d22 +Author: eugenevinitsky +Date: Sun Sep 16 17:09:45 2018 -0700 + + minor fixes to highway class + +commit 4956dc485f78ef2b7c5f4a13f8abb7a24cfbb1bb +Author: eugenevinitsky +Date: Sun Sep 16 16:18:15 2018 -0700 + + modified the highway class to make it easier to use for tests + +commit 43e0f4d062c1a16ee67be3b772d728a9564b3a12 +Author: eugenevinitsky +Date: Thu Sep 13 17:34:07 2018 +0400 + + added link to brew + +commit d455ec91809f07ceaac15be9d9d0a280d452565b +Author: eugenevinitsky +Date: Thu Sep 13 17:28:40 2018 +0400 + + added brew instructions + +commit 272e5183ae6c27baf123a5a2b89184c893fef1be +Author: AboudyKreidieh +Date: Thu Sep 13 06:09:07 2018 -0700 + + added deprecation warning for inflows (#141) + +commit 00671ce9640df1e749a32de7a83f8a6ca5ae1483 +Author: Nishant Kheterpal +Date: Sat Sep 8 14:19:03 2018 -0700 + + added tutorials substructure to docs + +commit 32fd8685b65bfd8cafb91c98c8eeb294e80d8284 +Merge: 09ee2d68 468bbd01 +Author: AboudyKreidieh +Date: Sat Sep 8 02:00:12 2018 -0700 + + Merge pull request #137 from flow-project/inflows_reset_warning + + added warning about inflows + +commit 468bbd0121036aa8e1b0f648d038d15ecdef0403 +Author: AboudyKreidieh +Date: Fri Sep 7 21:47:54 2018 -0700 + + renamed in_flow -> inflows + +commit 8066f65f0c19a11cd2ec823511206e2fde47a3a1 +Author: AboudyKreidieh +Date: Fri Sep 7 21:17:32 2018 -0700 + + made inflows by default and empty object + +commit 083ff221f61324a7064da574bdb8d52b6926c62f +Author: AboudyKreidieh +Date: Fri Sep 7 21:08:29 2018 -0700 + + removed unused import + +commit acff5e746879e487c871102e0208349a0769068d +Author: AboudyKreidieh +Date: Fri Sep 7 21:06:18 2018 -0700 + + added warning about inflows + +commit e3e8f312cceecca02a6a66849989b8dfe7dcd706 +Author: AboudyKreidieh +Date: Fri Sep 7 20:31:26 2018 -0700 + + removed sumo_binary from tutorials + +commit 967a0a58ce884bcde11937bb497aba90d343d218 +Author: AboudyKreidieh +Date: Fri Sep 7 20:24:53 2018 -0700 + + added deprecation warning to sumo_binary + +commit 97056123d6cfd002eaf47a946d0a1b4f4e461af5 +Merge: 068beba9 09ee2d68 +Author: AboudyKreidieh +Date: Fri Sep 7 20:09:22 2018 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow into render + +commit 09ee2d6821ef6efde654c123c5aac8662539c517 +Merge: 7bb3dc64 9af91f07 +Author: AboudyKreidieh +Date: Fri Sep 7 18:42:26 2018 -0700 + + Merge pull request #130 from flow-project/fixing_setup_py + + fixed env.yml and requirements.txt + +commit 4078eddcda92ab6d8c423c0cea07dbb7244347fc +Merge: ae372a7c 7bb3dc64 +Author: Nishant Kheterpal +Date: Fri Sep 7 18:13:26 2018 -0700 + + Merge branch 'master' of github.com:flow-project/flow into rllab_tutorial + +commit 7bb3dc64e52b200dffe9d4c13ba2881d76529902 +Merge: 36f9e34a 03bd9450 +Author: AboudyKreidieh +Date: Fri Sep 7 00:57:33 2018 -0700 + + Merge pull request #128 from kjang96/issue_106 + + Resolves #106 . Do we want to keep the numbering in the flow_setup.rst page? I removed them altogether. + +commit 36f9e34a123abe9185e5fb78a80363926e66a990 +Merge: b48ad148 9e7d1fc6 +Author: AboudyKreidieh +Date: Fri Sep 7 00:57:05 2018 -0700 + + Merge pull request #99 from kjang96/inflow_name + + Resolves #97 This allows for customizable flow names. I add a new optional name parameter to the Inflow class' add function, which defaults to "flow" (what it was originally). Inflow experiments run as expected with this change. + +commit 9af91f078d9b8b3f8bdce70bfd11734aaf589e9d +Author: Kanaad Parvate +Date: Fri Sep 7 00:24:46 2018 -0700 + + fixed env.yml and requirements.txt + +commit b48ad14863acd910999e0c77414c6c4dcc9496bd +Merge: 153eee1c 1a1fb250 +Author: AboudyKreidieh +Date: Thu Sep 6 16:36:18 2018 -0700 + + Merge pull request #119 from flow-project/updated_setup + + Updated setup + +commit 03bd9450df3afd3a56d8efc9b47c76f192af508b +Author: Kathy Jang +Date: Thu Sep 6 15:15:21 2018 -0700 + + Addresses issue #106 + +commit 153eee1c34093e50e795b6b6fb4d44310e93b581 +Author: Kathy Jang +Date: Thu Sep 6 15:03:15 2018 -0700 + + Addressing part of issue #96 (#122) + +commit e34fff344e1fe9804fa8809bd5fae4624a1b7daf +Author: Kathy Jang +Date: Thu Sep 6 15:02:36 2018 -0700 + + Issue #125 (#126) + + * Addressing part of issue #96 + + * Restored all tutorials to a clean state + +commit c798174d3a7a2d34ffe918fa4a534cba0f0acb20 +Author: Kathy Jang +Date: Thu Sep 6 15:02:01 2018 -0700 + + Resolves issue #120 (#127) + +commit 1a1fb250b1e63ff1b6da7f417f3e20cc26f71204 +Author: Lucas Fischer +Date: Thu Sep 6 14:25:52 2018 -0700 + + Change Plotly version + +commit b4f0a86d9eec55d58ece5ad693a50ab221260758 +Author: nskh +Date: Thu Sep 6 13:21:18 2018 -0700 + + tiny docs changes (#123) + + * updated links. Closes #115 + + * rst formatting + +commit 4b7f3707ee0abb32e6656be44faeb19884ca5915 +Merge: a8ef8204 3f73129f +Author: Kathy Jang +Date: Thu Sep 6 12:43:53 2018 -0700 + + Merge pull request #121 from kjang96/issue_113 + + Addressing issue#113 + +commit a8ef820432a4cc81f38ae39467affd95564efb70 +Author: nskh +Date: Thu Sep 6 12:32:12 2018 -0700 + + updated links. Closes #115 (#118) + +commit 3f73129f418d910ea86aa9c51b4b65379ff74b95 +Author: Kathy Jang +Date: Thu Sep 6 12:29:22 2018 -0700 + + Addressing issue#113 + +commit 48c069adeba553d802a0175a569d7c537056c6c2 +Author: eugenevinitsky +Date: Thu Sep 6 12:26:05 2018 -0700 + + Update environment.yml + + fixed bug + +commit 691fdc5025c76d8462d656f53b25feb441744980 +Author: eugenevinitsky +Date: Thu Sep 6 12:07:16 2018 -0700 + + moved numpy + +commit 4e2e7416484a6a51bf4a25a007d91f85eebe4595 +Author: eugenevinitsky +Date: Thu Sep 6 11:54:46 2018 -0700 + + updated setup to move numpy to pip + +commit 0d7d7040cbd7c2aea72478b05629f4cbd9732f04 +Author: eugenevinitsky +Date: Thu Sep 6 02:30:01 2018 -0700 + + Cleanup of docker section of tutorial (#112) + + * added fixed setup instructions + + * cleaned up the docker section of setup instructions + +commit 979e28d6efe924ba23e45c79973baa4515b30cb0 +Merge: e70f577f d5d81c28 +Author: eugenevinitsky +Date: Wed Sep 5 23:34:28 2018 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow + +commit d5d81c28b88564e8797a66ef891143e69d36e9cf +Author: Cathy Wu +Date: Wed Sep 5 23:32:35 2018 -0700 + + More descriptive Flow introduction text (#105) + + * Flow intro text + + * Update credits --> contributors in README + +commit d27d37ef0ce93355440b23f82a4af3842aba48f6 +Author: Cathy Wu +Date: Wed Sep 5 22:07:16 2018 -0700 + + Update README.md (#111) + +commit 9c7005a296e02592aa7b40cfdee8a7ef71c64e61 +Merge: fe872cc8 6b8117f2 +Author: AboudyKreidieh +Date: Wed Sep 5 13:07:52 2018 -0700 + + Merge pull request #94 from flow-project/tutorial-readme-typos + + Fixed small capitalization typos in tutorials README. + +commit 9e7d1fc67314838f7c47679fab560a8e5af49919 +Author: Kathy Jang +Date: Wed Sep 5 13:04:16 2018 -0700 + + Added flexibility for flow naming + +commit fe872cc8c6fac8921f8e5c97df3bd65fc217d241 +Merge: c0683bb5 dde176a4 +Author: AboudyKreidieh +Date: Wed Sep 5 12:49:14 2018 -0700 + + Merge pull request #85 from flow-project/install_sumo_binaries + + Install sumo binaries + + - modified the setup instructions to install sumo binaries into flow/bin. The binaries were built on my and Eugene's machines, as well as on AWS instances. + - sumo tools (e.g. traci) are installed in `setup.py` via a wheel. The wheel works for all operating systems (as far as I can tell so far) + - we need many people to test that the binaries work for them before this is merged. There may be some dependencies that won't work, and we can only really find out by testing this multiple times and finding the discrepancies + +commit 6b8117f27e0ffffad5d9b78c8d23ac5100323de5 +Author: Cathy Wu +Date: Wed Sep 5 09:54:03 2018 -0700 + + Update README.md + +commit dde176a4e998ae175352890ca735a8089be51983 +Author: AboudyKreidieh +Date: Tue Sep 4 23:36:03 2018 -0700 + + PR fix + +commit bcb5f9628f92702ec65396a2dca57b4e5171961e +Author: AboudyKreidieh +Date: Tue Sep 4 23:04:38 2018 -0700 + + flipped sumo installation instructions + +commit ab7154b3d649644be811413328dc9612692795be +Author: AboudyKreidieh +Date: Tue Sep 4 22:33:50 2018 -0700 + + removed unused modules + +commit ad9ccd1fd2922e8ce1023ec67bdd437a50ebb3cb +Author: AboudyKreidieh +Date: Tue Sep 4 22:31:45 2018 -0700 + + removed nose tests + +commit 62b8ca31b8a148c6ebe1a3d3e40ef45b1df72b59 +Author: AboudyKreidieh +Date: Tue Sep 4 22:29:39 2018 -0700 + + minor changes + +commit d14e3f7d982f645eb2329b7cb085a7d7edc6e20c +Author: AboudyKreidieh +Date: Tue Sep 4 22:29:28 2018 -0700 + + moved location of binaries to somewhere global + +commit 1f951e439ea4527f538de0dd8c3bfe15e0cf060c +Merge: 50af1162 c0683bb5 +Author: AboudyKreidieh +Date: Tue Sep 4 22:09:01 2018 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow into install_sumo_binaries + +commit c0683bb5db0675ade06ddcf429b4b9fc966ecc47 +Author: eugenevinitsky +Date: Tue Sep 4 22:06:47 2018 -0700 + + Update base_scenario.py to handle race condition (#89) + + * Update base_scenario.py + + self.name for base_scenario leads to race conditions by only using seconds in the naming scheme + + * ensured travis runs with python 3.6 + + * syntax fix + +commit 2d5edd366c155c11cdf5d9683e5034b710f46b30 +Author: AboudyKreidieh +Date: Tue Sep 4 21:33:56 2018 -0700 + + ensured travis runs with python 3.6 (#90) + +commit 50af116209991136000514d59ee7102b5eb4c0c8 +Merge: 6e64b523 f4dca193 +Author: AboudyKreidieh +Date: Mon Sep 3 22:27:36 2018 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow into install_sumo_binaries + +commit 6e64b523feb8ad13cd49096fabeca33325a72603 +Author: AboudyKreidieh +Date: Mon Sep 3 21:31:46 2018 -0700 + + typo + +commit e70f577f758000eb62f05c43c16a9566112f6b51 +Merge: c5e5a525 f4dca193 +Author: eugenevinitsky +Date: Mon Sep 3 20:48:37 2018 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow + +commit f4dca193054375e58dff8c0c21be58af29d1e262 +Author: eugenevinitsky +Date: Mon Sep 3 20:48:22 2018 -0700 + + updated rllib examples to conform to rllib verison 0.5.0 DO NOT MERGE (#23) + + * updated rllib examples to conform to rllib verison 0.5.0 + + * attempting travis fix + + * attempted fix + + * more fixes for tests + + * updated wheels + + * more attempts to resolve travis errors + + * added fixed setup instructions + + * updated run script + + * updated es run script + + * minor updates to es runner + + * minor for testing + + * minor tuning + + * minor + + * minor + + * fix to ars + + * another ars fix + + * minor fixes to upgrade to ray 0.5.0 + + * pointed at local setup instructions + + * minor yapf + + * flake8 fixes + + * minor + + * flake8 + + * Update ppo_runner.py + + repeat is deprecated in rllib 0.5.1 + + * fixed the review edits + + * updated version it is looking at + +commit 3a967073fbdaf87b04c863a71af2727dbd517fe1 +Author: AboudyKreidieh +Date: Mon Sep 3 20:06:00 2018 -0700 + + change instructions to choose your own sumo setup depending on OS + +commit 961fef733df48768ab20a746bab894c401b0349b +Author: AboudyKreidieh +Date: Mon Sep 3 19:56:09 2018 -0700 + + run bashrc or bash_profile when done + +commit 0bc47b7b429e8dd4b3b4cb46a80583b495b91b13 +Author: AboudyKreidieh +Date: Mon Sep 3 19:50:46 2018 -0700 + + commented binary installation + +commit d8fdc17a5d6312ff8c0011b2f9b64859c585ce6c +Author: AboudyKreidieh +Date: Mon Sep 3 19:50:10 2018 -0700 + + minor changes + +commit c0c070e37a23bfa606e0940cdf0ac7eacfdd0fe4 +Author: AboudyKreidieh +Date: Mon Sep 3 17:53:08 2018 -0700 + + typo + +commit 3af262e3aa7f6f1143fd7e2f3b63613e8df8067a +Author: AboudyKreidieh +Date: Mon Sep 3 17:43:47 2018 -0700 + + PYTHONPATH -> PATH$ + +commit 87a717e47eb835f8238f399f50ff378588dddbc2 +Author: AboudyKreidieh +Date: Mon Sep 3 17:03:01 2018 -0700 + + updated setup instructions + +commit 456bb0c567b7fb95b6a134eabc1824fa927823f5 +Author: AboudyKreidieh +Date: Mon Sep 3 16:29:12 2018 -0700 + + bug fixes sumo setup scripts + +commit 5d7ec76e0a6a40e88d5892323e5d38f80144ade8 +Merge: 4460173d 2f509462 +Author: AboudyKreidieh +Date: Mon Sep 3 16:27:34 2018 -0700 + + Merge branch 'install_sumo_binaries' of https://github.com/flow-project/flow into install_sumo_binaries + +commit 4460173de688913a5b926cd9a8620fdbc3bfd6d9 +Merge: 27e545cb 99120c80 +Author: AboudyKreidieh +Date: Mon Sep 3 16:24:15 2018 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow into install_sumo_binaries + +commit 99120c8062853edd8a17af053fbaa5b6f514b53c +Merge: b55fbe0f f08c5843 +Author: lucfisc +Date: Mon Sep 3 16:10:05 2018 -0700 + + Merge pull request #62 from lucfisc/lucfisc-new-installation + + New way to install flow + +commit 2f5094629c0adee7715be49b3edc01e536781994 +Author: Ubuntu +Date: Mon Sep 3 19:57:11 2018 +0000 + + bug fixes + +commit c5e5a52517792a99ba2055090af6861d265f1f7f +Merge: 016ba88c b55fbe0f +Author: eugenevinitsky +Date: Mon Sep 3 12:52:32 2018 -0700 + + resolved merge conflict + +commit b55fbe0f203bfa13cb524deacd1b37c343f9b635 +Author: AboudyKreidieh +Date: Mon Sep 3 12:51:04 2018 -0700 + + Docstring controllers utils (#52) + + * renamed solution_template.py -> solution.py.template + + * docstring cleanup to utils + + * misc docstring fixes + + * cleanup to docstrings in controllers + + * returned the attribute documentation to the constructor + + * removed redundancy + + * typos fixed + +commit 0ed609b399a693ae7c0f18d5674c2feb5e444abb +Author: AboudyKreidieh +Date: Mon Sep 3 12:45:56 2018 -0700 + + cleaned up docstring in envs (#49) + + * cleaned up docstring in envs + + * added Nish fixes + +commit f08c5843be9504aab986fab839e851d261457f8e +Merge: 60db0578 31037582 +Author: eugenevinitsky +Date: Mon Sep 3 12:45:10 2018 -0700 + + Merge branch 'master' into lucfisc-new-installation + +commit 31037582e46a60330f49c76232827b2e8599588d +Author: AboudyKreidieh +Date: Mon Sep 3 12:36:37 2018 -0700 + + cleanup to docstrings in tests (#46) + +commit 27e545cb102f7f398aa3765aea40cb157ce2c247 +Author: AboudyKreidieh +Date: Mon Sep 3 12:30:54 2018 -0700 + + sumo binaries and tools installed from setup.py + +commit a7428aa07306616e17eaa7b0e205ef5ac96efc1d +Author: Fangyu Wu +Date: Mon Sep 3 12:16:12 2018 -0700 + + Fix ray sudo install bug (#76) + + * Fix ray sudo install bug. + + * Update flow_setup.rst + + python3 removed + +commit 60db05788ffd872ac5a75f957109cb67cf60f36e +Author: lucfisc +Date: Mon Sep 3 02:51:51 2018 -0700 + + Add word to solve conflict + + Added two lines in order to solver the merging conflict I had + +commit c4d421e1c09188e0c08e0f4cd4a199719853b094 +Author: lucfisc +Date: Mon Sep 3 02:46:52 2018 -0700 + + Update flow_setup.rst + +commit ac0f1932f4398e6f59983a61bfc1c0d8f2bab71c +Author: AboudyKreidieh +Date: Mon Sep 3 01:02:56 2018 -0700 + + sumotools wheel and binaries + +commit 068beba91b2426c3cc907776675c8667ccd92cca +Author: AboudyKreidieh +Date: Sun Sep 2 17:48:42 2018 -0700 + + replaced sumo_binary with render + +commit e822a450f5c5ec41a13bb7c54fc62a74c5628aab +Author: AboudyKreidieh +Date: Sun Sep 2 16:47:55 2018 -0700 + + resolved lane change test issue + +commit c7a31e4fa1ce64838f55d8b145a585c717c5638b +Author: AboudyKreidieh +Date: Sun Sep 2 16:37:29 2018 -0700 + + fixed shapes in figure eight + +commit 05c96b91897451c9eed016994be68f4a12331e50 +Author: AboudyKreidieh +Date: Sun Sep 2 14:54:01 2018 -0700 + + bug fixes + +commit ee822031137bb1de495ae583746c73d41b0b146f +Author: AboudyKreidieh +Date: Sun Sep 2 13:50:00 2018 -0700 + + minor changes + +commit 3d3f04a295fdfdd55f2235fce708075f851ef9c5 +Author: AboudyKreidieh +Date: Sun Sep 2 13:07:01 2018 -0700 + + prevent collisions from abrupt decelerations + +commit 4bda180da21c04f9d3a42d74406894c190d883a2 +Author: AboudyKreidieh +Date: Sun Sep 2 09:11:46 2018 -0700 + + bug fix to avoid large decelerations when a vehicles enters the network + +commit 25772884342099fc323b68bd1cbd5da655058e9d +Author: AboudyKreidieh +Date: Sat Sep 1 15:07:34 2018 -0700 + + modified IDM to deal with new changes at intersections + +commit d8dcf4374e35df73400aab6a4d5b0eca1907a47c +Author: AboudyKreidieh +Date: Sat Sep 1 14:47:06 2018 -0700 + + working on sumo binaries for travis + +commit 7cbdc08396fb43f344fbc4e96abc730041e27ca7 +Author: AboudyKreidieh +Date: Sat Sep 1 14:46:40 2018 -0700 + + compatibility with the new sumo version + +commit 9ccd83d1223339746877c9174e850afba398d454 +Author: AboudyKreidieh +Date: Sat Sep 1 14:45:33 2018 -0700 + + new sumo version + +commit 915db47a92e46e6989261ce4410f6842f73e419d +Author: Fangyu Wu +Date: Fri Aug 31 22:11:23 2018 -0700 + + Fix "json not imported" bug. Ignore visual studio folder. + +commit 47bbf7e6d354b1f31ec2f6b2d67a29667754a0b7 +Author: lucfisc +Date: Fri Aug 31 17:15:55 2018 -0700 + + TYPO in the text + +commit 9657395b9b02ee00b5938717681d87c440cfe680 +Author: lucfisc +Date: Fri Aug 31 17:13:11 2018 -0700 + + Update flow_setup.rst + +commit 6ad96ed7fd6cac35647a79b01be7062e7e8ee269 +Author: lucfisc +Date: Fri Aug 31 17:12:39 2018 -0700 + + Remote Desktop dockerfile + +commit 7c5591c9d0241480009c7d8b707c0326ad0dc9dd +Author: lucfisc +Date: Fri Aug 31 17:11:46 2018 -0700 + + Delete Dockerfile + +commit ae372a7c0e421b65da2d1aefe8c4ac2caa8dbde3 +Merge: e43e1ed4 bc97132e +Author: Nishant +Date: Fri Aug 31 14:44:00 2018 -0700 + + merging master + +commit bc97132e9e2d05262bb6bbad5bda173fd9f4ae92 +Merge: 04861cad 7c15dc6d +Author: AboudyKreidieh +Date: Fri Aug 31 13:48:19 2018 -0700 + + Merge pull request #50 from flow-project/tests_rename + + fixed tests that weren't running + +commit 04861cad930db84415661786c860ca595e3e4eae +Merge: 10daae67 7d1cb9b2 +Author: AboudyKreidieh +Date: Fri Aug 31 13:30:29 2018 -0700 + + Merge pull request #45 from flow-project/benchmarks_fix + + Benchmarks fix + +commit 7c15dc6d1b5a83c4c9b896a0d2c69259413ee366 +Author: AboudyKreidieh +Date: Fri Aug 31 13:27:13 2018 -0700 + + PR fixes + +commit 7d1cb9b2a2af48202390a17baf08ec86408669aa +Author: AboudyKreidieh +Date: Fri Aug 31 13:21:55 2018 -0700 + + PR fix + +commit 4d9545a7293fc7482d4773414688c33591fc78fc +Author: lucfisc +Date: Fri Aug 31 12:18:06 2018 -0700 + + Dockerfile remote desktop + + Docker file to install the remote desktop + +commit 10daae675ab93836744af0cd08360991aa2d222e +Author: Kathy Jang +Date: Fri Aug 31 11:57:47 2018 -0700 + + Setup instruction fixes (#73) + +commit 4224de985fd0ddab0b61db1da776a1289e6b1792 +Merge: a8083d0c 6dc6e228 +Author: AboudyKreidieh +Date: Wed Aug 29 22:25:03 2018 -0700 + + Merge pull request #68 from flow-project/eugenevinitsky-patch-1 + + Update flow_setup.rst + +commit 6dc6e228d92d840e4bf50c8d48493928a1dbdcc7 +Author: eugenevinitsky +Date: Wed Aug 29 17:46:52 2018 -0700 + + Update flow_setup.rst + + Mac users have to open XQuartz before SumoGui will work + +commit 8668bc1329e88dcdf7d58f491dd8f0a63e5e88ff +Merge: 617abdc8 e5f90b02 +Author: lucfisc +Date: Wed Aug 29 17:03:11 2018 -0700 + + Merge pull request #4 from lucfisc/lucfisc-new-installation-v2-1 + + Changes in the table of content to make it work + +commit e5f90b02e369d2a344f84ce4fc22500f1ba2b523 +Author: lucfisc +Date: Wed Aug 29 17:00:21 2018 -0700 + + Update flow_setup.rst + +commit a8083d0c526903f2cf67b3787c45a17968f3f4a2 +Merge: b895773a 0dda1540 +Author: AboudyKreidieh +Date: Wed Aug 29 16:17:49 2018 -0700 + + Merge pull request #53 from flow-project/docstring_core + + docstring cleanup for flow/core/ + +commit b895773a5202e0830755b00314781f8cae1f37f3 +Merge: 307ac21e 5f2544d5 +Author: AboudyKreidieh +Date: Wed Aug 29 16:17:13 2018 -0700 + + Merge pull request #54 from flow-project/docstring_examples + + docstring cleanup to examples + +commit 0dda15406fd06bda543fdc1c9ec49a8ad10a0344 +Merge: 266c23d6 307ac21e +Author: AboudyKreidieh +Date: Wed Aug 29 16:09:34 2018 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow into docstring_core + +commit 5f2544d551243ef2dfbfc5ad2a04f2e828398be9 +Author: AboudyKreidieh +Date: Wed Aug 29 16:07:03 2018 -0700 + + PR fixes + +commit 307ac21ef1a546dbac5810dc689bb1c0a94817fc +Merge: 4d36c9aa 0c88df4c +Author: nskh +Date: Wed Aug 29 15:45:41 2018 -0700 + + Merge pull request #67 from flow-project/flow-readthedocs + + Update README.md with flow.readthedocs.io + +commit 4d36c9aa8f540b39c0f954dc2710c63a1cb91142 +Merge: ad393229 1491b3c8 +Author: nskh +Date: Wed Aug 29 15:44:34 2018 -0700 + + Merge pull request #66 from nskh/master + + title case for akvo flow redirect + +commit 0c88df4c30ea75128279f71779c1ee37f7313a2c +Author: Cathy Wu +Date: Wed Aug 29 15:15:17 2018 -0700 + + Update README.md + +commit 1491b3c88fed0ccadbd5bd54043f45c6c35f6794 +Author: Nishant +Date: Wed Aug 29 15:01:32 2018 -0700 + + docs links on readme.md + +commit e4f6f6adc97d84d3e233f87521b6c0588fff3a62 +Author: Nishant +Date: Wed Aug 29 15:00:58 2018 -0700 + + updating docs passing badge + +commit 9f83f9389607f1bb001577ed506bd79244284147 +Author: Nishant +Date: Wed Aug 29 14:44:47 2018 -0700 + + title case for akvo flow redirect + +commit 617abdc8af107032264d14b89aea742f383c4bf2 +Author: lucfisc +Date: Tue Aug 28 20:35:19 2018 -0700 + + Update flow_setup.rst + +commit e6140d591cb67a2fc84e78cd8a2af7981df8b74f +Author: lucfisc +Date: Tue Aug 28 12:55:57 2018 -0700 + + Update flow_setup.rst + +commit 98ce6fa5c9abf1448ff309f58e45cf692e38de68 +Merge: c97339e0 d180c335 +Author: lucfisc +Date: Tue Aug 28 12:53:43 2018 -0700 + + Merge pull request #2 from lucfisc/lucfisc-patch-v2-INSTALLATION + + Added a summary + +commit d180c3355186022deba450afe7f5923e6ad29a73 +Author: lucfisc +Date: Tue Aug 28 12:52:33 2018 -0700 + + Update of flow setup with summary + + Added a summary + +commit 2b094522605ca271e90a14e4290568cd7c2d8860 +Author: lucfisc +Date: Tue Aug 28 12:45:12 2018 -0700 + + Update flow_setup.rst + +commit ad393229f5e0b02b7c8828750c39b8f34272502d +Merge: 8510b3e2 ebf78656 +Author: AboudyKreidieh +Date: Tue Aug 28 12:45:06 2018 -0700 + + Merge pull request #56 from flow-project/docstring_scenarios + + docstring cleanup for scenarios + +commit c97339e0014f8284e20fceec740bb115ab2a4e88 +Author: lucfisc +Date: Tue Aug 28 12:41:42 2018 -0700 + + Summary added + +commit ab60b97e355863ad056ed2cca994782bc49e1aca +Author: lucfisc +Date: Tue Aug 28 12:41:20 2018 -0700 + + Update flow_setup.rst + +commit ebf7865666d80f93226bf4b462f534e92b397fe8 +Author: AboudyKreidieh +Date: Tue Aug 28 12:37:09 2018 -0700 + + PR fixes + +commit 8510b3e288d3b16df0a5817e4ce3e4b4431a701e +Author: eugenevinitsky +Date: Tue Aug 28 12:34:54 2018 -0700 + + Fixed setup (#65) + + * added fixed setup instructions + + * fix to PR + +commit e9972d5156589e6e9ec8b291a3ee4b19bcb13a3f +Author: AboudyKreidieh +Date: Tue Aug 28 12:16:21 2018 -0700 + + documentation cleanup for visualizers (#57) + +commit d19da517f61f27727b85f414e4de81cf68a354ac +Author: lucfisc +Date: Tue Aug 28 12:15:28 2018 -0700 + + Change version of matplotlib (#63) + + As showed in one of the issues, I found a problem of conflict between matplotlib 2.2.2 and other librairies + Changing to matplotlib 2.0.2 works + +commit 016ba88c47674665ee7127b16ff4bad01c4813f9 +Author: eugenevinitsky +Date: Tue Aug 28 12:13:37 2018 -0700 + + added fixed setup instructions + +commit d8ff3997fff51aaa2a11800267f8035efd6c1331 +Author: lucfisc +Date: Tue Aug 28 11:34:23 2018 -0700 + + Update flow_setup.rst + +commit b321ac541634ba865d9e2f59043d4b603eb166cf +Author: lucfisc +Date: Tue Aug 28 11:24:42 2018 -0700 + + Update flow_setup.rst + +commit b0f5cb54d3dd52dce8aaf63346d4353f7de74a4e +Author: lucfisc +Date: Tue Aug 28 11:14:40 2018 -0700 + + New way to install flow + + Add a Dockerfile that can run with a desktop on your browser with every flow packages installed + +commit dfe19f5f58f975076d7df58de7939df36a221e8c +Merge: dc295f04 708f30ff +Author: AboudyKreidieh +Date: Mon Aug 27 00:58:03 2018 -0700 + + Merge pull request #39 from flow-project/setup_fix + + Setup fix + - The links to conda and miniconda were broken + - Makefile for docs was missing + +commit 064ca64831bb313a45b130ddd374f7ed9f5523fd +Author: AboudyKreidieh +Date: Mon Aug 27 00:22:27 2018 -0700 + + docstring cleanup for scenarios + +commit f42a7550d5d1c3326651b29948a3ee013ba1e314 +Author: AboudyKreidieh +Date: Sun Aug 26 23:16:50 2018 -0700 + + docstring cleanup to examples + +commit dc295f042f4f0edb5e3d07f02dfff98f975574df +Merge: 8a7f403d ee10e97e +Author: AboudyKreidieh +Date: Sun Aug 26 22:10:25 2018 -0700 + + Merge pull request #41 from flow-project/remove_initials + + removed positions and lanes from initial_config + - removed positions and lanes from `initial_config`. These attributes are modified by the generator class, and causes confusion and some bugs when trying to use the same parameters on a new task (e.g. what we do in the homework, which is all written in jupyter). This removes the need to write: + ``` + initial_config.lanes, initial_config.positions = None, None + ``` + - minor modifications to the docstrings + +commit 266c23d6f1f64ef9f573aa42271dbe197c11d04c +Author: AboudyKreidieh +Date: Sun Aug 26 21:59:34 2018 -0700 + + pep8 + +commit 5e130b303250c8f378ee4915dd0eaf5fcf791e1f +Author: AboudyKreidieh +Date: Sun Aug 26 21:54:10 2018 -0700 + + docstring cleanup for flow/core/ + +commit 929506ca7df29d9d280888cea13ca09ae4006410 +Author: AboudyKreidieh +Date: Sun Aug 26 17:53:43 2018 -0700 + + fixed tests that weren't running + +commit 8a7f403d62359b293f26eaf1ee919dfb4d675403 +Merge: fb3f0d54 58366075 +Author: nskh +Date: Sun Aug 26 17:24:41 2018 -0700 + + Merge pull request #47 from nskh/docs + + Adding redirect to flow.readthedocs.io owner on docs homepage + +commit 58366075c097a2d9e1acd258e80696b387fee62d +Merge: 48016436 0411728f +Author: Nishant +Date: Sun Aug 26 15:29:45 2018 -0700 + + Merge branch 'master' of github.com:nskh/flow into docs + +commit 0411728f983ff8062e489b630a571daf0629f93d +Author: Nishant +Date: Sun Aug 26 15:29:26 2018 -0700 + + one newline + +commit 4d34adac24f566c76949000557ef9a458fefe9a0 +Author: Nishant +Date: Sun Aug 26 15:28:49 2018 -0700 + + reflecting upstream/master + +commit 48016436fcf4b24645364147d7f068e98c7534dd +Author: Nishant +Date: Sun Aug 26 15:21:04 2018 -0700 + + akvo flow redirect + +commit 627c64eec2db39effee9c8218242ea685b098e68 +Author: AboudyKreidieh +Date: Sun Aug 26 13:34:12 2018 -0700 + + cleanup to benchmark docstrings + +commit ad8016cc012f36f920734ef6c9738dac554b36f7 +Author: AboudyKreidieh +Date: Sun Aug 26 13:33:11 2018 -0700 + + tests for baselines + +commit 2cae16a2670d8828d6c2fc655523c1c58e8c3ab1 +Author: AboudyKreidieh +Date: Sun Aug 26 12:49:25 2018 -0700 + + docstring cleanup + +commit 4a27afdffb12b89a4f051d6e1f61e4d7e619b4a6 +Author: AboudyKreidieh +Date: Sun Aug 26 12:13:16 2018 -0700 + + reintroduced changes from berkeleyflow + +commit ee10e97ebc5af9fd3c247684badcf8e52be21343 +Author: AboudyKreidieh +Date: Sun Aug 26 10:37:58 2018 -0700 + + removed positions and lanes from initial_config + +commit 708f30ff7849a125bc9c0a356eac1183b11de5dd +Author: AboudyKreidieh +Date: Sun Aug 26 00:32:04 2018 -0700 + + bolded "or" + +commit 5b2a6c774367d66bfd2be88710d2bc9b73433c89 +Merge: 8b4d140d fb3f0d54 +Author: Nishant +Date: Sat Aug 25 13:26:02 2018 -0700 + + merging master + +commit e43e1ed4b1c48829417375f4b626112353e5679f +Author: Nishant +Date: Fri Aug 24 23:02:20 2018 -0700 + + added rllab ec2 tutorial to docs + +commit 0328d1cd2d875cbe4a7e97c21f42b2e1ff912375 +Author: Nishant +Date: Fri Aug 24 22:48:28 2018 -0700 + + extra + +commit 30d9eb9bea809231247322979f51b95ca298d13c +Merge: a57d4481 fb3f0d54 +Author: Nishant +Date: Fri Aug 24 22:47:01 2018 -0700 + + Merge branch 'master' of github.com:flow-project/flow into rllab_tutorial + +commit a2f78e7db36a81a96b1834f79d764cc0b488714f +Merge: 598bf71a fb3f0d54 +Author: AboudyKreidieh +Date: Fri Aug 24 19:08:59 2018 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow into setup_fix + +commit fb3f0d54e06b9e940b7a2ba8772395ee7ea0f17b +Merge: 8ac6cc29 fba1ade1 +Author: AboudyKreidieh +Date: Fri Aug 24 19:06:29 2018 -0700 + + Merge pull request #38 from flow-project/yapf + + Yapf + +commit a57d4481ce09cb89d50b9ddd1d1f05f08b1021bf +Merge: 5f3ebc20 8ac6cc29 +Author: Nishant +Date: Fri Aug 24 18:28:51 2018 -0700 + + Merge branch 'master' of github.com:flow-project/flow into rllab_tutorial + +commit 5f3ebc20450aa9ced952540bbba11710c1233ec3 +Author: Nishant +Date: Fri Aug 24 17:41:49 2018 -0700 + + deleting cell + +commit 598bf71aa721cc66c58ce2f5520e105effe14e48 +Merge: 8def09d6 fba1ade1 +Author: eugenevinitsky +Date: Fri Aug 24 17:32:06 2018 -0700 + + Merge branch 'yapf' into setup_fix + +commit 8def09d644b8443bb27fb6232197d687b3d57a34 +Author: eugenevinitsky +Date: Fri Aug 24 17:24:38 2018 -0700 + + fixed flow setup to link properly + +commit fba1ade155409ca7987943d6481ed73f5e0cb8c8 +Author: eugenevinitsky +Date: Fri Aug 24 16:31:35 2018 -0700 + + minor fixes + +commit 18ec521b84870d31b11321dc92397f8aaa001d1b +Author: eugenevinitsky +Date: Fri Aug 24 16:17:48 2018 -0700 + + more yapf + +commit fe9073755d7c79b09cfc4321bed58a3535f8cc78 +Author: Fangyu Wu +Date: Fri Aug 24 16:14:41 2018 -0700 + + Add tested benchmark Dockerfile. + +commit f8a9bcd540d81c3c775cfd6bcfe750238933d2fd +Author: eugenevinitsky +Date: Fri Aug 24 14:20:41 2018 -0700 + + more yapf; + +commit 504c3c817b284b21c45c0cd2d964a55249738ca9 +Author: eugenevinitsky +Date: Fri Aug 24 13:57:59 2018 -0700 + + yapf fixes + +commit 8ac6cc299f7427eb282f250a63e96922c18d485b +Merge: 1cf8ec51 1a2e0c57 +Author: AboudyKreidieh +Date: Fri Aug 24 10:04:31 2018 -0700 + + Merge pull request #36 from flow-project/setup_bugfix + + bug fix in setup instructions + +commit 1a2e0c57b165b870ee563befd71f288c34642631 +Author: eugenevinitsky +Date: Fri Aug 24 09:15:09 2018 -0700 + + minor + +commit d38336e2a1ce6250272576d2c02b07634307ec9d +Author: Fangyu Wu +Date: Thu Aug 23 21:52:58 2018 -0700 + + Fix a minor bug. + +commit 425cc355dcfc96b9a2d3bdd6c2a42717693b92ab +Author: Fangyu Wu +Date: Thu Aug 23 21:50:11 2018 -0700 + + Fix minor bugs. + +commit 1cf8ec51171388b2acd453bcaa1620d589625e4b +Merge: ccf07ed1 8be63bfd +Author: Fangyu Wu +Date: Thu Aug 23 19:02:59 2018 -0700 + + Merge pull request #27 from flow-project/leaderboard + + Add leaderboard utility. + +commit ccf07ed182aff2fe8ff7381da766a6fa03b0b24d +Merge: 043865f1 a91bba33 +Author: AboudyKreidieh +Date: Thu Aug 23 14:54:37 2018 -0700 + + Merge pull request #28 from flow-project/amend_setup + + Amend setup + - Created an environment.yml file that supersedes the rllab-multi-agent environment.yml file + - updated the setup instructions to handle it + +commit a91bba33ac60edd4d3f1e4f5cae6e947fde00d15 +Author: AboudyKreidieh +Date: Thu Aug 23 14:15:07 2018 -0700 + + merged separated thing + +commit 043865f1e39faedafa2a7a4b4d08966a451dafff +Merge: 0a3b7d36 f1ee2f8e +Author: AboudyKreidieh +Date: Thu Aug 23 14:04:14 2018 -0700 + + Merge pull request #26 from flow-project/eugenevinitsky-patch-1 + + Update requirements.txt + +commit 744d797544cc54c7e8bc5fcf98724283f99e2e68 +Author: eugenevinitsky +Date: Thu Aug 23 13:34:28 2018 -0700 + + added bashrc vs profile + +commit f466c547573cc9b4f00f0830259e9c4a879b73ac +Author: eugenevinitsky +Date: Thu Aug 23 12:45:36 2018 -0700 + + attempt to resolve travis issues take 2 + +commit e538bd16903be7b65de95832a95986633458a8b8 +Author: eugenevinitsky +Date: Thu Aug 23 12:40:39 2018 -0700 + + attempting to pass travis tests + +commit 6d857260e81cf1917d2536645b886591734c8113 +Author: eugenevinitsky +Date: Thu Aug 23 12:07:59 2018 -0700 + + updated setup instructions for OSX + +commit 5497c1d69f7c66dbed99c17bd052fee42f457cbe +Author: eugenevinitsky +Date: Thu Aug 23 11:59:59 2018 -0700 + + working environment.yml file + +commit cdd465e05c2400480856df40f9731ee67e703136 +Merge: 467e5cf6 0a3b7d36 +Author: eugenevinitsky +Date: Thu Aug 23 11:40:06 2018 -0700 + + Merge branch 'master' of https://github.com/flow-project/flow into amend_setup + +commit 467e5cf6d2fd6d627fa5fed05e19fcbe7cfbcc1f +Author: eugenevinitsky +Date: Thu Aug 23 11:40:02 2018 -0700 + + started environment.yml + +commit 8be63bfd33443ff42209606239b659c0705a075c +Author: Fangyu Wu +Date: Wed Aug 22 23:52:46 2018 -0700 + + I hope this is the last PEP violation. + +commit f6002f4da39b7ea93de07de2e88c53f35db643ab +Author: Fangyu Wu +Date: Wed Aug 22 23:45:45 2018 -0700 + + Fix more PEP violations. + +commit e7b52580a38518116122e807402ddbb8f5780df4 +Author: Fangyu Wu +Date: Wed Aug 22 23:35:03 2018 -0700 + + Fix E402 violation. + +commit 2f4070492c53af96649089497baa47fa756eb46c +Author: Fangyu Wu +Date: Wed Aug 22 23:14:36 2018 -0700 + + Add leaderboard utility. + +commit f1ee2f8eff2f94238cb00446b60f9f57217ca09b +Author: eugenevinitsky +Date: Wed Aug 22 19:25:38 2018 -0700 + + Update requirements.txt + + 1.1.0 is not correct and suggests that 1.1.0 would work. It doesn't and appears to break pip somehow + +commit 0a3b7d368bbb9c2acf98be1b4e6863821edfed6e +Author: AboudyKreidieh +Date: Wed Aug 22 16:14:03 2018 -0700 + + modified the rllab setup instructions so that they now work: (#24) + +commit d9b53134ba6ca8c02852908d94796f12023c860d +Author: AboudyKreidieh +Date: Wed Aug 22 10:52:33 2018 -0700 + + Version 020 (#21) + + * changes from berkeleyflow + + * replaced berkeleyflow with flow-project + + * more mods to links + + * more mods to links + + * travis build + + * berkeleyflow -> flow-project + + * modified local directory call + +commit e9f7ea00725f1a171f402720b51b8affa11fdf13 +Author: Nishant +Date: Mon Aug 20 18:20:10 2018 -0700 + + result dir + +commit 9ff877d4678b1fee442b7601ac37663882db1c75 +Author: Nishant +Date: Mon Aug 20 18:16:49 2018 -0700 + + draft tutorial + +commit d13abdb781c02b08dccc2cf5537133ef2a1256ad +Merge: 86dfa8d9 8ab2a3ff +Author: Nishant +Date: Thu Aug 16 11:40:26 2018 -0700 + + Merge branch 'master' of github.com:berkeleyflow/flow into rllab_tutorial + +commit 8ab2a3ffed220365ea4cdae48939aecb62f78a52 +Merge: 00fd0786 7b5b36b2 +Author: AboudyKreidieh +Date: Thu Aug 16 10:55:54 2018 -0700 + + Merge pull request #32 from berkeleyflow/tests_utils + + Tests utils + - added tests for methods in flow/utils + - bug fix to the assignment of traffic lights in `get_flow_params` method in utils/rllib.py + - modified the `types` attribute of the `Vehicles` class for it to be more easily unittestable + +commit 7b5b36b25203e51e201f4c7dfaa5c93a05a997da +Author: AboudyKreidieh +Date: Thu Aug 16 10:42:08 2018 -0700 + + typo + +commit e33916f6534503668a1b5da3e878d5d6b4215a97 +Author: AboudyKreidieh +Date: Thu Aug 16 10:39:28 2018 -0700 + + test includes inflows now + +commit 04a226f95b5bae1c3847c240dea966163567a544 +Merge: c8912c7d 00fd0786 +Author: AboudyKreidieh +Date: Thu Aug 16 10:27:44 2018 -0700 + + Merge branch 'master' of https://github.com/berkeleyflow/flow into tests_utils + +commit 00fd07863242046863b015ae043e3f0bc5da61d5 +Merge: 4453d0d9 217bf74e +Author: eugenevinitsky +Date: Thu Aug 16 10:03:22 2018 -0700 + + Merge pull request #33 from berkeleyflow/cleanup_bloat + + minor cleanup + +commit c8912c7d26dcd2ea0472805018502a4476d6dddd +Author: eugenevinitsky +Date: Thu Aug 16 09:57:00 2018 -0700 + + minor pep8 fixes + +commit 4453d0d90ea9a88fc9a16eca090fa9c95c18083f +Merge: 442fe1cc a7a6f5f6 +Author: eugenevinitsky +Date: Thu Aug 16 09:39:05 2018 -0700 + + Merge pull request #31 from berkeleyflow/traffic_lights_env + + discrete traffic light env + +commit 442fe1cc0a708423d0c167433f4369d1d1658fe2 +Merge: 3a3212cf 041fc247 +Author: eugenevinitsky +Date: Thu Aug 16 09:37:44 2018 -0700 + + Merge pull request #25 from berkeleyflow/examples_fix + + Examples fix + +commit 041fc24719f0a7c3158c87808e12e5d57f464e00 +Author: AboudyKreidieh +Date: Wed Aug 15 15:34:48 2018 -0700 + + PR fix + +commit 3a3212cffe6892d782a1afe48cb25a277d864d59 +Merge: bdb3f743 6eda6214 +Author: eugenevinitsky +Date: Wed Aug 15 15:28:55 2018 -0700 + + Merge pull request #38 from berkeleyflow/nskh-patch-1 + + fixing typo (rllab->rllib) + +commit 6eda62141d2f682a6c042f9321df443609cfb601 +Author: nskh +Date: Wed Aug 15 15:22:50 2018 -0700 + + fixing typo (rllab->rllib) + +commit 217bf74e405b37110aabd50ed22db219b47f6c49 +Author: AboudyKreidieh +Date: Mon Aug 13 00:57:20 2018 -0700 + + removed a file from the front page of flow that I don't think is used by anyone + +commit 8cadd7637b8aad956074170c97b69212d98c81ea +Author: AboudyKreidieh +Date: Sun Aug 12 18:49:07 2018 -0700 + + pep8 + +commit c9b050b77b0bb8fa23eab7503681971315772122 +Author: AboudyKreidieh +Date: Sun Aug 12 18:36:55 2018 -0700 + + added test for utils/registry.py + +commit 716eb2acf6c1f4a831b3ae3f766825661c6d011b +Author: AboudyKreidieh +Date: Sun Aug 12 18:19:00 2018 -0700 + + tests for methods in utils/rllib + +commit bdb3f743096605db00b7b06b50fb5eb91d203fc5 +Merge: dc9c5151 ca6fe568 +Author: AboudyKreidieh +Date: Sat Aug 11 15:45:44 2018 -0700 + + Merge pull request #18 from berkeleyflow/linux_build_instructions + + Linux build instructions + +commit a7a6f5f6522a64c2d596d95ba401f6276d690e78 +Author: AboudyKreidieh +Date: Fri Aug 10 13:39:46 2018 -0700 + + discrete traffic light env + +commit 27f3c6552e07488c82cbc595d288b53628b47040 +Merge: d0fd5cda dc9c5151 +Author: AboudyKreidieh +Date: Fri Aug 10 13:25:54 2018 -0700 + + Merge branch 'master' of https://github.com/berkeleyflow/flow into examples_fix + +commit dc9c51513aeacd3cd718669eb7d78ea90e22324f +Merge: 5700337c 63c12f5b +Author: AboudyKreidieh +Date: Fri Aug 10 13:24:52 2018 -0700 + + Merge pull request #23 from berkeleyflow/flow_devel_merge + + moved changes from flow-devel + +commit d0fd5cdae8c4f4f6a0c5d2a3d5d9a5b43e1cfd42 +Author: AboudyKreidieh +Date: Thu Aug 9 23:53:35 2018 -0700 + + added missing example + +commit 1191fcd190668f9e71f1c52f700e65d493afa4b6 +Author: AboudyKreidieh +Date: Thu Aug 9 23:52:28 2018 -0700 + + test fixed + +commit 7fdf0a59175adff6ba227530e0b47fa393de6014 +Merge: f266a6bf 5700337c +Author: AboudyKreidieh +Date: Thu Aug 9 23:35:58 2018 -0700 + + Merge branch 'master' of https://github.com/berkeleyflow/flow into examples_fix + +commit f266a6bf354fb78658d03b557fa3cef186b128a8 +Author: AboudyKreidieh +Date: Thu Aug 9 23:35:07 2018 -0700 + + cleaned up examples folder + +commit 5700337c4cc57d9a2c1fee6bba8587a0947d03fc +Author: Fangyu Wu +Date: Thu Aug 9 23:17:47 2018 -0700 + + Add __version__ macro (#17) + +commit 6e3fa53791d0b7c8dbab1184105e1831f059b563 +Merge: 8b4d140d 7c54bb46 +Author: AboudyKreidieh +Date: Thu Aug 9 22:46:17 2018 -0700 + + Merge pull request #16 from berkeleyflow/unit_test_backoff + + Extremely minor change to have the tests run faster. Backoff is not applied if we are in unit test mode. + +commit 7c54bb46e2441ef066187c74f8912d51d49e92ef +Merge: 0ad7e26c 8b4d140d +Author: AboudyKreidieh +Date: Thu Aug 9 22:05:31 2018 -0700 + + Merge branch 'master' of https://github.com/berkeleyflow/flow into unit_test_backoff + +commit 8b4d140d3d9e6f81991269dbd321673dee6640f4 +Merge: 7289422b de3a3f69 +Author: AboudyKreidieh +Date: Thu Aug 9 22:00:21 2018 -0700 + + Merge pull request #19 from berkeleyflow/docs + + mock imports for docs + +commit 7289422b90a485fa291e5516e982a65a11f9c474 +Merge: 3ddd3635 b3ed531d +Author: AboudyKreidieh +Date: Thu Aug 9 21:58:04 2018 -0700 + + Merge pull request #24 from berkeleyflow/stress_test + + backoff adjustment + +commit b3ed531d8f97c655895475aeca6133fb77d056c8 +Author: Nishant +Date: Thu Aug 9 17:32:36 2018 -0700 + + duplicating berkeleyflow/flow-devel/#87 + +commit 86dfa8d9f4142e4a6e442bc08a25ab3f94725908 +Author: Nishant +Date: Thu Aug 9 17:30:32 2018 -0700 + + initial tutorial 11 commit + +commit 63c12f5bea2cd1baa7b41f21bbc288579c8c4c5b +Author: AboudyKreidieh +Date: Thu Aug 9 17:24:55 2018 -0700 + + moved changes from flow-devel + +commit de3a3f690584b38ec55ced1192b159e7867c0680 +Author: Nishant +Date: Thu Aug 9 16:51:57 2018 -0700 + + restored setup.py + +commit cde075c33b8eeeb1526dc379979143ef1c4ff9f5 +Author: Nishant +Date: Thu Aug 9 16:12:00 2018 -0700 + + mock matplotlib + +commit af0b1fa35e1bc5b619f6895ff441ea38b35eaa85 +Author: Nishant +Date: Thu Aug 9 16:07:39 2018 -0700 + + mock flow is a bad idea + +commit ca6fe568d5e55e63a08f77d089736c066e1f06c9 +Author: eugenevinitsky +Date: Thu Aug 9 16:00:25 2018 -0700 + + fixed sumo build instructions for linux + +commit 4b1d0962c6f0710085d52cba45e673f93a0069fb +Author: Nishant +Date: Thu Aug 9 15:48:20 2018 -0700 + + mock flow? + +commit 775b5d7c787a0e27e0c8e628a233e9e0cca2c83b +Merge: 3f3adecf 3ddd3635 +Author: eugenevinitsky +Date: Thu Aug 9 15:42:44 2018 -0700 + + Merge branch 'master' of https://github.com/berkeleyflow/flow + +commit 82cf114bf67c64d0bd63125494f7672c4064e888 +Author: Nishant +Date: Thu Aug 9 15:41:32 2018 -0700 + + more mocks + +commit b11dead20e31bbd5630b984fbfaf771ff4003e3a +Merge: 5c6d8eb9 3ddd3635 +Author: Nishant +Date: Thu Aug 9 15:31:40 2018 -0700 + + Merge branch 'master' of github.com:berkeleyflow/flow into docs + +commit 0ad7e26cec9931cd33efec9ed7605c9b3881a8bc +Merge: 3f3adecf 3ddd3635 +Author: eugenevinitsky +Date: Thu Aug 9 15:29:23 2018 -0700 + + Merge branch 'master' of https://github.com/berkeleyflow/flow into unit_test_backoff + +commit 3f3adecf65fc500a0963d0fed80183f168083050 +Author: eugenevinitsky +Date: Thu Aug 9 15:29:07 2018 -0700 + + no backoff in unit tests + +commit 3ddd363575f47c4e34421055205597f699dc5d34 +Merge: 21829349 1742149d +Author: eugenevinitsky +Date: Thu Aug 9 14:17:56 2018 -0700 + + Merge pull request #15 from berkeleyflow/setup_update + + added requirements, minor changes to setup instructions + +commit 1742149d72a3d34df93f2d123b26b8e7ee5aea49 +Author: eugenevinitsky +Date: Thu Aug 9 13:33:42 2018 -0700 + + Update requirements.txt + + Added scipy to requirements + +commit 5abc40fecc0418391c23b75d13315a919ce999e3 +Author: eugenevinitsky +Date: Thu Aug 9 13:18:03 2018 -0700 + + added requirements, minor changes to setup instructions + +commit 5c6d8eb9f5f6a99e97aa99618743d995a74c4ee4 +Author: Nishant +Date: Thu Aug 9 12:28:53 2018 -0700 + + more print + +commit 1d3b7e2a0d35b7f86cfae359dc962f243a719a77 +Author: Nishant +Date: Thu Aug 9 12:27:15 2018 -0700 + + print + +commit 2227917faa4c77264582fd2579119bea89ba2829 +Author: Nishant +Date: Thu Aug 9 12:25:56 2018 -0700 + + setup + +commit 325e5fb2afbe0d3a27a7d1287b3ed744f934c2af +Author: Nishant +Date: Thu Aug 9 11:52:11 2018 -0700 + + rip == + +commit 9e8a6e1655742f66419f6756bc968433c3015ac4 +Author: Nishant +Date: Thu Aug 9 11:44:46 2018 -0700 + + req + +commit 218293493a4ab6c2611c6ca71c88018c83be1edc +Merge: a85691d5 bc42d798 +Author: eugenevinitsky +Date: Thu Aug 9 10:25:54 2018 -0700 + + Merge pull request #8 from berkeleyflow/docs + + Documentation and README changes + +commit bc42d7989003fa50bf38b8a59f330b70ef971d8d +Author: Nishant +Date: Wed Aug 8 18:42:05 2018 -0700 + + updating per comments + +commit 7a892582ce10637252fe1ed1e413c5ee65eaa734 +Author: Nishant +Date: Wed Aug 8 16:49:47 2018 -0700 + + more links + +commit 0a200a1b9c3ec7b0c572b7c0a4455f3d0c85599a +Author: Nishant +Date: Wed Aug 8 16:48:49 2018 -0700 + + adding website links + +commit 86d3a90269b9ed4a38e5ca4684a4b74801da013a +Author: Nishant +Date: Wed Aug 8 14:59:30 2018 -0700 + + pulling in Aboudy's updated setup instructions + +commit 0a82c6f9b00f640ed86e29e54d9eaf83e61341a7 +Author: Nishant +Date: Wed Aug 8 10:49:18 2018 -0700 + + moved position of tutorials + +commit 0048feb89487b93a9db6ef2c56d7d918bc144985 +Author: Nishant +Date: Wed Aug 8 10:47:51 2018 -0700 + + added sidebar links to tutorials + +commit 2d1aa479f52d0ba5ff1c538d6c01d57ba598ebd8 +Merge: 67705487 a85691d5 +Author: Nishant +Date: Mon Aug 6 17:20:17 2018 -0700 + + Merge branch 'master' of github.com:berkeleyflow/flow into docs + +commit 677054878cc44d8ae302acbd7209ea3c3ba4d87d +Author: Nishant +Date: Mon Aug 6 17:19:03 2018 -0700 + + comments in conf.py, fixing so that build badge shows passing, and changing index to highlight tutorials more + +commit a85691d5943bef87ff50dd7c47ec88c1b1026ad9 +Author: Kathy Jang +Date: Mon Aug 6 16:25:22 2018 -0700 + + Incorporated changes from flow-devel which specifies which sumo commit and pulls the patch from aws (#6) + +commit 184311ab64fbc1164f7a88ba732e5380d084cd63 +Author: Nishant +Date: Thu Jul 26 18:09:05 2018 -0700 + + removing module prefixes + +commit 083a6c6c953d4419a88b34706d49eb82e50e4cda +Author: Nishant +Date: Thu Jul 26 17:30:38 2018 -0700 + + hope this works + +commit 7a3b6c6d1b02c5e7e434d7c917a017cf99716123 +Author: Nishant +Date: Thu Jul 26 17:23:44 2018 -0700 + + removing all mock imports + +commit eba18b4c7aa86ba7b0c9457d8f99869f03b38523 +Author: Nishant +Date: Thu Jul 26 17:15:42 2018 -0700 + + back to before + +commit 8c63c7dfb738a2f6e85592dba1dbe9a8e2222f84 +Author: Nishant +Date: Thu Jul 26 17:10:00 2018 -0700 + + no sumolib mock + +commit 3ccddadc8a9ee51b3a9585a9aa49a0272673186e +Author: Nishant +Date: Thu Jul 26 17:05:58 2018 -0700 + + more + +commit 9edd9e4dd00f39467e0b064df310704c48faf296 +Author: Nishant +Date: Thu Jul 26 16:58:05 2018 -0700 + + different mock imports + +commit fa4dc2b2f51232939bfb54f28b431f3aa495284e +Author: Nishant +Date: Wed Jul 18 12:32:07 2018 -0700 + + removing sumolib mock import + +commit 7ec281284bc14933c45d4e938ca2fa47e6419b56 +Author: Nishant +Date: Wed Jul 18 12:14:45 2018 -0700 + + more mock + +commit 67a6e8533f8a3277d44a5dc9e14ed7c1251c7958 +Author: Nishant +Date: Wed Jul 18 12:07:40 2018 -0700 + + minor + +commit f15090c463cd7b26f03773905aa3c2dbc00f2b5c +Author: Nishant +Date: Fri Jul 13 16:39:12 2018 -0700 + + undoing + +commit 44775dd9fa294aed6a87e28effa8244f29e4ae62 +Author: Nishant +Date: Fri Jul 13 16:35:48 2018 -0700 + + deleted file + +commit 53b84482213fe4b1c94e48227da68f70376c7528 +Author: Nishant +Date: Fri Jul 13 16:27:54 2018 -0700 + + attempting to fix imports + +commit eafca86ef5154b1a661290805b3214fec3592ae5 +Author: Nishant +Date: Fri Jul 13 16:11:39 2018 -0700 + + only traci + +commit 1232a8b976d21c0c1cb57f942d9ceaae8629d752 +Author: Nishant +Date: Fri Jul 13 16:00:14 2018 -0700 + + mock imports for autodoc functionality on readthedocs + +commit 0508cd8792f2db435475dcd5057efa8e9996ea34 +Merge: ee3a90ca c2b3ee3d +Author: eugenevinitsky +Date: Sat Jun 30 13:43:32 2018 -0700 + + Merge pull request #3 from berkeleyflow/version_0_1_0 + + Version 0 1 0 + +commit c2b3ee3d9ca09f54cbaf22c1bda286b94001069d +Author: AboudyKreidieh +Date: Sat Jun 30 13:47:06 2018 +0300 + + version 0.1.0 + +commit d47d0c2dcf48dbfabfd5ecaffb60abdff2ced9d8 +Author: AboudyKreidieh +Date: Sat Jun 30 13:21:17 2018 +0300 + + tutorials + +commit ee3a90caa78db7208ef288fd3683da573854e2b8 +Merge: 99773415 4ea7f68c +Author: eugenevinitsky +Date: Fri May 25 09:39:33 2018 -0700 + + Merge pull request #2 from berkeleyflow/remove_bay_bridge + + temporarily deleted bay bridge components + +commit 4ea7f68c529abccdc72da427492f91f981a3fe9b +Author: AboudyKreidieh +Date: Fri May 25 09:16:18 2018 -0700 + + removed bay bridge components from scenario + +commit c7e7757e24cd094a2569a03b6013bc30742e212a +Author: AboudyKreidieh +Date: Fri May 25 08:54:13 2018 -0700 + + travis fix + +commit 86b6bab4d9ca1f7088294e9c4270ce92d09c6cc9 +Author: AboudyKreidieh +Date: Fri May 25 08:49:02 2018 -0700 + + temporarily deleted bay bridge components + +commit 99773415f0ab38b4aceb755e487b45b756d28bde +Merge: 94b255d7 0b59d01a +Author: AboudyKreidieh +Date: Tue May 15 22:55:07 2018 -0700 + + Merge pull request #444 from cathywu/rllib_update + + Rllib runscript update + - created a generic `make_create_env` which accepts our params (e.g. `SumoParams`) and strings for the scenario and generator classes (which need to now be the __init__ file for `flow/scenarios`) + - updated `visualizer_rllib.py` + +commit 0b59d01a4043d089e3a8645aec1cee8993b74a77 +Author: AboudyKreidieh +Date: Tue May 15 22:24:25 2018 -0700 + + fixed figure8 run scripts + +commit f3ac7d3bc2583c46de853cc70b3a3ef8120dd545 +Author: AboudyKreidieh +Date: Tue May 15 22:17:35 2018 -0700 + + pep8 + +commit 5d3d4e0291445715cd5c9e4a25789ff533db8475 +Merge: 36e5a34d 94b255d7 +Author: AboudyKreidieh +Date: Tue May 15 22:00:20 2018 -0700 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic into rllib_update + +commit 36e5a34de3a09785a483e128a86ae1217b0ce426 +Author: AboudyKreidieh +Date: Mon May 14 23:13:42 2018 -0700 + + minor fixes + +commit 94b255d7cad44a2668bdf5b92615e11253ba15a9 +Merge: c70a25eb 29b08cb0 +Author: eugenevinitsky +Date: Mon May 14 16:56:51 2018 -0700 + + Merge pull request #446 from cathywu/velocity_bottleneck + + Velocity bottleneck + +commit 29b08cb089e4db0bfce0d4eef855f7ff4e72bbd0 +Author: eugenevinitsky +Date: Mon May 14 16:29:31 2018 -0700 + + spacing + +commit a45b9f2b76017abfb7c4913fb1e0694a5b7f51f9 +Author: eugenevinitsky +Date: Mon May 14 16:25:29 2018 -0700 + + changed env names + +commit c9bba4c538c5244248fd660c6a535a043cc0ce8a +Author: AboudyKreidieh +Date: Mon May 14 16:21:03 2018 -0700 + + gae for all rllib examples + +commit e6ee0855f91baad1e1b6eaf11e0f490064e1af5c +Merge: 06ed841e bfe3bdef +Author: eugenevinitsky +Date: Mon May 14 16:20:10 2018 -0700 + + Merge branch 'velocity_bottleneck' of https://github.com/cathywu/learning-traffic into velocity_bottleneck + +commit 06ed841e22186f04d2a85243a7353688da6380d9 +Author: eugenevinitsky +Date: Mon May 14 16:19:59 2018 -0700 + + addressed comments + +commit 95f5c3e0b4a00424dd0cb980128e87e7f0373959 +Author: AboudyKreidieh +Date: Mon May 14 16:18:01 2018 -0700 + + PR fixes + +commit bfe3bdef2c5a9ec6dbde42baefa6aa991c470fd3 +Merge: 9b73cbd1 c70a25eb +Author: eugenevinitsky +Date: Mon May 14 16:17:02 2018 -0700 + + Merge branch 'master' into velocity_bottleneck + +commit 627694f95a8133c7c0613bc9938b08198eebad15 +Merge: f4ec66ad c70a25eb +Author: AboudyKreidieh +Date: Mon May 14 15:35:27 2018 -0700 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic into rllib_update + +commit c70a25ebcf59d61286fe5b86d4af7112df34cb49 +Merge: c550a5c9 eb60faf9 +Author: AboudyKreidieh +Date: Mon May 14 15:34:38 2018 -0700 + + Merge pull request #443 from cathywu/pythonic_init_files + + pythonified __init__ files + - added relevant imports to the `flow.controllers`, `flow.envs`, and `flow.scenarios` + - added an `__all__` to each __init__ file for pep8 compliance to imports + - replace controller imports in the run scripts to imports from `flow.controllers` + +commit c550a5c965d557ced43aa9f3d3a7f9c1fc1b130f +Merge: 0fe6c9cf d4ddbf20 +Author: AboudyKreidieh +Date: Mon May 14 15:29:44 2018 -0700 + + Merge pull request #442 from cathywu/more_cleanup + + More cleanup: + - removed extra rllib examples + - renames two_loops_one_merging -> loop_merge + - updated wave attenuation environment (observation was wrong) + - updated documentation to the traffic lights class + +commit 9b73cbd1fa5a80da1c0a3feff6146aa873aab951 +Author: eugenevinitsky +Date: Mon May 14 15:19:19 2018 -0700 + + fix to test_controllers + +commit eb60faf90e8c6dd08f72b8c21546fbfbea5e6957 +Author: AboudyKreidieh +Date: Mon May 14 15:14:47 2018 -0700 + + PR fix + +commit d4ddbf209bfc4c6e5396ad7d6114faa4eed1c436 +Author: AboudyKreidieh +Date: Mon May 14 15:12:56 2018 -0700 + + PR fix + +commit b07c656e09dc4cb6ce698ecb15d8c52d51e89972 +Author: AboudyKreidieh +Date: Mon May 14 14:40:09 2018 -0700 + + reintroduced two level rllib policies + +commit 2573969f8e211b394e4df30cfad346c3398a13e8 +Author: eugenevinitsky +Date: Mon May 14 14:29:49 2018 -0700 + + comments addressed + +commit 63c5db06a6e3d6c24e5f956105dff811adbd20bf +Author: eugenevinitsky +Date: Mon May 14 12:19:20 2018 -0700 + + cleanup + +commit 52031d8d80dc3a6d0e4247e5a0b56ad8f9ccb2cb +Author: eugenevinitsky +Date: Mon May 14 12:16:30 2018 -0700 + + updated tests + +commit 7f88847c9d40639040129b709f186a496146eeed +Author: eugenevinitsky +Date: Mon May 14 12:11:16 2018 -0700 + + pep8 fixes + +commit 96cbe8694daf66f2b905707511590f88135c1cb2 +Merge: 987079e3 0fe6c9cf +Author: eugenevinitsky +Date: Mon May 14 11:52:55 2018 -0700 + + cleanup + +commit 987079e3ba2fd8f5caf5f7fee6fee70e042ec54c +Author: eugenevinitsky +Date: Mon May 14 11:10:20 2018 -0700 + + cleaned up sumo bottleneck + +commit f4ec66ad1e0f4ded04fc5cadbedd852737665e57 +Author: AboudyKreidieh +Date: Mon May 7 01:37:46 2018 -0700 + + pep8 fixes + +commit 743ff5b5e7504bc0acdccfc82fd309d8b304ef07 +Author: AboudyKreidieh +Date: Mon May 7 01:10:17 2018 -0700 + + fixed test + +commit 00abc29eae9af2c32f6128075fd7642e3e57a8fd +Merge: 6e6c1e58 820baa18 +Author: AboudyKreidieh +Date: Mon May 7 00:16:53 2018 -0700 + + Merge branch 'more_cleanup' into rllib_update + +commit 6e6c1e58486614edf9a6b1c8b4317442345bee4a +Merge: 1c016b3e 17ca3ce8 +Author: AboudyKreidieh +Date: Mon May 7 00:14:23 2018 -0700 + + Merge branch 'pythonic_init_files' into rllib_update + +commit 17ca3ce8205b98580712412e2dc94f35a0862c6f +Author: AboudyKreidieh +Date: Mon May 7 00:03:03 2018 -0700 + + pythonified __init__ files + +commit 820baa184dc3e4a6330d6acaa2d9abc963caff51 +Author: AboudyKreidieh +Date: Sun May 6 23:31:47 2018 -0700 + + modified wave attenuation env to match actual experiment + +commit 037d19604ca7a0c17a15414783fae4cb7ec8ece8 +Author: AboudyKreidieh +Date: Sun May 6 23:31:17 2018 -0700 + + modified documentation to traffic lights class + +commit b43e03b833283fa76aa40ab6c422ed51d6a34f67 +Author: AboudyKreidieh +Date: Sun May 6 23:30:53 2018 -0700 + + removed more examples, some pep8 and cleanup + +commit 1c016b3e14c5e13034481a15bbdacd402750a50a +Author: AboudyKreidieh +Date: Sun May 6 22:58:03 2018 -0700 + + updated rllib experiments + +commit 0fe6c9cf958d9a49b13baaf86860a4ffaeb62758 +Merge: 8d4aff83 a1248952 +Author: AboudyKreidieh +Date: Sun May 6 22:25:46 2018 -0700 + + Merge pull request #441 from cathywu/merge + + changes: + - added merge scenario, environment, and experiment (from ITSC) + - removed bounds on accel and decel in the controllers (they mess with IDM dynamics) + +commit a1248952e75ceec7452e180fde540a7dd383cd17 +Author: AboudyKreidieh +Date: Sun May 6 22:14:12 2018 -0700 + + PR fix + +commit 1db676b99fca31f2451a434ce12c849b3043b7e3 +Merge: 89c57f17 8ed9eb7d +Author: AboudyKreidieh +Date: Thu May 3 19:39:07 2018 -0700 + + Merge branch 'merge' into rllib_update + +commit 8ed9eb7dd428e919dd10deee35d049ba7f4a8fe9 +Author: AboudyKreidieh +Date: Thu May 3 19:25:25 2018 -0700 + + added sumo test for merge + +commit a1a2777df4a6cd70cb662c6724691463fa570410 +Merge: ecd52bb6 8d4aff83 +Author: AboudyKreidieh +Date: Thu May 3 19:17:24 2018 -0700 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic into merge + +commit 89c57f172872b7bfaf47ec49fc06f091ce25f66c +Author: AboudyKreidieh +Date: Thu May 3 19:16:45 2018 -0700 + + mods + +commit 8d4aff83b3cfc29c615b42da4235d62de36f7ce7 +Merge: 6248de16 2d317f6f +Author: AboudyKreidieh +Date: Thu May 3 18:53:04 2018 -0700 + + Merge pull request #439 from cathywu/cleanup + + Cleanup + + changes: + - large scale pep8 cleanup + - removed `aws-build-tester.py` + - removed `examples/sumo/cooperative_merge.py` (it is redundant) + - updated documentation to `base_env.py` + - removed `max_accel`, `max_decel`, and `lane_change_duration` from `EnvParams`, with approprraite changes to the environments + - removed `loop_merges` scenario and environments + - renames `two_loops_one_merging` -> `loop_merges` + - removed `flow/visualize/space_time_plotter.py` (it is very experiment specific) + +commit 6248de16e3e67e19c642b90547802acf06faaf62 +Merge: 7a15fbb5 73888845 +Author: AboudyKreidieh +Date: Thu May 3 15:06:35 2018 -0700 + + Merge pull request #411 from cathywu/visualizer_rllab_update + + changes to `visualizer_rllab.py`: + - removed `--run_long`, which has always been broken + - since we always want to activate the gui when running the visualizer, removed `--use_sumogui` as well + - added prints for the cumulative return from each rollout, and then the average return across rollouts + +commit 2d317f6f3b90e65775f62f9006157433861a65b2 +Author: AboudyKreidieh +Date: Thu May 3 15:05:48 2018 -0700 + + PR fixes + +commit 738888452b0285019933d6eaccc9fcc30c5ad519 +Author: AboudyKreidieh +Date: Thu May 3 14:54:29 2018 -0700 + + PR fix + +commit bf98657336f55f3d432fecb491d62a428acc1ea1 +Author: AboudyKreidieh +Date: Thu May 3 14:41:07 2018 -0700 + + important cleanup to wave attenuation env + +commit 326a3bae55c1ba5b3c9aca9ee5218d0ca98a72d9 +Author: AboudyKreidieh +Date: Thu May 3 14:30:34 2018 -0700 + + pythonic __init__ files + +commit c625beedb53470e7883112ad15b2fcd59d26c731 +Author: AboudyKreidieh +Date: Thu May 3 12:44:20 2018 -0700 + + reintroduced changes (someone deleted them) + +commit c88644e2bda51e561bec8a0875584ee6185db9e9 +Author: AboudyKreidieh +Date: Thu May 3 12:43:04 2018 -0700 + + initial changes to rllib run scripts + +commit a1c15ab1ac146137ff2c723fad441070632dc5b2 +Merge: 7224411b ecd52bb6 +Author: AboudyKreidieh +Date: Thu May 3 02:27:35 2018 -0700 + + Merge branch 'merge' into rllib_update + +commit 7224411bb69477809b6a578478f1e0b92c85c413 +Author: AboudyKreidieh +Date: Thu May 3 02:27:23 2018 -0700 + + removed rllib run scripts + +commit 35845557390af93e22c43b4cd432c737568b8c82 +Merge: ad139560 7a15fbb5 +Author: AboudyKreidieh +Date: Wed May 2 18:53:47 2018 -0700 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic into visualizer_rllab_update + +commit ecd52bb694f54385abd5eac245d3578cf0202cf9 +Author: AboudyKreidieh +Date: Tue May 1 21:01:36 2018 -0700 + + open merge experiment + +commit f7169909e15b52de521bd58000c7346b0c54b3a8 +Merge: 84e1ff2c 7a15fbb5 +Author: AboudyKreidieh +Date: Sun Apr 29 23:58:49 2018 -0700 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic into cleanup + +commit 7a15fbb5bf1e3294e272467040a27dd829701be9 +Merge: d8182a40 bce5ec3d +Author: AboudyKreidieh +Date: Sun Apr 29 23:52:08 2018 -0700 + + Merge pull request #415 from cathywu/rllib_visualizer_update + + Rllib visualizer update + + - Fixed rllib visualizer so it works with inflows, and pulls the flow params from the env_config of the rllib config. + - Pep8 fixes + +commit bce5ec3de19af46eefb74558247d371f99be9c65 +Merge: bd75c63a d8182a40 +Author: AboudyKreidieh +Date: Sun Apr 29 23:36:22 2018 -0700 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic into rllib_visualizer_update + +commit bd75c63a169841518937c78630b766fb4bd348f6 +Author: AboudyKreidieh +Date: Sun Apr 29 23:11:57 2018 -0700 + + PR fix + +commit 84e1ff2cbd32ab4a11c0b0356cbf89fe132b5bd8 +Author: AboudyKreidieh +Date: Sun Apr 29 23:02:10 2018 -0700 + + major pep8 cleanup and some documentation to base_env + +commit 12fb698204142974be124b23367f3f438e789552 +Author: eugenevinitsky +Date: Thu Apr 26 16:14:05 2018 -0700 + + minor + +commit 2e70db2c55062605baa17b8a91ddd1f7901f4ba9 +Author: eugenevinitsky +Date: Thu Apr 26 16:08:37 2018 -0700 + + added in separate observation size contorl + +commit 76c03fb52689761bb11cfedf010d6d9c362de629 +Author: eugenevinitsky +Date: Thu Apr 26 11:02:47 2018 -0700 + + updated ALINEA, deprecation of trafficlights fix + +commit ccb62c377584f8cc0852241da3fe3deb93145087 +Author: eugenevinitsky +Date: Wed Apr 25 23:20:54 2018 -0700 + + merged ALINEA branch in + +commit 8ab9067fdf987fb2666522ecfba22ac525c67a5b +Merge: 3c820d33 213967be +Author: eugenevinitsky +Date: Wed Apr 25 23:19:52 2018 -0700 + + merged ALINEA branch in + +commit 3c820d3321b208108d2ef17ecd0de0965e9e0ab5 +Author: eugenevinitsky +Date: Wed Apr 25 23:16:11 2018 -0700 + + set up a run script for ALINEA experiments + +commit bb2c43a3fcb6f11441bb45689f5fdb97e0661aa5 +Author: eugenevinitsky +Date: Wed Apr 25 16:32:03 2018 -0700 + + added reset method back in + +commit a20d23a76b2c5998e6bed50a48867274b8f8bb42 +Author: eugenevinitsky +Date: Wed Apr 25 11:49:50 2018 -0700 + + fixed bug in number of segments + +commit 213967beebef2c9870328def8ef716776a092d11 +Author: eugenevinitsky +Date: Tue Apr 24 22:07:15 2018 -0700 + + better cycle offset + +commit e06604a73cd5c849781b3e68c99fd496c8e9ad3e +Author: eugenevinitsky +Date: Tue Apr 24 19:45:38 2018 -0700 + + more tuning + +commit 11a0357ce4422ec7e272e26a431dd2cee3b0a153 +Author: eugenevinitsky +Date: Tue Apr 24 19:24:55 2018 -0700 + + alinea tuning + +commit 51e3156289cca3744069ae824ff43b41721f9cf9 +Author: eugenevinitsky +Date: Tue Apr 24 19:15:51 2018 -0700 + + updated run script so that I can send up multiple inflow experiments in one pass + +commit 76fe63baec47c82c3806ed5b6aa4a4ded044304c +Author: eugenevinitsky +Date: Tue Apr 24 18:47:26 2018 -0700 + + updated alinea params + +commit df17a22d53ebcab8ebbd38ec06dd1ff7f9ca88fc +Author: eugenevinitsky +Date: Tue Apr 24 16:50:17 2018 -0700 + + mild tuning + +commit 3025e6e1bbdb270f546fe2d2a9cd34b61a68b266 +Merge: c4ab408e d8182a40 +Author: eugenevinitsky +Date: Tue Apr 24 15:47:57 2018 -0700 + + working now + +commit 0f85493fac9aff518be80aeda8115f347a7d0044 +Author: eugenevinitsky +Date: Tue Apr 24 15:02:06 2018 -0700 + + added outflow to state space + +commit d8182a40023c585971a8e26725dd775aa2605926 +Merge: b63de31b b45feb97 +Author: AboudyKreidieh +Date: Mon Apr 23 16:21:44 2018 -0700 + + Merge pull request #416 from cathywu/loop_envs_cleanup + + Loop envs cleanup + + changes: + - removed the loop_merge scenario/generator/environment + - added env params exposure to the loop environments. Any loop environment can refer to `ADDITIONAL_ENV_PARAMS` to determine what parameters are needed. + +commit b45feb97fad98b628e9be476821a329a6cf68327 +Author: AboudyKreidieh +Date: Mon Apr 23 15:58:50 2018 -0700 + + PR changes + +commit f831ddd7e65b3a0b256098d0f0ab531b72f9b3dd +Merge: e8b982cf 1206b0a6 +Author: AboudyKreidieh +Date: Mon Apr 23 15:44:14 2018 -0700 + + Merge branch 'tutorials' of https://github.com/cathywu/learning-traffic into loop_envs_cleanup + +commit b63de31bfdefc071213b88553e15f612a1498f79 +Merge: ce03cce7 4f774274 +Author: AboudyKreidieh +Date: Mon Apr 23 15:23:34 2018 -0700 + + Merge pull request #410 from cathywu/params_documentation + + documentation for params + +commit e8b982cf856d1306e7467a4f63933a5438d81168 +Merge: 229ea017 ce03cce7 +Author: AboudyKreidieh +Date: Mon Apr 23 15:22:14 2018 -0700 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic into loop_envs_cleanup + +commit ad139560466c99c588d615c0a117aa657f3e99ce +Merge: f1667526 ce03cce7 +Author: eugenevinitsky +Date: Mon Apr 23 14:35:57 2018 -0700 + + Merge branch 'master' into visualizer_rllab_update + +commit f1667526a27fe0fc55a9230b739a5f264f131f12 +Author: eugenevinitsky +Date: Mon Apr 23 14:33:09 2018 -0700 + + Revert "updates to visualizer_rllab" + + This reverts commit fa988bffb611965c9523b9910944c24591a4a6f8. + +commit 2a08a23a98d23a28218409b65a595fc58ba23c25 +Author: eugenevinitsky +Date: Mon Apr 23 14:32:57 2018 -0700 + + added resets to bottleneck env + +commit ce03cce736768e84181b53b0ad59bdce92cd425f +Merge: d9be0f98 aab2b859 +Author: AboudyKreidieh +Date: Mon Apr 23 13:02:39 2018 -0700 + + Merge pull request #409 from cathywu/scenario_documentation + + modified documentation for scenarios + +commit d9be0f98f5a84828abf9005d69c5c8a285af3883 +Merge: d6e76c49 5b1bc076 +Author: Kanaad Parvate +Date: Mon Apr 23 11:46:41 2018 -0700 + + Merge pull request #385 from cathywu/max_speed + + removed max_speed from EnvParams + +commit aab2b859e53b325d3415f210efcccb69d166c285 +Author: Kanaad Parvate +Date: Mon Apr 23 11:44:49 2018 -0700 + + added documentation for -1001 cases + +commit d6e76c49c1477159138fa0ba73f361b1f9fec237 +Merge: dc553132 20692f75 +Author: Kanaad Parvate +Date: Mon Apr 23 11:42:27 2018 -0700 + + Merge pull request #408 from cathywu/cleanup_controllers + + cleaned up controllers + +commit 5b1bc076cb5aea55375cfe20f2120c766a20bbfb +Merge: 63d685c0 dc553132 +Author: Kanaad Parvate +Date: Mon Apr 23 11:33:05 2018 -0700 + + Merge branch 'master' into max_speed + +commit 345f68a3ed3faa106f107474c55bb8c22aa4cc36 +Author: eugenevinitsky +Date: Fri Apr 20 20:10:43 2018 -0700 + + minor + +commit 64a1efe05f542e76139e5bf9ffb6b9bb3c07c3c0 +Author: eugenevinitsky +Date: Fri Apr 20 20:08:36 2018 -0700 + + set min speed to zero + +commit 943188ee6ca3ef3837d8e3d4991fa911d6e1146b +Author: eugenevinitsky +Date: Fri Apr 20 17:53:54 2018 -0700 + + Revert "fix" + + This reverts commit 1e4172a0f2462a82470fbc5d3d1512ac07af0cdf. + +commit 8308107bca06a7fe783900ad4da11d14c7e61d36 +Author: eugenevinitsky +Date: Fri Apr 20 17:47:17 2018 -0700 + + Revert "pep8 fix" + + This reverts commit 8f7b4c085f66644a69d1ab06e2cd5fadf96963a5. + +commit 1e4172a0f2462a82470fbc5d3d1512ac07af0cdf +Author: eugenevinitsky +Date: Fri Apr 20 17:12:13 2018 -0700 + + fix + +commit 8f7b4c085f66644a69d1ab06e2cd5fadf96963a5 +Author: eugenevinitsky +Date: Fri Apr 20 16:51:46 2018 -0700 + + pep8 fix + +commit 1055a8c245231dc9ee45cf962565ccdb2614def7 +Author: eugenevinitsky +Date: Fri Apr 20 16:51:02 2018 -0700 + + added removed import statements + +commit 5e6e8ee7cb062eab554b84cd5c0df45c0eaa56d1 +Author: eugenevinitsky +Date: Fri Apr 20 16:44:21 2018 -0700 + + update json test + +commit 4d16a1e0e4d4270a870c72b4f7f5f8a2ef132731 +Author: eugenevinitsky +Date: Fri Apr 20 16:42:58 2018 -0700 + + update + +commit 73ee12970d66c23d7559260bfba98c5225e850a9 +Merge: 10d2afe4 e400b770 +Author: eugenevinitsky +Date: Fri Apr 20 15:56:27 2018 -0700 + + working util for json_tst + +commit 10d2afe449efe2dad7a7ab1765bf413ce3451f23 +Author: eugenevinitsky +Date: Fri Apr 20 15:54:11 2018 -0700 + + fixed utils for rllib test + +commit e400b770e7390a1af14c1070e0edfb3ae0cd329a +Author: eugenevinitsky +Date: Fri Apr 20 15:54:11 2018 -0700 + + fixed utils for rllib test + +commit 1616c52eb25efdaea146c7bcc7f624830da3f59d +Author: eugenevinitsky +Date: Fri Apr 20 15:49:13 2018 -0700 + + update json test + +commit 1206b0a6a375f5f885629ba09f731b8a5ba6c3aa +Author: Nishant +Date: Fri Apr 20 15:06:42 2018 -0700 + + updated tutorial 1: sumo + +commit 7cfd5b87190a5c32265a0193668529501d3777d5 +Author: AboudyKreidieh +Date: Fri Apr 20 15:05:43 2018 -0700 + + PR fix + +commit 229ea0173f96c6ffd3db8b3a18067b8636f005c4 +Author: AboudyKreidieh +Date: Fri Apr 20 15:02:42 2018 -0700 + + env params exposure to the loop environments + +commit b33a183f8207663572e6f324d0c4eb4404d4e8b2 +Author: eugenevinitsky +Date: Fri Apr 20 15:02:27 2018 -0700 + + fixed travis failure + +commit 9bef04839f4683c7b7dad6db1a60d0f84d95c9bd +Author: eugenevinitsky +Date: Fri Apr 20 14:55:04 2018 -0700 + + flake8 and updated visualizer class + +commit f2bd78aa3b208a4b04915638f140579680086f17 +Merge: 9687b922 c5975305 +Author: eugenevinitsky +Date: Fri Apr 20 14:42:38 2018 -0700 + + merged in vel early lc + +commit 80231373c2fcfd55661862b6b5b177deaabaedb0 +Author: eugenevinitsky +Date: Fri Apr 20 14:40:49 2018 -0700 + + update visualizer rllib and flake fixes + +commit 681ed1cdff75cea3f82959b69f53a3439f9be439 +Author: eugenevinitsky +Date: Fri Apr 20 14:40:12 2018 -0700 + + update visualizer rllib and flake fixes + +commit 591e9850fb0a2744711b7716f9cf84523720d6a0 +Merge: f42de9d0 dc553132 +Author: eugenevinitsky +Date: Fri Apr 20 14:30:41 2018 -0700 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic + +commit 09f77aa4aa7b61c6e65293a396c562a70596bdee +Author: AboudyKreidieh +Date: Thu Apr 19 20:03:57 2018 -0700 + + removed loop_merge + +commit c4ab408ede8c9f0f03f436318ed88c9644c663ea +Author: eugenevinitsky +Date: Thu Apr 19 19:00:46 2018 -0700 + + updated to new gym + +commit 045ec4f3e6c4d3eb20b1bdf3756c3fbba2dbb30a +Author: AboudyKreidieh +Date: Thu Apr 19 18:40:10 2018 -0700 + + tutorials, modified AccelEnv, and small change to base_env + +commit c5975305abd359f935183208e0f470b119473bb5 +Author: eugenevinitsky +Date: Thu Apr 19 18:26:12 2018 -0700 + + lane changing off + +commit 25f4735427c623cc60b12f828ab4d5d6d5df205d +Author: eugenevinitsky +Date: Thu Apr 19 14:36:23 2018 -0700 + + updated action to generate a change in max speed rather than a max speed, this prevents sharp accelerations + +commit dc55313245a3cf47f2062b1c5a0f820216d04216 +Merge: aa527e3d 8638b97b +Author: AboudyKreidieh +Date: Wed Apr 18 20:34:17 2018 -0700 + + Merge pull request #407 from cathywu/clutter_removal + + Clutter removal + + changes: + - removed superfluous or unused environments, scenarios, generators, examples + - renames `two_loops_one_merging_new` --> `two_loops_one_merging` + - pep8 to tests + + removed examples: + - rllab/two_lane_mixed.py + - rllab/two_way_intersection.py + - rllib/two_loops_straight_merge.py + - sumo/two_lane_change_changer.py + - sumo/two_loops_merge.py + - sumo/two_way_intersection.py + + removed environments: + - AccelPOEnv + - TwoIntersectionEnv + + removed scenarios/generators: + - two_loops_one_merging + - intersection + +commit 8638b97b7b01fb74857c25fbe1bd4b1ee8727d53 +Merge: f78f0c2d aa527e3d +Author: AboudyKreidieh +Date: Wed Apr 18 17:49:18 2018 -0700 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic into clutter_removal + +commit 8d3705bda9b14d705422bcd20e8e871d400c0e83 +Author: eugenevinitsky +Date: Wed Apr 18 17:39:15 2018 -0700 + + removed print statement + +commit 203371543458a7de1cfa46e8cf923ad7f1128377 +Merge: ab74597e 318437bb +Author: eugenevinitsky +Date: Wed Apr 18 17:33:47 2018 -0700 + + working lane changes tried out fix to race condition + +commit aa527e3d1e463b10cda96547ef8c5b19f5794724 +Merge: c7887e77 02983458 +Author: AboudyKreidieh +Date: Wed Apr 18 15:02:20 2018 -0700 + + Merge pull request #378 from cathywu/gui_colors + + Gui colors + + the main purpose behind this PR is to incorporate the colors we decided to standardize on for all visualizations. + + color choices: + - red: autonomous (rl) vehicles + - white: unobserved vehicles + - cyan: observed vehicles + - grey: background + + changes: + - updated documentation for the base generator class + - added default colors for the background in the generator, and for the vehicles in base_env + - added a method to the vehicles class to specify which vehicles are observed, and accordingly which should be colored blue + - started incorporating which vehicle are observed in the different environments (namely the envs in `loop_accel`, `lane_changing`, and `wave_attenuation`) + - modified the env in `wave_attenuation` to use the new warmup steps method instead of what it previously did. the effect is the same, but this is needed to start the colors off correctly + +commit ab74597e8bfa4efbb7c914b33accbb08375b6e38 +Author: eugenevinitsky +Date: Wed Apr 18 10:27:39 2018 -0700 + + cleanup + +commit 9687b922ed595c76439b410221af1b990c57ae56 +Author: eugenevinitsky +Date: Wed Apr 18 10:14:52 2018 -0700 + + update + +commit fa988bffb611965c9523b9910944c24591a4a6f8 +Author: AboudyKreidieh +Date: Tue Apr 17 12:21:59 2018 -0700 + + updates to visualizer_rllab + +commit 4f7742742aa3a32aeb07e076cb48ac29c5643920 +Author: AboudyKreidieh +Date: Mon Apr 16 21:18:00 2018 -0700 + + doc fix + +commit f0e9bdd65a6a261bfd954c0c38a0db5c97a33ed9 +Author: AboudyKreidieh +Date: Mon Apr 16 21:05:19 2018 -0700 + + documentation for params + +commit b2a19ef21f871c40f1a546fe5445a4d9d5c6eee8 +Author: AboudyKreidieh +Date: Mon Apr 16 20:59:01 2018 -0700 + + modified documentation for scenarios + +commit 20692f755675935dbb6e46a8983605ed5430964d +Author: AboudyKreidieh +Date: Mon Apr 16 19:28:09 2018 -0700 + + cleaned up controllers + +commit f78f0c2d9c88dc8b1c078156cb23826513bf82f3 +Author: AboudyKreidieh +Date: Mon Apr 16 18:57:14 2018 -0700 + + removed intersection scenario + +commit 747c49fcbda0a111bd008a3ad7161661c3512fc9 +Merge: 87beff42 c7887e77 +Author: AboudyKreidieh +Date: Mon Apr 16 18:49:00 2018 -0700 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic into clutter_removal + +commit 87beff4207b107e57182b036d3916b54ab1a0979 +Author: AboudyKreidieh +Date: Mon Apr 16 18:47:42 2018 -0700 + + renamed two_loops_one_merging_new -> two_loops_one_merging + +commit c7887e77975620d726de6935bc4156003e19f956 +Merge: 4d868161 ace98e3d +Author: eugenevinitsky +Date: Mon Apr 16 14:39:34 2018 -0700 + + Merge pull request #395 from cathywu/docker_pull + + Docker file w/ updated gym and sumo install + +commit 4d8681615aa40a095906f488e426d890216831b7 +Merge: ade03f93 cd0616cd +Author: eugenevinitsky +Date: Mon Apr 16 14:38:26 2018 -0700 + + Merge pull request #402 from cathywu/restart_fix + + fixed a bug in restarts when there are inflows + +commit 318437bb7496a90d308f62c106d063a9e0dfc782 +Merge: b01b540c 1d862174 +Author: Nishant +Date: Sun Apr 15 19:10:02 2018 -0700 + + pulling in velocity_bottleneck + +commit b01b540c676c2c49dc8b417a4a02718ec2167054 +Author: Nishant +Date: Sun Apr 15 19:07:22 2018 -0700 + + lane by lane experiment changes + +commit 8c1bfe5226bfb72ae024b48ccf1b8e6ff36dc7b7 +Author: Nishant +Date: Sat Apr 14 15:55:03 2018 -0700 + + lane by lane experiments + +commit 081dded55de9fe6a92c0fae3c8ece6f589b6031d +Author: Nishant +Date: Sat Apr 14 15:49:45 2018 -0700 + + fixing action space and stuff + +commit 1d862174ed4cea1304026e2ee5cea45bf9e7b1ca +Merge: c6942456 cb30ac8c +Author: eugenevinitsky +Date: Sat Apr 14 15:41:54 2018 -0700 + + merged + +commit 2bc704a3465a9e5ab0e7961031d89d1c994256e7 +Author: Nishant +Date: Sat Apr 14 15:27:02 2018 -0700 + + removed debug statement + +commit c6942456d9cebe0895acfee79a1069ca83107d7d +Author: eugenevinitsky +Date: Sat Apr 14 15:26:29 2018 -0700 + + changed bottleneck length + +commit a70636e01767c274e78fee32c6e26749308930ef +Merge: 530fc204 42291b10 +Author: Nishant +Date: Sat Apr 14 15:22:33 2018 -0700 + + Merge branch 'vel_early_lc' of github.com:cathywu/learning-traffic into vel_early_lc + +commit 530fc2047c7563f57634bebc95297daba1316d0a +Author: Nishant +Date: Sat Apr 14 15:22:19 2018 -0700 + + changed lane by lane control + +commit 42291b10cfd30b171ae634cbbdadc0c99a258d09 +Author: Kathy Jang +Date: Sat Apr 14 15:21:39 2018 -0700 + + Added documentation for apply_rl_actions + +commit f3b47761dd16c90961cb99d4f2bd5b99e5154535 +Author: Nishant +Date: Sat Apr 14 15:16:54 2018 -0700 + + updates + +commit 169fca76605958a67df11be39105b6b5c2c5e4fd +Author: Nishant +Date: Sat Apr 14 14:28:46 2018 -0700 + + fixed action space bug + +commit 042cd5ccd5ee54a707d1f6c33318d4a37317ee3a +Merge: cce2939f 02983458 +Author: eugenevinitsky +Date: Sat Apr 14 12:38:14 2018 -0700 + + Merge branch 'gui_colors' of https://github.com/cathywu/learning-traffic into velocity_bottleneck + +commit 39c068f3b0f64b5c7456ac6a30e9698d2aaeb76c +Author: Nishant +Date: Sat Apr 14 10:40:04 2018 -0700 + + eugene's better reward function + +commit cce2939f536b73234b90f2eaf09efeff2fb2fa6a +Merge: 7200fd0c cd0616cd +Author: eugenevinitsky +Date: Sat Apr 14 10:26:46 2018 -0700 + + Merge branch 'restart_fix' of https://github.com/cathywu/learning-traffic into velocity_bottleneck + +commit 5c1b3d7b8b8bd5a961277182b9e8cc69f2e6199c +Author: Nishant +Date: Sat Apr 14 10:16:07 2018 -0700 + + minor + +commit 85200d41469c72a3504853d36ce1b79af76b8df2 +Merge: 4362b719 cb30ac8c +Author: Nishant +Date: Sat Apr 14 00:34:04 2018 -0700 + + Merge branch 'velocity_bottleneck' of github.com:cathywu/learning-traffic into vel_early_lc + +commit 4362b719678d46f1523b8794add81f5cfb218278 +Merge: bdd2be8c 5b043a29 +Author: Nishant +Date: Sat Apr 14 00:33:53 2018 -0700 + + Merge branch 'velocity_bottleneck' of github.com:cathywu/learning-traffic into vel_early_lc + +commit cb30ac8c2cca0b5a6069745c1f8c49b46206748d +Author: Kanaad Parvate +Date: Fri Apr 13 23:18:02 2018 -0700 + + fixed outlfow printing + +commit 9e464da709e0bfff72b952a9517641ec5a2943fd +Author: Kanaad Parvate +Date: Fri Apr 13 23:09:20 2018 -0700 + + density exp + +commit 5b043a29638c2c88bec16af4748ae65181f790ae +Author: Kanaad Parvate +Date: Fri Apr 13 22:56:13 2018 -0700 + + updating density exp and velocity bottleneck to reflect original experiments + +commit bdd2be8c1006f79d6ad42cb4bba6f22b0a4303df +Merge: 4dad270e 7200fd0c +Author: Nishant +Date: Fri Apr 13 22:54:52 2018 -0700 + + Merge branch 'velocity_bottleneck' of github.com:cathywu/learning-traffic into vel_early_lc + +commit 4dad270e79a5009858a1aa3047da551f8f9f1bbf +Author: Nishant +Date: Fri Apr 13 22:54:48 2018 -0700 + + grid search changes + +commit 7200fd0c1f0137618ddbe251ebd9e6ef14f0e5c9 +Merge: 9983d223 36755919 +Author: eugenevinitsky +Date: Fri Apr 13 22:26:38 2018 -0700 + + Merge branch 'velocity_bottleneck' of https://github.com/cathywu/learning-traffic into velocity_bottleneck + +commit 9983d223b1381c6c2f069656c98101701bf03651 +Author: eugenevinitsky +Date: Fri Apr 13 22:26:30 2018 -0700 + + added new states to state space + +commit f4de154e3245ebae1b4d9351dc687ad5edb7fe71 +Author: Nishant +Date: Fri Apr 13 22:25:50 2018 -0700 + + changed apply_rl_actins + +commit 554453c44e228ad1e5d0a0052f28b7e9e48d9647 +Merge: 0e2b2dab 36755919 +Author: Nishant +Date: Fri Apr 13 21:54:16 2018 -0700 + + Merge branch 'velocity_bottleneck' of github.com:cathywu/learning-traffic into vel_early_lc + +commit 0e2b2dab034337d0fe4b5b4216ba47b86364c048 +Author: Nishant +Date: Fri Apr 13 21:54:14 2018 -0700 + + small updates + +commit 367559192b70f3a79b05aef9097fa334fc0c68be +Author: Kanaad Parvate +Date: Fri Apr 13 21:02:54 2018 -0700 + + use ray + +commit 2d6609ea18d804d9a6f5a6c123d2c7fc000a0873 +Author: Kanaad Parvate +Date: Fri Apr 13 21:01:30 2018 -0700 + + change to sumo from sumo-gui + +commit 2e290619be2a88b218f9a606b7f58d2ff06253ef +Author: Kanaad Parvate +Date: Fri Apr 13 21:00:15 2018 -0700 + + changeed to probabiltiy, enabled sumo restarts + +commit 12b5bcd0425cbf4e60a09f693d7de26007ec5834 +Merge: 0c8d88bb cc748d4a +Author: Nishant +Date: Fri Apr 13 20:51:58 2018 -0700 + + Merge branch 'velocity_bottleneck' of github.com:cathywu/learning-traffic into vel_early_lc + +commit cc748d4afac28c889788d5b1a0b482d91c5a28d3 +Author: Kanaad Parvate +Date: Fri Apr 13 20:19:15 2018 -0700 + + density experiment + +commit 0c8d88bb6f03868072e83c12653144744d516ef3 +Merge: 5b9e33b1 53cdae88 +Author: Nishant +Date: Fri Apr 13 20:19:05 2018 -0700 + + Merge branch 'velocity_bottleneck' of github.com:cathywu/learning-traffic into vel_early_lc + +commit 5b9e33b1010574141a8e7e8f5af48f052681841f +Merge: ae199085 61ce8254 +Author: Nishant +Date: Fri Apr 13 20:19:02 2018 -0700 + + merging + +commit 53cdae880ac3b6e73d36d40e73a608d47f228caf +Merge: fb2a248e 61ce8254 +Author: Kanaad Parvate +Date: Fri Apr 13 20:18:31 2018 -0700 + + Merge branch 'velocity_bottleneck' of https://github.com/cathywu/learning-traffic into velocity_bottleneck + +commit fb2a248e641ab552762c9d5eb18d5b38e404a8fc +Author: Kanaad Parvate +Date: Fri Apr 13 20:18:19 2018 -0700 + + remove print statements + +commit ae1990853b24d167ae223906d03f1a52a5656094 +Author: Nishant +Date: Fri Apr 13 20:08:04 2018 -0700 + + adding grid search script + +commit a1dff54f97bd4c37560afd62d75e5c67bcbaf24d +Author: Nishant +Date: Fri Apr 13 20:07:50 2018 -0700 + + deleting random file and editing K to Kp + +commit 61ce8254af930a476ac6e064495c8817b212577e +Merge: 11a1481b 55f6934e +Author: eugenevinitsky +Date: Fri Apr 13 20:07:45 2018 -0700 + + Merge branch 'velocity_bottleneck' of https://github.com/cathywu/learning-traffic into velocity_bottleneck + +commit 11a1481b7f8ff05129ee5887774b7e9170dff49d +Author: eugenevinitsky +Date: Fri Apr 13 20:07:36 2018 -0700 + + removed print + +commit 55f6934ea63791c6af3887906eea6fe823926c9c +Author: Kanaad Parvate +Date: Fri Apr 13 20:05:08 2018 -0700 + + remove discount + +commit 04207ee4163f63c72740b8922865dabe75842746 +Merge: e96085ba ca091a75 +Author: Kanaad Parvate +Date: Fri Apr 13 19:57:47 2018 -0700 + + Merge branch 'velocity_bottleneck' of https://github.com/cathywu/learning-traffic into velocity_bottleneck + +commit e96085bac1fb638288577b1115ef7060d3a7faab +Author: Kanaad Parvate +Date: Fri Apr 13 19:57:27 2018 -0700 + + added sumo params to base controller + +commit ca091a75351b0884f9a7027df6f2fdb823b4d5ee +Merge: b137a836 fd7cbffc +Author: eugenevinitsky +Date: Fri Apr 13 19:50:33 2018 -0700 + + Merge branch 'velocity_bottleneck' of https://github.com/cathywu/learning-traffic into velocity_bottleneck + +commit b137a8363be903a938d8751406ec16e680f262d2 +Author: eugenevinitsky +Date: Fri Apr 13 19:50:23 2018 -0700 + + changed to tsumo controllers + +commit 7cdc36b0a177d45c00fb423436aa3b4d1291d01a +Author: Nishant +Date: Fri Apr 13 19:40:37 2018 -0700 + + updating feedback controller experiment + +commit a76733cdc299e473ac78d513e061570bfefe3b63 +Merge: bbfe4b34 fd7cbffc +Author: Nishant +Date: Fri Apr 13 19:35:37 2018 -0700 + + Merge branch 'velocity_bottleneck' of github.com:cathywu/learning-traffic into vel_early_lc + +commit fd7cbffc0108cd58f6d121fd317c515858366f16 +Author: Kanaad Parvate +Date: Fri Apr 13 19:35:15 2018 -0700 + + feedback controller + +commit bd5cdf0a4c5ac81ed8e9f5fdc9931464a6823768 +Merge: dc9f5921 4374f317 +Author: eugenevinitsky +Date: Fri Apr 13 19:29:22 2018 -0700 + + update + +commit dc9f592180edf428c232b4d7605d82bea498eba7 +Merge: 2a7c961d c028e578 +Author: eugenevinitsky +Date: Fri Apr 13 19:27:18 2018 -0700 + + Merge branch 'velocity_bottleneck' of https://github.com/cathywu/learning-traffic into velocity_bottleneck + +commit 4374f3170aa68316014f8ea92074f8eb5882a112 +Author: eugenevinitsky +Date: Fri Apr 13 19:26:48 2018 -0700 + + update + +commit bbfe4b34ae9d985837e1498d43704df91342e6b1 +Merge: 598d9936 c028e578 +Author: Nishant +Date: Fri Apr 13 19:02:33 2018 -0700 + + Merge branch 'velocity_bottleneck' of github.com:cathywu/learning-traffic into vel_early_lc + +commit 598d99369abc59a52273251e3f00d8d84aba25bf +Author: Nishant +Date: Fri Apr 13 19:02:29 2018 -0700 + + updated default + +commit c028e57858e30a3b5f5666b83590eff16b354387 +Merge: 3156a451 36386aa8 +Author: Kanaad Parvate +Date: Fri Apr 13 19:00:53 2018 -0700 + + Merge branch 'velocity_bottleneck' of https://github.com/cathywu/learning-traffic into velocity_bottleneck + +commit 3156a4510710650e03fc77e1d98e549008e00125 +Author: Kanaad Parvate +Date: Fri Apr 13 19:00:14 2018 -0700 + + updated velocity bottleneck code + +commit 3e394f36ec8bb03a7a6de3cadfb21dfc9e632c89 +Merge: 4ee9d567 36386aa8 +Author: Nishant +Date: Fri Apr 13 18:00:26 2018 -0700 + + merging in velocity_bottleneck + +commit e5188f640f2ca46646aefd52e2a79c0c0dfd15a0 +Author: eugenevinitsky +Date: Fri Apr 13 16:16:37 2018 -0700 + + returned to old traci connection method + +commit 04bee509241524246119a52bedc6ed19fb2689c2 +Author: eugenevinitsky +Date: Fri Apr 13 16:01:43 2018 -0700 + + minor + +commit 5fca44bb1a847a1fdb03d1f42431c58656c4b7b2 +Author: eugenevinitsky +Date: Fri Apr 13 15:57:16 2018 -0700 + + update + +commit 2a7c961dd2048e186694944ed753fc9dfdc42a2b +Author: eugenevinitsky +Date: Fri Apr 13 15:37:08 2018 -0700 + + fix to hang error hopefully + +commit 36386aa80b34a7ef4a02a825a0849cc008390e2d +Author: eugenevinitsky +Date: Fri Apr 13 14:57:19 2018 -0700 + + rescaled inflows + +commit 4ee9d5670b60c175b3af0f7162153bdb2f92f194 +Merge: 3d2431ae 3ca9b7a2 +Author: Nishant +Date: Fri Apr 13 00:50:22 2018 -0700 + + merging in velocity_bottleneck + +commit 3d2431ae73265dc55676f3e8f8be1d4d98e28eb6 +Author: Nishant +Date: Fri Apr 13 00:32:13 2018 -0700 + + sending None command when out of controlled edge set + +commit 9313db7c17a0adac3175a598fb5d9727a52032a1 +Author: eugenevinitsky +Date: Thu Apr 12 18:13:10 2018 -0700 + + changed AV frac + +commit ace98e3d954228a397d9aa999822a4662d8d3b01 +Merge: f5a5d5fd 69961770 +Author: Eugene +Date: Thu Apr 12 17:48:14 2018 -0700 + + merged + +commit f5a5d5fda6a1601c1079b4c1a2f16f6534856553 +Author: Eugene +Date: Thu Apr 12 17:46:56 2018 -0700 + + added working patch + +commit 3ca9b7a2841918f0eb31e1aed26004f7c80bf128 +Author: eugenevinitsky +Date: Thu Apr 12 16:57:47 2018 -0700 + + 75 p avs + +commit 2d2b4080077ef204dba23e9d820849cce8696ce0 +Author: eugenevinitsky +Date: Thu Apr 12 16:27:23 2018 -0700 + + temp + +commit 41a187d7cc340ccaa21141249feaeac45ad4efb3 +Author: eugenevinitsky +Date: Thu Apr 12 15:20:36 2018 -0700 + + update + +commit aa8a422d583b433f83eec6bdcb55e1a94cf5841c +Author: eugenevinitsky +Date: Thu Apr 12 15:19:59 2018 -0700 + + made it so you dont have to control every edge + +commit 02983458e8520530b8dca669e3f6c7575d26eb6b +Merge: 87da3f9e ade03f93 +Author: AboudyKreidieh +Date: Thu Apr 12 11:59:06 2018 -0700 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic into gui_colors + +commit 09bfc314d4782e30983bb3096eb2f3a65719203a +Author: AboudyKreidieh +Date: Thu Apr 12 11:54:18 2018 -0700 + + more clutter removal + +commit 64fe0d4a800235c47646efa804e810ff878ad1df +Author: eugenevinitsky +Date: Thu Apr 12 10:48:13 2018 -0700 + + temp update + +commit bfda33759945a2e4ce8190c0c9efac1b46ba7fd5 +Author: eugenevinitsky +Date: Thu Apr 12 01:25:30 2018 -0700 + + fixes to visualizer rllib + +commit 1807107dc3e420a956b4a7ea7865bc63f46e361e +Author: eugenevinitsky +Date: Wed Apr 11 19:43:50 2018 -0700 + + update + +commit 060e52d523a93b6ded48b99133f37f87a9c858b2 +Author: eugenevinitsky +Date: Wed Apr 11 19:27:13 2018 -0700 + + update + +commit 070637e7bc92d9a5afb7824185166f4f735f5252 +Author: eugenevinitsky +Date: Wed Apr 11 19:25:30 2018 -0700 + + update for run + +commit f7934519617ef7261cc8043df8e51ceb7b781dc7 +Merge: 4110483b 1a435c2e +Author: eugenevinitsky +Date: Wed Apr 11 19:05:20 2018 -0700 + + Merge branch 'velocity_bottleneck' of https://github.com/cathywu/learning-traffic into velocity_bottleneck + +commit 4110483be0bbf9de75ac84b45ceda6f59a2c1b57 +Author: eugenevinitsky +Date: Wed Apr 11 19:05:09 2018 -0700 + + fixed rllib visualizer to read out flow params from the env config + +commit b22765832991b4a1c02bd76475acf5da251e50b8 +Author: eugenevinitsky +Date: Wed Apr 11 18:10:41 2018 -0700 + + temp + +commit 7547b0e0cf18e07527d4143f67ce6d885aeb8e2f +Author: AboudyKreidieh +Date: Wed Apr 11 17:23:33 2018 -0700 + + removed two_loops_one_merging and repurposed its tests for two_loops_one_merging_new + +commit 3da6b574482d9fbf9615236d1e4b076cc6a204c3 +Author: AboudyKreidieh +Date: Wed Apr 11 17:10:27 2018 -0700 + + more clutter removal + +commit f4dd1d4125eec805a224750b1c5737ecf2a75fe9 +Author: AboudyKreidieh +Date: Wed Apr 11 17:03:19 2018 -0700 + + deleted two way intersection and pep8 to tests + +commit cd0616cd7bb01f77ff5f2428bfcec6c493610f1a +Author: AboudyKreidieh +Date: Wed Apr 11 14:34:51 2018 -0700 + + fixed a bug in restarts when there are inflows + +commit 2d67710c817c5396bf0c5721e62f3e5aee2f7b67 +Merge: ccb91895 1a435c2e +Author: Nishant +Date: Wed Apr 11 12:43:11 2018 -0700 + + Merge branch 'velocity_bottleneck' of github.com:cathywu/learning-traffic into vel_early_lc + +commit 2f05a0117b3323d5f4f03c3cf9b784ab07703138 +Author: eugenevinitsky +Date: Wed Apr 11 12:23:14 2018 -0700 + + temp + +commit 63d685c09b060ef9a9061b1cc52b77bde3d62e80 +Author: AboudyKreidieh +Date: Wed Apr 11 12:05:56 2018 -0700 + + PR fix + +commit 1a435c2e32bd8918ec06f02808814a2c31df7420 +Author: eugenevinitsky +Date: Wed Apr 11 11:31:39 2018 -0700 + + Update velocity_bottleneck.py + +commit 230e7c642859d84ffec47b1cedf2e5522f90e188 +Merge: 3ab731dd ade03f93 +Author: eugenevinitsky +Date: Wed Apr 11 11:28:13 2018 -0700 + + Merge branch 'master' into velocity_bottleneck + +commit 0e7c6f952ef3655af49231b8b58da87a0c01f05b +Merge: 8687f006 3ab731dd +Author: eugenevinitsky +Date: Wed Apr 11 11:24:29 2018 -0700 + + Merge branch 'velocity_bottleneck' of https://github.com/cathywu/learning-traffic into velocity_bottleneck + +commit 8687f006101c25338636d794e941673a80ac0dce +Merge: 128b9d4f ade03f93 +Author: eugenevinitsky +Date: Wed Apr 11 11:24:18 2018 -0700 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic into velocity_bottleneck + +commit f42de9d03929c78fd9558a4bf84505c0d5970da3 +Merge: 02b00ef8 ade03f93 +Author: eugenevinitsky +Date: Wed Apr 11 02:12:33 2018 -0700 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic + +commit 21ec89d841fa1956a89e269e45ecbf1ca8909225 +Author: Eugene +Date: Wed Apr 11 01:54:55 2018 -0700 + + upgrade + +commit 3ab731dd043b66aaf3295db5cb7fa87bd4f6e5ce +Author: Kanaad Parvate +Date: Wed Apr 11 00:26:42 2018 -0700 + + added settling time scripts, and tweaked hand tuned controller + +commit 64225fea89883af83ce55356a3259e5c5c007e9c +Merge: d048a22a 433460ab +Author: Kanaad Parvate +Date: Wed Apr 11 00:25:26 2018 -0700 + + merge bottleneck + +commit 546777f008812d1bd1113cdcf7e8a3154284b0ad +Author: Eugene +Date: Wed Apr 11 00:19:30 2018 -0700 + + working docker file as of april + +commit ccb918955abe0b59fc898f79db7afa6f11d03e8a +Author: Nishant +Date: Wed Apr 11 00:15:30 2018 -0700 + + supporting default velocity for rl vehicles leaving controlled edges and lanes + +commit f001dabe1fac7f70918bf206c86b26239399dee1 +Merge: 24afdfe3 433460ab +Author: Nishant +Date: Tue Apr 10 22:06:03 2018 -0700 + + merging in velocity_bottleneck + +commit 24afdfe30c300c54cb311d4a76c12d885b5eb78f +Merge: 32850478 ade03f93 +Author: Nishant +Date: Tue Apr 10 20:28:52 2018 -0700 + + Merge branch 'master' of github.com:cathywu/learning-traffic into vel_early_lc + +commit 128b9d4fb39b7e58177254b3a902d2fcd0974cd4 +Author: eugenevinitsky +Date: Tue Apr 10 18:46:04 2018 -0700 + + moved flow params to json config + +commit 16a112d25b9b2ee42c2f6959bd651904377603c7 +Author: eugenevinitsky +Date: Tue Apr 10 18:07:10 2018 -0700 + + minor + +commit ade03f93699000be783c9bafe10f01dd8a2e6e8b +Merge: 393a8e40 4296a202 +Author: eugenevinitsky +Date: Tue Apr 10 15:36:12 2018 -0700 + + Merge pull request #392 from cathywu/rllib_update + + Rllib update + +commit 699617702f19beb0d61c8dc1da1be9e2366088b3 +Author: eugenevinitsky +Date: Tue Apr 10 15:34:20 2018 -0700 + + working dockerfile + +commit 433460ab656c7bc3be7e1b77b0ce151f2f2149ed +Author: eugenevinitsky +Date: Mon Apr 9 22:46:19 2018 -0700 + + simplified visualizer choice for rllib run script + +commit cbdd1b11c817a9753ac6e7d18304a6437c796103 +Author: eugenevinitsky +Date: Mon Apr 9 22:37:59 2018 -0700 + + normalize + +commit 8bd6fa8ad96053a87f77a1976627bd6ea7e5f541 +Author: eugenevinitsky +Date: Mon Apr 9 22:34:00 2018 -0700 + + changed net + +commit 3dd556265901221174f086082e15662f1dca58b2 +Author: eugenevinitsky +Date: Mon Apr 9 22:31:35 2018 -0700 + + added mean segment speed to state space + +commit 328504780928611f9fffcd500ee6c7b490446a81 +Author: Nishant +Date: Mon Apr 9 22:11:58 2018 -0700 + + added support for different desired velocity per lane within a segment + +commit 945eea815ffbc996368b96213a2f2d0342a70214 +Author: eugenevinitsky +Date: Mon Apr 9 22:06:04 2018 -0700 + + fixed rllib visualizer script + +commit eeb8596cb5de85bdd829e78cfae91a89bcd65da7 +Author: eugenevinitsky +Date: Mon Apr 9 21:50:55 2018 -0700 + + semi working visualizer + +commit 9898b7ebd10c7b2ee47fbec59e1464ce32e3f95f +Author: Eugene +Date: Mon Apr 9 20:34:37 2018 -0700 + + minor + +commit 346ec9a96fb888d24b9f25938722a530fe84d62a +Author: Nishant +Date: Mon Apr 9 19:26:23 2018 -0700 + + more bottleneck & early lane-change related reward functions + +commit e1186f935a9eb9aabd556bcf1499ed298717b336 +Author: eugenevinitsky +Date: Mon Apr 9 17:56:28 2018 -0700 + + update + +commit c5c51492c199e4a47fd5d585d07dfe899db4a67c +Author: eugenevinitsky +Date: Mon Apr 9 17:56:11 2018 -0700 + + update + +commit 8d655d7b7b06bef4554db577fb7d12beddcd1477 +Author: eugenevinitsky +Date: Mon Apr 9 17:53:45 2018 -0700 + + actions werent being clipped! + +commit be741527c8c44dbcacafdcdb6aa679c6e4e4a0d6 +Author: eugenevinitsky +Date: Mon Apr 9 17:43:01 2018 -0700 + + fixed bug + +commit 034e467506caf4cfcc039bcf398f9b383a0eb126 +Author: eugenevinitsky +Date: Mon Apr 9 17:34:04 2018 -0700 + + minor + +commit 7d8f6b2284bde9cca33574669c0d521804320788 +Author: eugenevinitsky +Date: Mon Apr 9 17:32:34 2018 -0700 + + added more vehicles + +commit dbd0babbb46a505cf3ec65022f926d48d5e4871b +Author: eugenevinitsky +Date: Mon Apr 9 17:17:53 2018 -0700 + + update + +commit b6290021690561266d275384f6c8dc138254613f +Author: eugenevinitsky +Date: Mon Apr 9 17:13:13 2018 -0700 + + edit + +commit 85a8a77bef43c66ac178bd93fac097543dde0b7a +Author: eugenevinitsky +Date: Mon Apr 9 16:21:32 2018 -0700 + + update + +commit 5c2c2ab4ab22da96cc29b10ebc9ebb83684a6e5e +Author: eugenevinitsky +Date: Mon Apr 9 16:20:13 2018 -0700 + + update + +commit fbb26857fc6ad696220a4372837c4464c0ae7c21 +Author: eugenevinitsky +Date: Mon Apr 9 16:19:27 2018 -0700 + + normalized + +commit b1e1f9e0be449fe6815d61969961b595c2623dde +Author: Nishant +Date: Mon Apr 9 15:29:49 2018 -0700 + + more stuff with lanes + +commit ea93ac117a1e5334772d65ce425b5cf89eea1f22 +Author: eugenevinitsky +Date: Mon Apr 9 15:24:13 2018 -0700 + + update + +commit ddbb9b6725d9aa7440e23075dc9e05386c7da635 +Author: eugenevinitsky +Date: Mon Apr 9 14:49:10 2018 -0700 + + upgrade + +commit 419bb6f5b4038242afff73facafab71ed4e71924 +Author: eugenevinitsky +Date: Mon Apr 9 13:30:05 2018 -0700 + + update + +commit b647237e2cdbe317da8334c5f89d04b8555cb5f7 +Author: eugenevinitsky +Date: Mon Apr 9 13:20:46 2018 -0700 + + ready for pull request + +commit 82edf39f6a880986419cd678b339c44e7fc11418 +Author: eugenevinitsky +Date: Mon Apr 9 08:36:10 2018 -0700 + + need to restart sumo + +commit 6f4a48d0c20d45b2583277299462bf787f2f5bf2 +Author: Nishant +Date: Mon Apr 9 01:09:30 2018 -0700 + + changed env to control only one edge and also outside lanes only + +commit b6d7a99a3c813c6e4af9176e6c4e181574f0bca7 +Author: eugenevinitsky +Date: Mon Apr 9 00:34:43 2018 -0700 + + updated horizon + +commit 45106600b81fa2f11f08797a8bd6b2183d27832f +Author: eugenevinitsky +Date: Mon Apr 9 00:33:51 2018 -0700 + + normalizing + +commit 6f37ef5a953bb9f50e03fa63f7c24bcce0be4ee3 +Author: eugenevinitsky +Date: Mon Apr 9 00:29:14 2018 -0700 + + normalized the vehicles + +commit 12651a6b2901e616dd7e083796a61cfffb99cffd +Author: eugenevinitsky +Date: Mon Apr 9 00:06:17 2018 -0700 + + minor update + +commit 592bd4ebda45b9e375e74b49a65ae9f049d3eee4 +Author: eugenevinitsky +Date: Sun Apr 8 23:32:49 2018 -0700 + + added outflow reward + +commit 514d664ddf856d220e8518c163981f2ec54ba82d +Author: eugenevinitsky +Date: Sun Apr 8 22:56:17 2018 -0700 + + quieted rollouts + +commit d6f678ffa2de4616f06e5a618cd2a1a680b5d474 +Merge: b27dab11 06d968e7 +Author: eugenevinitsky +Date: Sun Apr 8 22:53:30 2018 -0700 + + Merge branch 'print_warnings' into velocity_bottleneck + +commit 06d968e7cbbb61a12a7e2dbfe92c41de6497906f +Author: eugenevinitsky +Date: Sun Apr 8 22:53:19 2018 -0700 + + added ability to silence warnings + +commit b27dab110286738ac883adcfb33eb1916b6f4644 +Author: eugenevinitsky +Date: Sun Apr 8 22:29:52 2018 -0700 + + updated autoscaler script + +commit a0468182b54067657fad3da31f5b4a509c7217ad +Author: eugenevinitsky +Date: Sun Apr 8 22:15:03 2018 -0700 + + update + +commit ee87a31a55b86b935b85a2ef4480643a47d9c5c9 +Merge: 8e5e5024 02b00ef8 +Author: eugenevinitsky +Date: Sun Apr 8 22:13:14 2018 -0700 + + Merge branch 'master' into velocity_bottleneck + +commit 02b00ef8927b553aef51ec5ac152601776d3918c +Merge: d982b6df 393a8e40 +Author: eugenevinitsky +Date: Sun Apr 8 22:13:03 2018 -0700 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic + +commit 8e5e5024222e4b4caaaa1228d9a11991ef1c69b5 +Author: eugenevinitsky +Date: Sun Apr 8 22:12:56 2018 -0700 + + update + +commit 3aa9d2d96e7b6384090ffa7b65b031f01a973884 +Author: eugenevinitsky +Date: Sun Apr 8 22:10:57 2018 -0700 + + changed safety so it can be active when needed + +commit b6d16ccd8999075439608bc641babcf3da7332ad +Author: eugenevinitsky +Date: Sun Apr 8 19:32:59 2018 -0700 + + update + +commit 45f1b24262aacab2c18884b5a457da9531372fc9 +Author: eugenevinitsky +Date: Sun Apr 8 18:46:48 2018 -0700 + + update + +commit 61c698bbec6718fcb4e65fc6fa7b61df95c40934 +Author: eugenevinitsky +Date: Sun Apr 8 18:44:01 2018 -0700 + + added safe velocity + +commit 723700e09f87daac9de2e5bb947f472a629ba7df +Author: eugenevinitsky +Date: Sun Apr 8 18:34:11 2018 -0700 + + update + +commit eaf34a37e3ac76567445449432c6aef4206b7211 +Author: eugenevinitsky +Date: Sun Apr 8 18:25:42 2018 -0700 + + update + +commit f72214b461730db5454ef9898bcf3657ed6ae260 +Author: eugenevinitsky +Date: Sun Apr 8 18:18:50 2018 -0700 + + update + +commit 747d7de8d4604d8391db548b098f7a509af46979 +Author: eugenevinitsky +Date: Sun Apr 8 18:14:01 2018 -0700 + + update + +commit 3db123351f5714b47d064e65842871682e386899 +Merge: 1b166bd5 479c4025 +Author: eugenevinitsky +Date: Sun Apr 8 18:11:27 2018 -0700 + + merged + +commit 1b166bd52e598e6f4bdde4dea04f127e6c779a54 +Author: eugenevinitsky +Date: Sun Apr 8 18:10:33 2018 -0700 + + updated rllib bottleneck script + +commit d048a22a78e81f89cc6110587f4a1d354532fcda +Author: Kanaad Parvate +Date: Sun Apr 8 17:44:36 2018 -0700 + + more progress + +commit 0737d7ee7390d9e69a4d114f9847f1d6f5b1a7bf +Merge: 8f8d8923 144fbb27 +Author: Kanaad Parvate +Date: Sun Apr 8 16:35:48 2018 -0700 + + Merge branch 'rl_early_merge' into velocity_bottleneck + +commit 8f8d8923161a668ea3d996e92967fbed565ec703 +Author: Kanaad Parvate +Date: Sun Apr 8 16:12:15 2018 -0700 + + progress + +commit 4b183359fe886808c986cd9117f8dd7edcabc320 +Merge: 3f9cc664 4296a202 +Author: eugenevinitsky +Date: Sun Apr 8 15:42:05 2018 -0700 + + Merge branch 'rllib_update' into velocity_bottleneck + +commit 479c4025db367e5b0cc04e0927c527b95651e201 +Merge: d95efaac 393a8e40 +Author: Kanaad Parvate +Date: Sun Apr 8 15:36:09 2018 -0700 + + Merge branch 'master' into velocity_bottleneck + +commit d95efaac1269c5302daa3ec183782ec3e90d1b43 +Merge: a75c747b 12949ec0 +Author: Kanaad Parvate +Date: Sun Apr 8 15:33:25 2018 -0700 + + Merge branch 'fixing_accel' into velocity_bottleneck + +commit 4296a202182abd7b012ed4e89921abaf9eedba6b +Author: eugenevinitsky +Date: Sun Apr 8 15:29:05 2018 -0700 + + swapped gym version + +commit 3f9cc664702713a02b5d5d8fda3efecc5c33b267 +Author: eugenevinitsky +Date: Sun Apr 8 15:28:45 2018 -0700 + + started rllbi script for velocity bottleneck + +commit c3f5a02ca96f6fc7e163b0221f09922ce9ac4095 +Merge: 148d3e2a 393a8e40 +Author: eugenevinitsky +Date: Sun Apr 8 15:26:00 2018 -0700 + + merged master + +commit 148d3e2ae913c5e74408d8ada97f7a8679a0225e +Merge: 22e46f77 a75c747b +Author: eugenevinitsky +Date: Sun Apr 8 15:20:34 2018 -0700 + + merged + +commit d10524322ae0f1343d0cf8cbbd5eb454758cf578 +Author: eugenevinitsky +Date: Sun Apr 8 14:36:08 2018 -0700 + + update + +commit 2893f325024626f9798ea3053299d51b1c6d2ab9 +Author: eugenevinitsky +Date: Sun Apr 8 14:26:49 2018 -0700 + + updated to new gym + +commit 393a8e4084260a546ac8d764b6d16b5f44eaa754 +Merge: 1f657c3c 2ad416e7 +Author: eugenevinitsky +Date: Sun Apr 8 14:08:39 2018 -0700 + + Merge pull request #390 from cathywu/outflow_2 + + total inflow and outflow calculations + +commit 1f657c3c0e2d281a682def85c01a4aa08bc73872 +Merge: e75f026c 12949ec0 +Author: eugenevinitsky +Date: Sun Apr 8 14:06:17 2018 -0700 + + Merge pull request #387 from cathywu/fixing_accel + + Fixing accel + +commit 0ac3ee25b9860af06d95eebb4f3f247b3ebe3f67 +Author: eugenevinitsky +Date: Sun Apr 8 14:02:24 2018 -0700 + + change instance type for ray cluster + +commit 144fbb27c577e468e5e5c26f1784fe3438ffed15 +Author: Kanaad Parvate +Date: Sun Apr 8 00:20:56 2018 -0700 + + increase pre-junction length + +commit 59d4fe97aab6d97d0f3c162999b49afacd88f4ee +Merge: a6a176b2 a75c747b +Author: Kanaad Parvate +Date: Sun Apr 8 00:15:31 2018 -0700 + + Merge branch 'velocity_bottleneck' of https://github.com/cathywu/learning-traffic into rl_early_merge + +commit 2ad416e7050721ffd5b86ae39bdfe5f35897edd7 +Author: AboudyKreidieh +Date: Fri Apr 6 22:30:02 2018 -0700 + + total inflow and outflow calculations + +commit 12949ec015bef9c8559d535583fbccfdc843716b +Author: Kanaad Parvate +Date: Fri Apr 6 21:27:41 2018 -0700 + + flake8 and other fixes + +commit a75c747b1aef3ea1336d119a67c33c1387581c30 +Author: Kanaad Parvate +Date: Fri Apr 6 19:13:35 2018 -0700 + + merge fixing_accel + +commit acea98401eab88785c854585079a1301b3c22370 +Merge: 67329e27 e75f026c +Author: Kanaad Parvate +Date: Fri Apr 6 19:10:19 2018 -0700 + + merged master + +commit 69127c93d9f7ba7d9bd0c3c65cabdde120d56e55 +Author: Kanaad Parvate +Date: Fri Apr 6 19:05:06 2018 -0700 + + tests pass + +commit 79afbb4f350f1bd8d0c2cba954dee88ddd691d3b +Merge: e48353fa e75f026c +Author: Kanaad Parvate +Date: Fri Apr 6 17:06:33 2018 -0700 + + merged master + +commit e48353fae803f17d35eb850f648ceb052be78851 +Author: Kanaad Parvate +Date: Fri Apr 6 17:03:24 2018 -0700 + + controller update + +commit d5f93a0de85f52f1d8d89d037d7133246fae8d38 +Merge: 1e3cd4c4 54bad74d +Author: eugenevinitsky +Date: Thu Apr 5 23:31:23 2018 -0700 + + Merge branch 'rllib_testing' of https://github.com/cathywu/learning-traffic into rllib_testing + +commit 1e3cd4c49d97a01fba0d86b99194572a64fc7af6 +Merge: 866e11c5 93f79e06 +Author: eugenevinitsky +Date: Thu Apr 5 22:50:56 2018 -0700 + + Merge branch 'rllib_testing' of https://github.com/cathywu/learning-traffic into rllib_testing + +commit 54bad74d93c70b30656fee08b814a9b98dea3856 +Merge: 866e11c5 93f79e06 +Author: eugenevinitsky +Date: Thu Apr 5 22:50:56 2018 -0700 + + Merge branch 'rllib_testing' of https://github.com/cathywu/learning-traffic into rllib_testing + +commit 866e11c5ab0340714489cdfda8e3afe3bf04e351 +Author: eugenevinitsky +Date: Thu Apr 5 22:23:34 2018 -0700 + + minor + +commit 93f79e06e9d19c0cc7d911de0168211d6b171c3e +Author: eugenevinitsky +Date: Thu Apr 5 22:23:34 2018 -0700 + + minor + +commit 1bd56c9413ae72950ded038556d6bcaf5d5c7665 +Merge: 09e0266e da2b5595 +Author: eugenevinitsky +Date: Thu Apr 5 22:12:48 2018 -0700 + + Merge branch 'rllib_testing' of https://github.com/cathywu/learning-traffic into rllib_testing + +commit 09e0266e7d77c3b1843ec8b1629e2ae71a97451c +Author: eugenevinitsky +Date: Thu Apr 5 22:05:44 2018 -0700 + + minor + +commit da2b5595044947c7f9a977e788c4f81eb23f9273 +Author: eugenevinitsky +Date: Thu Apr 5 22:05:44 2018 -0700 + + minor + +commit 73ddc187a3e98d7f414f9e991ba0875972c4a5b4 +Merge: 42679463 da77c3ed +Author: eugenevinitsky +Date: Thu Apr 5 19:25:01 2018 -0700 + + Merge branch 'rllib_testing' of https://github.com/cathywu/learning-traffic into rllib_testing + +commit 4267946343de7a5fd360883c581b3557d7fe83cd +Author: eugenevinitsky +Date: Thu Apr 5 19:17:43 2018 -0700 + + minor + +commit da77c3edad1e00d9264be3957f63d7e1cedb07c8 +Author: eugenevinitsky +Date: Thu Apr 5 19:17:43 2018 -0700 + + minor + +commit 0e2978f85814570f7a3f2a1f448fd7ff205dafef +Author: eugenevinitsky +Date: Thu Apr 5 19:14:04 2018 -0700 + + minor + +commit 0f4c9583d994205561de0d2b2d3089c845df3635 +Author: eugenevinitsky +Date: Thu Apr 5 18:33:11 2018 -0700 + + changed run style for rllib examples + +commit dec986dfe32bb4eb59757bace65e9f721fe9c6a8 +Author: eugenevinitsky +Date: Thu Apr 5 17:50:52 2018 -0700 + + updated travis + +commit 7e3009f2c2cbe3b172939839f1819a37a89421eb +Author: eugenevinitsky +Date: Thu Apr 5 17:49:27 2018 -0700 + + added instructions + +commit b3a7c03e52f17387052e31c5db9ace36f06a334f +Author: eugenevinitsky +Date: Thu Apr 5 16:54:06 2018 -0700 + + update + +commit 4e1ba49ee5f0b9431db405160e2968a4076ea363 +Author: eugenevinitsky +Date: Thu Apr 5 16:43:21 2018 -0700 + + minor + +commit 7aecd5cb1b3137d052f7320ac23e561e7b6175a8 +Author: eugenevinitsky +Date: Thu Apr 5 16:38:58 2018 -0700 + + updated cooperative merge setup script + +commit 88775375c426e4f0a38d932bb566fcb906e17b89 +Author: eugenevinitsky +Date: Thu Apr 5 16:37:29 2018 -0700 + + working setup script + +commit 3477071489c61e6740811b439e3d4b3fee793ea5 +Author: AboudyKreidieh +Date: Wed Apr 4 13:51:05 2018 -0700 + + removed max_speed from EnvParams + +commit 266b1aef0d2d0ac5d97e4169437652ec7be2ea97 +Author: Kanaad Parvate +Date: Wed Apr 4 00:50:02 2018 -0700 + + more bug fixes + +commit e75f026ca057ae80a1776bb2a0f071bc22e7fff2 +Merge: 78d586eb 5983245c +Author: eugenevinitsky +Date: Tue Apr 3 20:48:58 2018 -0700 + + Merge pull request #383 from cathywu/flakefixes + + added no crash custom mode to vehicles, flake 8 fixes + +commit d982b6df52d999eccef37fbaf805551cfde2b98e +Merge: 0d3dcd6e 95626f96 +Author: eugenevinitsky +Date: Tue Apr 3 20:46:02 2018 -0700 + + Merge branch 'rllib_testing' + +commit 0d3dcd6e14a7e7e0fef7ea807618dffdceaf66ae +Merge: 5983245c 78d586eb +Author: eugenevinitsky +Date: Tue Apr 3 20:45:54 2018 -0700 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic + +commit 95626f961ae1a428538e3383e02a883612fd4edf +Author: eugenevinitsky +Date: Tue Apr 3 20:45:46 2018 -0700 + + minor + +commit 66b3b6dd4fbcd8649f1a28d3e2c1e488c0dd7fb3 +Merge: c9e3e7a5 78d586eb +Author: eugenevinitsky +Date: Tue Apr 3 20:43:49 2018 -0700 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic into rllib_testing + +commit 78d586eb1b4620c708ae21f44bd7c2825bed2603 +Merge: e99713b1 bd42a1cb +Author: AboudyKreidieh +Date: Tue Apr 3 19:49:24 2018 -0700 + + Merge pull request #379 from cathywu/sims_per_step_bug_fix + + bug fix for collisions with multiple sims_per_steps + + added checking for collisions within the sims_per_step loop. This way, if there is a collision no new simulations are run, which may cause the exp to terminate on an error + +commit 5983245c894acaff8539e403465345506e71ff79 +Author: eugenevinitsky +Date: Tue Apr 3 19:45:37 2018 -0700 + + added no crash custom mode to vehicles, flake 8 fixes + +commit c9e3e7a567583aa7ed19667e5eed9dca3afbbed8 +Author: eugenevinitsky +Date: Tue Apr 3 19:35:48 2018 -0700 + + autoscaler modification + +commit 3fde1d9992d3d33053dd0f04d0a3c0bb49b6bf85 +Author: eugenevinitsky +Date: Tue Apr 3 17:31:25 2018 -0700 + + updating dtype + +commit 52cc38ccfd6ab39e35171cbe92e6881816893eb2 +Author: eugenevinitsky +Date: Mon Apr 2 14:47:35 2018 -0700 + + updated run script for stabilizing the ring rllib verision + +commit c1868e66b692ee6ffb646376742f2bad47e21dd5 +Author: eugenevinitsky +Date: Mon Apr 2 14:40:54 2018 -0700 + + updated setup script + +commit 22e46f775cefde2e107ba652e641d1230b521610 +Author: eugenevinitsky +Date: Mon Apr 2 12:27:14 2018 -0700 + + cleanup + +commit e431bbda4c755a80b2b144a04e60bf34f1e1c665 +Author: eugenevinitsky +Date: Mon Apr 2 11:41:16 2018 -0700 + + debugging + +commit 6971ce645c4aa0c71e5c0775bd4192b3b312cbcb +Author: Kanaad Parvate +Date: Sun Apr 1 18:32:54 2018 -0400 + + updating velocity controllers appropriately + +commit 7a1c025721d4e4f6154d8332697b0cdfb5aed8fb +Author: Kanaad Parvate +Date: Sun Apr 1 18:28:59 2018 -0400 + + correct accessing of params from SumoCFParams aka i'm dum + +commit 427b0e7e05cb21deba0270a5049990c2ef966fac +Author: Kanaad Parvate +Date: Sun Apr 1 18:20:48 2018 -0400 + + added sumo params as a paramter for flow controllers, and adjusted some of the controllers acordingly. THIS CHANGE BREAKS THE BUILD, NEED TO UDPATE MORE + +commit e99713b142c0651c9e6af60f13ec1f943ff59cf6 +Merge: 063874c7 4212d697 +Author: AboudyKreidieh +Date: Sun Apr 1 10:55:38 2018 -0700 + + Merge pull request #380 from cathywu/lane_change_directions_only + + removed target lanes from lane change actions + + changes: + - removed `target_lane` from `apply_lane_change`. + + The idea behind this is that it's a bit confusing that rl lane change actions are chosen by a direction and human-driven vehicle actions by target lane. This could also get confusing when we move on to use lateral speeds as well. If we don't think it's a good idea, we can all just not do this and move on, but I think we should do this. + +commit 67329e278be42786c1bbcf55ec37d9c930302ffa +Merge: ee42b06c c57c5a5e +Author: Kanaad Parvate +Date: Fri Mar 30 14:41:32 2018 -0400 + + Merge branch 'velocity_bottleneck' of https://github.com/cathywu/learning-traffic into velocity_bottleneck + +commit 4212d697109e5b915497313721a8a3fc1a8e03b9 +Author: AboudyKreidieh +Date: Wed Mar 28 20:57:24 2018 -0700 + + removed target lanes from lane change actions + +commit bd42a1cbaf69408d6147f3ef6e2a1ce6bba9844d +Author: AboudyKreidieh +Date: Wed Mar 28 20:31:14 2018 -0700 + + bug fix for collisions with multiple sims_per_steps + +commit 87da3f9e399f7e1991dab939abcf6701596399a6 +Author: AboudyKreidieh +Date: Wed Mar 28 20:19:56 2018 -0700 + + changes to wave attenuation env, and observed colors to envs + +commit 7500289b6aa0eaaa9f6162987e34ecf5cfde0818 +Author: AboudyKreidieh +Date: Wed Mar 28 19:05:23 2018 -0700 + + added methods in order to allow base_env to automatically change the colors of vehicles base on their type + +commit f40dcf84732c396dbcb7e18e433a96c9fb4a3fb2 +Author: AboudyKreidieh +Date: Wed Mar 28 18:58:09 2018 -0700 + + updated documentation for base generator and defaulted color of background to grey + +commit c57c5a5eac968995a7010ee6f83cd0b8ea67e31f +Author: eugenevinitsky +Date: Wed Mar 28 12:16:20 2018 -0700 + + minor changes + +commit 063874c78eb9c1d9a904f35b1353bb9b38eb5668 +Merge: 3f4921c4 8ec9ebe5 +Author: eugenevinitsky +Date: Tue Mar 27 17:09:53 2018 -0700 + + Merge pull request #370 from cathywu/reset_mod + + restart mod + +commit 3f4921c4e61fc0dde34c02ee951b7616d2a02f59 +Merge: c014f6e9 54866d4c +Author: eugenevinitsky +Date: Tue Mar 27 17:08:53 2018 -0700 + + Merge pull request #375 from cathywu/bottleneck_fix + + increased bottleneck radius + +commit c014f6e99ae0a8128f4440206c53b821439652fe +Merge: e6cc4c53 1300568c +Author: eugenevinitsky +Date: Tue Mar 27 17:08:39 2018 -0700 + + Merge pull request #376 from cathywu/visualizer_bug_fix + + refactoring bug fix to visualizer_rllab.py + +commit 1300568c23b708545724a1078ecad0efb7f04b7e +Author: AboudyKreidieh +Date: Tue Mar 27 16:23:40 2018 -0700 + + refactoring bug fix to visualizer_rllab.py + +commit 8ec9ebe55f920ddda5d88d06562ba7f7a3c19dcf +Author: AboudyKreidieh +Date: Tue Mar 27 16:19:09 2018 -0700 + + PR review additions + +commit ee42b06c8e9fa4f4b5f4afd2d85503980ca161f3 +Merge: 52debf8d cbfbdd21 +Author: Kanaad Parvate +Date: Tue Mar 27 18:08:16 2018 -0400 + + Merge branch 'velocity_bottleneck' of https://github.com/cathywu/learning-traffic into velocity_bottleneck + +commit 52debf8d980184d66ca4ca892540928b133910e8 +Author: Kanaad Parvate +Date: Tue Mar 27 18:08:12 2018 -0400 + + density experiments + +commit e6cc4c53031e29d2c9b7d0c14a47713e2d298a88 +Merge: b3aabac1 2d51dbaf +Author: eugenevinitsky +Date: Tue Mar 27 15:04:54 2018 -0700 + + Merge pull request #371 from cathywu/bottleneck_run_scripts + + updated bottleneck run scripts + +commit cbfbdd219fb5b01cbeb96c8659e20795696b2963 +Merge: f42f092f 54866d4c +Author: eugenevinitsky +Date: Tue Mar 27 15:00:58 2018 -0700 + + modified velocity bottleneck slighty + +commit 54866d4ca225606b584abe80ccc5e3a18a6b8a1b +Author: eugenevinitsky +Date: Mon Mar 26 13:37:55 2018 -0700 + + flake fixup, error handling + +commit 1712dd72c14322b835a66ee7c23af218f3820880 +Author: eugenevinitsky +Date: Mon Mar 26 12:58:29 2018 -0700 + + increased bottleneck radius + +commit 2d51dbaf6367abfa977f13664eb4f1f2c4eb53c7 +Author: AboudyKreidieh +Date: Wed Mar 21 10:11:30 2018 -0700 + + added random inflows, slow initial number of vehicles, updated sumo cfm params + +commit a28178b366d390198711a13c037dd7102eeb12a2 +Author: AboudyKreidieh +Date: Wed Mar 21 09:58:34 2018 -0700 + + restart mod + +commit f42f092f3f0e9f8ba600739bbb611b9ef625c5eb +Author: eugenevinitsky +Date: Wed Mar 21 08:41:45 2018 -0700 + + minor + +commit b3aabac1b4b46ce46b310fbed36abdd1903a11b9 +Author: nskh +Date: Mon Mar 19 10:31:50 2018 -0700 + + added plotter (#369) + + * added plotter + + * @eugenevinitsky's suggested tweaks + +commit 1e29cb1027b69c99f2b35dbb9058b16bb277e175 +Merge: b5d5543c 7ae658d8 +Author: eugenevinitsky +Date: Sat Mar 17 17:59:46 2018 -0700 + + Merge pull request #368 from cathywu/bottlenecks + + Update bottlenecks.py + +commit 48dc1bd2be91f24fc5bef5c88d8af239062c7974 +Author: Kanaad Parvate +Date: Sat Mar 17 17:58:42 2018 -0700 + + move density exp to examples/sumo + +commit 6f1cda0b2493981ad942ba583f5e2cd50acc42b8 +Merge: 5eb33aad 61f629fe +Author: Zian Hu +Date: Sat Mar 17 17:35:32 2018 -0700 + + jhf + +commit b5d5543cd813d8d36a164da8a0802ee37c8f2288 +Merge: 61f629fe 906ed2d9 +Author: AboudyKreidieh +Date: Sat Mar 17 17:25:13 2018 -0700 + + Merge pull request #341 from cathywu/cleanup_environments + + Cleanup environments + + changes: + - pep8 fixes and documentation fixes to most environment classes + - I'm proposing a systematic way of us documenting our environments if someone else wants to get a somewhat detailed description of their contents. We essentially always provide four components: states, actions, rewards, and termination, but also may have additional components at the four main onces (such as additional or sorting). In addition, like any class each environment needs a brief an detailed description at the top. The documentation currently presented is mostly in skeleton form (lots of blanks), but I'm hoping we can fill them out prior to any new release + + Note: + - `two_loops_one_merging` needs to be merged in, so best to punt any argument over the deleted commented portions in it. + +commit f2ffb90799a0e407aeb48303ad0ed00d08a76bc3 +Merge: 921e3437 8bd4e25c +Author: eugenevinitsky +Date: Sat Mar 17 16:18:51 2018 -0700 + + merged in remote + +commit 921e3437b1004abbea34f179352eca9256449dae +Author: eugenevinitsky +Date: Sat Mar 17 16:13:44 2018 -0700 + + working alinea, uncalibrated v 2 + +commit 8bd4e25cc3b77b6a22801fafc00ed74008577f02 +Author: eugenevinitsky +Date: Sat Mar 17 16:13:44 2018 -0700 + + working alinea, uncalibrated v 2 + +commit da290c1f16dffdbbc1fe96b08ccd03a41700acae +Author: eugenevinitsky +Date: Sat Mar 17 15:37:55 2018 -0700 + + alinea running uncalibrated + +commit d1e40ec159e0e7bedc3c8eb7b32bb87e52c4fbff +Author: eugenevinitsky +Date: Sat Mar 17 14:42:43 2018 -0700 + + started building out ALINEA + +commit 61f629febc053c505d67268f5182686e88bf5ab4 +Merge: bec57cab f8936cb5 +Author: AboudyKreidieh +Date: Sat Mar 17 12:09:11 2018 -0700 + + Merge pull request #364 from cathywu/figure_eight_exp + + Adding rllab and rllib figure-eight experiments + + Aboudy wrote these and for some reason they're not in `master`. I'm making this PR to add these two. + +commit 5eb33aad52365040947c16c4abcf212ea41523f3 +Author: Kanaad Parvate +Date: Fri Mar 16 18:34:08 2018 -0700 + + hand tuned vel control + +commit bec57cab536c0978d183248794b91a3b8b9942e1 +Merge: 884eeb4e 2b9ef314 +Author: Kanaad Parvate +Date: Fri Mar 16 17:07:19 2018 -0700 + + Merge pull request #365 from cathywu/subscription_bug + + Fixed bug with removing subscriptions + +commit a6a176b2a97920ef38fc0e9dd9c96c8b22b92284 +Author: Kanaad Parvate +Date: Fri Mar 16 16:53:28 2018 -0700 + + ready for multiagent + +commit f8936cb5aa5d392f2b9123a97e39ad32e8426ec3 +Author: AboudyKreidieh +Date: Fri Mar 16 14:50:59 2018 -0700 + + wrong scenario specified + +commit 2b9ef314723c84b1a5711da7addb2f54b9300ac0 +Author: Nishant +Date: Fri Mar 16 14:49:36 2018 -0700 + + inflow begin + +commit b4a7e878c30d17f7a91f6fc76cfc2b3edb6ce5b4 +Merge: b98488c7 884eeb4e +Author: AboudyKreidieh +Date: Fri Mar 16 14:41:09 2018 -0700 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic into figure_eight_exp + +commit 32b525b8fee14b13f4aab5554268ad9fbeed72e9 +Author: Kanaad Parvate +Date: Fri Mar 16 14:28:25 2018 -0700 + + allowed for inflows w/out starting vehicles and removed second unsubscribe + +commit 884eeb4e4274c643b75d46ade634e59897bddf19 +Merge: d1357a16 3fca6220 +Author: eugenevinitsky +Date: Fri Mar 16 14:06:04 2018 -0700 + + Merge pull request #363 from cathywu/aws_dying_seeds_fix + + fixed aws dying seeds bug + +commit 3fca622022d55a4b71d38ad07bd06551b7e13d07 +Author: AboudyKreidieh +Date: Wed Mar 14 17:05:10 2018 -0700 + + fixed aws dying seeds bug + +commit f649cb7874fd9c90322cb64c9ff4d2da4bbda9c9 +Author: eugenevinitsky +Date: Wed Mar 14 13:12:17 2018 -0700 + + experiment seems to run without crashes + +commit 07c33ef32f04297b940b306b1b587bdf1c1b0f6c +Author: eugenevinitsky +Date: Wed Mar 14 10:46:57 2018 -0700 + + working experiments + +commit 766a7c43054bf9dbde11a8131e21105c052b5df8 +Author: eugenevinitsky +Date: Wed Mar 14 10:22:31 2018 -0700 + + running bottleneck velocity experiment + +commit de28d82400ca187d2731d2d954ddf06ac7aef0fd +Author: eugenevinitsky +Date: Tue Mar 13 18:29:43 2018 -0700 + + added working experiment, need to add danger edges + +commit f4c1c081fdb749f84176a7686ad7a0391482e6b1 +Author: eugenevinitsky +Date: Tue Mar 13 17:53:38 2018 -0700 + + started preliminary env + +commit 906ed2d9f49bfadf1fe7d13adc66d049a9f2f14a +Merge: b4ece0b4 ac99ec24 +Author: AboudyKreidieh +Date: Tue Mar 13 16:09:37 2018 -0700 + + Merge branch 'multiagent_bottleneck' of https://github.com/cathywu/learning-traffic into cleanup_environments + +commit ac99ec241c5b8b036c56425c148643fd7f659040 +Merge: 1df86f3c d1357a16 +Author: AboudyKreidieh +Date: Tue Mar 13 15:52:52 2018 -0700 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic into multiagent_bottleneck + +commit c892459cb6839a05d17fd2187726818ee58aaf25 +Merge: 2717ad27 d1357a16 +Author: eugenevinitsky +Date: Tue Mar 13 15:50:42 2018 -0700 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic into velocity_bottleneck + +commit 2717ad272dc0fa9e46b72cb2f8f492b74f23dec2 +Author: eugenevinitsky +Date: Tue Mar 13 15:50:39 2018 -0700 + + started new environment + +commit d1357a1699a717354f3b373ca49589332d76056b +Merge: 92721e4b 96a123df +Author: AboudyKreidieh +Date: Tue Mar 13 15:47:12 2018 -0700 + + Merge pull request #361 from cathywu/warmup_multiple_steps + + Warmup multiple steps + + changes: + - added a `warmup_steps` attribute to `EnvParams`, which can be used to warmup the simulation for a few steps before running a training rollout + - added a `sims_per_step` attribute to `EnvParams`, which can be used to run multiple simulation steps with the same rl action. + - tests for the two above methods + - added an internal `_apply_rl_actions` method, which should be used instead of `apply_rl_actions` for all children classes. This lets the actions by rl agents be dictated by sumo when the rl algo is not issuing commands (e.g. during a warmup for when using `SumoExperiment`) + + Note: + - currently, the `Vehicles` and `TrafficLights` classes do not store information for every simulation step in `sims_per_step`, but instead only the last sim step + + -------------------- + + Cleanup params + + changes: + - pep8 and cleanup to `flow.core.params`. This includes removing `shared_policy` and `shared_rewards` from `EnvParams`, since they are not used and calling similar methods in the future will be from rllib + - added a default (large) value for the `end` parameter in `InFlows`. This is because new versions of sumo default this to 24 hours, meaning that after 24 hours of simulation vehicles stop flowing into the network. + - created method for issuing deprecation warnings + - added deprecation warnings for refactoring changes in `flow.core.params` + - modified documentation to the classes in `flow.core.params` (more still needed) + - tests for deprecation warning, `SumoLaneChangeParams`, and `SumoCarFollowingParams` + +commit 9895ab8a73b55b8964d4e2a647368f02ef9d7680 +Author: Kanaad Parvate +Date: Tue Mar 13 14:31:17 2018 -0700 + + hand-tuned sumo bottleneck with followerstopper cars(called bottleneck_dan.py). followerstopper can release control back to sumo by returning None, generator has fixed speeds of 23m/s + +commit 96a123dfeaa9d7fad6ba3403bb1b3dbb7dcbe62b +Author: AboudyKreidieh +Date: Tue Mar 13 13:01:15 2018 -0700 + + warmup steps, sims per step, and default rl actions + +commit 78eb0338b2d4484cf39812ae4cd2078b4fc57fa3 +Author: AboudyKreidieh +Date: Tue Mar 13 11:57:52 2018 -0700 + + pep8 and cleanup to params + +commit 0eb45887397240d3a8383879a1d4eb291bc54ac5 +Author: AboudyKreidieh +Date: Tue Mar 13 11:57:27 2018 -0700 + + created method for issuing deprecation warnings + +commit 8562f0c707e91cc75bddf64ebb69e0c29f702998 +Author: Kanaad Parvate +Date: Mon Mar 12 18:21:27 2018 -0700 + + some code + +commit 065d96f428b68ca29a2f092059a7a503b516fa9e +Author: Kanaad Parvate +Date: Mon Mar 12 17:00:55 2018 -0700 + + some code + +commit 92721e4ba37a4ff36ee815ac275917c531fc3db2 +Merge: 2e5edf28 896ef8e7 +Author: Kanaad Parvate +Date: Mon Mar 12 14:23:30 2018 -0700 + + Merge pull request #359 from cathywu/dans_models + + added dan's controllers + +commit 896ef8e7f6d11ec9cd5c89785e5b1ef13c24c7a7 +Author: Kanaad Parvate +Date: Mon Mar 12 14:22:03 2018 -0700 + + added url to dan's paper + +commit 1df86f3c6e34efeacbf6fe7ddcf0bab695c078d4 +Author: eugenevinitsky +Date: Mon Mar 12 11:18:58 2018 -0700 + + added outflow velocity function + +commit 2e5edf2866bf93239985f988fac4816da51291d6 +Merge: 7c8d6f55 712e1a31 +Author: eugenevinitsky +Date: Mon Mar 12 10:32:15 2018 -0700 + + Merge pull request #358 from cathywu/enforce-gym-version + + forced gym to be 0.9.2 b/c 0.10.3 breaks naming in env + +commit 31e52d8c92bfd5e337b581cf8dfb510923b552a5 +Merge: acd455d7 68a7416d +Author: eugenevinitsky +Date: Mon Mar 12 10:28:45 2018 -0700 + + Merge branch 'multiagent_bottleneck' of https://github.com/cathywu/learning-traffic into multiagent_bottleneck + +commit acd455d7afef8eeea84f1f601077a268e4389989 +Author: eugenevinitsky +Date: Thu Mar 8 17:07:21 2018 -0800 + + walking the walk and doing pep8 formatting + +commit 811b9a9b7dc18a4279a6265b47236e836217de41 +Author: AboudyKreidieh +Date: Sun Mar 11 19:28:56 2018 -0700 + + added dan's controllers + +commit 712e1a31fa27cc81e242aea22dbdf61f136fcbde +Author: Kanaad Parvate +Date: Fri Mar 9 15:07:22 2018 -0800 + + Update requirements.txt + + forgot an = + +commit 14402dcf1228104438d63a7b3156ef8bed93a19b +Author: Kanaad Parvate +Date: Fri Mar 9 15:05:04 2018 -0800 + + forced gym to be 0.9.2 b/c 0.10.3 breaks naming in env + +commit 68a7416d6213f53bed3946fcea2f8ab8b8a662ca +Author: eugenevinitsky +Date: Thu Mar 8 17:07:21 2018 -0800 + + walking the walk and doing pep8 formatting + +commit 8157bd3da015b0d785f0d06fdf3a6c0868ad1f49 +Merge: a0115238 7c8d6f55 +Author: eugenevinitsky +Date: Thu Mar 8 16:46:58 2018 -0800 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic into multiagent_bottleneck + +commit a0115238002f4d51f72a8a7436df6f51fc14f0b5 +Author: eugenevinitsky +Date: Thu Mar 8 16:46:51 2018 -0800 + + minor + +commit a10831052ad611bed66f3af66cc79b036aa1ff06 +Author: eugenevinitsky +Date: Wed Mar 7 13:21:42 2018 -0800 + + switched reward gain + +commit b5db3affc309048658176639a69bd10d2f2628a6 +Author: eugenevinitsky +Date: Wed Mar 7 13:20:30 2018 -0800 + + removed line from visualizer rllib + +commit 2fe2087055890e8416ba0b3124ea1bf2fb991447 +Author: eugenevinitsky +Date: Wed Mar 7 09:51:04 2018 -0800 + + minor + +commit c99bdd0cba76d12ad5428aa7889cb9d407cf1d15 +Author: eugenevinitsky +Date: Tue Mar 6 15:45:08 2018 -0800 + + running multiagent + +commit 13b5404563d72a82012ede9e35a64a052c5754a6 +Author: eugenevinitsky +Date: Tue Mar 6 09:25:46 2018 -0800 + + added run script for rllib multiagent bottleneck, not yet functional + +commit 9ac09b599c50134aa3511d4ede2f718695d1e1e2 +Author: eugenevinitsky +Date: Tue Mar 6 07:23:59 2018 -0800 + + reformatting + +commit 8cdf46d9861158a686400d1153a7c5458b96caa8 +Author: eugenevinitsky +Date: Mon Mar 5 21:19:44 2018 -0800 + + added multiagent bottlenecks, not yet functional + +commit 7c8d6f55fadc93fed59c1f8027f335264c80afa4 +Merge: 04c8b235 966b8358 +Author: AboudyKreidieh +Date: Mon Mar 5 19:01:56 2018 -0800 + + Merge pull request #354 from cathywu/colorfix + + bug fix to black cars + + fixed an where vehicles as come out as black when using a new version of sumo. The 4th color term needs to be 255 now instead of 0. + +commit f874132c8792135a38a5222b677a2ec1d96edd5f +Merge: 467d5681 966b8358 +Author: eugenevinitsky +Date: Mon Mar 5 18:55:58 2018 -0800 + + Merge branch 'colorfix' of https://github.com/cathywu/learning-traffic into bottlenecks + +commit 966b8358215b4e64dac2896fa912881ba9d210fa +Author: AboudyKreidieh +Date: Mon Mar 5 18:40:32 2018 -0800 + + bug fix to black cars + +commit 467d568131b5c5866d7f5b90a6cc2ef2b3aee90d +Author: eugenevinitsky +Date: Mon Mar 5 13:40:21 2018 -0800 + + minor edits + +commit 91b6be6751f9df86c7202f24ff585a844a3f3750 +Author: eugenevinitsky +Date: Mon Mar 5 11:51:22 2018 -0800 + + modified reward function + +commit 7ae658d8567f95b830869e6999f231dfa5bd5de7 +Author: eugenevinitsky +Date: Mon Mar 5 11:31:00 2018 -0800 + + Update bottlenecks.py + + Error in safety code for failsafe + +commit 078eab44ec6c0f9b11f67f5c5b6d80008e026226 +Author: eugenevinitsky +Date: Sun Mar 4 22:32:38 2018 -0800 + + seemingly working + +commit 0e745e9d68513f043141370389390ca7bfb644fe +Merge: f1cb850e 04c8b235 +Author: eugenevinitsky +Date: Sun Mar 4 22:01:02 2018 -0800 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic into bottlenecks + +commit 04c8b235a9aa18bd93a3f2f343a59d40cdc3c5c6 +Author: nskh +Date: Sun Mar 4 19:48:56 2018 -0800 + + added documentation about visualizer (#350) + + * added documentation about visualizer + + * Update visualizing.rst + +commit f1cb850e3acd471350cd98f85e7075cf7a504d7b +Author: eugenevinitsky +Date: Sun Mar 4 19:00:07 2018 -0800 + + working bottleneck example with added vehicles + +commit 1a21ecddc88e52adb29e77a50570858e2ea95dc6 +Author: eugenevinitsky +Date: Sun Mar 4 18:48:47 2018 -0800 + + added code to move rl vehicles back to front of bottleneck, not yet functional + +commit 58cd61063f454e9aeb0e16d242205b49f996a4ae +Merge: 8ed98fdd 2667b9f0 +Author: eugenevinitsky +Date: Fri Mar 2 16:40:19 2018 -0800 + + Merge pull request #351 from cathywu/bottlenecks_merge + + Bottlenecks merge + +commit 2667b9f04a2c9b82f189adc0812309101784bf50 +Merge: 804845cf 7d0fa6b5 +Author: eugenevinitsky +Date: Fri Mar 2 16:31:19 2018 -0800 + + Merge branch 'bottlenecks_merge' of https://github.com/cathywu/learning-traffic into bottlenecks_merge + +commit 804845cf36f98ad3c83f9c4e2189cbf7a3d3c5f3 +Author: eugenevinitsky +Date: Fri Mar 2 16:31:07 2018 -0800 + + addressed comments + +commit 5d71c9e0b063e51810d3c8771cbc4f9b89467c94 +Author: eugenevinitsky +Date: Fri Mar 2 16:11:51 2018 -0800 + + cleanup + +commit 7d0fa6b557c7e69b9281649729ac3b7c634436df +Author: eugenevinitsky +Date: Fri Mar 2 16:11:51 2018 -0800 + + cleanup + +commit f0964787bb637a97a622943e1b838c3ceaeecf89 +Author: eugenevinitsky +Date: Fri Mar 2 16:05:10 2018 -0800 + + working code for if the rl vehicles leave the system + +commit e864877540a3df370a3649ce4cccb22c4ab942ef +Author: eugenevinitsky +Date: Fri Mar 2 13:07:47 2018 -0800 + + added a bottleneck sumo script + +commit e4f548d7f184332d6ab06beb80cd628c480e5ea3 +Author: eugenevinitsky +Date: Thu Mar 1 17:56:01 2018 -0800 + + currently working bottleneck and collision tests + +commit ab57edbe92e14e4b1f60ac6f5da0b7d5c041d797 +Author: eugenevinitsky +Date: Thu Mar 1 16:59:21 2018 -0800 + + added bottleneck test + +commit 8ed98fddaa7bb76b1977c2991339bd0cbfb1909e +Merge: 44b73efd 87682657 +Author: AboudyKreidieh +Date: Thu Mar 1 16:36:03 2018 -0800 + + Merge pull request #340 from cathywu/cleanup_controllers + + Cleanup controllers + + changes: + - modifications to the documentation + - cleanup and pep8 + - removed redundant classes + - all classes now use their base controllers + +commit c77f61f1741272721eca9bec3217bb602ae8723f +Merge: 7969736f 44b73efd +Author: eugenevinitsky +Date: Thu Mar 1 16:17:14 2018 -0800 + + merged in master + +commit 44b73efd6a206cebce55c116c1a35f1ada8515ce +Merge: f0d705e5 39cea1d8 +Author: eugenevinitsky +Date: Thu Mar 1 16:14:37 2018 -0800 + + Merge pull request #349 from cathywu/collision_test + + Collision test + +commit 39cea1d89d6d19db7275ba11aa4887eb46c757f0 +Merge: 0d7811a6 4bd7ff6d +Author: eugenevinitsky +Date: Thu Mar 1 16:06:18 2018 -0800 + + Merge branch 'collision_test' of https://github.com/cathywu/learning-traffic into collision_test + +commit 0d7811a6cdb7051967aa1b5b1f1e387c9e583b75 +Author: eugenevinitsky +Date: Thu Mar 1 16:01:22 2018 -0800 + + removed unnecessary param + +commit 7969736ff1e4f3f9eb6395ec8ee9045b3b7b52bf +Author: eugenevinitsky +Date: Thu Mar 1 16:00:52 2018 -0800 + + changes for timing, should be removed later + +commit 4bd7ff6dd33ab9e585d3c940c87c29472db478ba +Author: AboudyKreidieh +Date: Thu Mar 1 15:41:53 2018 -0800 + + bug fixes to prevent early termiantions from collisions + +commit 9f54baaaf05deea675c58ab0a2fc256d43cfdbc8 +Author: eugenevinitsky +Date: Thu Mar 1 14:41:01 2018 -0800 + + actually added collision test + +commit 8768265765d207733fded617295869acf1fb6c8c +Merge: 76a15cc5 f0d705e5 +Author: AboudyKreidieh +Date: Thu Mar 1 14:22:17 2018 -0800 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic into cleanup_controllers + +commit 5f095a69e4a7c94849a2202bf225d9cadc7c99b7 +Author: eugenevinitsky +Date: Wed Feb 28 17:31:28 2018 -0800 + + blah + +commit db47bc8cfde543a2bc5f44685b9b3738695b740f +Author: eugenevinitsky +Date: Wed Feb 28 13:53:38 2018 -0800 + + added a collision test + +commit 545b797caef5973188c549fed6b5336a81a63d71 +Merge: 587be4e8 f0d705e5 +Author: eugenevinitsky +Date: Wed Feb 28 13:45:20 2018 -0800 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic + +commit 52f2b9ecff8fe8db9b23ffa213dfed9a21442cfc +Merge: 87ad93d6 f0d705e5 +Author: eugenevinitsky +Date: Tue Feb 27 09:56:17 2018 -0800 + + added forward progress reward function + +commit f0d705e5c991c89f4afe8d323f8373fba74d3ba4 +Merge: c95c7f23 98203f85 +Author: AboudyKreidieh +Date: Mon Feb 26 18:04:51 2018 -0800 + + Merge pull request #344 from cathywu/vehicles_dict_get + + changes: + - replaced `dict` calls in the `Vehicles` class with `.get()` methods, which return a user specifiable `error` message if no vehicle is found + - documentation and pep8 changes to the `Vehicles` class + +commit b98488c7b6093ee52fdc60a2784fe5de65003d3f +Author: AboudyKreidieh +Date: Mon Feb 26 17:50:43 2018 -0800 + + figure eight experiments + +commit 587be4e834ac930b5b522bef0a6a48a6fb175c00 +Author: eugenevinitsky +Date: Mon Feb 26 16:31:16 2018 -0800 + + added a reset to avoid exceeding the 24 day limit + +commit 76a15cc5cae3cbd4ed77917d18047a727a86a8d7 +Author: AboudyKreidieh +Date: Mon Feb 26 11:40:37 2018 -0800 + + reverted changes to vehicles class + +commit 98203f85bec514e5059b318eed522a4229c0632a +Author: AboudyKreidieh +Date: Mon Feb 26 11:34:24 2018 -0800 + + replaced dict calls in the Vehicles class with .get(), and documentation + +commit c95c7f232a1e604968de2bca2c05e5520224515c +Merge: 95481b66 b62e6cca +Author: eugenevinitsky +Date: Fri Feb 23 19:46:24 2018 -0600 + + Merge pull request #343 from cathywu/flow_grid_rl + + Flow grid rl + +commit b62e6cca4fa0bf5e8d4cd8c26a9e28953c870d45 +Merge: a237d5b6 95481b66 +Author: eugenevinitsky +Date: Fri Feb 23 19:31:31 2018 -0600 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic into flow_grid_rl + +commit 87ad93d6a6463005dc0eb76785b1c94aa1399dc8 +Author: eugenevinitsky +Date: Thu Feb 22 23:44:48 2018 -0600 + + scaled vehicles + +commit 67f6d47d9e61f28d455319c868c38fbc11e73366 +Author: eugenevinitsky +Date: Thu Feb 22 16:08:20 2018 -0600 + + added a scaling factor that lets you generate arbitrary sized bottlenecks + +commit 95481b667e2722998bff81f99f7dea224cdfc3f6 +Merge: b3c60300 f55c4faf +Author: eugenevinitsky +Date: Thu Feb 22 15:32:01 2018 -0600 + + Merge pull request #338 from cathywu/flow_grid_merge + + Flow grid merge + +commit a237d5b6ae6e0da04646ff4425f1c976c27eb2ba +Author: AboudyKreidieh +Date: Thu Feb 22 07:13:25 2018 -0800 + + green wave rllib and rllab examples + +commit f55c4faf05170922af84fe33519c36b3b03538df +Author: AboudyKreidieh +Date: Wed Feb 21 19:07:54 2018 -0800 + + bug fixes + +commit c3e2bddac97626d057c363fd65c892d02f78d21a +Author: eugenevinitsky +Date: Wed Feb 21 15:17:58 2018 -0600 + + added print statements + +commit 852174e04127aeb8f0ed654db7440978655210ae +Author: AboudyKreidieh +Date: Wed Feb 21 12:52:27 2018 -0800 + + revert + +commit 6232e3fd4190a546980421a24206cbc349d4a3b8 +Merge: 59f8ee3a b3c60300 +Author: AboudyKreidieh +Date: Wed Feb 21 12:45:42 2018 -0800 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic into cleanup_controllers + +commit 59f8ee3ad1b881155e0d6ea100b2882403f9bc03 +Author: AboudyKreidieh +Date: Wed Feb 21 12:43:36 2018 -0800 + + doc cleanup + +commit c4ed01e176251c4aa639bb637e66575a8172a044 +Author: eugenevinitsky +Date: Wed Feb 21 14:28:19 2018 -0600 + + tiny fix + +commit 7134f8a445c4f51fad8d7a30887683cff8226f80 +Merge: 75d13e40 b3c60300 +Author: eugenevinitsky +Date: Wed Feb 21 14:27:54 2018 -0600 + + pulled in master + +commit b3c60300f2816064e2d2c1f7214d45963efedd89 +Merge: 60219d4d fef673c8 +Author: eugenevinitsky +Date: Wed Feb 21 12:26:23 2018 -0800 + + Merge pull request #339 from cathywu/aws_fix + + Aws fix + +commit 9abfb90f39a5803ccff1ff06089664ce2451c0c9 +Author: AboudyKreidieh +Date: Wed Feb 21 12:09:28 2018 -0800 + + bug fixes + +commit fef673c80b7901863fbbe64aa0670a7325cef57b +Author: eugenevinitsky +Date: Wed Feb 21 14:07:18 2018 -0600 + + sped up tests + +commit 4352a15330384855960f420846bd90de9117d914 +Author: eugenevinitsky +Date: Wed Feb 21 13:52:41 2018 -0600 + + added test flag to travis + +commit 2437ead1f4b1dd7de370df730d4e7f755d4884f7 +Author: eugenevinitsky +Date: Wed Feb 21 13:13:41 2018 -0600 + + flake8 fixes + +commit 60219d4dede15e4348004a9678cff801a557c8ea +Merge: ca41442e 06ba0d0d +Author: AboudyKreidieh +Date: Wed Feb 21 11:10:38 2018 -0800 + + Merge pull request #329 from cathywu/bay_bridge_merge + + Bay bridge merge + + This PR introduces the bay bridge to `master`, allowing us to add methods to master while also testing them on the bay bridge experiment and ensuring that changes do not break any of the bay bridge components. + + changes: + - added working sumo examples of the bay bridge and bottleneck experiments. These scripts download the net.xml file from AWS, so not local files are needed. + - added bay bridge and bottleneck scenario and generator methods + - added base bay bridge environment class + + todo: + - a later PR will introduce tests to make sure we do not break any of the functionality of the base bay bridge environment and run scripts + +commit 75d13e40f3c3d59006e185d850c3a3b328f4f311 +Author: eugenevinitsky +Date: Wed Feb 21 12:50:57 2018 -0600 + + removed gen custom start pos, not needed for this pull request + +commit 5552aaa089fef01c884da97e2c406ad9db75ae15 +Merge: 1d84abcd 09cc0e6c +Author: eugenevinitsky +Date: Wed Feb 21 12:49:08 2018 -0600 + + Merge branch 'flow_grid_merge' of https://github.com/cathywu/learning-traffic into flow_grid_merge + +commit 1d84abcdf3bc6a4d5250a2abe300613f5c2bd2bd +Author: eugenevinitsky +Date: Wed Feb 21 12:48:47 2018 -0600 + + added better reward + +commit 09cc0e6c3bc11e4515551e5c8ffd6ba02b8f76dd +Author: AboudyKreidieh +Date: Wed Feb 21 10:48:08 2018 -0800 + + next guess at bug fix + +commit 8956af6df17e638726f08286b652a023bd0c771c +Author: eugenevinitsky +Date: Wed Feb 21 12:39:08 2018 -0600 + + removed 24 hr bug fix, not tested sufficiently + +commit 06ba0d0ddc5885375b3bf92dc5b5090e239eecee +Author: AboudyKreidieh +Date: Wed Feb 21 10:37:39 2018 -0800 + + PR changes + +commit 79e5671d26d7e4aa300bd99534d2a7d6c8436fed +Author: eugenevinitsky +Date: Wed Feb 21 12:36:27 2018 -0600 + + changed sumo sleep time to fix aws bug but added a flag to set it back to .1 if test time + +commit 6fafbe8dc98b7e87fb4e9096c4f396a79143e161 +Author: AboudyKreidieh +Date: Wed Feb 21 10:23:10 2018 -0800 + + maybe bug fix? + +commit ef62dad2862e3b025857c272db587b9e0e8ed9e5 +Author: AboudyKreidieh +Date: Wed Feb 21 09:37:12 2018 -0800 + + tests and documentation + +commit 62401ea79646d552976e31cdc6ec92bd1fc9a865 +Author: AboudyKreidieh +Date: Wed Feb 21 09:09:59 2018 -0800 + + added tests + +commit 815e127db379b929d0db100be984c6e0f7c3160f +Author: eugenevinitsky +Date: Wed Feb 21 11:05:41 2018 -0600 + + added restart to avoid 24 day bug + +commit 66189443c3b3b6cbd2c3b184878e61dde5c9618c +Author: AboudyKreidieh +Date: Wed Feb 21 08:55:28 2018 -0800 + + cleanup and pep8 to the grid components + +commit 126bb38fcf69d0e41c3f507bd0bab6de115db6c6 +Author: AboudyKreidieh +Date: Wed Feb 21 08:06:44 2018 -0800 + + bug fixes + +commit b4ece0b49467eac98aced7167dcba39f89aac14a +Author: AboudyKreidieh +Date: Wed Feb 21 07:49:30 2018 -0800 + + minor doc changes + +commit e425e272897acb6abf438e7e1d7a50078bd8d45a +Author: AboudyKreidieh +Date: Tue Feb 20 21:58:29 2018 -0800 + + templates for all environment documentation + +commit da25e18d9f524afbeead11511d24dfd25647691c +Author: AboudyKreidieh +Date: Tue Feb 20 20:13:47 2018 -0800 + + pep8 + +commit 394a5b722978f1acc53f7106b2e03f65f68ca77d +Author: AboudyKreidieh +Date: Tue Feb 20 20:07:23 2018 -0800 + + grid scenario and example + +commit d8e6c2186e92072d6a6f229625b530fada15fbe7 +Author: AboudyKreidieh +Date: Tue Feb 20 20:06:43 2018 -0800 + + grid generator, scenario, and routing controller + +commit 857c355a1c8122c19d1a7194c07d30cb6ba48d40 +Author: AboudyKreidieh +Date: Tue Feb 20 18:33:39 2018 -0800 + + green wave environment + +commit 0eaf06ba5f25233f0c79b13fe57411ece5e939b8 +Author: AboudyKreidieh +Date: Tue Feb 20 00:06:37 2018 -0800 + + documentaion for environments + +commit 930084315d987e68d4471a1e47dc2353ac5fb75b +Author: AboudyKreidieh +Date: Mon Feb 19 23:00:46 2018 -0800 + + bug fix + +commit debbc889ab56d42a341acdd278ee0a5d1dc0eb62 +Author: AboudyKreidieh +Date: Mon Feb 19 22:53:51 2018 -0800 + + pep8 and documentation cleanups + +commit 117232d40d5dc67aa174573aeccb743818ec36f7 +Author: AboudyKreidieh +Date: Mon Feb 19 08:57:29 2018 -0800 + + replacing dict calls with .get() + +commit 3393819fa842d0db56c9be25bd4d211c4eaa0b27 +Author: eugenevinitsky +Date: Sun Feb 18 11:34:34 2018 -0800 + + minor visualzier fix + +commit 769859c33bef6ba163ab8c4d6c85b671894b9afe +Merge: ba6ecbb5 b0c11155 +Author: eugenevinitsky +Date: Sat Feb 17 20:39:52 2018 -0800 + + merged in vehicles crash fixes + +commit b0c11155b1af8c1908ad7bf58ac30f6ada06d860 +Author: AboudyKreidieh +Date: Sat Feb 17 19:08:05 2018 -0800 + + cleanup + +commit 5b84ee560da7d76a3e30ea50aded332e2a5fe383 +Author: AboudyKreidieh +Date: Sat Feb 17 19:06:40 2018 -0800 + + tries on everything + +commit ca41442e1040583b472271b8f084f531e7e3bdae +Merge: 780e0bc5 68bbe79f +Author: eugenevinitsky +Date: Sat Feb 17 16:28:20 2018 -0800 + + Merge pull request #335 from cathywu/ballistic_fix + + ballistic now an option + +commit 68bbe79fcdb2862ae7908f48bb5112644235f593 +Author: AboudyKreidieh +Date: Sat Feb 17 16:07:27 2018 -0800 + + ballistic now an option + +commit ba6ecbb55e0ff1ace9e47650b069860431d951bc +Author: eugenevinitsky +Date: Sat Feb 17 16:00:35 2018 -0800 + + remove ballistic + +commit a7c1e0940cd4eca84197b429fd7b28a3859b45f0 +Merge: 548a30d6 4762546a +Author: eugenevinitsky +Date: Sat Feb 17 15:29:02 2018 -0800 + + Merge branch 'bottlenecks' of https://github.com/cathywu/learning-traffic into bottlenecks + +commit 4762546aacbb6c240e6cf23a7cb8270aac7609b0 +Author: AboudyKreidieh +Date: Sat Feb 17 15:28:15 2018 -0800 + + another collision bug fix + +commit 548a30d63c86df0373243ddd4061495e70ef19de +Merge: dba98b31 4432243a +Author: eugenevinitsky +Date: Sat Feb 17 15:21:19 2018 -0800 + + merged in master + +commit 4432243a98681aaaf90953c65992883ae84bd46b +Author: AboudyKreidieh +Date: Sat Feb 17 15:15:34 2018 -0800 + + collision bu fix + +commit 482a521d05ad6e4e278892f50bed3f5222f8d187 +Author: AboudyKreidieh +Date: Sat Feb 17 14:27:37 2018 -0800 + + bug fix + +commit dba98b313e9b66c33fae7d09ecac4fb242e028d4 +Author: eugenevinitsky +Date: Sat Feb 17 14:22:07 2018 -0800 + + log for very small bottleneck + +commit df38eee662f86de1e33bdb45e1979254552a37c4 +Author: eugenevinitsky +Date: Sat Feb 17 14:11:27 2018 -0800 + + log for small bottleneck experiment + +commit 2343a84507ef56a465db70a935d27bd63bf0c3f9 +Merge: 970d3638 9672a57a +Author: eugenevinitsky +Date: Sat Feb 17 13:32:50 2018 -0800 + + Log for small bottleneck experimentd + +commit 9672a57a7588e3ff221d489c09b42f24c2d2351f +Author: AboudyKreidieh +Date: Sat Feb 17 13:13:57 2018 -0800 + + reduced version of bottleneck + +commit 970d36389fc80842b8d6832acfa0ef6f9112662a +Merge: 2e15817b bd9027a5 +Author: eugenevinitsky +Date: Sat Feb 17 13:12:51 2018 -0800 + + log for BottleNeckLarge replay + +commit bd9027a51ca5a2dfe711808477577a515779a562 +Author: AboudyKreidieh +Date: Sat Feb 17 12:37:15 2018 -0800 + + mods + +commit 2e15817b1601c3848a546508d31e123889b8dede +Author: eugenevinitsky +Date: Sat Feb 17 12:18:13 2018 -0800 + + minor changes + +commit 2549f6daa47addc6e3097274ac7d574c1bb97bb1 +Author: eugenevinitsky +Date: Fri Feb 16 21:34:26 2018 -0800 + + added run script + +commit 0389b936ea99a97d7af4126011a0a6dcbab61182 +Author: AboudyKreidieh +Date: Fri Feb 16 20:41:08 2018 -0800 + + observation space appended to base bottleneck env + +commit 4a1f7b6fe74c39ec45320a0c472aa72839145d94 +Merge: fd716769 e7bab699 +Author: AboudyKreidieh +Date: Fri Feb 16 20:35:28 2018 -0800 + + Merge branch 'bottlenecks' of https://github.com/cathywu/learning-traffic into bottlenecks + +commit fd716769257614505f2721c7f7a31a58241c0187 +Author: AboudyKreidieh +Date: Fri Feb 16 20:35:09 2018 -0800 + + observation space for bay bridge toll + +commit e7bab699e99d735113e41efaa3646de34fdb9173 +Author: eugenevinitsky +Date: Fri Feb 16 20:31:11 2018 -0800 + + aded working toll booth control + +commit 17b244fb19fd3d67b2987ac0842f2fe7508f3fb4 +Author: AboudyKreidieh +Date: Fri Feb 16 19:25:03 2018 -0800 + + modified toll booth + +commit 226a5542e11c1300f2d2cdcbae57e5b0900c0d12 +Merge: 67d383d4 780e0bc5 +Author: AboudyKreidieh +Date: Fri Feb 16 18:28:06 2018 -0800 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic into bottlenecks + +commit 780e0bc54d9b89c62dbdcd2c8a6f1ad2fd36ca80 +Author: nskh +Date: Fri Feb 16 15:53:27 2018 -0800 + + added a util function and modified three rllib examples to log out experiment env names (#332) + +commit 9b2ec9b7926fdad0f2ee74df2be682a7a338c27f +Author: AboudyKreidieh +Date: Thu Feb 15 18:30:57 2018 -0800 + + PR changes + +commit 2b3ac591905f6376603bb4bbb38633d51fb0c4e9 +Merge: 97a732d8 78873dfc +Author: eugenevinitsky +Date: Wed Feb 14 11:47:48 2018 -0800 + + Merge pull request #321 from cathywu/fix_autoscaler_script + + Update ray autoscaling configuration script + +commit 97a732d81ac7f9834044178861420064756518f3 +Merge: 0704dce0 a43114ee +Author: eugenevinitsky +Date: Wed Feb 14 11:47:01 2018 -0800 + + Merge pull request #331 from cathywu/variable_num_vehicles_reset + + support for resets in cases of dynamic numbers of vehicles + +commit 0704dce0ba5d3a10f8237a07b073a4a2d2e5b01c +Merge: d72bc425 7093fff6 +Author: eugenevinitsky +Date: Wed Feb 14 10:03:10 2018 -0800 + + Merge pull request #330 from cathywu/scenario_crash_fix + + bug fix to get_x method + +commit a43114eec594dd34515485f337de06cde854488e +Author: AboudyKreidieh +Date: Tue Feb 13 21:26:32 2018 -0800 + + added num_vehicles parameter to generate_starting_positions method to support dynamic numbers of vehicles during reset + +commit 7093fff642861db0549133204783d413b1f25141 +Author: AboudyKreidieh +Date: Tue Feb 13 12:53:19 2018 -0800 + + bug fix to get_x method + +commit 1ebe1bcaf9a1b4a2b1adb499b472004205050a67 +Merge: 0e63bc46 d72bc425 +Author: AboudyKreidieh +Date: Tue Feb 13 12:04:36 2018 -0800 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic into bay_bridge_merge + +commit 0e63bc4625d0762cafbeaba802d3e317edc0c5b8 +Author: AboudyKreidieh +Date: Tue Feb 13 12:02:50 2018 -0800 + + added scenarios and generators for the bay bridge and bottleneck + +commit d72bc425b796a0079d056a195d5fc8063bd878be +Author: nskh +Date: Mon Feb 12 23:40:33 2018 -0800 + + Updating rllib visualizer (#320) + + * added None input to render_env + + * removed required --run argument since we always use PPO + + * fixed the way config files are loaded, should also fix agent.restore(checkpoint) bugs + + * fixed horizon not found bug + + * forgot how dictionary keys work + +commit 9b2d573220becbf8aa4654b8f19b110b4a5344ca +Author: AboudyKreidieh +Date: Mon Feb 12 19:43:29 2018 -0800 + + working bay bridge and bottleneck examples + +commit 117536225ef8c306962076c0a485d9be71c7d3f1 +Merge: 2cfb3c60 8247b105 +Author: AboudyKreidieh +Date: Mon Feb 12 19:06:48 2018 -0800 + + Merge pull request #328 from cathywu/speedups + + Speedups + + changes: + - lane change durations only applied to rl vehicles + - deepcopies of vehicle observations are made using the `.copy()` method, which as far as I can tell works + +commit 8247b1057bc1f43aa28927c03f5a3039e033bf12 +Merge: 65bd3c2d 2cfb3c60 +Author: AboudyKreidieh +Date: Mon Feb 12 17:08:26 2018 -0800 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic into speedups + +commit 2cfb3c60c4df6b53e3ef8c84bebe0f7c152d03c2 +Merge: ccdc56a7 3b55915a +Author: AboudyKreidieh +Date: Mon Feb 12 16:36:41 2018 -0800 + + Merge pull request #326 from cathywu/vehicles_all_checks + + changes in vehicles class from flow_grid + +commit ccdc56a712c6bb86ca8672b2130ee6fa7ac53da2 +Merge: db21c289 6fdcb394 +Author: AboudyKreidieh +Date: Mon Feb 12 16:26:31 2018 -0800 + + Merge pull request #319 from cathywu/pythonic_changes + + Pythonic changes + + made of pythonic changes to the codebase: + - use of iterable: `next`, `reversed`, etc.. + - minimized used of `range(len())` + - sorting via `sorted` instead of `numpy` + + also, deleted the environment `loop_with_perturbation` + +commit db21c289df7d3c0a58550ef7fdae83d0be678665 +Merge: 6fe8ac57 a631ff79 +Author: AboudyKreidieh +Date: Mon Feb 12 16:22:16 2018 -0800 + + Merge pull request #325 from cathywu/random_cleanup + + minor cleanups from bay_bridge_multiagent + + changes: + - random cleanups from `bay_bridge_multiagent` + - identified an issue with setting `tau` too large (commented next to the default value) + +commit a631ff79a96c58bd5d392e66a11a36144fdeee9e +Author: AboudyKreidieh +Date: Mon Feb 12 16:05:46 2018 -0800 + + Update params.py + +commit 3b55915a28d60ae48c36cb045b9efee3ebcc2457 +Author: AboudyKreidieh +Date: Mon Feb 12 15:59:36 2018 -0800 + + changes in vehicles class from flow_grid + +commit 64da4eb06b55eff97b306a9f43ebfc89f9d20093 +Author: AboudyKreidieh +Date: Mon Feb 12 14:58:50 2018 -0800 + + minor cleanups from bay_bridge_multiagent + +commit 6fdcb394a8f6a61b9dbeba3cc715846dfaffca19 +Merge: 28af80a0 6fe8ac57 +Author: AboudyKreidieh +Date: Mon Feb 12 14:38:10 2018 -0800 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic into pythonic_changes + +commit 78873dfc41c769723c756818358caddbf742b44e +Merge: c5c9d6d8 6fe8ac57 +Author: AboudyKreidieh +Date: Mon Feb 12 14:37:14 2018 -0800 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic into fix_autoscaler_script + +commit 6fe8ac57840f06b4433f46d478bb65e3651f61f5 +Merge: 1816602c a3d4a590 +Author: AboudyKreidieh +Date: Mon Feb 12 14:01:48 2018 -0800 + + Merge pull request #322 from cathywu/cleanup + + cleanups to openstreetmap and skipping ray test + + changes: + - some cleanup to the openstreetmap methods; the subprocess sometimes fails in the other form + - skipping `testRay` temporarily, until the issue is resolved in ray. In the meantime, it is advice to run the slow test locally (it passes with these new changes) + +commit 65bd3c2db9b43065f3f15fd0160c94b1618df4d6 +Author: AboudyKreidieh +Date: Mon Feb 12 10:27:16 2018 -0800 + + faster vehicle observation copying and lane change duration only applies to rl vehicles + +commit a3d4a5908dc43f90a7089acc8d218bc618a622ca +Author: aboudy +Date: Fri Feb 9 18:29:14 2018 -0800 + + cleanups to openstreetmap and skipping ray test + +commit c5c9d6d8888cd69accfa7e1f48c87c1eab16074a +Author: Cathy Wu +Date: Fri Feb 9 15:29:04 2018 -0800 + + autoscaler fixes + +commit 28af80a0e4fea5db750efa553f2204001261fbb1 +Author: aboudy +Date: Thu Feb 8 13:39:23 2018 -0800 + + removed print + +commit 5278addd9e8a02d128d1f3848251e6521d11fd48 +Author: aboudy +Date: Thu Feb 8 12:17:42 2018 -0800 + + modified sorting method + +commit 4045c03ccf5a4c0fa244e87843a2788893ba027d +Author: aboudy +Date: Thu Feb 8 10:21:29 2018 -0800 + + more pythonic changes + +commit b0e80fe56df8b34831f35f6f66dd2a6144653029 +Author: aboudy +Date: Thu Feb 8 01:30:20 2018 -0800 + + cleanup and pythonic changes + +commit 1816602ca2c574527fc10a213bf6367def7fe50f +Merge: 3f61c34a 6288f5b1 +Author: AboudyKreidieh +Date: Tue Feb 6 18:27:59 2018 -0800 + + Merge pull request #317 from cathywu/speedups + + Speedups + + changes: + - speedups to the multi_lane_data method in the vehicles class, which only provided data to rl vehicles now (may be temporary) + - speedups to the `get_x` method in the scenario class + - `get_x` returns a value of 0 if no valid edgestart is found (which should support code that doesn't define them in `specify_internal_edgestarts`) + +commit 3f61c34ab5b02d50e3d42f54b6aefff5b880808c +Merge: 9ca97d90 fa4cd632 +Author: AboudyKreidieh +Date: Tue Feb 6 18:24:28 2018 -0800 + + Merge pull request #316 from cathywu/get_state_fix + + get_state() fix + + changes: + - modified `get_state()` call in base_env's `step()` function to allow for all forms of rl control (not just autonomous vehicles) + - removed the `self.mult_agent` attribute from base_env, since the condition only applies to rllab (not rllib) + +commit 6288f5b1c876b5ca12654505163d2af846b8615a +Author: aboudy +Date: Tue Feb 6 18:17:00 2018 -0800 + + PR fixes + +commit 913649adc3c2f542285473eb3ada806f25a9af95 +Author: aboudy +Date: Tue Feb 6 17:32:22 2018 -0800 + + defaulted internal edgestarts to zero (if not found) + +commit 357b94469453cabc1d16ac3f87195c6e763bb40e +Author: aboudy +Date: Tue Feb 6 17:07:29 2018 -0800 + + backwards compatability fix + +commit 00b85ca3ca280d0bc43c765bca1afb1110ef6320 +Author: aboudy +Date: Tue Feb 6 16:30:41 2018 -0800 + + speedups to the get_x method in the scenario class + +commit 552b063c80f0a9738c3f29f3b20d9530a30d4921 +Author: aboudy +Date: Tue Feb 6 16:21:59 2018 -0800 + + speedups to the multi_lane_data method in the vehicles class, which only provided data to rl vehicles now (may be temporary) + +commit fa4cd63249283af8cde23201828224a2f51e7dbe +Author: aboudy +Date: Tue Feb 6 16:09:10 2018 -0800 + + modified get_state() call in base_env's step() function to allow for all forms of rl control (not just autonomous vehicles) + +commit 9ca97d90180ccbcbbaaa007f02acc20ec907857e +Merge: 3ceead86 5289873a +Author: AboudyKreidieh +Date: Tue Feb 6 15:17:17 2018 -0800 + + Merge pull request #315 from cathywu/sorting_option + + Sorting option + + changes: + - introduces an option to choose when `self.sorted_ids` actually sorts the vehicles ids. This is to avoid sorting in every step. + - tests for the new option + +commit 3ceead86113fce181431f433fa9ce5e0054e3121 +Merge: 3db35e59 4d9a1366 +Author: AboudyKreidieh +Date: Tue Feb 6 15:16:43 2018 -0800 + + Merge pull request #312 from cathywu/base_env_cleanup + + Base env cleanup + + changes: + - code cleanup to `base_env`, including: improper uses of `except`, creating attributes outside of the `__init__` method, etc. + - removed unnecessary attributes + - removed redundant uses of some methods, such as changing the colors in `setup_initial_state` + +commit 5289873a83bfb4f19bd45e77fe66417a8e00b55e +Merge: a61efd56 3db35e59 +Author: aboudy +Date: Tue Feb 6 15:03:09 2018 -0800 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic into sorting_option + +commit a61efd56e85a10a8cc08efa680e83391ca1f99db +Author: aboudy +Date: Tue Feb 6 15:02:49 2018 -0800 + + added option for choosing when to sort vehicles + +commit 3db35e592f085fea40048b0e29fb39db647784a0 +Merge: f291b1e0 4b36d923 +Author: eugenevinitsky +Date: Tue Feb 6 14:59:47 2018 -0800 + + Merge pull request #313 from cathywu/scenario_net_params_cleanup + + Scenario net params cleanup + +commit 4b36d92340075a88749be4fb906dbfa7eb21691b +Author: aboudy +Date: Mon Feb 5 16:36:11 2018 -0800 + + added additional_net_params from scenarios to the sumo examples + +commit dc8575fb0f01287743566882ec2a01cbd5cf40b8 +Author: aboudy +Date: Mon Feb 5 15:54:47 2018 -0800 + + added ADDITIONAL_NET_PARAMS dict to all scenarios, modified documentation, and code cleanup + +commit 4d9a13669429b214b0a2d2efa77304d554601600 +Merge: 484418eb f291b1e0 +Author: aboudy +Date: Mon Feb 5 12:33:12 2018 -0800 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic into base_env_cleanup + +commit f291b1e03a0540bd983fbb062908555b58d7847e +Merge: 47050913 51bd2329 +Author: eugenevinitsky +Date: Fri Feb 2 13:19:52 2018 -0800 + + Merge pull request #310 from cathywu/sumo_update + + changed travis to use a version of sumo that doesnt have traffic light bugs + +commit 51bd2329e8f03e5dc569aeafa973c6952fe30897 +Author: eugenevinitsky +Date: Fri Feb 2 12:10:49 2018 -0800 + + changed travis to use a version of sumo that doesnt have traffic light bugs + +commit 47050913beb238f8fbe94c4d94488c131def0bda +Merge: b97f3af1 ca9b1b67 +Author: AboudyKreidieh +Date: Thu Feb 1 16:13:21 2018 -0800 + + Merge pull request #306 from cathywu/multi_lane_headways + + Multi lane headways + + changes: + - added `get_lane_headways()`, `get_lane_leaders()`, `get_lane_followers`, and `get_lane_tailways()` methods to the `Vehicles` class to collect multi-lane local data for the vehicle. + - added `get_ids_by_edge` method to the `Vehicles` class to collect the names of all vehicles in a specific edge + - bug fixes to the `next_edge` and `prev_edge` methods in the base scenario class + - tests for all above methods + - minor cleanup + + Note: + - the methods mentioned in the first bullet point of changes assume all edge/lane pairs are connect to only one other edge/lane pair. This is not always the case, but for now it handles almost all cases without failing + +commit ca9b1b671a8ba7d819d6f9fa4ed4def2a273f8e0 +Author: aboudy +Date: Thu Feb 1 15:19:46 2018 -0800 + + remove via + +commit b97f3af131b8235e99f5a30bbcf0b8df269b5e6c +Merge: 7fb72ccc 9c25915c +Author: AboudyKreidieh +Date: Thu Feb 1 13:48:54 2018 -0800 + + Merge pull request #305 from cathywu/starting_position_speedups + + speedups to starting position methods + + changes: + - replaces `self._edges` with `self._edge_list` in the osm and netfile scenarios to ensure that junctions aren't considered during starting position generation + - modified the `self.get_edge` method in the base scenario class to provide some additional speedups when generating starting positions (especially useful when the number of edges and junctions is very large) + +commit 9c25915c8cebee079440746419bae90135f293df +Author: aboudy +Date: Thu Feb 1 13:27:50 2018 -0800 + + PR fix + +commit 5faecbc8179101391e95c0785eb8d3be0d12d95d +Author: aboudy +Date: Thu Feb 1 13:19:35 2018 -0800 + + reverted experiment class + +commit d5ceaf591f57c28a78b21ced2ceb386fea3df5b2 +Author: aboudy +Date: Thu Feb 1 13:16:23 2018 -0800 + + tests for multi_lane_data methods and get_ids_by_edge + +commit 484418ebb5e638d4abe0df3ffc180715900f2d1f +Author: aboudy +Date: Thu Feb 1 11:32:25 2018 -0800 + + mod to the way emission_path is added to the sumo_call + +commit 5dd2b15292dbe0b8d1185a9e6dcbb588d38c9cfe +Author: aboudy +Date: Thu Feb 1 10:27:34 2018 -0800 + + continued cleanup to base_env + +commit 5a88a8638dbe5531326f37b22a24d87aa624a156 +Author: aboudy +Date: Thu Feb 1 09:17:28 2018 -0800 + + minor cleanup to base_env + +commit debff77e520d23da163266df7a36f636d0f0c49d +Author: aboudy +Date: Thu Feb 1 00:35:18 2018 -0800 + + speedups to starting position methods + +commit f1bd3851f437cfbc34b13c881f4626b5f6ef3657 +Merge: 1218ef44 7fb72ccc +Author: aboudy +Date: Wed Jan 31 17:03:50 2018 -0800 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic into multi_lane_headways + +commit 1218ef441ce2bc93c7aab8f7ff82ba70a1c74e18 +Author: aboudy +Date: Wed Jan 31 17:03:25 2018 -0800 + + bug fixes to multi_lane_data + +commit 7fb72ccc8ac1a4662ef05639eddfb6a8e6ef320f +Merge: aed870a3 e5ff55e9 +Author: AboudyKreidieh +Date: Wed Jan 31 13:47:07 2018 -0800 + + Merge pull request #304 from cathywu/netfile_fix + + bug fix in scenario generators + +commit e5ff55e9df677332e53ba6ab86e0cfcdbfbdaac5 +Author: eugenevinitsky +Date: Wed Jan 31 13:04:50 2018 -0800 + + fixed osm generator + +commit 380babd61d9b879b107c858d108c04bec6084f6e +Author: eugenevinitsky +Date: Wed Jan 31 13:03:53 2018 -0800 + + bug fix in scenario generators + +commit aed870a381b5ea8e42a1c1643d70aea9cf3b2419 +Merge: 1770983f 6c325ff5 +Author: eugenevinitsky +Date: Wed Jan 31 12:59:05 2018 -0800 + + Merge pull request #302 from cathywu/traffic_get_ids_patch + + traffic lights get_id patch + +commit 6c325ff586bed3e6d9f2350e0e6ba2842602d340 +Author: aboudy +Date: Wed Jan 31 12:49:33 2018 -0800 + + traffic lights get_id patch + +commit 1770983f995be8c3ee69ccc4f445bf461c0dc158 +Merge: 98667fad a9d5809c +Author: eugenevinitsky +Date: Wed Jan 31 12:42:07 2018 -0800 + + Merge pull request #290 from cathywu/sumo_logging + + Sumo logging + +commit a9d5809c2120b8ea00dcbcb21eedb53111ed3fcd +Merge: 5783f1e7 98667fad +Author: eugenevinitsky +Date: Wed Jan 31 12:14:11 2018 -0800 + + Merge branch 'master' into sumo_logging + +commit 98667fad306fb83a3891a9b9d14c8f8460667207 +Merge: bf830744 180f25f8 +Author: eugenevinitsky +Date: Wed Jan 31 12:13:23 2018 -0800 + + Merge pull request #293 from cathywu/overtake_right + + added functionality to configure overtaking on the right + +commit bf830744cfe8599b56ecdef459515af2af6b3fd6 +Merge: aa4dd4bd 72f25c50 +Author: eugenevinitsky +Date: Wed Jan 31 12:03:08 2018 -0800 + + Merge pull request #298 from cathywu/expanded_scenario_methods + + Expanded scenario methods + +commit 2e1726149346f5f555c2df28dccc629283d836c0 +Author: aboudy +Date: Tue Jan 30 22:56:43 2018 -0800 + + working version of lane leader and follower data, with the assumption of one outgoing junction per lane + +commit 72f25c505d6317a6e34736d65a31cb8a0e00167a +Author: eugenevinitsky +Date: Tue Jan 30 20:11:37 2018 -0800 + + reduced worker numbers to avoid race condition? + +commit ef92d284862b3bef25515dca4e70903e133616b1 +Author: aboudy +Date: Tue Jan 30 19:22:09 2018 -0800 + + semi-working version of lane leaders + +commit 41ebe2f2a219f3717ab75ddeb849d0113e3c74a9 +Author: eugenevinitsky +Date: Tue Jan 30 18:54:28 2018 -0800 + + fixed gym version in travis + +commit 47270730e7f1b9a2f43032670ea05fd2db9ebc97 +Author: eugenevinitsky +Date: Tue Jan 30 18:06:39 2018 -0800 + + speedup in ray slowtests + +commit bea0790016e432a767eef0ce3515818d0507751a +Author: eugenevinitsky +Date: Tue Jan 30 17:45:24 2018 -0800 + + added num steps as an env param + +commit 6c25f5f2eea0e395b4ed35f0b9cc190fbbac9b70 +Author: aboudy +Date: Tue Jan 30 16:43:23 2018 -0800 + + PR fix + +commit fa1b41f4ecce0e4d0c8d199b9c305fd929c45708 +Author: aboudy +Date: Tue Jan 30 16:12:34 2018 -0800 + + reverted changed to vehicles class + +commit eb67ae7c68aa13093cc6e3fd09b8b23581378072 +Author: aboudy +Date: Tue Jan 30 16:08:27 2018 -0800 + + added tests for new methods in the scenario class + +commit f6eadc451a2c21d65d9d89790806064e8f43ca65 +Author: aboudy +Date: Tue Jan 30 13:01:59 2018 -0800 + + modified _import_edges_from_net to output junction and connection data as well + +commit f3320989c2afe6025b7feed5e51ea045a6fa0c35 +Author: aboudy +Date: Tue Jan 30 10:23:37 2018 -0800 + + first pass on lane leaders and followers + +commit 180f25f88dbf38c3155cd5dd8161b4086233cc40 +Author: eugenevinitsky +Date: Fri Jan 26 17:18:12 2018 -0800 + + Update params.py + + Added description of overtake right to docstring + +commit a70b2965170af14eed3125af0d24dff4c64ae96c +Author: Kanaad Parvate +Date: Fri Jan 26 14:39:55 2018 -0800 + + added functionality to configure overtaking on the right + +commit aa4dd4bdada6d9269768a8b4ea600914e3e10775 +Author: Kanaad Parvate +Date: Fri Jan 26 14:15:11 2018 -0800 + + fixed bug where traci_connection.trafficlight -> traci_connection.trafficlights + +commit ef5c313140fe45808321df8fc1473ebfd7f25e38 +Merge: 8cc61524 8fc1f82b +Author: AboudyKreidieh +Date: Fri Jan 26 11:16:21 2018 -0800 + + Merge pull request #289 from cathywu/traffic_lights + + Traffic lights + + This PR adds support for implemented and controlling traffic lights. + + changes: + - created a `TrafficLights` class + - integrated traffic lights into the base scenario, generator, and environment classes + - created tests for the `set_state`, `get_state`, and `update` traffic light methods + - minor cleanups and pep8 changes + +commit 5783f1e79e7263e4679f7ee0879dbda9af8c7db4 +Merge: a45490eb 8cc61524 +Author: aboudy +Date: Fri Jan 26 00:13:42 2018 -0800 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic into sumo_logging + +commit 8fc1f82bfa9befbf39604729d69161c2bebb3b8a +Author: aboudy +Date: Thu Jan 25 23:56:11 2018 -0800 + + tests for traffic lights + +commit f14289158a62debf1ffe8dc20f5bc45f23043821 +Author: aboudy +Date: Thu Jan 25 22:22:22 2018 -0800 + + undid change to sugiyaama example + +commit d819e99cf719e8c3d1852e311bfd3398de3565e7 +Author: aboudy +Date: Thu Jan 25 22:07:34 2018 -0800 + + added traffic lights to the scenario and generator classes, updated Env to support traffic lights, and pep8 changes + +commit 6ea01a9990851e607937447066320d9d1686878e +Author: aboudy +Date: Thu Jan 25 16:33:10 2018 -0800 + + traffic light class and update method + +commit 8cc6152443c941fa98609327b3424804606b262c +Merge: 4c9ecdb1 5c6c0429 +Author: AboudyKreidieh +Date: Thu Jan 25 10:10:17 2018 -0800 + + Merge pull request #281 from cathywu/unittest_fix + + Unittest fix, Resolve #197. + Update: the fix didn't resolve the unit test. The test itself is flawed (routing isn't supposed to work the way it is written), so I think it may be best to just remove this test. + +commit 4c9ecdb125924fd909c78cfe1233fb553be49765 +Merge: 1118613a ef90a42c +Author: AboudyKreidieh +Date: Tue Jan 23 13:59:19 2018 -0800 + + Merge pull request #274 from cathywu/net_file_scenarios + + adding net.xml-based generators as well as rllab cooperative_merge experiment + +commit ef90a42c569c417fd36822dae13f677fee01a95f +Merge: 0f812785 6c5f1ddf +Author: Nishant +Date: Tue Jan 23 13:41:03 2018 -0800 + + Merge branch 'net_file_scenarios' of github.com:cathywu/learning-traffic into net_file_scenarios + +commit 0f8127852905ad551606e5f8c49682ecfb69f788 +Author: Nishant +Date: Tue Jan 23 13:40:48 2018 -0800 + + updated comments in params.py:NetParams regarding netfile input + +commit ab176f5812645b2e42e3c40d6db94564ee7626c7 +Merge: 204d6768 1118613a +Author: Nishant +Date: Tue Jan 23 13:38:29 2018 -0800 + + Merge branch 'master' of github.com:cathywu/learning-traffic into net_file_scenarios + +commit 5c6c0429a14d7c49087a5f458212cd0bb7a9df27 +Merge: cb161b66 1118613a +Author: aboudy +Date: Mon Jan 22 17:35:29 2018 -0800 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic into unittest_fix + +commit cb161b6652dd03f39201bf66630bc68625ea7bce +Author: aboudy +Date: Mon Jan 22 17:35:07 2018 -0800 + + removed broken unittest + +commit 1118613a4d16cdacecd78ee3d3cd2f0f3fa431e8 +Merge: e262ff5c 0b85ebea +Author: AboudyKreidieh +Date: Mon Jan 22 16:28:18 2018 -0800 + + Merge pull request #254 from cathywu/tests_for_examples + + This PR makes sumo example unit-testable by transforming them into functions that can be called and run without sumo's gui. Tests were also created for each sumo example located in the test_examples.py file in tests.fast_tests + +commit a45490eb00eb0b6f00cd7a38894c3a3e9c3dc132 +Author: aboudy +Date: Mon Jan 22 16:21:24 2018 -0800 + + disabled generator logging + +commit e262ff5c9bb0c598952efcc1c4ae5f7170bea3b2 +Author: nskh +Date: Mon Jan 22 15:51:19 2018 -0800 + + Removed opencv install from travis.yml (#279) + + * removed Fetching package metadata ....... + Solving package specifications: . from .travis.yml + + * travis build now points to testing branch + +commit 0b85ebea44ac248edffc29f307391334291ff6f8 +Author: aboudy +Date: Mon Jan 22 15:34:24 2018 -0800 + + fixed PR bug + +commit e377bdb2488ec2802155d341363cbc60e0cf6497 +Author: aboudy +Date: Mon Jan 22 15:30:28 2018 -0800 + + fixed cooperative_merge example + +commit 5f3eab01d613178f97be77311449ca46e9e31163 +Merge: a8f2c46f de52a54a +Author: aboudy +Date: Mon Jan 22 15:25:22 2018 -0800 + + Merge branch 'tests_for_examples' of https://github.com/cathywu/learning-traffic into tests_for_examples + +commit 80d483bb77350fad715d3909165d1fdfe94d9a07 +Merge: 8f2aa9e6 b2b35c19 +Author: aboudy +Date: Mon Jan 22 15:21:44 2018 -0800 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic into unittest_fix + +commit 8f2aa9e696a3658cd3893a24241779c81281d520 +Author: aboudy +Date: Mon Jan 22 15:20:17 2018 -0800 + + added fix to occasionally failing unit test + +commit de52a54a9d3cd5fa6ea1dc7f66f560f956226406 +Author: eugenevinitsky +Date: Mon Jan 22 11:11:38 2018 -0800 + + resolved all pep8 errors in edited files + +commit bdf8a01b222e9d1288cadaeb84fff21cf590f957 +Merge: 189ebda7 b2b35c19 +Author: eugenevinitsky +Date: Mon Jan 22 10:50:52 2018 -0800 + + Merge branch 'master' into tests_for_examples + +commit 6c5f1ddf4bd671bc8536dd351f6f18507266f709 +Merge: 204d6768 b2b35c19 +Author: eugenevinitsky +Date: Mon Jan 22 10:42:38 2018 -0800 + + Merge branch 'master' into net_file_scenarios + +commit b2b35c196729c88848c8c6410bcb9403c13bab3d +Merge: 4c33b68f 6da7c3d5 +Author: eugenevinitsky +Date: Mon Jan 22 10:37:36 2018 -0800 + + Merge pull request #272 from cathywu/docker_fix + + Contains the most up-to-date Dockerfile and environment.yml being stored on the lab machine + +commit 4c33b68f5b72903b4d21d5d88ec40cf23db0d6ed +Merge: 2640da85 c8911fdb +Author: AboudyKreidieh +Date: Mon Jan 22 10:17:12 2018 -0800 + + Merge pull request #276 from cathywu/min_max_accel_fix + + removed large max/min accels + +commit c8911fdbe0bfced1c6073e059a56974488cb2796 +Author: eugenevinitsky +Date: Sun Jan 21 23:46:05 2018 -0800 + + pointed Travis to hierarchy + +commit 204d676886798c42fdf9cfdef51e44a4c4a33c8f +Author: Nishant +Date: Sun Jan 21 18:01:14 2018 -0800 + + changed vehicle.add_vehicles() to vehicles.add() + +commit c359f369717127584fd079db5660cf78081355c6 +Author: Nishant +Date: Sun Jan 21 17:42:08 2018 -0800 + + adding required change to params.py + +commit b4e8a521403a2e34f18f91b5bddc033e272eeb3d +Author: Nishant +Date: Sun Jan 21 17:39:10 2018 -0800 + + adding net.xml-based generators as well as rllab cooperative_merge experiment + +commit 1a2ccba26e4e9a1baad905e04392e10f5bd232e2 +Author: aboudy +Date: Sun Jan 21 17:36:45 2018 -0800 + + removed large max/min accels + +commit 2640da85797206725305fea8a5956d9825d0ce17 +Merge: 8338bb68 f11faa28 +Author: eugenevinitsky +Date: Sun Jan 21 17:18:02 2018 -0800 + + Merge pull request #269 from cathywu/merge_hierarchy + + Merge hierarchy + +commit 6da7c3d544312827925cdebe97b8a3606da0223c +Author: Kathy Jang +Date: Sun Jan 21 17:16:11 2018 -0800 + + Contains the most up-to-date Dockerfile being stored on the lab machine + +commit f11faa28749e26907d28ab5f16e877e920cefde8 +Author: eugenevinitsky +Date: Sun Jan 21 15:58:07 2018 -0800 + + updated TwoMergeEnv to correctly work in scenario where there are no lane changes + +commit 278061e0dbfd59f41d62d215a7e15e636576871c +Author: eugenevinitsky +Date: Sun Jan 21 15:51:48 2018 -0800 + + added horizon import statement to tests + +commit 67d383d4a80a8f9859761c9f7f1f7ef7a3ad0695 +Author: aboudy +Date: Sun Jan 21 15:32:42 2018 -0800 + + mod to toll example + +commit 6673d4b2ad2e1947477ea8dd758595380fdd9bbf +Author: eugenevinitsky +Date: Sun Jan 21 15:07:22 2018 -0800 + + more nits + +commit 2b5dbe717b8c14b35e97f58d73d060aab4c4ba45 +Author: eugenevinitsky +Date: Sun Jan 21 15:02:53 2018 -0800 + + fixed the nits + +commit d9e2c0bb1c094f75c6b73692440b1881683dfd9d +Author: eugenevinitsky +Date: Sun Jan 21 14:33:51 2018 -0800 + + switched travis to use the hierarchy branch + +commit 8c888fb31cfe55a6d84de87fcfce87744f2bc44a +Merge: 2313fb3b 0ca44f43 +Author: eugenevinitsky +Date: Sun Jan 21 14:19:59 2018 -0800 + + Merge branch 'merge_hierarchy' of https://github.com/cathywu/learning-traffic into merge_hierarchy + +commit 2313fb3bc22369124c2d599eef22a3e7858ef61b +Author: eugenevinitsky +Date: Sun Jan 21 14:19:44 2018 -0800 + + fixed up all rllib examples, and ray_test + +commit fb6afd1902f7cac4593bfe8e40411a3f2c799010 +Merge: 7ff9bd3e 74adce7d +Author: eugenevinitsky +Date: Sun Jan 21 13:34:04 2018 -0800 + + Merge branch 'master' into merge_hierarchy + +commit 74adce7d83e967c11ea9d0b8b99080e368f89c81 +Merge: 3a040ab6 8338bb68 +Author: eugenevinitsky +Date: Fri Jan 19 16:35:36 2018 -0800 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic + +commit 8338bb68d804ea970986765ba8bc62f7e8a698c3 +Merge: da63c797 929350dc +Author: eugenevinitsky +Date: Fri Jan 19 16:27:42 2018 -0800 + + Merge pull request #260 from cathywu/inflow_bug_fixes + + bug fixes to inflows + +commit 3a040ab6dbc10cfc0732c991ff67fdf01cd6a631 +Merge: 9f8351bf da63c797 +Author: eugenevinitsky +Date: Fri Jan 19 12:10:05 2018 -0800 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic + +commit 0ca44f431a6fd69cc3767546dbfae081a3480abf +Merge: f473d088 da63c797 +Author: Cathy Wu +Date: Fri Jan 19 11:24:26 2018 -0800 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic into merge_hierarchy + +commit 929350dcb1478ab008ae48f1bd5982fc49e371f0 +Author: aboudy +Date: Thu Jan 18 21:34:28 2018 -0800 + + bug fixes to inflows + +commit ec036f1c28f576e6c304b2cdd5cce042e62078d4 +Author: aboudy +Date: Thu Jan 18 21:33:20 2018 -0800 + + created bb toll network + +commit da63c797e87e3f1b0c9189dfa7a36715659ef7fa +Merge: b70ec61c 6d750bc1 +Author: eugenevinitsky +Date: Wed Jan 17 13:38:37 2018 -0800 + + Merge pull request #256 from cathywu/vehicles_cleanup + + Vehicles cleanup + +commit 6d750bc19c4bdf840686ca92255c7792b884520a +Author: aboudy +Date: Wed Jan 17 13:20:23 2018 -0800 + + PR requested changes + +commit ad43fc119e8756bfd4fd34ac547b13ecbe4e8922 +Merge: f22319bb b70ec61c +Author: aboudy +Date: Tue Jan 16 18:31:54 2018 -0800 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic into vehicles_unittests + +commit f22319bb67f20fb36d4529fc88a19f01bde036e4 +Author: aboudy +Date: Tue Jan 16 18:31:14 2018 -0800 + + created set functions in the vehicles class for speed, position, lane, and edge + +commit dbfaf9fe0d354bfcf2dcb7d0c688a5463ab1a518 +Author: aboudy +Date: Tue Jan 16 17:32:53 2018 -0800 + + fixed bug with inflow vehicles entering in first time step, and removed redundancies from the vehicles' function + +commit b70ec61c9c84ce0b98382a611ef7ba1e4e8fb66a +Author: nskh +Date: Tue Jan 16 17:18:18 2018 -0800 + + fixed bug where vehicle_params in flow_params wouldn't be used by make_create_env (#251) + +commit 9f8351bfe7495165d416841a61762a0356da0e76 +Merge: dffc3a88 5249464c +Author: eugenevinitsky +Date: Tue Jan 16 15:29:27 2018 -0800 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic + +commit a8f2c46ff85d9a733327be175781678df39e1274 +Merge: 189ebda7 5249464c +Author: aboudy +Date: Tue Jan 16 14:45:37 2018 -0800 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic into tests_for_examples + +commit 5249464c910bbc42c5602356354636a7c81302c2 +Merge: 37a71431 a1f2591b +Author: aboudy +Date: Tue Jan 16 14:31:40 2018 -0800 + + This PR is supposed to update the naming of some environments to following a naming convention, resolving #207 . It also fixes the names of some functions/ attributes. + + Environment changes: + - `SumoEnvironment` -> `Env` + - `SimpleAccelerationEnvironment` -> `AccelEnv` + - `MultiAgentAccelerationEnvironment` -> `AccelMAEnv` + - `PartiallyObservableAccelerationEnvironment` -> `AccelPOEnv` + - `LaneChangeAccelerationEnvironment` -> `LaneChangeAccelEnv` + - `TwoLoopsOneMergingEnvironment` -> `TwoLoopsMergingEnv` + - `TwoIntersectionEnvironment` -> `TwoIntersectionEnv` + - `IntersectionEnvironment` -> `IntersectionEnv` + - other environments follows the same convention + + Vehicle changes: + - `add_vehicles` -> `add` + - `set_sumo_observations` -> `update` + + EnvParams changes: + - `max_acc` -> `max_accel` + - `max_deacc` -> `max_decel` + +commit 7ff9bd3e87de62eb9bf95282b5c693b411f1d47f +Merge: 65d0870c cd819007 +Author: eugenevinitsky +Date: Mon Jan 15 16:21:38 2018 -0800 + + Merge branch 'building_on_ramp' into merge_hierarchy + +commit cd819007c317502628e7d650c8665233d366dbf7 +Author: eugenevinitsky +Date: Mon Jan 15 16:21:20 2018 -0800 + + added ability to control inner and outer lane number + +commit 65d0870c6dbe505064815a2ca2d4ecde5d4faa93 +Author: eugenevinitsky +Date: Mon Jan 15 14:24:38 2018 -0800 + + merged in multiagent + +commit 189ebda7761db434782fe13abe8a43a3edefe546 +Author: aboudy +Date: Fri Jan 12 01:39:13 2018 -0800 + + created tests for sumo examples + +commit 2d27ad6d4ff7d25183e08bf98d1d7a20cca714f1 +Author: eugenevinitsky +Date: Wed Jan 10 12:09:15 2018 -0500 + + added description to visualizer_rllib of what each command means + +commit f473d088d5c3af8a42db541a98074ec0903682c2 +Author: eugenevinitsky +Date: Tue Jan 9 15:44:25 2018 -0500 + + modified hierarchical merge reward + +commit d8c0781c636f2d44860d2bca554b90ea2bf985df +Author: eugenevinitsky +Date: Tue Jan 9 15:36:41 2018 -0500 + + fixed punish small headways reward funciton to use new vehicles function calls + +commit 1ed1e383ddf064f2bc2b114428a92c5d98984812 +Author: eugenevinitsky +Date: Tue Jan 9 15:32:38 2018 -0500 + + changed headway penalty to use punish_small_headways + +commit 6f1b5e0fb0609c9be31e557d210c654ea8c87020 +Author: eugenevinitsky +Date: Tue Jan 9 10:47:30 2018 -0500 + + added headway penalty back into reward + +commit a1f2591b5c86bbe9aaf323f45a553f06babd32d6 +Merge: 3bdc9b98 37a71431 +Author: aboudy +Date: Tue Jan 9 03:20:32 2018 -0800 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic into renaming + +commit 1754a0e579583b8e7f3b1c65e3a696e015c91356 +Author: eugenevinitsky +Date: Tue Jan 9 02:41:51 2018 -0500 + + removed the normalization + +commit e6ef9071b13bd19a17672ffb803ac1b0d187b0c4 +Author: eugenevinitsky +Date: Tue Jan 9 02:02:16 2018 -0500 + + changed the reward function to normalize for the number of vehicles in the inner ring + +commit aa0190bf9df84c74d1743ad039a2f7dc8c3024a2 +Author: eugenevinitsky +Date: Tue Jan 9 00:59:08 2018 -0500 + + updated to new parameter saving style + +commit a14aff98679d140d8cac9e7860c0c57eec6eafb0 +Merge: c5302e2f dffc3a88 +Author: eugenevinitsky +Date: Tue Jan 9 00:21:04 2018 -0500 + + Merge branch 'master' into merge_hierarchy + +commit dffc3a8825db1be7256a2d14ccb51991e02ed140 +Merge: 0aaeea54 37a71431 +Author: eugenevinitsky +Date: Tue Jan 9 00:20:50 2018 -0500 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic + +commit c5302e2fd4ff6f0439c151e6730e17f49556438a +Author: eugenevinitsky +Date: Tue Jan 9 00:20:37 2018 -0500 + + added a reward that doesnt contain the outer ring + +commit 37a714315c5f199ff160d1e5f32cf33f30563c4d +Author: Cathy Wu +Date: Mon Jan 8 17:28:52 2018 -0800 + + Update ray autoscaler script (#249) + + ## Summary + + - Updates the default configuration for ray cluster autoscaling (2 nodes, c5.4xlarge instances) + - Updates to use the latest AMI, which uses `cathywu/ray:testing` and cleans up the setup paths + - Updates setup instructions for ray setup and ray autoscaler. + + ---- + + * Update AMI for autoscaler and defaults + + * move and rename autoscaling scripts + + * New AMI with updated cloudpickle version + + * Update docs + +commit 6161ef4c120187a4360ccbc785e9f9ea05e3ff73 +Merge: b290ee4c b4db49b0 +Author: Cathy Wu +Date: Sun Jan 7 22:49:52 2018 -0800 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic into merge_hierarchy + +commit b4db49b0409a3f09aa5ecc52eaf39fee9ac0ec3c +Author: nskh +Date: Mon Jan 8 01:44:35 2018 -0500 + + Saving flow parameters in experiment directory (#245) + + * updated visualizer example usage + + * changed make_create_env for cooperative_merge to support flow_params input + + * running into json serializability errors for actual objects + + * it's possible this works + + * cooperative_merge.py works with flow_param logging; next up are the other two rllib examples i've been working on + + * i think this works + + * forgot imports + + * oh sweet jesus it works + + * tentatively saying this works, but needs prettyifying + + * fixed up some small stuff + + * documentation and PEP8 changes + + * fixed test_ray to work with new flow_params structure... Travis should work on this commit + + * committing partial work + + * added json import/export integration test, prettified json output, changed some utility functions + + * documentation omg + + * very small docs changes + + * fixed a bug and implemented a backwards-compatability tweak + + * example usage + +commit 302fc5258b30d551178d73119af193dcd0d29677 +Author: Cathy Wu +Date: Sun Jan 7 15:09:22 2018 -0800 + + SUMO-only merge reference experiment (#244) + + ## Summary + + Prerequisite: PR #243 + + - Introduces SUMO-only merging experiment (`examples/sumo/cooperative_merge.py`), which serves as a reference for computing the reward/return without external RL control + - Introduces a class `TwoLoopsMergeNoRLPOEnv`, which extends `TwoLoopsMergePOEnv` and overwrites the `get_state` function (which requires information about RL vehicles). + - Modified `SumoExperiment:run()` and `base_env` to support computing returns for SUMO-only runs. Namely, `base_env:compute_reward()` now defaults to returning 0 instead of raising a `NotImplementedError`. + - See video `2018-01-05-cooperative_merge_sumo.mov` (posted to Slack #emergentbehaviors) + + ## Testing done + The following runs fine and has the expected output. + ``` + python examples/sumo/cooperative_merge.py + ``` + + ----- + + * Refactored ray dependencies and examples for integration tests; added integration test for an end-to-end ray (rllib) run using stabilizing_the_ring example. + + * separated tests into fast and slow tests, now that we have our first integration test + + * add ray install to travis + + * fix ray install for travis + + * fix ray install for travis + + * set up conda in travis + + * link ray in docker and add ray to pythonpath + + * oops my bad + + * not sure.. + + * linux version + + * remove docker + + * non-interactive linux setup for SUMO + + * add conda + + * switch order to see why ray install is failing + + * Partial implementation of two-level fcnet example + + * missing init + + * sigh + + * oops + + * BROKEN passing function through options + + * install ray from wheels + + * restructure config params, use cloudpickle + + * my bad + + * add ray testing branch + + * Manually move ray clone to site-packages + + * path + + * rllib + + * make sure + + * Cleanup + + * integration test for two-level policy + + * change env name to permit re-registration + + * missing test file + + * tensorflow + + * refactor to support multiple ray tests + + * add conda and opencv + + * minor edit + + * conda switches python versions? + + * install opencv without conda + + * download sumo build directly + + * fix + + * chmod + + * different ubuntu setup scripts + + * sumo build - ubuntu14.04 version + + * typo + + * add netconvert + + * python path + + * add data, indent stuff + + * wrong dir + + * opencv + + * py3.5 -> py3.6 (miniconda) to support opencv dependency of ray + + * updated travis + + * cleanup + + * cleanup, remove apt-get update; fix test? + + * remove linux setup + + * typo + + * integration test fix + + * organize examples by usage + + * rename files + + * fix tests + + * rename two level policy example + + * add rllib merge example; rename merge env + + * fix integration test + + * smaller sgd batch + + * Update params.py + + * merge sort fix + + * update merging env + + * non-two-level merge rllib example + + * fix labels + + * Partially observed version of merge env; usage example (cooperative_merge.py) + + * running partially observed merging env + + * fix test + + * Revised stabilizing the ring example + + * stabilizing the ring params + + * merge reverted this change + + * broken rllib visualizer + + * Operational rllib visualizer (basic); switched up merging scenario to place the RL agent in the inner ring + + * pass params was missing version + + * revise merge POMDP (state space was configured incorrectly) + + * comments from aboudy's code review + + * undo + + * handle nans + + * remove extra env creation; remove unneeded exception handling; cls --> agent_cls + + * Observation space was slightly wrong (was getting merging vehicles from the inner loop as well as the outer loop). Position 0 seems to correspond to both the inner and outer ring merge positions, so I added a check for vehicles that start with merge (= outer ring). I don't think this would make a huge difference for training though. + + * handle errors + + * augment reward to penalize headway variance + + * decrease weight on headway variance + + * merge + + * cleanup + + * cleanup + + * cleanup + + * cleaner printing of returns + + * base_env compute_reward defaults to 0 + +commit 3bdc9b98184797b0367aedec5f61cd1d75818a7b +Author: aboudy +Date: Sun Jan 7 12:40:53 2018 -0800 + + replaced max_acc with max_accel and max_deacc with max_decel + +commit b290ee4c9dec4c74fbe4494f6621e9cce93d12e9 +Author: Cathy Wu +Date: Sat Jan 6 17:56:08 2018 -0800 + + need to threshold on normalized position + +commit 24cb8a839778088eab1a46e72a938c733359b74c +Author: Cathy Wu +Date: Sat Jan 6 17:37:04 2018 -0800 + + safer defaults; more aggressive subpolicy split + +commit 3de4c629d6d683a3057d484b772fbe975a40d294 +Merge: 6a7fc7ae a3d7eeef +Author: Cathy Wu +Date: Sat Jan 6 14:13:13 2018 -0800 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic into merge_hierarchy + +commit a3d7eeefa2014f0664d077c345d97e966c60503e +Author: Cathy Wu +Date: Sat Jan 6 01:01:31 2018 -0800 + + POMDP merge experiment (#243) + + ## Summary + + - Fully operational POMDP merge experiment (1 learning agent, 16 IDM vehicles). + - `examples/rllib/cooperative_merge.py`: example script + - `flow/envs/two_loops_one_merging.py`: + - Observation space is the single RL vehicle, 2 vehicles preceding it, 2 vehicles following it, the next 2 vehicles to merge in, the queue length, and the average velocity of the inner and outer rings. + - Reward is a combination of the usual target velocity reward and a penalty on headway variance (with some hand-tuned trade-off) + - Introduces a reward function which penalizes headway variance. + - Catches errors in `base_env` which occur when vehicles teleport temporarily in SUMO. + - For a video of the performance, see `2018-01-05-TwoLoopsMergePOEnv-v0_PPO_2018-01-05_10-03-085dur9ua8-itr181-lower_headway_penality-slower-horizon1500.mov` (posted to Slack #emergentbehaviors). + + ---- + + + * Refactored ray dependencies and examples for integration tests; added integration test for an end-to-end ray (rllib) run using stabilizing_the_ring example. + + * separated tests into fast and slow tests, now that we have our first integration test + + * add ray install to travis + + * fix ray install for travis + + * fix ray install for travis + + * set up conda in travis + + * link ray in docker and add ray to pythonpath + + * oops my bad + + * not sure.. + + * linux version + + * remove docker + + * non-interactive linux setup for SUMO + + * add conda + + * switch order to see why ray install is failing + + * Partial implementation of two-level fcnet example + + * missing init + + * sigh + + * oops + + * BROKEN passing function through options + + * install ray from wheels + + * restructure config params, use cloudpickle + + * my bad + + * add ray testing branch + + * Manually move ray clone to site-packages + + * path + + * rllib + + * make sure + + * Cleanup + + * integration test for two-level policy + + * change env name to permit re-registration + + * missing test file + + * tensorflow + + * refactor to support multiple ray tests + + * add conda and opencv + + * minor edit + + * conda switches python versions? + + * install opencv without conda + + * download sumo build directly + + * fix + + * chmod + + * different ubuntu setup scripts + + * sumo build - ubuntu14.04 version + + * typo + + * add netconvert + + * python path + + * add data, indent stuff + + * wrong dir + + * opencv + + * py3.5 -> py3.6 (miniconda) to support opencv dependency of ray + + * updated travis + + * cleanup + + * cleanup, remove apt-get update; fix test? + + * remove linux setup + + * typo + + * integration test fix + + * organize examples by usage + + * rename files + + * fix tests + + * rename two level policy example + + * add rllib merge example; rename merge env + + * fix integration test + + * smaller sgd batch + + * Update params.py + + * merge sort fix + + * update merging env + + * non-two-level merge rllib example + + * fix labels + + * Partially observed version of merge env; usage example (cooperative_merge.py) + + * running partially observed merging env + + * fix test + + * Revised stabilizing the ring example + + * stabilizing the ring params + + * merge reverted this change + + * broken rllib visualizer + + * Operational rllib visualizer (basic); switched up merging scenario to place the RL agent in the inner ring + + * pass params was missing version + + * revise merge POMDP (state space was configured incorrectly) + + * comments from aboudy's code review + + * undo + + * handle nans + + * remove extra env creation; remove unneeded exception handling; cls --> agent_cls + + * Observation space was slightly wrong (was getting merging vehicles from the inner loop as well as the outer loop). Position 0 seems to correspond to both the inner and outer ring merge positions, so I added a check for vehicles that start with merge (= outer ring). I don't think this would make a huge difference for training though. + + * handle errors + + * augment reward to penalize headway variance + + * decrease weight on headway variance + + * cleanup + + * cleanup + + * cleanup + +commit 0238cccf6ebb0e81e810d3ea636fcd03cf51bfd3 +Author: Cathy Wu +Date: Fri Jan 5 21:20:51 2018 -0800 + + compute average return of rollouts; check that horizon is the same (or issue a warning); increase default number of rollouts (#238) + + ## Summary + - compute average return of rollouts + - check that horizon is the same between the experiment horizon and the rendering env horizon (issue a warning if different). The discrepancy is due to the fact that the rendering env horizon is set in the example file, and not from the loaded experiment horizon. + - increase default number of rollouts to 10 + +commit 6a7fc7ae5f272ccd3e3395dc717668cc58a57336 +Merge: a2c88343 0df1d34c +Author: Cathy Wu +Date: Fri Jan 5 20:56:59 2018 -0800 + + Merge branch 'merge' of https://github.com/cathywu/learning-traffic into merge_hierarchy + +commit 0df1d34c573aaf4156ce03a0853ed4ca371afd12 +Author: Cathy Wu +Date: Fri Jan 5 20:14:27 2018 -0800 + + cleanup + +commit 2b6b2e7f6028a83e144507238800ec95c4547ec7 +Author: Cathy Wu +Date: Fri Jan 5 20:05:36 2018 -0800 + + cleanup + +commit fb50ca1af8218352d31be6c16f4f1a7aa1bd759f +Author: Cathy Wu +Date: Fri Jan 5 20:03:54 2018 -0800 + + cleanup + +commit a2c8834343bae524602a7852756127348770fadf +Author: Cathy Wu +Date: Fri Jan 5 19:53:12 2018 -0800 + + partial implementation to replace cloudpickle function serialization + +commit 5915c22e553c69e8de0120db5b46acf58468ec7f +Author: Cathy Wu +Date: Fri Jan 5 17:45:37 2018 -0800 + + for reproducing segfault + +commit 193a7c5a6b793dc5e8dc23cca2c0beb2ad59ae12 +Merge: 3dfb19ce 5882e4e0 +Author: Cathy Wu +Date: Fri Jan 5 15:53:41 2018 -0800 + + Merge branch 'rllib_viz_logging' of https://github.com/cathywu/learning-traffic into merge_hierarchy + +commit 5882e4e004feaa1ebda61400e0f04e500ebbe308 +Author: Cathy Wu +Date: Fri Jan 5 15:47:53 2018 -0800 + + compute average return of rollouts; check that horizon is the same (or issue a warning); increase default number of rollouts + +commit 3dfb19ce3cd0de27af81c6dd4265ff492bfe704f +Merge: 64e8077d a72f3b4f +Author: Cathy Wu +Date: Fri Jan 5 14:41:08 2018 -0800 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic into merge_hierarchy + +commit a72f3b4f76447fc4427a9defa0be84a6e527fae0 +Author: nskh +Date: Fri Jan 5 17:10:44 2018 -0500 + + Fixing colors (#236) + + Resolves #232. + + Cyan remains as a color; just remove `COLORS[3]` at the top of `base_env.py` to get rid of that. I also updated the example usage of the rllib visualizer (v1.0). + + ---- + + * updated visualizer example usage + + * removed blue (0, 0, 255) but not cyan (0, 255, 255) + +commit c05cc3390e12eef50bed8f9e4d2e03d1678a39e9 +Author: aboudy +Date: Fri Jan 5 08:14:41 2018 -0800 + + modified names of environments + +commit 3c5345826a5a60725971d6745fd71cee39bb396b +Author: aboudy +Date: Fri Jan 5 07:47:01 2018 -0800 + + replaced add_vehicles with add and set_sumo_observations with update + +commit 64e8077d9090c15a1f5bf7f8e772eb2f16c91ca1 +Author: Cathy Wu +Date: Fri Jan 5 03:57:46 2018 -0800 + + two-level policy + POMDP merge + +commit cbaabac2a1943b6addd57113e1021eff857afa65 +Author: Cathy Wu +Date: Fri Jan 5 01:48:42 2018 -0800 + + decrease weight on headway variance + +commit 986947996453cec91615e58cff13eaf1afad567d +Merge: ce8364e5 899be271 +Author: Cathy Wu +Date: Thu Jan 4 23:57:56 2018 -0800 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic into merge + +commit 899be2718d8f603135159f30db7dd9f7ae9d2e46 +Author: nskh +Date: Fri Jan 5 01:26:01 2018 -0500 + + Completed rllib_visualizer (#233) + + * Refactored ray dependencies and examples for integration tests; added integration test for an end-to-end ray (rllib) run using stabilizing_the_ring example. + + * separated tests into fast and slow tests, now that we have our first integration test + + * add ray install to travis + + * fix ray install for travis + + * fix ray install for travis + + * set up conda in travis + + * link ray in docker and add ray to pythonpath + + * oops my bad + + * not sure.. + + * linux version + + * remove docker + + * non-interactive linux setup for SUMO + + * add conda + + * switch order to see why ray install is failing + + * Partial implementation of two-level fcnet example + + * missing init + + * sigh + + * oops + + * BROKEN passing function through options + + * install ray from wheels + + * restructure config params, use cloudpickle + + * my bad + + * add ray testing branch + + * Manually move ray clone to site-packages + + * path + + * rllib + + * make sure + + * Cleanup + + * integration test for two-level policy + + * change env name to permit re-registration + + * missing test file + + * tensorflow + + * refactor to support multiple ray tests + + * add conda and opencv + + * minor edit + + * conda switches python versions? + + * install opencv without conda + + * download sumo build directly + + * fix + + * chmod + + * different ubuntu setup scripts + + * sumo build - ubuntu14.04 version + + * typo + + * add netconvert + + * python path + + * add data, indent stuff + + * wrong dir + + * opencv + + * py3.5 -> py3.6 (miniconda) to support opencv dependency of ray + + * updated travis + + * cleanup + + * cleanup, remove apt-get update; fix test? + + * remove linux setup + + * typo + + * integration test fix + + * organize examples by usage + + * rename files + + * fix tests + + * rename two level policy example + + * add rllib merge example; rename merge env + + * fix integration test + + * smaller sgd batch + + * Update params.py + + * merge sort fix + + * update merging env + + * non-two-level merge rllib example + + * fix labels + + * Partially observed version of merge env; usage example (cooperative_merge.py) + + * running partially observed merging env + + * fix test + + * Revised stabilizing the ring example + + * stabilizing the ring params + + * merge reverted this change + + * broken rllib visualizer + + * Operational rllib visualizer (basic); switched up merging scenario to place the RL agent in the inner ring + + * pass params was missing version + + * revise merge POMDP (state space was configured incorrectly) + + * comments from aboudy's code review + + * undo + + * handle nans + + * remove extra env creation; remove unneeded exception handling; cls --> agent_cls + + * revert merge (moved development to branch merge) + + * revert merge (moved development to branch merge) + + * progress towards params.json support + + * got params.json support working (changed input formats to enable this) + + * fixed typo + + * i think visualizer support for generic envs works now... testing + + * updated cooperative_merge to take in a sumo binary + + * changes to experiment runner files + + * tweaks cathy suggested in PR + +commit ce8364e53c5119b891979af0bb51d31991534be9 +Author: Cathy Wu +Date: Thu Jan 4 15:36:01 2018 -0800 + + augment reward to penalize headway variance + +commit 3104d9ede5aec2d8f6bb208146b1e72f1fab203f +Merge: 1bf5edac c7b35f35 +Author: Cathy Wu +Date: Thu Jan 4 13:50:17 2018 -0800 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic into merge + +commit c7b35f35aefb413aeae007a208ecdcebf77e24ac +Author: Cathy Wu +Date: Thu Jan 4 13:48:47 2018 -0800 + + rllib visualizer and 1-RL cooperative merging scenario (#230) + + ## Summary + + Prerequisite: PR #229. + + - Introduces a basic rllib visualizer, which loads a checkpoint saved by rllib during training and renders using `sumo-gui`. See #188. + - example usage: + `./visualizer_rllib.py /tmp/ray/checkpoint_dir/checkpoint-0 --run PPO + --flowenv TwoLoopsMergePOEnv` + - Currently supports `TwoLoopsMergePOEnv` and `TwoLoopsMergeEnv` + - Moves and renames the rllab visualizer. + + ----- + + * Refactored ray dependencies and examples for integration tests; added integration test for an end-to-end ray (rllib) run using stabilizing_the_ring example. + + * separated tests into fast and slow tests, now that we have our first integration test + + * add ray install to travis + + * fix ray install for travis + + * fix ray install for travis + + * set up conda in travis + + * link ray in docker and add ray to pythonpath + + * oops my bad + + * not sure.. + + * linux version + + * remove docker + + * non-interactive linux setup for SUMO + + * add conda + + * switch order to see why ray install is failing + + * Partial implementation of two-level fcnet example + + * missing init + + * sigh + + * oops + + * BROKEN passing function through options + + * install ray from wheels + + * restructure config params, use cloudpickle + + * my bad + + * add ray testing branch + + * Manually move ray clone to site-packages + + * path + + * rllib + + * make sure + + * Cleanup + + * integration test for two-level policy + + * change env name to permit re-registration + + * missing test file + + * tensorflow + + * refactor to support multiple ray tests + + * add conda and opencv + + * minor edit + + * conda switches python versions? + + * install opencv without conda + + * download sumo build directly + + * fix + + * chmod + + * different ubuntu setup scripts + + * sumo build - ubuntu14.04 version + + * typo + + * add netconvert + + * python path + + * add data, indent stuff + + * wrong dir + + * opencv + + * py3.5 -> py3.6 (miniconda) to support opencv dependency of ray + + * updated travis + + * cleanup + + * cleanup, remove apt-get update; fix test? + + * remove linux setup + + * typo + + * integration test fix + + * organize examples by usage + + * rename files + + * fix tests + + * rename two level policy example + + * add rllib merge example; rename merge env + + * fix integration test + + * smaller sgd batch + + * Update params.py + + * merge sort fix + + * update merging env + + * non-two-level merge rllib example + + * fix labels + + * Partially observed version of merge env; usage example (cooperative_merge.py) + + * running partially observed merging env + + * fix test + + * Revised stabilizing the ring example + + * stabilizing the ring params + + * merge reverted this change + + * broken rllib visualizer + + * Operational rllib visualizer (basic); switched up merging scenario to place the RL agent in the inner ring + + * pass params was missing version + + * revise merge POMDP (state space was configured incorrectly) + + * comments from aboudy's code review + + * undo + + * handle nans + + * remove extra env creation; remove unneeded exception handling; cls --> agent_cls + + * revert merge (moved development to branch merge) + + * revert merge (moved development to branch merge) + +commit 1bf5edac13f047317269a62de9e6502fe83c76eb +Author: Cathy Wu +Date: Wed Jan 3 02:36:32 2018 -0800 + + handle errors + +commit 3d6e9aa2d5c5ec4f8fdf43baa1d4d32ecf894632 +Author: Cathy Wu +Date: Wed Jan 3 02:28:10 2018 -0800 + + Observation space was slightly wrong (was getting merging vehicles from the inner loop as well as the outer loop). Position 0 seems to correspond to both the inner and outer ring merge positions, so I added a check for vehicles that start with merge (= outer ring). I don't think this would make a huge difference for training though. + +commit a72a8f51b22d30342820621e47bb1eda08c9d69c +Author: Cathy Wu +Date: Wed Jan 3 01:47:49 2018 -0800 + + remove extra env creation; remove unneeded exception handling; cls --> agent_cls + +commit f5bb48ad667e1934140039a485c18c150e6a1bd7 +Author: Cathy Wu +Date: Tue Jan 2 16:18:10 2018 -0800 + + handle nans + +commit 136dd0779ff5644d99a9350082661af61321cd56 +Author: Cathy Wu +Date: Tue Jan 2 16:08:13 2018 -0800 + + undo + +commit df90f8ae1d1ca54913f0a394a16bdfa80b55e30e +Merge: f100de17 c3528400 +Author: Cathy Wu +Date: Tue Jan 2 15:33:43 2018 -0800 + + merge + +commit f100de176509df61a72d6c942fb703e5d1cfa6f8 +Author: Cathy Wu +Date: Tue Jan 2 15:30:34 2018 -0800 + + comments from aboudy's code review + +commit c35284007cc1ad7d87d370b19adeb4ed153b82dc +Author: Cathy Wu +Date: Tue Jan 2 15:29:53 2018 -0800 + + Fully and partially observable merging examples (rllib) (#229) + + ## Summary + + Prerequisite: PR #226. + + - Introduces partially observable merge environment, which observes a few vehicles preceding and following the RL vehicle (only 1 allowed for now), as well as the first few vehicles nearest to the merge point. + - Added a few attributes to `flow/scenarios/two_loops_one_merging_new/scenario.py` to support this. + - Adds a run script for this merge POMDP (`cooperative_merge.py`) + + ---- + + * Refactored ray dependencies and examples for integration tests; added integration test for an end-to-end ray (rllib) run using stabilizing_the_ring example. + + * separated tests into fast and slow tests, now that we have our first integration test + + * add ray install to travis + + * fix ray install for travis + + * fix ray install for travis + + * set up conda in travis + + * link ray in docker and add ray to pythonpath + + * oops my bad + + * not sure.. + + * linux version + + * remove docker + + * non-interactive linux setup for SUMO + + * add conda + + * switch order to see why ray install is failing + + * Partial implementation of two-level fcnet example + + * missing init + + * sigh + + * oops + + * BROKEN passing function through options + + * install ray from wheels + + * restructure config params, use cloudpickle + + * my bad + + * add ray testing branch + + * Manually move ray clone to site-packages + + * path + + * rllib + + * make sure + + * Cleanup + + * integration test for two-level policy + + * change env name to permit re-registration + + * missing test file + + * tensorflow + + * refactor to support multiple ray tests + + * add conda and opencv + + * minor edit + + * conda switches python versions? + + * install opencv without conda + + * download sumo build directly + + * fix + + * chmod + + * different ubuntu setup scripts + + * sumo build - ubuntu14.04 version + + * typo + + * add netconvert + + * python path + + * add data, indent stuff + + * wrong dir + + * opencv + + * py3.5 -> py3.6 (miniconda) to support opencv dependency of ray + + * updated travis + + * cleanup + + * cleanup, remove apt-get update; fix test? + + * remove linux setup + + * typo + + * integration test fix + + * organize examples by usage + + * rename files + + * fix tests + + * rename two level policy example + + * add rllib merge example; rename merge env + + * fix integration test + + * smaller sgd batch + + * Update params.py + + * merge sort fix + + * update merging env + + * non-two-level merge rllib example + + * fix labels + + * Partially observed version of merge env; usage example (cooperative_merge.py) + + * running partially observed merging env + + * fix test + + * Revised stabilizing the ring example + + * stabilizing the ring params + + * merge reverted this change + + * pass params was missing version + +commit db71fae045b84e5c176eb0511ce5b5507773e428 +Merge: 126b8527 e3021210 +Author: Cathy Wu +Date: Tue Jan 2 15:27:07 2018 -0800 + + Merge branch 'merge_rllib' of https://github.com/cathywu/learning-traffic into rllib_visualizer + +commit 126b8527625559cdc0b510275b14709fea16a310 +Author: Cathy Wu +Date: Tue Jan 2 15:25:13 2018 -0800 + + revise merge POMDP (state space was configured incorrectly) + +commit e30212108bdca46b13195d21514d42d42f5ce588 +Merge: 8cde92c9 c228de73 +Author: Cathy Wu +Date: Tue Jan 2 13:18:38 2018 -0800 + + merge + +commit c228de73e06761d75aea96067f636af881753089 +Author: Cathy Wu +Date: Tue Jan 2 13:17:13 2018 -0800 + + Hierarchical policy example (#226) + + ## Summary + + Prerequisite PR: #225. + + - `examples/rllib/ring_two_level_policy.py`: Example usage of two-level (hierarchical) policies in rllib (currently only in `cathywu/ray:testing` and `cathywu/ray:hierarchy`). + - Refactor `stabilizing_the_ring` example for re-use in integration tests and two-level policy usage example. + - Added integration test for two-level policy in rllib. + - Somewhat more tuned parameters for `stabilizing_the_ring` rllib example. + + ----- + + * Refactored ray dependencies and examples for integration tests; added integration test for an end-to-end ray (rllib) run using stabilizing_the_ring example. + + * separated tests into fast and slow tests, now that we have our first integration test + + * add ray install to travis + + * fix ray install for travis + + * fix ray install for travis + + * set up conda in travis + + * link ray in docker and add ray to pythonpath + + * oops my bad + + * not sure.. + + * linux version + + * remove docker + + * non-interactive linux setup for SUMO + + * add conda + + * switch order to see why ray install is failing + + * Partial implementation of two-level fcnet example + + * missing init + + * sigh + + * oops + + * BROKEN passing function through options + + * install ray from wheels + + * restructure config params, use cloudpickle + + * my bad + + * add ray testing branch + + * Manually move ray clone to site-packages + + * path + + * rllib + + * make sure + + * Cleanup + + * integration test for two-level policy + + * change env name to permit re-registration + + * missing test file + + * tensorflow + + * refactor to support multiple ray tests + + * add conda and opencv + + * minor edit + + * conda switches python versions? + + * install opencv without conda + + * download sumo build directly + + * fix + + * chmod + + * different ubuntu setup scripts + + * sumo build - ubuntu14.04 version + + * typo + + * add netconvert + + * python path + + * add data, indent stuff + + * wrong dir + + * opencv + + * py3.5 -> py3.6 (miniconda) to support opencv dependency of ray + + * updated travis + + * cleanup + + * cleanup, remove apt-get update; fix test? + + * remove linux setup + + * typo + + * integration test fix + + * organize examples by usage + + * fix tests + + * rename two level policy example + + * Update params.py + + * Revised stabilizing the ring example + + * stabilizing the ring params + + * merge reverted this change + + * pass params was missing version + +commit 13e969e69c9869ba05731123c7370c4e52bd213a +Merge: eea957a5 8cde92c9 +Author: Cathy Wu +Date: Tue Jan 2 12:27:48 2018 -0800 + + Merge branch 'merge_rllib' of https://github.com/cathywu/learning-traffic into rllib_visualizer + +commit 8cde92c96a14c5e29a34b4d9d3dfd7b1007a9a0a +Merge: 45d9107f a7a5cae5 +Author: Cathy Wu +Date: Tue Jan 2 12:26:17 2018 -0800 + + merge + +commit a7a5cae51dae079c6fcf389113d3f5a935fc5bd3 +Merge: d923582d 63233423 +Author: Cathy Wu +Date: Tue Jan 2 12:25:26 2018 -0800 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic into hierarchy + +commit 6323342362062d6076a469eddaf9ed5776dc56f0 +Author: AboudyKreidieh +Date: Tue Jan 2 12:25:11 2018 -0800 + + modified reset() to work with collisions and open networks (#231) + + This PR modifies the `_reset()` function in `base_env` to work with open networks and networks where collisions might occur. Resolves an issue mentioned in #228 + +commit d923582dbec53e7264b6b70605966f8c2cef26ff +Merge: 6f74bf0f 1fac095f +Author: Cathy Wu +Date: Tue Jan 2 10:03:38 2018 -0800 + + merge + +commit 1fac095f01a84f39e86e1b1c09a17e5349ebdd2d +Merge: c18e993f 0dbd6ac9 +Author: aboudy +Date: Tue Jan 2 09:32:51 2018 -0800 + + This adds support for importing OpenStreetMap networks. + + Prerequisite: PR #221 + + Changes: + - created osm generator and scenario classes + - added import method for .net.xml files to collect edge data for use by the scenario class + - added `osm_path` attribute to `NetParams` + +commit 0dbd6ac963638b4537faa23582c84811c7a639cf +Merge: edf624cf c18e993f +Author: Cathy Wu +Date: Tue Jan 2 00:54:51 2018 -0800 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic into osm_support + +commit eea957a5bfbc6f54a88e8bbb5a04a0f8914700e0 +Merge: 149f69c2 45d9107f +Author: Cathy Wu +Date: Tue Jan 2 00:53:38 2018 -0800 + + merge + +commit 45d9107f62fbb9d7f8bd8d3cdac8389eb87a9beb +Merge: 770abc1e 6f74bf0f +Author: Cathy Wu +Date: Tue Jan 2 00:52:00 2018 -0800 + + merge + +commit 6f74bf0f97bf9a7a9377e2faf80db4049b578470 +Author: Cathy Wu +Date: Tue Jan 2 00:49:53 2018 -0800 + + pass params was missing version + +commit 149f69c232773ad0e215c5ae5b535bf73e9ff6f3 +Author: Cathy Wu +Date: Tue Jan 2 00:25:55 2018 -0800 + + Operational rllib visualizer (basic); switched up merging scenario to place the RL agent in the inner ring + +commit 96bf5d48eadb4bf5a5419a853a7e42e6d88318c1 +Author: Cathy Wu +Date: Mon Jan 1 22:22:02 2018 -0800 + + broken rllib visualizer + +commit 18d41f36c53687750506dcd30ed6ca527656f84a +Author: Cathy Wu +Date: Mon Jan 1 21:25:53 2018 -0800 + + merge reverted this change + +commit 67e793e098acf259b3c343a6bf630d193f7890bb +Author: Cathy Wu +Date: Mon Jan 1 20:32:19 2018 -0800 + + stabilizing the ring params + +commit 35f7404bb048af431e72006cd70d231400e9a0b9 +Merge: 0d4518a7 c18e993f +Author: Cathy Wu +Date: Mon Jan 1 20:27:32 2018 -0800 + + merge + +commit 0d4518a78ddf816dfca6af3cc3a7208bba1b549b +Merge: 5eb0a9d1 ddf61ca7 +Author: Cathy Wu +Date: Mon Jan 1 20:26:06 2018 -0800 + + Merge branch 'hierarchy' of https://github.com/cathywu/learning-traffic into hierarchy + +commit 5eb0a9d1134691886073d5f8e8e4c45330bb3691 +Author: Cathy Wu +Date: Mon Jan 1 20:26:03 2018 -0800 + + Revised stabilizing the ring example + +commit 770abc1ec329acb169203730b9ebad3238a5d328 +Author: Cathy Wu +Date: Mon Jan 1 20:16:41 2018 -0800 + + fix test + +commit f8e3663765dcb1be0826a061c7f748838ccd3e7f +Merge: 59db4aba c18e993f +Author: Cathy Wu +Date: Mon Jan 1 20:14:44 2018 -0800 + + merge + +commit 59db4aba975f214050294696df9b16ddae0b7fad +Author: Cathy Wu +Date: Mon Jan 1 20:02:15 2018 -0800 + + running partially observed merging env + +commit c18e993f595d3b82b48eb29d9e83311874b98129 +Author: Cathy Wu +Date: Mon Jan 1 19:47:07 2018 -0800 + + Two-loop merge example (#227) + + ## Summary + + Prerequisite PR: #225. + + - Pulls "straight" merge example (uses `flow.scenarios.two_loops_one_merging_new`) out of `braess_merges_experiments`. + - Renames files slightly + + ----- + + * organize examples by usage + + * rename files + + * fix tests + + * update merging env + +commit ff3223ec76a2697dd814d4fbe1a9542ef8fa2838 +Author: Cathy Wu +Date: Mon Jan 1 18:19:55 2018 -0800 + + Partially observed version of merge env; usage example (cooperative_merge.py) + +commit d3c108d130ccc8eac41dd0ae52231d3c1c13c7c8 +Author: Cathy Wu +Date: Mon Jan 1 17:22:49 2018 -0800 + + fix labels + +commit 7caeeabf9cbb327fd124491b8d208466590c2d58 +Author: Cathy Wu +Date: Mon Jan 1 17:14:42 2018 -0800 + + non-two-level merge rllib example + +commit 28601daed2620396b846b78794150aa3a624a8a5 +Merge: a9854cbe da03fd1b +Author: Cathy Wu +Date: Mon Jan 1 17:06:41 2018 -0800 + + merge + +commit da03fd1bde5d2d4836e11def61d19dcc2d4c2b6b +Author: Cathy Wu +Date: Mon Jan 1 17:03:28 2018 -0800 + + update merging env + +commit ed68b20a96103c74d37afbe6fd0f35c58aa86e32 +Merge: af72ca74 f86b1d33 +Author: Cathy Wu +Date: Mon Jan 1 17:01:32 2018 -0800 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic into merge_hierarchy + +commit a9854cbe8a3801c2e3b24d2a95c01d0939c13b04 +Author: Cathy Wu +Date: Mon Jan 1 16:54:19 2018 -0800 + + merge sort fix + +commit f86b1d33031bcfecc3d700ef76deb944252e0076 +Author: Cathy Wu +Date: Mon Jan 1 16:24:48 2018 -0800 + + Organize examples by usage (#225) + + ## Summary + - Organizes flow examples by usage, resolves #219. + - `examples/sumo`: contains versions that do not use RL. This is primarily used for baseline examples (without RL control), debugging, and playing out and visualizing a network. + - `examples/rllab`: contains rllab versions. These have RL control via rllab. + - `examples/rllib`: contains rllib versions. These have RL control via rllib. + - Renamed examples to use underscores instead of dashes; removed "rl", "test", and "ray" from filenames. + + ---- + + * organize examples by usage + + * fix tests + +commit ddf61ca79567cf5fc236176145a6cec0f0bef2b4 +Author: AboudyKreidieh +Date: Mon Jan 1 16:00:42 2018 -0800 + + Update params.py + +commit edf624cf49136d103bc423bdfa6385c605886b0c +Author: aboudy +Date: Mon Jan 1 15:57:25 2018 -0800 + + test fix + +commit 0d834c6fd63f1722e88f758b04d51a8b7ae21454 +Author: Cathy Wu +Date: Mon Jan 1 15:16:33 2018 -0800 + + smaller sgd batch + +commit 0bb2916e474b52c561d8221b832b76b37cf3f9c1 +Author: Cathy Wu +Date: Mon Jan 1 15:12:21 2018 -0800 + + fix integration test + +commit 910c2a72183f1d68104a61b3d99608e9bc990751 +Author: Cathy Wu +Date: Mon Jan 1 15:01:22 2018 -0800 + + add rllib merge example; rename merge env + +commit c7aade74ea0809c5af4cc68635909c0af0bef446 +Merge: af72ca74 2cdcd73e +Author: Cathy Wu +Date: Mon Jan 1 14:38:15 2018 -0800 + + Merge branch 'hierarchy' of https://github.com/cathywu/learning-traffic into merge_rllib + +commit 2cdcd73e3e7bb71fc009631e40a3a79c82b9e575 +Author: Cathy Wu +Date: Mon Jan 1 14:16:24 2018 -0800 + + rename two level policy example + +commit 6e14567dc57abb821aa3df4cfe06c115e7bcd0a9 +Merge: 772cd383 4094b085 +Author: Cathy Wu +Date: Mon Jan 1 14:12:53 2018 -0800 + + merge + +commit 772cd383a0a1676d827bcafa2f02fb53db36214c +Merge: e90bc982 67a4de8a +Author: Cathy Wu +Date: Mon Jan 1 14:11:43 2018 -0800 + + merge + +commit af72ca74ebda9daf2fc38aec69d14ea59d7cd5c1 +Merge: 98a8c0ca 4094b085 +Author: Cathy Wu +Date: Mon Jan 1 14:07:05 2018 -0800 + + Merge branch 'organize_examples' of https://github.com/cathywu/learning-traffic into merge_hierarchy + +commit 4094b08539889a3ab399f87c60418642b97dc11f +Merge: baeb011f 67a4de8a +Author: Cathy Wu +Date: Mon Jan 1 14:06:07 2018 -0800 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic into organize_examples + +commit baeb011fc3ce174bf2342bc9564877f6215e749f +Author: Cathy Wu +Date: Mon Jan 1 14:05:53 2018 -0800 + + fix tests + +commit 67a4de8af7347cc0894ecbc67b281f3fa6af3dde +Author: Cathy Wu +Date: Mon Jan 1 14:02:57 2018 -0800 + + Documentation on edge types for network generation (#224) + + * Documentation on edge types for network generation + + * correction + + * Clarified distinction between edge types and edge data; refactored + +commit 98a8c0ca3dd876ee8b1eeefb95c3d178bda24c51 +Author: Cathy Wu +Date: Mon Jan 1 14:02:02 2018 -0800 + + rename files + +commit c81fb5b908e02ad1c6c8804fb9fa2f6341e38b22 +Merge: c0ae5d43 d1c1367c +Author: aboudy +Date: Mon Jan 1 14:01:14 2018 -0800 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic into osm_support + +commit d1c1367c7983b8a58a9c72d1b14166d383e084dc +Merge: 60650c91 708057ad +Author: aboudy +Date: Mon Jan 1 13:58:42 2018 -0800 + + Merge branch 'variable_num_lanes_support' + +commit 5c231846407899fcd5d47465e7b50e9695b8d063 +Author: Cathy Wu +Date: Mon Jan 1 13:52:25 2018 -0800 + + organize examples by usage + +commit 708057ade918c23646f273d49eeaee2d2897e24d +Author: aboudy +Date: Mon Jan 1 12:38:17 2018 -0800 + + PR fix + +commit 6031d1fb243218bcca0ce42c1e2a5ea04bfe8276 +Merge: 343d3438 60650c91 +Author: aboudy +Date: Mon Jan 1 12:14:01 2018 -0800 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic into variable_num_lanes_support + +commit 60650c91947c37c25c4d5ab828dd42ecaef4aa94 +Merge: 0cf3355f 25478990 +Author: aboudy +Date: Mon Jan 1 12:10:51 2018 -0800 + + This is a prelude to supporting starting positions and lane-change methods for networks with variable number of lanes per edge. It introduces a few methods to the scenario class that allow us to access some edge information as we need it. + + Changes: + + generator provides edge data + reorganized components of scenario class + added speed_limit(), edge_length(), num_lanes() to scenario class to get specific edge data + removed rerouters from generator class + tests to verify the new functions work + +commit c0ae5d43eef7767c512c7802e31b61e656be2702 +Author: aboudy +Date: Mon Jan 1 08:27:45 2018 -0800 + + test bug fix + +commit fd14bc2e82616af480228cc2ecfddf17f3b49d22 +Merge: ad9a1880 343d3438 +Author: aboudy +Date: Mon Jan 1 07:54:30 2018 -0800 + + Merge branch 'variable_num_lanes_support' of https://github.com/cathywu/learning-traffic into osm_support + +commit 343d34385f42cd703375ec6e9875bd630a8e8d25 +Author: aboudy +Date: Mon Jan 1 07:52:38 2018 -0800 + + test bug fix + +commit ad9a188004a6a515dc4644dd7aae02c89d38afdf +Author: aboudy +Date: Mon Jan 1 07:27:21 2018 -0800 + + created osm generator and scenario + +commit cfae8914def6f352950896b6104025a7f6b44ac2 +Merge: 7230e062 25478990 +Author: aboudy +Date: Mon Jan 1 06:58:39 2018 -0800 + + Merge branch 'scenario_edge_methods' of https://github.com/cathywu/learning-traffic into modified_starting_positions + +commit 25478990e204dffea6594fd2d5e9856c1ff3cfb6 +Merge: dc80f94b 0cf3355f +Author: aboudy +Date: Mon Jan 1 02:58:48 2018 -0800 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic into scenario_edge_methods + +commit 0cf3355f951d9eb229efa9459423049f48059ff3 +Merge: 2491677a 6d95cc3f +Author: aboudy +Date: Mon Jan 1 02:50:55 2018 -0800 + + Adds support for vehicles entering and exiting a network: + + changes: + - added a `Vehicles.remove_vehicle()` method to prevent the experiment from crashing once a vehicle leaves. + - built up support for inflows for vehicles of different types in different edges. This also works with flow-controlled vehicles and, potentially, rl vehicles. + - added some tests for the `Vehicles` class + - created a multi-lane highway network + +commit 6d95cc3f7ba2e9950e514f9575628e2c3edc6391 +Merge: 13cde797 d692079a +Author: aboudy +Date: Mon Jan 1 02:19:52 2018 -0800 + + Merge branch 'headway_fix' of https://github.com/cathywu/learning-traffic into entering_exiting_vehicles + +commit 13cde7973b0cd7fb2841cda0cebf91ae0644dbe9 +Author: aboudy +Date: Mon Jan 1 02:09:53 2018 -0800 + + review_fixes + +commit 41739fa9711f6cb3f9a0f4a0a9b1af77037a614c +Merge: ed43e1cf e0929851 +Author: aboudy +Date: Mon Jan 1 01:37:18 2018 -0800 + + Merge branch 'entering_exiting_vehicles' of https://github.com/cathywu/learning-traffic into entering_exiting_vehicles + +commit ed43e1cfc6fa6665e0bc0bcb5f6b4e4a36f0e1f4 +Merge: a58ec952 2491677a +Author: aboudy +Date: Mon Jan 1 01:36:15 2018 -0800 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic into entering_exiting_vehicles + +commit e90bc98255c6fd28491b223d43bca1063ec2967a +Author: Cathy Wu +Date: Sun Dec 31 02:26:25 2017 -0800 + + integration test fix + +commit 7230e062cd6d03ab3535fe5353d3fcb86e213f0f +Author: aboudy +Date: Sun Dec 31 00:32:11 2017 -0800 + + added starting position test for networks with variable lanes per edges + +commit 91ae8a51fe6a9c2a3169c753bc4e312b27419e00 +Merge: a3a66291 2491677a +Author: Cathy Wu +Date: Sat Dec 30 15:37:39 2017 -0800 + + merge + +commit d692079ae90a8c9e0d922f142e4a06dbff56c9dc +Merge: b77ecaf2 2491677a +Author: Cathy Wu +Date: Sat Dec 30 15:30:41 2017 -0800 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic into headway_fix + +commit e0929851f0a85521f09c2d16ba4e678a736ce130 +Merge: a58ec952 2491677a +Author: Cathy Wu +Date: Sat Dec 30 15:30:04 2017 -0800 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic into entering_exiting_vehicles + +commit 2491677a20768f5d459dd94b83c96e89afb36328 +Author: Cathy Wu +Date: Sat Dec 30 15:28:48 2017 -0800 + + Integration testing and fast Travis builds (#216) + + ## Summary + + The following changes make the Travis build 7x faster and support a new dependency (`ray`) so that we can have integration tests. This PR supercedes PR #214 (no longer needed). + + In `.travis.yml`: + - Deprecates `rllab` (no longer installs it) + - Supports `ray/rllib` and its missing dependencies + - Installs ray from whl. This reduces ray "build" time from 10 minutes to 2.5 minutes. See #208. + - Installs local rllib changes by copying over `cathywu/ray:testing` branch + - Removes dependence on docker build (had a lot of trouble integrating ray) + - Supports manually built SUMO binaries and python tools (hosted on AWS S3). This reduces the SUMO "build" time from 20 minutes to ~20 seconds. :) Resolves #208. Resolves #215 (not doing this). + + In ` tests/slow_tests/test_ray.py`: + - Introduces first integration test, which tests a ray/rllib + flow example (based on `stabilizing_the_ring_ray`). + + Additional changes: + - Refactoring to support this integration test. + - `flow/utils/tuple_preprocessor.py`: Moved preprocessor for ease of importing + - `examples/stabilizing_the_ring_ray.py`: re-organized code so that `create_env` can be imported without triggering `ray.init()`, etc. + - Split up fast tests from slow tests + - Creates different linux instructions for Ubuntu 14.04 and 16.04. Resolves #211. The Ubuntu 14.04 version is used to manually build a SUMO binary for use in `.travis.yml`. The Ubuntu 16.04 version was formerly the "linux" setup script. + - Renames wave attenuation env in accordance with #207. + + ---- + + Instead of 30 minutes, testing now takes 5 minutes (4 minutes setup time instead of 29). The breakdown is as follows: + - 114s: opencv [ray] + - 72s: nose2 (including a 40s integration test and 64 unit tests) + - 20s: ray + - 17s: conda [opencv] + - 19s: sumo + - 14s: tensorflow + + ------- + + * Refactored ray dependencies and examples for integration tests; added integration test for an end-to-end ray (rllib) run using stabilizing_the_ring example. + + * separated tests into fast and slow tests, now that we have our first integration test + + * add ray install to travis + + * fix ray install for travis + + * fix ray install for travis + + * set up conda in travis + + * link ray in docker and add ray to pythonpath + + * oops my bad + + * not sure.. + + * linux version + + * remove docker + + * non-interactive linux setup for SUMO + + * add conda + + * switch order to see why ray install is failing + + * sigh + + * oops + + * install ray from wheels + + * my bad + + * add ray testing branch + + * Manually move ray clone to site-packages + + * path + + * rllib + + * make sure + + * Cleanup + + * missing test file + + * tensorflow + + * add conda and opencv + + * conda switches python versions? + + * install opencv without conda + + * updated travis + + * cleanup + + * cleanup, remove apt-get update; fix test? + + * remove linux setup + +commit 01331da3d56791c507ed17d6e486e8922f335814 +Author: aboudy +Date: Sat Dec 30 14:46:46 2017 -0800 + + added starting position support for networks with different number of lanes per edge + +commit 3cb05c66aea220019f4ec4fd78193f16e67e4381 +Author: aboudy +Date: Sat Dec 30 14:07:29 2017 -0800 + + support of variable num_lanes lane-changing + +commit dc80f94b3af0b8959eadf188800b48949e8609c6 +Author: aboudy +Date: Sat Dec 30 09:57:52 2017 -0800 + + tests for new methods in the scenario class + +commit 2d1ccb69af3c914fe9b74239661cddf43cd5065e +Author: aboudy +Date: Sat Dec 30 09:29:01 2017 -0800 + + added methods to get edge data from the scenario class + +commit b77ecaf21e1ad7810dfb90d951c9f0241ceb1090 +Author: aboudy +Date: Sat Dec 30 09:04:59 2017 -0800 + + bug fixes + +commit a58ec9521d909e1b16ad37a10757ec092fc87971 +Author: aboudy +Date: Fri Dec 29 09:55:44 2017 -0800 + + cleanup to vehicles class + +commit 0bdaafa661e652c339987d09bcd308949cc8be81 +Author: aboudy +Date: Fri Dec 29 09:21:02 2017 -0800 + + added support to inflows + +commit a3a662919d762b08fb5b21e9348c9c5f8172e3df +Author: Cathy Wu +Date: Fri Dec 29 04:34:55 2017 -0800 + + typo + +commit 5bd37a29efb8cecbc11afbd85047982907e2aeea +Author: aboudy +Date: Fri Dec 29 03:53:05 2017 -0800 + + added method to remove vehicles vehicle from the Vehicles class once it leaves the network + +commit d6b88bd725faeec1a15e62d885dfc11ebe84ea90 +Merge: cb0181eb d473b5ba +Author: Cathy Wu +Date: Fri Dec 29 03:41:25 2017 -0800 + + Merge branch 'ray_test' of https://github.com/cathywu/learning-traffic into hierarchy + +commit d473b5ba5d4b76ec91c9831192a176703cc748c0 +Author: Cathy Wu +Date: Fri Dec 29 03:35:17 2017 -0800 + + remove linux setup + +commit cb0181eba18ffb65c3d58e0c3d8e5508590f6dbe +Merge: 9aa97bc0 0782ba52 +Author: Cathy Wu +Date: Fri Dec 29 03:06:08 2017 -0800 + + merge + +commit 0782ba5258c16ffa86e6317be09a4d256937a4d4 +Author: Cathy Wu +Date: Fri Dec 29 03:04:17 2017 -0800 + + cleanup, remove apt-get update; fix test? + +commit 5470beb0699654eb6df3d1f256639c7323f5a924 +Author: aboudy +Date: Fri Dec 29 03:02:00 2017 -0800 + + created highway scenario + +commit a8902ecb0374c2f8431bae5dddb31aa6ee402666 +Author: Cathy Wu +Date: Fri Dec 29 02:57:03 2017 -0800 + + cleanup + +commit 5b371d53c124b44688d8811e8c84c5158f31f46d +Author: Cathy Wu +Date: Fri Dec 29 02:49:40 2017 -0800 + + updated travis + +commit 9aa97bc0c7c356d25b39a7f798b6bca1a98f7713 +Author: Cathy Wu +Date: Fri Dec 29 02:48:03 2017 -0800 + + py3.5 -> py3.6 (miniconda) to support opencv dependency of ray + +commit 3003a695128e198868a124684fefc8b9e61dab6a +Author: Cathy Wu +Date: Fri Dec 29 02:00:13 2017 -0800 + + opencv + +commit 8a9ba73c487388ee3ae94ef6bf22657605253b6d +Author: Cathy Wu +Date: Fri Dec 29 01:53:05 2017 -0800 + + wrong dir + +commit 5b84fef59d37cd11250cb5bda46c6996c5dcf2fd +Author: Cathy Wu +Date: Fri Dec 29 01:48:16 2017 -0800 + + add data, indent stuff + +commit 2fa33c013c877646bc6e15f9a1a2577764e1a46d +Author: Cathy Wu +Date: Fri Dec 29 01:32:31 2017 -0800 + + python path + +commit e61a4ffb5adcf08eac6e3bfa7d0e666aece605f3 +Author: Cathy Wu +Date: Fri Dec 29 01:25:54 2017 -0800 + + add netconvert + +commit 187afc9b3f4626dfd30112803604fe22204500d1 +Author: Cathy Wu +Date: Fri Dec 29 01:12:31 2017 -0800 + + typo + +commit 9086fdac2e50f55c628bce464111d0658c1d1730 +Author: Cathy Wu +Date: Fri Dec 29 01:08:08 2017 -0800 + + sumo build - ubuntu14.04 version + +commit fca6205d7780176a91f7ded179f442f185a9f115 +Author: Cathy Wu +Date: Fri Dec 29 01:02:56 2017 -0800 + + different ubuntu setup scripts + +commit 2ba686b235127cd29e467b4192ddae459205b0bc +Author: Cathy Wu +Date: Fri Dec 29 00:33:27 2017 -0800 + + chmod + +commit 44c52637b60310a8162cd6d2b4b57b25bc9e9cc3 +Author: Cathy Wu +Date: Fri Dec 29 00:28:10 2017 -0800 + + fix + +commit 4d982cf798b87710c4feedac7d12a66d209e6e4a +Author: Cathy Wu +Date: Fri Dec 29 00:25:20 2017 -0800 + + download sumo build directly + +commit 13a1419bcb27655024d1652a95a4ec3fb2241f73 +Author: Cathy Wu +Date: Thu Dec 28 21:53:53 2017 -0800 + + install opencv without conda + +commit e20e9587bfb328547afe0e85c89f5418ac06faf6 +Author: Cathy Wu +Date: Thu Dec 28 21:45:28 2017 -0800 + + conda switches python versions? + +commit 5d7b33f4b79736a9031b633247239b48eefe4f3f +Author: Cathy Wu +Date: Thu Dec 28 21:35:47 2017 -0800 + + minor edit + +commit e2b4b8d02d8b988f9f60e2a2d09c1fda5b4c9330 +Author: Cathy Wu +Date: Thu Dec 28 21:23:41 2017 -0800 + + add conda and opencv + +commit 190c0b7fbf774aedd5048203cf71e2ff55f9caf5 +Author: Cathy Wu +Date: Thu Dec 28 21:22:02 2017 -0800 + + refactor to support multiple ray tests + +commit f0d17f54f41ad9767e2d019af8b2a783a7ffe3d9 +Merge: 277505be 9f92f7fc +Author: Cathy Wu +Date: Thu Dec 28 19:01:26 2017 -0800 + + Merge branch 'ray_test' of https://github.com/cathywu/learning-traffic into hierarchy + +commit 9f92f7fc8ba5f2ba4efbf99d2bf134f77c48a267 +Author: Cathy Wu +Date: Thu Dec 28 18:19:46 2017 -0800 + + tensorflow + +commit 16a86d3b5062d4bca6edea96bfaa4ed5cd039311 +Author: Cathy Wu +Date: Thu Dec 28 18:18:11 2017 -0800 + + missing test file + +commit 277505be1104b98c2a377c49849809bd33fc36aa +Author: Cathy Wu +Date: Thu Dec 28 18:05:09 2017 -0800 + + change env name to permit re-registration + +commit db5d92ac8c5504d3d8526611a1149a1cb2e85d4e +Author: Cathy Wu +Date: Thu Dec 28 17:16:42 2017 -0800 + + integration test for two-level policy + +commit f0f9e0053db07bcd64fb40355af1f010df8687b6 +Merge: 302e32a1 2ccbe615 +Author: Cathy Wu +Date: Thu Dec 28 17:12:37 2017 -0800 + + Merge branch 'ray_test' of https://github.com/cathywu/learning-traffic into hierarchy + +commit 2ccbe6150d026b13fb8805adfb92f205b0bd5dbe +Merge: 15385958 fd6c269d +Author: Cathy Wu +Date: Thu Dec 28 17:04:24 2017 -0800 + + merge + +commit fd6c269d8e203b795fb1860b1c317dcb0f1b70c2 +Author: Cathy Wu +Date: Thu Dec 28 16:57:26 2017 -0800 + + Cleanup + +commit 3c1692c88daaf67c85964751bb781b3e3af05d13 +Author: Cathy Wu +Date: Thu Dec 28 16:27:59 2017 -0800 + + make sure + +commit 9b7c1c1c70acfc0b171ed7e012b7026823140ea5 +Author: Cathy Wu +Date: Thu Dec 28 16:22:36 2017 -0800 + + rllib + +commit 56ae4ff2a85138f5764e2967a23e90e870222105 +Author: Cathy Wu +Date: Thu Dec 28 16:17:06 2017 -0800 + + path + +commit 7d5d210ecde61640d1d92f13180b11e9e34a01b1 +Author: Cathy Wu +Date: Thu Dec 28 15:24:05 2017 -0800 + + Manually move ray clone to site-packages + +commit 1233525856cd9040581ca0fa54e35b4948ecb5ed +Author: Cathy Wu +Date: Thu Dec 28 14:50:09 2017 -0800 + + add ray testing branch + +commit 06d54c0ee07386f90ba00bc36bb08e943dfd405f +Author: Cathy Wu +Date: Thu Dec 28 14:40:55 2017 -0800 + + my bad + +commit 302e32a1d0b5da2d5278f99055fa1ec806b3112f +Author: Cathy Wu +Date: Thu Dec 28 14:39:11 2017 -0800 + + restructure config params, use cloudpickle + +commit 2e276de37a5de1154ea84b32004923791194f749 +Author: Cathy Wu +Date: Thu Dec 28 14:06:45 2017 -0800 + + install ray from wheels + +commit cef1ef1cbc285f66f2e549a17c4476946cb47f14 +Author: Cathy Wu +Date: Thu Dec 28 13:58:13 2017 -0800 + + BROKEN passing function through options + +commit 72c984316ae97c6450d9fe63a97dd36ef62f6a3f +Merge: 1e0934f6 15385958 +Author: Cathy Wu +Date: Thu Dec 28 13:55:45 2017 -0800 + + Merge branch 'ray_test' of https://github.com/cathywu/learning-traffic into hierarchy + +commit 0aaeea549e508e28c43f0ee857e2851dc2ffff0a +Merge: 4af14a40 1ec2a037 +Author: eugenevinitsky +Date: Thu Dec 28 14:51:12 2017 -0500 + + pulled in master + +commit ef12e40b65e838c429d23b6070e5716d510f570b +Author: Cathy Wu +Date: Thu Dec 28 03:55:55 2017 -0800 + + oops + +commit ddaba7bbdb6abce81e14be81efbc9396673d83d8 +Author: Cathy Wu +Date: Thu Dec 28 03:42:56 2017 -0800 + + sigh + +commit 1e0934f6ba5746fcb1cecde8c751a3e046d96315 +Author: Cathy Wu +Date: Thu Dec 28 03:39:40 2017 -0800 + + missing init + +commit a125b205520d55b70ca022e268562276a6007d75 +Author: Cathy Wu +Date: Thu Dec 28 03:38:55 2017 -0800 + + Partial implementation of two-level fcnet example + +commit 5dc585c5626611b025059df0a8d2a5816d6dcd1c +Author: Cathy Wu +Date: Thu Dec 28 03:27:33 2017 -0800 + + switch order to see why ray install is failing + +commit c712605ef09810a9702bfeb11e01feb5b1ea1417 +Author: Cathy Wu +Date: Thu Dec 28 02:53:29 2017 -0800 + + add conda + +commit 9a0ea68fe54f45c60dc8fd29d3c304e8745188f7 +Author: Cathy Wu +Date: Thu Dec 28 02:19:40 2017 -0800 + + non-interactive linux setup for SUMO + +commit d3789891072021cf35aeb9f4989350a0eb36e8a2 +Author: Cathy Wu +Date: Thu Dec 28 02:11:52 2017 -0800 + + remove docker + +commit 59df3af0b4174ae6312fd30f7ca7dac7200dab9f +Author: Cathy Wu +Date: Thu Dec 28 02:10:13 2017 -0800 + + linux version + +commit 1538595878d825ec7fa60eaf36fd69c4ccc3853e +Author: Cathy Wu +Date: Thu Dec 28 01:58:24 2017 -0800 + + not sure.. + +commit 141d9cd88921a35b8679e349f97c74e2f10933b4 +Merge: 066f1aa2 1ec2a037 +Author: Cathy Wu +Date: Thu Dec 28 01:53:59 2017 -0800 + + merge + +commit 1ec2a03781c0045756a5c61d34fbd2e08238929e +Author: AboudyKreidieh +Date: Thu Dec 28 01:50:02 2017 -0800 + + Cleanup examples (#210) + + changes: + - removed some redundant examples + - removed `two_loops_two_merging` environment (it shouldn't be in master) + - cleaned up comments and organization of examples + - resolves #206 + + ---- + + * cleaned up params.py, renamed time_step -> step_length, added option to ask for sumo step logs + + * delted redundant examples, cleaned up examples to match new refactoring, and deleted never-used scenario + +commit 1e734753d810eb11f03c9ac4c4286ec302eaee81 +Author: AboudyKreidieh +Date: Thu Dec 28 01:46:29 2017 -0800 + + Cleanup vehicles (#209) + + Some cleaning up to the vehicles class and its interaction with the environment class. Prelude to supporting dynamic numbers of vehicles. + + Changes: + - the list of human-driven vehicles can be collected from `vehicles.get_human_ids()`, and, like before, autonomous vehicles are collected from `vehicles.get_rl_ids()` + - Removed the `sumo_ids` list and produced to controlled_id lists (`controlled_ids` and `controlled_lc_ids`) to make it clear which vehicles are controlled by flow and which by sumo in terms of lane-change and acceleration actions. This in turn makes applying these actions in `base_env` somewhat simpler + - removed all vehicle id lists from the environment classes and replaced calls to them with calls to the vehicle class. This is meant to reduce confusion when these lists becomes dynamic when cars are allowed to enter and exit the network. + - modified the `wave_attenuation` environment to be compatible with the new modifications to `base_env` and the `vehicles` class + + --- + + * cleaned up params.py, renamed time_step -> step_length, added option to ask for sumo step logs + + * removed ids from the environment and replaced calls to it with calls to the vehicles class + + * fixed environments to support modifications to vehicles class + +commit 066f1aa26fe7dc74166bfe3d566f1f7edfbe161c +Author: Cathy Wu +Date: Thu Dec 28 01:30:49 2017 -0800 + + oops my bad + +commit d5570f00c58dce2115dbc1f94564343eb7c5db4f +Merge: b05f76a3 34779f82 +Author: AboudyKreidieh +Date: Thu Dec 28 00:32:59 2017 -0800 + + Merge pull request #172 from cathywu/ray_integration + + ray/rllib integration + +commit 94f3067a23c625ef6245724fe1cb835a8a831d01 +Author: Cathy Wu +Date: Wed Dec 27 18:53:07 2017 -0800 + + link ray in docker and add ray to pythonpath + +commit e5b4c44a2968b400d15b7d3ce71e7c3ff80130df +Author: Cathy Wu +Date: Wed Dec 27 18:24:07 2017 -0800 + + set up conda in travis + +commit 1d541d62ee4234d15dff072a65976811024c77a8 +Author: Cathy Wu +Date: Wed Dec 27 18:08:23 2017 -0800 + + fix ray install for travis + +commit dd7881fa1298d77ebf152840746175bde2748b06 +Author: Cathy Wu +Date: Wed Dec 27 17:57:56 2017 -0800 + + fix ray install for travis + +commit 88cd3ca4d7b7482fd35c7e422ec9ac6152574506 +Author: Cathy Wu +Date: Wed Dec 27 17:37:22 2017 -0800 + + add ray install to travis + +commit 981f19dafe483d7d944d0ac70b11038415c5e635 +Author: Cathy Wu +Date: Wed Dec 27 17:15:37 2017 -0800 + + separated tests into fast and slow tests, now that we have our first integration test + +commit 8c5e304ff3d4598b2f154302026407be4a538d33 +Author: Cathy Wu +Date: Wed Dec 27 17:05:15 2017 -0800 + + Refactored ray dependencies and examples for integration tests; added integration test for an end-to-end ray (rllib) run using stabilizing_the_ring example. + +commit 34779f82d49fdb51f2c3cb9205b40be9dd56fe0b +Merge: 0f0906c4 b05f76a3 +Author: Cathy Wu +Date: Wed Dec 27 13:28:18 2017 -0800 + + merge + +commit b05f76a3d4aa51aeeecb32d5e0c62d0d28567467 +Author: AboudyKreidieh +Date: Wed Dec 27 13:25:52 2017 -0800 + + Cleanup (#203) + + This pull request is just to clean up a few things and close some issues. + + Prerequisites: PR #185 + + Changes: + - cleaned up documentation in `params.py` and removed / moved around a few attributes in the parameter classes. + - Changed the name of `time_step` to `step_length`; resolves #168 + - added an option in `SumoParams` to choose whether or not to add sumo step logs (defaults to no step logging), resolved additional comments in #182 + + --- + + * cleaned up params.py, renamed time_step -> step_length, added option to ask for sumo step logs + + * replaced step_length with sim_step and timer with timer_counter + + * refactoring bug + +commit 0f0906c4f1f4a5a35979827529c720605fa0b0aa +Author: Cathy Wu +Date: Wed Dec 27 13:24:35 2017 -0800 + + missed a serialization initialization + +commit d22e255e1ea5ccdd28d7d05ffec963ac6d37d6d6 +Merge: 9c58e6b4 87667429 +Author: Cathy Wu +Date: Wed Dec 27 03:02:37 2017 -0800 + + merge + +commit 876674291ae1451bed55d4bd32885a53fdeed2aa +Merge: ab9443df f200206f +Author: AboudyKreidieh +Date: Wed Dec 27 01:55:22 2017 -0800 + + Merge pull request #185 from cathywu/speedups + + Speedups + +commit 4af14a402053e97cfd38214bf6c6ad7236aa4a55 +Merge: ade87f23 ab9443df +Author: eugenevinitsky +Date: Tue Dec 26 22:20:39 2017 -0500 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic + +commit 9c58e6b46540231748838b49ab08164cbeba7c7b +Author: Cathy Wu +Date: Tue Dec 26 15:41:08 2017 -0800 + + match hyperparameters to rllab + +commit f200206fd409b40f680e03cb80b92e6de24176db +Merge: a6050df1 ab9443df +Author: aboudy +Date: Tue Dec 26 14:31:27 2017 -0800 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic into speedups + +commit a6050df1e9321dc8a307aa5773b6871c42b1dba5 +Merge: 4cf8a31d ab5edaa5 +Author: aboudy +Date: Tue Dec 26 14:28:30 2017 -0800 + + Merge branch 'speedups' of https://github.com/cathywu/learning-traffic into speedups + +commit ab9443dfd3c18307ebfeac21dd5f7ac565d1f9fa +Author: Cathy Wu +Date: Tue Dec 26 13:07:45 2017 -0800 + + Support fixing a random seed for SUMO (#199) + + ## Summary + + - Supports fixing a SUMO random seed via `SumoParams`. Resolves #195. + - This is one step towards reproducible runs. + + ---- + + * support random seed + + * needs int + + * smaller seed + +commit 15b531f925b57d3c48740324cd9653f241c8a889 +Author: Cathy Wu +Date: Tue Dec 26 13:07:29 2017 -0800 + + Default config (#198) + + ## Summary + + - Introduces `config_default.py` as the default config parameters. + - `flow/core/config.py` is no longer required, but is supported. + - Reduced the default sleep time again (to 0.1 instead of 2.0 or 0.002). + - Resolves #194. + + --- + + * add default config, so config.py is no longer required + + * update docs + + * shouldn't need to copy over config in setup anymore (travis) + +commit c6d0bd231bb5b2228e3416b80a5da1b9306e5f69 +Author: Cathy Wu +Date: Sun Dec 24 13:14:28 2017 -0800 + + teardown method for sumo + +commit 0c31fcf00255775925585e31a6d30c9b3152f4a4 +Author: Cathy Wu +Date: Sun Dec 24 03:56:14 2017 -0800 + + probably don't need this + +commit 492d47bd41c67e4e2fabeb65a17ecdb13f8a230a +Author: Cathy Wu +Date: Sun Dec 24 03:44:10 2017 -0800 + + return if no error + +commit 4f3859615e6f6dfdd9567e5a649c31623c6880bc +Author: Cathy Wu +Date: Sun Dec 24 03:40:47 2017 -0800 + + find new port + +commit 5e29e3a8834d05f9b9369f543a17a7ce790ef650 +Author: Cathy Wu +Date: Sun Dec 24 03:23:06 2017 -0800 + + reset mechanism for sumo start instead of sumo restart + +commit ab5edaa52bdf04c486636dc9461a5e4f6ef941ac +Merge: d6a8e2ad eba92c5a +Author: Cathy Wu +Date: Sun Dec 24 01:08:13 2017 -0800 + + merge + +commit 576adb3d3c45ac8b1cb16f4443668c124382b33d +Merge: 85b234ca eba92c5a +Author: Cathy Wu +Date: Sun Dec 24 01:06:58 2017 -0800 + + merge + +commit eba92c5a513d329501c8b1ead5ebf5c1c9df87ee +Author: Cathy Wu +Date: Sun Dec 24 01:05:22 2017 -0800 + + rllab baseline and increased robustness of running experiments (#184) + + ## Summary + - Introduces benchmark for a direct comparison with rllib/ray version (sister PR to #172). Copies over `stabilizing-the-ring.py` (renamed to `stabilizing_the_ring.py`) and `envs/wave_attenuation.py` from branch `master_devel_aboudy`. + - For increased robustness of running experiments (resolves #173, workaround for #170): + - Increases default sleep time (for TraCI connections) to 2.00 sec (up from 0.02 sec) + - Re-tries SUMO restart 10x if connection fails (NOTE: 5x was not sufficient) + + --- + + * Remove rllab dependency; add eugene's gym registration (with params) to flow utils; add 2 working rllib examples (mixed_rl_single_lane and stabilizing_the_ring); ported over wave attenuation env + rllab version from aboudy's branch + + * add back rllab dependency + + * batch size + + * parallel + + * benchmark + + * benchmark + + * Add .travis.yml + + * Fix .travis.yml + + * travis fix + + * fix + + * there must be a better way.. + + * warmer? + + * build status + + * almost there.. + + * add rllab + + * run faster commands first, so we can see if things are working + + * install rllab linux dependencies; try mounting same directory as learning-traffic clone + + * -y + + * clone to parent dir + + * setup learning-traffic; cleanup + + * config + + * sumo restart retry mechanism; sleep longer by default + + * typo + + * remove SUMO step log (displays rollout progress, but conflicts with other outputs) + + * skip known broken test + + * skip known broken tests + + * is setup.py develop necessary? + + * beefier reset + + * typo + + * don't introduce ray examples in this branch + + * revert utils + +commit 85b234caf8fe71aeaf34c379b014be72e0560f37 +Author: Cathy Wu +Date: Sun Dec 24 01:03:43 2017 -0800 + + add visualizing training progress instructions + +commit d6a8e2ada8ecdd3cca2a50414f0c1476abad1b8d +Merge: 119faac2 0a0e382c +Author: Cathy Wu +Date: Sat Dec 23 22:44:02 2017 -0800 + + merge + +commit 9c27dfc55bb5d0962ad02bf4cdbd5738f83ba407 +Merge: d9ce2a94 0a0e382c +Author: Cathy Wu +Date: Sat Dec 23 22:38:37 2017 -0800 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic into ray_integration + +commit 0a0e382ca43d2dfb36c513f6acf34b82d6e0db1c +Author: Philipp Moritz +Date: Sat Dec 23 22:37:52 2017 -0800 + + Add script to install sumo in linux (#171) + + ## Summary + + - Setup instructions for SUMO on linux. + - Minor corrections to OSX instructions. + + ## Testing done + + Tested on Ubuntu 16.04 on a clean EC2 instance with 25 GB storage. + + --- + + * start writing script + + * add more commands + + * update + + * linux sumo installation script + + * fix + + * Fixes to linux setup instructions + + * fixed linux setup instructions and script; cleaned up osx scripts + + * revert docs + +commit d9ce2a94781b89ed2855bbe129b0819e80883d26 +Author: Cathy Wu +Date: Sat Dec 23 22:18:55 2017 -0800 + + cluster deployment instructions + +commit f0360f911c6584450e9dd2a5939aa4ea6f961926 +Author: Cathy Wu +Date: Sat Dec 23 21:48:25 2017 -0800 + + ray setup instructions + +commit 5cf82b6d16467518d90fda05f4c9301a3e16768f +Author: Cathy Wu +Date: Sat Dec 23 18:55:06 2017 -0800 + + Backwards compatibility with rllab (addresses #178) + +commit 32084238d3ae4cd55ba0dd829f354653975ce6dd +Merge: 3cfde841 2e9e41ac +Author: Cathy Wu +Date: Sat Dec 23 18:44:52 2017 -0800 + + merge + +commit 2e9e41ac76583905ae63da13b327e478758c461c +Author: Cathy Wu +Date: Fri Dec 22 13:06:10 2017 -0800 + + Fix Travis hook + + Fix Travis hook + +commit ade87f23d4e1e9bde51bacb16076b2c35674870f +Merge: 8ca11919 083460f7 +Author: eugenevinitsky +Date: Fri Dec 22 12:51:18 2017 -0500 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic + +commit 083460f73f264dc5a36be9ee5521c56e1bff4c4c +Author: Cathy Wu +Date: Fri Dec 22 07:48:44 2017 -0800 + + Travis set up properly (#180) + + **Summary**: Properly sets up Travis continuous integration. Resolves #174. In summary, the Travis configuration script clones and sets up `learning-traffic` and `rllab-multagent`, pulls down the `evinitsky/flow` docker image, links volumes as appropriate, and invokes the unit tests (via nose2) within the docker image. + + **WARNING**: The way this is set up, Travis will git clone `rllab-multiagent` (master) and test with that. There may be issues if simultaneous changes in `rllab-multiagent` and `flow` are needed. + + **Commit summary**: + + * Add .travis.yml + + * Fix .travis.yml + + * travis fix + + * fix + + * there must be a better way.. + + * warmer? + + * build status + + * almost there.. + + * add rllab + + * run faster commands first, so we can see if things are working + + * install rllab linux dependencies; try mounting same directory as learning-traffic clone + + * -y + + * clone to parent dir + + * setup learning-traffic; cleanup + + * config + + * skip known broken tests + + * is setup.py develop necessary? + +commit 119faac292b96459c050209d410fa6d78a49109c +Author: AboudyKreidieh +Date: Fri Dec 22 06:15:14 2017 -0800 + + quietted step logging from sumo + +commit 3cfde841a57b85e2957f90c767ba17a8009d66f6 +Merge: 45cecbce 4d41b920 +Author: Ubuntu +Date: Fri Dec 22 07:50:37 2017 +0000 + + Merge branch 'ray_integration' of github.com:cathywu/learning-traffic into ray_integration + +commit 45cecbce48334fff47d58eb10a86b15602af9107 +Merge: 0f77eb4a f6d1b8ad +Author: Ubuntu +Date: Fri Dec 22 07:50:00 2017 +0000 + + Merge branch 'travis' of github.com:cathywu/learning-traffic into ray_integration + +commit 4d41b920169060ea40a7b32c32406ba7b0fbe6ad +Author: Cathy Wu +Date: Thu Dec 21 22:54:27 2017 -0800 + + autoscale + +commit b267ce35a8ddf6e46ebb18e5ec4b36608fb0320e +Author: Cathy Wu +Date: Thu Dec 21 22:43:54 2017 -0800 + + remove rllab depencency + +commit 138d0422c0b08973fd853f8bda7facd5cb43bcfb +Author: Cathy Wu +Date: Thu Dec 21 22:30:05 2017 -0800 + + add reset mechanism + +commit 0f77eb4aad08408e314612370dd48973b9dbf41c +Merge: 0a7a17e3 dfd4d281 +Author: Ubuntu +Date: Fri Dec 22 06:26:04 2017 +0000 + + Merge branch 'ray_integration' of github.com:cathywu/learning-traffic into ray_integration + +commit 0a7a17e38d0a04d02fba7357828cdf0fd31e3a69 +Author: Ubuntu +Date: Fri Dec 22 06:25:25 2017 +0000 + + performance test + +commit f6d1b8ad7f7f45c15a399b19cda49075b93fc655 +Author: Cathy Wu +Date: Thu Dec 21 21:10:56 2017 -0800 + + is setup.py develop necessary? + +commit 36c7c69bc2c017ac0bb6370b027409da31a18347 +Author: Cathy Wu +Date: Thu Dec 21 20:41:35 2017 -0800 + + skip known broken tests + +commit 1f8c3de3eaace8a689fdab8b8372ecfa3f082c16 +Author: Cathy Wu +Date: Thu Dec 21 20:22:48 2017 -0800 + + config + +commit 0e90f4a02e8277dd7c88e25f4fb83ef5dfc668a6 +Author: Cathy Wu +Date: Thu Dec 21 20:08:44 2017 -0800 + + setup learning-traffic; cleanup + +commit cb8284956c9cbffdfe21f582cc9650628c9f4fa6 +Author: Cathy Wu +Date: Thu Dec 21 19:54:34 2017 -0800 + + clone to parent dir + +commit 54b532bcd39d81619d0f07ac2f1bda36cdf7ad86 +Author: Cathy Wu +Date: Thu Dec 21 19:51:51 2017 -0800 + + -y + +commit 9bb3d5480a5aa70ed9fa4f5079aae386c8ea4c1e +Author: Cathy Wu +Date: Thu Dec 21 19:51:06 2017 -0800 + + install rllab linux dependencies; try mounting same directory as learning-traffic clone + +commit 63a0aec7cf5ebf770ee220533c9bfdaf1de399f6 +Author: Cathy Wu +Date: Thu Dec 21 19:39:32 2017 -0800 + + run faster commands first, so we can see if things are working + +commit 6e2a9b24afbc6b3b3adc2e3589e00e383f0d30d8 +Author: Cathy Wu +Date: Thu Dec 21 19:21:31 2017 -0800 + + add rllab + +commit eda5f87245f9d9272cd2255d1a77a84129aadc53 +Author: Cathy Wu +Date: Thu Dec 21 19:12:54 2017 -0800 + + almost there.. + +commit aa125bcccda4f7d570e5f392db2d6487d391a80a +Author: Cathy Wu +Date: Thu Dec 21 19:03:44 2017 -0800 + + build status + +commit 9d1f2529cecb565382c38b4662b9d347325256b9 +Author: Cathy Wu +Date: Thu Dec 21 18:58:27 2017 -0800 + + warmer? + +commit 78a0eae70fbf79d2850d143eff6a0f435efcf79f +Author: Cathy Wu +Date: Thu Dec 21 18:27:23 2017 -0800 + + there must be a better way.. + +commit dfd4d281a547af735d958374ed2d9d990384a525 +Merge: 96eb9502 8f8a81e0 +Author: Cathy Wu +Date: Thu Dec 21 18:02:27 2017 -0800 + + Merge branch 'ray_integration' of https://github.com/cathywu/learning-traffic into ray_integration + +commit 96eb950271f9da2d7a0561b80d96f6488752e9a8 +Author: Cathy Wu +Date: Thu Dec 21 18:02:25 2017 -0800 + + autoscale config + +commit d8a5624c96305412b15eb93f051ab048f87498f1 +Author: Cathy Wu +Date: Thu Dec 21 17:38:44 2017 -0800 + + fix + +commit 116d4b00b03d273f133aaa00b461fc7313db1853 +Author: Cathy Wu +Date: Thu Dec 21 17:35:23 2017 -0800 + + travis fix + +commit dd606c839ddb9e31824b0fc30c1b4abd3bb05e07 +Author: Cathy Wu +Date: Thu Dec 21 17:15:04 2017 -0800 + + Fix .travis.yml + +commit 92ee9e48b850bf261138ea177d8eb56b530419c2 +Author: Cathy Wu +Date: Thu Dec 21 17:09:50 2017 -0800 + + Add .travis.yml + +commit 8ca1191964d74b38e278d13b49d8168837d7e316 +Author: eugenevinitsky +Date: Wed Dec 20 16:36:50 2017 -0800 + + added ray file for mixed rl case + +commit 8f8a81e02c4c588c982c4256686806ed7790abdc +Author: Ubuntu +Date: Wed Dec 20 08:04:14 2017 +0000 + + benchmark + +commit 46e820f79c36274a4d3480101ab3a3aa51458ae0 +Author: Cathy Wu +Date: Tue Dec 19 23:40:57 2017 -0800 + + remove rllab dependency + +commit df2ca1e44c364976512e54d08a70462413520103 +Author: Ubuntu +Date: Wed Dec 20 07:14:40 2017 +0000 + + benchmark + +commit defcda4de560e842a5ee8bfd58c0ec21d4239a4f +Author: Cathy Wu +Date: Tue Dec 19 18:56:07 2017 -0800 + + batch size + +commit 0eb0493e1c231379a71ce18b2e0085a7a9f45d68 +Author: Cathy Wu +Date: Tue Dec 19 18:49:04 2017 -0800 + + batch size + +commit 5145aa83dd9a9a4a2f8610aa37e386a81fdcd41a +Author: Cathy Wu +Date: Tue Dec 19 18:41:14 2017 -0800 + + merge + +commit 71b986f12aa017f3217f800f642b1abbbca3b860 +Author: Cathy Wu +Date: Tue Dec 19 00:55:12 2017 -0800 + + Remove rllab dependency; custom config for benchmark task + +commit 4cf8a31db4dc3e5d2ad054b864fc1a869c6c67b4 +Merge: dcac012b d94a9683 +Author: aboudy +Date: Tue Dec 19 00:44:13 2017 -0800 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic into speedups + +commit ed699b0af3d498f10e2430ab793bfb6a7ea22bcf +Author: Cathy Wu +Date: Tue Dec 19 00:22:03 2017 -0800 + + Remove rllab dependency; add eugene's gym registration (with params) to flow utils; add 2 working rllib examples (mixed_rl_single_lane and stabilizing_the_ring); ported over wave attenuation env + rllab version from aboudy's branch + +commit dcac012b29095c37ac6f9393ab0934bdaead9ab6 +Author: aboudy +Date: Mon Dec 18 14:55:18 2017 -0800 + + added new unittests for sumo lc/accel params and controller features, and fixed bugs associated with these unittests + +commit d94a9683bde70d5db81d82fdf6c183315ed140ca +Author: Cathy Wu +Date: Sat Dec 16 16:15:07 2017 -0800 + + Revised documentation and fixed unit tests (#166) + + * Cleanup of documentation; + * added SUMO_HOME to instructions; + * fixed unit tests (so that they run from the project root directory); + * added SUMO_SLEEP to config, which delays connections to TraCI before sockets are available (gives a large speedup to tests and runs) + * update README (contributors) + +commit a37e1350bd49b40cc28bad15a862f2370135e133 +Merge: 94a405c5 c5e4ce2e +Author: eugenevinitsky +Date: Thu Nov 16 11:05:35 2017 -0800 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic + +commit 1439884477e114f630a4dec1b043dc87d9254d98 +Author: Kanaad Parvate +Date: Fri Nov 3 14:30:18 2017 -0700 + + added sumo lane change controller and refactored how we provide parameters to sumo for controllers (new params classes) + +commit c5e4ce2ed0b758128c92956372306bb918065228 +Merge: d27a9ff1 ed12f932 +Author: Cathy Wu +Date: Fri Nov 3 11:07:24 2017 -0700 + + Merge pull request #165 from cathywu/update_lt_documentation + + Update lt documentation + +commit ed12f932bde135cd378398c555deccaf51b3163e +Merge: d27a9ff1 ec472ad8 +Author: Kanaad Parvate +Date: Fri Nov 3 11:04:26 2017 -0700 + + Merge branch 'master' of https://github.com/cathywu/flow + +commit d27a9ff13f4c12754027445cebc30f16c9781ddb +Merge: b0a56c93 f4a55a2c +Author: Cathy Wu +Date: Fri Nov 3 10:56:58 2017 -0700 + + Merge pull request #161 from cathywu/gitignore + + Update .gitignore to successfully ignore xml files + +commit ec472ad8f8afb8b1c7cf55bb4ae19e295ac7f22e +Author: Kanaad Parvate +Date: Thu Nov 2 14:50:39 2017 -0700 + + Unit tests (#16) + + Unit Tests and Bug Fixes + +commit 2827f882ebc48f113532eb99b3e83249e8a98a71 +Merge: 7743147f 3ae8d401 +Author: Kanaad Parvate +Date: Thu Nov 2 12:27:57 2017 -0700 + + merged speed up changes + +commit 7743147f61139f1b354a7c8e938dd42fca81f0e3 +Author: Kanaad Parvate +Date: Wed Nov 1 20:00:46 2017 -0700 + + speed and lane changing modes are configured by vehicle type, and unit tests for setting modes in vehicles was added + +commit 3ae8d4019ff26e5dc8f383220e3ada27bec1e7d7 +Merge: 7a157792 b0a56c93 +Author: aboudy +Date: Wed Nov 1 15:46:41 2017 -0700 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic into speedups + +commit 7a157792ef73831afdadf15868f2bf363ce45384 +Author: aboudy +Date: Wed Nov 1 15:38:37 2017 -0700 + + removed failsafes from env_params + +commit 7d51a69f59d36d93c7302dde7ca1f6b34a7edb77 +Author: aboudy +Date: Wed Nov 1 15:33:23 2017 -0700 + + moved failsafe calls from base_env to base_controller and made the fail_safe a parameter for the acceleration controllers + +commit fe2d8e1b69b10da4746b48dc30f21a0cf539e538 +Author: aboudy +Date: Wed Nov 1 12:07:33 2017 -0700 + + added open of convert emission files to csv from the experiment class + +commit f4a55a2c90bc717d2a466ffc09fe5036485fa0f6 +Author: Kathy Jang +Date: Wed Nov 1 11:45:06 2017 -0700 + + Update .gitignore to successfully ignore xml files + +commit e094e43f9e7b75eb2800a1b4c97d494e18e3581d +Author: Kanaad Parvate +Date: Tue Oct 31 11:46:53 2017 -0700 + + updated readme + +commit b0a56c9318fa3a467f776c21ca61b96fafc44d26 +Merge: 03c7867a c76ee980 +Author: Kanaad Parvate +Date: Tue Oct 31 14:45:33 2017 -0700 + + Merge pull request #153 from cathywu/unit_tests + + full unit test coverage for the current codebase, total of 62 tests that take around 12 sec to run. + bug fixes and methods to handle edge cases + The "safe_velocity" failsafe was also re-written, and now manages to always prevent crashes. + visualizer_flow no longer requires you to specify the type of scenario + Refactored components: + + visualizer_CISTAR renamed to visualizer_flow, and all other visualizers were deleted + some parts of the accelerations controllers were renamed to maintain some consistency between all controllers. + stuff that haven't been tested: + + get_headway_dict + run_long in visualizer_flow (this is still broken) + resets after collisions (this used to be broken, but I added a patch. I can't figure out how to recreate the problem though, since it doesn't happen all the time) + anything rl (tests take at least 3 sec because of rllab, so moving them all into integration tests) + generator base class (could not think of good unit tests) + +commit c76ee9805c57512bc224c915c4181fda97fd4bfa +Author: Kanaad Parvate +Date: Tue Oct 31 14:43:38 2017 -0700 + + removed unneeded comments + +commit bd8a96d9d8ad2b4dfc2d86d359d56c4eb3390c5b +Author: aboudy +Date: Mon Oct 30 13:31:40 2017 -0700 + + cleaned up tests to support changes to the vehicles class and modified instantaneous failsafe to support ballistic sumo step methods + +commit 1b763a737b70e3c2b2267af7a91fa7058483f745 +Author: aboudy +Date: Mon Oct 30 12:42:26 2017 -0700 + + bug fixes to the vehicles class regarding the speedups + +commit fe77359956e16a76d09deeadb360ac5f571c738b +Merge: 21e45c08 0f9fb990 +Author: aboudy +Date: Sun Oct 29 17:20:09 2017 -0700 + + Merge branch 'unit_tests' of https://github.com/cathywu/learning-traffic into speedups + +commit 0f9fb9901a54b80b942b82150019ecfc95839858 +Merge: e4becc6a 03c7867a +Author: aboudy +Date: Sun Oct 29 17:14:56 2017 -0700 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic into unit_tests + +commit 21e45c08bf3a6407025f2507532d1493c6eb9381 +Author: aboudy +Date: Sun Oct 29 16:58:51 2017 -0700 + + modified SumoController class and generator to allow vehicles to be controlled by sumo + +commit 94a405c5f6caafc99550d5267a6c94cf20af2d59 +Author: eugenevinitsky +Date: Fri Oct 27 18:23:09 2017 -0700 + + added multiagent example, it runs, but need to run tests to make sure it actually works + +commit e3d6d70aa6a3ea88d649f94ca81aa9d47a5b170c +Author: eugenevinitsky +Date: Fri Oct 27 16:58:45 2017 -0700 + + Update flow_setup.rst (#14) + + * Update flow_setup.rst + + Fix for the download of rllab-multiagent; it's off the master branch, not cistar_release. + + * Update flow_setup.rst + + * Update flow_setup.rst + + * Update flow_setup.rst + + * Update flow_setup.rst + + Removed comments to team + +commit 8f07d476f32cd5a7a670a2c58dd9080b89639cba +Merge: bd343205 e4becc6a +Author: aboudy +Date: Thu Oct 26 14:17:14 2017 -0700 + + Merge branch 'unit_tests' of https://github.com/cathywu/learning-traffic into speedups + +commit 03c7867a2264addd24866a66195948a15d3c451c +Merge: 2e675d27 cb99cb07 +Author: Kanaad Parvate +Date: Thu Oct 26 12:30:03 2017 -0700 + + Merge pull request #155 from cathywu/flow_release + + Update master to flow + +commit 2e675d275479651ef2fda74cdc11f0663302aa4f +Merge: 985a2d86 30c3008b +Author: Kanaad Parvate +Date: Thu Oct 26 12:29:41 2017 -0700 + + Merge pull request #156 from cathywu/rollback_master_code_owners + + remove codeowners + +commit 30c3008b23b692ac7fb715639b85325b21ef499c +Author: Kanaad Parvate +Date: Thu Oct 26 12:28:43 2017 -0700 + + remove codeowners + +commit e4becc6a70d1fb4ff170df9f8488a8e22aec5cfb +Author: aboudy +Date: Thu Oct 26 12:16:49 2017 -0700 + + cleaned up redundant unit tests and removed commented unit tests + +commit cb99cb075064268b41b0ade98f3da6621b1c208f +Merge: 8d8b8c0b 8550bea7 +Author: Kanaad Parvate +Date: Thu Oct 26 12:02:25 2017 -0700 + + Merge pull request #154 from cathywu/replacing_master + + backwards merging flow/master to flow_release (changes were made to cathywu/flow/master that need to be reincorporated into learning-traffic) + +commit 8550bea79f2c13177d3bbaf940ee56affc9685b0 +Merge: 8d8b8c0b 4f678563 +Author: Kanaad Parvate +Date: Thu Oct 26 11:50:42 2017 -0700 + + backwards merging flow/master + +commit bd3432058b7a9833c17c11309226bb8819b6c160 +Author: aboudy +Date: Thu Oct 26 11:30:33 2017 -0700 + + removed redundant step in the _step function when storing information about the state of vehicles + +commit 31e2850ae2c373471a933d811a8e3234c5a94bdd +Author: aboudy +Date: Wed Oct 25 18:28:44 2017 -0700 + + added tests for loop_merges and two_loops_one_merging, and some bug fixes. Generator class has no tests + +commit d1076bcff25eda2a0ab40b9400dd7a92e8d67077 +Author: aboudy +Date: Wed Oct 25 18:27:07 2017 -0700 + + cleaned up some tests and an example + +commit 29affb3c54635f7571e98eb19e9f285e149b5772 +Author: aboudy +Date: Wed Oct 25 17:31:50 2017 -0700 + + small modification to one of the arguments + +commit 4889d527757091863969d79a164f849038d81473 +Author: aboudy +Date: Wed Oct 25 17:28:58 2017 -0700 + + added tests for emission_to_csv and a few files needed when testing the visualizer and util functions + +commit 8c9ee60bda16f1c82e3a7e8f7e2f7ad2a65610e3 +Author: aboudy +Date: Wed Oct 25 17:02:11 2017 -0700 + + removed broken visualizers + +commit 60774afe7ad41b120b9a26355a4b934cedab2eef +Author: aboudy +Date: Wed Oct 25 17:01:23 2017 -0700 + + renamed visualizer_CISTAR visualizer_flow, and added a test for the visualizer + +commit 318d28dfe3fb9bde54c63a4ef0337e7def830731 +Author: aboudy +Date: Wed Oct 25 16:33:03 2017 -0700 + + modified visualizer_CISTAR and added a function to convert emission files to csv files + +commit faeeaccd636924c00f8cbe42ceac7c28e73a929c +Author: aboudy +Date: Mon Oct 23 16:19:22 2017 -0700 + + added setup script needed for most tests + +commit 3ec4a1e7851d65a3f651fa37d1d1434587a13613 +Author: aboudy +Date: Mon Oct 23 16:14:52 2017 -0700 + + added tests for the experiment class, removed redundant tests in the controllers, bug fixes for experiment class, and added test for emission path to prevent new memory leaks from this + +commit 58fec6db49ba97f3676431e79ea5b21e64f2b40f +Author: aboudy +Date: Mon Oct 23 15:44:35 2017 -0700 + + added tests for the base scenario class, base environment class, and controllers, as well as bug figures for bugs discovered during tests, and added support for edge cases (mostly when generating starting positions) + +commit 4f678563bcb945d18cb299a3f26d7b0b5423cebe +Merge: 679e601f 26f562da +Author: Cathy Wu +Date: Wed Oct 18 10:12:22 2017 +0900 + + Merge pull request #10 from cathywu/python_path + + added pythonpath documentation + +commit 26f562daaddef380b5b21030b8897c883de25dbf +Author: Kanaad Parvate +Date: Tue Oct 17 03:30:39 2017 -0700 + + added pythonpath documentation + +commit 679e601f702a829467c28e2421e84e0752c033c5 +Author: Cathy Wu +Date: Tue Oct 17 17:41:28 2017 +0900 + + Added arXiv link + +commit b81379a097be48b2a3075241483c1deb4aef845f +Author: Cathy Wu +Date: Tue Oct 17 17:40:24 2017 +0900 + + Revert to 56e05fced + +commit 8d17c92dcf66eefdadd1501ced3ee5f901cc5345 +Author: Cathy Wu +Date: Tue Oct 17 17:05:37 2017 +0900 + + Added arXiv link to README (#8) + + * Add arXiv link + + * minor text change + +commit 1239836fd5b295d04b35a676854812633e982d6c +Author: aboudy +Date: Mon Oct 16 13:23:26 2017 -0700 + + modification to the merge environment + +commit 4d389a997609f2be5937200be2259042cb59be78 +Author: eugenevinitsky +Date: Mon Oct 16 03:28:42 2017 -0700 + + Revert "Minor corrections and updates to the README" (#7) + +commit a54845f4dcbb6200dff42849c62962c20ea673da +Merge: cf9eae29 edf55364 +Author: eugenevinitsky +Date: Mon Oct 16 03:27:24 2017 -0700 + + Merge pull request #6 from cathywu/typo + + Minor corrections and updates to the README + +commit edf553644b883115396a94375e29635f005dee93 +Author: Cathy Wu +Date: Mon Oct 16 11:31:12 2017 +0900 + + quick links for docs + +commit f72a5d4027991f3ccaef89b52e43dd40a47d9b3d +Author: Cathy Wu +Date: Mon Oct 16 10:53:55 2017 +0900 + + Tweak README + +commit 958f0fe817a9f0143be6ff9a2e7029c79ab7f4b8 +Author: Cathy Wu +Date: Mon Oct 16 10:49:35 2017 +0900 + + fixed typo; updated README to include citation and links + +commit 8c4cde6cf684c029cf7efe0f70b7276139f1a36a +Author: aboudy +Date: Fri Oct 13 10:13:29 2017 -0700 + + termination bug + +commit cf9eae290936c93a0b070db8afec1cf7cf04e21d (tag: 0.1.0) +Author: Kanaad Parvate +Date: Fri Oct 13 05:22:21 2017 -0700 + + using environemnt.yml instead of requirements.txt + +commit 5f95fba0979fd46aab14a9a58bbe61ae516a9d43 +Author: Kanaad Parvate +Date: Fri Oct 13 05:19:38 2017 -0700 + + fixed patch and added version number + fixed minor bug in osx setup + +commit 9b05d213cd5007044ef08ffbea15e9d858e11f29 +Author: Kanaad Parvate +Date: Thu Oct 12 21:59:17 2017 -0700 + + added sumo patch + +commit 2d119feb55cb8e5ad63416f5174e9f82165e65ba +Author: Kanaad Parvate +Date: Thu Oct 12 21:57:48 2017 -0700 + + made osx script executable + +commit a8c81b1db61af2028a663d5e4eb2165c191f39f7 +Author: nskh +Date: Thu Oct 12 21:53:20 2017 -0700 + + Updated documentation for Flow source code (#5) + + * Updated Flow code documentation using raw HTML Sphinx autodoc output + + * Bypassed modules page since it was superfluous + +commit 28b657fc3e287873473a43da01b4db4b64d1ad03 +Author: Kanaad Parvate +Date: Thu Oct 12 21:51:47 2017 -0700 + + fixed all examples (#4) + +commit 3180a425e79de081a7aa9edc370c7634b702c481 +Author: Nishant +Date: Thu Oct 12 19:19:55 2017 -0700 + + updated conf.py for readthedocs to enable sphinx autodoc + +commit b270a67c52601686f6ea0671ae67cc9472cef061 +Author: Nishant +Date: Thu Oct 12 19:02:00 2017 -0700 + + updated conf.py + +commit b9989c0aadcab28ff94b396fd0310e164cb479d4 +Author: nskh +Date: Thu Oct 12 18:44:21 2017 -0700 + + Updating tutorial (#3) + + Updating Tutorial and Documentation + +commit ba54a88068c07af00b4cb26362788ee51af319be +Author: aboudy +Date: Thu Oct 12 16:38:25 2017 -0700 + + changes made to support environments with collisions and discrete lane change actions + +commit 8d8b8c0be8af20bef073f731ed7f848ad1d41169 +Author: Cathy Wu +Date: Thu Oct 12 10:54:29 2017 -0700 + + Create CODEOWNERS + +commit 985a2d8662ba874e0efaf4bb3f51872cd7e9f8a7 +Author: Cathy Wu +Date: Thu Oct 12 10:53:22 2017 -0700 + + Create CODEOWNERS + +commit e492275256e33a1da7f716c47208f8cf144b70cd +Merge: 5834d57e bc2af670 +Author: Nishant +Date: Wed Oct 11 16:58:43 2017 -0700 + + merged a very small change from master (in Docker_Tutorial.md) + +commit 5834d57e31766fd8ea2a34e21bc1dd2ecfbcc4b5 +Author: Nishant +Date: Wed Oct 11 16:55:28 2017 -0700 + + a lottt of documentation + +commit 8c2fe747b03de602c2575ccd7d7ca01b9c6ff988 +Author: Kanaad Parvate +Date: Tue Oct 10 23:14:32 2017 -0700 + + added MIT license + +commit 43d649018a0429e43d59d621e5059847a3e5fe5e +Author: Nishant +Date: Tue Oct 10 21:31:51 2017 -0700 + + modified gitignore to ignore data and debug directories + +commit 1c9203ca728e78dff31700cf3ff40f1206547eab +Author: Kanaad Parvate +Date: Wed Oct 4 23:30:50 2017 -0700 + + Flow initial release (#1) + + Initial Release of Flow. This version of flow contains: + * Rich interface for design and analysis of traffic control problems, complete with: + * Simulation of mixed autonomy traffic + * Advanced, easily generated road network configurations + * Configurable vehicle types and vehicle dynamics + * Learn policies to optimize reward functions + +commit e38d22cc4afa57a34347c9c80009cf0f271b1561 +Merge: 8c278c77 21871f90 +Author: Kanaad Parvate +Date: Wed Oct 4 20:00:41 2017 -0700 + + Merge branch 'cistar_release' of https://github.com/cathywu/learning-traffic into flow_release + +commit 8c278c77db2bb84bdb2f74976faee42b340fa983 +Author: Kanaad Parvate +Date: Wed Oct 4 19:59:30 2017 -0700 + + removed all traces of cistar, replaced with flow + +commit 566a0dec7c19d29e2f498d05573d7772113d2139 +Author: Kanaad Parvate +Date: Wed Oct 4 16:35:58 2017 -0700 + + rename cistar to flow + +commit 21871f905a8b22c62559988b7c0599510126f881 +Author: albeaik <31267700+albeaik@users.noreply.github.com> +Date: Wed Oct 4 13:34:48 2017 -0700 + + update base_env function for div by zero bug (#150) + +commit 493d71c6b7c0e595c28556797ebc991746503aa9 +Author: eugenevinitsky +Date: Tue Oct 3 00:01:23 2017 -0700 + + Update Docker_Tutorial.md + +commit b62c6ac7b623db06aa88c21e3dffd11ba808a025 +Author: eugenevinitsky +Date: Tue Oct 3 00:00:43 2017 -0700 + + Update Docker_Tutorial.md + +commit bc2af6704d812b4e47b2629252490e6e1c11032c +Author: eugenevinitsky +Date: Tue Oct 3 00:00:15 2017 -0700 + + Update Docker_Tutorial.md + +commit 0870e8a1784d21014fc4cb7f2315574289bbfe64 +Merge: c0e0abab a47fb341 +Author: Cathy Wu +Date: Sat Sep 30 23:51:44 2017 -0700 + + Merge branch 'cistar_release' of github.com:cathywu/learning-traffic into cistar_release + +commit c0e0ababc617bc2dca33a41d0e96310820b343d8 +Author: Cathy Wu +Date: Sat Sep 30 23:51:41 2017 -0700 + + easier setup scripts + +commit a47fb3417eb65034a3b0e6e79704cf695e3ba989 +Author: aboudy +Date: Sat Sep 30 00:10:47 2017 -0700 + + modified inputs to gen functions + +commit bda1395be78f8e61a67c9d98f11dac56e7a2e9e5 +Merge: cfc8dc94 c413b796 +Author: aboudy +Date: Fri Sep 29 16:03:33 2017 -0700 + + modified documentation and added option of noise to acceleration controllers + +commit c413b796aaf619351d0fea66970d24b3b6856d5f +Author: Nishant +Date: Wed Sep 27 19:11:14 2017 -0700 + + fixed get_state bug + +commit fcfafff3eb05887529fd4b85a21b3d1c913c3062 +Author: Eugene Vinitsky +Date: Mon Sep 25 17:58:38 2017 -0700 + + fixed visualizer to output plots correctly and work with new cistar version. Updated intersection environment to find distance to sort by intersection distance, normalize the states, and correctly only allow accelerations to speed cars up to enter speed + +commit 9f69c29f1aa32c10a1e7ffc644cf1d73349c1b94 +Author: Eugene Vinitsky +Date: Mon Sep 25 12:21:19 2017 -0700 + + added working rl intersection example to cistar_release + +commit cfc8dc942f171a2273cd4f62808992c8faced0ac +Merge: d325bb72 342c986c +Author: aboudy +Date: Mon Sep 25 11:44:31 2017 -0700 + + updated documentation + +commit f0da85737befee04bf1a72ca848d146e20b99184 +Author: Eugene Vinitsky +Date: Fri Sep 22 17:37:15 2017 -0700 + + Revert "system now accelerates vehicles with max accel when they pass the intersection" + + This reverts commit 1227cae4e5012105ca866ffd2fba40472dd0bcbc. + +commit 1227cae4e5012105ca866ffd2fba40472dd0bcbc +Author: Eugene Vinitsky +Date: Fri Sep 22 17:15:45 2017 -0700 + + system now accelerates vehicles with max accel when they pass the intersection + +commit 083a4b8259c656997e6641f2eedd1640c7ebff75 +Merge: 3a5c97f2 342c986c +Author: Eugene Vinitsky +Date: Fri Sep 22 13:01:10 2017 -0700 + + Merge branch 'cistar_release' of https://github.com/cathywu/learning-traffic into cistar_release + +commit 3a5c97f223296e84ae63a3d75a0877267aed280d +Author: Eugene Vinitsky +Date: Fri Sep 22 13:00:54 2017 -0700 + + Revert "removed missing environments" + + This reverts commit 3fa212034c471131272485ed98891bed39b45e92. + +commit 3fa212034c471131272485ed98891bed39b45e92 +Author: Eugene Vinitsky +Date: Fri Sep 22 12:59:28 2017 -0700 + + removed missing environments + +commit 342c986cbb07049adc9555998bc5af8b7959b097 +Author: Eugene Vinitsky +Date: Fri Sep 22 12:32:12 2017 -0700 + + removed missing environments from envs/__init__ + +commit 0e2ab192fed07d84e9ac511b075ac5919791160d +Merge: 3159ce4c a33ce283 +Author: Eugene Vinitsky +Date: Thu Sep 21 10:52:17 2017 -0700 + + Merge branch 'cistar_release' of https://github.com/cathywu/learning-traffic into cistar_release + +commit 3159ce4c31d1098abccf3d184f8460e8ccb0742c +Author: Eugene Vinitsky +Date: Thu Sep 21 10:51:44 2017 -0700 + + removed ngsim folder, added changes to intersection dist that views passing intersection as negative dist to intersection and changed abs distances in intersections to remove factor of 1000 + +commit a33ce283f3e5d5e9cc2077cac31114b21a8131fb +Author: Kanaad Parvate +Date: Thu Sep 21 10:43:09 2017 -0700 + + removed init.py from base dir + +commit 57e7091a0ca601938c4c021db74d411b9c688cb5 +Author: Kanaad Parvate +Date: Thu Sep 21 10:40:54 2017 -0700 + + removing old rl experiements + +commit e0d15b35f339c6dc2fc3fad62093f447d00881ff +Author: Kanaad Parvate +Date: Thu Sep 21 04:59:21 2017 -0700 + + removed cistar_dev folder, and moved everything the top level + +commit ea55a57a498dd4a82862f71ba3f12902464be67e +Author: Kanaad Parvate +Date: Thu Sep 21 04:58:24 2017 -0700 + + moved all files to cistar_dev and combined README.md's + +commit 6cbf760f63479d326f1bf9547c9ce9facfd599b7 +Author: Kanaad Parvate +Date: Thu Sep 21 04:54:08 2017 -0700 + + removed sumo binary + +commit d325bb723d83657e407d53933c5fc35b794e2cbd +Author: aboudy +Date: Wed Sep 20 21:05:33 2017 -0700 + + modified documentation + +commit 0e310b537271705df943af39cc47b09335d6e1de +Author: nskh +Date: Tue Sep 19 23:05:44 2017 -0700 + + Update AWS_tutorial.md + +commit 3587fdc23653d89144e9c9cd6557b16fb4b04362 +Author: Cathy Wu +Date: Tue Sep 19 21:51:24 2017 -0700 + + Fix unit tests, shorten tests, update requirements, remove a bunch of extra files + +commit a75e337aa6e3473f1de626d0654408865f00cf43 +Author: aboudy +Date: Tue Sep 19 11:15:24 2017 -0700 + + updated documentation + +commit 378b94d75b49238e2f95814ca8d8935b978228a4 +Author: aboudy +Date: Mon Sep 18 13:32:52 2017 -0700 + + modified documentation + +commit c539e9b45dbc8348c847617b1a42dd093f3a4dda +Author: Kanaad Parvate +Date: Thu Sep 14 12:03:09 2017 -0700 + + deleted deviations from params + +commit c50cc0154aba356bc2b2b43ac43c1be4003d4abc +Author: Kanaad Parvate +Date: Thu Sep 14 11:59:40 2017 -0700 + + more deletes + code cleanup + +commit 5f4cd8d5020f26e53118fef55d453ff7823ac636 +Author: Cathy Wu +Date: Thu Sep 14 11:06:09 2017 -0700 + + changed naming of unit tests (to support nose2 discovery) and made them smaller + +commit 30366ebbd4c759d272b3e2210498b095e060dd59 +Author: Kanaad Parvate +Date: Thu Sep 14 10:19:01 2017 -0700 + + added tests, cleaned code, removed print statements + +commit d18598bb69374439b627793e53de2a04202a1295 +Merge: ae581127 49c1b1c2 +Author: Kanaad Parvate +Date: Wed Sep 13 19:33:12 2017 -0700 + + Merge branch 'cistar_release' of https://github.com/cathywu/learning-traffic into cistar_release + +commit ae581127c243d1d73b98bf70154f811a966ccee8 +Author: Kanaad Parvate +Date: Wed Sep 13 19:32:56 2017 -0700 + + removing xml files + minor changes + +commit 49c1b1c25f25063840d1d4f6771ad80896cb1354 +Author: Cathy Wu +Date: Wed Sep 13 16:09:08 2017 -0700 + + instructions for config + +commit 2c9a41dfb48ea8c3a011b93ef7739935088543c2 +Author: Cathy Wu +Date: Wed Sep 13 16:08:19 2017 -0700 + + make config file into a template, since everyone will have their own + +commit ccedd522af616bea21b523a38631c128e559f5b1 +Author: nskh +Date: Thu Sep 7 11:31:01 2017 -0700 + + adding docs to cistar_release (#140) + + * initial docs branch commit + + * changed some stuff before pull request + +commit 10ba4ce8dec5a072e25de5954c104fe71ceaaf52 +Merge: cf0db8df 28c3d494 +Author: Kanaad Parvate +Date: Thu Sep 7 11:29:47 2017 -0700 + + Merge branch 'aboudy_cistar_release_2' into cistar_release + +commit 28c3d4947f3efd495f1fc84641b1ed0e1059ed8c +Author: Kanaad Parvate +Date: Thu Sep 7 11:27:00 2017 -0700 + + fixing missed merge issue + +commit 159733d1a036dea159bfd771e6e61c87b02187c2 +Merge: 70484dbf cf0db8df +Author: Kanaad Parvate +Date: Thu Sep 7 11:16:56 2017 -0700 + + merge net params and cistar dev + +commit cf0db8df8bc178f0b35766b7f3c7fca9772a23f7 +Author: Kanaad Parvate +Date: Thu Sep 7 10:47:54 2017 -0700 + + code clean up and correct set up of example experiments + +commit 70484dbf421f91dd61ea183c76278631db11dc87 +Merge: 0ab10d4e e2f1fcb1 +Author: aboudy +Date: Thu Aug 31 23:17:55 2017 -0700 + + Merge branch 'cistar_release' of https://github.com/cathywu/learning-traffic into cistar_release_aboudy + +commit aa08885560dee411a0964a6d7475bb52d6aa9aa0 +Author: Kanaad Parvate +Date: Thu Aug 31 11:09:29 2017 -0700 + + removed braess + +commit 0ab10d4eaa27bc7c2b342c69b253e99adb5b3c55 +Author: aboudy +Date: Thu Aug 31 11:06:25 2017 -0700 + + added NetParams and InitialConfig classes, merged sumo_binary into sumo_params and cfg_params is net_params + +commit e2f1fcb1b53c00a68091689244a63c03f83700a6 +Author: Kanaad Parvate +Date: Thu Aug 31 11:06:19 2017 -0700 + + added mulitagent rewards + +commit 1c07111e20016b2dce1b0ab61a75244990710a2e +Author: Kanaad Parvate +Date: Thu Aug 31 10:48:55 2017 -0700 + + removed old cistar code + +commit 463d2022bce0de121d4345084118e022803873f7 +Author: Kanaad Parvate +Date: Wed Aug 30 15:37:27 2017 -0700 + + made comments obey pydoc + +commit 4378faba25aa60ac883b29a365380958a60c15c4 +Author: Kanaad Parvate +Date: Thu Aug 31 10:40:54 2017 -0700 + + merge + +commit 011b080fca8edb3edf45c398c6dfa0f6d48a9b50 +Author: Kanaad Parvate +Date: Thu Aug 31 10:39:04 2017 -0700 + + merge + +commit b4c762781f1709297d37acbd02c1a7bcf95d21de +Author: aboudy +Date: Thu Aug 31 01:44:39 2017 -0700 + + added InitialConfig class + +commit 9080116c665801b49ea548458234a6fa8c6f1f2d +Author: aboudy +Date: Wed Aug 30 21:49:37 2017 -0700 + + fixing the merge + +commit 7f04d3ae1863bade0dcb1c081c15cd9de1dd24c1 +Author: aboudy +Date: Wed Aug 30 21:27:23 2017 -0700 + + added vehicles and routing classes + +commit 33cce53c6bb138885393cb7126b1e965e89a6a5a +Merge: cdf4dd75 a3593404 +Author: Eugene Vinitsky +Date: Tue Aug 29 15:22:42 2017 -0700 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic + +commit cdf4dd759ba1b87ec92f3174673405621b00534e +Author: Eugene Vinitsky +Date: Tue Aug 29 15:21:48 2017 -0700 + + branch is working + +commit a3593404bb775304853ff659622352a2cd391786 +Merge: bb644190 ff0b13d1 +Author: eugenevinitsky +Date: Tue Aug 29 10:24:02 2017 -0700 + + Merge pull request #135 from cathywu/multi_agent_vist + + minor fixes in emergent behavior experiments to make them compatible … + +commit ff0b13d143d7f056d579d5f733a135ba76242e94 +Author: Eugene Vinitsky +Date: Mon Aug 28 14:14:44 2017 -0700 + + minor fixes in emergent behavior experiments to make them compatible with hackathon changes + +commit bb644190b4d887125a03aa9a2c52ab6722eaec76 +Merge: 7d5d5637 4079ea5b +Author: AboudyKreidieh +Date: Sun Aug 27 17:21:47 2017 -0700 + + Merge pull request #132 from cathywu/braessParadox + + changed the inputs to a few functions + +commit 4079ea5b9840a8bb89d68364c8c6e63cb0a99fa8 +Author: aboudy +Date: Sun Aug 27 14:39:28 2017 -0700 + + changed the inputs to a few functions + +commit 7d5d5637f0a59e2733447f92aa7683444988c530 +Author: Eugene Vinitsky +Date: Thu Aug 24 17:39:40 2017 -0700 + + cleaned up emergent behaviors folder + +commit d723348d6e186c96f483875eb9623b645df9c04c +Merge: 07e548b2 679f28f2 +Author: eugenevinitsky +Date: Thu Aug 24 17:36:21 2017 -0700 + + Merge pull request #131 from cathywu/braessParadox + + Braess paradox + +commit 679f28f293ae4a7440c305f4c15f983be98cb2fa +Author: aboudy +Date: Thu Aug 24 11:37:29 2017 -0700 + + code cleanup + +commit cddb116112e76cfca652549db57348546f268788 +Author: aboudy +Date: Tue Aug 22 17:36:44 2017 -0700 + + made generator class more abstract, and modified subclasses + +commit 58937b650681e315064114f22e9586019851b521 +Author: aboudy +Date: Sat Aug 19 19:45:15 2017 -0700 + + replaced type_params with lists instead of dicts + +commit e8f621defff3284ee6f38c6f2e302fd5e6121160 +Author: aboudy +Date: Thu Aug 17 10:31:08 2017 -0700 + + restrcuturing of scenario class in order to make more abstract + +commit f66f9cae2714a9c11fb30fce1608f7e013a03287 +Author: aboudy +Date: Thu Aug 17 10:28:08 2017 -0700 + + some code cleanup and continued fixing merge + +commit 5ed0861e015b1a1caf41311ea25709da2456d8f4 +Author: aboudy +Date: Thu Aug 17 10:10:33 2017 -0700 + + some cleanup to examples + +commit 363373d37fa70bf53f5f9d84f04ff6e18a17f2ac +Merge: c25c5296 07e548b2 +Author: aboudy +Date: Mon Aug 14 19:18:00 2017 -0700 + + merged changes + +commit c25c5296e2f404f2b812dc177cbe221c7804096f +Author: aboudy +Date: Fri Aug 11 15:30:13 2017 -0700 + + bug fixes and documentation + +commit b82e5c726a7dbbc373afeaedb83dbae3020d3996 +Author: aboudy +Date: Fri Aug 11 15:26:39 2017 -0700 + + added subclass for partial observability + +commit 5f6bfb974e70d43bd4a7083512ca4f7e6134f774 +Author: aboudy +Date: Fri Aug 11 15:23:27 2017 -0700 + + added subscribe for headways into get_headway_dict() + +commit 07e548b2afa0933e3e0b725e2c322a19faaeb3eb +Merge: dac56ce1 00536cb4 +Author: Eugene Vinitsky +Date: Sun Aug 6 16:18:20 2017 -0700 + + merged with multi-agent updates + +commit 00536cb4777442076c1fb6c3026f50d72b9c0247 +Author: Eugene Vinitsky +Date: Sun Aug 6 15:58:21 2017 -0700 + + minor fixes to how experiments are run + +commit 8bd167cdea750fef847772fbf192eefa20f95a50 +Merge: a8f8cced dac56ce1 +Author: AboudyKreidieh +Date: Thu Aug 3 15:24:36 2017 -0700 + + Merge branch 'braessParadox' of https://github.com/cathywu/learning-traffic into braessParadox + +commit a8f8cceddd4115eabb285ab7f4e973edbf34d9ac +Author: AboudyKreidieh +Date: Thu Aug 3 15:24:28 2017 -0700 + + misc changes + +commit 5533d5ec472db420a1acfcb8125474648a2ba684 +Author: AboudyKreidieh +Date: Thu Aug 3 15:21:28 2017 -0700 + + misc changes + +commit 04ffdaeb26a446ce09407a6f8ababf011e5bb682 +Author: AboudyKreidieh +Date: Thu Aug 3 15:19:15 2017 -0700 + + locked down a method of acquiring robust policies + +commit 18c09435a74f4f77cf6677e354450b8d4f6ce06f +Author: AboudyKreidieh +Date: Thu Aug 3 15:18:05 2017 -0700 + + updated getState and sort_by_id + +commit 5ea78e55e811a22a2bc3bc3724aa6884b4ad6bb8 +Author: AboudyKreidieh +Date: Thu Aug 3 15:16:43 2017 -0700 + + added functionality to perform dynamic route changes (used in braess and loop-merges) + +commit 8601b2ba7384362b66a29df04f27fe212eb8c1aa +Author: AboudyKreidieh +Date: Thu Aug 3 13:24:19 2017 -0700 + + the function sort_by_position() added an extra output that can be used to speed getState function calls + +commit 6675ef7ddc08ab25eb6545943c7f4cc0234b62ee +Author: AboudyKreidieh +Date: Thu Aug 3 13:19:36 2017 -0700 + + modified braess paradox env and scenario to accept car following models and separate speed limits on the two portions of the network + +commit 8deb6baa48480fce402de4cf8704fd7df6390e66 +Author: Eugene Vinitsky +Date: Tue Aug 1 15:36:18 2017 -0700 + + updated multi-agent environments to have the correct observation space. Additionally made changes in base-env allowing for mixed, multiagent traffic + +commit eb542686f5e8cd82ef0a12925fd9265074970516 +Author: AboudyKreidieh +Date: Tue Aug 1 13:53:21 2017 -0700 + + fixed bug in IDMController and DrunkDriver when there are no leading cars + +commit 6460a9187f06792be2fc94568fe1323a2e3f9dbd +Author: AboudyKreidieh +Date: Tue Aug 1 13:42:25 2017 -0700 + + fixed bug in IDMController and DrunkDriver when there are no leading cars + +commit a082ea00744e1a4bd64db21f54f8488c12139977 +Author: Eugene Vinitsky +Date: Mon Jul 31 17:16:30 2017 -0700 + + fixed the visualizer to use gymenv + +commit c497896575dcc835580408ea130f9b66803e7e36 +Author: Eugene Vinitsky +Date: Mon Jul 31 11:35:46 2017 -0700 + + created lane changing only scenario + +commit 5caa4d8711b36b27e5930b262f00187265301868 +Author: AboudyKreidieh +Date: Fri Jul 28 12:01:11 2017 -0700 + + added option of running braess and loop_merge scenarios on visualizer_CISTAR + +commit 139b0daabb5011ff39ddd7a30759b424badb0662 +Merge: 03a509b2 da7e732f +Author: Eugene Vinitsky +Date: Fri Jul 28 11:50:31 2017 -0700 + + fixed up merge conflict in dockerfile svn + +commit d4f722a449186983ed02cec4f76c9afac5881455 +Author: AboudyKreidieh +Date: Fri Jul 28 11:21:38 2017 -0700 + + misc fixes + +commit 93bbb598d78a4413438f4b6248f4953bf798c07b +Author: AboudyKreidieh +Date: Thu Jul 27 22:52:47 2017 -0700 + + several different states to allow for partial observability and implicit labeling (latter did not work) + +commit 50de241d0097c43be9932c1878fdf9e4941067d7 +Author: AboudyKreidieh +Date: Thu Jul 27 22:49:11 2017 -0700 + + changes to allow even distribution of vehicles across lanes in figure 8 scenario + +commit e75436063abb9e78fa266b34d0ad6f6ea6aeba8c +Author: AboudyKreidieh +Date: Thu Jul 27 22:38:18 2017 -0700 + + additional options for getState and sorted_by_position which may speed up convergence + +commit 349297d55712cdc952cc9d1dfc8444ed65cf0d4f +Author: AboudyKreidieh +Date: Thu Jul 27 22:36:25 2017 -0700 + + added method for traci subscribing headways (already on another branch) + +commit e6d35789d4c62d2de9231af1c3c37469d54f2212 +Author: AboudyKreidieh +Date: Thu Jul 27 22:34:44 2017 -0700 + + misc fixes + +commit 225b8d59a8f252fd9199b5ab4e91b4d663263857 +Author: AboudyKreidieh +Date: Thu Jul 27 20:10:25 2017 -0700 + + added option of having only merge ins (no merge out) + +commit 03a509b2368e701c01ea8019fb1897062ad212a9 +Author: Eugene Vinitsky +Date: Thu Jul 27 18:07:01 2017 -0700 + + everything working in multiagent parallel form except for possibly multi-agent lane changing and the files in test-fast + +commit 64a15e3ed105eb31946bdbf62ac26586a9199345 +Author: AboudyKreidieh +Date: Thu Jul 27 16:39:55 2017 -0700 + + network for loops with merges + +commit 385933ad6227824a8ba000f292072d1b6a8d7fa1 +Author: AboudyKreidieh +Date: Thu Jul 27 16:39:04 2017 -0700 + + created network and environment for loops with merges + +commit 3b2653e26d0e606e3277dc51bab0deda8f0cd66c +Author: AboudyKreidieh +Date: Wed Jul 26 20:35:27 2017 -0700 + + minor changes to lane-change only environment + +commit 0d1ce4957095aa3f6d79806f2fc30cde8d5e3a4e +Author: Eugene Vinitsky +Date: Wed Jul 26 19:09:32 2017 -0700 + + all emergent behaviors are currently working as gym environments. Parallel does NOT work yet, some of the tests are still broken + +commit 7057ff3b112bc404c45670f42ef64fd65f292f36 +Author: AboudyKreidieh +Date: Wed Jul 26 15:51:59 2017 -0700 + + created scenario and environment for braess paradox, and setup a network that shows the parado in action + +commit b965d5f8cb0218e367b287b49ffa67792eeb0b1e +Author: AboudyKreidieh +Date: Wed Jul 26 15:22:51 2017 -0700 + + created environment and experiment for lane-change only control + +commit 98c8bc5c219ec6c1c4a5517f72e4c4fa59f297a0 +Author: AboudyKreidieh +Date: Fri Jul 21 12:18:46 2017 -0700 + + file to contain several observation functions + +commit f5553ee255f02951548e0fd2d4b2c756fb66342d +Author: AboudyKreidieh +Date: Fri Jul 21 01:21:33 2017 -0700 + + created braess paradox generator, scenario, and environment, as well as an example showing the paradox in action in the absence of rl vehicles + +commit dac56ce161ed8c122c66b6599bfa59c6ef285940 +Author: Cathy Wu +Date: Thu Jul 20 20:14:57 2017 -0700 + + Refactored multilane ring exp so that params.pkl are saved per iteration + +commit 232f1b3f58c0dc1d778dc3f82f2fe1ee6af97c6e +Author: Cathy Wu +Date: Thu Jul 20 18:07:38 2017 -0700 + + Stabilizing multilane ring (tensorflow version of moving bottleneck) + +commit 4f2e824895fba1d3600098ef2a066279f3ee91a5 +Author: AboudyKreidieh +Date: Thu Jul 20 17:05:14 2017 -0700 + + added everything moving-bottleneck related, including changes to lane_changing and the scenario + +commit bd6f8a1e4a6cb43049150052d1d857d6ea7d36ea +Author: Eugene Vinitsky +Date: Wed Jul 19 14:33:48 2017 -0700 + + added missing __init__ file + +commit 173765cac93962e352b186c063b15526ed3fea83 +Author: Eugene Vinitsky +Date: Wed Jul 19 14:27:18 2017 -0700 + + added appropriate cistar_dev files back in + +commit 794d506e07817cbb625bb4793fc7d6149825974f +Author: Eugene Vinitsky +Date: Wed Jul 19 14:15:21 2017 -0700 + + changed all intersection classes to use Gym classes as superclass + +commit 0206b2396e72ef1937e29715c2ce444909906565 +Author: Eugene Vinitsky +Date: Tue Jul 18 16:05:40 2017 -0700 + + registered things as gym environments + +commit da7e732f5280eb91d0fb848d90f88c5addcfd1a5 +Merge: 8b3398e2 7b14da92 +Author: Kanaad Parvate +Date: Mon Jul 17 15:29:12 2017 -0700 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic into laneChangeChChChChanges + +commit 8b3398e2f0273a4d0f69619d0f0de43603beb4b7 +Author: Kanaad Parvate +Date: Mon Jul 17 15:28:22 2017 -0700 + + updated docker-svn file to properly pull nightly build + +commit 434a7d6dccae2b5d9cf1242d950c195aa176554f +Author: AboudyKreidieh +Date: Mon Jul 17 14:17:39 2017 -0700 + + changes made to allow for vehicles to be placed in multiple lanes for the loop scenario + +commit 7b14da9229a63a0619c61d296bdcde61de58bf8c +Author: eugenevinitsky +Date: Mon Jul 17 10:25:24 2017 -0700 + + Update Docker_Tutorial.md + +commit 52be68b9d98661addaaae4909bc77e9f06bae2ef +Author: eugenevinitsky +Date: Mon Jul 17 10:22:05 2017 -0700 + + Update Docker_Tutorial.md + +commit 2aa5be5e4f6fd233f02132789e42f0c499b53a89 +Author: eugenevinitsky +Date: Fri Jul 14 17:42:20 2017 -0700 + + Create commit-practices.md + +commit 3744b51740348fd7b9b227a01b974eceaa2db6ec +Author: Eugene Vinitsky +Date: Fri Jul 14 14:10:28 2017 -0700 + + working two intersection experiment without shuffling of initial positions and noise + +commit ea56bf9d2a212391e09674b1114245911e22c921 +Merge: 35162db1 7d300af8 +Author: Cathy Wu +Date: Thu Jul 13 17:14:14 2017 -0700 + + merge + +commit 35162db162ea766f97e5662aa8d59612f1e0cc08 +Author: Cathy Wu +Date: Thu Jul 13 17:13:31 2017 -0700 + + gitignore .idea files + +commit 7d300af8eeb21301bc27a19da34233568b673c3d +Author: Cathy Wu +Date: Thu Jul 13 17:12:48 2017 -0700 + + Delete workspace.xml + +commit 778f4d80e622948c642e6b1bc90259303a3c1c48 +Author: Cathy Wu +Date: Thu Jul 13 17:12:36 2017 -0700 + + Delete vcs.xml + +commit d6c9826cd1974bbba35b507f8437af40dba48092 +Author: Cathy Wu +Date: Thu Jul 13 17:12:30 2017 -0700 + + Delete modules.xml + +commit 24cfcd78b51b6a25ddadf26a6fd57883bfce4df1 +Author: Cathy Wu +Date: Thu Jul 13 17:12:23 2017 -0700 + + Delete learning-traffic.iml + +commit 2e26fca243700592e6751a5ea40fb1fd368a33d8 +Author: Cathy Wu +Date: Thu Jul 13 17:12:16 2017 -0700 + + Delete misc.xml + +commit 40af3d7a34356eb1c6c8edcd5e6bb652314b1278 +Author: Eugene Vinitsky +Date: Wed Jul 12 15:12:13 2017 -0700 + + two way intersection is working. The max path length needs to be adjusted and a max speed be set such that the cars never exit the intersection in a single run + +commit b5f83bb614a9aca8656009707d086f862c01a7b6 +Author: AboudyKreidieh +Date: Tue Jul 11 16:59:02 2017 -0700 + + vehicles in the intersection scenario can now change positions and shuffle in between rollouts + +commit 42d847201e1a871a411219d2c483ccba98bb899f +Merge: a2928c87 088bb582 +Author: Eugene Vinitsky +Date: Tue Jul 11 15:43:09 2017 -0700 + + Merge branch 'intersectionControl' of https://github.com/cathywu/learning-traffic into intersectionControl + +commit a2928c87cbf491776bea434b5625201c2f4e176e +Author: Eugene Vinitsky +Date: Tue Jul 11 15:42:05 2017 -0700 + + changed start positions of two lane intersection + +commit 088bb582ebd8c7b7e4ce217b9a35e154919dbba5 +Author: AboudyKreidieh +Date: Tue Jul 11 15:36:48 2017 -0700 + + remove vehicle ids dynamically whenever a car exits to prevent the system from crashing + +commit e01964b95b8cf8e72438677b2042006a0f90dfff +Author: Eugene Vinitsky +Date: Tue Jul 11 15:11:59 2017 -0700 + + fixed bug where I had labelled start edge as right instead of bottom + +commit 7b2ff2d8345738ca4a9857863f375049a335ee02 +Author: Eugene Vinitsky +Date: Tue Jul 11 14:52:46 2017 -0700 + + fixed getting headway to use traci calls + +commit 762812ce370f7a145f8c9a137b2d12baab3d991c +Author: Eugene Vinitsky +Date: Tue Jul 11 11:26:07 2017 -0700 + + added start position generator that pushes all cars to the far left and bottom of the intersection + +commit c47e8164099e8119a3629307936c4c14e6b578f2 +Merge: a4ab96b4 05545200 +Author: eugenevinitsky +Date: Mon Jul 10 17:21:39 2017 -0700 + + Merge pull request #125 from cathywu/cleanup + + Cleanup + cleaned up example branches + cleaned up environments + shuffling between rollouts implemented + cross-intersection partially implemented + speedups via subscriptions + get_headway and get_x_by_id are sped up + +commit 0554520092e9c8692f9eadea28678f41fd6fbf58 +Merge: 4c3a5b58 a4ab96b4 +Author: eugenevinitsky +Date: Mon Jul 10 17:21:20 2017 -0700 + + Merge branch 'master' into cleanup + +commit 4c3a5b58af754619e107f9b45e7e7d81753b584b +Author: Eugene Vinitsky +Date: Mon Jul 10 17:18:44 2017 -0700 + + merged in master + +commit 1d8fae7ec59bc6375d69e8acd5fd6662af93974b +Author: Eugene Vinitsky +Date: Mon Jul 10 17:14:43 2017 -0700 + + merged in master branch + +commit 3a51289efc2e02028f46608381f31ec197f39c36 +Merge: 8a3eff57 c2878b7b +Author: Eugene Vinitsky +Date: Mon Jul 10 17:08:27 2017 -0700 + + Merge in changes from remote + + Merge branch 'cleanup' of https://github.com/cathywu/learning-traffic into cleanup + +commit 8a3eff578005d13e0ecd3d90fae8e92d77cbd585 +Author: Eugene Vinitsky +Date: Mon Jul 10 17:07:27 2017 -0700 + + added functional rl tests + +commit c2878b7b0bcf46f5c1ad8acf100a9fdc0b7c7ba3 +Author: AboudyKreidieh +Date: Mon Jul 10 16:57:14 2017 -0700 + + started adding partial observability to getState() + +commit c4de341c2bb5295193212d98c69b164d474157a2 +Merge: b9968875 e356547a +Author: AboudyKreidieh +Date: Mon Jul 10 16:48:22 2017 -0700 + + fixed merge conflicts + +commit b9968875e7bf05151900532270210e22daad45c2 +Author: AboudyKreidieh +Date: Mon Jul 10 16:45:18 2017 -0700 + + made changes to shuffling process in between rollouts + +commit c9160d49ecefe099970c5ea86bc7f94936027189 +Author: AboudyKreidieh +Date: Mon Jul 10 16:43:34 2017 -0700 + + recreated rewards file as a series of rewards functions + +commit d0d09e71d5cd8d6a3301224049a342aae677930b +Author: AboudyKreidieh +Date: Mon Jul 10 16:43:04 2017 -0700 + + cleaned up car-following models + +commit e356547ae4317016d33a83ba2b793876e4cf5560 +Author: Eugene Vinitsky +Date: Mon Jul 10 16:41:21 2017 -0700 + + removed unnecessary environments + +commit 32b94d43a666a0aacd814273640d22ec17460a5e +Author: Eugene Vinitsky +Date: Mon Jul 10 16:30:59 2017 -0700 + + cleaned up and commented example folder + +commit a4ab96b46c66de8d362ff8eb8ace7549b914aa53 +Merge: a8197566 6fd5e12c +Author: eugenevinitsky +Date: Mon Jul 10 12:02:04 2017 -0700 + + Merge pull request #121 from cathywu/Makefile + + Makefile template instead of Makefile + +commit 157c6d5b638470cbd0d5d0ed0a690db284b6af64 +Author: AboudyKreidieh +Date: Mon Jul 10 01:03:11 2017 -0700 + + changes to get_x_by_id(), collecting headways, and collecting observations for speed boosts. also added method for random initialization of positions + +commit 6fd5e12c94a1b98429123a54048950dfc86da7da +Author: Cathy Wu +Date: Sat Jul 8 10:19:48 2017 -0700 + + Makefile template instead of Makefile, to support custom paths for the rllab directory. + +commit c8d597f130b9b923d504366150b5609a1cf06b16 +Author: AboudyKreidieh +Date: Fri Jul 7 11:14:45 2017 -0700 + + added intersection scenario (still needs work) + +commit 24a345f13a28465efef67575a59eaaee2dc46271 +Author: AboudyKreidieh +Date: Wed Jul 5 12:38:26 2017 -0700 + + adding methods for performing simulations of intersections (work in progress) + +commit 071b27b1ffc1c38e84f64fafcc126fafa54369a1 +Author: AboudyKreidieh +Date: Wed Jul 5 12:33:51 2017 -0700 + + cleaned up various asepcts of cistar, added option of noise to observations and actions + +commit eb4ebeab4c01fe9cb4ba93235553b2ce17e7a25c +Merge: 92f823ce 9535ee03 +Author: AboudyKreidieh +Date: Thu Jun 29 03:52:02 2017 -0700 + + merged changes and placed each emergent behavior experiment is a separate python file + +commit 92f823ce24cbea9897b9b2e35412b2d4f60cd56b +Author: AboudyKreidieh +Date: Thu Jun 22 21:16:57 2017 -0700 + + changes made for paper, some temporary + +commit 9535ee0357e35b686da20dab20be8b282232f974 +Author: Eugene Vinitsky +Date: Fri Jun 16 16:14:50 2017 -0700 + + fixed rlonly to use both in lane and adj lane headway + +commit b85c67b7465be793a0646da90378fcdf7f9d063f +Author: Eugene Vinitsky +Date: Fri Jun 16 15:42:04 2017 -0700 + + switched mixed_human to use a state space that depends on headway and not absolute position + +commit 4fa8e8f43684a8ccd5d463585f7ffb5769c7c8be +Author: Eugene Vinitsky +Date: Fri Jun 16 01:05:57 2017 -0700 + + fixed simple accel to account for the fact that applying a reward of -20 can be crippling for code run without a failsafe + +commit 0fb5036b2bc417c379a0fb2ab69e5fafecd47898 +Author: Eugene Vinitsky +Date: Fri Jun 16 00:17:39 2017 -0700 + + fixed bug wherein time of lane change was updated whether the fail safe had let it happen or not. Now lane change time is only updated if the lane change has actually occurred + +commit 18069f57b931c154da77da3a3b26c7c7d100ce4b +Author: Eugene Vinitsky +Date: Thu Jun 15 19:22:43 2017 -0700 + + resolved the bug that was causing excessive lane changes + +commit f21b5c78974b522830866ed2fc3e6a4fea779b6b +Author: Eugene Vinitsky +Date: Thu Jun 15 18:52:23 2017 -0700 + + added drunk drivers + +commit d7906b4418f71266e6b8eb7c6f6489aad7a7c260 +Merge: 9b0f8da8 2a141ba6 +Author: AboudyKreidieh +Date: Thu Jun 15 12:19:33 2017 -0700 + + changes to instantaneous failsafe and observation space method for multi-lane + +commit 80dad993646d040f10f03bfa4b971cd16502fca3 +Author: Eugene Vinitsky +Date: Wed Jun 14 17:29:21 2017 -0700 + + added drunk driver class that gets perturbed every number of time steps by a perturbation of random size + +commit 531ecd851c431e9940f02258bdf62c37b23cb7c8 +Merge: 72fe3d87 db26c45c +Author: Eugene Vinitsky +Date: Wed Jun 14 13:52:57 2017 -0700 + + merged in aboudys changes to speed up the experiments + +commit 72fe3d87bf35cd3a41019cf72ab70796726e6e2b +Author: Eugene Vinitsky +Date: Wed Jun 14 10:17:30 2017 -0700 + + removed extraneous lane changing applied at each step + +commit 9b0f8da8052ddccdc9dc821c3e585dfabff449b2 +Author: AboudyKreidieh +Date: Tue Jun 13 13:13:56 2017 -0700 + + preparing for merge + +commit 2e58550f70b9897130fa5a72f57b4f71064062dd +Author: AboudyKreidieh +Date: Tue Jun 13 13:13:04 2017 -0700 + + preparing branch for merge + +commit db26c45c5e16296d77edbf39442360e817b0269a +Author: AboudyKreidieh +Date: Tue Jun 13 01:07:15 2017 -0700 + + removed unneccesary lane change commands + +commit 6a1dc31adbc10365e7426755ebd093c7c04eeee1 +Author: AboudyKreidieh +Date: Tue Jun 13 00:28:02 2017 -0700 + + fixed bug in getting lane index + +commit 38a9beb58ba44733c5f225ae8eb158ac033af84e +Author: AboudyKreidieh +Date: Mon Jun 12 21:31:01 2017 -0700 + + stopped traci get calls when unnecessary + +commit cc748db1c01a1b3af739c98d8359534c2668b5af +Author: Eugene Vinitsky +Date: Mon Jun 12 17:11:30 2017 -0700 + + fixed lane changing bug where command was not issued at every step + +commit dba8d28c5c7feb00bcc23c8da72d9b26901c5f51 +Author: AboudyKreidieh +Date: Mon Jun 12 15:43:53 2017 -0700 + + updates to parameters in experiments + +commit 80ea9a78eebb1b7d5131fc90193556e6152e212c +Author: AboudyKreidieh +Date: Mon Jun 12 15:40:48 2017 -0700 + + made iterations faster + +commit 8c560cb85af12a6c258b9caa5a7ae1a36b9bfe5b +Author: AboudyKreidieh +Date: Mon Jun 12 02:02:26 2017 -0700 + + added method for shuffling vehicles in between runs + +commit e4cada90ceb1be81785b4d26bd780a2ec3bd4bbf +Author: AboudyKreidieh +Date: Mon Jun 12 02:01:49 2017 -0700 + + added method for shuffling vehicles in between runs + +commit 14838154a17865cdbb377bac1ebe1634b8841d86 +Author: AboudyKreidieh +Date: Mon Jun 12 02:01:08 2017 -0700 + + added method for shuffling vehicles in between runs + +commit 2a141ba68b02858693b6be10cd8764f78851d64c +Author: Eugene Vinitsky +Date: Sun Jun 11 16:27:47 2017 -0700 + + added in aboudys changes so that a lane change command is applied every time to tell the vehicle to stay in lane if lane_change_duration has not passed + +commit fc025a6ffd8fd8dd30896bd967a5cb47399038b0 +Author: AboudyKreidieh +Date: Sun Jun 11 13:21:34 2017 -0700 + + get_headway by default looks in current headway + +commit 93a7f518a7eefd0d5492f8c77b253d7f40af3b4f +Author: AboudyKreidieh +Date: Sat Jun 10 19:18:13 2017 -0700 + + fixed bugs with lane changing cars running sumo commands + +commit cff2408027703d8cc73facfb02e748380acbbfb9 +Author: Eugene Vinitsky +Date: Sat Jun 10 14:23:36 2017 -0700 + + created new file for visualizing policies created through tensorflow + +commit b801c3bddca1bb3f52f9b47c0f1ae295588bf7ed +Merge: c171d10f 2a2600d2 +Author: AboudyKreidieh +Date: Sat Jun 10 00:16:33 2017 -0700 + + fixed merge conflicts + +commit 2a2600d2d278cf7b7a68e0fd5a22e99a10bc8d0c +Author: Eugene Vinitsky +Date: Fri Jun 9 23:45:59 2017 -0700 + + changed base_env to handle the fact there isnt a safe_target_lane for non-rl cars + +commit c171d10f74fe392e816e66b8c8e71fecb094ba76 +Author: AboudyKreidieh +Date: Fri Jun 9 23:20:32 2017 -0700 + + added method to implement sumo IDM controller + +commit 482d52c6b760efc3bd5094223bb032574116a992 +Author: AboudyKreidieh +Date: Fri Jun 9 23:19:48 2017 -0700 + + method to penalize non-compliance with rl requests + +commit 40f3187e7221547708079507348a7684059f0e88 +Author: Eugene Vinitsky +Date: Fri Jun 9 23:11:20 2017 -0700 + + fixed sheparding aggressive drivers to work with automlp + +commit a0250cadab34a5eb90f7ec08a8f2c115de814553 +Merge: 293a8acd a8197566 +Author: AboudyKreidieh +Date: Fri Jun 9 23:05:55 2017 -0700 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic into funWithPandas + +commit 293a8acda3f8adf4c0dbfb1e18a9c61dd3284c9e +Author: AboudyKreidieh +Date: Fri Jun 9 23:05:43 2017 -0700 + + cases to mixed-rl + +commit 7d94f965f72486727b69b0dcd2e1ac7373d1dd3d +Author: Eugene Vinitsky +Date: Fri Jun 9 22:18:45 2017 -0700 + + fixed lane changing to use mixed and discrete policy + +commit 8004e3d8ca98e3224fe8d8a78147df40731a536e +Author: Eugene Vinitsky +Date: Fri Jun 9 14:31:28 2017 -0700 + + added all car rl lc example + +commit 4e2a5cb241b8cd957a1ff08787c4304426dc4a86 +Author: Eugene Vinitsky +Date: Fri Jun 9 14:07:37 2017 -0700 + + made base-env changes, changed lane-changing to use discrete version + +commit 4cac22502f6b0c2b196312d8aff0621424aa0f01 +Author: AboudyKreidieh +Date: Thu Jun 8 16:16:02 2017 -0700 + + all sumo functions in base_env, method to set lc_mode and speed_mode (maybe to replace fail-safes), some documentation, modified lane_changing.py to perform actions we want in the continuous space, and added (possible) method to perform lane_changing in a mixed discrete-continuous action space + +commit a8197566078913601ee508fd3775dd04a0205d62 +Merge: af08c531 7ddd57c0 +Author: eugenevinitsky +Date: Thu Jun 8 14:40:58 2017 -0700 + + Merge pull request #107 from cathywu/prepare_automlp + + Switch to AutoMLPPolicy for cistar envs + +commit 7ddd57c027a710714b928a414acbba72e4cf93a6 +Author: eugenevinitsky +Date: Thu Jun 8 14:04:15 2017 -0700 + + Create AWS_tutorial.md + +commit fb29ad1e249837540bdb82cbbad4aa04af00904f +Author: AboudyKreidieh +Date: Tue Jun 6 16:46:28 2017 -0700 + + base lane changing controller + +commit d6e190ed21eb8678bf1e80bec788d8bfec64b631 +Merge: e673c301 af08c531 +Author: AboudyKreidieh +Date: Tue Jun 6 16:44:02 2017 -0700 + + fixed merge + +commit e673c301c42f64a5ff53b78effdf78b0855e83e5 +Author: AboudyKreidieh +Date: Tue Jun 6 15:57:14 2017 -0700 + + reorganizing location of sumo commands + +commit af08c5311b972a379e90e53709466530d65b85e3 +Merge: 99a6e9bf 78960b8c +Author: AboudyKreidieh +Date: Tue Jun 6 15:53:42 2017 -0700 + + Merge pull request #105 from cathywu/laneChangeChChChChanges + + changed compute reward to take kwargs for additional arguments + +commit 91168c063736e244be55d53c51415467628f1955 +Merge: 02b80b3d 99a6e9bf +Author: Cathy Wu +Date: Mon Jun 5 21:46:13 2017 -0700 + + Merge + +commit 02b80b3dbcfe573382cae99336a6db4f6cdabeda +Author: Cathy Wu +Date: Mon Jun 5 21:44:32 2017 -0700 + + mixed-human-rl: switch GaussianMLPPolicy to AutoMLPPolicy, switch Theano uses of rllab to Tensorflow + +commit 78960b8cab9c014196bce2cbc37d6b011618eca9 +Author: Kanaad Parvate +Date: Mon Jun 5 11:33:54 2017 -0700 + + changed docker file t onot use the patch anymore + +commit 99a6e9bf1e667f403bf6d6f48bde603a982c7095 +Author: eugenevinitsky +Date: Mon Jun 5 14:28:44 2017 -0400 + + Update AWS_tutorial.md + +commit a93016c48be23a5d6070f27a606f8f4cb372ec12 +Author: eugenevinitsky +Date: Thu Jun 1 17:36:33 2017 -0700 + + Update Docker_Tutorial.md + +commit 0542eaaaa3001bb984a5d5f6b76208d3d3c7fc35 +Author: eugenevinitsky +Date: Thu Jun 1 17:36:17 2017 -0700 + + Update Docker_Tutorial.md + +commit 3a825151eddb6830724776efd59187c68aa17aba +Author: Eugene Vinitsky +Date: Thu Jun 1 17:08:52 2017 -0700 + + added some docker files to the svn folder + +commit 7fc287dc4aa2dc4d82a75e980057469670f7728f +Author: Cathy Wu +Date: Thu Jun 1 16:28:16 2017 -0700 + + Instructions corresponding with commit f40f033cb3986c657de39c34f253f0236bc337a7 in cathywu/rllab repo (incorporated several of leah's steps into the rllab setup script) + +commit 0cba6f8cc11168186e194440f971d2dbd207a4da +Author: Eugene Vinitsky +Date: Thu Jun 1 14:19:03 2017 -0700 + + changed compute reward to take kwargs for additional arguments + +commit 8e45f8895ea1cd6ed65d1871f994128c2a066db2 +Merge: 847aac6a 761597fe +Author: eugenevinitsky +Date: Thu Jun 1 13:26:31 2017 -0700 + + Merge pull request #102 from cathywu/idm_simulations + + Idm simulations + +commit 761597fe6910aefe77887932b0d9e7973f64cd2d +Merge: 86f856e8 847aac6a +Author: eugenevinitsky +Date: Wed May 31 10:26:10 2017 -0700 + + Merge branch 'master' into idm_simulations + +commit 86f856e8a2ab52269e72923292cad3fc6f98e972 +Author: AboudyKreidieh +Date: Wed May 31 10:10:00 2017 -0700 + + modified reward function and states to be compatible with newest approaches + +commit 847aac6a320541c4f99e9f769b6b61ad31d8c22a +Author: Eugene Vinitsky +Date: Wed May 31 10:09:33 2017 -0700 + + unit tests fixed now? + +commit 0441b9f4988a56da387a1253ba320e60a133d3ca +Author: AboudyKreidieh +Date: Wed May 31 10:08:43 2017 -0700 + + added function to compute distance to intersection + +commit e9b6f6c11a576df16f79036f1605d0d511ea570f +Author: AboudyKreidieh +Date: Wed May 31 10:06:55 2017 -0700 + + fixed typo in IDM model + +commit 77a560c0332b49782167722e913049d7615103b3 +Author: AboudyKreidieh +Date: Wed May 31 10:06:13 2017 -0700 + + modified intersection representation and edge names in figure8 scenario + +commit 2fe232c86fa5ef76d3acebec1135df7a4bf6c60f +Author: AboudyKreidieh +Date: Wed May 31 10:04:35 2017 -0700 + + added absolute position and fail variable to compute_reward + +commit d7e039c0709a561ad27e2a44a0117f53d7669edb +Author: Eugene Vinitsky +Date: Wed May 31 10:04:17 2017 -0700 + + fixed unit tests to use an arbitrary port + +commit 2607edaf6955c6dc74c780bb38b1a1bbd0044a66 +Author: AboudyKreidieh +Date: Wed May 31 10:02:20 2017 -0700 + + added intersection crash, absolute position + +commit f231d3cf0865f29213cf473a60611412f4259eca +Author: AboudyKreidieh +Date: Wed May 31 10:01:26 2017 -0700 + + script to train vehicles to not crash at intersections + +commit 6aac1b422fb8baeede06b869a3b91f2d6db52f26 +Author: AboudyKreidieh +Date: Wed May 31 10:00:42 2017 -0700 + + added intersection fail-safe + +commit 5fbfaafd10f65f6fc722cd06192201080d6e647b +Merge: 8d5bc354 de993ddc +Author: eugenevinitsky +Date: Wed May 31 09:57:20 2017 -0700 + + Merge pull request #99 from cathywu/dockerSVN + + Docker svn + +commit de993ddc255e6b7b0a369924beae9ce72c1641ef +Author: Eugene Vinitsky +Date: Wed May 31 09:31:03 2017 -0700 + + dockerfile for pulling stable sumo is in dockerfile, svn dockerfile is in docker-svn + +commit c44f594fcffe135b26327f37ad87accad52d1422 +Author: Eugene Vinitsky +Date: Wed May 31 09:28:38 2017 -0700 + + changed based_env to color cars differently for each car type, added dockerfile that works for svn + +commit 6e86c3e131f2e3c9293e42d4b2156112cb97a976 +Author: Eugene Vinitsky +Date: Mon May 29 11:54:29 2017 -0700 + + fixed minor bug in instantaneous failsafe where we were occasionally dividing by zero + +commit 9b421a342edab0adb0b2907a3e16e224bf1d636f +Author: Eugene Vinitsky +Date: Mon May 29 10:27:40 2017 -0700 + + changed visualizer_CISTAR to have a loop_length input argument that lets you choose how long the loop should be in replay + +commit c941352ea85df13766a91047f550ba4d80bd3937 +Author: Eugene Vinitsky +Date: Sun May 28 14:11:22 2017 -0700 + + fixed bug in IDM where a factor of 2 was replaced by headway + +commit 43cb6928ac66e43ddbae6dffa90fe86ebc839074 +Author: Eugene Vinitsky +Date: Thu May 25 13:44:29 2017 -0700 + + fixed bug in lanechanging.py that caused it to be unable to be used by visualizer_cistar + +commit 34b64e4c68f51de34f017450e30d5677ba527209 +Author: AboudyKreidieh +Date: Thu May 25 13:36:00 2017 -0700 + + made end time larger for bigger experiments + +commit 5ed29086e6a94838de7bfe33a8c47b6711354bc9 +Author: AboudyKreidieh +Date: Thu May 25 13:35:23 2017 -0700 + + modified reward function in sheparding class + +commit 4f442caccf5ffa0c3d3f46e48ee9a04ed80938af +Author: AboudyKreidieh +Date: Thu May 25 13:13:21 2017 -0700 + + updated experiments to be compatible with latest version of cistar + +commit 152f1864e38caa830f448e40836b79d41bfaad9a +Author: AboudyKreidieh +Date: Thu May 25 13:09:53 2017 -0700 + + added condition to ensure rollout ends after crash + +commit 748d836d1bc399835e9f64b77dd540547a6c194d +Author: AboudyKreidieh +Date: Thu May 25 13:08:35 2017 -0700 + + vehicles at figure8 generator can pass through junctions + +commit 92811e6929b131ec9dea9604efe3841905ca7ad7 +Author: AboudyKreidieh +Date: Thu May 25 13:03:47 2017 -0700 + + added experiment for platooning + +commit 91892f936d19fa3174e042c858cfbf2931b8616f +Author: Eugene Vinitsky +Date: Tue May 23 15:14:56 2017 -0700 + + created docker file that downloads from svn instead of stable build + +commit 27abf261ffc11c189eb706dc904238782bd47828 +Author: Eugene Vinitsky +Date: Tue May 23 08:47:13 2017 -0700 + + changed dockerfile to pull nightly SUMO build + pulled in environment.yml changes from new rllab dockerfile + +commit 51db8e1776ea90ebe5995e9963b7ca30d0b268c5 +Author: Eugene Vinitsky +Date: Tue May 23 08:37:43 2017 -0700 + + increased max length of run in gen.py, added positive only reward to simpleEmission + +commit e65481aaf5c75d1977c0cf554626cac814428ba2 +Merge: b777df4e 8d5bc354 +Author: Eugene Vinitsky +Date: Mon May 22 14:34:22 2017 -0700 + + Pulled in changes to state for lc environment + + Merge branch 'master' of https://github.com/cathywu/learning-traffic + +commit b777df4e38bda68c760a97945b2ffc1e63382ecb +Author: Eugene Vinitsky +Date: Mon May 22 14:34:02 2017 -0700 + + added fully positive reward function to mixed-human-rl.py + +commit 8d5bc3544e22838b51ab949b179ae3504234a287 +Merge: 483def55 2e09d18c +Author: eugenevinitsky +Date: Mon May 22 14:32:58 2017 -0700 + + Merge pull request #98 from cathywu/idm_simulations + + Updated map generator to resolve -1001 errors + +commit 483def558e23827a442ab05ed90023dd6ddaa1cc +Merge: 735ffbab 3dcb10ae +Author: eugenevinitsky +Date: Mon May 22 14:32:43 2017 -0700 + + Merge pull request #82 from cathywu/docker + + current Dockerfile, still need to make gpu_Dockerfile + +commit 2e09d18cc15de10e89db0e196f704390e7a1bec4 +Merge: 77ea67e5 dcc2b550 +Author: AboudyKreidieh +Date: Mon May 22 14:25:14 2017 -0700 + + modified observation space in lane_changing + +commit 77ea67e58154f02617cda121847158973eb19700 +Author: AboudyKreidieh +Date: Mon May 22 13:32:47 2017 -0700 + + updates to figure 8 scenario + +commit dcc2b550aa1412841f5968160e39072fd95021af +Merge: 5243cc2d c658cff9 +Author: Eugene Vinitsky +Date: Mon May 22 13:16:14 2017 -0700 + + added aboudy's intersection and instantaneous fix + + Merge branch 'origin/idm_simulations' into routerFix + +commit 5243cc2d8ac2379613c52dc1ae1ed85ae9029c13 +Author: Eugene Vinitsky +Date: Mon May 22 13:13:41 2017 -0700 + + fixed state space in lane changing, made emission acceleration controlled instead of velocity controlled + +commit 9339457b4de4f40b6b958b32ea5ec3488070cf75 +Author: Eugene Vinitsky +Date: Mon May 22 12:01:57 2017 -0700 + + changed generator.py so it now has rerouters on every node. This should fix the -1001 error in the getDistance call. There is still a -1001 error when there is a crash however + +commit c658cff99ed95f7f15bdb466a85b1528e7dbc8c7 +Author: AboudyKreidieh +Date: Sun May 21 16:31:55 2017 -0700 + + added IDM controller, generator and scenario for figure8, updated instantaneous failsafe + +commit 735ffbab9f8d0d7a4c353ccfe24b501838c55ba7 +Merge: 9ae8bafa 497307ef +Author: eugenevinitsky +Date: Wed May 17 21:26:57 2017 -0700 + + Merge pull request #91 from cathywu/orderedDictionaryFix + + Ordered dictionary fix - minor changes to stochastic simulator + +commit 497307ef4b86883e7337d8762fc0c0179bdbb5d7 +Author: Eugene Vinitsky +Date: Wed May 17 21:13:20 2017 -0700 + + changed vehicles in base_env to be an ordered dictionary. Now each iteration will have the inputs to the neural net keep the same order from iteration to iteration + +commit 415c09308796828741e4252e0edb4d459d080c22 +Author: Eugene Vinitsky +Date: Wed May 17 21:05:00 2017 -0700 + + added flag to visualizer to let the policy be run for shorter or longer than max_path_length + +commit 64d2dec00eb0ced7e69571eee048d28b9c606962 +Author: Eugene Vinitsky +Date: Tue May 16 20:39:31 2017 -0700 + + added plots of the mean for all cars to visualizer, added naming of emissions files to base + +commit 9ae8bafa89e4069f7c71368906db9be6dc0a293a +Merge: 1f83b473 46db1868 +Author: eugenevinitsky +Date: Mon May 15 17:10:39 2017 -0700 + + Merge pull request #90 from cathywu/idm_simulations + + Idm simulations + +commit 46db1868c83cb245874a267f99583980e2c6511b +Author: AboudyKreidieh +Date: Mon May 15 17:09:56 2017 -0700 + + right code + +commit a696370e3bed78a8a3b590a23a333418aa05041b +Author: AboudyKreidieh +Date: Mon May 15 16:54:36 2017 -0700 + + fixed vehicle counting bug + +commit 1f83b473cfdf3b5d26f157af6150e50b079f347a +Merge: 70fe7de6 f62373da +Author: eugenevinitsky +Date: Mon May 15 16:21:09 2017 -0700 + + Merge pull request #89 from cathywu/idm_simulations + + fixed bug where all cars disappear + +commit f62373dade6133781cccb5c183c5fa94e45fe3b7 +Author: AboudyKreidieh +Date: Mon May 15 16:19:40 2017 -0700 + + fixed bug where all cars disappear + +commit 70fe7de649f855d449a5932eb74a7d3d83af1b26 +Merge: 7bc416f1 44e1a971 +Author: eugenevinitsky +Date: Mon May 15 14:26:03 2017 -0700 + + Merge pull request #88 from cathywu/idm_simulations + + fixed headway bug + +commit 44e1a9719f949d67c535468ba84ed3ef223f3a4b +Author: AboudyKreidieh +Date: Mon May 15 14:04:16 2017 -0700 + + fixed headway bug + +commit 7bc416f1940858d849220477215f99f15bb0ed4b +Merge: 956ce1fb 424d826a +Author: eugenevinitsky +Date: Mon May 15 13:56:49 2017 -0700 + + Merge pull request #87 from cathywu/idm_simulations + + fixed space-time diagram + +commit 424d826aca32227c78ec2cf91ce1e9e84992e4cb +Author: AboudyKreidieh +Date: Mon May 15 13:41:54 2017 -0700 + + fixed space-time diagram + +commit 956ce1fb181e3daaef194bc20f6642861bbd0a0e +Merge: 4ef3df75 3b1957f4 +Author: eugenevinitsky +Date: Mon May 15 13:19:28 2017 -0700 + + Merge pull request #86 from cathywu/stochastic-sim-idm + + Stochastic sim idm + +commit 3b1957f4c655f881b54067cc1da6dc377f1b38b4 +Author: Eugene Vinitsky +Date: Mon May 15 11:42:06 2017 -0700 + + cleaned up unnecessary files from stochastic_simulation folder + +commit 91b03819924d9fa6c75664d5d708772b60b3be70 +Merge: fc99ebbe 4ef3df75 +Author: Eugene Vinitsky +Date: Mon May 15 11:37:56 2017 -0700 + + Pulled in new stochastic lane changing simulation that uses IDM instead of OVM + + Merge branch 'master' of https://github.com/cathywu/learning-traffic + +commit 4ef3df75cac3346d1c178d5708bf296c4d494c28 +Merge: bd8226f4 ea96955c +Author: eugenevinitsky +Date: Mon May 15 11:37:41 2017 -0700 + + Merge pull request #85 from cathywu/idm_simulations + + Idm simulations + +commit fc99ebbe143586e4aa76c5dbb8efb4c63aa3e15f +Merge: 755a5712 bd8226f4 +Author: Eugene Vinitsky +Date: Mon May 15 11:36:12 2017 -0700 + + Needed IDM code + + Merge branch 'master' of https://github.com/cathywu/learning-traffic + +commit ea96955caaf197e22eb3f37a25026d53f9959ddf +Merge: 675a1f49 bd8226f4 +Author: eugenevinitsky +Date: Mon May 15 11:35:20 2017 -0700 + + Merge pull request #84 from cathywu/master + + idm simulations + +commit 675a1f49c20557f1431ce19560949a70071a24b1 +Author: AboudyKreidieh +Date: Mon May 15 11:33:22 2017 -0700 + + IDM simualtions with lane-cahnging + +commit bd8226f41d6678586b49eb13b72c5c8cbf088905 +Author: eugenevinitsky +Date: Mon May 15 11:30:38 2017 -0700 + + Update current-bugs.md + +commit ceafcbd9aef40bbaf19cd1b7efcc22020b9bd4fb +Author: AboudyKreidieh +Date: Mon May 15 11:28:38 2017 -0700 + + got IDM with stochastic lane-changing working + +commit 755a5712e34edf9b803e4053985bda84aa1eafaa +Author: Eugene Vinitsky +Date: Mon May 15 10:00:05 2017 -0700 + + fixed cost function in loop_emission.py. It was dependent on the headway instead of position + +commit 5c4e19c170e01bbebc4ca8cae487b07bdbf329ca +Author: eugenevinitsky +Date: Thu May 11 21:29:13 2017 -0700 + + Create current-bugs.md + +commit d38ec1f24f71036efba1b3da55d3ed161a982396 +Merge: 12157dbe 48287c1d +Author: Eugene Vinitsky +Date: Thu May 11 21:27:51 2017 -0700 + + Pulling the master branch in? + Merge branch 'master' of https://github.com/cathywu/learning-traffic + +commit 12157dbec6464d09576370bdd7a4dd935f04208c +Author: Eugene Vinitsky +Date: Thu May 11 21:27:40 2017 -0700 + + entering cars in stochastic lane changes ovm now cannot enter with a velocity that would cause them to crash. We added a failsafe to them + +commit 5e644cfd261ecd861e2ff09fe528851bd66e23fa +Author: Eugene Vinitsky +Date: Thu May 11 21:27:02 2017 -0700 + + entering cars in stochastic lane changes ovm now cannot enter with a velocity that would cause them to crash. We added a failsafe to them + +commit 8e7c11ddf0bf38469bf7f78520ad5e905436e9a2 +Author: Eugene Vinitsky +Date: Thu May 11 19:06:07 2017 -0700 + + cleaned up the directory by removing extraneous experiment files from emergent behavior + +commit 48287c1d800f170eed35e8c06e1ac6cd55429cc1 +Author: eugenevinitsky +Date: Thu May 11 16:23:01 2017 -0700 + + Update things-arent-working.md + +commit 7ab76342cfe2fc38b389d660a8a15355777eaf93 +Author: eugenevinitsky +Date: Thu May 11 16:22:41 2017 -0700 + + Create things-arent-working.md + +commit 3dcb10ae12d43b1a99af94e695fef9d6510c0af6 +Author: Leah Dickstein +Date: Thu May 11 16:20:10 2017 -0700 + + added tutorial + +commit c07e8a53174f80056cd33d6eaeb24440aad4d9f3 +Author: Leah Dickstein +Date: Thu May 11 16:16:49 2017 -0700 + + updated gpu dockerfile + +commit 11ace7c3ced4ece2257cbd090dad345c03aa6507 +Author: Leah Dickstein +Date: Thu May 11 16:03:14 2017 -0700 + + current Dockerfile, still need to make gpu_Dockerfile + +commit 28448d4c8f66a22cc79f9dbec92fc2d86900ebd9 +Author: Eugene Vinitsky +Date: Thu May 11 13:16:04 2017 -0700 + + modified the velocity of entering cars so that they dont enter with more than the failsafe velocity in stochastic_lane_changes-OVM + +commit 2c4883132ec806cde445690973115d0cc21a3961 +Author: Eugene Vinitsky +Date: Tue May 9 16:13:35 2017 -0700 + + snapshot for aws testing + +commit ca611eefb1556343986ecdb54f78800e8bb81f16 +Merge: 7ff6f36e 39f593fe +Author: Eugene Vinitsky +Date: Tue May 9 15:52:59 2017 -0700 + + changed state space in loop emission to be on headway rather than position + +commit 7ff6f36e5e3f11a966aae8a47da9dbb016a1d962 +Merge: de335dc4 bdbd22b9 +Author: Eugene Vinitsky +Date: Tue May 9 15:49:37 2017 -0700 + + Added fixes to headway computation and made state space function on headway instead of position for loop_emission + + Merge branch 'joao-new-state' + +commit de335dc4ef136c3a19a15610badcfd8db8a032fd +Author: Nishant +Date: Fri May 5 16:49:20 2017 -0700 + + updated plotting script + +commit 39f593fee2098d2b3c12d79a4b84025c2f53aeff +Author: Joao Carlos Menezes Carreira +Date: Fri May 5 11:09:54 2017 -0700 + + Update + +commit a0fa87747b17db2b4b3434aba7288840258eecc5 +Author: Joao Carlos Menezes Carreira +Date: Fri May 5 00:06:30 2017 -0700 + + Adding some experiments + +commit aa44954c842c862bb2f1b757d8e7a16069295e62 +Author: Eugene Vinitsky +Date: Thu May 4 23:58:27 2017 -0700 + + changed mixed human to have 22 cars and an emission reward function + +commit 7f2adf74fcbe64764c5c433ac4b2ca9c27c2c2a1 +Author: Eugene Vinitsky +Date: Thu May 4 18:56:36 2017 -0700 + + fixed up mixed human + +commit 4f149f0f5dc189640a04b9c3772ad33a038de52d +Author: Eugene Vinitsky +Date: Thu May 4 18:55:21 2017 -0700 + + added mixed file + +commit 0df68b48d88f8b4b357e0b21146c94ac1792512f +Author: Eugene Vinitsky +Date: Thu May 4 17:39:40 2017 -0700 + + added two car experiment with original parameters + +commit 54b89a4633d6c357bd8389e7ed7b61263c1afd12 +Merge: 1739ab64 2ed8a5df +Author: Kanaad Parvate +Date: Thu May 4 16:20:18 2017 -0700 + + merge with visualizer + +commit 1739ab64519aeeefc94693efaf5637c0cf25fd17 +Author: Kanaad Parvate +Date: Thu May 4 16:15:33 2017 -0700 + + rl lane changing progress + +commit 51e235f3f1091941934d0fd89f071d9ff3ff545d +Author: Kanaad Parvate +Date: Thu May 4 16:10:38 2017 -0700 + + makefile uses local rllab path + +commit de2cdb4f341337bd42aa645f05bec9d8218560d7 +Author: Eugene Vinitsky +Date: Thu May 4 11:33:11 2017 -0700 + + working in parallel + +commit 2026b60a4c80106cf287251abf6c3b1b7ffd8d72 +Merge: f6cc6c70 a717f223 +Author: Kanaad Parvate +Date: Wed May 3 15:55:38 2017 -0700 + + merged rl-lane-changing and parallel branches + +commit b949a109ccc0a8608269a561ac95edffa99ac43b +Author: Joao Carreira +Date: Wed May 3 15:48:25 2017 -0700 + + 8-car TRPO experiment + +commit a717f223abfd2bdf8cafd4523efdde7261da00fb +Author: Kanaad Parvate +Date: Wed May 3 15:46:54 2017 -0700 + + deleted a print statement + +commit 15e810aa083f840f141f141ebd71600158f71c2d +Author: Eugene Vinitsky +Date: Wed May 3 15:31:11 2017 -0700 + + removed the port from 1-car-rl.py + +commit 5732897e1f9eba20940b8a5bd92e37f5aec4f6dc +Merge: 7bdf0a45 f6cc6c70 +Author: Eugene Vinitsky +Date: Wed May 3 15:23:37 2017 -0700 + + Adding parallelizing! Instead of traci calls we now open a connection with traci and make all the calls to that connection + Merge branch 'parallel' into joao + +commit f6cc6c70157fd36a6ffa29bca0a5691358be2e44 +Author: Kanaad Parvate +Date: Wed May 3 15:11:32 2017 -0700 + + working parallelized rollouts + +commit 7bdf0a45e16347b700c71ace4030e5216c21e9a3 +Author: Eugene Vinitsky +Date: Wed May 3 14:17:39 2017 -0700 + + eh + +commit 0594bd65b4668c52072eed16f2ed09c926493997 +Author: Kanaad Parvate +Date: Wed May 3 14:17:37 2017 -0700 + + preliminary rl-lane-changing code + +commit 8ab728e7284c8c1ca9171af821cd812f5da392e5 +Author: Eugene Vinitsky +Date: Wed May 3 14:16:52 2017 -0700 + + setup mixed experiment + +commit feb6e23b3bea1fe5c5052efdae5ce24845ff6d1a +Author: Eugene Vinitsky +Date: Tue May 2 21:10:55 2017 -0700 + + fixed state space to be headway for ExtendedEmissionEnvironment + +commit 21e3d6d0990d1e8a69f93444453294fa29cce997 +Author: Eugene Vinitsky +Date: Tue May 2 19:21:58 2017 -0700 + + fixed batch size. Batch size over max_path_length is the number of rollout + +commit 3cd4eb26b4bf57f1bd91dce37a4ee5259321808a +Merge: ee5ec75d 2efc2e51 +Author: Kanaad Parvate +Date: Tue May 2 17:33:58 2017 -0700 + + Merge branch 'rl-lane-changing' of https://github.com/cathywu/learning-traffic into rl-lane-changing + +commit ee5ec75d4cb8adce7b29dc3e51a056488daae520 +Author: Kanaad Parvate +Date: Tue May 2 17:33:52 2017 -0700 + + some rl changes + +commit 2efc2e5169f3976ab2e40ae89c2c5b51d9b806bc +Author: Nishant +Date: Tue May 2 17:32:36 2017 -0700 + + maybe this works + +commit 6673e533930b0d37e9371671d543c7ff37bccc6c +Author: Joao Carreira +Date: Tue May 2 17:22:01 2017 -0700 + + New 1-car experiment. Disabled safe actions for 1 car + +commit cf83e6204564564d9b60b110601ffc14ef278e6e +Author: Eugene Vinitsky +Date: Tue May 2 16:52:35 2017 -0700 + + changed state to be absolute position + +commit dbc5e23e0aae14ee3b712e26a364898c53d525db +Merge: 60e3c96f 161d5e03 +Author: Kanaad Parvate +Date: Tue May 2 15:26:01 2017 -0700 + + Merge branch 'sumo-lane-changing' into rl-lane-changing + +commit 161d5e03604838457fcc7ddf22c884510b632d31 +Merge: fa9d5cfa 60e3c96f +Author: Kanaad Parvate +Date: Tue May 2 15:25:18 2017 -0700 + + merge + +commit aff1cf705e7c325e90b5cf9558183fde56e1be52 +Author: Eugene Vinitsky +Date: Tue May 2 15:11:25 2017 -0700 + + fixed loop_accel_pos_vel reward computation correctly this time + +commit 0abd1cb271436b5bd21b443db7387352374fe1dd +Author: Eugene Vinitsky +Date: Tue May 2 15:07:55 2017 -0700 + + fixed the reward function for loop_accel_pos_vel + +commit 4bc77a08b039b5f74c4e94e47d05825cb3a7ad53 +Author: Eugene Vinitsky +Date: Tue May 2 15:04:08 2017 -0700 + + 1-car-rl now works with ExtendedEmissionEnvironment instead + +commit bdbd22b9a3650db8bba7994aab4f5722f83c1677 +Author: Eugene Vinitsky +Date: Tue May 2 14:59:00 2017 -0700 + + added state as position in file loop_accel_post-vel.py + +commit fa9d5cfaed2ef935635ed018952fce3283156417 +Author: Nishant +Date: Tue May 2 14:32:51 2017 -0700 + + commented out some nonsense in loop.py + +commit 9dbc7fb6ea5030747f25c27db226ee67f81bfdb5 +Author: Nishant +Date: Tue May 2 14:17:39 2017 -0700 + + some updates to null lane-change handling + +commit 60e3c96fbc5ac8f869ce327849017c273a0f112f +Author: Kanaad Parvate +Date: Tue May 2 11:24:41 2017 -0700 + + lane changing logic complete, needs null checking + +commit 2c61f9818ed4529161749325c3e13774c9162159 +Author: Joao Carreira +Date: Mon May 1 12:03:03 2017 -0700 + + First update + +commit 2ee778d0f69ab17bf837c63ed9d8414ce1f1c173 +Author: Kanaad Parvate +Date: Sun Apr 30 22:49:01 2017 -0700 + + added testing file + +commit 35e778f1cf1dd9587a9f8fbbc654922f7b3e186a +Author: Kanaad Parvate +Date: Sun Apr 30 22:46:51 2017 -0700 + + halfway through refactoring basenv + +commit 2ed8a5dfba8f7804541291a3bd4fe772e620f323 +Author: Leah Dickstein +Date: Sun Apr 30 12:19:21 2017 -0700 + + final version of visualizer pre testing + +commit 5c0135919424020323d8d4c74d23d3c8f356347d +Merge: c360de7f 89227c37 +Author: Leah Dickstein +Date: Sun Apr 30 12:12:32 2017 -0700 + + fixed merge conflict + +commit e6473e39b0339374cd0d06aa561e29a9b7068323 +Author: Nishant +Date: Sat Apr 29 17:23:33 2017 -0700 + + fixed merge, whoops + +commit 93b3dc2dc65bd1d38f51ec7e7ed7a5e9f196070b +Merge: a4cd451b e93b2d80 +Author: Nishant +Date: Sat Apr 29 17:21:03 2017 -0700 + + Merge branch 'master' of github.com:cathywu/learning-traffic into sumo-lane-changing + +commit e93b2d8034d4efaaf45e3c0edad91a0beef6c0db +Merge: 14b0345c 5385e867 +Author: Nishant +Date: Sat Apr 29 17:06:39 2017 -0700 + + Merge branch 'master' of github.com:cathywu/learning-traffic + +commit 14b0345c3fc35b213b056858ade6627d8e0dbab9 +Author: Nishant +Date: Sat Apr 29 17:06:31 2017 -0700 + + updated perturbation code to allow multiple perturbations + +commit c360de7face6e816f807bd5190326707dbdb631e +Author: Leah Dickstein +Date: Sat Apr 29 15:30:17 2017 -0700 + + post team meeting + +commit 5385e867855e755925aa4c57bcbe31dbea9e1a35 +Author: Kanaad Parvate +Date: Fri Apr 28 12:37:45 2017 -0700 + + removed python path + +commit b4aec2bc8a76dc8a44c8fe7772c59c795fccaf6a +Author: Leah Dickstein +Date: Fri Apr 28 11:45:49 2017 -0700 + + merged in eugene' stuff + +commit 6c8ee3322e17f0578dc3499b6f1deb8d55772592 +Author: Leah Dickstein +Date: Fri Apr 28 11:39:24 2017 -0700 + + updated to get more information from pkl + +commit a4cd451b3ce3da6ae5a4d7a2ab18237b278c4dd3 +Author: Nishant +Date: Thu Apr 27 16:26:39 2017 -0700 + + plotting changes, attempts at using default sumo lane-changing + +commit 89227c376711062346c331fc76dfef2f27a0b820 +Author: Eugene Vinitsky +Date: Thu Apr 27 16:15:48 2017 -0700 + + added code to visualizer_cistar and base-env such that visualizer cistar plays movies + +commit 6816dad9572a5bff003d81c9b504c90df310208e +Author: Nishant +Date: Tue Apr 25 15:51:06 2017 -0700 + + updated plotting script + +commit 80e212eb3c4ed415e0cb5b97db0acba65130b1d2 +Author: Kanaad Parvate +Date: Mon Apr 24 17:51:20 2017 -0700 + + removed requirement for endtime + +commit f5437f5f9bc1e76167459fbbef5927bd62232b0c +Author: Nishant +Date: Mon Apr 24 17:40:41 2017 -0700 + + really bad code + +commit 14108c5660da09c8a7aa2ecef6ed9422e6549fcc +Author: Leah Dickstein +Date: Mon Apr 24 11:29:06 2017 -0700 + + updated visualizer to handle multiple observation variables, still need to make small fix to handle AWS run experiments + +commit 5cae0663ccac221d90b5437474e9e594234cca52 +Merge: e0202099 810b91da +Author: Kanaad Parvate +Date: Sat Apr 22 20:23:09 2017 -0700 + + Merge branch 'refactor' + +commit e02020992c0ea20f537d1640bb461f10fb9b4f4a +Author: Kanaad Parvate +Date: Sat Apr 22 20:23:03 2017 -0700 + + added no failsafe option + +commit 810b91dadb2a0c31e7221c8328e35b7ce8d64b20 +Author: Kanaad Parvate +Date: Sat Apr 22 19:27:01 2017 -0700 + + can reset with new sumo_paramsD + +commit 22c5d5b104aaebe9abf1d975b5077edbbcad9b6d +Author: Kanaad Parvate +Date: Sat Apr 22 19:05:46 2017 -0700 + + added visualizer file + +commit b79957fbb031219e79ea92a092a50fce440d77f4 +Author: Kanaad Parvate +Date: Sat Apr 22 18:58:07 2017 -0700 + + restart-base-env + +commit 5154baa479904c254d4a84b7b80acc91e01ba40d +Author: Kanaad Parvate +Date: Thu Apr 20 15:35:37 2017 -0700 + + emission file-per environment + +commit 6acd781f6d5ff89971039a0ee21e38d63ebcd1b8 +Author: Kanaad Parvate +Date: Thu Apr 20 15:07:02 2017 -0700 + + refactor 1 + +commit 58b8b580bb4b32d6bdbbb8645e42f894f26d98ae +Author: Leah Dickstein +Date: Thu Apr 20 14:28:31 2017 -0700 + + tweak to AWS tutorial + +commit f78119a12d077ed59335575d759696263155ea62 +Author: Leah Dickstein +Date: Thu Apr 20 14:26:29 2017 -0700 + + tweak to AWS tutorial + +commit a2810b21b049a1f08137e1ebe2e0cf1f0fe01a14 +Author: Leah Dickstein +Date: Thu Apr 20 14:16:46 2017 -0700 + + AWS tutorial + +commit 98ec9b8d33c1742fb16e553b688bf086c35f87df +Merge: 32075a74 6da7dd86 +Author: Leah Dickstein +Date: Thu Apr 20 13:57:22 2017 -0700 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic + +commit 32075a749ae459571c9e02395f9b9b0321feba06 +Author: Leah Dickstein +Date: Thu Apr 20 13:57:14 2017 -0700 + + Makefile + +commit 6da7dd8608aad7acb705abd697b2eccbfd4c2f65 +Merge: 4cca855a bfeeb66f +Author: Kanaad Parvate +Date: Thu Apr 20 12:26:16 2017 -0700 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic + +commit 4cca855a492e355a92f1685823b0d56e6791afae +Author: Kanaad Parvate +Date: Thu Apr 20 12:26:09 2017 -0700 + + removed old cistar folder + +commit bfeeb66fd98e29728d9836e82952dae1e7ffe91a +Author: Nishant +Date: Fri Apr 14 15:29:09 2017 -0700 + + made more tweaks to plotting code + +commit f7ba1f46663587440d22e1664eecc0015244b60b +Author: Nishant +Date: Fri Apr 14 01:44:14 2017 -0700 + + fixed a stupid bug in plot index code + +commit eae6a72dc848f461129122e6bb9b8646a8b811b1 +Merge: 53dc6aeb 08d00889 +Author: Nishant +Date: Thu Apr 13 22:07:48 2017 -0700 + + merged + +commit 53dc6aebbc21d4c938b94bef6a8f51d9966d7ce9 +Author: Nishant +Date: Thu Apr 13 22:06:26 2017 -0700 + + added plotting code, updated for some lane-change dependencies + +commit f62f95d01ce6d8755c3ddfc1d07f9ee54480db19 +Author: Leah Dickstein +Date: Tue Apr 11 20:57:59 2017 -0700 + + Script for creating plots of observation variables averaged over rollouts. Note this is a WIP: I will be updating it with better code once we have a working emissions experiment, since emissions has an observation matrix instead of observation array. Not ready to be merged yet. + +commit 08d00889595938f06b50aa7314c3515e81bc4ad1 +Merge: 91d7b486 aea22fdb +Author: eugenevinitsky +Date: Mon Apr 10 12:09:26 2017 -0700 + + Merge pull request #76 from cathywu/ITSC-lane-plots + + Itsc lane plots + +commit aea22fdbecea3f3af41cba5ad9b05ab753bb2534 +Merge: 91d7b486 cef90669 +Author: Eugene Vinitsky +Date: Mon Apr 10 12:02:14 2017 -0700 + + merged in changes to stochastic-lane-changes ovm + +commit cef9066981e4ab83801bda7ed573593ecbf91d65 +Author: Eugene Vinitsky +Date: Mon Apr 10 11:34:25 2017 -0700 + + added variance and percentage fail-safe calculations to stochastic_lane_changes-ovm + +commit 91d7b486373bee61662b50bfba07380f5d164445 +Author: Kanaad Parvate +Date: Mon Apr 10 02:54:42 2017 -0700 + + velocity check for emission-env + +commit fe79b650fd5f9ec7d78c9e6d9f10604f4bc62328 +Author: Kanaad Parvate +Date: Sun Apr 9 20:33:12 2017 -0700 + + reasonable testing numbers, and moving emission to itsc_experiments folder + +commit a695e5bd43455063061e080da55dfc4ce90933cb +Merge: fe910cc4 37fe5eb7 +Author: Kanaad Parvate +Date: Sun Apr 9 20:01:24 2017 -0700 + + merge + +commit fe910cc41e91a819189678e6336fe3e91c087e7d +Author: Kanaad Parvate +Date: Sun Apr 9 19:55:40 2017 -0700 + + small typo + +commit 25be7422562d7cabd9988c9a072164d233ee01a7 +Author: Kanaad Parvate +Date: Sun Apr 9 19:48:35 2017 -0700 + + multi-car-rl experiment + +commit 37fe5eb731d31cf03e0cc8ca398bd9e206845809 +Author: Leah Dickstein +Date: Sun Apr 9 17:24:57 2017 -0700 + + fixed emission env to be less hacky + +commit 3b39204a958cb413de8722a123898d38c6451c0b +Author: Leah Dickstein +Date: Fri Apr 7 11:48:36 2017 -0700 + + rl build tester emission + +commit be9e9e4bf16174b4f17e2a17987b2f9d8d87e89d +Author: Kanaad Parvate +Date: Thu Apr 6 22:14:38 2017 -0700 + + fixed experiements lane changing + +commit 5e295758c9c411f7e560019e8e199c5f208f5866 +Merge: 38ea3ca4 9ebd004e +Author: Kanaad Parvate +Date: Thu Apr 6 18:59:57 2017 -0700 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic + +commit 38ea3ca4d9940bde2f9e524d0be5f5b1ec3580ee +Author: Kanaad Parvate +Date: Thu Apr 6 18:59:51 2017 -0700 + + removed old files + +commit 9ebd004ebee525df4e048996946e94fe9bb533ef +Author: Nishant +Date: Thu Apr 6 14:11:07 2017 -0700 + + changed lane-change controllers to be objects, not higher-order functions + +commit 574cfe5c57fe22d52451dd782e1645414ca2e466 +Author: AboudyKreidieh +Date: Thu Apr 6 14:03:35 2017 -0700 + + Stochastic fail safes (#75) + + * fixed initial conditions to extend backwards in history, added failsafe + + * fixed major bug in initial conditions for entering cars. we were setting the past history to be a constant headway, which led to the length of the track not being conserved + +commit 3abe7deba27748a355db06f01091d7daecf91601 +Author: Eugene Vinitsky +Date: Wed Apr 5 20:22:52 2017 -0700 + + fixed bug in computing when to check if a lane change has occured. There was a floating point error in the mod that was making lane changes way too infrequent + +commit fe843f3ef785bfb571f02279c0cb7b1180026c78 +Author: Eugene Vinitsky +Date: Tue Apr 4 23:02:02 2017 -0700 + + fixed major bug in initial conditions for entering cars. we were setting the past history to be a constant headway, which led to the length of the track not being conserved + +commit b1e6fe67ec8dc79c6f200edc93f00270170cff80 +Author: AboudyKreidieh +Date: Tue Apr 4 15:58:46 2017 -0700 + + fixed initial conditions to extend backwards in history, added failsafe + +commit 1a0c65c639c91abd85a28a80dd1ab108b9ded7e6 +Merge: fa98091e b7932f39 +Author: eugenevinitsky +Date: Mon Apr 3 12:24:31 2017 -0700 + + Merge pull request #74 from cathywu/Stochastic_Lane_Changes + + added updated OVM code + +commit b7932f397e362f0cab801f9597acd1b89a3e1e9d +Author: Eugene Vinitsky +Date: Mon Apr 3 12:22:34 2017 -0700 + + added updated OVM code that uses velocity of lag car and headway of lag car at entry time as the delay history of the entering car + +commit fa98091e7de42263141c1250c2770e918941406f +Author: Kanaad Parvate +Date: Mon Apr 3 11:38:20 2017 -0700 + + accidentally pushed local only changes + +commit 7ebc21c159bf21004c57bab4b5e97ed8260d5d14 +Author: Kanaad Parvate +Date: Mon Apr 3 11:34:45 2017 -0700 + + merge + +commit a36cadd8030efc6420304d58c05287d3ca7673f7 +Author: Nishant +Date: Sun Apr 2 16:18:22 2017 -0700 + + minor cistar tweaks (using safe-velocity safety controller, removing print statements, fixing small perturbation bug) + +commit b8be09efe51679e275a08cbd55c9da01f0f0cb73 +Author: Cathy Wu +Date: Sun Apr 2 15:07:20 2017 -0700 + + Working target velocity experiment (#72) + + * Eugene's working version + a few minor tweaks + + * arange --> linspace; space time diagram with limited time; a few parameter tweaks + + * time scaling for stochastic lane change model + + * tweaked simulation steps + + * EVERYTHING WORKS. We changed mu_appear to be 3.2 to make the number of average cars consistent with the data + + * leah's configuration (ish) + + * test config + + * FIX JSON serialization error when using stub from rllab by making our classes serializable and stub-ing at the right place in our experiment script; velocity experiment now works locally! and this should fix some issues with the AWS mode too. + + * modified velocity version of RL experiment for JSON serializable fixes; parameter tweaks + + * tweak simulation time step and max velocity + + * PEP8 + + * PEP8 + + * PEP8 + + * ITSC CISTAR: target velocity experiment configuration for the current plots in the paper (v1 of submitted paper) + +commit 1959ab683d5cb97c28c65ee0e12c8b4daf0dee5d +Merge: 5d4f5341 95ac38ef +Author: eugenevinitsky +Date: Mon Mar 20 15:45:10 2017 -0700 + + Merge pull request #73 from cathywu/stochastic_lane_pull + + Stochastic lane pull + +commit 95ac38efe05f0dc5aabe3102f94dbbdf355c8379 +Merge: 43d6a11d 5d4f5341 +Author: Eugene Vinitsky +Date: Mon Mar 20 15:43:44 2017 -0700 + + merged the stochastic simulation code + +commit 43d6a11d699303a8c19d516c40d28a0346a5442e +Author: Eugene Vinitsky +Date: Mon Mar 20 14:44:45 2017 -0700 + + untracked all the xml files + +commit 3419ba8b471da9c8945f8d153b43b0f8fa89ed87 +Merge: 7bfeac2b bfc7c107 +Author: Eugene Vinitsky +Date: Mon Mar 20 14:32:54 2017 -0700 + + Merge branch 'Stochastic_Lane_Changes' + + Added working ipython notebooks that are calibrated to give the right amount of lane changes and car density for the stochastic lane changing system + +commit bfc7c107dbf23f3bd30c05cfb28eabdb56ad28cb +Author: Eugene Vinitsky +Date: Mon Mar 20 14:32:10 2017 -0700 + + calibrated mu_appear and lane change time-step to give the right density and number of lane changes + +commit 8107c9ab0ebe1056c91eb6ea6d74579521b2bc6c +Author: Eugene Vinitsky +Date: Mon Mar 20 14:31:45 2017 -0700 + + calibrated mu_appear and lane change time-step to give the right density and number of lane changes + +commit 7e794e946d90bb3a61fe3998b242fab961d6a1ef +Author: Eugene Vinitsky +Date: Mon Mar 20 12:19:10 2017 -0700 + + added code for computing average number lane change distributions. Also added aboudys file that sets the delayed history of newly entering cars to be just a constant, which is their velocity upon entering + +commit 5d4f5341b9ca5a060f89dffd0c623a00b285f04e +Author: Nishant +Date: Thu Mar 16 15:26:13 2017 -0700 + + adding sugiyama experiments + +commit be12deba6d4d7f109bfa00b0ff59e849b7d05c19 +Author: Cathy Wu +Date: Tue Mar 14 17:41:53 2017 -0700 + + FIX JSON serialization error when using stub from rllab (#67) + + * Eugene's working version + a few minor tweaks + + * arange --> linspace; space time diagram with limited time; a few parameter tweaks + + * time scaling for stochastic lane change model + + * tweaked simulation steps + + * EVERYTHING WORKS. We changed mu_appear to be 3.2 to make the number of average cars consistent with the data + + * leah's configuration (ish) + + * test config + + * FIX JSON serialization error when using stub from rllab by making our classes serializable and stub-ing at the right place in our experiment script; velocity experiment now works locally! and this should fix some issues with the AWS mode too. + +commit c0ff2b337bc17b06e50aca81df0807884e5f3c71 +Author: Cathy Wu +Date: Tue Mar 14 00:17:01 2017 -0700 + + this gives the plots I generated for the first draft of the paper (which sent to alex last night) + +commit 54fa34f1a1c4d554531384d6f4f2169b62521afc +Author: Leah Dickstein +Date: Mon Mar 13 17:03:16 2017 -0700 + + I think this velocity exp works + +commit cc07035a087e8b8a14f7436e3c42aa3523679e98 +Author: Leah Dickstein +Date: Mon Mar 13 16:09:42 2017 -0700 + + super hacky version that appears to work + +commit 038822b94e38a0e77f04ec85f54171d1e3850434 +Author: Leah Dickstein +Date: Mon Mar 13 16:00:13 2017 -0700 + + getting emisison env to work + +commit 7bfeac2b04af649cd8ed434c7827c0abd994f3b1 +Author: Leah Dickstein +Date: Mon Mar 13 15:18:15 2017 -0700 + + getting emissionenv to work + +commit 2b6e1d5ca0428995c682b8138f40e5bfb8f34470 +Author: Leah Dickstein +Date: Mon Mar 13 14:55:20 2017 -0700 + + making emission env + +commit d103664e2376293901ebd099ff487e74a6e5a1b1 +Author: Cathy Wu +Date: Sun Mar 12 22:16:31 2017 -0700 + + requirements.txt: dependencies + +commit 39a117b6b3f9084b8193a5588f64a444e422c4e7 +Author: Eugene Vinitsky +Date: Sun Mar 12 20:05:42 2017 -0700 + + EVERYTHING WORKS. We changed mu_appear to be 3.2 to make the number of average cars consistent with the data + +commit 5c8dcc66ca79ff71c1f21986bd972d70ac210f4f +Author: Cathy Wu +Date: Sun Mar 12 18:40:56 2017 -0700 + + tweaked simulation steps + +commit 19f7027311dfb7738612980046927fea78447523 +Author: Cathy Wu +Date: Sun Mar 12 18:16:01 2017 -0700 + + time scaling for stochastic lane change model + +commit cb01655bb6231efa682189622487c17f67f64bf9 +Author: Cathy Wu +Date: Sun Mar 12 17:38:46 2017 -0700 + + arange --> linspace; space time diagram with limited time; a few parameter tweaks + +commit acd5ee4a1a4dcaf407bd2e18d2af0108ca90ba91 +Author: Cathy Wu +Date: Sun Mar 12 12:49:12 2017 -0700 + + Eugene's working version + a few minor tweaks + +commit 711deba6ca379b8341db58a9f25dd184cbdb88b7 +Merge: e16c0bf2 9fac0bfe +Author: eugenevinitsky +Date: Sat Mar 11 22:16:58 2017 -0800 + + Merge pull request #65 from cathywu/Stochastic_Lane_Changes + + Changes to SLC + +commit 9fac0bfe9cc3e37ada605930bed2f562325cd668 +Author: AboudyKreidieh +Date: Sat Mar 11 22:07:58 2017 -0800 + + Changes to SLC + +commit e16c0bf2feef8517980f661789afb0ea3073f1b1 +Author: Nishant +Date: Sat Mar 11 16:23:31 2017 -0800 + + updated parse_and_plot.py + +commit be964ca4d1851fd7116ea84e4b58af6f85509850 +Author: Kanaad Parvate +Date: Fri Mar 10 20:45:33 2017 -0800 + + perturbation code + +commit dbb0ec9bb22cf76b794817feede065528507856d +Author: Nishant +Date: Fri Mar 10 18:17:07 2017 -0800 + + diff failsafe + +commit 2b7337b1ab6294ea909bbea80bd20c612cc1fe43 +Author: Kanaad Parvate +Date: Fri Mar 10 17:52:09 2017 -0800 + + itsc experiments + +commit 020a91687279da30ab9dba2a1db80a66b61630c0 +Author: Kanaad Parvate +Date: Fri Mar 10 17:38:22 2017 -0800 + + further expanded spacing + +commit 0c4259231ec72a87fa76d79b6ea5094da8b72baa +Author: Kanaad Parvate +Date: Fri Mar 10 14:20:27 2017 -0800 + + better spacing options + clean up base_controller + +commit 9e9decd0f6bd8ea248fd499eb4491d0ce60f1103 +Merge: 5cc3fffe 0ba7f684 +Author: Kanaad Parvate +Date: Fri Mar 10 12:00:30 2017 -0800 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic + +commit 5cc3fffebb499f0e58aff5a51235139416ab9f53 +Author: Kanaad Parvate +Date: Fri Mar 10 12:00:23 2017 -0800 + + v_safe can be 0, fail-safes should work + +commit 0ba7f684df80770dea3681296cbdd8408f931663 +Author: Nishant +Date: Fri Mar 10 01:51:22 2017 -0800 + + added dan work's FollowerStopper controller (constant-velocity with safety-checking) + +commit 79eb9ae5ee3dbd69fa731f46dd936bd2d1987329 +Merge: 1fcec743 1eedee46 +Author: Kanaad Parvate +Date: Thu Mar 9 23:27:10 2017 -0800 + + merge + +commit 1fcec7431e6b28dcc1ff8230626f9afd55a80ff2 +Author: Kanaad Parvate +Date: Thu Mar 9 23:24:48 2017 -0800 + + naming and ovm default parameter is negative bug + +commit 1eedee465fa7eddfc644c188ac9cebca74b00dbe +Author: Kanaad Parvate +Date: Thu Mar 9 23:11:30 2017 -0800 + + another minor naming bug fix + +commit 37c4bb7c762429539dace147da579be31142eecf +Author: Kanaad Parvate +Date: Thu Mar 9 23:09:57 2017 -0800 + + minor naming bug fix + +commit 963042af02ce8d0a0edf9c7480395a25d878ffb2 +Merge: 44b0922b 71df5932 +Author: Kanaad Parvate +Date: Thu Mar 9 23:07:24 2017 -0800 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic + +commit 44b0922ba986723ffdf4b9ff7430e1740610ec6d +Author: Kanaad Parvate +Date: Thu Mar 9 23:07:14 2017 -0800 + + printing safe_vel for debugging safety + +commit 71df593261c665a85b330b45d468f0c4b0230b9b +Author: nskh +Date: Thu Mar 9 21:48:45 2017 -0800 + + merging plotting code with master (#64) + + * first pass at adding plotting capability, probably won't work + + * plotting works! using parse_and_plot.py + + * removed old logging code from base_env + + * changed controller params a bit + +commit cce52581cd9abb295398319bcef7ae090ece0e50 +Author: Kanaad Parvate +Date: Thu Mar 9 21:39:10 2017 -0800 + + new experiments + +commit 3353b5f71b5fe7656ac5221e8e447e776f4fd90f +Author: Kanaad Parvate +Date: Thu Mar 9 21:35:26 2017 -0800 + + fixed failsafes; fixed bug with reset_env + +commit 5c3097b7a184dad0a39757e0870c7c31fc84382c +Author: Kanaad Parvate +Date: Thu Mar 9 21:28:32 2017 -0800 + + observation space is all vehicles, action space is only rl + +commit 3237221b044eea80fb521c0154e4fffb84ab4527 +Author: Kanaad Parvate +Date: Wed Mar 8 19:59:30 2017 -0800 + + rl velocity controllers + +commit bc103972a80978e6ca0a41d33925b5f2e28ad9c8 +Author: eugenevinitsky +Date: Wed Mar 8 18:46:21 2017 -0800 + + updated safe_action to account for the fact that the lead vehicle (#62) + + * updated safe_action to account for the fact that the lead vehicle could have a smaller position than the following vehicle due to the mod in ring road + + * added some init files + + * Changes to SLC + + * sumo binary + + * deleting xml files + +commit 8e9194177128743f124baca9d27d265f2bd5df72 +Merge: 5075f027 ede13b25 +Author: Kanaad Parvate +Date: Wed Mar 8 18:00:42 2017 -0800 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic + +commit 5075f027e8465013e7bd03329d63fa27471b04ca +Author: Kanaad Parvate +Date: Wed Mar 8 18:00:26 2017 -0800 + + sumo binary + +commit ede13b25ca82d2f59502daa5236ca1bdf0257613 +Merge: 2358a295 abe99520 +Author: eugenevinitsky +Date: Wed Mar 8 11:38:18 2017 -0800 + + Merge pull request #63 from cathywu/Stochastic_Lane_Changes + + Changes to SLC + +commit abe99520804c208fbd67334fcfc0224d231498e4 +Author: AboudyKreidieh +Date: Wed Mar 8 11:36:14 2017 -0800 + + Changes to SLC + +commit 2358a2959b2215d834d790da88fb19736c51f0c3 +Author: Leah Dickstein +Date: Tue Mar 7 22:02:58 2017 -0800 + + added some init files + +commit a6c551798cc6d84bffc62c12a9a4e2379d62aff0 +Author: Eugene Vinitsky +Date: Tue Mar 7 14:54:53 2017 -0800 + + added abouds stochastic lane changing code. This is used to simulate a single lane with cars popping in and out. I didnt do a pull request because it doesnt touch CSTAR and Im not sorry + +commit 7edf47a1d56a74f43a7524eebc569f1cfc95a9c8 +Author: Kanaad Parvate +Date: Tue Mar 7 03:27:02 2017 -0800 + + old aws file, sumo issue documentation + +commit c5557fa10df44d5d7aa2e26fc1e9a4b1c6432411 +Merge: 41d9ef84 3fc8a3c5 +Author: Kanaad Parvate +Date: Tue Mar 7 02:57:42 2017 -0800 + + Merge branch 'master' into fixing-rl + +commit 41d9ef84e217a87cfd0734c941644aae7ce14687 +Author: Kanaad Parvate +Date: Tue Mar 7 02:56:56 2017 -0800 + + using safe_action now, parameters need to be tuned for successfully avoiding crashes + +commit 1a876e8f0ed28ee49191f84cb4815adc561f3e5e +Author: Kanaad Parvate +Date: Tue Mar 7 02:22:37 2017 -0800 + + refactored examples + +commit 7d0d447664b8e3fd1abbdd7752866b555d818c10 +Author: Kanaad Parvate +Date: Tue Mar 7 02:17:02 2017 -0800 + + deleted xml files + +commit 53321c96e39f325d13fed0ba18d6662fc8ed5dbb +Author: Eugene Vinitsky +Date: Mon Feb 27 13:48:54 2017 -0800 + + properly subclassed controllers + +commit e1e10a9f487a03b4c6e91639683ed7946e509b12 +Author: Eugene Vinitsky +Date: Mon Feb 27 13:05:48 2017 -0800 + + adding xml + +commit a5dbcffcdc36833912c15313c70b5cfa0b71ed70 +Author: Eugene Vinitsky +Date: Tue Feb 28 07:54:14 2017 -0800 + + adding file + +commit bc2c83dc06b76528f594e1a60e7e88c7bf771f82 +Author: Kanaad Parvate +Date: Tue Mar 7 02:08:13 2017 -0800 + + deleting net files + +commit a767813b1aae7c7b4ba59b88c2dc9beab1e8c1ba +Author: Eugene Vinitsky +Date: Mon Feb 27 13:15:57 2017 -0800 + + fixed a bug in safe_action wherein it was returning the desired velocity, not the desired acceleration + +commit 9eb76785d9de85e61ff34c905637782e48650aff +Author: Eugene Vinitsky +Date: Mon Feb 27 13:04:29 2017 -0800 + + switched the environment to use safe-action instead of get-action + +commit 78d1de2c29dd6564c93f602c3aef7cd8cb806ea5 +Author: Eugene Vinitsky +Date: Mon Feb 27 12:52:57 2017 -0800 + + added base controllers and base car + +commit d2a266ca413a017df2d17305db2126a3a1922d8e +Author: Kanaad Parvate +Date: Mon Mar 6 11:47:07 2017 -0800 + + update base_env to handle rl + +commit f497a6c04bd82803bf0f23ff1ef14db37958e200 +Author: nskh +Date: Sun Feb 26 18:43:56 2017 -0800 + + Merging car-following controllers that now use classes into master (#61) + + * first commit for controllers that are classes, not functions + + * made controllers classes and changed base_env.py to fit that + + * fixed some dumb mistakes + + * fixed more in the tests + +commit a6f960ce8e406c3fd7b7951b2f9d0a6be1fc3ead +Author: Leah Dickstein +Date: Sun Feb 26 18:11:05 2017 -0800 + + sorry quick fix + +commit 73eb4eb9cd38ab1b5d8847fdd616ff72e3470616 +Author: Kanaad Parvate +Date: Mon Mar 6 17:54:33 2017 -0800 + + minor typo + +commit 4e2373c0a08ea8643b1f5a2c5c37e422affebaa3 +Author: Leah Dickstein +Date: Sun Feb 26 18:10:39 2017 -0800 + + aws compatibility + +commit 1db7a38c9083a699bc676b9396808fc64d5b8841 +Author: Kanaad Parvate +Date: Mon Mar 6 17:52:27 2017 -0800 + + fixed rl-build-tester + +commit 3fc8a3c550a45a9eefad86af4e2a037ab4b423f1 +Author: Kanaad Parvate +Date: Mon Mar 6 11:47:07 2017 -0800 + + update base_env to handle rl + +commit 1fc495d6b479b77154e035d0b5d21b55136a5290 +Author: Eugene Vinitsky +Date: Wed Mar 1 18:49:25 2017 -0800 + + chagned base_env.py to use safe_action + +commit 14083c6abe300880a98b61c1900d3bee29a01d69 +Author: Eugene Vinitsky +Date: Tue Feb 28 07:54:14 2017 -0800 + + added file describing failsafe in fail-safe.md + +commit 5fe50d7794e05783c0a9a4040804cd8120fb5042 +Author: Eugene Vinitsky +Date: Mon Feb 27 13:48:54 2017 -0800 + + properly subclassed controllers + +commit 11aecadfacf1c4e95fac567afd007e2135f2c86b +Author: Eugene Vinitsky +Date: Mon Feb 27 13:15:57 2017 -0800 + + fixed a bug in safe_action wherein it was returning the desired velocity, not the desired acceleration + +commit f63c990b61921c2a3b320e127412cddceaa1f69c +Author: Eugene Vinitsky +Date: Mon Feb 27 13:05:48 2017 -0800 + + added xml files to gitignore + +commit 761bfcf56688f5d76a73db4e6277dd93df9519bd +Author: Eugene Vinitsky +Date: Mon Feb 27 13:04:29 2017 -0800 + + switched the environment to use safe-action instead of get-action + +commit 66e40ba5cb49f0ff3f6ac98085a46de3641d4f0f +Author: Eugene Vinitsky +Date: Mon Feb 27 12:52:57 2017 -0800 + + added base controllers and base car + +commit f0b2ca4d7d48a9397759c56c0cbc7a6d63c2bc74 +Author: Leah Dickstein +Date: Sun Feb 26 18:45:41 2017 -0800 + + RL tutorial file working on AWS + +commit a1ef6c369100f169c71a152c1f957ac8c4e56b6a +Author: nskh +Date: Sun Feb 26 18:43:56 2017 -0800 + + Merging car-following controllers that now use classes into master (#61) + + * first commit for controllers that are classes, not functions + + * made controllers classes and changed base_env.py to fit that + + * fixed some dumb mistakes + + * fixed more in the tests + +commit 97d69cbfa4d60e0ab822db0b7b3b7e69fcb41677 +Author: Leah Dickstein +Date: Sun Feb 26 18:11:05 2017 -0800 + + sorry quick fix + +commit 4d63324eeab7670ede6fe6e5186496d0d7decaf4 +Author: Leah Dickstein +Date: Sun Feb 26 18:10:39 2017 -0800 + + aws compatibility + +commit 4e31e6e32a81430696b6dcbd2d2b5ad96afac4fb +Author: Kanaad Parvate +Date: Sun Feb 26 17:58:10 2017 -0800 + + fixed tests + +commit 224cc4b6ac454db300811301e3a8d6ae45fd9950 +Author: Leah Dickstein +Date: Sun Feb 26 17:56:48 2017 -0800 + + Congested env (#57) + + * standardize initial_params to cfg_params + + * set initial config shuffle default to false + + * quick fix to make_routes + + * quick add to readme + + * added departSpeed to type_params + + * slight change for readability + + * can't read my own code, minor bugfix + + * added departSpeeds as 0 + +commit 56aba9170de6acdd4ef8725a9f090d23264d1033 +Author: eugenevinitsky +Date: Sun Feb 26 17:47:44 2017 -0800 + + Update README.md + +commit c693957a4f69936f2e518e8db5887793b9318441 +Author: eugenevinitsky +Date: Sun Feb 26 17:47:04 2017 -0800 + + Update README.md + +commit 10ca921eb1740c5675569bf6205b7445e24585b6 +Author: Kanaad Parvate +Date: Sun Feb 26 17:44:56 2017 -0800 + + missing sim-step + +commit 3e9163fff30e9fbc8a8ed134b80586df31391289 +Merge: 413b9720 39f9c5af +Author: Kanaad Parvate +Date: Sun Feb 26 16:52:02 2017 -0800 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic + +commit 39f9c5af60dfe4ed6ece787a6f4ae86cd47e184f +Author: Kanaad Parvate +Date: Sun Feb 26 16:51:56 2017 -0800 + + loop code review (#60) + +commit 413b9720200cac479e21b7668876597fc34ddea6 +Author: Kanaad Parvate +Date: Sun Feb 26 16:50:06 2017 -0800 + + testing part 3 + +commit b4b14fdafb25b908de1901731ed18e63fcf2bc28 +Author: Kanaad Parvate +Date: Sun Feb 26 16:48:26 2017 -0800 + + testing tests + +commit ace2ab540313a8be5d497e1d582462d6b7236031 +Author: Cathy Wu +Date: Sun Feb 26 16:44:52 2017 -0800 + + Sample unit tests + commit hook for running unit tests (#58) + + * A few starter unit tests for cistar-dev, along with git commit hook for + automatically running the tests when running `git commit`. + + * Update unit testing instructions + +commit c5e2a8a6c244d476355c2a86cafb0f8814cbc3ed +Author: AboudyKreidieh +Date: Sun Feb 26 16:05:45 2017 -0800 + + code review for lan_change_controllers, velocity_controllers, and gen (#56) + +commit aae224d9f2efb6f86ac8cfe905076a66546dae34 +Author: Leah Dickstein +Date: Sun Feb 26 15:12:10 2017 -0800 + + base_env documentation (#55) + + * base_env documentation + + * cleaned up a bit + +commit 940903cb6558258e6eee50bca788c44cf78ce688 +Author: Cathy Wu +Date: Sun Feb 26 14:45:16 2017 -0800 + + CISTAR documentation: loop_scenario.py (#54) + +commit d353f41e7890c682a0da7d20340ea5cd288d1f5e +Author: Cathy Wu +Date: Sun Feb 26 13:28:20 2017 -0800 + + CISTAR Documentation: Scenario class (#53) + +commit d59202ca558e38e3768561fd79ff033e4414dd79 +Author: Cathy Wu +Date: Sun Feb 26 12:01:25 2017 -0800 + + CISTAR Documentation (lane changing models) + +commit 5997f0005c2897031f95375e60c17bea9092e72c +Merge: e0f7655e 86940c5c +Author: Kanaad Parvate +Date: Sun Feb 26 11:58:59 2017 -0800 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic + +commit e0f7655e224d025586eee20b07c591f386376336 +Author: Kanaad Parvate +Date: Sun Feb 26 11:58:34 2017 -0800 + + minor changes to the example builds + +commit 86940c5ca0386a68dc23cc7f5f2ee9304dc1e6b1 +Merge: c5639726 37057cd0 +Author: Leah Dickstein +Date: Fri Feb 24 12:18:37 2017 -0800 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic + +commit c5639726a0c7d8d3835ad06bb9b6303bcbe59de3 +Author: Leah Dickstein +Date: Fri Feb 24 12:18:29 2017 -0800 + + readme + +commit 37057cd065dd18b511af1c2167ecd1e5ff8eb394 +Author: Cathy Wu +Date: Fri Feb 24 11:48:44 2017 -0800 + + Minor documentation and cleanup on sumo experiment params + +commit 55b80e3cd6529fdcb345f195693fbf584c6f606c +Author: Kanaad Parvate +Date: Fri Feb 24 02:40:44 2017 -0800 + + rl testing + +commit 30f870e8a5534244c91ccfc5fc5e7ca6dcb6290d +Author: Kanaad Parvate +Date: Thu Feb 23 16:58:23 2017 -0800 + + split loop controller, and created separate file for rl-build-testing + +commit 4d530a7f3227ceb8c9b791afaa44e8c9d60e237f +Author: Nishant +Date: Thu Feb 23 16:24:05 2017 -0800 + + added lane-checking to car following models. needs validation. + +commit 6664d9b78aa6c1d9b235eb5882c2ffe63adb1015 +Author: Nishant +Date: Thu Feb 23 00:25:49 2017 -0800 + + left a man behind + +commit a47c8acf4f7cca3377629ad65b16c22775061be2 +Author: Nishant +Date: Thu Feb 23 00:25:20 2017 -0800 + + TODO: make car-following models track lanes but LANE CHANGES HAPPEN + +commit e863c4f9ca65d28b7bbe312c3f7628a2bf704cb7 +Merge: 47e5167d e9e154ac +Author: Leah Dickstein +Date: Tue Feb 21 14:04:36 2017 -0800 + + merge conflict + +commit 47e5167d6ca63b12dad4a1cd467e249e49a8e8fe +Author: Leah Dickstein +Date: Tue Feb 21 14:00:11 2017 -0800 + + connecting cistar to rllab architecture + +commit e9e154ac48d491e6d6acc9b001274918fa454843 +Merge: d6ee34c9 75028b69 +Author: Kanaad Parvate +Date: Tue Feb 21 12:47:04 2017 -0800 + + merge + +commit 75028b69a20261c44081f807a4a18d6d4bcb2929 +Author: Leah Dickstein +Date: Tue Feb 21 11:28:19 2017 -0800 + + leah getting her first exp set up + +commit b069a1514fca38d4164243736ef54e777f3a5af3 +Author: Leah Dickstein +Date: Tue Feb 21 10:10:59 2017 -0800 + + added init files + +commit d6ee34c979aaef712809f77d9c5693ba0090633a +Author: Kanaad Parvate +Date: Mon Feb 20 19:17:10 2017 -0800 + + bulletproofing + +commit b25f7a1e3a331f479e3221ca28c2ba3d10e7a655 +Merge: 132e92ce b4796c21 +Author: Leah Dickstein +Date: Mon Feb 20 19:01:46 2017 -0800 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic + +commit 132e92ce93bfd482c50ea16abbd404d3c37b8a26 +Author: Leah Dickstein +Date: Mon Feb 20 18:52:38 2017 -0800 + + leah learning cistar + +commit b4796c212b5517c0bec2f55e13493c4b7ba13525 +Author: Cathy Wu +Date: Sat Feb 18 00:18:51 2017 -0800 + + working implementation of V(s) function approximation; variance computation and reduction via V(s) baseline; tf definitions for action baseline + +commit c3bd40806fa494c36c5c2d0a119b8207dea51c06 +Merge: b7efdc78 64fbc79a +Author: Cathy Wu +Date: Fri Feb 17 22:01:35 2017 -0800 + + Merge branch 'master' of github.com:cathywu/learning-traffic + +commit b7efdc787a7b9cc78f47e16fbd91e36ab5d12225 +Author: Cathy Wu +Date: Fri Feb 17 22:01:31 2017 -0800 + + Compute gradient in a batch; score --> output; parameter changes + +commit 64fbc79aa935a906061e2e81e7d4267af4d95d1c +Author: Nishant +Date: Thu Feb 16 18:34:16 2017 -0800 + + added bad ovm controller + +commit aadc5416e449dd709fbd3e412622832f7f061792 +Merge: c0ad1172 49a2bbc9 +Author: Cathy Wu +Date: Wed Feb 15 10:04:46 2017 -0800 + + Merge branch 'master' of github.com:cathywu/learning-traffic + +commit c0ad1172fd3452a407704553cf305f0cabfd75b1 +Author: Cathy Wu +Date: Wed Feb 15 10:00:55 2017 -0800 + + - Small initialization of output layer weights + - Normalization of observations + - Learn log stds instead of stds + - Partial implementation of computing gradients in a batch + - Partial implementation of V baseline + - Psuedocode for action baseline + - Added many TODOs and FIXMEs; general cleanup + +commit 49a2bbc9152daa4a58c1e91de59c9db7d0615deb +Merge: 4f61455e f10a216a +Author: Kanaad Parvate +Date: Mon Feb 13 11:57:30 2017 -0800 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic + +commit 4f61455e58e54e27b4d038702f7fbe983e3ca9a0 +Author: Kanaad Parvate +Date: Mon Feb 13 11:57:20 2017 -0800 + + better cfms + +commit f10a216a5f1cc1b70df62b2ba8c96f05da7cd4c9 +Author: Cathy Wu +Date: Sat Feb 11 18:27:21 2017 -0800 + + Partial prototype implementation: deep copy of score, variance without baseline and with value baseline, appropriate surrogate loss with log likelihood ratio (Issue: nans) + +commit b218992684dc70689ee883e8912d005c87ae5f1d +Merge: 4b5f6967 8d5721ce +Author: Cathy Wu +Date: Sat Feb 11 17:31:20 2017 -0800 + + Merge branch 'master' of github.com:cathywu/learning-traffic + +commit 4b5f6967ad76666a376bd69dcb5aaf966c8facb6 +Author: Cathy Wu +Date: Sat Feb 11 17:31:17 2017 -0800 + + Partial prototype implementation: Gaussian MLP and log likelihood function, minor refactoring and cleanup + +commit 8d5721cea290a3038ae4cfae6292c6b5b1ed4b2d +Author: Kanaad Parvate +Date: Thu Feb 9 23:13:52 2017 -0800 + + 'working' controller + +commit ad2e04bceba6df3999283d650bd0595022d9b2f9 +Author: Nishant +Date: Thu Feb 9 22:33:23 2017 -0800 + + 0.03% percent chance this works + +commit e59f6f18dcb0d4165d8148b1cdaa83cce354e10d +Author: Kanaad Parvate +Date: Thu Feb 9 21:50:27 2017 -0800 + + higher-order cfm half done + +commit 7228824a24624487132e264b4d3953da5c4a76b1 +Author: Nishant +Date: Thu Feb 9 21:41:44 2017 -0800 + + bad car following models + +commit f339b6f7c66860346508c7629be13099d2f3140a +Author: Kanaad Parvate +Date: Thu Feb 9 21:38:35 2017 -0800 + + controllers folder + +commit 7ea19076c2532f85fd0c57e065d65f21b9b1b349 +Author: Kanaad Parvate +Date: Thu Feb 9 21:36:20 2017 -0800 + + merge + added folder + +commit 08ea5f02a14fd109dff43fc00304d6ea1909125b +Author: Nishant +Date: Thu Feb 9 21:31:45 2017 -0800 + + changed apply_action + +commit f4c179c8e42535b11749e17f4fa34f67e01ddb1e +Author: Cathy Wu +Date: Wed Feb 8 19:38:12 2017 -0800 + + Slightly more general setup + +commit 36e5aa8df0311767056ed58a47336a5f6fdfa3a5 +Author: Cathy Wu +Date: Wed Feb 8 19:08:12 2017 -0800 + + tensorflow + OpenAI gym + Mujoco example + +commit 09061e4f00f2679a75b6b1e4e2f1a7e4b4123a58 +Author: Cathy Wu +Date: Wed Feb 8 14:14:46 2017 -0800 + + Basic OpenAI example + +commit fcb70aaaec1ecfc402f35ea188a125c98c1b44fe +Merge: df374bd0 20112e36 +Author: Cathy Wu +Date: Wed Feb 8 14:14:13 2017 -0800 + + Merge branch 'master' of github.com:cathywu/learning-traffic + +commit df374bd06f72ee52cca3eb94f6aa1d8e8dc45d2d +Author: Cathy Wu +Date: Wed Feb 8 14:14:10 2017 -0800 + + Old changes; use scipy instead of controls toolbox; integrate sspade + +commit 20112e3678692ed70b2a231b5a427b6c7d2ac98a +Author: Kanaad Parvate +Date: Mon Feb 6 18:22:11 2017 -0800 + + reset, loading vehicles, equal spacing + +commit c8dbb8fa50331c6b797bf8c1a23e44ae5a430b4f +Author: Kanaad Parvate +Date: Wed Feb 1 14:08:20 2017 -0800 + + working reset function + +commit b9ce411af98f94c78b92bd509a7c07a6e11c5985 +Merge: 9f0a67fd 3f12e8a3 +Author: Kanaad Parvate +Date: Mon Jan 30 19:06:33 2017 -0800 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic + +commit 9f0a67fdbf75641cfdd6ddd1dd8c192fe3634942 +Author: Kanaad Parvate +Date: Mon Jan 30 19:06:18 2017 -0800 + + CISTAR progress + +commit 3f12e8a32e4a805239541f277ca0d18e0e449d53 +Author: Eugene Vinitsky +Date: Thu Jan 26 10:33:59 2017 -0800 + + Wrote a symmetric exponential moving average filter for analyzing the NGSIM velocities + +commit fe51c6a19ada210b96fc7a7776968a897c304696 +Author: Kanaad Parvate +Date: Fri Jan 20 16:17:49 2017 -0800 + + delete old files + +commit a5721169b0c22fbb165a60608a462f2ebcb6c742 +Author: Kanaad Parvate +Date: Fri Jan 20 16:16:43 2017 -0800 + + cistar-cfg files + +commit 173ba70b1a2ee29388a933bcb9431aaf568d8de5 +Merge: 47f5afa2 51347b52 +Author: Kanaad Parvate +Date: Fri Jan 20 16:15:55 2017 -0800 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic + +commit 47f5afa28ef114c60697d9305a86dbea739ea2ed +Author: Kanaad Parvate +Date: Fri Jan 20 16:15:25 2017 -0800 + + cistar v1.0 + +commit 51347b52ca0d1a513aba7fe22a496e517f84e653 +Merge: 8a1f25b2 345ecacd +Author: Cathy Wu +Date: Wed Jan 18 18:59:42 2017 -0800 + + Merge branch 'master' of github.com:cathywu/learning-traffic + +commit 8a1f25b2d06a3e77bb7b096a43f94bd010f4d323 +Author: Cathy Wu +Date: Wed Jan 18 18:59:39 2017 -0800 + + BROKEN CODE: partial implementation, replacing pade approximation with a mix of pade and bessel filter in state space representation to support a closer fit for an impulse response to a delayed system. Unresolved: a working cascade of systems. + +commit 345ecacd8862256e1080feb49daa2837a4e3b3dd +Merge: 37eb6973 dcca40cd +Author: Eugene Vinitsky +Date: Wed Jan 18 11:39:00 2017 -0800 + + Merge branch 'pval_analysis' + + Added eigenvalue code for the bilateral case + +commit dcca40cd88ea3547014d2d0b0bd50104ca0d787c +Author: Eugene Vinitsky +Date: Wed Jan 18 11:38:25 2017 -0800 + + added code for computing the eigenvalues for the bilateral case. Can also compute the eigenvalues for systems in which manual and automated cars are randomly distributed + +commit 37eb6973c22a44078571f8b4c45b829568463a05 +Author: Cathy Wu +Date: Sat Jan 14 12:37:33 2017 -0800 + + Alternating communication delays, following L2 and Linfty string stability conditions. First commit for #18. Linfty plots relies on resolution of #17. + +commit bc0161d49350303f91596083f16b95a32fe8b936 +Author: Cathy Wu +Date: Sat Jan 14 12:14:00 2017 -0800 + + Code to reproduce Ploeg2014 Figures 4(a) and 4(b). 4(a) looks close, but it trends in the wrong direction (why?); subsequently, 4(b) is just wrong. Why??? First commit for #17 + +commit 617f79b55499c1839c9794dd50fe107b8ed9604a +Author: Cathy Wu +Date: Sat Jan 14 11:35:49 2017 -0800 + + Add useful titles, setup for reproducing Figure 4(a) from Ploeg2014 + +commit 411801cff7d511315d4eef097320769399a9c0a9 +Author: Cathy Wu +Date: Sat Jan 14 11:26:49 2017 -0800 + + Refactored system generation into functions; added reproduction of Figure 3(b) from Ploeg (though I believe they are using different constants because my reproduction is consistent with 3(a) whereas theirs may not be); added some minor documentation. + +commit 18374c1f02e3c6427075dfcf05594deb86470b82 +Author: Cathy Wu +Date: Fri Jan 13 18:50:07 2017 -0800 + + Actually, it was reproducing Ploeg2014 plots, just with different units! I've re-done the axes, added some more documentation. Resolves #16. + +commit 86b370f3b246c891a2909955a4e959c0fcf8e1c9 +Merge: 10db3e51 ccb48171 +Author: Cathy Wu +Date: Fri Jan 13 16:23:16 2017 -0800 + + Merge branch 'master' of github.com:cathywu/learning-traffic + +commit 10db3e511096ccde23e348ae684c55748ecbf023 +Author: Cathy Wu +Date: Fri Jan 13 16:23:12 2017 -0800 + + Two attempts at reproducing Figure 3(a) of Ploeg2014. + +commit ccb48171179eafa0701fdf72702e9ff416b36f3b +Author: Eugene Vinitsky +Date: Fri Jan 13 14:47:54 2017 -0800 + + rewrote the code so it doesnt re-analyze the headways everytime, instead it pulls them from an output file. Cuts down the runtime a lot + +commit adf6f01a758b7c7d5f7308c7a9b105e50fad4602 +Author: Eugene Vinitsky +Date: Wed Jan 11 13:15:54 2017 -0500 + + added in analysis of US-101 code + +commit ea641cc5df0a289fc927b6174588f80fcc77c6a1 +Author: Eugene Vinitsky +Date: Tue Jan 10 14:27:31 2017 -0500 + + updated to pep8 + +commit f052be905a06fd306dc96f6e7327078c980c6bfa +Author: Eugene Vinitsky +Date: Tue Jan 10 13:34:23 2017 -0500 + + added code that computes the headway when a car begins entering the lane for a lane change. Also added code that divides each bin in the histogram by the total number of counts in that bin for the whole span of NGSIM data, which normalizes the counts by their likelihood of appearing + +commit d29800e977994e1c055bc07bd71b15a7f91b8d49 +Author: Eugene Vinitsky +Date: Fri Dec 23 18:41:25 2016 -0500 + + updated to PEP8 + +commit dccc19946011d8f5064e20544b30061a27081771 +Author: Eugene Vinitsky +Date: Fri Dec 23 18:38:00 2016 -0500 + + added code that computes the headway from the following vehicle when its leading vehicle exits the lane. The procedure is based on Kestin, Thiemann 2008. + +commit 1b9a513f8d3609e268b4ab7f4b9ec9f688b3fb1d +Author: Eugene Vinitsky +Date: Thu Dec 22 15:51:45 2016 -0500 + + added code that computes headways before a lane change in and out for ngsim data + +commit 3f5c05c064bacbcd79d2bfc48f3810963941cbf8 +Author: Nathan Mandi +Date: Tue Dec 20 23:21:27 2016 -0500 + + ExperimentEnv starters + +commit d17a5f4de7976ed7fe7ea0659142d97b1a7c8917 +Author: Nathan Mandi +Date: Thu Dec 15 19:10:30 2016 -0500 + + Minor changes + +commit e43ed6d50af21a79cb30c5de0f36e0c042cee6e9 +Author: Leah Dickstein +Date: Wed Nov 30 14:07:28 2016 -0800 + + Code needs cleanup, but it moves a lot of code changes to the train file to be more compatible with CISTAR + +commit 0ec1c1148fbecb89a0816d4b0627aa72c5cf23c9 +Author: Leah Dickstein +Date: Fri Nov 25 00:13:41 2016 -0800 + + working on emission env and visualizer + +commit 74b1d5cba3feca83eb839a07f13d78618913cf76 +Author: Leah Dickstein +Date: Thu Nov 24 16:51:11 2016 -0800 + + working toy speed example with larger highway circle called leah-3 and 12 cars on the track + +commit f63d1d4cceb9f87c3ae6a8d3c978f37d6e9ad8d1 +Merge: 8561f30d 20f9987f +Author: Nathan Mandi +Date: Thu Nov 17 18:25:39 2016 -0800 + + Merge branch 'master' of https://github.com/cathywu/learning-traffic + +commit 8561f30de4e36114ac4ccd5ac8bdd6efec715cd4 +Author: Nathan Mandi +Date: Thu Nov 17 18:22:45 2016 -0800 + + Changes to rllab interface + +commit 20f9987f098604482b7ad45b7cb5fc01105f3f6d +Author: Kanaad Parvate +Date: Thu Nov 17 17:29:22 2016 -0800 + + minor changes to sumo environment + +commit 724d46f88218c1098d30055efab59323fcc40a40 +Author: Kanaad Parvate +Date: Thu Nov 17 04:57:54 2016 -0800 + + vehicle list processing + loop file generation + skeleton for interfacing with env + +commit 2e2d5739b1488e340655bcaece75d199ebb35c76 +Author: Leah Dickstein +Date: Wed Nov 16 15:00:06 2016 -0800 + + shouldn't break up privacy + +commit d00a148e81799e1ca4f417a4f4b3e65d3ec99f9b +Author: Leah Dickstein +Date: Wed Nov 16 14:54:13 2016 -0800 + + oops, can't go on public github + +commit 619c68d7b24751b6ba87cc3119375d79d888774b +Author: Leah Dickstein +Date: Wed Nov 16 11:42:31 2016 -0800 + + Adding docker information and figuring out how to run aws train from different dir + +commit cd1aea3ae5b23473e0a5a3f082d16c6b336452b2 +Author: Leah Dickstein +Date: Thu Oct 27 21:25:44 2016 -0700 + + update with sumo linked training environment + TRPO train script + +commit 85ea3711ca9678fd0560b04a3cc0d2c52e071817 +Author: Nathan Mandi +Date: Tue Nov 15 17:36:53 2016 -0800 + + Changes to sumo interface + +commit 070a57b22f3ea1e51aa42cf79c1ef8cfe42e3c25 +Author: Nathan Mandi +Date: Mon Nov 7 12:49:19 2016 -0800 + + First skeletons of sumo++ + +commit b55f2592c8e46a3bf6d99c0763fed5ad8a6f9f48 +Author: Kanaad Parvate +Date: Sun Oct 30 21:39:21 2016 -0700 + + step test + +commit ec7195ca0cf0d53cdc2fb9fae0eb43ef86f14a0a +Author: Kanaad Parvate +Date: Sun Oct 30 21:38:00 2016 -0700 + + added stetest.py + +commit c40c854349bea718acea951bb4f55fb280f35c04 +Author: Nathan Mandi +Date: Fri Oct 28 01:14:07 2016 -0700 + + Typo + +commit e79c686bf8485327ae9c102e36295c339947e332 +Author: Leah Dickstein +Date: Thu Oct 27 21:25:44 2016 -0700 + + update with sumo linked training environment + TRPO train script + +commit 7f6b978f5df06fe942d12167db2ca97bd41ff3c3 +Author: Leah Dickstein +Date: Thu Oct 27 21:06:42 2016 -0700 + + test push + +commit 7b265817b3574a30f5f60d978ded45bbcb2cc2c5 +Author: Kanaad Parvate +Date: Tue Oct 4 12:47:59 2016 -0700 + + mit circle simulation + +commit 79b71adace89928e62819ca3b645b5c200acfbf3 +Author: Cathy Wu +Date: Fri Sep 16 14:19:47 2016 -0700 + + Initial commit From 8e140835ca9e5c6e06b5747ec4d3c250ad170844 Mon Sep 17 00:00:00 2001 From: liljonnystyle Date: Mon, 6 Jul 2020 16:34:07 -0700 Subject: [PATCH 48/60] address pydocstyle and flake8 issues --- flow/core/kernel/vehicle/base.py | 16 ++++- flow/core/kernel/vehicle/traci.py | 40 ++++--------- flow/core/params.py | 7 ++- flow/core/rewards.py | 23 +++----- flow/energy_models/base_energy.py | 8 ++- flow/energy_models/power_demand.py | 92 ++++++++++++++++++++++------- flow/energy_models/toyota_energy.py | 37 ++++++------ 7 files changed, 135 insertions(+), 88 deletions(-) diff --git a/flow/core/kernel/vehicle/base.py b/flow/core/kernel/vehicle/base.py index 9ca83ab40..a3a510e13 100644 --- a/flow/core/kernel/vehicle/base.py +++ b/flow/core/kernel/vehicle/base.py @@ -314,7 +314,7 @@ def get_num_not_departed(self): """ raise NotImplementedError - def get_fuel_consumption(selfself, veh_id, error=-1001): + def get_fuel_consumption(self, veh_id, error=-1001): """Return the mpg / s of the specified vehicle. Parameters @@ -327,6 +327,20 @@ def get_fuel_consumption(selfself, veh_id, error=-1001): ------- float """ + raise NotImplementedError + + def get_energy_model(self, veh_id): + """Return the energy model class object of the specified vehicle. + + Parameters + ---------- + veh_id : str or list of str + vehicle id, or list of vehicle ids + Returns + ------- + subclass of BaseEnergyModel + """ + raise NotImplementedError def get_speed(self, veh_id, error=-1001): """Return the speed of the specified vehicle. diff --git a/flow/core/kernel/vehicle/traci.py b/flow/core/kernel/vehicle/traci.py index 0e1eb56d8..9bed135ed 100644 --- a/flow/core/kernel/vehicle/traci.py +++ b/flow/core/kernel/vehicle/traci.py @@ -5,23 +5,15 @@ import traci.constants as tc from traci.exceptions import FatalTraCIError, TraCIException import numpy as np -import math import collections import warnings -import random -import statistics from flow.controllers.car_following_models import SimCarFollowingController from flow.controllers.rlcontroller import RLController from flow.controllers.lane_change_controllers import SimLaneChangeController -from flow.energy_models.toyota_energy import PriusEnergy -from flow.energy_models.toyota_energy import TacomaEnergy -from flow.energy_models.power_demand import PDMCombustionEngine -from flow.energy_models.power_demand import PDMElectric from bisect import bisect_left import itertools from copy import deepcopy - # colors for vehicles WHITE = (255, 255, 255) CYAN = (0, 255, 255) @@ -96,12 +88,6 @@ def __init__(self, # old speeds used to compute accelerations self.previous_speeds = {} - """ self.energy = Energy(self) - self.energy.calc_energy_level(self) """ - - # # store speeds of all vehicles at last iteration - self.old_speeds = {} - def initialize(self, vehicles): """Initialize vehicle state information. @@ -128,14 +114,6 @@ def initialize(self, vehicles): self.__vehicles[veh_id]['type'] = typ['veh_id'] self.__vehicles[veh_id]['initial_speed'] = typ['initial_speed'] - # self.energy.initialize(veh_id) - # energy.intialize(veh_id) - # self.__vehicles[veh_id]['SOC'] = float(random.randrange(8, 92))/100 #move to experiment code - # # Assume level of fuel is 10-100% of capacity - # # Tacoma has 21.1 gallon capacity = 79.87219 L - # # Use density of gasoline = 748.9 g/L (needs to convert b/c fc is in g/s) - # self.__vehicles[veh_id]['fuel'] = float(random.randrange(598163, 5981628))/100 - self.num_vehicles += 1 if typ['acceleration_controller'][0] == RLController: self.num_rl_vehicles += 1 @@ -286,8 +264,6 @@ def update(self, reset): # make sure the rl vehicle list is still sorted self.__rl_ids.sort() - #self.base_energy.get_energy(self) - def _add_departed(self, veh_id, veh_type): """Add a vehicle that entered the network from an inflow or reset. @@ -574,6 +550,16 @@ def get_fuel_consumption(self, veh_id, error=-1001): return [self.get_fuel_consumption(vehID, error) for vehID in veh_id] return self.__sumo_obs.get(veh_id, {}).get(tc.VAR_FUELCONSUMPTION, error) * ml_to_gallons + def get_energy_model(self, veh_id): + """See parent class.""" + if isinstance(veh_id, (list, np.ndarray)): + return [self.get_energy_model(vehID) for vehID in veh_id] + + if "energy_model" in self.__vehicles.get(veh_id, {}): + return self.__vehicles.get(veh_id, {})["energy_model"] + else: + raise KeyError("Energy model not set for {}".format(veh_id)) + def get_previous_speed(self, veh_id, error=-1001): """See parent class.""" if isinstance(veh_id, (list, np.ndarray)): @@ -585,12 +571,6 @@ def get_speed(self, veh_id, error=-1001): if isinstance(veh_id, (list, np.ndarray)): return [self.get_speed(vehID, error) for vehID in veh_id] return self.__sumo_obs.get(veh_id, {}).get(tc.VAR_SPEED, error) - - def get_power(self, veh_id, error=-1001): - """See parent class.""" - if isinstance(veh_id, (list, np.ndarray)): - return [self.get_power(vehID, error) for vehID in veh_id] - return self.__vehicles.get(veh_id, {}).get("energy_model", error) def get_default_speed(self, veh_id, error=-1001): """See parent class.""" diff --git a/flow/core/params.py b/flow/core/params.py index c2a963a35..8742a9601 100755 --- a/flow/core/params.py +++ b/flow/core/params.py @@ -13,7 +13,6 @@ from flow.energy_models.power_demand import PDMElectric - SPEED_MODES = { "aggressive": 0, "obey_safe_speed": 1, @@ -24,6 +23,8 @@ LC_MODES = {"aggressive": 0, "no_lat_collide": 512, "strategic": 1621} +ENERGY_MODELS = {PriusEnergy, TacomaEnergy, PDMCombustionEngine, PDMElectric} + # Traffic light defaults PROGRAM_ID = 1 MAX_GAP = 3.0 @@ -249,7 +250,6 @@ def add(self, lane_change_params=None, energy_model=(PDMCombustionEngine, {}), color=None): - """Add a sequence of vehicles to the list of vehicles in the network. Parameters @@ -285,6 +285,9 @@ def add(self, # FIXME: depends on simulator lane_change_params = SumoLaneChangeParams() + if energy_model not in ENERGY_MODELS: + energy_model = PDMCombustionEngine + type_params = {} type_params.update(car_following_params.controller_params) type_params.update(lane_change_params.controller_params) diff --git a/flow/core/rewards.py b/flow/core/rewards.py index 2df720acb..0eaccf549 100755 --- a/flow/core/rewards.py +++ b/flow/core/rewards.py @@ -442,7 +442,8 @@ def miles_per_gallon(env, veh_ids=None, gain=.001): return mpg * gain -def instantaneous_power(env, veh_id=None, gain=.001): + +def instantaneous_power(env, veh_id): """Calculate the instantaneous power for every simulation step specific to the vehicle type. Parameters @@ -450,20 +451,12 @@ def instantaneous_power(env, veh_id=None, gain=.001): env : flow.envs.Env the environment variable, which contains information on the current state of the system. - veh_ids : [list] - list of veh_ids to compute the reward over - gain : float - scaling factor for the reward + veh_id : str + veh_id to compute the reward for """ + speed = env.k.vehicle.get_speed(veh_id) + accel = env.k.vehicle.get_accel_no_noise_with_failsafe(veh_id) + grade = env.k.vehicle.get_road_grade(veh_id) + inst_power = env.k.vehicle.get_energy_model(veh_id).get_instantaneous_power(accel, speed, grade) - if veh_ids is None: - veh_ids = env.k.vehicle.get_ids() - elif not isinstance(veh_ids, list): - veh_ids = [veh_ids] - for veh_id in veh_ids: - speed = env.k.vehicle.get_speed(veh_id) - accel = env.k.vehicle.get_accel_no_noise_with_failsafe(veh_id) - grade = env.k.vehicle.get_road_grade(veh_id) - inst_power = env.k.vehicle.get_power(veh_id).get_instantaneous_power(accel, speed, grade) - return inst_power diff --git a/flow/energy_models/base_energy.py b/flow/energy_models/base_energy.py index 45eff2d29..4bfbdeafb 100644 --- a/flow/energy_models/base_energy.py +++ b/flow/energy_models/base_energy.py @@ -1,12 +1,14 @@ +"""Script containing the base vehicle energy class.""" from abc import ABCMeta, abstractmethod + class BaseEnergyModel(metaclass=ABCMeta): """Base energy model class. Calculate the instantaneous power consumption of a vehicle in - the network. It returns the power in Watts regardless of the + the network. It returns the power in Watts regardless of the vehicle type: whether EV or Combustion Engine, Toyota Prius or Tacoma - or non-Toyota vehicles. Non-Toyota vehicles are set by default + or non-Toyota vehicles. Non-Toyota vehicles are set by default to be an averaged-size vehicle. """ @@ -16,7 +18,7 @@ def __init__(self, kernel): @abstractmethod def get_instantaneous_power(self, accel, speed, grade): """Calculate the instantaneous power consumption of a vehicle. - + Must be implemented by child classes. """ pass diff --git a/flow/energy_models/power_demand.py b/flow/energy_models/power_demand.py index d1469b24d..03e859c33 100644 --- a/flow/energy_models/power_demand.py +++ b/flow/energy_models/power_demand.py @@ -1,17 +1,17 @@ +"""Script containing the vehicle power demand model energy classes.""" import math -import random -import statistics import numpy as np -from scipy.interpolate import interp1d -from collections import namedtuple from flow.energy_models.base_energy import BaseEnergyModel from abc import ABCMeta, abstractmethod + class PowerDemandModel(BaseEnergyModel, metaclass=ABCMeta): - """Calculate power consumption of a vehicle. - Assumes vehicle is an average sized vehicle. - The power calculated here is the lower bound of the - actual power consumed by the vehicle + """Vehicle Power Demand base energy model class. + + Calculate power consumption of a vehicle based on physics + derivation. Assumes some vehicle characteristics. The + power calculated here is the lower bound of the actual + power consumed by the vehicle. """ def __init__(self, kernel, mass=2041, area=3.2, rolling_res_coeff=0.0027, aerodynamic_drag_coeff=0.4): @@ -23,35 +23,87 @@ def __init__(self, kernel, mass=2041, area=3.2, rolling_res_coeff=0.0027, aerody self.aerodynamic_drag_coeff = aerodynamic_drag_coeff self.cross_area = area self.gamma = 1 - - def calculate_power(self, accel, speed, grade): + + def calculate_power_at_the_wheels(self, accel, speed, grade): + """Calculate the instantaneous power required. + + Parameters + ---------- + accel : float + Instantaneous acceleration of the vehicle + speed : float + Instantaneous speed of the vehicle + grade : float + Instantaneous road grade of the vehicle + Returns + ------- + float + """ accel_slope_forces = self.mass * speed * ((np.heaviside(accel, 0.5) * (1 - self.gamma) + self.gamma)) * accel accel_slope_forces += + self.g * math.sin(grade) rolling_friction = self.mass * self.g * self.rolling_res_coeff * speed air_drag = 0.5 * self.rho_air * self.cross_area * self.aerodynamic_drag_coeff * speed**3 power = accel_slope_forces + rolling_friction + air_drag return power - + @abstractmethod def get_regen_cap(self, accel, speed, grade): + """Set the maximum power retainable from regenerative braking. + + A negative regen cap is interpretted as a positive regenerative power. + + Parameters + ---------- + accel : float + Instantaneous acceleration of the vehicle + speed : float + Instantaneous speed of the vehicle + grade : float + Instantaneous road grade of the vehicle + Returns + ------- + float + """ pass def get_instantaneous_power(self, accel, speed, grade): - power = max(self.get_regen_cap(accel, speed, grade), self.calculate_power(accel, speed, grade)) - return power + """Apply the regenerative braking cap to the modelled power demand. + + Parameters + ---------- + accel : float + Instantaneous acceleration of the vehicle + speed : float + Instantaneous speed of the vehicle + grade : float + Instantaneous road grade of the vehicle + Returns + ------- + float + """ + regen_cap = self.get_regen_cap(accel, speed, grade) + power_at_the_wheels = self.calculate_power_at_the_wheels(accel, speed, grade) + return max(regen_cap, power_at_the_wheels) class PDMCombustionEngine(PowerDemandModel): - - # Power Demand Model for a combustion engine vehicle + """Power Demand Model for a combustion engine vehicle.""" + def get_regen_cap(self, accel, speed, grade): + """See parent class.""" return 0 + class PDMElectric(PowerDemandModel): - - # Power Demand Model for an electric vehicle - def __init__(self,kernel): - super(PDMElectric, self).__init__(kernel, mass=1663, area=2.4, rolling_res_coeff=0.007, aerodynamic_drag_coeff=0.24) - + """Power Demand Model for an electric vehicle.""" + + def __init__(self, kernel): + super(PDMElectric, self).__init__(kernel, + mass=1663, + area=2.4, + rolling_res_coeff=0.007, + aerodynamic_drag_coeff=0.24) + def get_regen_cap(self, accel, speed, grade): + """See parent class.""" return -2.8 * speed diff --git a/flow/energy_models/toyota_energy.py b/flow/energy_models/toyota_energy.py index d2139a139..36c7f4005 100644 --- a/flow/energy_models/toyota_energy.py +++ b/flow/energy_models/toyota_energy.py @@ -1,50 +1,53 @@ +"""Script containing the Toyota energy classes.""" import dill as pickle import boto3 -import botocore -import math -import random -import statistics -import numpy as np -from scipy.interpolate import interp1d -from collections import namedtuple from flow.energy_models.base_energy import BaseEnergyModel import os from abc import ABCMeta, abstractmethod -class ToyotaModel(BaseEnergyModel): + +class ToyotaModel(BaseEnergyModel, metaclass=ABCMeta): + """Base Toyota Energy model class.""" def __init__(self, kernel, filename=None): self.k = kernel # download file from s3 bucket s3 = boto3.client('s3') - s3.download_file('toyota.restricted', filename,'file.pkl') #move to init - with open('file.pkl','rb') as file: - self.toyota_energy = pickle.load(file) #self.prius_energy + s3.download_file('toyota.restricted', filename, 'temp.pkl') + with open('temp.pkl', 'rb') as file: + self.toyota_energy = pickle.load(file) + # delete pickle file os.remove(file.pkl) - + @abstractmethod def get_instantaneous_power(self, accel, speed, grade): + """See parent class.""" pass class PriusEnergy(ToyotaModel): - + """Toyota Prius (EV) energy model class.""" + def __init__(self, kernel, soc=0.9): - super(PriusEnergy, self).__init__(kernel, filename = 'prius_test.pkl') - self.soc = soc + super(PriusEnergy, self).__init__(kernel, filename='prius_test.pkl') + self.soc = soc def get_instantaneous_power(self, accel, speed, grade): + """See parent class.""" socdot = self.toyota_energy(self.soc, accel, speed, grade) self.soc -= socdot * self.k.env.sim_step return socdot - + + class TacomaEnergy(ToyotaModel): + """Toyota Tacoma energy model class.""" def __init__(self, kernel): - super(TacomaEnergy, self).__init__(kernel, filename = 'tacoma_test.pkl') + super(TacomaEnergy, self).__init__(kernel, filename='tacoma_test.pkl') def get_instantaneous_power(self, accel, speed, grade): + """See parent class.""" fc = self.toyota_energy(accel, speed, grade) return fc From 745c2bde11d83432cc95604ed22978217e850be7 Mon Sep 17 00:00:00 2001 From: liljonnystyle Date: Mon, 6 Jul 2020 16:35:46 -0700 Subject: [PATCH 49/60] Delete git push --- git push | 29119 ----------------------------------------------------- 1 file changed, 29119 deletions(-) delete mode 100644 git push diff --git a/git push b/git push deleted file mode 100644 index 8b4fd57a9..000000000 --- a/git push +++ /dev/null @@ -1,29119 +0,0 @@ -commit ae48511f4e64b4a76d63a3417d0b20908cdc1662 (HEAD -> jc-energy-class, origin/jc-energy-class) -Author: Joy Carpio -Date: Tue Jun 23 23:12:29 2020 +0800 - - Update toyota_energy.py - -commit 108910809ad0cf71ffd01cfc4694cb42a8b62823 -Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> -Date: Tue Jun 23 22:30:47 2020 +0800 - - Update power_demand.py - -commit 71341531b89e314e7d97cb73a12e3d797eef070a -Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> -Date: Tue Jun 23 03:59:18 2020 +0800 - - Update toyota_energy.py - -commit 979aa95776d009aeb81dd0634adb54394c945f56 -Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> -Date: Tue Jun 23 03:58:42 2020 +0800 - - Update power_demand.py - -commit 6a088334c05ce0aa65e59b54d41037677241970e -Author: liljonnystyle -Date: Mon Jun 22 08:59:08 2020 -0700 - - Delete toyota_energy.py - -commit 45d7e4fa96dedb53696c72c1fc73ff217eb6c4a0 -Author: liljonnystyle -Date: Mon Jun 22 08:58:56 2020 -0700 - - Delete power_demand.py - -commit ef1209baaafa8738a33b18a519169814dd475236 -Author: liljonnystyle -Date: Mon Jun 22 08:58:43 2020 -0700 - - Delete base_energy.py - -commit 0e0a6f74e07ff5a6fadd416a23d595b689b9e082 -Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> -Date: Mon Jun 22 21:39:14 2020 +0800 - - Update traci.py - -commit 8a0bdeebe8288488191881e74f18a82c5308f017 -Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> -Date: Mon Jun 22 21:19:51 2020 +0800 - - Update rewards.py - -commit 3d48f15e47fb28ed7b256e9c138ae0d214ba9d50 -Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> -Date: Mon Jun 22 20:57:50 2020 +0800 - - Update traci.py - -commit f338c4b9a61a6d0f87954c7a85c917688d4b57df -Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> -Date: Mon Jun 22 20:52:37 2020 +0800 - - Update traci.py - -commit 70e9a4b7a8cb976f8f89c42f4355601675afa650 -Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> -Date: Mon Jun 22 20:51:17 2020 +0800 - - Update params.py - -commit 74382e4c5a15f0fd6a319ad75a60980b7bae72a8 -Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> -Date: Mon Jun 22 20:45:00 2020 +0800 - - Create power_demand.py - -commit ddedb95c5438fdcef675a5af8ca1d710de36fbc4 -Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> -Date: Mon Jun 22 20:44:15 2020 +0800 - - Create toyota_energy.py - -commit e2d95cdba879513b7216e4ebdd9e9a0addf12d4c -Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> -Date: Mon Jun 22 20:42:20 2020 +0800 - - Create base_energy.py - -commit 31ca68fe27b3215ca0c20f6c6003b93ebe82fba1 -Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> -Date: Thu Jun 18 22:17:43 2020 +0800 - - Update toyota_energy.py - -commit 994c0890273c90ec58ded7b5e5a650c42c33dc87 -Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> -Date: Thu Jun 18 22:16:58 2020 +0800 - - Update power_demand.py - -commit 26afe673fb8d4ee0d6afc1637883a23bde6959ec -Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> -Date: Thu Jun 18 22:15:57 2020 +0800 - - Update base_energy.py - -commit 4643ed883789b75ca2899ffc4e3fbd6eee578c3d -Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> -Date: Thu Jun 18 22:10:34 2020 +0800 - - Update rewards.py - -commit d718a3312b89ef6de760175dce362ba03ea7c7d8 -Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> -Date: Thu Jun 18 22:05:30 2020 +0800 - - Update params.py - -commit b8d2d1238c886614e8c74dba674c45be5f83e524 -Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> -Date: Mon Jun 15 02:57:46 2020 +0800 - - Update rewards.py - -commit 81cfba9f86604537de16e14dcb6279970fee3be6 -Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> -Date: Mon Jun 15 02:55:29 2020 +0800 - - Update base_energy.py - -commit c133fb08fbf4fdb3e5e2a585840e79cbd30015f6 -Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> -Date: Mon Jun 15 02:54:54 2020 +0800 - - Update toyota_energy.py - -commit 0a0de585dbc93aef40b54bae371d483c76238591 -Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> -Date: Mon Jun 15 02:53:38 2020 +0800 - - Update power_demand.py - -commit 23688b2a39786139b8a9f994f2c1393c1d0549f1 -Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> -Date: Mon Jun 15 00:26:27 2020 +0800 - - Update base_energy.py - - instantiate vehicle to have all the properties of VehicleParams() - -commit 4461995aacb3b80423aeb511d84715dec3cd2906 -Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> -Date: Mon Jun 8 00:45:54 2020 +0800 - - Update toyota_energy.py - -commit 9ae25785efed7a74e1b2991a7e2ba88f24199ebb -Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> -Date: Mon Jun 8 00:42:48 2020 +0800 - - Update power_demand.py - -commit f747be3c78c9f7a575432b8b492c443a3915c601 -Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> -Date: Mon Jun 8 00:39:55 2020 +0800 - - Update base_energy.py - -commit 372335bc0995e4d158cb90466d19ab1315034b79 -Author: liljonnystyle -Date: Sat May 30 01:22:48 2020 -0700 - - remove extra whitespace - -commit 21047646bffa7ebfb8f20010f7c5d0356477f100 -Author: liljonnystyle -Date: Sat May 30 01:21:39 2020 -0700 - - add get_fuel_consumption() back - - this code is actually unrelated to the energy classes being implemented, but rather the fuel consumption from SUMO - -commit be2673bc2527eeb1d288a92a67ce721f091f6b77 -Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> -Date: Sat May 30 07:42:05 2020 +0800 - - Update toyota_energy.py - -commit 3ad43b4502dec12df4643849ced4c754e2f8f0c9 -Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> -Date: Sat May 30 07:33:57 2020 +0800 - - Update power_demand.py - -commit f82dfb00cb225859112fa2e38d5affaad2929b15 -Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> -Date: Sat May 30 07:10:03 2020 +0800 - - Update base_energy.py - - added space after all commas - -commit 5558af0d3cbd303821fb14f271ab873b08c16383 -Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> -Date: Sat May 30 07:09:04 2020 +0800 - - Update base_energy.py - - Some imports removed - -commit fd4a9ccb86b62ef7e0aacb2a8a3ea0f7334c427e -Merge: 5398d219 243c8951 -Author: liljonnystyle -Date: Wed May 27 14:01:05 2020 -0700 - - Merge branch 'i210_dev' into jc-energy-class - -commit 243c895181f9498ebdda25a01434badbfe9b1add -Merge: 7ab2b3e9 16697871 -Author: liljonnystyle -Date: Wed May 27 10:05:56 2020 -0700 - - Merge pull request #939 from flow-project/jl-more-accel-outputs - - Add several accelerations to custom output - -commit 16697871d63f735a90aad66ace14b5d757ce73e0 -Author: liljonnystyle -Date: Wed May 27 10:05:09 2020 -0700 - - addressing comments - -commit 7ab2b3e9469e0c9f4cb6a382158db2b2a3766179 -Merge: 3a501dab 7f68c503 -Author: Akash Velu <31679538+akashvelu@users.noreply.github.com> -Date: Wed May 27 09:25:09 2020 -0700 - - Merge pull request #952 from flow-project/av-emission-path - - Fixed trajectory_table_path - -commit 7f68c503945c14eec9ca81fab228759d50668b39 (origin/av-emission-path) -Author: akashvelu -Date: Wed May 27 09:21:09 2020 -0700 - - Fixed trajectory_table_path - -commit c3756f8745cac215ec7f53845aa439d5aac4ef74 -Author: akashvelu -Date: Wed May 27 09:07:46 2020 -0700 - - Fixed trajectory_table_path - -commit 86458115b1f2f4d1f59755fae484daa8af4b00dc -Author: liljonnystyle -Date: Tue May 26 17:07:41 2020 -0700 - - minor docstring formatting - -commit cbf6a420b727f5bf1d60a9bf8ff7cef92bbfe5ae -Author: Yasharzf -Date: Tue May 26 15:15:05 2020 -0700 - - removed duplicated print - -commit 528f0aace706fc8a3de99aba720bda7c0eb309b4 -Author: Yasharzf -Date: Tue May 26 15:14:00 2020 -0700 - - fixed docstrings - -commit b49dbce1cfa3d18e191b51547e2dbd4848a7bb3a -Merge: b5f54245 53cf0356 -Author: Yasharzf -Date: Tue May 26 14:59:49 2020 -0700 - - fixed merge conflicts - -commit 5398d2191dea100474af8442a6ed3a83fe462caa -Author: liljonnystyle -Date: Tue May 26 14:58:15 2020 -0700 - - rename get method - -commit 3e849631fd5c85ed2c8f8d465137f0dc35626ad6 -Author: liljonnystyle -Date: Tue May 26 14:55:40 2020 -0700 - - fix typo - -commit 53cf035684b02668fa2116942c75b02cd4398d29 (origin/yashar_fail_safe) -Author: Yasharzf -Date: Tue May 26 14:22:16 2020 -0700 - - removed json file which was added by mistake - -commit ddf6a2435d0c2ca7eafe0dd6292ec574626bd397 -Author: Yasharzf -Date: Tue May 26 14:12:23 2020 -0700 - - added failsafe methods for max accel/decel and speed limit, and all - -commit 3c6dcf71c0ac4219e13da3a3a58471a69dfc88d1 -Author: Yasharzf -Date: Tue May 26 13:38:08 2020 -0700 - - added apply acceleratino function which uses setSpeed() method instead of slowDown() - -commit 4106217b1bcdb5608621b8faf3b3ef57dbdd9363 -Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> -Date: Wed May 27 00:12:16 2020 +0800 - - Energy models for power_demand and toyota - - These are child classes of the base_energy class. - -commit eae12b7f0e47f52780773108064bf9767923554e -Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> -Date: Wed May 27 00:07:23 2020 +0800 - - update traci.py - - applied comments from from previous PR. - -commit 1aeb97d9be915f558ec3025f861e0283e4610319 -Author: Joy Carpio <53185340+joyncarpio@users.noreply.github.com> -Date: Tue May 26 23:55:40 2020 +0800 - - energy.py changed to base_energy.py - - This python file describes the base energy file which will serve as the parent class of the power demand model and toyota energy models. - -commit 9475e152e1cd91097b7a45b08aa4199d56c56379 -Merge: 32527f80 3a501dab -Author: liljonnystyle -Date: Mon May 25 21:14:39 2020 -0700 - - Merge branch 'i210_dev' into jc-energy-class - -commit b5f54245250bb96c9ef03d606a5dad04345aaae0 -Merge: 8eee7722 3a501dab -Author: liljonnystyle -Date: Mon May 25 21:11:49 2020 -0700 - - Merge branch 'i210_dev' into jl-more-accel-outputs - -commit 8eee7722bc28ae05ac330e741e33ee9b659391a2 -Author: liljonnystyle -Date: Mon May 25 18:03:02 2020 -0700 - - rename trajectory table - -commit d2ba0694ef7cf0e4f6c913d4e855011fbcdc76e2 -Author: liljonnystyle -Date: Mon May 25 18:00:46 2020 -0700 - - revert accidental change - -commit 4f2f23ec7d47bff699baeac9bf8810af68f2f465 -Author: liljonnystyle -Date: Mon May 25 17:58:58 2020 -0700 - - add return carriage to eof - -commit 69f6f5536a3be4d885652471c3008da258e58416 -Author: liljonnystyle -Date: Mon May 25 17:57:41 2020 -0700 - - rm deleted file - -commit 27e2960cbee48680627ada7ada16befd833052c8 -Merge: d8884057 151e3b21 -Author: liljonnystyle -Date: Mon May 25 17:56:30 2020 -0700 - - fix merge conflicts - -commit d88840578f88c70da428d829b7b9d22024d6bf52 -Author: liljonnystyle -Date: Mon May 25 16:57:52 2020 -0700 - - fix rebase errors - -commit df182ad6c820b1fd2b05db9ce6a305aee248cec5 -Author: liljonnystyle -Date: Sun May 24 23:20:29 2020 -0700 - - fix accel with noise with failsafe output - -commit fceedf874599c68852aa8feb016921b12abd358e -Author: liljonnystyle -Date: Wed May 20 21:31:20 2020 -0700 - - Add several accelerations (with/without noise, with/without failsafes) to custom output - -commit 38af177a02bd47cc691201083f4192f61fa2dedc -Author: liljonnystyle -Date: Wed May 20 21:51:46 2020 -0700 - - remove trailing whitespaces - -commit d66a0ab6542a6075ce9495991790afadf8a4d3e4 -Author: liljonnystyle -Date: Wed May 20 21:47:44 2020 -0700 - - fix flake8 issues - -commit b3f15a3c2a4527b59139ed1d9198f68110c93270 -Author: liljonnystyle -Date: Wed May 20 21:44:15 2020 -0700 - - update queries with new column names - -commit 077983206ea4454190ffa98987dc81e4ba5d2954 -Author: liljonnystyle -Date: Wed May 20 21:31:20 2020 -0700 - - Add several accelerations (with/without noise, with/without failsafes) to custom output - -commit 28d4f73c4170c05b8fde403d8a6148347d2d1351 -Author: liljonnystyle -Date: Sun May 24 21:29:11 2020 -0700 - - fix bug in vehicle power demand - -commit 3df23123743b183a737adb0c7f29516771f2d353 -Author: liljonnystyle -Date: Wed May 20 11:49:38 2020 -0700 - - specify power demand model names - -commit d7da535e81b50dd7b14b2cbb5c72d8cd65fa1825 -Author: Brent Zhao -Date: Tue May 19 21:47:19 2020 -0700 - - style fixed - -commit 498e08aa1f35d2c37bb1551b35b5d8c98635afa4 -Author: liljonnystyle -Date: Tue May 19 21:04:56 2020 -0700 - - remove whitespace - -commit 2563818e4e31cf61606f53955a7b7aed35557a7b -Author: liljonnystyle -Date: Tue May 19 20:59:00 2020 -0700 - - add back ray import - -commit f4fa42632a13c17b76ba49e73d67d13559f19062 -Author: liljonnystyle -Date: Tue May 19 20:51:14 2020 -0700 - - remove blank lines after docstrings - -commit a799abda655a821b66828b44669210c8a8dd35ea -Author: liljonnystyle -Date: Tue May 19 20:45:08 2020 -0700 - - remove dupe imports - -commit 7e549be514a427b1877f19cab3ecb603a02c4f50 -Author: Brent Zhao -Date: Tue May 19 21:18:43 2020 -0700 - - update lambda function, change partition into multi-column - -commit 6884960aecf8adb4704143b17383fcddd2aa0ffa -Author: Brent Zhao -Date: Tue May 19 15:56:53 2020 -0700 - - get up to date with i210_dev - -commit b5be92ac038b118b4055ef6489612a9836cf00f2 -Author: Brent Zhao -Date: Tue May 19 15:28:54 2020 -0700 - - fix some style issue - -commit c7cd96303620e97530bceb9507a085d6e4089cc9 -Author: Brent Zhao -Date: Tue May 19 13:41:17 2020 -0700 - - fix some query string formatting issue - -commit 32c052866e2d750fb4e4911c06320cb89ccd3157 -Author: liljonnystyle -Date: Tue May 19 10:44:06 2020 -0700 - - move partition condition to cte's - -commit d578e6337b117316ce9d0633c7e18070ec27d6dc -Author: liljonnystyle -Date: Tue May 19 08:52:17 2020 -0700 - - rename vehicle power demand query - -commit e45eb92cc420836fa297c0ccceb2d93d88d06359 -Author: liljonnystyle -Date: Tue May 19 08:42:29 2020 -0700 - - reformatting energy queries - -commit 420ea3f798d00e2a79260b82b79092f304ee9b72 -Author: Brent Zhao -Date: Tue May 19 04:10:43 2020 -0700 - - some minor issue fixed - -commit 72d4733f07458a2863bb2c95cb7ef75c89935d33 -Author: Brent Zhao -Date: Tue May 19 04:07:29 2020 -0700 - - fix trailing white space style issue - -commit 6af7e02c86ddfbce78851d2c85a2042ae3b9ea6c -Author: Brent Zhao -Date: Tue May 19 04:01:41 2020 -0700 - - added auto upload to s3 feature for the reply scipt and fix some other minor issues - -commit fdd983eb19b7a4acd75b9101568dfa8441c86294 -Author: Brent Zhao -Date: Thu Apr 23 12:58:44 2020 -0700 - - fix some more style issues - -commit 979d0476fbd2e3308d4bc75f0fc3576306ae6ad5 -Author: Brent Zhao -Date: Thu Apr 23 12:38:47 2020 -0700 - - reorganized file locations - -commit de35f9009e9de0c75de7ba4c1eccdccac794e877 -Author: Brent Zhao -Date: Thu Apr 23 12:35:54 2020 -0700 - - fix style issue - -commit 00a526b43f8ee069c768b27629233b074ca60260 -Author: Brent Zhao -Date: Thu Apr 23 02:54:33 2020 -0700 - - fix windoes line ending issue with experiment.py - -commit aa14dbf247bbe5610d4f3741ed81581152596293 -Author: Brent Zhao -Date: Wed Apr 22 05:22:01 2020 -0700 - - added more support for lambda function - -commit 8d4ad2904bb76afeb6c03cd8d90d8ea1e038df15 -Author: Brent Zhao -Date: Fri Apr 10 19:54:30 2020 -0700 - - multiple runs issue solved, testing added - -commit 3af559503e36d69c4f1481ee405778aab01c6840 -Author: Brent Zhao -Date: Mon Apr 6 15:28:57 2020 -0700 - - datapip pipeline implemented - -commit 0ee66469dcb5f21d542a57b464b3ad5fe7b11008 -Author: Eugene Vinitsky -Date: Wed Mar 18 16:43:22 2020 -0700 - - Add an on ramp option - -commit bc8584a30d3736169d9c0f985ddc677d34144dfd -Author: Brent Zhao -Date: Mon May 18 12:28:17 2020 -0700 - - removed the old tests - -commit 638f9b4ff1a7baec698264f2f2cdbb35d507b669 -Author: Brent Zhao -Date: Mon May 18 12:25:00 2020 -0700 - - change the bucket to a common bucket - -commit 3b10524a6830986f3ec446907a9655a08c3f85dd -Author: Brent Zhao -Date: Sun May 10 23:03:35 2020 -0700 - - including next_V for testing only - -commit c97021992460a6d628ad769c289975f83bdf9628 -Author: Brent Zhao -Date: Sat May 9 22:06:30 2020 -0700 - - added new two new quries - -commit e7ac1a9afa6513f0cb425a2e37c3db26b259f6f0 -Author: Brent Zhao -Date: Thu Apr 23 13:02:33 2020 -0700 - - fix one more style issue - -commit ddc53fb03ae5474c6c2faf2627feb11a6bdac7da -Author: Brent Zhao -Date: Thu Apr 23 12:58:44 2020 -0700 - - fix some more style issues - -commit 5a3ff57fb2d70f2736a9f1ba091aa5730d7006d4 -Author: Brent Zhao -Date: Thu Apr 23 12:38:47 2020 -0700 - - reorganized file locations - -commit 65c9ee061541b4e9660bf54d241a603dabf77e95 -Author: Brent Zhao -Date: Thu Apr 23 12:35:54 2020 -0700 - - fix style issue - -commit ee1188ec7b5796aeb96bc7de89c5d9bfd10168de -Author: Brent Zhao -Date: Thu Apr 23 02:54:33 2020 -0700 - - fix windoes line ending issue with experiment.py - -commit dc881e06442f642538320c1792dec529abad6086 -Author: Brent Zhao -Date: Wed Apr 22 05:22:01 2020 -0700 - - added more support for lambda function - -commit c3b2a51aa3fcf2c60c0678e7e3c385febf11d867 -Author: Brent Zhao -Date: Fri Apr 10 19:54:30 2020 -0700 - - multiple runs issue solved, testing added - -commit 7d52445fdaa2f6ef358bad6cd58f6b26775a4f36 -Author: Eugene Vinitsky -Date: Tue Mar 24 22:49:17 2020 -0700 - - Add 1 lane highway network for Benni - -commit 505d646beb9814daaa527f417740f8309a9f1c85 -Author: Eugene Vinitsky -Date: Thu Mar 19 12:10:07 2020 -0700 - - Upgrade the network to not have keepclear value on the junctions - -commit e4c02bb1f5513e905f2ea0c5e635d3946fe4d38a -Author: Eugene Vinitsky -Date: Thu Mar 19 11:32:12 2020 -0700 - - Increased inflows to 10800 to match density in Bennis ring - -commit ebb29215ad82c0b2a6b89625ea1b899b5587420a -Author: Eugene Vinitsky -Date: Wed Mar 18 16:43:22 2020 -0700 - - Add an on ramp option - -commit 36e8851f7f7ae71a25b2d5ca5a927396b9e1e41a -Author: Yashar Zeinali Farid <34227133+Yasharzf@users.noreply.github.com> -Date: Sat May 9 15:31:44 2020 -0700 - - changed _departed_ids, and _arrived_ids in the update function (#926) - - * changed _departed_ids, and _arrived_ids in the update function - - * fixed bug in get_departed_ids and get_arrived_ids - -commit a4c7d67758bd4187f176e1b5f1f63bc12a10af81 -Author: Yashar Zeinali Farid <34227133+Yasharzf@users.noreply.github.com> -Date: Thu May 7 23:51:53 2020 -0700 - - get not departed vehicles (#922) - - * added function to kernel/vehicle to get number of not departed vehiles - - * fixed over indentation of the docstring - - * indentation edit - - * pep8 - - Co-authored-by: AboudyKreidieh - -commit 1111e9aa34a4ce46058ec282255c43d03b117123 -Author: chendiw <31671291+chendiw@users.noreply.github.com> -Date: Tue Apr 21 15:14:31 2020 -0700 - - moved imports under functions in train.py (#903) - - * deleting unworking params from SumoChangeLaneParams - - * deleted unworking params, sublane working in highway - : - - * moved imports inside functions - - * Apply suggestions from code review - - * bug fixes - - * bug fix - - Co-authored-by: Aboudy Kreidieh - -commit 0ade197b74f7ec0a5a4890e419d605ff3933f824 -Author: liljonnystyle -Date: Tue May 19 21:04:56 2020 -0700 - - remove whitespace - -commit 0d5fa6bda67aca96014b8be335cde547b47d7f7b -Author: liljonnystyle -Date: Tue May 19 20:59:00 2020 -0700 - - add back ray import - -commit 306a01fe55f3e756931098e306d03872602b88b2 -Author: liljonnystyle -Date: Tue May 19 20:51:14 2020 -0700 - - remove blank lines after docstrings - -commit 89f8d1d504a4e4c98bc564967c1490f0718774cd -Author: liljonnystyle -Date: Tue May 19 20:45:08 2020 -0700 - - remove dupe imports - -commit a88c209f5fa6eb057c978c6583ab040cd11a8aa0 -Author: Brent Zhao -Date: Tue May 19 15:56:53 2020 -0700 - - get up to date with i210_dev - -commit c373e94388e8fa4399a95e377c1ba95bbdb282c3 -Author: Brent Zhao -Date: Mon Apr 6 15:28:57 2020 -0700 - - datapip pipeline implemented - -commit 8eed7e16ef8793914761a48cc6c0af30756b89d0 -Author: Eugene Vinitsky -Date: Thu Mar 19 12:10:07 2020 -0700 - - Upgrade the network to not have keepclear value on the junctions - -commit 43eeee0193d92e10ef76c9436dac903a52060157 -Author: Eugene Vinitsky -Date: Wed Mar 18 16:43:22 2020 -0700 - - Add an on ramp option - -commit 9d2026e6a3635f756417f632abd30bb8891310a9 -Author: Yashar Zeinali Farid <34227133+Yasharzf@users.noreply.github.com> -Date: Thu May 7 23:51:53 2020 -0700 - - get not departed vehicles (#922) - - * added function to kernel/vehicle to get number of not departed vehiles - - * fixed over indentation of the docstring - - * indentation edit - - * pep8 - - Co-authored-by: AboudyKreidieh - -commit 151e3b2195de3d6f9079593d0acf684489633e81 -Author: liljonnystyle -Date: Mon May 25 16:57:52 2020 -0700 - - fix rebase errors - -commit 97400c7b03b3dc211243b723327660215bf39ca0 -Merge: d6ffaa6b 97f3ccdf -Author: liljonnystyle -Date: Mon May 25 16:48:59 2020 -0700 - - rebase and fix merge conflicts - -commit d6ffaa6bb0783fe0aaf0feb09a7b2b1f9591d0b5 -Author: liljonnystyle -Date: Tue May 19 21:04:56 2020 -0700 - - remove whitespace - -commit 6c11a70281ba4673edad160ffdcf68fc4372c13a -Author: liljonnystyle -Date: Tue May 19 20:59:00 2020 -0700 - - add back ray import - -commit fc9983631ec172b624ae6dfef65eeed1eb8dce4c -Author: liljonnystyle -Date: Tue May 19 20:51:14 2020 -0700 - - remove blank lines after docstrings - -commit 34cecff822badd955a79ee8c773640875e6bea2b -Author: liljonnystyle -Date: Tue May 19 20:45:08 2020 -0700 - - remove dupe imports - -commit 5878eae7cc27e766085362b478beb2abe1f51933 -Author: Brent Zhao -Date: Tue May 19 15:56:53 2020 -0700 - - get up to date with i210_dev - -commit c18ec58b8a1e0a036b111649dbd2b0f05bd28c55 -Author: Brent Zhao -Date: Mon Apr 6 15:28:57 2020 -0700 - - datapip pipeline implemented - -commit 9b649efbda97a80f3c926ec1fc9838b76f27aa60 -Author: Eugene Vinitsky -Date: Thu Mar 19 12:10:07 2020 -0700 - - Upgrade the network to not have keepclear value on the junctions - -commit 0a83576b80c2955ac8e09f88e0b159c836a887c4 -Author: Eugene Vinitsky -Date: Wed Mar 18 16:43:22 2020 -0700 - - Add an on ramp option - -commit 36086521fff4c3e3d0728423e36af15bfa242403 -Author: Yashar Zeinali Farid <34227133+Yasharzf@users.noreply.github.com> -Date: Thu May 7 23:51:53 2020 -0700 - - get not departed vehicles (#922) - - * added function to kernel/vehicle to get number of not departed vehiles - - * fixed over indentation of the docstring - - * indentation edit - - * pep8 - - Co-authored-by: AboudyKreidieh - -commit 3a501dab148900d2d5f3a17f7af7232acf1eb059 -Author: Brent Zhao -Date: Mon May 25 15:59:26 2020 -0700 - - fix minor string formatting issue in the query - -commit 8941cea6c2f8d9f7c0a2674ce273c6cc9dbe61f9 -Merge: eac7730c 3b93994d -Author: Brent Zhao -Date: Mon May 25 15:19:31 2020 -0700 - - Merge pull request #912 from flow-project/datapipeline_dev - - Datapipeline Dev - -commit 3b93994d4be805e9b12d79906e29857eeca76312 (origin/datapipeline_dev) -Author: liljonnystyle -Date: Mon May 25 14:31:43 2020 -0700 - - update energy query to MVP params - -commit d0df0a3d9271584c80c26fe691d7d2cb4a70f5f4 -Author: liljonnystyle -Date: Mon May 25 14:27:50 2020 -0700 - - revert temporary change - -commit e9e66a77e5ea38e2deda69ae46191d3aeee72723 -Author: liljonnystyle -Date: Mon May 25 14:27:27 2020 -0700 - - remove extra_init() in favor of collections.defaultdict() - -commit 97f3ccdf34d4fb1323a25d479abc4ccab616c8f1 -Author: liljonnystyle -Date: Sun May 24 23:20:29 2020 -0700 - - fix accel with noise with failsafe output - -commit 5bb70741986345cc01d0db71148828c1d111d526 -Merge: 215d4abb 863f3608 -Author: liljonnystyle -Date: Sun May 24 22:23:04 2020 -0700 - - Merge branch 'jl-more-accel-outputs' of https://github.com/flow-project/flow into jl-more-accel-outputs - -commit 215d4abb938e7b7032f227b9a2e6997092164bc6 -Author: liljonnystyle -Date: Wed May 20 21:51:46 2020 -0700 - - remove trailing whitespaces - -commit 92a745dd3d517135f3bef6b69782c212ffbfd336 -Author: liljonnystyle -Date: Wed May 20 21:47:44 2020 -0700 - - fix flake8 issues - -commit d192a9f5dc1ca2622875cd26997198c1889d213c -Author: liljonnystyle -Date: Wed May 20 21:44:15 2020 -0700 - - update queries with new column names - -commit 87dcff271ac1aa5450516f2592940eddeb149fe4 -Author: liljonnystyle -Date: Wed May 20 21:31:20 2020 -0700 - - Add several accelerations (with/without noise, with/without failsafes) to custom output - -commit 57b42ca5544b72a5d6641ac38c50f9677117d940 -Author: liljonnystyle -Date: Sun May 24 21:29:11 2020 -0700 - - fix bug in vehicle power demand - -commit eac7730cd2da0d400f97bb90b43c2e79e0937a5a -Merge: 3d16a5ad 3b7364b9 -Author: Kathy Jang -Date: Fri May 22 11:52:11 2020 -0700 - - Merge pull request #942 from flow-project/slowdown_i210 - - Slowdown i210 - -commit 32527f805a587dfc821b4f3ea845d6f9ebf7e9fb -Author: liljonnystyle -Date: Thu May 21 23:02:26 2020 -0700 - - revert some inadvertent changes - -commit 9bda1ebe5f76c0c0764c9d1f890debb0a9a1e76d -Author: liljonnystyle -Date: Thu May 21 23:00:59 2020 -0700 - - revert some inadvertent changes - -commit 8843b3bc3238d2d605351b99cfa73ac5ee33faf6 -Author: liljonnystyle -Date: Thu May 21 22:24:41 2020 -0700 - - New energy class to inventory multiple energy models - -commit 3b7364b9ee26642d8c9700874541899de447de9a (origin/slowdown_i210) -Author: Kathy Jang -Date: Thu May 21 12:41:32 2020 -0700 - - Updated ray_autoscale and requirements.txt - -commit 863f360809eac6fad1ae26eba0b197759a7c666c -Author: liljonnystyle -Date: Wed May 20 21:51:46 2020 -0700 - - remove trailing whitespaces - -commit df0bb664e80e5fe9819c6246663b8602212da243 -Author: liljonnystyle -Date: Wed May 20 21:47:44 2020 -0700 - - fix flake8 issues - -commit 951c755672a37bffcec0ac723545746b5e1d0e73 -Author: liljonnystyle -Date: Wed May 20 21:44:15 2020 -0700 - - update queries with new column names - -commit da243f946c109259e4c75943bd24515dd4d9e516 -Author: liljonnystyle -Date: Wed May 20 21:31:20 2020 -0700 - - Add several accelerations (with/without noise, with/without failsafes) to custom output - -commit 0ea7ffc571c441e0d6b4c8c42d0edc4df7186fc5 -Author: liljonnystyle -Date: Wed May 20 11:49:38 2020 -0700 - - specify power demand model names - -commit a60b023d233335c2a0f4776f404d5a79f47e9b02 -Author: Brent Zhao -Date: Tue May 19 21:47:19 2020 -0700 - - style fixed - -commit d4923f6a76f3d3f8756c41021c24d50e72bf3094 -Author: Brent Zhao -Date: Tue May 19 21:37:12 2020 -0700 - - remove the IDM config file from another campus - -commit efa60f79f096f44f5b12fcbf70fa57c344d0a587 -Author: Brent Zhao -Date: Tue May 19 21:32:39 2020 -0700 - - style fix - -commit 9d690d4b05eaa2617f5e8a9005442c69a6600de4 -Merge: 7306298d 18a88bca -Author: Brent Zhao -Date: Tue May 19 21:19:05 2020 -0700 - - Merge branch 'datapipeline_dev' of https://github.com/flow-project/flow into datapipeline_dev - -commit 7306298d97fbaa1fd03fb9f4a4ea816631b300b5 -Author: Brent Zhao -Date: Tue May 19 21:18:43 2020 -0700 - - update lambda function, change partition into multi-column - -commit 18a88bcaef5b677a1f81e65beb9dbab6d3a17f29 -Author: liljonnystyle -Date: Tue May 19 21:04:56 2020 -0700 - - remove whitespace - -commit 4d206b374e843ee611f46d5519de62119d8fb1b2 -Author: liljonnystyle -Date: Tue May 19 20:59:00 2020 -0700 - - add back ray import - -commit 6b5111b93db5760235d05f26e6ef163591b36497 -Author: liljonnystyle -Date: Tue May 19 20:51:14 2020 -0700 - - remove blank lines after docstrings - -commit e6db29b9d6013b541f9e066383f1aa7f3090f885 -Author: liljonnystyle -Date: Tue May 19 20:45:08 2020 -0700 - - remove dupe imports - -commit 437f8cf4103626bae222268b3e9380f397f26469 -Author: Brent Zhao -Date: Tue May 19 15:56:53 2020 -0700 - - get up to date with i210_dev - -commit aa02ac983fbe922464d39dd6a4623669e1036a5b -Merge: 78e47457 e9c3f8de -Author: Brent Zhao -Date: Tue May 19 15:29:33 2020 -0700 - - Merge branch 'datapipeline_dev' of https://github.com/flow-project/flow into datapipeline_dev - -commit 78e47457c034dce1cfbe3d18695ba6ff2a466159 -Author: Brent Zhao -Date: Tue May 19 15:28:54 2020 -0700 - - fix some style issue - -commit e9c3f8ded5e9a5e5e27f335a633b18efc71c071f -Merge: f43d0e43 3d16a5ad -Author: Brent Zhao -Date: Tue May 19 15:23:49 2020 -0700 - - Merge branch 'i210_dev' into datapipeline_dev - -commit f43d0e43a0b4ef158a15c680d4e3131bd7dee0fb -Author: Brent Zhao -Date: Tue May 19 13:41:17 2020 -0700 - - fix some query string formatting issue - -commit 3d16a5ad4e308da3628354191f14b2c949a59526 -Author: Eugene Vinitsky -Date: Tue May 19 15:53:30 2020 -0400 - - Ev i210 highway updated (#937) - - Merge in wave calibration for the straight road @AboudyKreidieh - -commit f021d5a6381e777eaea0a917b6a8f7e95ca3a1e0 -Author: liljonnystyle -Date: Tue May 19 10:44:06 2020 -0700 - - move partition condition to cte's - -commit 8a68fb93be587339fc1535b5c58c5e79731e1cd7 -Author: liljonnystyle -Date: Tue May 19 08:52:17 2020 -0700 - - rename vehicle power demand query - -commit 1dcf6a654f59a2c36406b3b6cf732e1fac79d3fb -Author: liljonnystyle -Date: Tue May 19 08:42:29 2020 -0700 - - reformatting energy queries - -commit c2513e9e1d0f22065e513c34e8edee178bef1602 -Author: Brent Zhao -Date: Tue May 19 04:10:43 2020 -0700 - - some minor issue fixed - -commit 462f4bb877a6e179ed27a926e0e660e9b37d6700 -Author: Brent Zhao -Date: Tue May 19 04:07:29 2020 -0700 - - fix trailing white space style issue - -commit 27445157469851cf146b7eb4b08d811929155033 -Author: Brent Zhao -Date: Tue May 19 04:01:41 2020 -0700 - - added auto upload to s3 feature for the reply scipt and fix some other minor issues - -commit c01f235891baa45b8af010e730e0daeefb557ae5 -Author: Brent Zhao -Date: Mon May 18 12:49:11 2020 -0700 - - fix merge issue in i210_replay - -commit b0689fecbceba9c3ca65c74606c37e3b00b6e824 -Merge: 78499d07 0f45dbe3 -Author: Brent Zhao -Date: Mon May 18 12:43:57 2020 -0700 - - Merge branch 'i210_dev' into datapipeline_dev - -commit 78499d071c4a9dc9a6c611b375c85ad1a80b3f82 -Merge: 2851e8a6 4b834647 -Author: Brent Zhao -Date: Mon May 18 12:35:58 2020 -0700 - - merge conflict resolved - -commit 2851e8a6b7089756c33a4519f6148c373b763a77 -Author: Brent Zhao -Date: Mon May 18 12:28:17 2020 -0700 - - removed the old tests - -commit 153da9d7dfd6b811c13634284f06000dceca9842 -Author: Brent Zhao -Date: Mon May 18 12:25:00 2020 -0700 - - change the bucket to a common bucket - -commit 0f45dbe356b79067915e933f5795ab3760d69930 -Author: Eugene Vinitsky -Date: Mon May 18 14:06:22 2020 -0400 - - Mpg reward2 (#933) - - Add an MPG and MPJ reward - -commit 3468747c4f824fcefcfc7b80ad3a695b4e8ae5d3 -Author: Kanaad Parvate -Date: Thu May 14 11:51:26 2020 -0700 - - Replay Improvement / Fixes (#905) - - * added aggressive driver and made modifications to replay scripts - - * add numpy import - - * some more small changes and cleanup - - * remove aggressive driver - - * added distribution plots - - * Fixed minor but common matplotlib error - - * merge - - Co-authored-by: Kathy Jang - -commit bdd6068b9326f984b886037f9572b01013df2e05 -Author: Brent Zhao -Date: Sun May 10 23:03:35 2020 -0700 - - including next_V for testing only - -commit 5d5606acad5b7f60c2eed3a3c67060d465d75733 -Author: Brent Zhao -Date: Sat May 9 22:06:30 2020 -0700 - - added new two new quries - -commit 6335dd847ef95b4e672616f27293bd612f8f6e1c -Author: Brent Zhao -Date: Thu Apr 23 13:02:33 2020 -0700 - - fix one more style issue - -commit 3bd49eca1b39d998abbc2c4fbbbb737dd58786cc -Author: Brent Zhao -Date: Thu Apr 23 12:58:44 2020 -0700 - - fix some more style issues - -commit 23783bd6e70f471189c929086be0a5e0a18e7797 -Author: Brent Zhao -Date: Thu Apr 23 12:38:47 2020 -0700 - - reorganized file locations - -commit 29ebdb70d4ab1203edfee65d9d50bb03785ea235 -Author: Brent Zhao -Date: Thu Apr 23 12:35:54 2020 -0700 - - fix style issue - -commit 8f05ec596edfe048487fcabf830b9cd04cedaf04 -Author: Brent Zhao -Date: Thu Apr 23 02:54:33 2020 -0700 - - fix windoes line ending issue with experiment.py - -commit 221bb9319a1df6e7550ecf18804278e6584ca4ea -Author: Brent Zhao -Date: Wed Apr 22 05:22:01 2020 -0700 - - added more support for lambda function - -commit bd13f693bd58522dfa69b11c15bc12f26b862772 -Author: Brent Zhao -Date: Fri Apr 10 19:54:30 2020 -0700 - - multiple runs issue solved, testing added - -commit 48e2642bd6da2be5696c2649eb73f1351b94769c -Author: Brent Zhao -Date: Mon Apr 6 15:28:57 2020 -0700 - - datapip pipeline implemented - -commit edfd1496f0fb85c7798526b8c23bc22b331ad2cc -Author: Eugene Vinitsky -Date: Tue Mar 24 22:49:17 2020 -0700 - - Add 1 lane highway network for Benni - -commit d99b8b7271bbd6231b93b3035d837028257db490 -Author: Eugene Vinitsky -Date: Thu Mar 19 12:41:31 2020 -0700 - - Convert inflows to pick out the best lane to travel in instead of a random lane - -commit 37161a60991187f71d20effb03b527481f657030 -Author: Eugene Vinitsky -Date: Thu Mar 19 12:10:07 2020 -0700 - - Upgrade the network to not have keepclear value on the junctions - -commit 1a36503ba19034f1bd11891fc13896b22f7d5c25 -Author: Eugene Vinitsky -Date: Thu Mar 19 11:32:12 2020 -0700 - - Increased inflows to 10800 to match density in Bennis ring - -commit 1db687e557ffab1d4caffb0b3a72cc647d806892 -Author: Eugene Vinitsky -Date: Wed Mar 18 16:43:22 2020 -0700 - - Add an on ramp option - -commit 5080514630615d232f3b9caf75c57c1623bdca7f -Author: Yashar Zeinali Farid <34227133+Yasharzf@users.noreply.github.com> -Date: Sat May 9 15:31:44 2020 -0700 - - changed _departed_ids, and _arrived_ids in the update function (#926) - - * changed _departed_ids, and _arrived_ids in the update function - - * fixed bug in get_departed_ids and get_arrived_ids - -commit aa1d7133bda5d89c54cd5a68a792a83e9e0f09cc -Author: Yashar Zeinali Farid <34227133+Yasharzf@users.noreply.github.com> -Date: Thu May 7 23:51:53 2020 -0700 - - get not departed vehicles (#922) - - * added function to kernel/vehicle to get number of not departed vehiles - - * fixed over indentation of the docstring - - * indentation edit - - * pep8 - - Co-authored-by: AboudyKreidieh - -commit bb3c14cfdbb742eca861a3846d6016aa0b237384 -Author: Eugene Vinitsky -Date: Sun May 3 23:47:51 2020 -0700 - - Benchmark fix (#919) - - * Add the appropriate reward to the grid benchmark back - - * Put the bottleneck in a congested regime - - * Bump bottleneck inflows to put it in the congested regime - -commit 771e504a413cdf0720de6304df7ebc48db43ddca -Author: Aboudy Kreidieh -Date: Sat May 2 02:51:06 2020 -0700 - - Bando / ghost edge (#917) - - * added bando model - - * added ghost edge to the highway network - - * added highway-single example - - * bug fixes - - * more tests - -commit 6ef1f0f231d3a3e643b0ee74b540846826733ff5 -Author: chendiw <31671291+chendiw@users.noreply.github.com> -Date: Tue Apr 21 15:14:31 2020 -0700 - - moved imports under functions in train.py (#903) - - * deleting unworking params from SumoChangeLaneParams - - * deleted unworking params, sublane working in highway - : - - * moved imports inside functions - - * Apply suggestions from code review - - * bug fixes - - * bug fix - - Co-authored-by: Aboudy Kreidieh - -commit ba2e214c6d263c2e8b107f8edde1666f3cf282d9 -Author: Eugene Vinitsky -Date: Fri May 8 15:43:03 2020 -0700 - - Add option to reroute exiting vehicles back into the network (#918) - - Add option to reroute exiting vehicles back into the network - -commit d15f19b0d5ca4529374d62553f4dd677c39f5008 -Author: Kanaad Parvate -Date: Tue May 5 11:14:57 2020 -0700 - - fix train multiagent_i210 (#915) - -commit eb67d2804574f20c42f64c974e8df4e8f722532a -Author: Kathy Jang -Date: Tue Apr 28 12:57:47 2020 -0700 - - New AMI with ray 0.8.0, tensorflow 2.1.0, h-baselines, stable-baselines (#916) - -commit 4b8346470714678ed2a50883a32ce60c79681ac6 -Author: Brent Zhao -Date: Thu Apr 23 13:02:33 2020 -0700 - - fix one more style issue - -commit 2177ef6e66af579530a003e961fb5302852bbb33 -Author: Brent Zhao -Date: Thu Apr 23 12:58:44 2020 -0700 - - fix some more style issues - -commit c429bf267f6ec18ecf1c9647ea637a490438ee36 -Author: Brent Zhao -Date: Thu Apr 23 12:38:47 2020 -0700 - - reorganized file locations - -commit 517499ee2d832deb266a0b86e8785ca105a63547 -Author: Brent Zhao -Date: Thu Apr 23 12:35:54 2020 -0700 - - fix style issue - -commit e84952580b1c7aeb3809593313121169872790d2 -Author: Brent Zhao -Date: Thu Apr 23 02:54:33 2020 -0700 - - fix windoes line ending issue with experiment.py - -commit 1759b027dbf24354e050bce3c6c6705092c2d6ec -Author: Brent Zhao -Date: Wed Apr 22 05:22:01 2020 -0700 - - added more support for lambda function - -commit 47057758ba3cf84dd125ac102fd0bae6681ac91a (origin/kj_temp) -Author: Eugene Vinitsky -Date: Wed Apr 15 20:24:51 2020 -0700 - - Evinitsky/straight road pr (#909) - - Add a straight road training environment. Swap out the reward for a desired velocity squared reward. - -commit adcc61787729ec7a60af1bb5e294f1df2eeca825 -Author: Brent Zhao -Date: Fri Apr 10 19:54:30 2020 -0700 - - multiple runs issue solved, testing added - -commit 073d828c2e6b7f3361056f01320b14e585c48a9b -Merge: 1100d8d2 5e3e8874 -Author: Kathy Jang -Date: Thu Apr 9 14:59:45 2020 -0700 - - Merge pull request #901 from flow-project/time_space_fixes - - Time space fixes - -commit 5e3e88742197c0587423b35c0ec9a9457ad75cf0 -Author: Kathy Jang -Date: Thu Apr 9 11:50:44 2020 -0700 - - style - -commit 4ce53319e4768cae17f866f3cfc9686db9080ae7 -Author: Brent Zhao -Date: Mon Apr 6 15:28:57 2020 -0700 - - datapip pipeline implemented - -commit 1100d8d2223014ea3919bbf553f7498d9c69bd60 -Author: Kanaad Parvate -Date: Sun Apr 5 22:41:18 2020 -0700 - - I210 Replay Script (#886) - - Replay script for the i210 env. - -commit d04f1440c7f3e953ac8cdddcc591b75f2800a13b -Author: Eugene Vinitsky -Date: Tue Mar 31 13:43:29 2020 -0700 - - Python upgrade (#895) - - - Upgrade python - - Clean up AMI - -commit 861c31e21d042471d9ea3be54d9ab0145d4321ff -Author: Eugene Vinitsky -Date: Tue Mar 31 11:49:58 2020 -0700 - - Noise fix (#894) - - * Add an option for a local reward that just computes speed of the AV and its follower - - * Set the noise scaling to match Bennis suggestions - -commit ba2ff131f64db344b8d928ff290266653680213f -Author: Eugene Vinitsky -Date: Mon Mar 30 11:56:15 2020 -0700 - - Add an option for a local reward that just computes speed of the AV and its follower (#891) - -commit 27f325b9fd9031f027b32732d195b808167ee980 -Author: Kanaad Parvate -Date: Sun Mar 29 16:21:59 2020 -0700 - - missed a flake8 - -commit eec0a02b430238c3a7ce4f05de0f04fb362d6e2b -Author: Kanaad Parvate -Date: Sun Mar 29 16:20:28 2020 -0700 - - flake and pydocstyle - -commit 91144cae9ddb0651603ab32b8652ca11cf7f9579 -Author: Eugene Vinitsky -Date: Thu Mar 26 12:46:39 2020 -0700 - - Add current dev version of multiagent I210 - -commit 5603f035581c6db19c3c7f6fcc8ab1378fbd215b -Author: Aboudy Kreidieh -Date: Wed Mar 25 10:24:39 2020 -0700 - - bug fix for num_rl_vehicles during reset (#884) - -commit 903bb729ccd6f4ad174ceac639a6665ded59d131 (origin/circles/model_dev) -Author: Eugene Vinitsky -Date: Tue Mar 24 22:49:17 2020 -0700 - - Add 1 lane highway network for Benni - -commit 0166e419330ba56c16df84a413bedb78e65be2b4 -Author: Aboudy Kreidieh -Date: Tue Mar 24 13:38:06 2020 -0700 - - support for h-baselines (#874) - - * started adding support for h-baselines - - * some cleanup - - * some cleanup - - * pydocstyle - - * added test to parse_args - - * working support for multiagent envs - - * added tests for train_h_baselines - - * maybe a bug fix - - * maybe a bug fix - - * one more try - - * helping out coveralls - - * got rid of broken test - - * pep8 - -commit d6ed510694f97cfa2a76539b481ec2c81a920144 -Author: zpymyyn -Date: Mon Mar 23 22:09:09 2020 +0200 - - specify python version for pip install (#859) - - To avoid error caused by multiple versions of python and pip - -commit 5869c581ca884af61902cea9e6acfe52a7b15e80 -Author: Eugene Vinitsky -Date: Thu Mar 19 12:41:31 2020 -0700 - - Convert inflows to pick out the best lane to travel in instead of a random lane - -commit 661564baeaec5f1be107a65b4ba3a4f6ea727c8c -Author: Eugene Vinitsky -Date: Thu Mar 19 12:10:07 2020 -0700 - - Upgrade the network to not have keepclear value on the junctions - -commit b8d12126b09bbf2552b27c5ed35887ec078dad97 -Author: Eugene Vinitsky -Date: Thu Mar 19 11:32:12 2020 -0700 - - Increased inflows to 10800 to match density in Bennis ring - -commit 35f5b5f1b96e6ca9db6175b0fd9ccdcfb30bff6b -Author: Kathy Jang -Date: Thu Mar 19 11:18:07 2020 -0700 - - Added code to output json. Added code to resolve macOS matplotlib import error - -commit 4c49ab74022a613a713f93a4ff7828821dec8cad -Author: Kathy Jang -Date: Thu Mar 19 10:32:47 2020 -0700 - - Fixed issue 840 (#841) - -commit 2eac0da8ecb3dbdbc45fd6efcca2718c9207fc12 -Author: Eugene Vinitsky -Date: Wed Mar 18 18:25:53 2020 -0700 - - The acceleration noise is now scaled by the sqrt of the sim step as suggested by Benni - -commit bdaa306aafe44d7caa47bd54084248868b0b4e27 -Author: Eugene Vinitsky -Date: Wed Mar 18 16:43:22 2020 -0700 - - Add an on ramp option - -commit d1688c6d533d5370b7f20b6776ddf191a7b32377 -Author: zpymyyn -Date: Tue Mar 17 21:22:34 2020 +0200 - - add pip in yml to avoid wrong-version pip (#858) - -commit d3c5c831b46cc4a09c698b1b683e1205d6d73817 -Author: Eugene Vinitsky -Date: Tue Mar 17 12:21:37 2020 -0700 - - Add ballistic integration as an option (#873) - - * Add ballistic integration as an option - - * bug fix - - Co-authored-by: AboudyKreidieh - -commit f72760b1d383b4b1d5af04d4c4355b89dbde28a5 -Author: Eugene Vinitsky -Date: Tue Mar 17 11:01:03 2020 -0700 - - Add energy reward from benni/joy (#864) - - * Add energy reward from benni/joy - - * Add tests - -commit 4e47f7aae7e3e94e75afdafd92a1ce8a749710ce -Author: Lucia Cipolina Kun -Date: Tue Mar 17 16:00:23 2020 +0000 - - singleagent_traffic_light_grid (#871) - - Fix high value of traffic light - -commit 80f3c47f55ce167dcf27164783234894d43ddda0 -Author: Eugene Vinitsky -Date: Thu Mar 12 17:21:41 2020 -0700 - - I210 merge (#839) - - Add I210 network - -commit 2df2afd80ba6a72deae43f11d67cba18310bdf8f -Author: Kanaad Parvate -Date: Wed Mar 11 15:42:14 2020 -0700 - - train from checkpoint (#853) - -commit e2e50775c91352d7b7fc566b4bc77e0c05f25ae8 -Author: Kanaad Parvate -Date: Mon Mar 9 17:10:47 2020 -0700 - - rendering fix (#861) - -commit 7d632c7c3d0c01912020f14cff9212289f0edd94 -Author: Aboudy Kreidieh -Date: Wed Mar 4 20:56:08 2020 -0800 - - Add flag auto_color flag to SumoParams and disable coloring if flag is off. (#849) - - * color specification - - * keep backward compaitble try/except - - * auto_update -> force_color_update, false by default - - * not in flake8 - - * i'm stupid this is better - - * add color to type params - - * added comments - -commit d4886d957e2a1b6bd251b64a19d1b286aad2cbcc -Author: Aboudy Kreidieh -Date: Wed Mar 4 14:37:49 2020 -0800 - - Add a nonlocal example of follower stopper as requested (#846) - - * Add a nonlocal example of follower stopper as requested - - * Make v_des nonlocal - -commit 32927677e6db72c68393aa3433f9e813485619ac -Author: zpymyyn -Date: Sun Mar 1 23:33:20 2020 +0200 - - usage argument correction (#843) - - * usage argument correction - - * usage argument correction 2 - - * usage argument correction 3 - -commit 8dba645b7de4205b5558c6277b3d6507c1d0fbbb -Author: Aboudy Kreidieh -Date: Thu Feb 27 13:34:43 2020 -0800 - - removed dt parameter from IDMController (#837) - -commit 4cd30ee686a5dffcd05b3989bd76db1d75c11f83 -Author: Aboudy Kreidieh -Date: Thu Feb 27 13:34:26 2020 -0800 - - fixed sims_per_step done bug (#838) - - this was causing experiments to end prematurely if sims_per_step > 1 - -commit bc65245504e590604ffa3a49376e3367c318a475 -Author: Eugene Vinitsky -Date: Fri Feb 21 18:53:04 2020 -0800 - - Fix the extra ray windows that pop up (#836) - -commit 3e8fc0ccc5130012e54fc9b882b72a3f857ce75e -Author: Aboudy Kreidieh -Date: Tue Feb 18 16:31:20 2020 -0800 - - Multiagent environments (#818) - - * renamed MultiAgentAccelEnv -> AdversarialAccelEnv and it's dependents as well - - * added MultiAgentAccelPOEnv - - * bug fix - - * bug fix - - * added MultiAgentWaveAttenuationPOEnv - - * added MultiAgentMergePOEnv - - * added tests - - * test to observed - - * added reset to wave attenuation env - - * test to observed in wave attenuation env - - * added figure eight example - - * added multiagent merge example - - * renamed multiagent_ring -> lord_of_the_rings - - * added an additional test - - * added multiagent ring example - - * test not being hit - - * added time debugger - - * bug fix to done mask - - * bug associated with warmup steps - -commit 7dc20963f0db1cb0edf892611e88d6866866dd13 -Author: Eugene Vinitsky -Date: Mon Feb 17 08:44:41 2020 -0800 - - Update README.md (#832) - -commit 509791145866f933bc6647614d88c85291549a54 -Author: chendiw <31671291+chendiw@users.noreply.github.com> -Date: Mon Feb 10 18:39:27 2020 -0800 - - deleting unworking params from SumoChangeLaneParams, sublanes working (#830) - - * deleting unworking params from SumoChangeLaneParams - - * deleted unworking params, sublane working in highway - : - - * Apply suggestions from code review - - * bug fix - - Co-authored-by: Aboudy Kreidieh - -commit 363d003b47c71916dc6c736ff270c6e5b560fe0a -Author: Dominik Kleiser -Date: Fri Jan 31 19:35:38 2020 +0100 - - Fix path to ring simulation (#822) - - Signed-off-by: Dominik Kleiser - -commit 5eac69157ace8e691f951b6d6d39425d0a9711d6 -Author: Ashkan Y -Date: Tue Jan 21 01:18:23 2020 -0800 - - Tutorial for multiagent (#808) - - * Creating tutorial for multi-agent - - * some cleanup - - * Making sure the jupyter file runs completely - - Co-authored-by: Aboudy Kreidieh - -commit 1f015dfa040acd7f90d0e8612a930ebfd79d0a4b -Merge: 5ceaf085 47cf2891 -Author: Ashkan Y -Date: Fri Jan 10 11:41:27 2020 -0800 - - Merge pull request #814 from flow-project/update_experiment - - Make render true by default in examples - -commit 47cf289102fc0a915da73aa700496aaac27febf5 -Author: Ashkan Y -Date: Fri Jan 10 11:14:28 2020 -0800 - - make render true by default - -commit 5ceaf0857bd833ca1d1109bee3a06e9d5384e698 -Merge: 6930f1e3 e52e5314 -Author: Ashkan Y -Date: Thu Jan 9 14:05:30 2020 -0800 - - Merge pull request #805 from flow-project/traffic_light_tests - - traffic light grid examples - -commit 6930f1e3c02a0fa0fbf3c98bb1ea50c7de347d61 -Author: Ashkan Y -Date: Wed Jan 8 09:09:10 2020 -0800 - - Combine train_rllib.py and train_stable_baseline.py (#812) - - * Make train.py single file - - * flake8 - - * Fix remaining files - - * Few bug fixes - - * PR fix - - Co-authored-by: Aboudy Kreidieh - -commit 55e39f1119924191ec4f207159438899ee24eee9 -Author: Aboudy Kreidieh -Date: Wed Jan 8 19:08:48 2020 +0200 - - remove remaining rllab (#757) - - * removed most uses of rllab. Bug pending - - * added description that separate py files are needed - - * bug fix - - * cleanup to tutorials - - Co-authored-by: Ashkan Y. - -commit e52e53147704f319749cd5aea489b11ed577104b -Author: Ashkan Y -Date: Tue Jan 7 11:43:38 2020 -0800 - - Flake8 - -commit 9f1c990dbb4e832968392e47a9541d75fd735c28 -Author: Ashkan Y -Date: Tue Jan 7 11:29:55 2020 -0800 - - Fixed multi agent traffic light grid - -commit e85caf3afb6bda4c643bac164ad6b8b43b2e2dad -Merge: e46a5aa2 d61e0c99 -Author: AboudyKreidieh -Date: Sun Jan 5 23:02:48 2020 +0200 - - Merge branch 'master' of https://github.com/flow-project/flow into traffic_light_tests - -commit d61e0c99e95b882755d50a28a2137bbe23674c5c -Author: Aboudy Kreidieh -Date: Sun Jan 5 22:48:12 2020 +0200 - - added plotly 2.4.0 dependency (#758) - -commit f35f7b91e5dd16eed3250de26416597ad754691c -Author: Ashkan Y -Date: Sun Jan 5 12:27:09 2020 -0800 - - Update remaining files to match with new way of running experiments (#803) - - * Update evaluate.py to match with new way of runnign experiments - - * flake8 issues - - * bug fix - - * bug fix - - Co-authored-by: Aboudy Kreidieh - -commit 824c613bbc79daccee21e5ba7acc24fd6e99daf1 -Author: Ashkan Y -Date: Sun Jan 5 09:56:47 2020 -0800 - - Fix sim_params in the tutorials (#807) - - * Update tutorials - - * Update all tutorials - - * Apply suggestions from code review - - Co-authored-by: Aboudy Kreidieh - -commit d2cd8934599e7f27e6cf39b6563519bdedd841f8 -Author: Ashkan Y -Date: Sun Jan 5 09:56:01 2020 -0800 - - Update tutorials to match with the new way of running experiments (#802) - - * unused parameter - - * Update tutorials according to the new example folder - - * Adding final changes to the tutorials - - * Correct the env_name and network in flow_params - - * bug fix - - Co-authored-by: Aboudy Kreidieh - -commit 5bbbf88354219a5390e85c2a770e64c04beda79c -Author: Radu Stochitoiu -Date: Sun Jan 5 15:49:39 2020 +0200 - - Correct typo (#810) - -commit a876a55c8be3e10e0842bfdae72decc124c7d078 -Author: Radu Stochitoiu -Date: Sun Jan 5 15:49:11 2020 +0200 - - Correct typo (#809) - - Modified "founded" to "found". - -commit e46a5aa2c8b1ae4240462f39f5141a6bae46289d -Author: Ashkan Y -Date: Fri Dec 27 16:53:55 2019 -0800 - - Imrpove naming of the tests in test_examples - -commit 0007f89a40096a0cbd66a5af6cf8999a1380a6a7 -Author: Ashkan Y -Date: Fri Dec 27 16:44:43 2019 -0800 - - traffic light grid multiagent fix - -commit 1a44c3f2d1b889ff97a7e71e7b41b7fe1b30126c -Author: Aboudy Kreidieh -Date: Tue Dec 24 10:16:50 2019 +0200 - - New example folder (#720) - - * better file names for environments - - * change base_scenario.py to base.py for consistency - - * change WaveAttenuationMergePOEnv to MergePOEnv for consistency - - * initial pass at modifying examples page - - * changed "loop" to "ring" in envs - - * Renamed "loop" to "ring" in scenarios - - * More rename "loop" to "ring" - - * Final commit for "loop" to "merge" - - * merge multiagent_envs into envs - - * changed all apperance of green wave to traffic light grid - - * Fixed names for scenarios so that they match the environments. Everything is uniform now - - * moved scenario files to network and renamed Scenario->Network - - * removed all non-aimsun mentioned of scenario - - * added pending deprecation warning for scenario use - - * Removing cooperative_merge (later we called it "TwoRingsOneMerge" - - * pep8 - - * added deprecation warning for scenario to env input - - * Refactoring new files that are added after pulling from master - - * Change 'grid' to 'traffic_light_grid' across all files - - * addressed flake8 issues - - * PR fixes - - * PR fix - - * Fixed test_visualiszer.py errors - - * working version of simulate.py - - * bug fixes - - * fixed tests for simulate - - * cleanup - - * added script for running single agent rllib experiments - - * added multiagent rllib support to examples - - * Remove data.json - - * pydocstyle fixes - - * pep8 - - * modified some examples - - * added stable baselines support - - * bug fix - - * added aimsun template to exp_configs - - * added missing files - - * Update README.md - - * Update readme to reflect how to run examples, and to add all the examples - - * Renamed several files so the new naming matches our new naming convention - - * Update readme, flow_setup, change example paths in files - - * Update tutorial 00 for the new structure of examples - - * Rename density_exp and also update the ray_auoscale.yaml - - * fix train_rllib - - * fix pep8 issues - - * fix test for highway - - * check multiagent file name, remove HTTPS - - * properly update config dictionary - - * Fix the follwoing multiagent examples:{figure_eight, highway, ring} - - * Resolve flake8 issues - - * Fix errors in test_experiment_base_class - - * Fixing class TestCollisions with the new way of running experiments - - * pep8 - - * Fix errors in test_contollers - - * Fix the tests with ring_road_exp_setup - - * flake8 - - * Revert "flake8" - - This reverts commit 52d1a099fcc9c89a82a36362f4061cfa4451b8ce. - - * Revert "Fix the tests with ring_road_exp_setup" - - This reverts commit 1659fb3582b2078dd5a8cea56cd8817c810800b0. - - * Fix all tests that use setup_scripts - - * pep8 - - * Fix benchmark tests - - * (Thanks Kanaad) Fix the error that was causing many benchmarks and examples fail - - * Resolve merge conflict - - * Fix test_experiment_base_class errors - - * Fix test_collisions errors - - * Trying isolating bug - - * Testing to see if TestVisualizerRLlib is the issue - - * Testing if test_benchmarks is the problem - - * Revert "Testing if test_benchmarks is the problem" - - This reverts commit 050f5db2cf54f7ba69df08e367f430f393ba6c47. - - * Revert "Testing to see if TestVisualizerRLlib is the issue" - - This reverts commit 42978c49ec0ada00c78d9944780691e3f61febd1. - - * Revert "Trying isolating bug" - - This reverts commit c359d8fc9c8c32d000c102b5a2622a11e23660df. - - * trying to see if the error is in slow tests - - * Trying to see if test_examples or test_visualizers is the issue - - * Trying to see where the error occurs in fast_tests - - * See if example rename is the issue - - * typo - - * some minor cleanup - - * fixed some tests - - * resolved multiple registery calls bug - - * Fixing the random start of vehicles on ring - - * Fixing the bug that comes up randomly - - * Trying to remove randomness - - * flake8 issues - - * Remove unnecessary debugging code - - * update the hierarchy of exp_config to be more logical - - * Update examples/README.md - - Co-Authored-By: Aboudy Kreidieh - - * Update examples/README.md - - Co-Authored-By: Aboudy Kreidieh - - * Address aboudy's comments - - Co-authored-by: Nathan Lichtlé - Co-authored-by: Ashkan Y. - Co-authored-by: Kanaad Parvate - -commit 2a084f42ff3f625c8c5debec4913b8567b0cfa68 -Merge: ac23278f 99daa202 -Author: Ashkan Y -Date: Mon Dec 23 11:21:51 2019 -0800 - - Merge pull request #798 from flow-project/env_name_fix - - update tutorial 00 to reflect the new folder of multiagent env - -commit 99daa202742dc8ed74d2b7d3a0a76605503bd370 -Author: Ashkan Y -Date: Mon Dec 23 00:15:26 2019 -0800 - - update tutorial 00 to reflect the new folder of multiagent env - -commit ac23278fbb092e878d2d67d3ad6324eeef3ab9a3 -Author: Isaacb -Date: Tue Dec 17 21:19:01 2019 -0600 - - Checked for edge case where vehicle speeds is empty (#795) - -commit 97b962a48d054df1127b066dbef7b294b5d8cf9c -Author: Damian Dailisan -Date: Mon Dec 2 05:02:34 2019 +0800 - - render to video using sumo-gui (#784) - - * render to video using sumo-gui - - * flake - - * allow usage of sumo_gui in render - - * cleanup - -commit 7ff781588ff23f42af00b9b01a5720f85959d1d0 -Author: Zhongxia Yan -Date: Mon Nov 25 15:38:19 2019 -0500 - - changed visualizer rllib to not open SUMO unnecessarily (#788) - - * changed visualizer rllib to not open SUMO unnecessarily - -commit 44e21a3a711c8f08fc49bf5945fb074e9f41c61d -Author: Eugene Vinitsky -Date: Thu Nov 21 20:08:54 2019 -0500 - - (Bug): Change loop network to ring network in tutorial 8 (#786) - -commit 27f0cfd0b382b535736568b0f154add08b89c6ce -Author: GilbertBahati <41528944+gilbertbahati@users.noreply.github.com> -Date: Wed Nov 20 13:06:15 2019 -0800 - - added the Gipps car folowing model- first order model (#776) - - * added the Gipps car folowing model- first order model - - * added the Gipps car folowing model- first order model_ - - * tests for GippsController - -commit 7a99a567d9fbc8e857e49c42c5d539b29562fb6a -Author: Eugene Vinitsky -Date: Thu Nov 7 16:14:26 2019 -0800 - - Update README.md (#775) - -commit c6fcf4fa688d54a59fe3168e5e21c1fb58c222f5 -Author: Yashar Zeinali Farid <34227133+Yasharzf@users.noreply.github.com> -Date: Wed Nov 6 14:13:53 2019 -0800 - - Aimsun 8 4 install guide (#774) - - * added troubleshooting for Aimsun 8.4 installation - - * fixed bug - aimsun sitepackage installation guide - - * minor edits - -commit 2b9e7a2863f59836ba0f6a3f202787721afb75cb -Author: Damian Dailisan -Date: Mon Nov 4 20:16:08 2019 -0800 - - Running multiple aimsun instances while training (#766) - - * Use port to generate unique auxiliary files - - * open multiple copies of ang file to avoid conflict - - * flake - -commit 4ff791b3af6c7d06f9ccc8148e9c6b97bdd19745 -Author: Kathy Jang -Date: Wed Oct 30 13:59:07 2019 -0700 - - Updated versions for lxml and cloudpickle (#762) - - * Updated versions for lxml and cloudpickle - - * Updated lxml for environment.yml - -commit 61f36f2bdd1012a49df58f49b5aedfb447294551 -Author: Kathy Jang -Date: Mon Oct 28 21:51:37 2019 -0700 - - Fixed multi-agent open network __done__ bug (#767) - -commit f174056b29f5a3ffe789562eaf91f2820dca1235 -Author: Zhongxia Yan -Date: Sat Oct 26 16:50:04 2019 -0400 - - disable stdout when invoking flow scripts (#763) - -commit 0a188f500051a643edbac6d89b3adc1e0e2eccce -Author: Damian Dailisan -Date: Thu Oct 24 14:28:45 2019 -0700 - - Aimsun communication port no longer hardcoded (#761) - -commit 0b518f6d402f8369579c99a35dcb5fcf349d4763 -Author: Eugene Vinitsky -Date: Tue Oct 22 17:49:05 2019 -0700 - - (Bug): Fix the observation space in Multi wave attentuation env - -commit 4a27159dd92c818f9c23dac8d18e63b2a37d139e -Author: Nathan Lichtlé -Date: Tue Oct 15 06:24:14 2019 +0200 - - New visualization tutorial (#635) - - * start rewriting tuto5 - - * new visualization tutorial - - * Add example to visualization tutorial - - * Print path where emission file is generated - - * Add trained ring policy for visualization tutorial - - * Display path of CSV emission file generated by --gen-emission - - * Rename section - - * removed rllab, added updated trained policy - -commit 054d3937af3082595f074bb58067e23e48df93cb -Author: Damian Dailisan -Date: Mon Oct 14 21:09:10 2019 -0700 - - Aimsun fixes (#753) - - * get rid of save prompt in aimsun - - * bug: getLanesLength2D sums all lane lengths - - * was using wrong key for speed limit - - * add flow directory to PYTHONPATH - - * length2D is the proper way to get edge length - -commit 1906340e1fdfcd3623e718a6698b03fef04688b5 -Author: Ashkan Y -Date: Mon Oct 14 16:16:07 2019 -0700 - - Changed the remaining old names (#754) - -commit 84a7249a4378340080f6aadaf7a8a759df7302c8 -Author: kevin-thankyou-lin <33344633+kevin-thankyou-lin@users.noreply.github.com> -Date: Sat Oct 12 12:12:52 2019 -0700 - - Update tutorial 11 (#751) - - * modify flow/config for aimsum - - * fixed tutorial 11 typos and updated import modules - - * Fix tutorial 11 inflow depart_speed speedLimit param - - * Fixed tutorial 11, replaced speedLimit with max and set one departure speed as a constant - - * Revert "Fixed tutorial 11, replaced speedLimit with max and set one departure speed as a constant" - - This reverts commit 77ebb92af71daa38a35911b3864d6f4795e78259. - - * replace speedLimit with max and used a constant for a departure speed - -commit 5eaa30e8d759036e93bbe490081994a8bca8fbf2 -Author: Yashar Zeinali Farid <34227133+Yasharzf@users.noreply.github.com> -Date: Tue Oct 8 13:05:07 2019 -0700 - - Fixed Aimsun Bugs (#750) - - * Fix bugs in utils/aimsun/load.py - - 1. Updated the path to data.json - 2. Added a check before querying centroid_config.origin_centroids and centroid_config.destination_centroids to prevent erroring out when the model doesn't have origin or destination centroids set. - - * Fixed bug - - * bug fixed - - * deleted the json files - - * PR fixes - -commit 67d1a5298e55dcac83e77768348e6f6e61cfab97 -Author: Nicholas Liu -Date: Tue Oct 8 12:45:23 2019 -0700 - - Cleaned up tutorial07 run history and fixed LuSTScenario directories (#748) - -commit 375fac9b424ab3d5cb989030abfc9d49a2416ea8 (origin/routes) -Author: Umang Sharaf -Date: Fri Oct 4 16:45:11 2019 -0700 - - Fix bugs in utils/aimsun/load.py (#746) - - * Fix bugs in utils/aimsun/load.py - - 1. Updated the path to data.json - 2. Added a check before querying centroid_config.origin_centroids and centroid_config.destination_centroids to prevent erroring out when the model doesn't have origin or destination centroids set. - - * Fixed bug - - * Renamed in more places - -commit 2418b649a9c69a41abf0ae6d7780057273d53449 -Author: Alben Bagabaldo <36107964+albenbagabaldo@users.noreply.github.com> -Date: Wed Oct 2 19:07:16 2019 -0700 - - Update for setup_aimsun.sh (#744) - - * Addressing issue #743 - - This is a fix for Conda having removed support for Python 2.7.4 and not being able to run setup_aimsun.sh - - * Uncommented the two lines of code - - I've also changed the comment, so people know the purpose of adding the two lines of code. - -commit 0d425fb41af4b999520b10f08255a390d826b464 -Merge: fc76d031 4dadba3c -Author: Umang Sharaf -Date: Wed Oct 2 11:58:06 2019 -0700 - - Merge pull request #745 from flow-project/umangs94-patch-ring - - Change flow.networks.loop to ring to fix module error - -commit 4dadba3c55dd484306808b1735e4177049f7a13e -Author: Umang Sharaf -Date: Wed Oct 2 11:39:20 2019 -0700 - - Changing loop to ring to fix module error - - There is no flow.networks.loop anywhere, so this should be changed to flow.networks.ring - -commit fc76d03174cae3da2b1f84efffcec5a98c3980c6 -Author: kevin-thankyou-lin <33344633+kevin-thankyou-lin@users.noreply.github.com> -Date: Mon Sep 30 18:26:17 2019 -0700 - - Update Installation Instructions (#742) - - * Update flow_setup.rst: add python setup.py develop - - We need the line "python setup.py develop" for the SUMO GUI to load. Otherwise, we'll get a ModuleNotFound Error. - - * Update flow_setup.rst - - I've moved the command "python setup.py develop" up to the setup instructions itself (i.e. directly after activating the conda environment). - - I've also updated "source activate" and "source deactivate" to "conda activate" and "conda deactivate", since "source" no longer works for Anaconda versions >= 4.6. - - Finally, I've deleted the repeated instructions on "Testing your installation" for RLlib. There were two of the same sections for Testing your installation for RLlib, and the content of second one was just a shortened version of the first one. - -commit 180e063e2b77db17179e78a5d933d9601b736bbd -Author: Damian Dailisan -Date: Fri Sep 27 14:13:32 2019 -0700 - - use environment variables (#740) - - * use environment variables - -commit 3c010946fb6303c7ef6afd764532e6f3943875b7 -Merge: 26ffa1ca c73a8817 -Author: Damian Dailisan -Date: Wed Sep 25 15:03:41 2019 -0700 - - Merge pull request #719 from flow-project/passing_env_instances - - Allows passing of Env and Scenario instance through flow_params. - - Passing of strings will be deprecated, but backwards functionality is provided. - -commit c73a8817edc8b7ba75b4fb6dd4dd099122f00e33 -Author: AboudyKreidieh -Date: Tue Sep 24 14:14:30 2019 -0700 - - bug fixes to tests - -commit 30914f1557789d6aa7be743b7707d0b2e97c75e6 -Author: damian -Date: Tue Sep 24 13:27:01 2019 -0700 - - tests still assumed strings were being passed - -commit 9d78375cc772b9b3e5a0775ef88e74209a413bcb -Author: AboudyKreidieh -Date: Tue Sep 24 12:46:24 2019 -0700 - - updated tutorial - -commit 26ac0e3f0a9d3b01255ef06886bfa58151ae31ca -Author: AboudyKreidieh -Date: Tue Sep 24 12:38:34 2019 -0700 - - replaced strings with classes in all examples and benchmarks - -commit d8cc47b3567ef28dbfb448f9d6e1b3923e3794e5 -Merge: 7c4b2953 26ffa1ca -Author: AboudyKreidieh -Date: Mon Sep 23 21:22:34 2019 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow into passing_env_instances - -commit 7c4b2953539c74c7e89d208612e80c2dde2ee308 -Author: damian -Date: Mon Sep 23 15:12:17 2019 -0700 - - should not expect strings from `get_flow_params`. - -commit 26ffa1ca8c7bed12a6ad034c5aa019df3e8f4f0a -Author: Kanaad Parvate -Date: Mon Sep 23 14:30:57 2019 -0700 - - Upgrade ray to 0.7.3 (#732) - - * upgrade ray from master - - * pull kparvate/upgrade_ray_2 - - * update benchmark scripts to only run ppo, and set 14 cpus - - * length includes internal lengths, added no_internal_length - - * flake - - * make aboudy's changes - - * fix - - * checkout origin/master in autoscale.yaml - - * added upadted pkl results for rllib - - * updated obs space of multiagent highway, fixed multiagent features in visualizer_rllib - - * upgraded numpy, setuptools - - * bug fixes - -commit ae539f3d647b380f1984fbfccc7672a470355efb -Author: damian -Date: Mon Sep 23 14:25:30 2019 -0700 - - remove trailing whitespace - -commit 85f966d7e57065664d40e9a6ad65e9a036229269 -Author: damian -Date: Mon Sep 23 14:21:15 2019 -0700 - - cleaned up implementation, pass Network as a class - -commit b49d918f61c534a1b0914e7423e68967a7c493db -Author: Eugene Vinitsky -Date: Mon Sep 23 11:30:10 2019 -0700 - - Update README.md (#737) - -commit 5305911ae2e8667f58387c81a9d10d67120b6eec -Author: damian -Date: Wed Sep 18 11:05:15 2019 -0700 - - added line to comply with flake8 - -commit 5b1a0045f8f0a613be8d604169557af462e7982b -Author: damian -Date: Fri Sep 13 21:39:44 2019 -0700 - - encode whole module name for reloading with visualizer_rllib.py - -commit 9c3e08eded305fcd190462ecd469c8fa635f90ea -Merge: 8e270c5f bd49a788 -Author: damian -Date: Fri Sep 13 21:32:11 2019 -0700 - - merge scenario -> network changes - -commit bd49a7882fa645b9b2a706c60482e3236544766d -Author: Aboudy Kreidieh -Date: Thu Sep 12 01:36:05 2019 -0700 - - scenarios -> networks [do not merge] (#698) - - * better file names for environments - - * change base_scenario.py to base.py for consistency - - * change WaveAttenuationMergePOEnv to MergePOEnv for consistency - - * changed "loop" to "ring" in envs - - * Renamed "loop" to "ring" in scenarios - - * More rename "loop" to "ring" - - * Final commit for "loop" to "merge" - - * merge multiagent_envs into envs - - * changed all apperance of green wave to traffic light grid - - * Fixed names for scenarios so that they match the environments. Everything is uniform now - - * moved scenario files to network and renamed Scenario->Network - - * removed all non-aimsun mentioned of scenario - - * added pending deprecation warning for scenario use - - * Removing cooperative_merge (later we called it "TwoRingsOneMerge" - - * pep8 - - * added deprecation warning for scenario to env input - - * Refactoring new files that are added after pulling from master - - * Change 'grid' to 'traffic_light_grid' across all files - - * addressed flake8 issues - - * PR fixes - - * PR fix - - * Fixed test_visualiszer.py errors - - * bug fixes - - * Remove data.json - - * bug fix - - * added deprecation support - - - added a deprecation function for classes and functions - - renames deprecation_warning ->deprecated_attribute - - added deprecation warnings for all old names of environments - - updated version to 0.5.0.dev - - * pep8 - - * pydocstyle - - * added deprecation warnings to changed scenarios - - * added deprecation warning for the multiagnet environments - - * pydocstyle - - * cleanup - -commit 8e270c5f250c6c9c5ef9be1ffd533e88a51805be -Author: damian -Date: Wed Sep 11 20:55:42 2019 -0700 - - remove trailing whitespace - -commit 38cfb6cb260a81c370b44674f80246c7eb5e84e4 -Author: damian -Date: Wed Sep 11 20:38:51 2019 -0700 - - Allows passing of Env instance through flow_params - -commit f4ed943661f7d098813de759432b210136da7508 -Author: Nathan Lichtlé -Date: Tue Sep 10 22:35:29 2019 +0200 - - Better folder structure and file names (#625) - - * better file names for environments - - * change base_scenario.py to base.py for consistency - - * change WaveAttenuationMergePOEnv to MergePOEnv for consistency - - * changed "loop" to "ring" in envs - - * Renamed "loop" to "ring" in scenarios - - * More rename "loop" to "ring" - - * Final commit for "loop" to "merge" - - * merge multiagent_envs into envs - - * changed all apperance of green wave to traffic light grid - - * Fixed names for scenarios so that they match the environments. Everything is uniform now - - * Removing cooperative_merge (later we called it "TwoRingsOneMerge" - - * Refactoring new files that are added after pulling from master - - * Change 'grid' to 'traffic_light_grid' across all files - - * addressed flake8 issues - - * Fixed test_visualiszer.py errors - - * Remove data.json - - * added deprecation support - - - added a deprecation function for classes and functions - - renames deprecation_warning ->deprecated_attribute - - added deprecation warnings for all old names of environments - - updated version to 0.5.0.dev - - * pep8 - - * pydocstyle - - * added deprecation warnings to changed scenarios - - * added deprecation warning for the multiagnet environments - - * pydocstyle - - * added two missing deprecated files - -commit ad1bc36b5ef4cdbb492a2020441a4720fa4cf94b -Author: Aboudy Kreidieh -Date: Mon Sep 9 11:48:55 2019 -0700 - - added TRPO runner to benchmarks (#713) - - * added TRPO runner to benchmarks - - * added tests for TRPO runner - - * pep8 - - * delete created file - -commit b72040e1ab56e99b0a67b20cfb15eb5aa287acf1 (tag: v0.4.1) -Author: Aboudy Kreidieh -Date: Tue Sep 3 17:20:17 2019 -0700 - - modified version for release (#705) - -commit c696bcf74a3151720f44be528a8f9a925f79970d -Author: Eugene Vinitsky -Date: Fri Aug 30 15:28:04 2019 -0700 - - Fix departed id counting (#704) - -commit feea3abafe2b94b3b66f66939dba45792ffb32e5 -Author: Kathy Jang -Date: Fri Aug 23 19:22:52 2019 -0700 - - Deleted rllab tutorial, renumbered bottlenecks tutorial (#699) - - Renumbered tutorials to match title, also updated README - -commit 2b5a78fc159ebc87dfa9d54a312014ac3c00eb07 -Merge: 2931df5b 5a1ba0a2 -Author: Kathy Jang -Date: Tue Aug 20 17:21:43 2019 -0700 - - Merge pull request #597 from kjang96/issue_32 - - RLlib EC2 tutorial, issue 32 - -commit 5a1ba0a228d506bcabad26aa6dcfb93205d944e3 -Author: Kathy Jang -Date: Mon Aug 5 19:13:02 2019 -0700 - - Created RLlib EC2 tutorial - -commit 2931df5bf2ed3bb2f2a2203a58d262ae08c7831e -Author: Eugene Vinitsky -Date: Tue Aug 20 09:55:57 2019 -0700 - - Evinitsky/setupfix (#694) - - Remove stable baselines from environment and requirements file. - -commit 69ac2440b9c538fceb78b8dcf28a557525c2c4f0 -Merge: 72555dec dd8f7218 -Author: Ashkan Y -Date: Mon Aug 19 22:22:18 2019 -0700 - - Merge pull request #642 from flow-project/ashkan-development - - Improving Traffic Light Tutorial - -commit dd8f72186fdaf66e447c82ad5e1ca5ceaff9b8a6 -Merge: 4c8aab68 df405216 -Author: Ashkan Y -Date: Mon Aug 19 21:53:05 2019 -0700 - - Merge branch 'master' into ashkan-development - -commit 4c8aab6840c445f3911ebd1743035e734143c7a2 -Author: Ashkan Y -Date: Mon Aug 19 21:52:49 2019 -0700 - - Last change - -commit 7e400ce8e689921a804ec92379fdca53b66c118c -Author: Ashkan Y -Date: Mon Aug 19 21:45:05 2019 -0700 - - Addressed Eugene's comments - -commit 72555decd53e9f3611d02cbf66e316d7d0abb10f -Author: Fangyu Wu -Date: Mon Aug 19 17:57:20 2019 -0400 - - Add clipping for Tuple and update gym to 0.14.0. (#685) - - * Add clipping for Tuple and update gym to 0.14.0. - -commit a34865a9011bb4b6e25b365ce826f38613d7e5a6 -Author: Eugene Vinitsky -Date: Mon Aug 19 13:39:30 2019 -0700 - - Add bottleneck tutorial (#684) - - Tutorial for bottleneck. - -commit df40521613a0c773008c40bf50caff5eedc8e445 -Merge: dd64a1c0 966fa9fa -Author: Ashkan Y -Date: Sun Aug 18 16:16:19 2019 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow - -commit 966fa9fa7f5c2282ceecd80e4621c576984cb032 -Author: Aboudy Kreidieh -Date: Sun Aug 18 15:40:30 2019 -0700 - - removed redundant tutorials (#692) - -commit 2294c947b441471a968a3f26d95a52d56dafd368 -Author: Eugene Vinitsky -Date: Wed Aug 14 22:04:34 2019 -0700 - - Kill rllab (#690) - - * Remove 99.9% of rllab - - * removed final rllab script - - * updated version number and pep8 - - * Add the renamed tutorials - - * Actually remove rllab run scripts - -commit 6dcfb91dd36c6c33329d6f1f3df2cb84c3ccb1ec -Author: Eugene Vinitsky -Date: Wed Aug 14 16:56:50 2019 -0700 - - Remove 99.9% of rllab (#664) - - Remove RLlab - -commit 93f14512a267c7203f866879a3282260448b5033 -Author: Cathy Wu -Date: Tue Aug 13 20:51:57 2019 -0400 - - Fix vehicle accounting (for multi-agent settings) (#629) - - Update the counting of the number of vehicles in the system to be less error prone. - -commit 325b02ecb63566f89bd852973629b4ec5ea0f363 -Author: Eugene Vinitsky -Date: Tue Aug 13 17:38:35 2019 -0700 - - Evinitsky/add baselines (#668) - - * First pass at adding stable baselines - - * Added all examples for stable baselines - - * Fix command execution in mac osx - - * Upgrade gym - - * Update rllib registry to pass tests - - * Add stable baselines to travis - - * Freeze stable baselines version - - * Initial vehicles are distributed across lanes in the grid now - - * Changed parsing in stable baselines - -commit fde78a4214db1af5c45902e91ad16ee1ff3f4435 -Author: Kathy Jang -Date: Mon Aug 12 16:15:27 2019 -0700 - - Updated requirements.txt such that the pip or pip3 install will actually work (#683) - -commit b4e4fc94c689b70d873929d53092504845430d0e -Author: Marsalis Gibson -Date: Mon Aug 12 16:13:34 2019 -0700 - - Usage doc (#679) - - * Added usage doc to controllers - - * Adding usage doc to params.py - - * Finish usage doc - - * pep8 and cleanup - - * Remove usage examples from params.py - -commit eebcf7fa18db9465fe921c00e573efaaff9a28bc -Author: Cathy Wu -Date: Mon Aug 12 19:05:08 2019 -0400 - - missing matplotlib dependency (#677) - -commit 9793f8e8421f23c682f2281310a3d6519e55d97c -Merge: b7f126c1 4b19afff -Author: Ashkan Y -Date: Mon Aug 12 01:45:26 2019 -0700 - - Merge branch 'ashkan-development' of https://github.com/flow-project/flow into ashkan-development - -commit b7f126c1cade43cb1cbceefb025b447d0ca52167 -Author: Ashkan Y -Date: Mon Aug 12 01:45:24 2019 -0700 - - fix typos, thanks to Eugene - -commit 0e569be643706e92661c9a9bc28f3224b3c4e1bc -Author: Nathan Lichtlé -Date: Fri Aug 9 14:06:29 2019 -0700 - - Tutorial 0 - Introduction to Flow (#656) - - * introduction draft - - * wrote part 1 - - * add notes to introduction - - * add transition at end of part 2 - - * structured tutorial - - * quick fix - - * add environments section - - * modify environments according to better-file-names PR - - * tutorial0 - - * add image - - * fix old transition - - * Minor changes to tutorial - - * Language fix - - Co-Authored-By: Eugene Vinitsky - - * Improve tutorial 0 - - * Add tutorial 0 in README - - * Replace subsections titles by horizontal lines - - * Update tutorial00_flow.ipynb - - * Last modifications to tutorial 0 - - * Correction in spelling - - Changed "refere" to "refer" - -commit cb96463747988e4607eb8710195e55a5ff9caacb -Author: Nathan Lichtlé -Date: Fri Aug 9 09:14:37 2019 -0700 - - Multi-agent training on highway with ramps (#671) - - * Default num_vehicles to 0 when adding vehicle type - - * add color_vehicles param if we don't want auto vehicle coloration - - * Add color_vehicles param in docstring - - * More params and docstring for InFlows - - * Consider new inflow params period and number when adding them in sumo - - * Complete wrt changes and add examples to inflows tutorial - - * Add images for new inflow tutorial - - * Fix allowed value for 'begin' param - - * Add precisions for kwargs - - * Fix docstyle - - * Make attribute SimParams.color_vehicles back-compatible for tests - - * Fix test_environments that expects one vehicle of each type to be added by default - - * Fix bug in case inflow generates vehicles into several routes - - * Made new highway example with on and off ramps - - * Add angle for on and off ramps - - * Modify network parameters - - * Fix docstring - - * Fix docstring - - * Fix pep8 - - * Fix pep8 - - * Fix bug of vehicles colliding - - * test highway ramps - - * Fix vehicles collision - - * Add ramps angle in additional params - - * updated python version - - * updated rllib pkl data to match new python - - * added channel to conda - - * added different channels - - * Add csv and png files to .gitignoe - - * Multi agent highway first commit - - * Add highway scenario to __init__ - - * Add multiagent highway env to __init__ - - * Cleaned example file - - * Cleaned multi-agent highway environment - - * Fix name conflict - - * Fix copy/paste from single agent env - - * Modify SumoParams - - * Fix bug when RL vehicles are inserted and no reward for them is computed - - * Color the follower vehicle as well as the leader - - * Make sure get_follower returns the closest follower - - * Fix typo - - * Added lane changing to actions - - * Change parameters - - * Continue simulation in case of crash - - * Adjust parameters - - * Store observation when vehicles teleport - - * Comment lane changing out of action space - - * Make RL vehicles stay on highway - - * Adjust warmup steps - - * pep8 - - * pydocstyle - - * Update parameters - - * some bug fixes - - * pep8 - - * bug fix - - * added tests for highway env - - * another attempt at silencing something from coverage - - * removed @ray.remote methods from coverage - -commit 92b16feee3ee62cc176aa047dbb89d3b164b972a -Author: Eugene Vinitsky -Date: Mon Aug 5 15:43:51 2019 -0700 - - Fix command execution in mac osx (#670) - -commit 5b30957047b808128c4a6091099bebc73ff78757 -Author: Cathy Wu -Date: Fri Aug 2 15:02:00 2019 -0700 - - Exception handling (#654) - - * exception handling - - * Update flow/core/kernel/vehicle/traci.py - - Co-Authored-By: Aboudy Kreidieh - -commit 4b19afff2c5a6e983096b1536a6990bc1b320138 -Merge: 3b36cc17 681d200c -Author: AboudyKreidieh -Date: Fri Aug 2 14:56:53 2019 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow into ashkan-development - -commit 681d200c77f004f797f7f8f0ca4a650063217b3a -Author: Aboudy Kreidieh -Date: Mon Jul 29 18:35:39 2019 -0700 - - delete xml emission files if creating csv versions of them (#662) - - * delete xml emission files if creating csv versions of them - - * Delete .xml emission files in visualizer (CSV is generated by default) - - * pep8 - - * bug fix - -commit 0b8503fbbe531425d004fa89d9b2e122aeacb68f -Author: Nathan Lichtlé -Date: Mon Jul 29 17:39:46 2019 -0700 - - Generic highway scenario (#667) - - * Default num_vehicles to 0 when adding vehicle type - - * add color_vehicles param if we don't want auto vehicle coloration - - * Add color_vehicles param in docstring - - * More params and docstring for InFlows - - * Consider new inflow params period and number when adding them in sumo - - * Complete wrt changes and add examples to inflows tutorial - - * Add images for new inflow tutorial - - * Fix allowed value for 'begin' param - - * Add precisions for kwargs - - * Fix docstyle - - * Make attribute SimParams.color_vehicles back-compatible for tests - - * Fix test_environments that expects one vehicle of each type to be added by default - - * Fix bug in case inflow generates vehicles into several routes - - * Made new highway example with on and off ramps - - * Add angle for on and off ramps - - * Modify network parameters - - * Fix docstring - - * Fix docstring - - * Fix pep8 - - * Fix pep8 - - * Fix bug of vehicles colliding - - * test highway ramps - - * Fix vehicles collision - - * Add ramps angle in additional params - - * updated python version - - * updated rllib pkl data to match new python - - * added channel to conda - - * added different channels - -commit fd0ad46533e7d8a80603bc32633cf8db9849ba50 -Author: Ashkan Y -Date: Sat Jul 27 18:26:43 2019 -0700 - - Add "avg_delay_specified_vehicles" to rewards.py (#658) - - * Added function "avg_delay_specified_vehicles" to rewards - - * Fixed flake8 issues - - * Fixed numpy docstyle issues - -commit b991e83933f98ff4c341f470a64fc825dd048684 -Author: Nathan Lichtlé -Date: Sat Jul 27 18:26:00 2019 -0700 - - Inflows (more features + new tuto) (#666) - - * Default num_vehicles to 0 when adding vehicle type - - * add color_vehicles param if we don't want auto vehicle coloration - - * Add color_vehicles param in docstring - - * More params and docstring for InFlows - - * Consider new inflow params period and number when adding them in sumo - - * Complete wrt changes and add examples to inflows tutorial - - * Add images for new inflow tutorial - - * Fix allowed value for 'begin' param - - * Add precisions for kwargs - - * Fix docstyle - - * Make attribute SimParams.color_vehicles back-compatible for tests - - * Fix test_environments that expects one vehicle of each type to be added by default - - * Fix bug in case inflow generates vehicles into several routes - - * mild fixes - -commit a26cc6dd8ea6c33f4e9555537ddbd8a9ac3459df -Author: Eugene Vinitsky -Date: Sat Jul 27 18:25:07 2019 -0700 - - Update bottleneck docstrings, add missing brew warning to install ins… (#660) - - * Update bottleneck docstrings, add missing brew warning to install instructions - - * pep8 - -commit a855138261a2cc5d16573d4e25a409fd8b5cd2a1 -Author: Ashkan Y -Date: Sat Jul 27 18:23:29 2019 -0700 - - Document all attributes in classes (#661) - - * add doc in merge - - * Added attribute documentation for loop_accel.py - - * Added attribute documenation for green_wave_env.py - - * added attributes for kernel/simulation/aimsun.py - - * added attributes to LaneChangeAccelPOEnv in lane_changing.py - - * added attributes to kernel.scenario.aimsun - - * Add missing attributes for base env. - - * Add missing attribute documentation to base env. - - * Add missing attribute documentation to pyglet renderer. - - * Fix pip8. - - * removed private attributes from the docstring - - * changed to 'of str' - - * Added attributes for bottleneck env - - * pep8 - - * Apply suggestions from code review - -commit 47f04157923be2aaf95a1246a8a92a73e15506ef -Merge: 800cbba5 504b85c3 -Author: Aboudy Kreidieh -Date: Wed Jul 24 12:39:44 2019 -0700 - - Merge pull request #655 from flow-project/renderer-tests - - Renderer tests - -commit 504b85c3a01c8c05d661c3d751a30adff4dffa8e -Author: Fangyu Wu -Date: Tue Jul 23 16:48:36 2019 -0700 - - Improve documentation of pyglet renderer class and remove commented code. - -commit d82dba33b819e4cfda4623d33b933f9506a177c2 -Author: Fangyu Wu -Date: Tue Jul 23 16:21:34 2019 -0700 - - Update tests/fast_tests/test_pyglet_renderer.py - - Co-Authored-By: Aboudy Kreidieh - -commit 0f2eda7febe4195afa0e487e2fe85c77f064c4a7 -Author: Fangyu Wu -Date: Tue Jul 23 16:20:37 2019 -0700 - - Update flow/renderer/pyglet_renderer.py - - Co-Authored-By: Aboudy Kreidieh - -commit 78617d00c9bced9ee39049e5088f06341bd961f3 -Author: Fangyu Wu -Date: Tue Jul 23 16:19:12 2019 -0700 - - Update flow/renderer/pyglet_renderer.py - - Co-Authored-By: Aboudy Kreidieh - -commit 800cbba54cf207ec0a66c8390fba51f391ea8f3f -Merge: f7c9797c a9c102d9 -Author: Aboudy Kreidieh -Date: Tue Jul 23 11:28:20 2019 -0700 - - Merge pull request #578 from flow-project/remove_internal_links - - Remove no_internal_links - -commit a9c102d926fcef8b1d4d21284f3d5cb44ccad44a -Author: AboudyKreidieh -Date: Tue Jul 23 10:52:26 2019 -0700 - - bug fix - -commit b9d7395f82bc7110ad72c4ce032f371684cdbf01 -Merge: 06bd502a f7c9797c -Author: AboudyKreidieh -Date: Tue Jul 23 10:51:14 2019 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow into remove_internal_links - -commit 3b36cc175d36b74b5a1543b9fd79c34ab4300e3c -Author: Ashkan Y -Date: Sun Jul 21 21:26:25 2019 -0700 - - Revert the changes. Going to add this as a new PR - -commit e45940e3b3c5e1be59fe41cef2afe70b1cc3f85d -Author: Ashkan Y -Date: Sun Jul 21 21:22:53 2019 -0700 - - Added function avg_delay_specified_vehicles - -commit 06bd502adb43873710785f83d50af5f751d0f060 -Author: AboudyKreidieh -Date: Sat Jul 20 23:51:55 2019 -0700 - - removed magic numbers - -commit f7c9797c93d7442a9c18ccd3e53dd5e315d78452 -Merge: 1f68535e 46232210 -Author: Nathan Lichtlé -Date: Sat Jul 20 23:39:15 2019 -0700 - - Merge pull request #620 from flow-project/aimsun-load - - Aimsun load template - -commit 1f68535ebfe7eee8297a3a89bb0b845c847f3882 (tag: v0.4.0) -Merge: 8672844f e815320e -Author: Nathan Lichtlé -Date: Fri Jul 19 16:48:58 2019 -0700 - - Merge pull request #647 from flow-project/fix-grid-scenario - - Quick fix grid scenario - -commit 8672844f92e345f486ca62b0e6ae79453da7d7d6 -Merge: dc91f904 3038e452 -Author: Nathan Lichtlé -Date: Fri Jul 19 16:48:27 2019 -0700 - - Merge pull request #649 from flow-project/improve-tutorials - - add common error fix to tutorials README - -commit 54cda81ea265d3df10fae588140c36edbb6aecae -Author: Fangyu Wu -Date: Fri Jul 19 01:04:45 2019 -0700 - - Update travis for full tests. - -commit 803dcfdf93678c98c4c72b13cc74003a796f6cd0 -Author: Fangyu Wu -Date: Fri Jul 19 00:51:24 2019 -0700 - - Remove xvfb-run. - -commit 5b8b0db2a55a38ee2b019a2d7a7e33a1cf0e7003 -Merge: c29965a0 78123942 -Author: Fangyu Wu -Date: Fri Jul 19 00:50:33 2019 -0700 - - Merge branch 'renderer-tests' of https://github.com/flow-project/flow into renderer-tests - -commit c29965a0e775ea200000ca62f4f3ce6fb3a27a2a -Author: Fangyu Wu -Date: Fri Jul 19 00:49:14 2019 -0700 - - Test xenial xvfb service. - -commit 78123942bf3c65d425739a827db6d9523e6a1155 -Author: Fangyu Wu -Date: Thu Jul 18 23:53:08 2019 -0700 - - Engage ablation debugging [8]. - -commit 7c8e0ef0d972a2d8f907fadfe367d9ccab804738 -Author: Fangyu Wu -Date: Thu Jul 18 23:42:02 2019 -0700 - - Engage ablation debugging [7]. - -commit c392ea17f7e606f79aed3da993c8ab282d94bf2b -Author: Fangyu Wu -Date: Thu Jul 18 23:29:33 2019 -0700 - - Engage ablation debugging [6]. - -commit ad9bae0103ae834cf3e8547fc89d1dad3515b224 -Author: Fangyu Wu -Date: Thu Jul 18 23:12:14 2019 -0700 - - Engage ablation debugging [5]. - -commit 0a89b7cfd553d4d5ebbfdb5e92ee1aaf3a9f7b16 -Author: Fangyu Wu -Date: Thu Jul 18 23:01:01 2019 -0700 - - Engage ablation debugging [4]. - -commit f2f4348b054de95b47f1edf27ca2d9c1b479f5a0 -Author: Fangyu Wu -Date: Thu Jul 18 22:47:12 2019 -0700 - - Engage ablation debugging [3]. - -commit 34863526eb8a3f1e60dc6b2610083099e96c17db -Author: Fangyu Wu -Date: Thu Jul 18 22:29:59 2019 -0700 - - Engage ablation debugging [2]. - -commit 6e9f98dab1d038e84d1682062a590313f26d7d34 -Author: Fangyu Wu -Date: Thu Jul 18 22:20:03 2019 -0700 - - Engage ablation debugging [1]. - -commit 904fa4f27a8d94d346ca82b88a62c402c09654ec -Author: Fangyu Wu -Date: Thu Jul 18 21:58:31 2019 -0700 - - Enable only fast tests. - -commit 9bd7299f13af9d95a0f6c595b83020b5c6bda129 -Author: Fangyu Wu -Date: Thu Jul 18 21:08:43 2019 -0700 - - Recover original travis yml. - -commit a02610fbc26fe062eb3080a3174b229f3ac3fe04 -Author: Fangyu Wu -Date: Thu Jul 18 20:57:41 2019 -0700 - - Add more abalation task. - -commit 700766a95a04360426a92dd8282bb9805aece7a2 -Author: Fangyu Wu -Date: Thu Jul 18 20:48:32 2019 -0700 - - Temporarily disable other tests for debugging. - -commit 86de646075dbc42d7d02e75ba9990082f7213f67 -Author: Fangyu Wu -Date: Thu Jul 18 19:50:09 2019 -0700 - - Attempt again to fix GL dependency. - -commit dfef1005e5a4d1062535c3eca5e0d2e99400e088 -Author: Fangyu Wu -Date: Thu Jul 18 19:24:20 2019 -0700 - - Add glut as travis a dependency. - -commit 7391809d41c114758081e868c6594b079b88e312 -Author: Fangyu Wu -Date: Thu Jul 18 18:53:18 2019 -0700 - - Fix dependency on GL. - -commit e5373a83b1cc31e700bf2464501c388c5a70905e -Author: Fangyu Wu -Date: Thu Jul 18 18:13:18 2019 -0700 - - Fix unit test path. - -commit 97b6a6505e3c16ff540b1dee01c0c925a20473fc -Author: Fangyu Wu -Date: Thu Jul 18 17:32:06 2019 -0700 - - Fix coding style. - -commit 4fe6aa69fa245ad7a55dbb04e6a7deeb01113e2c -Author: Fangyu Wu -Date: Thu Jul 18 17:13:26 2019 -0700 - - Increase test coverage for renderer to 96%. - -commit dc91f904343bb622aecebb8e6bd3801dd49a1663 -Merge: 3beeeb24 86260ade -Author: Nathan Lichtlé -Date: Thu Jul 18 15:57:18 2019 -0700 - - Merge pull request #648 from flow-project/k_closest_to_intersection - - Add padding and docstring to `green_wave_env.k_closest_to_intersection` - -commit 86260ade1a10b2243b5a3120ba1b87d60bf26f83 -Author: nathanlct -Date: Thu Jul 18 15:00:07 2019 -0700 - - add return type - -commit 182ddf7cb49561490ca16d1766165f7318679e36 -Author: nathanlct -Date: Thu Jul 18 14:56:18 2019 -0700 - - fix pep8 - -commit 81702837c003c7cc76fa43e7097801ba7eef3631 -Author: nathanlct -Date: Thu Jul 18 14:52:00 2019 -0700 - - remove unnecessary max - -commit 1c629ebd6cdde4bde4f3edd287b0b8d24e37f0f6 -Author: nathanlct -Date: Thu Jul 18 14:51:30 2019 -0700 - - rename k into num_closest - -commit 0a209b91339be49a61ade629d77c7515394b972a -Author: nathanlct -Date: Thu Jul 18 14:51:11 2019 -0700 - - rename k_closest into get_closest - -commit 3beeeb24cb2beecf74f20f298df8d0a4d1c00d67 -Author: buechelmartin <51824326+buechelmartin@users.noreply.github.com> -Date: Thu Jul 18 18:34:39 2019 +0200 - - Calculation of standard deviation of mean velocity (#643) - - I guess this should be the standard deviation of the average velocities of each run? - In the visualizer_rrlib_py, the same calculation is done as: - - print('Average, std speed: {}, {}'.format( - np.mean(mean_speed), np.std(mean_speed))) - - - Maybe, on top of this, they could all share the same result evaluation methods. - -commit 3038e4524a04c1ff52928d933ffe8a4114bfdb71 -Merge: 7926787c 919a16c4 -Author: nathanlct -Date: Wed Jul 17 15:21:42 2019 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow into improve-tutorials - -commit 09e9e89f37b9905f1461e2bb9ddb47fba66aa9a0 -Author: nathanlct -Date: Wed Jul 17 15:10:50 2019 -0700 - - fix docstring - -commit ad83f2056755baf0247a06614f25053fd8154489 -Author: nathanlct -Date: Wed Jul 17 15:03:23 2019 -0700 - - fix docstring - -commit a818ed9926f78dc6e9b1e05b50690a4490ca53da -Author: nathanlct -Date: Wed Jul 17 14:59:17 2019 -0700 - - make padding optional - -commit c3f94ff0d4b4f60241f1a3e927a11ef88b7d8e42 -Author: nathanlct -Date: Wed Jul 17 14:49:35 2019 -0700 - - remove #FIXME - -commit 27dc862b0af1ef3e45a78e4bab41bbf8dce5a7c0 -Author: nathanlct -Date: Wed Jul 17 14:49:18 2019 -0700 - - complete docstring with example - -commit 08daa8876d2dfc9226d8a527880a57670675c842 -Author: nathanlct -Date: Wed Jul 17 14:49:03 2019 -0700 - - add padding to returned list - -commit e815320ef62264725c84e835bb1c395db2841644 -Author: nathanlct -Date: Wed Jul 17 14:20:21 2019 -0700 - - fix grid scenario - -commit 919a16c4c00fcad7440f4f7ed8b13b44e5e1e19f -Merge: 84da0db1 436aaac4 -Author: Aboudy Kreidieh -Date: Wed Jul 17 13:47:39 2019 -0700 - - Merge pull request #584 from flow-project/ACC_controller - - added Linear Adaptive Controller - -commit 436aaac406f0a2a460714ac99fea1babf10bf588 -Author: AboudyKreidieh -Date: Wed Jul 17 13:05:06 2019 -0700 - - bug fix - -commit 8af5b80064db361ca661a36f3f1680ee32595669 -Author: yhb08 -Date: Wed Jul 17 21:52:27 2019 +0300 - - fixed the previous file - -commit 1660ef9dae35b3bd830b593dcedb10600c24a267 -Author: yhb08 <46504488+yhb08@users.noreply.github.com> -Date: Wed Jul 17 07:23:53 2019 +0300 - - Delete test_controllers.py - -commit 0b454877a78084f2f0acc2add5294166bbdc3385 -Merge: 26579aac 771c2eb1 -Author: yhb08 -Date: Wed Jul 17 07:20:57 2019 +0300 - - Merge branch 'ACC_controller' of https://github.com/flow-project/flow into ACC_controller - -commit 26579aac1ad8a6d75d83f233bef8ae3407a28dbd -Author: yhb08 -Date: Wed Jul 17 07:20:26 2019 +0300 - - Modified the test controllers folder to include the LAC controller - -commit 4a72e81a6cca5d80ba41520f65447dbb92deca8b -Author: Ashkan Y -Date: Tue Jul 16 17:27:12 2019 -0700 - - Added reward and Apply RL actions - -commit 84da0db1d3ac20f9f0e1f88b55d1f5fae7ea7526 -Author: Cathy Wu -Date: Tue Jul 16 16:35:30 2019 -0700 - - Compute and display inflows and throughput efficiency (#632) - - Introduces an efficiency metric (between 0 and 1) which can be used to assess the optimality of our experiments. Efficiency of 1 means that the outflow (throughput) is as high as the inflow. We can't do much better than that. This is displayed when with the rllib visualizer. - - * compute and display inflows and throughput efficiency - - * fix: div/0 error - - * efficiency computation bug - -commit a5072ebc49b97cfa65b40ce9547e5302f5f9e253 -Author: Cathy Wu -Date: Tue Jul 16 15:59:34 2019 -0700 - - Multi-agent traffic light grid (#623) - - New multi-agent environment. - - ## Description - - - Introduces multi-agent version of `PO_TrafficLightsGridEnv`. - - Includes some updated, revised, and cleaned up documentation relating to multi-agent Flow. - - Includes parameterized run script, which supports different grid sizes, local vs cluster runs, different vehicle inflow rates. - - * revised multiagent documentation - - * PEP8 and documentation for PO_TrafficLightGridEnv - - * Add multiagent version of PO_TrafficLightGridEnv, including helper function for retreiving relative nodes - - * fix: observations should include num_observed vehicles from each incoming lane - - * fix conversion to edge numbers - - * prepare run script - - * cleaning - - * cleaning - - * documentation - - * PEP8 - - * add ES to multi-agent run script - - * missed some multi-agent params - - * probably can't use PPO policy graph for ES - - * ES --> PPO (multi-agent not supported, it seems) - - * bigger experiment, documentation - - * clean up docs - - * PEP8 - - * pydocstyle errors - - * Update multiagent_traffic_light_grid.py - - PEP8 - - * keep track of observed vehicles - - * add unit tests for get_relative_node - - * generalize multiagent grid run script - - * flake8 - - * fix unit tests for grid - - * flake8 - - * add inflow rate to arguments for multiagent grid script; expand parameter tuning grid search; minor tweaks - - * flake8 - - * add local vs cluster run mode - - * normalize per agent rewards - - * num edges fix - - * run script tweaks - - * multiagent grid test - - * disable autoscaling - - * refactor multi-agent grid run script - - * small fixes and tweaks - - * flake8 - - * flake8 - - * fix unit test for multiagent traffic light grid - - * docs - - * docs - - * remove ES - - * flake8 - - * exception handling - - * partial addressing of Eugene's comments - - * addressing remainder of Eugene's comments - -commit 771c2eb14c4c8aef2a866d3c561431e1ac3d354a -Author: AboudyKreidieh -Date: Tue Jul 16 14:54:16 2019 -0700 - - bug fix - -commit e3a3e168763f22f01991f311f7be5d83be405e8b -Merge: 0cee1b9c e1a435b2 -Author: Nathan Lichtlé -Date: Mon Jul 15 12:33:23 2019 -0700 - - Merge pull request #634 from flow-project/travis - - Make travis test for pep8 and docstyle first - -commit e1a435b2b494147a9f4e3586c748f0ac3699a66e -Author: nathanlct -Date: Mon Jul 15 10:44:28 2019 -0700 - - remove error - -commit 5fa4efc24bc87a886258a3d27aa17bc44fc56532 -Author: nathanlct -Date: Mon Jul 15 10:41:51 2019 -0700 - - test pep8 error - -commit bb41c2af8e669f92671d15b4a1adb956b2d8875a -Author: nathanlct -Date: Mon Jul 15 10:36:50 2019 -0700 - - test pydocstyle error - -commit bd47f68a2536b553964361de1b4d70a6276bbd2c -Author: nathanlct -Date: Mon Jul 15 10:36:17 2019 -0700 - - optimize order - -commit b056a0968c67537f5076716c26b19095a0cb12eb -Author: nathanlct -Date: Mon Jul 15 10:33:09 2019 -0700 - - install dependencies first - -commit e303c9a40c9a6da88fe553994a896a7fad7600e7 -Author: nathanlct -Date: Mon Jul 15 10:28:50 2019 -0700 - - test error - -commit 4623221047fb8e59089aa7e233a9ed57b08d65de -Merge: cf40fc74 0cee1b9c -Author: nathanlct -Date: Mon Jul 15 09:54:19 2019 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow into aimsun-load - -commit 0cee1b9cf427a409ec2fc5287626c6e28982d46d -Merge: 5c5a1240 d7849962 -Author: Aboudy Kreidieh -Date: Sat Jul 13 19:23:11 2019 -0700 - - Merge pull request #607 from flow-project/v0.4.0 - - final 0.4.0 commit - -commit 5c5a1240b3f1eb224834a256052f325a345e77ab -Merge: 4f4bd42a 1a83e377 -Author: Aboudy Kreidieh -Date: Sat Jul 13 13:38:14 2019 -0700 - - Merge pull request #630 from cathywu/visualizer - - Minor changes to RLlib visualizer - -commit 02e21fd5bde2d8dbc74c642a54917f76fffcd660 -Merge: d2e65860 4f4bd42a -Author: AboudyKreidieh -Date: Sat Jul 13 13:34:57 2019 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow into ACC_controller - -commit d2e658600e5c6d2dd0e75a39a9ce472a4927e6f5 -Author: AboudyKreidieh -Date: Sat Jul 13 13:34:53 2019 -0700 - - pep8 - -commit 4f4bd42af6419d39bf9e0b9f442105e454686455 -Merge: 3658f404 4d4e5d3b -Author: Aboudy Kreidieh -Date: Sat Jul 13 13:24:35 2019 -0700 - - Merge pull request #577 from flow-project/binder_logo - - Add experimental binder build - -commit 3658f404202dd2d7fed0d7f6c425ca4e4f1257b2 -Merge: c25a88bb 13e8a3d0 -Author: Aboudy Kreidieh -Date: Sat Jul 13 12:42:15 2019 -0700 - - Merge pull request #627 from cathywu/setup - - Installation refinement (SUMO setup) - -commit c25a88bb2bf466e5482aa21fad71ea1495f5e44c -Merge: d0e378b4 97c7ff95 -Author: Aboudy Kreidieh -Date: Sat Jul 13 12:41:16 2019 -0700 - - Merge pull request #631 from flow-project/nathanlct-patch-1 - - Remove obsolete link in benchmarks - -commit 97c7ff953ecd8323f70bc667e5837de2d826cea6 -Author: Nathan Lichtlé -Date: Fri Jul 12 17:31:30 2019 -0700 - - remove obsolete link - -commit 1a83e377820bd63f2e0641f63b46db7e060cefc9 -Author: Cathy Wu -Date: Fri Jul 12 16:54:38 2019 -0700 - - RLlib visualizer: updated documentation, prettyfied output metrics and added some more - -commit d0e378b4493da2a13489b322830148465767ff0b -Author: Cathy Wu -Date: Fri Jul 12 16:21:58 2019 -0700 - - RLlib visualizer tweaks (#587) - - Improve usage resilience of RLlib visualizer script. - - - Ignore hidden files when generate videos from image frames. Before, if hidden files were present, the visualizer script would crash. - - Improved consistency of command line arguments (use underscores, not dashes, with multi-word arguments). Also makes this consistent with usage in https://github.com/flow-project/flow/blob/master/flow/benchmarks/create_movies.sh. - - - * Ignore hidden files when generate videos from image frames; have consistent command line arguments - - * adjust the unit tests - -commit cf40fc74fd26aea6b666000ca2f5fd7eec9b2dee -Author: nathanlct -Date: Fri Jul 12 16:19:11 2019 -0700 - - add flow.ang to .gitignore - -commit 13e8a3d06e90d316b6041c0dc582d922946a50a7 -Author: Cathy Wu -Date: Fri Jul 12 13:03:48 2019 -0700 - - prioritizes this version of SUMO in PATH for users who already have a different instance of SUMO installed - -commit d5864206a222d249cbea563085de537a87123998 -Merge: e9d970f5 a715b485 -Author: Aboudy Kreidieh -Date: Fri Jul 12 09:57:52 2019 -0700 - - Merge pull request #626 from flow-project/fix-docstring - - Fix docstring (quick merge) - -commit 7926787ca24b457900c44cb855fa891542251214 -Author: nathanlct -Date: Fri Jul 12 01:06:55 2019 -0700 - - add common error fix to README - -commit a715b4852a8a46bae99d89299dce1a1ec2e8b667 -Author: nathanlct -Date: Fri Jul 12 00:55:36 2019 -0700 - - add docstring for get_initial_speed - -commit c079f4816818810f10c01bdb566815d90b83011a -Author: nathanlct -Date: Fri Jul 12 00:54:14 2019 -0700 - - fix docstring - -commit 929ec8f4ced626fa3dd236be582354792138e8f8 -Author: nathanlct -Date: Thu Jul 11 15:44:04 2019 -0700 - - remove unused import - -commit d91a5cf8f984bb86424a8a4ab0ad63d35788116f -Author: nathanlct -Date: Thu Jul 11 15:32:04 2019 -0700 - - fix for loading templates - -commit e179847627a18dbce5fbb27b99842a8673371e38 -Author: nathanlct -Date: Thu Jul 11 15:31:39 2019 -0700 - - add import os - -commit 211b8d37ff46edb692b36a13a82a1bcbbe77c0f6 -Author: nathanlct -Date: Thu Jul 11 15:30:59 2019 -0700 - - add small template loading example - -commit ce99f75bdfe9310621c8afe416e8a6bd905a197f -Author: nathanlct -Date: Thu Jul 11 15:28:44 2019 -0700 - - add all .sqlite files to .gitignore - -commit e9d970f5e717e8ecc23326c53a4d1cb986d81095 -Merge: d018ace3 9149d1f3 -Author: Aboudy Kreidieh -Date: Wed Jul 10 22:49:16 2019 -0700 - - Merge pull request #565 from flow-project/aimsun_bugs - - Fixed Aimsun bugs - -commit d018ace3c5e8dc103602b3d8da76d890904f7f68 -Merge: 39386ce4 3ba89ec9 -Author: Aboudy Kreidieh -Date: Wed Jul 10 16:20:53 2019 -0700 - - Merge pull request #580 from flow-project/travis-gui - - Enable GUI-based unit tests in travis - -commit 39386ce487f5286134913d16ea3b997341c66a59 -Merge: a4c710c0 3f379020 -Author: Aboudy Kreidieh -Date: Wed Jul 10 16:19:59 2019 -0700 - - Merge pull request #595 from kjang96/aimsun_docs - - Updated Aimsun docs - -commit a4c710c09c513dd2ac015e5f2ca7dd06b729a9a7 -Merge: 9df4fa5b 6b64dffe -Author: Aboudy Kreidieh -Date: Wed Jul 10 09:19:29 2019 -0700 - - Merge pull request #594 from flow-project/issue_42 - - issue 42 - -commit d7849962b5fae95c9aefeca48f982c8052e2511c -Author: AboudyKreidieh -Date: Wed Jul 10 06:23:14 2019 -0700 - - reduced min_gap of tests, since they check for large bunching values - -commit 6b64dffe4a81ec39dede2146f090be91cdedd7a8 -Author: Yasharzf -Date: Tue Jul 9 22:12:39 2019 -0700 - - minor - fixed style errors - -commit 9c9be36ff6c4f0f9039e8af084acbc0b3fcb5fb0 -Author: Yasharzf -Date: Tue Jul 9 21:31:55 2019 -0700 - - added docstrings in aimsun generator - -commit b4ad99627829b7804e3faed4680ea33afd5125dc -Author: AboudyKreidieh -Date: Tue Jul 9 20:51:31 2019 -0700 - - removed outdated test - -commit c69829b4a056548e88db9528fd4ee39110ed9719 -Author: AboudyKreidieh -Date: Tue Jul 9 20:26:44 2019 -0700 - - final 0.4.0 commit - - - renamed the versions in the setup scripts 0.3.1 -> 0.4.0 - - updated version 0.4.0.dev -> 0.4.0 - - removed minGap bug that was causing collisions in the figure eight and merge - - updated the minGap value for the ring, since it still needs a minGap of 0 - -commit d9fc0187a149dd5ab2ef864af4d0987d6e09cfc6 -Author: Ashkan Y -Date: Tue Jul 9 16:20:53 2019 -0700 - - Revised the wording of observation and action space - -commit 70a78d98c82795cb0b6219a487be41336cde3067 -Author: Ashkan Y -Date: Tue Jul 9 15:39:41 2019 -0700 - - Revised "Controlling Your Traffic Lights via RL" - -commit 9df4fa5b69bac5a039e69697c76d782da94e6398 -Merge: 15f24ff5 8e448cfa -Author: Aboudy Kreidieh -Date: Tue Jul 9 13:42:51 2019 +0300 - - Merge pull request #604 from flow-project/aimsun - - Delete temporary files after loading an Aimsun template - -commit 15f24ff59977ac270d54a4b8e82c3960566eb4be -Merge: 781d6fd2 192ccfdd -Author: Aboudy Kreidieh -Date: Tue Jul 9 13:41:54 2019 +0300 - - Merge pull request #602 from flow-project/fix-tutorial - - Code typo in tutorial (quick fix) - -commit 192ccfdd627ccb3709d263b83a5327c28099b766 -Author: Nathan Lichtlé -Date: Tue Jul 9 01:06:23 2019 -0700 - - fix code typo - -commit c8970951fed8ca6063a0da753587848598c1fe22 -Author: Ashkan Y -Date: Mon Jul 8 16:24:35 2019 -0700 - - Revised Section 5 (actuated baseline) - -commit 30d2456bb283d142538242b83760c3f81a79ad3e -Author: Ashkan Y -Date: Mon Jul 8 14:19:52 2019 -0700 - - Revised section 3 (static tl) and section 4 (actualted tl) - -commit b6842d913769ff515d8fcec95dace1ab6f128683 -Author: yhb08 -Date: Tue Jul 9 00:10:44 2019 +0300 - - fixed pep8 - -commit fab43d2aec58908d7c884447920b33a6f0ffe8ef -Author: Ashkan Y -Date: Mon Jul 8 13:57:59 2019 -0700 - - Reorder the ordering of the sections - -commit 9e90506a5a252b1788c8ea46e576abb50fd86367 -Author: Ashkan Y -Date: Mon Jul 8 13:18:57 2019 -0700 - - Fixed minor typo in readme - -commit dd64a1c0592961cabc1f79e5f9e3f4fe0645b073 -Merge: 9921ac10 781d6fd2 -Author: Ashkan Y -Date: Mon Jul 8 13:14:18 2019 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow - -commit 781d6fd239fb940a9d1e8c88d41aea49c42625a8 -Merge: 172dd0b9 9bc69221 -Author: Aboudy Kreidieh -Date: Mon Jul 8 16:29:44 2019 +0300 - - Merge pull request #586 from flow-project/issue_queston_template - - Added template for Issues (Bug, Feature, Question) - -commit 9bc69221595589120c1ff4f150371cfe3d4a0104 -Author: Ashkan Y -Date: Sun Jul 7 14:37:29 2019 -0700 - - Fixed minor typos - -commit 9921ac109908000e7dae81aa00bbdab62db8277c -Merge: 4aa39548 172dd0b9 -Author: Ashkan Y -Date: Sun Jul 7 14:21:58 2019 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow - -commit 172dd0b9213cea4d023da4cc8d1ca760a1b64f8f -Merge: 3e8897f9 78150a3e -Author: Aboudy Kreidieh -Date: Sun Jul 7 22:34:40 2019 +0300 - - Merge pull request #576 from flow-project/tutorial1_emission - - updates to tutorial - -commit 78150a3e70445e6d983b7a16eecd439f267989ba -Author: Nathan Lichtlé -Date: Sat Jul 6 14:26:19 2019 -0700 - - minor fixes - -commit 3e8897f94859f5bbc2b7053e66c9ec1565a50c1e -Merge: 08ce9a86 20131bb4 -Author: Nathan Lichtlé -Date: Sat Jul 6 14:01:12 2019 -0700 - - Merge pull request #575 from flow-project/simplify-grid-scenario - - Simplify grid scenario - -commit 20131bb4c8652c24d843ef532c094ce9abf09ec2 -Author: AboudyKreidieh -Date: Sat Jul 6 17:59:25 2019 +0300 - - minor documentation fixes - -commit 04ae2e134d559136897b2faf49a242a9418e32b0 -Author: AboudyKreidieh -Date: Sat Jul 6 17:50:07 2019 +0300 - - added more documentation and pydocstyle travis test - -commit 3f379020130470adc20b2d57b347b23a320cf44f -Author: Kathy Jang -Date: Fri Jul 5 14:38:54 2019 -0700 - - Updated Aimsun docs - -commit 777e9274df707d8faf44c3e871a22cf59278c8a8 -Author: AboudyKreidieh -Date: Sat Jul 6 00:02:43 2019 +0300 - - started getting rid of most remaining pydocstyle isssues - -commit 08ce9a861f46aa39f106c4af3ab6de54633990e3 -Merge: 9ae41bbe 46174ced -Author: Aboudy Kreidieh -Date: Fri Jul 5 13:51:14 2019 +0300 - - Merge pull request #589 from kjang96/update_sumo_install - - Updated SUMO installation on docs - -commit 46174ced221d3ae2085d196f65a8c3b4b6e24410 -Author: Kathy Jang -Date: Wed Jul 3 12:04:08 2019 -0700 - - Added additional instructions for building SUMO for source on OSX. cmake, which I added to this commit, works for me, while the instructions as they are do not - -commit 3009f3ac911008eb33a5d9ae850ce2282927422c -Author: nathanlct -Date: Tue Jul 2 21:55:30 2019 -0700 - - some changes to issue/PR templates - -commit 9ae41bbe8b83dd094c69f1ea8ebb0836eeca73b1 -Author: Cathy Wu -Date: Tue Jul 2 19:53:38 2019 -0700 - - minor OSX installation updates; apply environment variable changes immediately, for ease of testing SUMO installation (#585) - - - During installation of SUMO from OSX, applies environment variable changes immediately, so that of testing SUMO installation can happen without starting a few terminal window. - - Re-use environment variables. - - To support folks who use different shells (bash, zsh), print the commands to manually add to their preferred shell start scripts. - -commit 6b615c17859bc261b2557a1ad53a43df6f8d1379 -Author: Ashkan Y -Date: Tue Jul 2 16:18:32 2019 -0700 - - Made the Pull Request template simpler - -commit 4600a3e0066d2ea352d33ba80fd1f9a4311bac71 -Author: Ashkan Y -Date: Tue Jul 2 16:09:36 2019 -0700 - - Uncommenting the instructions - -commit 4385b8be85a8bc0bba0f5ba5062aa9f4d9baf690 -Author: Ashkan Y -Date: Tue Jul 2 16:09:07 2019 -0700 - - Uncommenting the instructions - -commit d3aae64781455d8909081fe6e604be1c7815f8d7 -Author: Ashkan Y -Date: Tue Jul 2 16:05:46 2019 -0700 - - Update bug.md - -commit 4fb06e9ef21e629c9fcffad766ed389f227c3883 -Author: Ashkan Y -Date: Tue Jul 2 16:05:13 2019 -0700 - - Added thank you note to the feature template - -commit 21a09e0458e3fab594f02be54b718da0c5f2484b -Author: Ashkan Y -Date: Tue Jul 2 16:03:22 2019 -0700 - - Adding thank you note on top of bug - -commit 12dc6d55ad501ac5e35705a44fb386a435437b99 -Author: Ashkan Y -Date: Tue Jul 2 16:00:55 2019 -0700 - - Change "problem" to "bug" - -commit 536e29e4d1ea06fb623886388e9bdaa3a99aa739 -Author: Ashkan Y -Date: Tue Jul 2 15:59:12 2019 -0700 - - Update bug.md - -commit fae9f577e7beb8db280a845069bdff9523994260 -Author: Ashkan Y -Date: Tue Jul 2 15:42:24 2019 -0700 - - Create `question' issue which points to Stack Overflow - -commit c1c545039ea9e3fd0fb9160689a1c0adfac463df -Author: yhb08 -Date: Wed Jul 3 01:32:57 2019 +0300 - - added Linear Adaptive Controller - -commit 0868f33718edc99cfc5c54c2fb7a4d57d5a7fa50 -Author: Ashkan Y -Date: Tue Jul 2 13:51:52 2019 -0700 - - renamed, and also added default label - -commit 17ef230320285d125c902d7bf55c2731203bfe55 -Author: Ashkan Y -Date: Tue Jul 2 13:30:22 2019 -0700 - - Update and rename issues.md to bug.md - -commit 48d8baa1b1dc250f6765eb4f388e418a9d4cd5af -Author: Ashkan Y -Date: Tue Jul 2 13:22:30 2019 -0700 - - Added template for features - -commit f6b5d20bf588851cd4ee5a803ca48919a5fe1ffe -Author: Nathan Lichtlé -Date: Tue Jul 2 12:52:09 2019 -0700 - - fix pr bug - -commit f9fc29f498134d7c10261d0f9adc8cf23689bb0e -Author: nathanlct -Date: Mon Jul 1 22:00:46 2019 -0700 - - add coverage - -commit 25211ba65e801a4cd82fb3737eb21337e16063aa -Merge: b88b1986 adae2396 -Author: Kathy Jang -Date: Mon Jul 1 20:49:05 2019 -0700 - - Merge pull request #561 from kjang96/issue_436 - - Documentation for bottleneck - -commit adae2396fc80bd52ce9370c60142ef4ece2986ca -Author: Kathy Jang -Date: Mon Jul 1 20:15:18 2019 -0700 - - minor - -commit 04b8b5c84d6cd816a370d4f06b91e3501d0c5fac -Author: Ashkan Y -Date: Mon Jul 1 16:59:44 2019 -0700 - - Update Section 3 of the tutorial - -commit cf244838b1cb1316a446292d044be5c301b720e0 -Author: nathanlct -Date: Mon Jul 1 16:32:12 2019 -0700 - - add fixme in k_closest_to_intersection - -commit 41ab4e641386a7892f5269ae36a44dbe91b4da91 -Merge: 4b28aaea 32b72d5f -Author: nathanlct -Date: Mon Jul 1 16:31:06 2019 -0700 - - Merge branch 'simplify-grid-scenario' of https://github.com/flow-project/flow into simplify-grid-scenario - -commit 4b28aaea9dcc239559df80a6f18f292bca4f5f6b -Author: nathanlct -Date: Mon Jul 1 16:30:54 2019 -0700 - - fix bug - -commit dbbf54971f2fdde82a476f5c270e452cc8025e7a -Author: Kathy Jang -Date: Mon Jul 1 15:48:30 2019 -0700 - - minor - -commit 32b72d5fdff90884ff2cc7e19fb5802ac85f0a33 -Merge: f7e42dd4 b88b1986 -Author: Nathan Lichtlé -Date: Mon Jul 1 14:31:55 2019 -0700 - - Merge branch 'master' into simplify-grid-scenario - -commit f7e42dd43849e06e110555a5095351ad3334155c -Author: nathanlct -Date: Mon Jul 1 14:27:40 2019 -0700 - - fix bugs - -commit 786960b3ac9c0b3e75a8319649d1987194844d46 -Author: nathanlct -Date: Mon Jul 1 14:15:41 2019 -0700 - - simplify k_closest_to_intersection function - -commit 4db119685bf29d442fabfe531d6942fb1e7ae297 -Author: Ashkan Y -Date: Mon Jul 1 13:46:46 2019 -0700 - - Revised the Section 2 - - Revised Section 2 of the tutorial, and removed the incorrect description of the traffic light phase - -commit cac2a868f0cfbb6f69fc148e5b094a2487363364 -Author: Kathy Jang -Date: Mon Jul 1 12:54:49 2019 -0700 - - Fixed all pep8 - -commit c79bbd106fb4e37ae69474a6c92894e1aa8f3816 -Merge: 8bce470d b88b1986 -Author: Kathy Jang -Date: Mon Jul 1 12:47:45 2019 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow into issue_436 - -commit b88b1986d60dece36d5540e1b7655e54aaf62c0f -Merge: 01cf30cb 4e12bacc -Author: Aboudy Kreidieh -Date: Mon Jul 1 21:44:23 2019 +0300 - - Merge pull request #555 from kjang96/issue_42 - - Issue 42 - -commit 4e12baccfca60d0d1f000f76f0861476d15b7f33 -Merge: 81d17159 254ded0a -Author: Kathy Jang -Date: Mon Jul 1 10:55:06 2019 -0700 - - Merge branch 'issue_42' of https://github.com/kjang96/flow-1 into issue_42 - -commit 81d1715931a7e7c40b92f58f835b2c7b501e995a -Author: Kathy Jang -Date: Mon Jul 1 10:54:10 2019 -0700 - - Fixed typo in docstring - -commit 3ba89ec9b896bd01029d46b9de45b815d1fbc2b8 -Author: Fangyu Wu -Date: Mon Jul 1 02:38:46 2019 -0700 - - Specify xvbf config. - -commit abb188ce8f3a95da443b1d981dd51a3b29a7a39d -Author: Fangyu Wu -Date: Mon Jul 1 01:20:54 2019 -0700 - - Add back xvbf-run with non-blocking plt.show(). - -commit c2f05bb9eaa6408daaff22834c6cfe4ad36ddefa -Author: Fangyu Wu -Date: Mon Jul 1 00:54:48 2019 -0700 - - Remove xvbf-run wrapper. - -commit de2cfd8ac5541ba29fce36fbea8224e8064f73c1 -Author: Fangyu Wu -Date: Mon Jul 1 00:27:54 2019 -0700 - - Add xvbf-run weapper. - -commit 4d4e5d3bbf6ca7545fc9fea06e3b3a64c002a699 -Author: Fangyu Wu -Date: Sun Jun 30 18:14:22 2019 -0700 - - Add experimental binder logo. - -commit ecd9a30263509d5165c36caf2b5f29f8a6e88247 -Author: AboudyKreidieh -Date: Sun Jun 30 20:01:14 2019 +0300 - - bug fixes - -commit 7f33f88e94164dd556c2daba979febf4e5c8da06 -Author: AboudyKreidieh -Date: Sun Jun 30 13:40:56 2019 +0300 - - bug fixes - - - added internal edge starts to loops - - modified broken tests - -commit 01cf30cb8b4a7e058ec8e3dae77abb2d816a582a -Merge: 5c0ec985 0a8276b8 -Author: Aboudy Kreidieh -Date: Sun Jun 30 10:43:13 2019 +0300 - - Merge pull request #560 from flow-project/docker-desktop - - Update docker installation instruction. - -commit 0a8276b890032d960003e875d0840797579b21b9 -Author: Ashkan Y -Date: Sat Jun 29 23:07:22 2019 -0700 - - Better title for docker installation - -commit d76b44cf1e28a597fe18f6ebacb1601e850f3b8d -Author: AboudyKreidieh -Date: Sat Jun 29 21:32:51 2019 +0300 - - removed methods of no_internal_links - -commit 9101c8ead486ecab9a9080388596d859d2d9921a -Author: nathanlct -Date: Sat Jun 29 09:59:40 2019 -0700 - - fix bug in node mapping - -commit 9149d1f3365ce8c02c2eb4afffe8f6cdce437d99 -Author: Yasharzf -Date: Sat Jun 29 09:56:38 2019 -0700 - - bug fix - changed SumoParams to AimsunParams - -commit 02d45bb17e4c9e4d68c94605a55c81585347c894 -Author: AboudyKreidieh -Date: Sat Jun 29 17:03:59 2019 +0300 - - updates to tutorial - - - added emission to tutotial 1 - - fixed a bug resulting in FileNotFound errors if the emission_path does not end with / - -commit fecd85ff91b02567ed4fd95489ec597d45e08331 -Author: Ashkan Y -Date: Fri Jun 28 23:18:37 2019 -0700 - - Change the intriduction paragraphs - -commit 873617e72a88ce2731b8a7c4f32074871d53d293 -Author: nathanlct -Date: Fri Jun 28 22:30:38 2019 -0700 - - fix test - -commit 87e622afb755ce02f6d1ea4c7ed72fdbdb7e89e3 -Author: nathanlct -Date: Fri Jun 28 22:05:10 2019 -0700 - - fix pep8 - -commit 72b9d29b284df6d624aeb617eb13827c4d16452f -Author: nathanlct -Date: Fri Jun 28 21:44:14 2019 -0700 - - fix bug - -commit 8b44993f0bbd2e7c525d0d65d47e038717aacf73 -Author: nathanlct -Date: Fri Jun 28 21:11:14 2019 -0700 - - fix some bugs - -commit 254ded0a82c60884ff896f78390ae22bd0761b2c -Merge: 9ea3194a 5c0ec985 -Author: Kathy Jang -Date: Fri Jun 28 15:44:30 2019 -0700 - - Merge branch 'master' into issue_42 - -commit 9ea3194a935b589fb6cead7b32bf640e09bf8b0b -Author: Kathy Jang -Date: Fri Jun 28 15:43:12 2019 -0700 - - Everything conforms to flake8 - -commit 8bce470db7c9aee7dd12a82b3915bb789bd58f4a -Author: Kathy Jang -Date: Fri Jun 28 15:28:04 2019 -0700 - - Removed incorrect docstring - -commit 29e3c0cb776f31c3fb5c3106726cbf961f07eeea -Author: nathanlct -Date: Fri Jun 28 14:30:29 2019 -0700 - - random grid improvements - -commit f367988ea895642b30f81ab5b51679710324a8e1 -Author: nathanlct -Date: Fri Jun 28 14:28:28 2019 -0700 - - better gen_custom_start_pos - -commit af5f1d44c04c52cf554427d735816e4e417ffd5d -Author: nathanlct -Date: Fri Jun 28 14:21:13 2019 -0700 - - improve specify_types - -commit dea227a991b3fafffdb4ac852fb0e4bd3b8c99e1 -Author: nathanlct -Date: Fri Jun 28 14:16:27 2019 -0700 - - improve specify_routes - -commit c95e672f5cb410cd4210d44626a42d579d374ac4 -Author: nathanlct -Date: Fri Jun 28 14:06:15 2019 -0700 - - remove useless method - -commit e6079bca05f6801d03693815b87e7e76a5345bd0 -Author: nathanlct -Date: Fri Jun 28 14:05:51 2019 -0700 - - improve grid init - -commit 92f4229e861f70252d62d91174453a2159fd3f05 -Author: nathanlct -Date: Fri Jun 28 12:15:31 2019 -0700 - - remove unused method - -commit d4507752aefb9482c29faf7afcc7364b84647677 -Author: nathanlct -Date: Fri Jun 28 12:10:58 2019 -0700 - - do we need specify_edge_starts? - -commit fc0a094f6ff40ade42af91f004ae8f74cf6ab1ee -Author: nathanlct -Date: Fri Jun 28 12:10:43 2019 -0700 - - improve specify_connections - -commit c0593dacdecb46d9499355861cbc97f4a7376df3 -Author: nathanlct -Date: Thu Jun 27 23:45:21 2019 -0700 - - simplify edges building - -commit 0223c3752d719284cd010e84b3c742ea16a6638a -Author: nathanlct -Date: Thu Jun 27 23:45:06 2019 -0700 - - simplify connections building - -commit f62da5f15b1d47ce913f08cedc5b9d8454a8868c -Author: nathanlct -Date: Thu Jun 27 23:44:23 2019 -0700 - - simplify how node_mapping is built and used - -commit 92acfe641eebc153730e98d12f64c133e1b9de38 -Author: Rayyan -Date: Thu Jun 27 20:49:44 2019 -0700 - - files commented on were 'examples/sumo/bottlenecks.py' and 'flow/envs/bottleneck_env.py'. - -commit 73533cbc820327800aeb0355f1360564ea22052b -Author: nathanlct -Date: Thu Jun 27 16:56:24 2019 -0700 - - convert to properties - -commit 5d50aad0bb63abd918e453ad6e35e4321d28f6e0 -Author: nathanlct -Date: Thu Jun 27 16:51:19 2019 -0700 - - better nodes building - -commit 5c0ec98524b7437bbd73faa96fc2dc5d2656f425 -Merge: 7ec2f684 ae71d939 -Author: Aboudy Kreidieh -Date: Thu Jun 27 16:28:47 2019 +0300 - - Merge pull request #552 from flow-project/tutorials-docs - - Improve tutorials - -commit 7ec2f6845981919cee59b09930a76a04e1cb95e4 -Merge: 694039f8 e3b66f27 -Author: Aboudy Kreidieh -Date: Thu Jun 27 14:45:32 2019 +0300 - - Merge pull request #554 from flow-project/fix-emission - - Fix emission path bug - -commit ae71d939e9267e5ef27d6ca9246d6b641062a9cb -Author: nathanlct -Date: Tue Jun 25 17:02:15 2019 -0700 - - fix pr - -commit e3b66f27c9eaa235cdad574de90ed79158146750 -Author: nathanlct -Date: Tue Jun 25 17:01:54 2019 -0700 - - fix pr - -commit bbf6757801a8299209a93027720cae60ed2b124b -Author: Yasharzf -Date: Tue Jun 25 16:47:00 2019 -0700 - - minor - -commit 2d2752d131144eb690f2f15b3ebd138935eeffbc -Author: Yasharzf -Date: Tue Jun 25 16:27:01 2019 -0700 - - commneted unused vars to resoleve travis issue - -commit 2b2421e7e79adef8efe46e07ea0141ad78c4b459 -Author: Yasharzf -Date: Tue Jun 25 16:00:14 2019 -0700 - - removed some files - -commit bbfdb9e629fb0745b2c72d56e9fb9381d094b01d -Merge: a5a03c1c 93856cf4 -Author: Yasharzf -Date: Tue Jun 25 15:57:17 2019 -0700 - - Merge branch 'aimsun_bugs' of https://github.com/flow-project/flow into aimsun_bugs - -commit 93856cf483f06b0815ef6d696a0ebe02d3221b5e -Author: nathanlct -Date: Tue Jun 25 15:56:08 2019 -0700 - - aimsun changes - -commit a5a03c1c5a1edf9520f1e09625917a3f1e9558cc -Author: Yasharzf -Date: Tue Jun 25 15:41:42 2019 -0700 - - removed veh_type from the veh deprart function - -commit 97bed8ecaaef406709909beaf8a2ac0ec35139c5 -Merge: 7673a312 1ce70ba6 -Author: nathanlct -Date: Tue Jun 25 15:37:37 2019 -0700 - - Merge branch 'aimsun-local' into aimsun_bugs - -commit 7673a3122143fd36c358381317c4ac0e7f416d1f -Author: Yasharzf -Date: Tue Jun 25 15:32:19 2019 -0700 - - fixed bugs - -commit 280ec078f8b05b9bf1b3ff39c7ae0456f048bc5f -Author: Yasharzf -Date: Tue Jun 25 09:45:15 2019 -0700 - - change sim step from 0.1 to 0.5 in Aimsun examples. Aimsun can not handle sim_step=.1 - -commit acc5cfc6d76896be03c4dc0dafa139aa75e03649 -Author: Yasharzf -Date: Tue Jun 25 09:32:19 2019 -0700 - - added get_initial_speed function to Aimsun vehicle - -commit c278ee852ada9c49183f666a479db0985a4ea0b7 -Author: Fangyu Wu -Date: Mon Jun 24 16:55:16 2019 -0700 - - Fix a typo. - -commit 150dfb892628042222609ab1d4b6af0e6f0fd0a8 -Author: Kathy Jang -Date: Mon Jun 24 00:13:58 2019 -0700 - - Added documentation to all but 2 more complicated functions, fixed pydocstyle. - -commit 4f4c22d555a7b30799babf4784b95d86db61ffa4 -Author: Fangyu Wu -Date: Sat Jun 22 19:06:07 2019 -0700 - - Update docker installation instruction. - -commit 4aa395488850e8f7b53ef0326e2f25294150e2f6 -Merge: 5717e866 694039f8 -Author: Ashkan Y -Date: Fri Jun 21 15:54:37 2019 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow - -commit 79c340c1dee268213a04ff2517a11a6bca02d8d0 -Author: nathanlct -Date: Fri Jun 21 14:44:33 2019 -0700 - - test - -commit 3a0a9a4e7c413c5dbdae419503bb29e4cb52e104 -Author: nathanlct -Date: Fri Jun 21 14:44:10 2019 -0700 - - test - -commit e86da28b171ea683fa081ffa82f4444df59da5e6 -Author: Nathan Lichtlé -Date: Fri Jun 21 09:42:48 2019 -0700 - - remove sugiyama.py from pr - -commit f8663b4d733c20f011ee020378296ef261f789dc -Merge: 55f3b727 694039f8 -Author: nathanlct -Date: Fri Jun 21 00:35:47 2019 -0700 - - Merge branch 'master' into tutorials-docs - -commit f2d7a0accf4336b2ef391188864aea67ea945dd1 -Author: nathanlct -Date: Fri Jun 21 00:33:10 2019 -0700 - - test - -commit 99682ccbb8418b77b972b55a4c0d7c40e11e1754 -Author: nathanlct -Date: Thu Jun 20 19:14:59 2019 -0700 - - test - -commit 55f3b727aaa76ec629dce487b6679e157a1b4d17 -Author: nathanlct -Date: Thu Jun 20 19:13:28 2019 -0700 - - add tests for plot_ray_results visualizer - -commit 166463b9e89bf754ed6285cc71b051c3fd89c87e -Author: nathanlct -Date: Thu Jun 20 19:13:01 2019 -0700 - - better error formatting - -commit a84c5070603ba3f18d9c00ddc81bc1ec4f4da9f3 -Author: nathanlct -Date: Thu Jun 20 17:52:08 2019 -0700 - - test - -commit 694039f8d9e9ab9c68960271b348832324a2478c -Merge: f5a8d1cc de414aa8 -Author: Aboudy Kreidieh -Date: Wed Jun 19 22:31:28 2019 +0300 - - Merge pull request #524 from flow-project/new_router - - New router - -commit de414aa81267dfdc09c6f5e67eeb3c77081bbb84 -Author: AboudyKreidieh -Date: Wed Jun 19 21:23:15 2019 +0300 - - PR fix - -commit b3b8e55ac2fb439c3cb76c0d8206b12b405301c2 -Author: Kathy Jang -Date: Tue Jun 18 17:18:22 2019 -0700 - - minor - -commit 9a961f4d0a4d7597824617fc9c57388a3555a735 -Author: Kathy Jang -Date: Tue Jun 18 17:16:33 2019 -0700 - - Fixed trivial pycodestyle errors for utils/aimsun files - -commit 6bbf41543486305d52f3bab4c81a7ddd837fa2dd -Author: Kathy Jang -Date: Tue Jun 18 17:11:53 2019 -0700 - - Fixed pycodestyle for all envs except for some functions in bottleneck_env and bay_bridge and loop/wave_attenuation.py - -commit 38dc955a3547f0f4e4a4a5423c3305cc4f16973f -Author: Kathy Jang -Date: Tue Jun 18 16:07:27 2019 -0700 - - Fixed pycodestyle for all files in core - -commit 553ebf5abf892fe060c55ba72035505572fa034c -Author: nathanlct -Date: Tue Jun 18 12:39:50 2019 -0700 - - add emission_path parameter in sumo tutorial - -commit 96bad25d9eda07851a85f852ebce4fda65711d96 -Author: nathanlct -Date: Tue Jun 18 12:38:39 2019 -0700 - - make sure emissions are generated if they are to be converted - -commit 1ce70ba6bf1e4dd43a7cdad789c05e76c1e433f1 -Author: nathanlct -Date: Tue Jun 18 10:40:15 2019 -0700 - - add helper scripts for aimsun - -commit 14f2e3f46c5d9fc7d619328e27269758c35824f8 -Merge: 5e6518ec f5a8d1cc -Author: AboudyKreidieh -Date: Tue Jun 18 09:56:14 2019 +0300 - - Merge branch 'master' of https://github.com/flow-project/flow into new_router - -commit 0bf0b73bcf11bd51189d3bfa0a02d180a7bdc9b5 -Author: nathanlct -Date: Mon Jun 17 19:51:05 2019 -0700 - - fix pep8 - -commit e2402a323fd7d32fa3fad416193a0840db797cae -Author: nathanlct -Date: Mon Jun 17 19:39:44 2019 -0700 - - remove python3.7 feature - -commit 59bf5f6b11a90cd6722ee8ec801d1dbdcdcd3979 -Author: nathanlct -Date: Mon Jun 17 19:27:56 2019 -0700 - - add section on restore from checkpoint in rllib tutorial - -commit 6785c6e1d30295c51d607c2585c3f2da13e3600c -Author: nathanlct -Date: Mon Jun 17 19:14:19 2019 -0700 - - add plot_ray_results file into visualize tutorial - -commit 423c9690908af17fc60a47f5ba5a03fcbc8d9094 -Author: nathanlct -Date: Mon Jun 17 19:11:57 2019 -0700 - - fix filename in plot_ray_results.py - -commit 3b154f737c797529cfb3794f8b1075a1370966c3 -Author: nathanlct -Date: Mon Jun 17 19:08:20 2019 -0700 - - add ray_results plotter - -commit 51a97ea5184e6626641c58eea82b4e95ba893d8a -Author: nathanlct -Date: Mon Jun 17 19:03:46 2019 -0700 - - mark the Aimsun installation section as optional - -commit 5650dccfc12ed1d935cc90ff2a81f9f25ba3a0b3 -Author: nathanlct -Date: Mon Jun 17 19:03:03 2019 -0700 - - add link to rllib installation tutorial - -commit 1de5c7aac78f2a9e1532380a7de8000c3fdc5249 -Author: nathanlct -Date: Mon Jun 17 19:00:05 2019 -0700 - - add checkpoint_at_end parameter in run_experiments - -commit 3a6004b54d6b42f9c816804953b2b3a6ef037732 -Author: nathanlct -Date: Mon Jun 17 18:55:19 2019 -0700 - - add precisions in aimsun tutorial - -commit 6c86970635c3343dda6e7070473d1f1d7bc4600b -Author: nathanlct -Date: Mon Jun 17 18:54:49 2019 -0700 - - add rllib visualization explanations in tutorials - -commit 11825b83c51b22ec45e95433c912b6eb4057d31b -Author: nathanlct -Date: Mon Jun 17 18:53:03 2019 -0700 - - add missing parameter in rllib visualizer example - -commit e7268aa73a7507404f4f10775437d34911c05bf3 -Author: Yasharzf -Date: Mon Jun 17 17:36:17 2019 -0700 - - bug fix - -commit 87cf3c84c1a8a6419fbfed2f9727be34628f3b2b -Author: Ashkan Y -Date: Wed Jun 12 17:41:54 2019 -0700 - - Remove 'bin' from SUMO_HOME - -commit 5717e86618242e35ade4720f7d51517e0e1847be -Merge: ab2198ec f5a8d1cc -Author: Ashkan Y -Date: Wed Jun 12 13:59:17 2019 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow - -commit f5a8d1cc9dd2323ace66c6b6ae98c28b6b9a1d6c -Merge: d085264d 56355420 -Author: Aboudy Kreidieh -Date: Wed Jun 12 12:46:03 2019 +0300 - - Merge pull request #293 from flow-project/new_sumo_pr - - New sumo pr - -commit 56355420f0e27901f3b147f74d9c45afbfab2094 -Merge: 82f2a37e d085264d -Author: Aboudy Kreidieh -Date: Wed Jun 12 12:16:22 2019 +0300 - - Merge branch 'master' into new_sumo_pr - -commit d085264dc62486216b25a09f91afdf2a21cf2983 -Merge: c8ea2b0c 2b5d2b36 -Author: Aboudy Kreidieh -Date: Wed Jun 12 12:13:02 2019 +0300 - - Merge pull request #530 from flow-project/rm_loop_merge - - Remove loop merge - -commit c8ea2b0cd35ecc811dcdd07b51d34a0766a0ed86 (tag: v0.3.1) -Merge: 3bfe67e5 748a67ba -Author: Aboudy Kreidieh -Date: Tue Jun 11 10:37:55 2019 +0300 - - Merge pull request #517 from flow-project/time_space_diagram - - Time space diagram - - - added a method for plotting time-space diagrams - - using the time-space diagrams to modify the vehicle parameters in the simulations to match expected behaviors in new sumo (more on this to come) - - tests for the new time-space diagram plotter - -commit 748a67ba895887246f56a616882c1fba5cbf3a80 -Author: AboudyKreidieh -Date: Tue Jun 11 09:42:35 2019 +0300 - - updated version number - -commit 3bfe67e51703c43d16a6e0276aa07924026087c6 -Merge: afe4f936 a8a0ef0f -Author: Aboudy Kreidieh -Date: Tue Jun 11 09:40:11 2019 +0300 - - Merge pull request #542 from flow-project/aimsun_cleanup - - Aimsun cleaning - -commit ab2198eca77174ce4756dd7fe3e254b052886ae7 -Merge: 9ea46cb0 afe4f936 -Author: Ashkan Y -Date: Mon Jun 10 21:59:30 2019 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow - -commit afe4f9360a28896776315c8cf57332efc47c8f07 -Merge: 65ab8b88 12c35646 -Author: Aboudy Kreidieh -Date: Mon Jun 10 19:51:49 2019 +0300 - - Merge pull request #544 from flow-project/clean_rewards - - Removed 4 unused reward functions - -commit bb00df455d394ec9c95af16e825a613d0f3b0e64 -Author: AboudyKreidieh -Date: Mon Jun 10 18:11:24 2019 +0300 - - updated merge scenario so that it's behavior will still work with new sumo - -commit 12c356468fc0507826d0e89f98870ffcd4c6899c -Author: AboudyKreidieh -Date: Mon Jun 10 17:04:38 2019 +0300 - - got rid of tests for removed reward functions - -commit 82f2a37e7f2d6d7eda60404c1db8703d844a090e -Author: AboudyKreidieh -Date: Mon Jun 10 16:54:03 2019 +0300 - - updated version - -commit ddc54c00bb1154223292e9650aac7febe445d726 -Merge: 90794da7 65ab8b88 -Author: AboudyKreidieh -Date: Mon Jun 10 16:50:52 2019 +0300 - - Merge branch 'master' of https://github.com/flow-project/flow into new_sumo_pr - -commit 6a98de289a02db6bd0c715affac9242a52c633e3 -Author: AboudyKreidieh -Date: Mon Jun 10 16:48:36 2019 +0300 - - bug fix to visualizers - -commit b5f392731832c9dba312d9db616d28ba237c6afa -Author: mtgibson2014 -Date: Sun Jun 9 22:55:45 2019 -0700 - - Removed 4 unused reward functions - -commit 9ea46cb02dce18551e56e307e8f8d4f0ab4b3ace -Merge: 7b0321a0 65ab8b88 -Author: Ashkan Y -Date: Sun Jun 9 14:15:05 2019 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow - -commit 8e448cfaa61f9eea7553b1756db6ff4c5b621872 -Author: nathanlct -Date: Sat Jun 8 11:43:07 2019 -0700 - - delete temporary files after loading Aimsun template - -commit a8a0ef0f4fdfa28bb52292b9efa8dcfb54d6097d -Author: Yasharzf -Date: Fri Jun 7 16:35:03 2019 -0700 - - deleted this because it was not supposed to be on this branch - -commit 90cc321404ccc1e90cd2563efba30f3a6269ba6f -Author: Yasharzf -Date: Fri Jun 7 16:12:22 2019 -0700 - - removed unnecessary comments - -commit 57abd6f105a85f0a8197d70935c93367d9d2fa0a -Author: Yasharzf -Date: Fri Jun 7 15:41:13 2019 -0700 - - removed unused find_node and find_turn functions - -commit 0f61b1fe544c2ad6bb886c65e1c163908871e3bb -Author: Yasharzf -Date: Fri Jun 7 15:34:36 2019 -0700 - - removed unused signal functions - -commit 5d257fbab55815454b5f0e2b067aa12ee09ede3f -Merge: c4457243 65ab8b88 -Author: Yasharzf -Date: Fri Jun 7 15:11:47 2019 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow into nn_controller - -commit 65ab8b88376485c6c0dd7a42843e154f2f325685 -Merge: cd701994 3afbf290 -Author: Aboudy Kreidieh -Date: Fri Jun 7 21:47:37 2019 +0300 - - Merge pull request #531 from flow-project/aimsun-scripting-api - - Scripting API for Aimsun - -commit cd701994908c1903e5b10d0f2ae8942f4ec13f47 -Merge: 492ad840 a5e51db3 -Author: Aboudy Kreidieh -Date: Fri Jun 7 21:35:25 2019 +0300 - - Merge pull request #541 from flow-project/clean-bottleneck - - Remove obsolete features from bottleneck environment - -commit 492ad84038bee4d6ce319cdb455275b1d825d02f -Merge: 876c2897 b7b64fe8 -Author: Aboudy Kreidieh -Date: Fri Jun 7 21:33:07 2019 +0300 - - Merge pull request #533 from flow-project/test_examples - - extended test coverage for grid examples - -commit 3afbf290d61a21e64f44590fb74c0ed2b59527e1 -Author: nathanlct -Date: Fri Jun 7 09:10:09 2019 -0700 - - add parameters to docstrings - -commit 876c289755317ddf5ab8fd62e64928a9fe72a61c -Merge: 6154a449 cd29143a -Author: Aboudy Kreidieh -Date: Fri Jun 7 14:41:23 2019 +0300 - - Merge pull request #539 from flow-project/ashkan-development - - Remove obsolete features from grid environment - -commit a5e51db3d7a18ecf50489d396c2f6c69bcf7f9fb -Author: nathanlct -Date: Thu Jun 6 17:24:29 2019 -0700 - - remove unused import - -commit 858c3e3e606df663a4832e9128118457ccaa4b04 -Author: nathanlct -Date: Thu Jun 6 17:17:19 2019 -0700 - - fix pep8 - -commit 04efb7ccad00854026fb0ef71349fb6f250a691d -Author: nathanlct -Date: Thu Jun 6 17:14:21 2019 -0700 - - removed unused functions - -commit 0c17b2330f679ac6b409c22a04b77edc64601f8e -Author: nathanlct -Date: Thu Jun 6 17:09:30 2019 -0700 - - clean bottleneck env - -commit cd29143af861267bbf38b54f6582727de286e5b4 -Author: Ashkan Y -Date: Thu Jun 6 16:32:55 2019 -0700 - - Remove obsolete features from grid - - Removed obsolete features from the grid. The function record_obs_var() is not called anywhere, and the function sort_by_intersection_dist() is only called by its tester. - -commit 311cece82b26ba3d90f2bbb0f862458199415773 -Author: nathanlct -Date: Thu Jun 6 16:05:22 2019 -0700 - - add default value to get - -commit 0c6168d6fa5dec0ee0222311ca8449392ed132dd -Merge: 11bab1b5 6154a449 -Author: AboudyKreidieh -Date: Fri Jun 7 00:04:47 2019 +0300 - - Merge branch 'master' of https://github.com/flow-project/flow into time_space_diagram - -commit 90794da744b074966e45582fab9e564bf4e743b8 -Merge: f926b3e7 6154a449 -Author: AboudyKreidieh -Date: Thu Jun 6 22:44:51 2019 +0300 - - Merge branch 'master' of https://github.com/flow-project/flow into new_sumo_pr - -commit 7b0321a0c5237dd3bb955db1f3de7b3fef9849bd -Merge: 6e42d679 6154a449 -Author: Ashkan Y -Date: Wed Jun 5 15:50:58 2019 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow - -commit 6154a4493c7a6a05dc1be60d877f4f24d7e9e054 -Merge: 6553be3c 1baf3035 -Author: Aboudy Kreidieh -Date: Wed Jun 5 09:33:50 2019 +0300 - - Merge pull request #535 from flow-project/improve-tutorial - - Add explanation on how to fix a bug when first installing flow - -commit 1baf3035730e2278d432e5d45236d4ff90853dc2 -Author: nathanlct -Date: Tue Jun 4 14:25:37 2019 -0700 - - add fix for notebook flow import bug when first installing flow - -commit e5021f4a4ef18ca7e0ef42f3b02be1debc29421d -Author: nathanlct -Date: Tue Jun 4 11:37:18 2019 -0700 - - complete tests for scripting_api.py up to 100% - -commit 05610bc92e7b5c961b842a52bb99e05268e9e8f9 -Author: nathanlct -Date: Tue Jun 4 11:23:05 2019 -0700 - - add load.py (requires Aimsun) to filed ignored by coverage - -commit 6553be3c69cd5f91ca0eccc6247f117616965a57 -Merge: 1cd55402 9e18e69a -Author: Aboudy Kreidieh -Date: Tue Jun 4 02:35:11 2019 -0400 - - Merge pull request #528 from flow-project/ashkan-development - - Update Readme with Stack Overflow tag information - -commit b7b64fe840d2d67d6c72128dd712fe86f35925f5 -Author: AboudyKreidieh -Date: Tue Jun 4 09:30:27 2019 +0300 - - extended test coverage for grid examples - - - modified the grid examples to accept as a input parameter - - added tests for both the cases when inflows are set on and off. In this way, we can make sure that both cases are not broken. - -commit 8d0fdac0ef8c59ab494c1f7193681c08aa26350e -Author: nathanlct -Date: Mon Jun 3 23:29:45 2019 -0700 - - add tests - -commit aea6a1895a17e01ad425c29bd37f0c6382147b21 -Author: nathanlct -Date: Mon Jun 3 23:29:36 2019 -0700 - - fix bug - -commit c4c095560b3f010f38397a35c44da69fbbe916a8 -Author: nathanlct -Date: Mon Jun 3 22:51:18 2019 -0700 - - fix bug with __setattr__ - -commit 383c4158fc77d36fea5706e7d7a38f22b4f9ee02 -Author: nathanlct -Date: Mon Jun 3 16:44:01 2019 -0700 - - useless change - -commit 6e42d679f3ab54063d5c7bbd1a7a430c3452ff67 -Merge: a30d1536 1cd55402 -Author: Ashkan Y -Date: Mon Jun 3 16:20:18 2019 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow - -commit 1cd5540258493ae486638df192a45cb315378c3d -Merge: 376034dc 8444d462 -Author: Nathan Lichtlé -Date: Mon Jun 3 09:27:14 2019 -0700 - - Merge pull request #532 from flow-project/pull-request-template - - Simplified PR template - -commit 7eb1ec3200ba03235229f0bc7fe1da2173f25005 -Author: nathanlct -Date: Sun Jun 2 02:19:43 2019 -0700 - - remove unwanted commit - -commit 66e0f28f49cd9ac24df2945fa7b973a3f60f3c49 -Author: nathanlct -Date: Sun Jun 2 01:38:40 2019 -0700 - - fix pep8 - -commit df5b802b3c2515a16f5855bae0cb4c780f863dd4 -Author: nathanlct -Date: Sun Jun 2 01:31:02 2019 -0700 - - fix pep8 - -commit 75fbdbc6009e238c663324422e8468f7a75aa8ab -Author: nathanlct -Date: Sun Jun 2 01:22:39 2019 -0700 - - fix syntax errors and pep8 - -commit 71fee1cc7ca8d6ae3c5162b5e272d554136fd2ad -Author: nathanlct -Date: Sun Jun 2 01:07:41 2019 -0700 - - fix syntax error - -commit 178298504928097f26e2c6514af82ee7c22eab84 -Author: nathanlct -Date: Sun Jun 2 00:34:11 2019 -0700 - - clean and fix pep8 - -commit b75e08eef6d0f95cf66f9952e1d4165c49635f4d -Author: nathanlct -Date: Sat Jun 1 23:47:59 2019 -0700 - - fix pep8 - -commit 84ad7a731f125ce997ef53235ad32bb017a031bd -Author: nathanlct -Date: Sat Jun 1 23:44:42 2019 -0700 - - fix syntax error - -commit 5a7fb4dae5a2be5b2998d91fbf7ebcb624732342 -Author: nathanlct -Date: Sat Jun 1 23:42:39 2019 -0700 - - fix pep8 - -commit abf966f8c137bc8c1985941fa547ffa92c8e9db6 -Author: nathanlct -Date: Sat Jun 1 01:25:13 2019 -0700 - - finis incorporating Aimsun scripting_api.py into load.py - -commit 6061b0a7ee4d76bc57875af13d2bbee8f5d61798 -Author: nathanlct -Date: Sat Jun 1 01:02:07 2019 -0700 - - incorporate Aimsun scripting_api.py into load.py (wip) - -commit 62265509a428adaa7a721ce3993373c6ad64e0bf -Author: nathanlct -Date: Sat Jun 1 00:44:47 2019 -0700 - - incorporate Aimsun scripting_api.py into load.py (wip) - -commit 176ac1ad34e4e08f0cabd1c8f23c71ed8da5fa7a -Author: nathanlct -Date: Sat Jun 1 00:28:20 2019 -0700 - - start incorporating Aimsun scripting_api.py into load.py - -commit 009149e36e8d8fdb23f2dd4678aa75e5d0af967d -Author: nathanlct -Date: Sat Jun 1 00:27:57 2019 -0700 - - add __setattr__ override to Aimsun objects - -commit aaa3be5c0a7562d34f230ee363a2eb965281ac02 -Author: nathanlct -Date: Fri May 31 20:04:45 2019 -0700 - - wrapper is functional - -commit c46f8b4df40ad9fc4ffb2fa7f77c8c795d8d4acc -Author: nathanlct -Date: Fri May 31 11:28:18 2019 -0700 - - first version of scripting api for Aimsun - -commit df41b2d9c06463867cd6a460efdd491f16f5c679 -Author: nathanlct -Date: Fri May 31 11:28:01 2019 -0700 - - add all Aimsun secondary files to .gitignore - -commit 4deb15c6a70a2ee5c25905b3b13f8f5b7a7c62fe -Author: nathanlct -Date: Thu May 30 13:31:06 2019 -0700 - - fix bug that was deleting template when loading it in Aimsun - -commit c9f65eb58d844c696f582d6d4ff9a449d4552985 -Author: nathanlct -Date: Thu May 30 12:58:33 2019 -0700 - - remove .ang Aimsun template from .gitignore - -commit b7d5ee49bcf229a2bb30c603fa095a75685c389c -Author: nathanlct -Date: Thu May 30 12:53:17 2019 -0700 - - add default Aimsun_Flow.ang template back - -commit 760dce4af431f6f14aee8d8daa5e0c4b9602780a -Author: nathanlct -Date: Thu May 30 12:42:46 2019 -0700 - - add .vscode folder in .gitignore - -commit a3025fd991b66ef3c19fb8a1ec18912b52d0fa2b -Author: AboudyKreidieh -Date: Mon Feb 4 14:47:15 2019 -0800 - - partial fix to aimsun kernel - -commit 8444d462ec5b7c62439ecbbbd57ba24594c83208 -Author: nathanlct -Date: Sun Jun 2 01:48:06 2019 -0700 - - simplify PR template - -commit 2b5d2b364067ca4bd50bbc3aab6004d09a22f327 -Author: AboudyKreidieh -Date: Wed May 29 12:18:38 2019 -0700 - - bug fix - -commit b9f423b1eacaf3bba5c974995ec5338291f09681 -Author: AboudyKreidieh -Date: Wed May 29 11:57:51 2019 -0700 - - removed obsolete tests - -commit 8c2c9b297aff87a84ece781dc58492bf674ab13d -Author: AboudyKreidieh -Date: Wed May 29 11:27:31 2019 -0700 - - Removed custom spacing from loop merge network. - - This method was using a parameter, cls, which acted as sort of a hack during the period when we were porting over Aimsun. This allows us to remove this parameter, since the loop merge scenario was the only scenario still using this. - -commit 9d0b03489e7a43cf8673bb1be0590583178d253f -Author: AboudyKreidieh -Date: Wed May 29 11:09:00 2019 -0700 - - removed loop merge environment - -commit 376034dc870b8b29792fcb1df5e724c06dce95b4 -Merge: 0d2a5e21 4a7cf6cb -Author: Aboudy Kreidieh -Date: Mon May 27 23:07:42 2019 -0700 - - Merge pull request #527 from flow-project/tutorial_template - - added template for tutorials - -commit 4a7cf6cbf4ecb80528f2dd390030585aa9ea2c38 -Author: Ashkan Y -Date: Mon May 27 09:35:50 2019 -0700 - - Added instuctions to add tutorial to the website - -commit 9e18e69ad83ee15415ffac62449486aaf8bccaa7 -Author: Ashkan Y -Date: Mon May 27 00:26:57 2019 -0700 - - Update Readme with Stack Overflow tag information - - ## Pull request information - - - - - **Status**: Ready to merge - - **Kind of changes**: enhancement - - **Code affected**: Readme.md - - **Related PR or issue**: None - - ## Description - - - - - General description - - - Added a section in Readme.md for asking questions on Stack overflow - -commit cf51ce431fb97e6886ed07af722a21afda7677b8 -Author: Ashkan Y -Date: Sun May 26 22:52:24 2019 -0700 - - Proof read the tutorial template - - Proof read the tutorial template and added more clarity to few sentences - -commit a30d1536a198092377e73958fad9636fcdf7e4e5 -Merge: 4c299ca1 0d2a5e21 -Author: Ashkan Y -Date: Sun May 26 22:34:37 2019 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow - -commit 11bab1b5ab5ded0f21ecd561e68ce702f0c04581 -Merge: 1662f156 0d2a5e21 -Author: AboudyKreidieh -Date: Sun May 26 15:38:08 2019 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow into time_space_diagram - -commit 18eff3a19a387c9ed3476f61b6c9fb3aaa51e577 -Author: AboudyKreidieh -Date: Sun May 26 13:29:45 2019 -0700 - - added template for tutorials - -commit 0d2a5e216a2ed110b45f79e399fe30aaff706ac6 -Merge: 0421ee31 1de1e29b -Author: Aboudy Kreidieh -Date: Sun May 26 03:58:32 2019 -0700 - - Merge pull request #483 from flow-project/remove_scenario - - Remove scenario - - - replaced `scenario.vehicles` in the environments with `initial_vehicles` - - updated the `initialize` procedure in the vehicle kernels so that they may be initialized with the correct number of initial vehicles - - moved `get_initial_speed` from `VehicleParams` to the vehicle kernel - -commit 1de1e29bba53ab5db19aedfd7b1343199ee568ea -Author: AboudyKreidieh -Date: Sun May 26 03:12:26 2019 -0700 - - cleanup - -commit 4c299ca1f602a429b6c686cfb92f3980299bfc27 -Merge: ed26471a 0421ee31 -Author: Ashkan Y -Date: Fri May 24 10:59:25 2019 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow - -commit 0421ee31b072cb2ac533357afe05adb0a6867463 -Merge: 2043a5b8 6802afd9 -Author: Aboudy Kreidieh -Date: Thu May 23 15:29:49 2019 -0700 - - Merge pull request #516 from flow-project/grid_doc - - added documentation to grid functions - -commit 6802afd906934c02ca643376a0c6097b60909733 -Author: AboudyKreidieh -Date: Thu May 23 14:51:26 2019 -0700 - - PR fix - -commit 2043a5b802774fb0fd997d9145ff460bed269d5f -Merge: 5ca98bbf 63859fe0 -Author: Aboudy Kreidieh -Date: Thu May 23 14:35:40 2019 -0700 - - Merge pull request #521 from flow-project/ashkan-development - - Better name for 'self.last_change' array - -commit 63859fe001568aa6f9c661aa98e3683097bb76e0 -Author: Ashkan Y -Date: Thu May 23 11:25:44 2019 -0700 - - Fixed tutorial 11 bug - - Fixed the accidental deletion of "}," in the code that had broken the tutorial - -commit 591fdca60412163c9985b10fe8b7ddf176a54183 -Author: Ashkan Y -Date: Wed May 22 15:57:15 2019 -0700 - - Removed ipdb trace code - -commit 0191e8ca79fff9d46dcbf1d1df1c97ff7dd0fe20 -Author: AboudyKreidieh -Date: Wed May 22 15:34:29 2019 -0700 - - bug fix - -commit 5ca98bbf095293c54d2840770cc3f93608c0680e -Merge: 0e940683 1096f508 -Author: Aboudy Kreidieh -Date: Wed May 22 13:29:00 2019 -0700 - - Merge pull request #513 from flow-project/removed_controller - - removed FeedBackController - -commit 0e94068377a4735a82123156a44b5d34b5f3a797 -Merge: 623b98b0 708758da -Author: Nathan Lichtlé -Date: Wed May 22 13:22:29 2019 -0700 - - Merge pull request #525 from flow-project/pr-template - - New pull request template - -commit 708758dab6bc1eb6f0d867e670e1adf74e3ffc5e -Author: Nathan Lichtlé -Date: Tue May 21 19:11:22 2019 -0700 - - cleaner PR template - -commit 741e90bef1fdc21ccbb5ccf476e40b951035ca7c -Author: Nathan Lichtlé -Date: Tue May 21 19:03:02 2019 -0700 - - added pull request template - -commit 623b98b07a81ff1ebedf7a7db08b47751ba6192a -Merge: 3cf37aab 08cc3c61 -Author: Aboudy Kreidieh -Date: Tue May 21 13:34:17 2019 -0700 - - Merge pull request #507 from flow-project/osm_test - - added test for osm files - -commit 08cc3c61407397ed439e249bdb3d898aa0580fa7 -Author: AboudyKreidieh -Date: Mon May 20 13:44:08 2019 -0700 - - pep8 - -commit 4d15c324561e4fa7fc49d009aee136630de20e69 -Author: AboudyKreidieh -Date: Mon May 20 13:38:39 2019 -0700 - - bug fixes - -commit 2418a6995dbeac39630d935575d8513dbd5b7782 -Merge: b3dd3a1e 3cf37aab -Author: AboudyKreidieh -Date: Mon May 20 13:21:10 2019 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow into grid_doc - -commit e44e339bc1ec626d570879cac41ce565bab0f194 -Merge: fa6356da 3cf37aab -Author: AboudyKreidieh -Date: Mon May 20 13:14:01 2019 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow into remove_scenario - -commit 9567f1ee2f8a47935a8c16ce354f97b1b0fb98b6 -Merge: 67a89c0e 3cf37aab -Author: AboudyKreidieh -Date: Mon May 20 13:09:07 2019 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow into osm_test - -commit 1662f156e85254b5d2fe8810579b50f1b0752fc0 -Merge: 0fd1da4f 3cf37aab -Author: AboudyKreidieh -Date: Mon May 20 13:07:31 2019 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow into time_space_diagram - -commit 0fd1da4f52b776cd23fe32912007233dd568a845 -Author: AboudyKreidieh -Date: Mon May 20 13:07:18 2019 -0700 - - bug fixes - -commit 3cf37aab3506694df347077db5c8ef438e7afbb1 -Merge: c544c4d0 b7f08f53 -Author: Aboudy Kreidieh -Date: Mon May 20 13:06:07 2019 -0700 - - Merge pull request #512 from flow-project/visualizer_tests - - new tests to visualizers - -commit e0499db7264a785d94556c0f15e056b9956ece12 -Author: AboudyKreidieh -Date: Sun May 19 17:25:08 2019 -0700 - - tests for the time space diagram visualizer and some cleanup - -commit bbe5e8a193caf34eeef7d58689a2409fda642886 -Author: Ashkan Y -Date: Sun May 19 14:51:15 2019 -0700 - - Remove ipdb - -commit 5e6518ec5f0377c08096e17a6329e1ca076286f6 -Author: AboudyKreidieh -Date: Sun May 19 13:23:22 2019 -0700 - - bug fix - -commit 0b7cd3c93cd54bb8162dcada440a52585bb9f821 -Author: AboudyKreidieh -Date: Sun May 19 13:15:43 2019 -0700 - - documented new routing methods in scenario tutorial - -commit b54cbb96074d4b2e85925d743e8065769df84a6d -Author: AboudyKreidieh -Date: Sun May 19 12:32:55 2019 -0700 - - modified ContinuousRouter to probabalistically adopt any of the routes available from a given starting edge - -commit 52ff9373e7be3093c2752a2dcb1c1e641cd7a91b -Author: Ashkan Y -Date: Sat May 18 23:33:22 2019 -0700 - - fixed pep8 issues :) - -commit 0b0bc56a33720fea91512752893b7bbe6f57a8c4 -Author: Ashkan Y -Date: Sat May 18 23:24:13 2019 -0700 - - Added ipdb for debug - -commit ed26471a86f854a3053ce7f6e1115d915dd864e4 -Merge: 6e40d099 c544c4d0 -Author: Ashkan Y -Date: Sat May 18 23:13:43 2019 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow - -commit 1fb8c5227855442c385fc2a7a63804ec03e58a78 -Author: AboudyKreidieh -Date: Sat May 18 21:08:24 2019 -0700 - - bug fixes - -commit b214aadbfcc203809ba8bbbc8d5e3481522b6701 -Author: AboudyKreidieh -Date: Sat May 18 14:55:14 2019 -0700 - - bug fixes - -commit 930326ace2e0b7aa236122161d31eb0720b96ed5 -Author: AboudyKreidieh -Date: Sat May 18 13:55:39 2019 -0700 - - some cleanup to changes - -commit 0c1f739f58d5bf9b239269e1e7a630412b250498 -Author: AboudyKreidieh -Date: Sat May 18 13:20:18 2019 -0700 - - pep8 - -commit 61749395931957860c576436e816b4ed0caa6dcf -Merge: 6d70435d c544c4d0 -Author: AboudyKreidieh -Date: Sat May 18 13:16:54 2019 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow into new_router - -commit fa6356daf5a31d12f7f7fb8e129d544b8f5adc00 -Author: AboudyKreidieh -Date: Fri May 17 18:59:45 2019 -0700 - - further removal of cases of scenario.vehicles - -commit 709850c2d4b39959beed43894667e453a2b2d083 -Merge: 5ed81b75 c544c4d0 -Author: AboudyKreidieh -Date: Fri May 17 11:02:42 2019 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow into remove_scenario - -commit c544c4d08bfceb50774dca5fa4c669e4581173d5 -Merge: 03fa1403 878ac3d1 -Author: Aboudy Kreidieh -Date: Fri May 17 10:51:46 2019 -0700 - - Merge pull request #523 from sotte/doc_multiagent_fix - - DOC fix indent and improve wording for multiagent - -commit 878ac3d1f145b9250bfb2cd13f89fe631e6aba5e -Author: Stefan Otte -Date: Fri May 17 10:53:15 2019 +0200 - - DOC fix indent and improve wording for multiagent - -commit 2e8615ad3a09d19786bfe8e1b6f525d7ec6129b7 -Author: Ashkan Y -Date: Wed May 15 17:42:32 2019 -0700 - - Fixed pep8 issues - -commit 513f702e15b29bae9ce9005326cf1a5b770618f3 -Author: Ashkan Y -Date: Mon May 13 18:44:20 2019 -0700 - - Better name for 'self.last_change' array - - -Split the 2D array self.last_change[num_traffic,3], into 3 arrays, that are described by better names - -Updated the file green_wave_env - -Updated the tutorial for traffic lights - -commit 6e40d099b3db190deb10a44df4ff87cdb709b934 -Merge: 1c1c284d 03fa1403 -Author: Ashkan Y -Date: Sun May 12 23:48:32 2019 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow - -commit 03fa1403e6b83671e987d57f69b9df448d78ed99 -Merge: ee9973b6 45a34db0 -Author: Aboudy Kreidieh -Date: Sun May 12 15:32:45 2019 -0700 - - Merge pull request #514 from flow-project/tests_cleanup - - some mods to unit-testability - -commit 5ed81b759fc11a4b95b6e526b5e4d5afe8c2fb51 -Merge: 4d0356ba ee9973b6 -Author: AboudyKreidieh -Date: Fri May 10 17:10:49 2019 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow into remove_scenario - -commit ee9973b6cca733da6f2e3b64c61bdb1fd018ebcc -Merge: 0c1a0d2e b97fb02b -Author: Aboudy Kreidieh -Date: Fri May 10 17:07:03 2019 -0700 - - Merge pull request #481 from flow-project/docstring_attributes - - extended documentation in docstrings - -commit b97fb02b76700d1e274dfd2fc814dd2e8422699a -Author: AboudyKreidieh -Date: Fri May 10 16:21:59 2019 -0700 - - PR fixes - -commit 246812514524287ac7aa43465975d68e97bb0b3a -Author: AboudyKreidieh -Date: Fri May 10 16:20:30 2019 -0700 - - PR fixes - -commit ce52713a694a938bb2ecd56f3e367fe17205e826 -Merge: 8d80bb4f 0c1a0d2e -Author: AboudyKreidieh -Date: Fri May 10 15:06:08 2019 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow into docstring_attributes - -commit 0c1a0d2e1ac83049ae0ef0e3effe8a7fe7bf805f -Merge: d1cf643c f6a0a592 -Author: Aboudy Kreidieh -Date: Wed May 8 21:31:19 2019 -0700 - - Merge pull request #492 from flow-project/LuST_pr - - LuSt pr - -commit f6a0a592c5342d59309c68daa4d3a20364e28a35 -Author: AboudyKreidieh -Date: Wed May 8 20:50:27 2019 -0700 - - added test for vehicles in .rou.xml - -commit 23e9ff3da0dc328c4088d3f2b0c4d10b0b621904 -Author: AboudyKreidieh -Date: Wed May 8 19:40:20 2019 -0700 - - added missing files - -commit 9816dc6e8e011dd62cbefa9ce93ffa034d4ea5ff -Author: AboudyKreidieh -Date: Wed May 8 19:11:54 2019 -0700 - - added tests for network templates - -commit dac74a734c50684cacb492d2ba28864e46c0f7e0 -Author: AboudyKreidieh -Date: Wed May 8 14:53:49 2019 -0700 - - bug fix for only one .rou file - -commit c66b2175529263832b7688b17728b9d5c122f7d7 -Merge: 4160009a d1cf643c -Author: AboudyKreidieh -Date: Wed May 8 13:21:56 2019 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow into LuST_pr - -commit 06fd1942936e95a29f7fe50690f5da8a0fac6db5 -Author: AboudyKreidieh -Date: Tue May 7 01:12:27 2019 -0700 - - added missing file - -commit 04627aeb50c82295bd9873d955b011b780cc8220 -Author: AboudyKreidieh -Date: Tue May 7 00:16:33 2019 -0700 - - added test for importing emission in time space diagram - -commit 1c1c284d8a9cbeb7d62c37e917492c27dbc89117 -Merge: 4324cab2 d1cf643c -Author: Ashkan Y -Date: Mon May 6 23:48:50 2019 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow - -commit 19c83f45f990f51797a0f98c7458d0819b0b9b4b -Merge: bcc511cc b7f08f53 -Author: AboudyKreidieh -Date: Mon May 6 23:40:56 2019 -0700 - - Merge branch 'visualizer_tests' of https://github.com/flow-project/flow into time_space_diagram - -commit 45a34db0ef9b625c93984414dea741a8753603cd -Author: AboudyKreidieh -Date: Mon May 6 23:32:15 2019 -0700 - - bug fix - -commit bcc511cc3eb81b660faebd262ffd7f1d8cd0293e -Author: AboudyKreidieh -Date: Sun May 5 09:36:59 2019 -0700 - - modified figure eight exps to improve behavior in new sumo - -commit bd04fc9ebe3e3ee012a13e175735f964eab08e4a -Author: AboudyKreidieh -Date: Sun May 5 09:36:05 2019 -0700 - - added a new method for plotting time space diagrams - -commit f926b3e7c5e09d2ea22334d78557075c82b04d38 -Merge: f4c70e14 d1cf643c -Author: AboudyKreidieh -Date: Fri May 3 13:07:22 2019 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow into new_sumo_pr - -commit d1cf643c309602fd31062abb42987f84b29ac4cb -Merge: a5dbd5d9 c2912c8e -Author: Aboudy Kreidieh -Date: Mon Apr 29 10:06:11 2019 -0700 - - Merge pull request #515 from romannv/master - - Update missing docs link in tutorial01_sumo - -commit f4c70e14cee540cd3d972df6ff7c7533005ba5b7 -Merge: 23ff77b0 a5dbd5d9 -Author: AboudyKreidieh -Date: Sun Apr 28 22:52:05 2019 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow into new_sumo_pr - -commit 777bc87dee61018982b56fd713ca54b1a66fb34f -Author: AboudyKreidieh -Date: Sun Apr 28 22:35:09 2019 -0700 - - removed additional_params - -commit 6d14051bddffdf75c5f7335acdb3cb5186a3829c -Author: AboudyKreidieh -Date: Sun Apr 28 22:34:55 2019 -0700 - - removed some features that were affecting unit test coverage - -commit c2912c8e78aec55db224260dee935cef6bf5b330 -Author: Alejandro Roman -Date: Sun Apr 28 14:34:23 2019 -0500 - - Add parenthesis for missing docs reference - - I think it looks better with a parenthesis, as it was originally placed. - -commit cb1528230734adc61a82b869bc933f1e35815786 -Author: Alejandro Roman -Date: Sun Apr 28 14:32:06 2019 -0500 - - Update missing readthedocs link in tutorial01_sumo - - There was a missing link with a placeholder text when referencing the docs for the VehicleParams.add function. - -commit 407170c7140c102767ccd9fd8f51e2c034b96c16 -Author: AboudyKreidieh -Date: Sun Apr 28 02:51:24 2019 -0700 - - some mods to unit-testability - - - replaced ZeroDivisionError checks with an epsilon term - - replaced check for None with an statement - - added tests for additional_params to all scenarios - -commit 1096f5082fc23b3d21c0d1c04bff4d6a1837ee31 -Author: AboudyKreidieh -Date: Sat Apr 27 15:44:13 2019 -0700 - - removed FeedBackController - -commit b7f08f535c051dc20b55c3e33bced568bdfb74b6 -Author: AboudyKreidieh -Date: Sat Apr 27 15:37:49 2019 -0700 - - new tests to visualizers - - - added a tests for capacity_diagram_generator.py - - modified capacity_diagram_generator to be unit testable and accept path to csv as input - -commit 23ff77b0e83ec40ebd05f68021266fdd573d10a1 -Merge: e921912e ba1a47fe -Author: AboudyKreidieh -Date: Fri Apr 26 16:43:56 2019 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow into new_sumo_pr - -commit a5dbd5d9fd99e953ba8ca1148c7c6fa1c5fd20b4 -Merge: ba1a47fe cc77f756 -Author: Aboudy Kreidieh -Date: Thu Apr 25 17:46:05 2019 -0700 - - Merge pull request #509 from flow-project/add-code-of-conduct-1 - - Create CODE_OF_CONDUCT.md - -commit cc77f756548b9c30b280ad05dd28e9d1ce7ccba3 -Author: Aboudy Kreidieh -Date: Tue Apr 23 16:18:44 2019 -0700 - - Create CODE_OF_CONDUCT.md - -commit 4324cab24d5d15807d162052c937601a47ae4506 -Merge: 92d142b6 ba1a47fe -Author: Ashkan Y -Date: Tue Apr 23 13:55:35 2019 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow - -commit ba1a47fe26317b7f051ef8c9a43dd685e20866a8 -Merge: 094098d7 8ccf94f7 -Author: Aboudy Kreidieh -Date: Mon Apr 22 21:15:57 2019 -0700 - - Merge pull request #505 from flow-project/wave_atten_env - - Wave atten env - -commit 094098d7eb1cd447814ec5616e64218ea4d9adfd -Merge: 043ec1a0 9d48f991 -Author: Aboudy Kreidieh -Date: Mon Apr 22 21:15:40 2019 -0700 - - Merge pull request #506 from flow-project/test_example - - Test example - -commit 4160009a0476a269b5219584cd05fa5af274fad5 -Merge: 12d9cae9 043ec1a0 -Author: AboudyKreidieh -Date: Mon Apr 22 16:56:42 2019 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow into LuST_pr - -commit 8ccf94f70e9dc1fa3f6a25230145d7348231e6d2 -Merge: 4e73437a 1d294744 -Author: AboudyKreidieh -Date: Mon Apr 22 14:03:52 2019 -0700 - - Merge branch 'wave_atten_env' of https://github.com/flow-project/flow into wave_atten_env - -commit 4e73437a756fde37c6e3d72c28b3e3b37fff5f93 -Merge: 1b7f7a46 043ec1a0 -Author: AboudyKreidieh -Date: Mon Apr 22 14:03:31 2019 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow into wave_atten_env - -commit 1d294744d84f9546267d2cab6935c24cab65e0a0 -Merge: 6e5008b3 1b7f7a46 -Author: Aboudy -Date: Sun Apr 21 23:04:15 2019 -0700 - - Merge branch 'wave_atten_env' of https://github.com/flow-project/flow into wave_atten_env - -commit 6e5008b336de70e2daf0fd7edd1f5c457e890175 -Author: Aboudy -Date: Sun Apr 21 23:03:49 2019 -0700 - - updated params to match paper - -commit 043ec1a0949547336ea217e5dac793fc4c1a8cda -Merge: f8d86344 7bd45bfe -Author: Aboudy Kreidieh -Date: Sun Apr 21 09:21:53 2019 -0700 - - Merge pull request #508 from flow-project/aimsun - - Aimsun - -commit 7bd45bfe099c6dd50ae0e3b9ead3e45d3a326b2b -Merge: 6a22e1d1 3f7ebf91 -Author: Aboudy Kreidieh -Date: Sat Apr 20 21:29:21 2019 -0700 - - Merge pull request #504 from nathanlct/flow-aimsun - - Aimsun-Flow interface - -commit 67a89c0e7d3f2ce3c2d24c1d84520dd4b991d9aa -Author: AboudyKreidieh -Date: Fri Apr 19 20:00:32 2019 -0700 - - more stable version of the test - -commit 3569535b3492b928d587838a2de3f13dc600f71b -Author: AboudyKreidieh -Date: Fri Apr 19 20:00:13 2019 -0700 - - more stable version of the test - -commit 3164a818e6a6f939276175bddf452b59667a60b5 -Author: AboudyKreidieh -Date: Fri Apr 19 19:35:13 2019 -0700 - - added test for osm files - -commit f8d86344b813a99e657c10e8aeaa69bf34dc1bb0 -Merge: 5b0c9b4a 7fdfd31d -Author: Aboudy Kreidieh -Date: Fri Apr 19 19:16:28 2019 -0700 - - Merge pull request #498 from flow-project/actions_single_veh - - modified apply vehicle actions to support single vehicles - -commit 5b0c9b4ab670900f60e5c404dece70224c626948 -Merge: 6a22e1d1 13d27822 -Author: Aboudy Kreidieh -Date: Fri Apr 19 19:15:56 2019 -0700 - - Merge pull request #503 from flow-project/rew_fix - - modified reward to match description - -commit 9d48f9916e864f7bc928d1f0b7b16ede06bd496c -Author: AboudyKreidieh -Date: Fri Apr 19 19:06:19 2019 -0700 - - pythonified some parameter updates - -commit 9e7c5b2a14b1ea2c1769a22d7af634562817b675 -Author: AboudyKreidieh -Date: Fri Apr 19 19:02:41 2019 -0700 - - added test for examples/sumo/density_exp.py - -commit 1b7f7a46208df0b94e66e6bfe2431829dd682402 -Author: AboudyKreidieh -Date: Fri Apr 19 18:31:50 2019 -0700 - - tests to wave attenuation env - -commit 12d9cae973fb570e50505a933493466f28b671e5 -Author: nathanlct -Date: Fri Apr 19 15:49:51 2019 -0700 - - added Aimsun part to tutorial 8 - -commit 3f7ebf91aef1633f2b3b71642d78fba6b4b80114 -Author: nathanlct -Date: Fri Apr 19 15:01:24 2019 -0700 - - fix tracking test - -commit 4d3e64daa2917a2c38d887c31907651894df9e32 -Author: nathanlct -Date: Fri Apr 19 15:00:30 2019 -0700 - - fix test - -commit 1b7bbb0d9de5862d141ea477ee952b6ac106b9f7 -Merge: a627bbd7 3eb3823f -Author: nathanlct -Date: Fri Apr 19 14:54:56 2019 -0700 - - merge - -commit 3eb3823f0b62d5c5d704351818b3af55347fcfd5 -Author: nathanlct -Date: Fri Apr 19 14:39:38 2019 -0700 - - fixed tracking info test - -commit 965c97f22230ba334ddcee5c2d56543b5b1e8385 -Author: nathanlct -Date: Fri Apr 19 13:54:17 2019 -0700 - - fix tests - -commit b14a2a0733aa645149b9cf317bf85945ccb6b3d9 -Merge: 311427e5 6b4e7b7a -Author: nathanlct -Date: Fri Apr 19 13:42:45 2019 -0700 - - Merge branch 'master' into flow-aimsun - -commit 45f0c7bfd53746f391ffe4ef266c9cb6a2fd0651 -Author: AboudyKreidieh -Date: Fri Apr 19 13:06:13 2019 -0700 - - bug fix - -commit a387dd0b5a257113e05a5f1efcdcf541e222d9d6 -Merge: ed2ecdf8 6a22e1d1 -Author: AboudyKreidieh -Date: Fri Apr 19 12:55:42 2019 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow into wave_atten_env - -commit 92d142b6b6847e435a4c253995e80ce02b426dca -Merge: 804b2293 6a22e1d1 -Author: Ashkan Y -Date: Thu Apr 18 12:49:28 2019 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow - -commit a627bbd77879040c6a5b2741a3259be8b54e731c -Author: Nathan Lichtlé -Date: Wed Apr 17 22:23:51 2019 -0700 - - Update tutorial08_network_templates.ipynb - -commit 311427e5bee082d6dacb6bac358b480f4e9ce417 -Author: nathanlct -Date: Wed Apr 17 22:13:25 2019 -0700 - - beautify code - -commit 228e0980cd6ddbff32083f8b641bd62be24e7dd3 -Author: nathanlct -Date: Wed Apr 17 21:05:54 2019 -0700 - - fixed indentation - -commit a5e6ee056b6c872771211b13b6de55811a8ea6a3 -Author: nathanlct -Date: Wed Apr 17 21:03:09 2019 -0700 - - simplify default call to specify_routes that now has a default value when not implemented - -commit c3c68187026793b4887e9baf4099feb2714147ba -Merge: b524edc6 05fbabbc -Author: nathanlct -Date: Wed Apr 17 20:57:53 2019 -0700 - - merge - -commit b524edc69194cba4fcd75a2b487d2128b84eb3da -Author: nathanlct -Date: Wed Apr 17 20:44:37 2019 -0700 - - fixed loading of scenario_data.json into scenario - -commit 6e970bbd1d742eb5431ced8e371629c91fb644df -Author: nathanlct -Date: Wed Apr 17 20:42:15 2019 -0700 - - fixed get_tracking_info function - -commit 05fbabbc560c286e1c8e891e88cddcfdd48db4a3 -Author: AboudyKreidieh -Date: Wed Apr 17 17:32:33 2019 -0700 - - removed code duplication - -commit b129d7cec6888c38b954e50b8a3484b7cc9a370e -Author: nathanlct -Date: Wed Apr 17 17:26:56 2019 -0700 - - added missing colon - -commit b01de7b385a1a726f713ca9fa2f89cd4376cf0eb -Author: AboudyKreidieh -Date: Wed Apr 17 17:18:37 2019 -0700 - - pep8 - -commit c0200c5bc2bbc537ede9b41d3355eb8f55670d51 -Author: AboudyKreidieh -Date: Wed Apr 17 17:07:50 2019 -0700 - - removed code duplication - -commit 59f335af0e2ceed9ef9812e859dfe19479801fe2 -Author: nathanlct -Date: Wed Apr 17 16:56:39 2019 -0700 - - removed unused import - -commit c8a6709dd92d40d8c486daa776d8cf2b134f54c2 -Author: nathanlct -Date: Wed Apr 17 16:46:19 2019 -0700 - - beautify code - -commit 7e01b4b9056fdfe956ceab1c1a380fa8c0289752 -Merge: 6e8b971a cebc6d81 -Author: nathanlct -Date: Wed Apr 17 16:22:57 2019 -0700 - - Merge branch 'flow-aimsun' of https://github.com/nathanlct/flow into flow-aimsun - -commit 6e8b971aed36025634084bce5e1ed8397224921c -Author: nathanlct -Date: Wed Apr 17 16:17:55 2019 -0700 - - beautify code - -commit cebc6d81d31817756525ef17a1dfe9754a99dce3 -Merge: 17a7d751 6a22e1d1 -Author: Nathan Lichtlé -Date: Wed Apr 17 15:24:56 2019 -0700 - - Merge branch 'aimsun' into flow-aimsun - -commit 17a7d75164ac0dbdc5939cf91e437d889bc090c3 -Author: nathanlct -Date: Wed Apr 17 14:29:56 2019 -0700 - - cleaning - -commit 6a22e1d135860575bd3f3be0a502a4f72a03f864 -Merge: 48a8f85d 22e65bd1 -Author: Aboudy Kreidieh -Date: Tue Apr 16 15:13:11 2019 -0700 - - Merge pull request #495 from flow-project/ashkan-development - - Update README.md - -commit 22e65bd15d11f437fbdc711aced9c1b4fd71487b -Merge: e1ef276d 48a8f85d -Author: AboudyKreidieh -Date: Tue Apr 16 13:51:28 2019 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow into ashkan-development - -commit 13d278226fce934696e11ed9e3900b7dea0a8105 -Author: AboudyKreidieh -Date: Tue Apr 16 13:50:54 2019 -0700 - - cleanup to tutorial - -commit db518a673611d86f975641e56196ff243a7c49e1 -Author: AboudyKreidieh -Date: Tue Apr 16 13:47:53 2019 -0700 - - cleaned up tutorial - -commit 48a8f85dd5a52c436536a19fdd9714199b93617c -Merge: 63281ef1 384bee0c -Author: Aboudy Kreidieh -Date: Tue Apr 16 13:39:55 2019 -0700 - - Merge pull request #502 from persianpros/patch-1 - - Make Travis CI faster with shallow clone. - -commit 6cea860b4a584cd508b28f99e2465ceff5f86c89 -Author: AboudyKreidieh -Date: Tue Apr 16 13:36:58 2019 -0700 - - modified reward to match description - - resolves #500 - -commit 384bee0cf6945f80f10274a514224083a1be2efc -Author: Persian Prince -Date: Wed Apr 17 00:39:22 2019 +0430 - - Make Travis CI faster with shallow clone. - -commit 786570076edd1f092f47949d37686136169f218b -Author: nathanlct -Date: Thu Apr 11 17:44:30 2019 -0700 - - everything - -commit 9314c5927df646b226362f35dcc0584bfcdaf92a -Author: nathanlct -Date: Thu Apr 11 17:43:48 2019 -0700 - - everything - -commit 7fdfd31d66ca2fdcdc2efb01fce58a27de49d3a0 -Author: AboudyKreidieh -Date: Thu Apr 11 00:15:14 2019 -0700 - - modified apply vehicle actions to support single vehicles - -commit 6d70435d3e47358d7d9bb09a6234321f455ec275 -Author: AboudyKreidieh -Date: Thu Apr 4 00:53:21 2019 -0700 - - added methods for including all possible routes - -commit 902462ace6254680ad3dee0f9802da7a59df3403 -Merge: aa5f1b92 63281ef1 -Author: AboudyKreidieh -Date: Thu Apr 4 00:45:43 2019 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow into new_router - -commit e1ef276d5c5762cae51a62a28cf4a6c7a582cc2a -Author: Ashkan Y -Date: Wed Apr 3 23:01:36 2019 -0700 - - Update README.md - - my apologies. I was using the last version of Readme. Here is the change with the updated readme. - -commit 804b2293f6fc57d28853357580f6af5c0fffd55b -Merge: eb95be58 63281ef1 -Author: Ashkan Y -Date: Wed Apr 3 22:59:04 2019 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow - -commit e9c1a491863550b3754cadb76575021469820385 -Author: Ashkan Y -Date: Wed Apr 3 22:55:54 2019 -0700 - - Update README.md - - Update the list of contributors, and link it to the contributors' webpage on the Flow website (so it's always updated) - -commit 63281ef1b22e360e0c825a9023afd7c6489246eb -Merge: e63a2278 4f71086d -Author: Aboudy Kreidieh -Date: Wed Apr 3 13:47:25 2019 -0700 - - Merge pull request #469 from flow-project/gen_emission - - Gen emission - -commit aa5f1b92e1555ba111512f359ebd2b6e7f55524f -Merge: 395457cc e63a2278 -Author: AboudyKreidieh -Date: Wed Apr 3 09:33:04 2019 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow into new_router - -commit 4f71086dedc64f8243c8db9051ad4d35e5ea4079 -Merge: b2986f70 e63a2278 -Author: AboudyKreidieh -Date: Wed Apr 3 09:32:30 2019 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow into gen_emission - -commit 395457cc317a248d5df84510bddbee3720054314 -Author: AboudyKreidieh -Date: Wed Apr 3 09:29:19 2019 -0700 - - documentation for new route - -commit e63a22783f2f08997973e2b36e1df2a567a7ea55 -Merge: 4a3731c8 16fe93e2 -Author: Aboudy Kreidieh -Date: Wed Apr 3 09:25:28 2019 -0700 - - Merge pull request #482 from flow-project/remove_intersec_edgestarts - - deprecated intersection_edgestarts - -commit 4a3731c876fbb305133f4a2826354c8677a9399c -Merge: 92cdbf49 60de4dd5 -Author: Aboudy Kreidieh -Date: Mon Apr 1 09:37:22 2019 -0700 - - Merge pull request #490 from flow-project/scenario_docs - - expanded documentation for the scenarios - -commit 92cdbf498e1ea397c9d117bf3ec3b5f5455a2ced -Merge: dfee97dd d6479960 -Author: Aboudy Kreidieh -Date: Mon Apr 1 09:36:13 2019 -0700 - - Merge pull request #493 from flow-project/terminate_fixes - - removed prints at termination - -commit e921912ee672c96c92d654c925d8e3e4bdec0a91 -Merge: 77d92097 dfee97dd -Author: AboudyKreidieh -Date: Sun Mar 31 15:06:31 2019 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow into new_sumo_pr - -commit 77d92097e343beadf2168cef2015f9395fcfc882 -Author: AboudyKreidieh -Date: Sun Mar 31 15:06:27 2019 -0700 - - updated version - -commit d6479960af77e551321da4e01e609009e5b4035e -Author: AboudyKreidieh -Date: Sun Mar 31 14:40:33 2019 -0700 - - removed prints at termination - - These are causing way too many print statements at the end of a test/experiment - -commit 8b832b592530f34d6bb8d6a5cd712caf907b8249 -Author: AboudyKreidieh -Date: Sun Mar 31 14:26:50 2019 -0700 - - minor updates and bug fixes - -commit 6f6b29ab7cedef763d5d6be8d9ed534cf2308982 -Author: AboudyKreidieh -Date: Sun Mar 31 14:13:59 2019 -0700 - - updated setup instructions - -commit 04829a425d46663b6a5faaf4761171dd6cb40f3c -Merge: 11c84d04 dfee97dd -Author: AboudyKreidieh -Date: Sat Mar 30 23:46:38 2019 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow into LuST_pr - -commit 8d5246f8c908c9de1eded1244e737e39c7170adf -Author: AboudyKreidieh -Date: Sat Mar 30 23:41:14 2019 -0700 - - updated setup scripts - -commit dfee97dd504231f723d141ad1159ab35ad77bdba -Merge: d6773e0f bf26c910 -Author: Aboudy Kreidieh -Date: Sat Mar 30 23:25:45 2019 -0700 - - Merge pull request #486 from flow-project/osm_tutorial - - tutorial for osm - -commit d245bdfa1942664877f376f8de25257e668bc870 -Author: AboudyKreidieh -Date: Sat Mar 30 23:22:26 2019 -0700 - - bug fixes and updated documentation - -commit 353a97e8efebb2cd37e153bf4c274381d9138b0a -Merge: 00fc2339 d6773e0f -Author: AboudyKreidieh -Date: Sat Mar 30 23:01:32 2019 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow into new_sumo_pr - -commit 60de4dd5bdf421d9735da38fb59d494d557dbea1 -Author: AboudyKreidieh -Date: Sat Mar 30 02:01:46 2019 -0700 - - expanded documentation for the scenarios - -commit 11c84d048c733e0817682f4a7995166c81fa7738 -Author: AboudyKreidieh -Date: Thu Mar 28 23:43:49 2019 -0700 - - pep8 - -commit b2285cad0e28c7e2f23578a600ecab584d5c75eb -Author: AboudyKreidieh -Date: Thu Mar 28 23:42:47 2019 -0700 - - typo - -commit b009a9bbfc51a92f3b9e2928b1ab33408452e4f3 -Merge: 07e502ff bf26c910 -Author: AboudyKreidieh -Date: Thu Mar 28 23:41:52 2019 -0700 - - Merge branch 'osm_tutorial' into LuST_pr - -commit bf26c910a6039c79bf4080ed206440921dfaf5f8 -Author: AboudyKreidieh -Date: Thu Mar 28 23:41:22 2019 -0700 - - bug fix - -commit 07e502ff787941488d784dd0587ff771ca78c7a5 -Author: AboudyKreidieh -Date: Thu Mar 28 23:37:01 2019 -0700 - - templates tutorial - - - created tutorial on running sims from templates - - modified the scenario and vehicles classes and kernels to support predefined routes from vtype files - -commit d6773e0ffd2add78f35dff59e1aaf850d3925656 -Merge: df2fa059 47aed243 -Author: Aboudy Kreidieh -Date: Thu Mar 28 20:01:44 2019 -0700 - - Merge pull request #457 from flow-project/env_horizon - - added horizon to termination in Env - -commit eb95be58f0441fecbae7d5b9f30257165f0dd753 -Merge: eefdb58a df2fa059 -Author: Ashkan Y -Date: Thu Mar 28 15:39:30 2019 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow - -commit eda1058748efdc9a3cdcc2131a88e0c29bc4cbb5 -Author: AboudyKreidieh -Date: Thu Mar 28 00:43:58 2019 -0700 - - undid some changes - -commit 1fb2341f20a2591a0da0c1bf133ffc404340db78 -Merge: 7a06eb64 f25fa762 -Author: AboudyKreidieh -Date: Thu Mar 28 00:29:47 2019 -0700 - - Merge branch 'template_tutorial' into LuST_pr - -commit f25fa76276ecb945c69a10f4462aa84b8b6db05e -Author: AboudyKreidieh -Date: Thu Mar 28 00:29:29 2019 -0700 - - renamed netfile -> template - -commit fa8bb692edb8d61b87aca6c5332fbc7acf6f8f62 -Author: AboudyKreidieh -Date: Wed Mar 27 23:02:15 2019 -0700 - - moved up old tutorials - -commit 7a06eb647a2001a08df4f06fddb3196a7806c63e -Merge: e58c5569 41d53eb4 -Author: AboudyKreidieh -Date: Wed Mar 27 19:04:32 2019 -0700 - - Merge branch 'osm_tutorial' of https://github.com/flow-project/flow into LuST_pr - -commit e58c5569f8735196e13bc33d33245889282dcbae -Merge: 027ef96e df2fa059 -Author: AboudyKreidieh -Date: Wed Mar 27 19:04:24 2019 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow into LuST_pr - -commit df2fa059996d7a802360af4be1b903c7bd8602d2 -Merge: 55f20c51 8381444b -Author: Aboudy Kreidieh -Date: Wed Mar 27 19:00:20 2019 -0700 - - Merge pull request #485 from CYBruce/patch-3 - - minor fix - -commit 41d53eb4d72a9ebd1408740ab5969d73f8188012 -Author: AboudyKreidieh -Date: Wed Mar 27 18:51:57 2019 -0700 - - added pic of getting edge names - -commit 2e687255aa64e337a2d8df1727c29ce2153a33ba -Author: AboudyKreidieh -Date: Wed Mar 27 18:46:25 2019 -0700 - - bug fix - -commit 01dc1de13db2cf74bd37e81995d7a04a7fa19568 -Author: AboudyKreidieh -Date: Wed Mar 27 18:43:43 2019 -0700 - - tutorial for osm - - - added a tutorial on importing networks from openstreetmap - - defaulted routes to consist of the current edge only (to make running osm files easier) - - updated the tutorials README - - added test for default scenario routes - -commit 8381444b7b5aad0b8e8fc28e07e4f760538f8be7 -Author: CYBruce -Date: Wed Mar 27 14:46:04 2019 +0800 - - minor fix - - It should be 'state space' instead of 'action space' - -commit 4d0356ba39a90f9eb0b383ba5fab69ad3d609fe7 -Author: AboudyKreidieh -Date: Tue Mar 26 01:35:53 2019 -0700 - - bug fixes - -commit 8206abcc96b473d78772ecbb3120a1d9c9c789cd -Merge: 853f3a4e 55f20c51 -Author: AboudyKreidieh -Date: Tue Mar 26 00:52:36 2019 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow into remove_scenario - -commit 16fe93e2c72be3317712943f9da1f63cb06c551c -Author: AboudyKreidieh -Date: Mon Mar 25 20:56:27 2019 -0700 - - deprecated intersection_edgestarts - - This is moving towards us removing specify_edgestarts - -commit 8d80bb4f07a9cf8db3fc463ea8123346a6218ea0 -Author: AboudyKreidieh -Date: Mon Mar 25 20:36:04 2019 -0700 - - extended documentation in docstrings - - - added attributes to Env and Scenario docstrings - - added an example usage to Scenario docstring - - minor docstring fixes and typos - -commit 55f20c512c868e5982f7d2ae82fc4047503c85fa -Merge: 197e455f 3393a5d0 -Author: Aboudy Kreidieh -Date: Sun Mar 24 19:59:01 2019 -0700 - - Merge pull request #458 from flow-project/aimsun_test - - added test for aimsun struct - -commit 197e455fceb410de4888488239dbd2281e1d60fc -Merge: ed5bb99f 7fa31811 -Author: Aboudy Kreidieh -Date: Sun Mar 24 19:58:42 2019 -0700 - - Merge pull request #477 from flow-project/examples_test - - uncommented examples test - -commit ed5bb99fa35cdb51c44ef8c10da32f892a16a217 -Merge: 808e59a0 01a4559b -Author: Aboudy Kreidieh -Date: Fri Mar 22 22:07:59 2019 -0700 - - Merge pull request #480 from flow-project/mock_imports - - final missing imports (hopefully) - -commit 01a4559b0a7fb116afab89b4638bc1b7e48af5b8 -Author: AboudyKreidieh -Date: Fri Mar 22 21:34:40 2019 -0700 - - final missing imports (hopefully) - -commit 808e59a08c2b1fb9ac92847b83ae0bc8230e5173 -Merge: 20d8f534 fd58a2ce -Author: Aboudy Kreidieh -Date: Fri Mar 22 21:25:04 2019 -0700 - - Merge pull request #479 from flow-project/mock_imports - - resolved further import issues - -commit fd58a2ce761d31f3d3cba0426202e72d016cfc99 -Author: AboudyKreidieh -Date: Fri Mar 22 20:52:56 2019 -0700 - - resolved further import issues - -commit 20d8f534525a6c065611e1403b61a1b4d8a3ddb4 -Merge: b9c5c4d1 e959b706 -Author: Aboudy Kreidieh -Date: Fri Mar 22 20:39:37 2019 -0700 - - Merge pull request #478 from flow-project/mock_imports - - added mock import to readthedocs - -commit e959b706136f3c4aeddb10cac43b0d1e339fe5bc -Author: AboudyKreidieh -Date: Fri Mar 22 20:15:13 2019 -0700 - - added mock import to readthedocs - -commit ed2ecdf81eaf4542920afad7e6a0b13770c0fc81 -Author: AboudyKreidieh -Date: Fri Mar 22 19:25:25 2019 -0700 - - bug fix - -commit 7fa318110c3860ba6d7b94b510b5fb8908669dfb -Author: AboudyKreidieh -Date: Fri Mar 22 19:22:40 2019 -0700 - - uncommented examples test - -commit 2f0938da2a4ae790ae2eb759e5b593909101d083 -Author: AboudyKreidieh -Date: Fri Mar 22 19:13:54 2019 -0700 - - test for clip_actions - -commit b9c5c4d124d8c5054a0f82f5ee51e5f23abe21b8 -Merge: b9b81f85 c34ef0c0 -Author: Aboudy Kreidieh -Date: Fri Mar 22 16:07:38 2019 -0700 - - Merge pull request #466 from flow-project/ashkan-development - - Fixed Grid traffic light problem - -commit aeee15f85d853fa3cbdad53c4dd0c7c36d418574 -Author: AboudyKreidieh -Date: Fri Mar 22 16:05:08 2019 -0700 - - changes to improve training on stabilizing exp - - this includes: - - added an expection to close in the scenario kernel for casese when the files were not created or are named differently - - added a clip_rewards attribute to EnvParams to allow the action to not be clipped before it is fed into the reward function. This might be leading to flat gradients - - modified the weights on the reward function for WaveAttenuationEnv - - These methods should resolve some regression issues in training - -commit c34ef0c002b9b808672f7445d2ae936b7ba8d868 -Author: AboudyKreidieh -Date: Fri Mar 22 15:49:28 2019 -0700 - - pep8 - -commit c30973f89dda0cff7a3070a58dc10de8b12ee850 -Merge: 0bee6f6b b9b81f85 -Author: AboudyKreidieh -Date: Fri Mar 22 15:45:00 2019 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow into ashkan-development - -commit b9b81f852d3ca668e2c4f78c8b278c39a2cd2b14 -Merge: 980f4c54 d3324a34 -Author: Aboudy Kreidieh -Date: Thu Mar 21 00:02:59 2019 -0700 - - Merge pull request #274 from flow-project/base_scenario_fix - - Base scenario fix - -commit d3324a34f70813197c99e8ff5c9b83c708053d70 -Author: AboudyKreidieh -Date: Wed Mar 20 23:34:59 2019 -0700 - - pep8 - -commit e2cef4c4fd4b8755259069840f7f07c21b19c82d -Author: AboudyKreidieh -Date: Wed Mar 20 23:05:18 2019 -0700 - - tests for edges distribution dict - -commit b0de5751911be71cbdd30b7cc4014fd1e4c57949 -Author: AboudyKreidieh -Date: Wed Mar 20 22:37:36 2019 -0700 - - added missing piece - -commit 5f31be08e9bbc7901a3100980c0b681b8bc91698 -Merge: 26e8c9d1 980f4c54 -Author: AboudyKreidieh -Date: Wed Mar 20 22:36:41 2019 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow into base_scenario_fix - -commit 00fc23395aab136edb0c329988300c17f97527e4 -Merge: e3323dd5 0b631352 -Author: AboudyKreidieh -Date: Wed Mar 20 21:05:58 2019 -0700 - - Merge branch 'new_sumo' of https://github.com/flow-project/flow into new_sumo_pr - -commit b2986f702595c045251727a5dcbc4a36a3adb3ff -Author: AboudyKreidieh -Date: Wed Mar 20 19:53:40 2019 -0700 - - remove emission-to-csv - -commit f932683e177f7066d2d5d896755fbe9fa951f470 -Author: AboudyKreidieh -Date: Wed Mar 20 19:35:11 2019 -0700 - - added gen_emission option - -commit 0bee6f6b35117f2d6862764c36cb073ed5bce43e -Author: Ashkan Y -Date: Tue Mar 19 18:18:48 2019 -0700 - - Fixed data path problem in visualization - - Fixed data path problem in visualization - -commit 624ad4e3990bedf1c911a51e16bcec1bd2c9d8fe -Author: nathanlct -Date: Tue Mar 19 16:09:49 2019 -0700 - - add junctions loading in scenario - -commit ae048b47c89cfe471723230afbb791e027236dd2 -Merge: 7654fd2b 768cd7e2 -Author: nathanlct -Date: Tue Mar 19 15:54:21 2019 -0700 - - Merge branch 'load-aimsun-template' of https://github.com/nathanlct/flow into load-aimsun-template - -commit 7654fd2be0ad3fb550e565276e3ce17bd66f78ed -Author: nathanlct -Date: Tue Mar 19 15:54:06 2019 -0700 - - add junctions - -commit 768cd7e253512c5f4c90da5f35d13b367d2f55c2 -Author: Nathan Lichtlé -Date: Tue Mar 19 15:49:01 2019 -0700 - - delete load_template.py - -commit 39f3b366621bdc21352a6b568271d5f6835ffad0 -Author: nathanlct -Date: Tue Mar 19 15:48:15 2019 -0700 - - fix for travis - -commit 2fba29b90156e844d7d61a15c9ad9c37e2b5dfe2 -Author: nathanlct -Date: Tue Mar 19 15:15:10 2019 -0700 - - load template - -commit 603b7a16efcec633230eae33dc159c7f39732ee3 -Author: nathanlct -Date: Tue Mar 19 15:13:42 2019 -0700 - - fix not to call not implemented specify_routes when loading Aimsun template - -commit f09c655e2735129e5f0766d3344158fe05b96976 -Author: nathanlct -Date: Tue Mar 19 15:10:50 2019 -0700 - - fix indentation - -commit 4d99fb299b3f235d6db16d6c45db43f2f230df38 -Author: nathanlct -Date: Tue Mar 19 15:07:47 2019 -0700 - - fix indentation - -commit 5c5086a903280ab5b3286d12daef7152d9a9634c -Author: nathanlct -Date: Tue Mar 19 14:42:55 2019 -0700 - - fix for travis - -commit 7ff62bb6d121e9b5bdcd8539d9429b322377d503 -Author: Ashkan Y -Date: Tue Mar 19 13:06:25 2019 -0700 - - Fixed Grid traffic light problem - - Fixed Grid traffic light problem where the 3 traffic lights on the bottom row of the grid were not synced (3 were green at the same time in one intersection) - -commit 24d7dde085326c37d9f3aa5d11b7396662a0a9e2 -Author: nathanlct -Date: Mon Mar 18 19:25:24 2019 -0700 - - fix for travis - -commit eefdb58a1ef6bae6336e412a3ef731c17b045862 -Merge: a821c9a7 980f4c54 -Author: Ashkan Y -Date: Mon Mar 18 19:21:30 2019 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow - -commit 1117716b7a0703936f1444ea595ad3349e4c7b40 -Author: nathanlct -Date: Mon Mar 18 18:31:01 2019 -0700 - - created script to load Aimsun templates (whole network or subnetwork) - -commit 6f1cf418cc8304b7cabf437de4663855719a6bcc -Author: nathanlct -Date: Mon Mar 18 18:30:11 2019 -0700 - - replaced hard coded Aimsun params by settings in generate.py - -commit 56829fadd5915986c2ade91702bbc38170493ad8 -Author: nathanlct -Date: Mon Mar 18 18:28:10 2019 -0700 - - removed call to specify_routes when loading Aimsun template - -commit ad5b931fd6175b59f2fbf4d16a6f1c28ce79abe0 -Author: nathanlct -Date: Mon Mar 18 18:23:37 2019 -0700 - - read scenario data file written by load.py - -commit ee6083e8583c2ce636c31b7242f43819f58d4987 -Author: nathanlct -Date: Mon Mar 18 18:21:50 2019 -0700 - - write path to Aimsun's scenario in a file so it can be read by load.py - -commit f86671eeeab7c03113ab956b9a0897b8f8e098b4 -Author: nathanlct -Date: Mon Mar 18 18:20:21 2019 -0700 - - call load.py instead of generate.py when template_path is specified - -commit a6ad99b7c191fc0adf01d6f315cc750dded69b81 -Author: nathanlct -Date: Mon Mar 18 18:17:52 2019 -0700 - - add aimsun params in data.json file - -commit 87ffa6695b3a52a03e3694bdc24d354e0a57b172 -Author: nathanlct -Date: Mon Mar 18 18:16:33 2019 -0700 - - add aimsun template parameters in AimsunParams class - -commit b3dd3a1ed0741a24817dda6b48c249c77634b0a7 -Author: AboudyKreidieh -Date: Sun Mar 17 20:14:04 2019 -0700 - - added documentation to grid functions - -commit e3323dd5a73aab07f03462be6df6dd8e8c1fff9c -Author: AboudyKreidieh -Date: Sun Mar 17 19:46:46 2019 -0700 - - bug fixes - -commit 6b4e7b7a239434bdcac4c548259eb32ede39b5d1 -Author: nathanlct -Date: Wed Mar 13 14:23:16 2019 -0700 - - removed trailing spaces - -commit b7ea91d3cfa6c493e669e5469cf791b5aee3072e -Author: nathanlct -Date: Wed Mar 13 12:52:07 2019 -0700 - - added experiment and replication name in config.py - -commit 5cdcefc514f8df6aa91058ca7fb08141a9761f29 -Author: nathanlct -Date: Tue Mar 12 16:57:55 2019 -0700 - - renamed netfile into template - -commit 5459d76da784e8f02aa94ebbef8b848119b52c40 -Author: nathanlct -Date: Tue Mar 12 16:44:57 2019 -0700 - - removed unused variable - -commit fe71b92ec206e377c69da61af8e4ca12030386af -Merge: 5f738d63 edec40a0 -Author: Nathan Lichtlé -Date: Tue Mar 12 12:56:04 2019 -0700 - - Merge pull request #1 from nathanlct/flow-aimsun-api - - Flow aimsun api - -commit edec40a02e7ad1eeb851e2f929cfcb4247dc332b -Merge: 71ec8388 980f4c54 -Author: nathanlct -Date: Tue Mar 12 09:11:01 2019 -0700 - - Merge https://github.com/flow-project/flow into flow-aimsun-api - -commit ae59079679122acdc8cf318e9593d4853b5abe5c -Merge: d8d5a71c 980f4c54 -Author: AboudyKreidieh -Date: Tue Mar 12 02:43:01 2019 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow into new_sumo_pr - -commit 3393a5d02dd33d33c85ab258665bad4b2ceee5de -Merge: 0b0182e7 980f4c54 -Author: AboudyKreidieh -Date: Tue Mar 12 02:24:07 2019 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow into aimsun_test - -commit 980f4c54f327127eb3f81f8413b1c1e549101b12 -Merge: 922997e6 37769518 -Author: Aboudy Kreidieh -Date: Tue Mar 12 02:22:52 2019 -0700 - - Merge pull request #417 from MouvementMondial/master - - Bug fixed: use render args - -commit 47aed243fd7be0ffa4059f8552fa316c2c86dbda -Author: AboudyKreidieh -Date: Tue Mar 12 02:15:30 2019 -0700 - - added horizon to termination in Env - -commit 922997e64261c7f3713ae329decac381c7769d7f -Merge: fae17180 f77c2b3c -Author: Aboudy Kreidieh -Date: Tue Mar 12 01:56:10 2019 -0700 - - Merge pull request #452 from kjang96/issue_451 - - Modified SimpleGridScenario's gen_custom_start_pos function - -commit fae1718044f68577e9a5eda0322679c513adecf3 -Merge: e1add137 5f738d63 -Author: Aboudy Kreidieh -Date: Tue Mar 12 01:54:28 2019 -0700 - - Merge pull request #453 from nathanlct/master - - fixed Aimsun API for OS X - -commit e1add13741950063b1117fcf428de4cab27bfe0d -Merge: bca08479 22763bfe -Author: Aboudy Kreidieh -Date: Mon Mar 11 23:09:44 2019 -0700 - - Merge pull request #456 from flow-project/new_logo_placement - - New logo placement - -commit 22763bfebeabef464f7c8b64b8b164fa5770b19d -Author: AboudyKreidieh -Date: Mon Mar 11 19:07:36 2019 -0700 - - shrunck the logo and added logo without words - -commit 636326689df66f0d40a20f75ffa53c62a67cc558 -Author: AboudyKreidieh -Date: Mon Mar 11 19:02:18 2019 -0700 - - shrunk the image slightly - -commit 5362c7507188e67b9b7e9031c7ed322eebde23e9 -Author: AboudyKreidieh -Date: Mon Mar 11 19:01:01 2019 -0700 - - moved logo to the side - -commit bca08479acc77a17572388a3468074d5bed08116 -Merge: 1f8e770a b8922aeb -Author: Aboudy Kreidieh -Date: Mon Mar 11 18:52:20 2019 -0700 - - Merge pull request #455 from flow-project/ashkan-development - - Add Flow Logo - -commit b8922aeb5c306940a05fe90674eed7e91583f5cd -Author: Ashkan Y -Date: Mon Mar 11 15:44:38 2019 -0700 - - Revert tutorial10_inflows back - - Revert tutorial10_inflows back to what it was before the pull request - -commit a821c9a7f46c395746fd54d52881007e64ffadbf -Merge: 1f8e770a e799e2bf -Author: Ashkan Y -Date: Mon Mar 11 14:53:24 2019 -0700 - - Merge branch 'ashkan-development' - -commit e799e2bfc1df9b5c77f3c5baee5e19962c8da9a3 -Author: Ashkan Y -Date: Mon Mar 11 14:46:13 2019 -0700 - - Add Flow Logo - -commit f77c2b3c84d3bcaabd127d5af97442859ec83ef6 -Author: Kathy Jang -Date: Mon Mar 11 15:39:20 2019 -0400 - - Fixed bug in testing setup scripts for the grid - -commit 71ec838835b53814aade1f7819f0ee48f8a156ba -Author: nathanlct -Date: Mon Mar 11 11:33:05 2019 -0700 - - fixed connection to server - -commit 5f738d633104b44439b8e4f9c15f7086c0ef77ae -Author: nathanlct -Date: Sat Mar 9 12:29:20 2019 -0800 - - fixed coding style - -commit 56c13365808c59f66656470b187619ac7a25775a -Merge: df6351b9 1f8e770a -Author: nathanlct -Date: Fri Mar 8 17:34:18 2019 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow - -commit df6351b900cafa3e8dbbeda74128faa6cc56c66b -Author: nathanlct -Date: Fri Mar 8 17:26:05 2019 -0800 - - fixed Aimsun API for OS X - -commit 605228db1632d495a139d9261165eb799a300d1b -Author: Kathy Jang -Date: Fri Mar 8 19:43:03 2019 -0500 - - Modified SimpleGridScenario's gen_custom_start_pos function to provide more flexibility on how many vehicles are on each edge, and fixes bug which averages the total number of vehicles/start edges - -commit 1f8e770a2a18c2e21185d7d299bb8f42aff2b853 -Merge: 32a0ecc7 693b60e4 -Author: Aboudy Kreidieh -Date: Fri Mar 8 16:23:56 2019 -0800 - - Merge pull request #450 from flow-project/docker_0.3.0 - - Add Dockerfile for release 0.3.0 and remove outdated docker folder - -commit 693b60e41a5c6d71228678a133102ad83a7cde1e -Author: Fangyu Wu -Date: Thu Mar 7 22:28:22 2019 -0800 - - Add Dockerfile for release 0.3.0 and remove outdated docker folder. - -commit 0b0182e7de0679c5f03c65b45589227292bfa564 -Author: AboudyKreidieh -Date: Thu Mar 7 12:13:17 2019 -0800 - - added test for aimsun struct - -commit 32a0ecc79f943f191e1dc8bfbe9d26e0edcc4e41 (tag: v0.3.0) -Merge: 2397a15c fb17351f -Author: Aboudy Kreidieh -Date: Thu Mar 7 08:57:40 2019 -0800 - - Merge pull request #441 from kjang96/visualizer_fix - - Minor fixes - -commit 2397a15cb42be77b79064cd65a51c4b747ce5ef1 -Merge: f8cc6c16 533a0361 -Author: Aboudy Kreidieh -Date: Thu Mar 7 08:56:41 2019 -0800 - - Merge pull request #438 from flow-project/velocity_bottleneck_tests - - Velocity bottleneck tests - -commit fb17351f75ba3729861f6cfa8e273b49efdc7bb6 -Author: Kathy Jang -Date: Tue Mar 5 18:06:14 2019 -0500 - - 2 minor fixes: 1) Added line to restart_simulation such that the GUI can be activated, and 2) Reworded an if statement header to avoid KeyError by using the built-in get method instead of directly accessing a dictionary member - -commit f8cc6c16bd8eed13cff0914510e9194a8f8f3970 -Merge: dcf97862 c7aa4908 -Author: Aboudy Kreidieh -Date: Tue Mar 5 00:20:17 2019 -0800 - - Merge pull request #440 from flow-project/flow_exceptions - - Flow exceptions - -commit dcf978627168d9ab94f09b1f186bd795fab9d9fb -Merge: 0356f127 6dc5598f -Author: Aboudy Kreidieh -Date: Tue Mar 5 00:20:00 2019 -0800 - - Merge pull request #439 from flow-project/num_vehicles_fix - - bug fix to number of vehicles - -commit 0356f127da4294cd8731c94904fe32c1eb930e53 -Merge: 27cf0889 bfb52286 -Author: Aboudy Kreidieh -Date: Tue Mar 5 00:19:31 2019 -0800 - - Merge pull request #437 from flow-project/bottleneck_documentation - - Some cleanup to bottleneck environments - -commit 027ef96e5380ad2fcaeb82cc8b39ccb25940d6e2 -Merge: 8e0f38f3 27cf0889 -Author: AboudyKreidieh -Date: Sun Mar 3 13:42:26 2019 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into LuST_pr - -commit c7aa4908b341065d6c93e9828339ebd174faf6b7 -Merge: a2701eda 27cf0889 -Author: AboudyKreidieh -Date: Sun Mar 3 11:11:20 2019 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into flow_exceptions - -commit 6dc5598fb30d28004bbd113e2b970a21a6ccc8f8 -Author: AboudyKreidieh -Date: Sun Mar 3 11:05:11 2019 -0800 - - bug fix to number of vehicles - - It seems that vehicles are sometimes removed twice during reset. The number of vehicles in the list is not affected though, so calculating the length now instead of decrementing the values. - - resolves #387 - -commit 533a03615d230faa8ada904689a7ee7eb7aabb36 -Author: AboudyKreidieh -Date: Sun Mar 3 02:54:30 2019 -0800 - - test - -commit f375fad9d54132d69bffefe3e7bea32f4959219e -Author: AboudyKreidieh -Date: Sun Mar 3 02:52:43 2019 -0800 - - changes to the velocity controllers - - * added a test for PISaturation - * removed HandTunedController - -commit 3fc392219fcffb85d8355f1911da1361b591d9c6 -Author: AboudyKreidieh -Date: Sun Mar 3 00:28:52 2019 -0800 - - bug fix - -commit dfb7900eeb3c449d8fa1cb69a61a73f7941d955d -Author: AboudyKreidieh -Date: Sun Mar 3 00:22:45 2019 -0800 - - tests for FollowerStopper controller - -commit bfb5228692dd9b58203199c8b7e72fea8b4f96fc -Author: AboudyKreidieh -Date: Sat Mar 2 23:56:12 2019 -0800 - - Some cleanup to bottleneck environments - - * added documentation to some methods - * removed unused attributes - * added a few more unit tests - -commit 27cf0889ab4e11a08a457e57553ccd26aa5523af -Merge: 9f36d653 38cadc01 -Author: Aboudy Kreidieh -Date: Sat Mar 2 22:37:43 2019 -0800 - - Merge pull request #435 from flow-project/green_wave_bug_fix - - Green wave env bug fix - -commit 38cadc01e0b801879e99afe75f60f20c7dac9b46 -Author: AboudyKreidieh -Date: Thu Feb 28 15:09:05 2019 -0800 - - Green wave env bug fix - - resolves #422 - -commit d8d5a71c7d4906814f6887cc3ffb151469967beb -Author: AboudyKreidieh -Date: Wed Feb 27 20:21:20 2019 -0800 - - vehicles that are in the network are only unubscribed - -commit 9f36d65375de93138082dd6e8b67feae66a6789e -Merge: 639625ba ce5c8acd -Author: Aboudy Kreidieh -Date: Sun Feb 24 11:37:07 2019 -0800 - - Merge pull request #414 from flow-project/vehicle_junctions_dynamics - - modified driving behavior by our controllers - -commit 639625bae0d21bc1dcb9ba420b62f286c5e8fa95 -Merge: c437f556 e671afbe -Author: Aboudy Kreidieh -Date: Sun Feb 24 11:35:55 2019 -0800 - - Merge pull request #416 from flow-project/mock_imports - - added mock imports - -commit c437f556d7fbd3046eff02b59fbb271436618b07 -Merge: a119baf5 a5e182d7 -Author: Aboudy Kreidieh -Date: Sun Feb 24 11:35:34 2019 -0800 - - Merge pull request #420 from flow-project/bottleneck_env_fix - - Bug fixes to BottleNeckAccelEnv - -commit e84e2a42f3dbe25127363f28f4441851ff90b16b -Author: AboudyKreidieh -Date: Sat Feb 23 01:09:27 2019 -0800 - - bug fixes - -commit c65b7de89d410c15a8a5da20d030d5136bf4d0e6 -Merge: f7c05d58 a119baf5 -Author: AboudyKreidieh -Date: Sat Feb 23 00:09:14 2019 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into new_sumo_pr - -commit a119baf5e69bf7bca45dc92e6befc0e684c4aaa7 -Merge: 2b965e1a 00aea40a -Author: Aboudy Kreidieh -Date: Thu Feb 21 18:02:48 2019 -0800 - - Merge pull request #415 from flow-project/remove_cls - - Remove cls - -commit 2b965e1a9efacffc5cad12d328233ffdc3fd3c6f -Merge: 4e8c8447 9c57037c -Author: Aboudy Kreidieh -Date: Thu Feb 21 18:01:42 2019 -0800 - - Merge pull request #406 from flow-project/flow_example_readme - - modified flow examples README - -commit 4e8c8447a17b16f42e875d9c9b7d4ef235078d1d -Merge: 6117b0ca 73efb86c -Author: Aboudy Kreidieh -Date: Thu Feb 21 18:01:04 2019 -0800 - - Merge pull request #412 from flow-project/zero_division_fix - - resolves ZeroDivisionError bugs in some rewards - -commit a5e182d7843530eace60aa16c113e9455ccc12f3 -Author: AboudyKreidieh -Date: Thu Feb 21 02:22:13 2019 -0800 - - Bug fixes to BottleNeckAccelEnv - - - adding action space - - added missing class attributes - -commit 3776951824937a0c8f36670d14d8bc6b338d8fe6 -Author: MouvementMondial -Date: Tue Feb 19 12:20:41 2019 +0100 - - Bug fixed: use render args - -commit e671afbe6659a597f1c3597ab08f757f3f29e806 -Author: AboudyKreidieh -Date: Mon Feb 18 01:16:50 2019 -0800 - - added mock imports - - This should help the generation of documentation in readthedocs - -commit 00aea40a2d01c250c701e4cd4f89b3050da98066 -Author: AboudyKreidieh -Date: Sun Feb 17 11:12:24 2019 -0800 - - bug fix - -commit 27d568c5cf6c5b011d075ea8113288a852170b32 -Author: AboudyKreidieh -Date: Sun Feb 17 11:02:22 2019 -0800 - - removed final instance of cls.network - -commit f1ff49b575cef3c8d083a04a076c404ee2e78245 -Merge: 99ecce13 6117b0ca -Author: AboudyKreidieh -Date: Sun Feb 17 10:53:03 2019 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into remove_cls - -commit ce5c8acdedef47d0bc7cd51c335c6780f0c54f1a -Author: AboudyKreidieh -Date: Sun Feb 17 10:48:08 2019 -0800 - - modified driving behavior by our controllers - - at junctions, the car following behavior is dictated by the simulator instead of us - - if a car just enters, in new sumo it may not be subscribed. Added a fix to support new sumo in the near future - -commit 6117b0cae8c43b00cfac36efcf1bb4f5b0f0c795 -Merge: 81099ebf 4afe2f6b -Author: Aboudy Kreidieh -Date: Sun Feb 17 02:54:25 2019 -0800 - - Merge pull request #409 from flow-project/green_wave_examples - - Green wave examples - -commit 4afe2f6b90fb27d47e34a230ff5a1352d639a8a2 -Author: AboudyKreidieh -Date: Sat Feb 16 23:30:41 2019 -0800 - - bug fix - -commit edfcbd1910cacf6ae459a03fae5b400f8fc4888e -Merge: bcf3b881 81099ebf -Author: AboudyKreidieh -Date: Sat Feb 16 23:02:41 2019 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into green_wave_examples - -commit 73efb86cee15812458c894c4f9d289d28c6ebaa1 -Author: AboudyKreidieh -Date: Sat Feb 16 14:17:18 2019 -0800 - - resolves ZeroDivisionError bugs in some rewards - -commit bcf3b881eca9f0dc11dad7f625a327cf7d8289fe -Author: AboudyKreidieh -Date: Thu Feb 7 23:26:42 2019 -0800 - - reverted some changes - -commit c445724398ff20310c8c6c392b0bf188e0be95b2 -Author: Yasharzf -Date: Wed Feb 6 17:04:58 2019 -0800 - - added Arizona example - -commit 81099ebf4b7c8e60e1624b9c984e2a52b663aef7 -Merge: f626cc5f b4448cbe -Author: Aboudy Kreidieh -Date: Wed Feb 6 11:18:03 2019 -0800 - - Merge pull request #408 from flow-project/rllib_tutorial_fix - - modified tutorial 3 to be compatible with ray 0.6.1 - -commit 5d6fd4700485d029b6e6b637aa1291c506264b88 -Author: AboudyKreidieh -Date: Tue Feb 5 15:23:15 2019 -0800 - - more transparency to usage to green wave examples - -commit b4448cbe73a25da1e36809d7705becaae892e3ae -Author: AboudyKreidieh -Date: Tue Feb 5 15:01:50 2019 -0800 - - modified tutorial 3 to be compatible with ray 0.6.1 - -commit f626cc5f030247471cd9ecdd32b6686c76d8ac3a -Merge: 02ff9633 53c2d550 -Author: Aboudy Kreidieh -Date: Tue Feb 5 14:27:00 2019 -0800 - - Merge pull request #407 from flow-project/docs_fix - - added numpydoc to requirements.txt - -commit 53c2d5506d23714b469a1c9d08ef846e71151e63 -Author: AboudyKreidieh -Date: Tue Feb 5 13:30:40 2019 -0800 - - added numpydoc to requirements.txt - - This is meant to resolve an issue causing the readthedocs documentation to fail - -commit 02ff96331283aeb4a0f1c6de15dbba638a4501b3 -Merge: be752ab5 5c21ef08 -Author: Aboudy Kreidieh -Date: Tue Feb 5 11:03:24 2019 -0800 - - Merge pull request #398 from flow-project/numpydoc - - Numpydoc - - resolves #381 - - added missing documentation to the readthedocs autogenerator - - moved param specifications from init to the class definition so that it is visible in readthedocs - - modifications to the documentation to make it compliant with numpydoc - -commit 5c21ef08f18983036fd56088e08255f0aeb4865e -Merge: f7340602 be752ab5 -Author: AboudyKreidieh -Date: Tue Feb 5 10:39:07 2019 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into numpydoc - -commit 9c57037cba4daeb0639b0c151408c34eb1804272 -Author: AboudyKreidieh -Date: Tue Feb 5 00:24:24 2019 -0800 - - modified flow examples README - -commit be752ab58ec07c98c9033a2de9c6d4cca2b14677 -Merge: 534850bb 374b6a77 -Author: Aboudy Kreidieh -Date: Tue Feb 5 00:18:28 2019 -0800 - - Merge pull request #405 from flow-project/gifs - - resized gifs - -commit 374b6a77d4e41a269e6b5889d930508eecd00c0d -Author: AboudyKreidieh -Date: Tue Feb 5 00:17:29 2019 -0800 - - resized gifs - -commit 534850bb87ee7ad67d6712517f8af0279b384353 -Merge: 3de47154 ccc3a4ed -Author: Aboudy Kreidieh -Date: Mon Feb 4 23:45:53 2019 -0800 - - Merge pull request #404 from flow-project/gifs - - added gifs - -commit ccc3a4edc78b66a7e5777da3dc69965b4d0c3514 -Author: AboudyKreidieh -Date: Mon Feb 4 23:13:53 2019 -0800 - - added gifs - -commit 3de47154f11e268fe46f671bd974ef652cde880b -Merge: 7b5a8818 aa2c1f48 -Author: Aboudy Kreidieh -Date: Mon Feb 4 21:15:45 2019 -0800 - - Merge pull request #396 from flow-project/obey_no_collide - - rename "no_collide" -> "obey_safe_speed" and then move "no_collide" = 7 - -commit 7b5a8818e0b52766f8c8b01bb6f200c07a8e2f9d -Merge: 5b772e7a f6a77288 -Author: Aboudy Kreidieh -Date: Mon Feb 4 20:24:38 2019 -0800 - - Merge pull request #300 from flow-project/remove_clipping - - Remove clip_action from ray run scripts - - Ray's clip_actions is currently buggy for continuous spaces, we temporarily set it to False since we clip on our own end. - - Adds Ray 0.6.1 to the environment.yml - - Upgrades test_visuallizers to ray 0.6.1 - -commit f6a772885b04a988f5b0601ed93b2ac8f0a171e1 -Author: AboudyKreidieh -Date: Mon Feb 4 20:04:12 2019 -0800 - - bug fix - -commit c04e4896b14be5b422fdefe214b05cef0712cb3e -Merge: 02c16173 5b772e7a -Author: AboudyKreidieh -Date: Mon Feb 4 19:18:16 2019 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into remove_clipping - -commit 853f3a4e792e838faa67f00227aae5669f1931a0 -Author: AboudyKreidieh -Date: Mon Feb 4 14:47:15 2019 -0800 - - partial fix to aimsun kernel - -commit 93edbe5b4f19e76f5db2f07917383f648f4ff011 -Author: AboudyKreidieh -Date: Mon Feb 4 14:41:53 2019 -0800 - - bug fix - -commit d19cd53b06072b2be03985ca618b21785e859e93 -Author: AboudyKreidieh -Date: Mon Feb 4 14:00:12 2019 -0800 - - moved initial_speed and type from VehicleParams and to the Vehicles kernel - -commit a2701eda6b826d5008017fa2dbb050e0821e9e6d -Author: AboudyKreidieh -Date: Mon Feb 4 13:34:24 2019 -0800 - - replaced instances of ValueError with FatalFlowError - -commit 1fafa65abe9302456575ae6071210a903145e459 -Merge: b98f53f3 5b772e7a -Author: AboudyKreidieh -Date: Fri Feb 1 01:01:52 2019 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into remove_scenario - -commit 5b772e7af59d575ab11440c388cc557a66ea7e6f -Merge: 1b6dd514 8ffc0c63 -Author: Aboudy Kreidieh -Date: Fri Feb 1 00:57:02 2019 -0800 - - Merge pull request #391 from flow-project/veq_fix - - Veq fix - -commit f73406027a640fec1c792a0f27bdaa70b7df18e1 -Merge: 21c0354c 1b6dd514 -Author: AboudyKreidieh -Date: Thu Jan 31 22:24:27 2019 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into numpydoc - -commit 8ffc0c63071582c658d3665cc27df69f0ad0b340 -Merge: a15a7b0d 1b6dd514 -Author: AboudyKreidieh -Date: Thu Jan 31 22:22:01 2019 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into veq_fix - -commit aa2c1f48d0609b9b01d74be9de52081bab46399d -Author: AboudyKreidieh -Date: Thu Jan 31 22:16:56 2019 -0800 - - rename "no_collide" -> "obey_safe_speed" and then move "no_collide" = 7 - -commit 1b6dd514b22e98e2ca93a8c66d4862e64a57330f -Merge: 1067b8c6 d577ff64 -Author: Aboudy Kreidieh -Date: Thu Jan 31 22:05:13 2019 -0800 - - Merge pull request #393 from flow-project/converage_cleanup - - extended unit test coverage - -commit d577ff645a700e6f615e6b5272ac12f17866f4bb -Author: AboudyKreidieh -Date: Thu Jan 31 21:44:01 2019 -0800 - - pep8 - -commit a15a7b0dcfe27fc9e9a615f3c679ad9b85cf89aa -Merge: 600b9462 1067b8c6 -Author: AboudyKreidieh -Date: Thu Jan 31 21:34:06 2019 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into veq_fix - -commit 86f814824ee6e8dfd72e9c18f323992255a29a73 -Author: AboudyKreidieh -Date: Thu Jan 31 21:29:43 2019 -0800 - - bug fix - -commit 21c0354cda16cbad9b004523c75c2f532ca9ac69 -Author: AboudyKreidieh -Date: Thu Jan 31 21:25:38 2019 -0800 - - pep8 - -commit e9a0ed2ec4d313cbb77e3ca25ebbcc9f3847d13a -Author: AboudyKreidieh -Date: Thu Jan 31 21:21:25 2019 -0800 - - modified documentation - -commit 61ff5209f6791125d6e9ea5fb7a44e0f8b8f9103 -Author: Aboudy -Date: Wed Jan 30 15:08:39 2019 -0800 - - numpydoc changes - -commit f7c05d58cfbf7bb3e24bef1890079e7bd09810e6 -Author: AboudyKreidieh -Date: Mon Jan 28 22:15:10 2019 -0800 - - pep8 - -commit 0b767751d22bd87d73399e49771bbc84803849b8 -Author: AboudyKreidieh -Date: Mon Jan 28 22:08:21 2019 -0800 - - minor fixes - -commit 6883cbf61cdf0e213d27658f8c5f210c1d6227b5 -Merge: 6d7fd072 1067b8c6 -Author: AboudyKreidieh -Date: Mon Jan 28 22:03:16 2019 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into new_sumo_pr - -commit b98f53f3afe2064cf6b0167e1eccdda8d13611e2 -Author: AboudyKreidieh -Date: Mon Jan 28 20:57:20 2019 -0800 - - removed some instances of self.scenario - -commit 1067b8c690c42d4326bb960ec67e2483535b35e1 -Merge: 4d0106a9 e896da53 -Author: Aboudy Kreidieh -Date: Mon Jan 28 20:44:36 2019 -0800 - - Merge pull request #251 from flow-project/tests_examples_extended - - Tests examples extended - -commit 99ecce138286e2bbbc3b6fbd6ef8a3755f91738d -Merge: 58b6d23d 4d0106a9 -Author: AboudyKreidieh -Date: Mon Jan 28 20:05:01 2019 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into remove_cls - -commit 4d0106a99d9b69e92e7b2e8fc9c56b6668094b37 -Merge: b4eafc29 2c179241 -Author: Aboudy Kreidieh -Date: Thu Jan 24 15:27:58 2019 -0800 - - Merge pull request #392 from flow-project/docstring_fix - - modifications to support autodoc in readthedocs - -commit edd09b17aba129d3b48a8a1fa3f748731bcef6e8 -Author: AboudyKreidieh -Date: Wed Jan 23 00:05:47 2019 -0800 - - pep8 - -commit 4b9034e1adc045d0b5e0db6a33e70157198fcbf9 -Author: AboudyKreidieh -Date: Tue Jan 22 23:15:24 2019 -0800 - - extended unit test coverage - - - removed FutureDeprecationWarning messages from params that have been changed over a significantly large enough period of time - - added a test to the reset of wave_attenuation that was introduced during the Aimsun changes - -commit 600b94620e48214a97b048b4118ef38adaff46c5 -Author: AboudyKreidieh -Date: Tue Jan 22 22:22:43 2019 -0800 - - minor bug fix - -commit 2c17924191b1ef3272c9906b20806ba61a7ca1ba -Author: AboudyKreidieh -Date: Tue Jan 22 22:18:29 2019 -0800 - - modifications to support autodoc in readthedocs - -commit 2181770686e53cb8f7c02dec553e00a89cbafe08 -Author: AboudyKreidieh -Date: Tue Jan 22 21:26:04 2019 -0800 - - bug fix - -commit 86f06aad880b2d8d8f8fd352c4f55e112a597bce -Merge: d5cdd358 b4eafc29 -Author: AboudyKreidieh -Date: Tue Jan 22 20:54:06 2019 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into veq_fix - -commit d5cdd358737e045000beae53562be2ec9e13465d -Author: AboudyKreidieh -Date: Tue Jan 22 20:53:49 2019 -0800 - - resolved issue where v_eq was not being calculated correctly - -commit b4eafc2986d0da3581cfff1be5fc2ecf402f6136 -Merge: 422992ac c99c8321 -Author: Aboudy Kreidieh -Date: Tue Jan 22 20:31:59 2019 -0800 - - Merge pull request #390 from flow-project/tutorial_fix - - fixed tutorial 3 - -commit c99c832149439a2d534d044a5ce256e01c11a184 -Author: AboudyKreidieh -Date: Mon Jan 21 15:00:17 2019 -0800 - - fixed tutorial 3 - -commit 422992ac36b35804f332bfaf233dd32b64a0b848 -Merge: ab7ee798 c1a2bb4d -Author: Aboudy Kreidieh -Date: Mon Jan 21 14:43:32 2019 -0800 - - Merge pull request #287 from flow-project/visualize_benchmarks - - Visualize benchmarks - -commit c1a2bb4d2754fb79ad6e5efb5d9d1cb9c3b6933b -Merge: 7fef0222 ab7ee798 -Author: AboudyKreidieh -Date: Mon Jan 21 14:16:53 2019 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into visualize_benchmarks - -commit e896da53068e60735ef476a6c45aa51d5f2fcd6b -Merge: f0913ec5 ab7ee798 -Author: AboudyKreidieh -Date: Mon Jan 21 13:53:58 2019 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into tests_examples_extended - -commit ab7ee7986572fbd0d83f2683777d1b397df6b30b -Merge: be06f6f1 da40d608 -Author: Aboudy Kreidieh -Date: Wed Jan 16 13:40:57 2019 -0800 - - Merge pull request #388 from flow-project/eugenevinitsky-patch-1 - - fix for sims_per_step > 1 - -commit da40d608712565b0ae65ee980bbeb11f3cd8ffe2 -Author: Eugene Vinitsky -Date: Wed Jan 16 12:52:15 2019 -0700 - - fix for sims_per_step > 1 - - If sims_per_step > 1 then it's possible that a vehicle has left the system when you try and apply the action to it a second time. Hence, you have to check that the vehicle is actually in the system before you apply the action. - -commit be06f6f18311dcd154a45aaaedd047b1acba09ac -Merge: 9f60f957 142e1aec -Author: Kathy Jang -Date: Tue Jan 15 20:21:15 2019 -0500 - - Merge pull request #386 from kjang96/tl_fix - - TL phase fix - -commit 9f60f957cd7be8f9c17c99b4c90d764e5898e989 -Author: Eugene Vinitsky -Date: Tue Jan 15 17:06:57 2019 -0700 - - refactor(MultiAgentEnv): MultiAgentEnv was lagging some upgrades in base_env for the kernel refactor. It was also not pythonic in its for loops and slower as a consequence (#384) - -commit 142e1aec194303dd7573411987048c29dfbe3419 -Author: Kathy Jang -Date: Tue Jan 15 12:58:01 2019 -0500 - - Fixed traffic light phases not being set correctly. Four a 2-way intersection with 4 roads converging at one interesection, instead of having phase strings of length 4*3=12 as it was before, they should be length 4 - -commit d0311dde958dae8441b4dec16e74d54eca8743d7 -Merge: bb778f52 baf65d3c -Author: Aboudy Kreidieh -Date: Mon Jan 14 00:09:38 2019 -0800 - - Merge pull request #380 from flow-project/aimsun_examples_tutorials - - Aimsun examples tutorials - -commit baf65d3ccba86334befd5dcc787200a7e18d88c0 -Author: AboudyKreidieh -Date: Sun Jan 13 20:55:13 2019 -0800 - - PR fixes - -commit d136cc01e9d4b392d1d5bf2bcb4b7950440cb90a -Author: AboudyKreidieh -Date: Sat Jan 12 12:42:46 2019 -0800 - - pep8 - -commit c0ddf8aa0644b055dd9d3763b933abc48c20be36 -Author: AboudyKreidieh -Date: Sat Jan 12 12:35:58 2019 -0800 - - added restart_instance support - -commit 9bb272abf90665768d43445a419d7eb12212a947 -Author: AboudyKreidieh -Date: Sat Jan 12 02:19:04 2019 -0800 - - updated README to match new changes - -commit 2dea66bf8c94ae5e7aad1ab54415f6508d33f14b -Author: AboudyKreidieh -Date: Sat Jan 12 02:13:03 2019 -0800 - - added image - -commit 141c0c0a32351cc861f81f72e3bd0aad2a8e20a4 -Author: AboudyKreidieh -Date: Sat Jan 12 02:11:47 2019 -0800 - - updated aimsun setup instructions - -commit 07719140526d6c83963ec77ff77ff7b8d3eea8a0 -Author: AboudyKreidieh -Date: Sat Jan 12 01:51:47 2019 -0800 - - added aimsun examples and tutorials - -commit bb778f5233364ccac69194b12d66e66efe3dbd25 -Merge: 4032478b 75d16cb7 -Author: Aboudy Kreidieh -Date: Sat Jan 12 01:38:01 2019 -0800 - - Merge pull request #379 from flow-project/aimsun_kernel - - Aimsun kernel - -commit 75d16cb7a75efccb982f6aeabcfc63796b7a614b -Author: AboudyKreidieh -Date: Fri Jan 11 23:51:01 2019 -0800 - - ignoring aimsun in coverage - -commit 69a50aded8530e941bc6b22576f92700378601f3 -Author: AboudyKreidieh -Date: Fri Jan 11 23:32:21 2019 -0800 - - ignoring aimsun in coverage - -commit 73a526de48848d8732cd490d20deebba60ea4f8c -Author: AboudyKreidieh -Date: Fri Jan 11 23:10:58 2019 -0800 - - bug fixes - -commit 89c7331342f409103ac91c98b2f7d209d666a5a3 -Author: AboudyKreidieh -Date: Fri Jan 11 22:18:15 2019 -0800 - - bug fixes and features - -commit e98f8847c84f83f312421506b9d4f9524c4422cc -Author: AboudyKreidieh -Date: Fri Jan 11 20:27:29 2019 -0800 - - add aimsun RL example - -commit e653e79c4ac5af56a742fc2b3946e70013ed11c2 -Merge: 855fc356 9ae1b128 -Author: AboudyKreidieh -Date: Fri Jan 11 20:27:08 2019 -0800 - - Merge branch 'aimsun_kernel' of https://github.com/flow-project/flow into aimsun_kernel - -commit 855fc356f6948ef56639c983daa9a732dd922386 -Author: AboudyKreidieh -Date: Fri Jan 11 20:27:02 2019 -0800 - - bug fixes - -commit 9ae1b128c5e067b050fd7f824035e380daa2414f -Merge: 721232c0 b3236dec -Author: Yasharzf -Date: Fri Jan 11 20:17:09 2019 -0800 - - Merge branch 'aimsun_kernel' of https://github.com/flow-project/flow into aimsun_kernel - -commit 721232c090c316b5cdf4bb9b12291b4c3608a705 -Author: Yasharzf -Date: Fri Jan 11 20:16:12 2019 -0800 - - added traffic light api - -commit b3236dece1b62c961993b05179caec1f7181521e -Author: AboudyKreidieh -Date: Fri Jan 11 19:47:07 2019 -0800 - - pep8 - -commit 754288aecd03a7b36dbc883f27a8b68d809c2f76 -Author: AboudyKreidieh -Date: Fri Jan 11 19:40:30 2019 -0800 - - compatibility changes - -commit 50896c2bc2b9b4b87939e96f23738938b43854e8 -Author: AboudyKreidieh -Date: Fri Jan 11 17:58:55 2019 -0800 - - cleanup - -commit dd6b3de883308b710dea5e0a27fe1f7edf42eaa1 -Author: AboudyKreidieh -Date: Fri Jan 11 17:27:36 2019 -0800 - - removed un-needed files - -commit 66dad9bf3a2b00f62884e90c17651330a8fef893 -Merge: bf656ad6 c3ab6775 -Author: AboudyKreidieh -Date: Fri Jan 11 17:22:36 2019 -0800 - - Merge branch 'aimsun_kernel' of https://github.com/flow-project/flow into aimsun_kernel - -commit bf656ad6c4e3cb3dadc55927bba4a48aa1046176 -Author: AboudyKreidieh -Date: Fri Jan 11 17:21:19 2019 -0800 - - minor bug fixes - -commit c3ab67753f9d48c3cc5cfbd74715fd1871fd82df -Author: Yasharzf -Date: Thu Jan 10 18:42:54 2019 -0800 - - modified traffic lights - -commit 88ccfa256e65c5ce5a98755d06dd6e2e98a25a9c -Merge: 66ab99c1 54249aec -Author: Yasharzf -Date: Thu Jan 10 16:19:34 2019 -0800 - - minor - -commit 66ab99c186ff99d21cd6137b1feae381a2260601 -Author: Yasharzf -Date: Thu Jan 10 16:13:04 2019 -0800 - - minor - -commit 292bf5111d79f19a1ceafc67fb17add1df69702a -Author: Yasharzf -Date: Thu Jan 10 16:11:50 2019 -0800 - - added sim step, modified grid connections - -commit 54249aeca92d1ac987da6c5818a3a7af22d68ba8 -Merge: cdb3c220 4032478b -Author: AboudyKreidieh -Date: Thu Jan 10 02:50:08 2019 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into aimsun_kernel - -commit 4032478ba81eabec48a921c91ef6ad051471428b -Merge: fb1936ce 3dfa9168 -Author: Aboudy Kreidieh -Date: Thu Jan 10 02:44:25 2019 -0800 - - Merge pull request #376 from flow-project/coverage_cleanup - - Coverage cleanup - - removed features that are unused and conflict in some way with Aimsun - - some cleanup to the Loop merge environment - - created a `FatalFlowError` exception that mimics sumo's `FatalTraCIError` - - added test to ensure that when not enough vehicles emerge in the network an error is raised - -commit 3dfa916898f3394cce427d5f9baceb5637cdbef0 -Merge: 87ecd4ee fb1936ce -Author: AboudyKreidieh -Date: Thu Jan 10 02:19:19 2019 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into coverage_cleanup - -commit fb1936ce6c02de4d80b682c5f9b04d517b550d02 -Merge: ce532bc1 f0a228df -Author: Aboudy Kreidieh -Date: Thu Jan 10 02:16:08 2019 -0800 - - Merge pull request #375 from flow-project/kernel_vehicle - - Kernel vehicle - - moved relevant components of the vehicles class to the vehicle kernel - - moved `apply_acceleration`, `apply_lane_change`, `get_x_by_id`, `choose_routes`, and `update_vehicle_colors` from the base environment class to the vehicles kernel - - removed all `traci_connection` calls (some hacks still need to be fixed though, but should not break anything) - - added methods to set/get max speed and color (in order to remove some traci calls) - - replaced `self.vehicles` -> `self.k.vehicle` - -commit 87ecd4eecc8ef630d32b18a937f09ca1a9f7ce9f -Author: AboudyKreidieh -Date: Thu Jan 10 02:00:18 2019 -0800 - - moved error to exceptions - -commit f0a228df5cc874145f3cd77fa68da67f5de77cc9 -Author: AboudyKreidieh -Date: Thu Jan 10 01:56:47 2019 -0800 - - PR fix - -commit 32484965453b43c44b1d9a0a1e9757b8f0be8e5d -Merge: 340efd6a ce532bc1 -Author: AboudyKreidieh -Date: Wed Jan 9 17:31:54 2019 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into kernel_vehicle - -commit cdb3c220e5beb4c0ec874c3cab5533c5a8da7c84 -Author: AboudyKreidieh -Date: Wed Jan 9 17:30:16 2019 -0800 - - minor - -commit 3f5718f8e40fa7207c7b547f3875f0076813e2b4 -Author: AboudyKreidieh -Date: Wed Jan 9 16:43:27 2019 -0800 - - major modifications - -commit ce532bc1da4bf6a035f71652202521a02ddeaf9a -Merge: 66e802c3 43c7afa3 -Author: Aboudy Kreidieh -Date: Wed Jan 9 15:00:27 2019 -0800 - - Merge pull request #377 from flow-project/cleanup_rllab_visualizer - - removed plotting from visualizer_rllab - -commit 66e802c30319b89b0cf071ba76f24892834a5e71 -Merge: 2ba4713b d933bed6 -Author: Aboudy Kreidieh -Date: Wed Jan 9 14:59:42 2019 -0800 - - Merge pull request #378 from flow-project/less_edges_fig8 - - added connection mod, radius, and modified fig8 edges - - changes: - - merged the six quarter rings for the figure eight into two 3/4 rings. Was having some issues with AImsun's headway, and this was the quickest fix - - added a "radius" term to many of the nodes. This is to make the scenarios compatible with both sumo and Aimsun - - converted connections into a dictionary, with sumo unfolding it back into a list. This, again, is to make it compatible with Aimsun. - - Note: - - since junctions and connections are becoming for involved, I will be created a tutorial on this in a near future PR - -commit 2ba4713b082a15a15a9c8b1d70b8da53a180428e -Merge: 395cba63 22d5f2bb -Author: Fangyu Wu -Date: Wed Jan 9 10:44:10 2019 -0800 - - Merge pull request #372 from flow-project/visualizer_rllib_patch - - Patch visualizer_rllib for ray 0.6.1. - -commit 8ce489f3879bf8a5cb5fb499253921c749f0487b -Merge: ebac4751 340efd6a -Author: AboudyKreidieh -Date: Wed Jan 9 00:09:53 2019 -0800 - - Merge branch 'kernel_vehicle' into aimsun_kernel - -commit 340efd6a316ee661c2005f7365cb0a069d8c071a -Author: AboudyKreidieh -Date: Wed Jan 9 00:09:15 2019 -0800 - - modified tutorials - -commit d933bed6fdec98a3a9156b6b4a83d7ba603138a0 -Author: AboudyKreidieh -Date: Tue Jan 8 23:41:15 2019 -0800 - - bug fix - -commit 3f8a7f474e388654981a5f3c305c09d04dfce134 -Author: AboudyKreidieh -Date: Tue Jan 8 23:19:47 2019 -0800 - - added connection mod, radius, and modified fig8 edges - -commit 43c7afa33256e17b55cb95bc0b3f7e312e56adfb -Author: AboudyKreidieh -Date: Tue Jan 8 21:34:14 2019 -0800 - - removed plotting from visualizer_rllab - -commit ebac4751478d70e942b8901b0a9355938c1bcf83 -Merge: 7ece5b82 2360dc65 -Author: AboudyKreidieh -Date: Tue Jan 8 21:20:27 2019 -0800 - - Merge branch 'coverage_cleanup' into aimsun_kernel - -commit 7ece5b8269676307c07f2c43d0dee14a8598825e -Merge: d6227c11 397c7bf9 -Author: AboudyKreidieh -Date: Tue Jan 8 21:15:14 2019 -0800 - - Merge branch 'kernel_vehicle' into aimsun_kernel - -commit d6227c11367262c61bb8f26541f1ffa255e9d2f1 -Author: AboudyKreidieh -Date: Tue Jan 8 21:15:07 2019 -0800 - - pep8 - -commit de5f3c55fefe93775b7044dfb5f3d2a307855db3 -Author: Yasharzf -Date: Tue Jan 8 17:40:55 2019 -0800 - - added osm, fixed bugs - -commit 5c0ad91ac3f997f6715d776b46296c70460469fc -Author: AboudyKreidieh -Date: Tue Jan 8 14:19:11 2019 -0800 - - bug fix - -commit 6e2c1f7c86d76554872d290f6e8f71650fadaec5 -Author: AboudyKreidieh -Date: Tue Jan 8 13:38:40 2019 -0800 - - changes to support visualization - -commit ed5f6f5e0fa4d2a55178c2a99fc87eeacd16f29c -Merge: 18076500 68f97932 -Author: AboudyKreidieh -Date: Mon Jan 7 21:26:37 2019 -0800 - - Merge branch 'aimsun_kernel' of https://github.com/flow-project/flow into aimsun_kernel - -commit 18076500fd5e6dc492b2f05cf1cb3f85638e29ab -Author: AboudyKreidieh -Date: Mon Jan 7 21:01:04 2019 -0800 - - minor - -commit 68f979326434a290036da3a005277b6741c68ddd -Author: Yasharzf -Date: Mon Jan 7 20:45:49 2019 -0800 - - fixed bugs - -commit 395cba6303d86ebdac8d7420af2b05a14e70ee3c -Merge: a03abdbc 121b8713 -Author: Aboudy Kreidieh -Date: Mon Jan 7 18:52:45 2019 -0800 - - Merge pull request #373 from flow-project/minor_fix2 - - added missing figure - -commit 3246475f1f899588a125389ecf8f70ac344a6a0b -Merge: 6cb4c90a ecc9b88c -Author: Yasharzf -Date: Mon Jan 7 15:26:32 2019 -0800 - - Merge branch 'aimsun_kernel' of https://github.com/flow-project/flow into aimsun_kernel - -commit 6cb4c90a766064756d495c99e82a05a2002c4d9b -Author: Yasharzf -Date: Mon Jan 7 15:26:15 2019 -0800 - - changed speed - -commit 22d5f2bb5e5ba1c6ed28871e14d72c66c1a242bc -Author: Fangyu Wu -Date: Sun Jan 6 23:50:08 2019 -0800 - - Fix pep8. - -commit 397c7bf9b536583baa8e82140763c9d23de7a154 -Author: AboudyKreidieh -Date: Sun Jan 6 23:36:54 2019 -0800 - - undo - -commit 02c1617331b6ff554d08e29d3f7efba3b7eb45a5 -Merge: 860fb90e a03abdbc -Author: Eugene Vinitsky -Date: Mon Jan 7 02:14:54 2019 -0500 - - Merge branch 'master' into remove_clipping - -commit 121b8713ade389e1e48251f794710bf7ec07fde0 -Author: eugenevinitsky -Date: Mon Jan 7 02:13:17 2019 -0500 - - added missing figure - -commit 458fc6e27566b374214e2717bfecb004a4410731 -Author: Fangyu Wu -Date: Sun Jan 6 23:12:53 2019 -0800 - - Fix a typo. - -commit a03abdbc8b31b8ab6046251d1a691ab18b236e74 -Author: Eugene Vinitsky -Date: Mon Jan 7 02:04:23 2019 -0500 - - Upgrade autoscaler script to simplify change process (#371) - - * started changing the autoscaler file - - * set up that copies local ray - - * minor removal of comments - - * changed branch name that is pulled by default - - * Update environment.yml - - Co-Authored-By: eugenevinitsky - -commit 860fb90ea7859923ddf40b032609e5595f8df540 -Merge: 0b852e36 5ea53d2e -Author: Eugene Vinitsky -Date: Mon Jan 7 01:59:51 2019 -0500 - - Merge branch 'master' into remove_clipping - -commit c6ee106e2e86340a59b3fb713977eb145fd96b8c -Author: Fangyu Wu -Date: Sun Jan 6 22:28:17 2019 -0800 - - Patch visualizer_rllib for ray 0.6.1. - -commit 93cbcb8014f25698d30036a7b2b82a2f193b9a59 -Author: AboudyKreidieh -Date: Sun Jan 6 03:50:34 2019 -0800 - - added pass to coverage ignore - -commit 2360dc653246de2e23237dfaaa92318aaadf47d3 -Author: AboudyKreidieh -Date: Sun Jan 6 00:58:35 2019 -0800 - - cleaned up some features in params - -commit e1584acf7c7dfc053678e08e13db312a790a4097 -Author: AboudyKreidieh -Date: Sun Jan 6 00:36:01 2019 -0800 - - extended tests to base scenario kernel: - -commit a2dadc8371a3a8359f40af2ff42e5dc5e2e68952 -Author: AboudyKreidieh -Date: Sat Jan 5 23:50:15 2019 -0800 - - minor fixes to improve unit test coverage - -commit 7df71c170df9f15342c31c7fe8158d47cbeafa40 -Author: AboudyKreidieh -Date: Sat Jan 5 23:13:16 2019 -0800 - - some speedups - -commit ecc9b88c4a45844b6d4e8c972e7b7e54e4a023a5 -Merge: 9da01ca4 cb9ff3fb -Author: AboudyKreidieh -Date: Sat Jan 5 15:49:29 2019 -0800 - - Merge branch 'aimsun_kernel' of https://github.com/flow-project/flow into aimsun_kernel - -commit 9da01ca451f7c167fe19e489fd3d5538a8c5e189 -Merge: b9ce08e1 ad908b53 -Author: AboudyKreidieh -Date: Sat Jan 5 15:48:51 2019 -0800 - - Merge branch 'kernel_vehicle' into aimsun_kernel - -commit ad908b536661cdc780c6d4cb1521fef5a12688d7 -Author: AboudyKreidieh -Date: Sat Jan 5 15:46:27 2019 -0800 - - cleanup - -commit a8c8fb07c96f8e4174fa373c6c22525ee9fd5481 -Author: AboudyKreidieh -Date: Sat Jan 5 15:14:09 2019 -0800 - - minor - -commit 9dae176924fff06fda7629d0fd484750e443785a -Author: AboudyKreidieh -Date: Sat Jan 5 15:01:33 2019 -0800 - - bug fixes - -commit d0d29455361864de1670506d3c8fa8f2a3ead3c7 -Merge: a9f61b22 5ea53d2e -Author: AboudyKreidieh -Date: Fri Jan 4 23:42:12 2019 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into kernel_vehicle - -commit 5ea53d2e48586cd59444656dd7dee21dcd4b20ee -Merge: 4a336977 718170e7 -Author: Aboudy Kreidieh -Date: Fri Jan 4 23:40:17 2019 -0800 - - Merge pull request #367 from flow-project/remove_abs_position - - Remove abs position - - removed `get_absolute_position` from the vehicles class and moved it to the environments that actually use it. This variable is essentially broken in environments that don't have a single path, so better not to treat it as a variable for every environment - - removed sorting, and left it in the environments that originally used it (i.e. the CoRL 2017 environments) - -commit 718170e729c08b7c651a8f49a0416f34df60e63c -Author: AboudyKreidieh -Date: Fri Jan 4 19:31:08 2019 -0800 - - bug fix - -commit c6f36b9d51138b89ebcaac2d3dc3d131190aa427 -Merge: e938724c 4a336977 -Author: AboudyKreidieh -Date: Fri Jan 4 19:13:27 2019 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into remove_abs_position - -commit b9ce08e14a93b4d290b9dfcbce74b27b6b9d8ec3 -Author: AboudyKreidieh -Date: Fri Jan 4 19:07:55 2019 -0800 - - speedups - -commit 4a33697730efdb3de08c6862f8725a1cc6548eb2 -Author: Eugene Vinitsky -Date: Fri Jan 4 20:45:48 2019 -0500 - - Example docs (#368) - - * files for capacity diagram generation - - * pep8 - - * bug fix to incorrectly named method in bottleneck_exps - - * pep8 - - * pep8 - - * pep8 - - * added example docs - - * bug fix - - * more misnamed variables - - * Update docs/source/examples.rst - - Co-Authored-By: eugenevinitsky - - * resolved nits - -commit cb9ff3fbab393b6b4fe7cc199e23f0df59b479f7 -Author: Yasharzf -Date: Fri Jan 4 17:23:47 2019 -0800 - - added aimsun API setup - -commit 3fdc5cd10e319cdeefecf84cccefa0d9d04c944c -Author: Yasharzf -Date: Fri Jan 4 16:29:49 2019 -0800 - - aimsun template path - -commit d34741fb20c05c205181b1745db09692e85de212 -Author: AboudyKreidieh -Date: Fri Jan 4 16:21:09 2019 -0800 - - ignore aimsun generated files - -commit d5391ba0f2717f89d9de0600ea7752debd077e39 -Merge: 171b4c1f 978839d7 -Author: AboudyKreidieh -Date: Fri Jan 4 16:17:04 2019 -0800 - - Merge branch 'aimsun_kernel' of https://github.com/flow-project/flow into aimsun_kernel - -commit a9f61b226de1fb726458947fe2e192a09b06ca7a -Author: AboudyKreidieh -Date: Fri Jan 4 15:58:35 2019 -0800 - - added get_color and set_color - -commit 40cf70e31b912f88413b30617c19ed3bf2fdb19c -Author: AboudyKreidieh -Date: Fri Jan 4 15:36:31 2019 -0800 - - cleanup - -commit 8e992250f18b096ddb452279804a3b69d7fe79bc -Merge: d171ac86 95b712cb -Author: AboudyKreidieh -Date: Fri Jan 4 15:01:54 2019 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into kernel_vehicle - -commit 95b712cb96ce1790f5d3127eafe65651ebc888d6 -Merge: baad5bb0 a8ceca26 -Author: Aboudy Kreidieh -Date: Fri Jan 4 15:00:34 2019 -0800 - - Merge pull request #366 from flow-project/kernel_scenario - - Kernel scenario - -commit a8ceca26ecf4dfdf2661bb8015fe057f809cc4a1 -Author: AboudyKreidieh -Date: Fri Jan 4 14:11:18 2019 -0800 - - PR fixes - -commit 0b852e3623869bb8c99f542815e4edc2962accaa -Author: eugenevinitsky -Date: Fri Jan 4 16:50:57 2019 -0500 - - maybe this makes the test pass oh my goodness - -commit 8ad690d4c18f1cf08a180dbaf2c0fdb57f0a8e41 -Merge: 5cb6eaa5 baad5bb0 -Author: AboudyKreidieh -Date: Fri Jan 4 13:48:14 2019 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into kernel_scenario - -commit 978839d7729e0fdba0b2168e435060d477b6b592 -Author: Yasharzf -Date: Fri Jan 4 12:24:33 2019 -0800 - - added simulation run commandand modified connection - -commit baad5bb0b70c56131adf30204edc0a3baa6005af -Author: Eugene Vinitsky -Date: Fri Jan 4 14:58:04 2019 -0500 - - files for capacity diagram generation (#363) - - * files for capacity diagram generation - - * pep8 - - * bug fix to incorrectly named method in bottleneck_exps - - * pep8 - - * pep8 - - * pep8 - - * Update examples/sumo/bottlenecks.py - - Co-Authored-By: eugenevinitsky - - * Update flow/envs/bottleneck_env.py - - Co-Authored-By: eugenevinitsky - - * resolved nits - -commit 204c69f30fd84b1c5e0ec1e34383ac4355e004e2 -Author: eugenevinitsky -Date: Fri Jan 4 14:46:33 2019 -0500 - - removed nits and changed example needed to pass the tests - -commit ed6bef65101e66baa2a519080eba338d851b8a19 -Author: eugenevinitsky -Date: Fri Jan 4 14:31:44 2019 -0500 - - changed out pkl files for test visualizer - -commit 12bee1f60f1f629c4a148c1121c0026435b4b0aa -Author: Yasharzf -Date: Fri Jan 4 10:24:06 2019 -0800 - - modified connections - -commit 4ee5a24ccaeb0c387f3ad3fc868558291ba8dd1c -Author: eugenevinitsky -Date: Thu Jan 3 23:51:43 2019 -0500 - - replaced saved pkl files to conform to new flow names for lane change controllers - -commit ce65cc3b982e9c0ebd98058d11438fb1ec37f30b -Author: eugenevinitsky -Date: Thu Jan 3 23:20:57 2019 -0500 - - pep8 - -commit bc260e3cc94cdc20919ba1bde33447e958b5845f -Author: eugenevinitsky -Date: Thu Jan 3 23:18:36 2019 -0500 - - bug fix - -commit 50c9c519b725986c2126c43c3b9a1cc8605589bf -Author: eugenevinitsky -Date: Thu Jan 3 23:02:51 2019 -0500 - - left comment to remind to put test back - -commit 6dfa4fd36edbc0d619bc019a22d462a7a3ba9a25 -Merge: af8795c7 5b78a9aa -Author: eugenevinitsky -Date: Thu Jan 3 23:02:30 2019 -0500 - - Merge branch 'remove_clipping' of https://github.com/flow-project/flow into remove_clipping - -commit af8795c7b7298420e51292670068344e28bf6a98 -Author: eugenevinitsky -Date: Thu Jan 3 23:02:19 2019 -0500 - - tests passing, but had to disable a test to do it - -commit 8e228e1726f3122587a072c22a2968b44a2a7fdf -Author: eugenevinitsky -Date: Thu Jan 3 22:19:53 2019 -0500 - - minor - -commit 5b78a9aa2f6f368b58ead2cebbf650b062362d48 -Merge: 652be4f6 777a6fc9 -Author: Eugene Vinitsky -Date: Thu Jan 3 22:01:59 2019 -0500 - - Merge branch 'master' into remove_clipping - -commit 777a6fc9febe42f183ebf3e5a414fddc659190e1 -Author: Cathy Wu -Date: Thu Jan 3 18:57:53 2019 -0800 - - downgrade tensorflow version in requirements to 1.9.0 (to be compatible with OSX El Capitan) (#352) - -commit 171b4c1fe628e7f5e848f739e11edd48429d469b -Merge: 24b66b1e d171ac86 -Author: AboudyKreidieh -Date: Thu Jan 3 18:02:12 2019 -0800 - - Merge branch 'kernel_vehicle' into aimsun_kernel - -commit d171ac86df0ee51cfb9f67d927dc8c797c01253f -Merge: 53130764 e938724c -Author: AboudyKreidieh -Date: Thu Jan 3 18:01:57 2019 -0800 - - Merge branch 'remove_abs_position' into kernel_vehicle - -commit e938724c52ac6c2f28590285f83e2a42fff166ff -Author: AboudyKreidieh -Date: Thu Jan 3 18:01:18 2019 -0800 - - False -> false - -commit 24b66b1ed0e00f576062152a136087a1e5b9b30b -Merge: f5c99279 53130764 -Author: AboudyKreidieh -Date: Thu Jan 3 17:53:39 2019 -0800 - - Merge branch 'kernel_vehicle' into aimsun_kernel - -commit 1b0d483cf8bf23648185dd27537b33487ce82502 -Author: Yasharzf -Date: Thu Jan 3 17:51:54 2019 -0800 - - added specify_connections function - -commit 53130764f51e02b3d4918f29a7fe0a0118d6aa5b -Merge: c48c74d9 fabbdf57 -Author: AboudyKreidieh -Date: Thu Jan 3 17:48:04 2019 -0800 - - Merge branch 'remove_abs_position' into kernel_vehicle - -commit fabbdf572a3349de84a087c629403c76023702a3 -Author: AboudyKreidieh -Date: Thu Jan 3 17:42:48 2019 -0800 - - bug fixes - -commit c48c74d9e24229d38dbe7343f03af2fbaab803ee -Merge: 2d0ef2a6 d20f00fb -Author: AboudyKreidieh -Date: Thu Jan 3 17:33:55 2019 -0800 - - Merge branch 'remove_abs_position' into kernel_vehicle - -commit d20f00fb6ee569af47622b6fdc7b1c0998699f77 -Author: AboudyKreidieh -Date: Thu Jan 3 17:04:37 2019 -0800 - - bug fix - -commit 073b4576319e293e7dd97c79f0a7e4b059985a82 -Author: AboudyKreidieh -Date: Thu Jan 3 16:41:25 2019 -0800 - - converted sorted_ids to a property - -commit dd71e6c6fc87ad95dd8f2e13e6045dfc24a4d893 -Merge: 977fce4c 1a99ca9b -Author: AboudyKreidieh -Date: Thu Jan 3 16:22:30 2019 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into remove_abs_position - -commit 1a99ca9b1cc29e0588a25e3aba14f5eacbad7a2c -Merge: 3324be00 bc20c7cd -Author: Aboudy Kreidieh -Date: Thu Jan 3 16:19:37 2019 -0800 - - Merge pull request #355 from flow-project/robustness_boost - - Robustness boost - -commit 2d0ef2a6d4411fdb29451971f6e8defca019f821 -Merge: d3f9151d 5cb6eaa5 -Author: AboudyKreidieh -Date: Thu Jan 3 16:17:22 2019 -0800 - - Merge branch 'kernel_scenario' into kernel_vehicle - -commit 5cb6eaa5767cb95ea2a689697f88bf5a803e0ac7 -Merge: 4ec8f1fd 3324be00 -Author: AboudyKreidieh -Date: Thu Jan 3 16:12:38 2019 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into kernel_scenario - -commit 3324be002dce373ed0c2030392bb8dce56fc9fc2 -Merge: 6aebd0d6 3dde060b -Author: Aboudy Kreidieh -Date: Thu Jan 3 16:10:51 2019 -0800 - - Merge pull request #361 from flow-project/aimsun_tcp_api - - Aimsun tcp api - - added an api that can be used to communicate commands to Aimsun. Since aimsun is written in Python2.7, we cannot generically send commands to it, so a tcp connection has been created instead (similar to the setup used by sumo). - - added some tests to ensure that the API is received messages from a dummy server as expected. The dummy server mimics our Aimsun-server is many ways (while not calling the aimsun api methods), so this test allows us to test the `FlowAimsunAPI` specifically while not trying to validate the AImsun side of things. - -commit 58b6d23dac711cb7f9f587e3ce60c00ac110dc38 -Author: AboudyKreidieh -Date: Thu Jan 3 15:55:31 2019 -0800 - - removed more instances of cls.network - -commit 5c33ff58957bf4668d72237b8e6249a4a1e218a2 -Author: AboudyKreidieh -Date: Thu Jan 3 15:49:04 2019 -0800 - - bug fixes - -commit bcfff3a18c666e4191d61f3e9b78017074ea275c -Author: AboudyKreidieh -Date: Thu Jan 3 15:30:14 2019 -0800 - - added net_params to custom start pos - -commit 2edc70f94b3cfb851ceea47b256acf73ef1f877f -Author: Yasharzf -Date: Thu Jan 3 12:52:01 2019 -0800 - - bug fixed - -commit 7fef0222fda3ed34a29d6a5cdcbc9b4571fbc235 -Author: eugenevinitsky -Date: Thu Jan 3 14:45:46 2019 -0500 - - swapped out flag - -commit 722ec38c448b6055eb4457efffd4a9e7d4bc93e4 -Merge: c5a11710 51b5977b -Author: eugenevinitsky -Date: Thu Jan 3 14:39:30 2019 -0500 - - merged in upstream - -commit c5a11710eb52bf2423edb775578c6a93de5a1f70 -Merge: 35b28c16 6aebd0d6 -Author: eugenevinitsky -Date: Thu Jan 3 14:37:45 2019 -0500 - - merged in master - -commit 977fce4c2a1553cbbc8daee7bafd425281350e21 -Merge: 10643bb5 6aebd0d6 -Author: AboudyKreidieh -Date: Thu Jan 3 11:09:01 2019 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into remove_abs_position - -commit 10643bb504949016dd589883af3e70ef5c091f3d -Author: AboudyKreidieh -Date: Thu Jan 3 11:07:40 2019 -0800 - - minor - -commit 4ec8f1fda84f72e5cb6a5802cab8c768a50ed430 -Merge: 5e803974 6aebd0d6 -Author: AboudyKreidieh -Date: Thu Jan 3 11:05:44 2019 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into kernel_scenario - -commit 35b28c16e95750ed5cea4584a01cd9e95c25874a -Author: eugenevinitsky -Date: Thu Jan 3 14:01:13 2019 -0500 - - started regression test explanation in docs - -commit cd4c262847fa6b85b33f8baa64f88deed065fecd -Author: eugenevinitsky -Date: Thu Jan 3 13:58:53 2019 -0500 - - attempt to resolve tests - -commit 6aebd0d609ce2cbbf8bcd2d9a964ee192e3e60a8 -Merge: f234d4a3 5083c1e3 -Author: Aboudy Kreidieh -Date: Thu Jan 3 10:43:39 2019 -0800 - - Merge pull request #358 from flow-project/tests_speedup - - moved multiagent environment to a new folder - -commit 3dde060b083c7bcc000e9f75361510ed639b3f71 -Author: AboudyKreidieh -Date: Thu Jan 3 10:42:05 2019 -0800 - - added test for traffic ligt ids - -commit f5c992790dff3fc5987b1f8a9145a9fcfa713ee5 -Author: AboudyKreidieh -Date: Wed Jan 2 23:57:36 2019 -0800 - - minor changes - -commit cd3cb111888321e3a840e1711663ac8402e92b9c -Author: AboudyKreidieh -Date: Wed Jan 2 21:21:25 2019 -0800 - - bug fixes - -commit 5e803974d2ee3b7a6cd70d6949ef59e4bddfd5bd -Author: AboudyKreidieh -Date: Wed Jan 2 19:55:04 2019 -0800 - - cleanup - -commit f1c289247d62ba56ea9dc63f5223551f4648cf0c -Author: Yasharzf -Date: Wed Jan 2 17:07:27 2019 -0800 - - fixed traffic light bug - -commit d4af10029d4959f2dc8a45ef3ba66650f68cbaff -Author: Yasharzf -Date: Wed Jan 2 16:26:00 2019 -0800 - - added metering settings - -commit 3b5fa742f24f5fbca259a11ec29eaa9e183bb7f3 -Merge: 2c5534a0 c4ef0b44 -Author: AboudyKreidieh -Date: Wed Jan 2 15:58:09 2019 -0800 - - Merge branch 'remove_abs_position' into aimsun_kernel - -commit 2c5534a0b4f05f722a76ea070781abec7262cb5d -Author: AboudyKreidieh -Date: Wed Jan 2 15:48:23 2019 -0800 - - removed print - -commit ba61a0a6f6d2cb73c1738b27d8ed4370904a109e -Merge: 02a72828 b6f59254 -Author: AboudyKreidieh -Date: Wed Jan 2 15:12:46 2019 -0800 - - Merge branch 'aimsun_tcp_api' into aimsun_kernel - -commit 69ff453f4cfd1cc7f98b13688645b2b47102d536 -Author: Yasharzf -Date: Tue Jan 1 22:27:11 2019 -0800 - - added metering control functions - -commit b6f592549e97943c93d354f177069da2814064f4 -Author: AboudyKreidieh -Date: Tue Jan 1 14:35:17 2019 -0800 - - extended tests - -commit f234d4a32b49d002c7ce8dfa266196a4e6b348af -Merge: f47274b1 a05f8d05 -Author: Fangyu Wu -Date: Tue Jan 1 13:07:40 2019 -0800 - - Merge pull request #356 from flow-project/pip_install - - Propose pip for installation. - -commit 77e6655d48ac1426619de39d3c787f814a2c34d0 -Author: AboudyKreidieh -Date: Tue Jan 1 11:40:15 2019 -0800 - - using absolute path - -commit 873cfef7cef5eaf6b250b8b65c518f12f0a50172 -Author: AboudyKreidieh -Date: Tue Jan 1 11:16:22 2019 -0800 - - added project path to dummy server - -commit 89848784b2e8b27bf80ec9018d18b1ff1cf91e41 -Author: AboudyKreidieh -Date: Tue Jan 1 10:35:44 2019 -0800 - - maybe this is the issue? - -commit 6731d8f3c2a22d9e31372760ee5023b3437dce88 -Author: AboudyKreidieh -Date: Tue Jan 1 09:58:15 2019 -0800 - - modified to not as for confirmation - -commit 28bda07eb692fba9a105d61b0f7a5dca30a8602a -Author: AboudyKreidieh -Date: Tue Jan 1 02:24:40 2019 -0800 - - bug fix - -commit 14a70af7b7ef413fd99272e3c75dbff32e649ea3 -Author: AboudyKreidieh -Date: Tue Jan 1 02:15:59 2019 -0800 - - added conda env to travis - -commit 02a72828f609dcad8aed18dfd931ab2f4e31d523 -Author: AboudyKreidieh -Date: Tue Jan 1 01:54:56 2019 -0800 - - bug fix - -commit 2f7c2ddc76ad41f52e864312dc3a6c6a371bacf9 -Author: AboudyKreidieh -Date: Tue Jan 1 01:53:36 2019 -0800 - - bug fix - -commit c4ef0b44b9d2d501f368f568fc7f45c1c7242f58 -Author: AboudyKreidieh -Date: Tue Jan 1 01:06:51 2019 -0800 - - moved absolute_position and soring to the correct environments - -commit a05f8d05001f705e405174cbb6fbcd7e7cc6d4ce -Merge: 1f596d27 f47274b1 -Author: Fangyu Wu -Date: Mon Dec 31 23:15:43 2018 -0800 - - Merge branch 'master' into pip_install - -commit f47274b103a0f8e0a248c0a799968908389bd6d2 -Merge: 7b120807 819c4e44 -Author: Aboudy Kreidieh -Date: Mon Dec 31 18:29:24 2018 -0800 - - Merge pull request #354 from cathywu/raydocs - - Update ray cluster docs - -commit 5083c1e33a371884b194cfe9e820a37c107328ee -Author: AboudyKreidieh -Date: Mon Dec 31 17:46:50 2018 -0800 - - moved multiagent environment to a new folder - -commit ba07af324f9a71fb203f0f19570a8d4be98422ed -Merge: a283b60b d3f9151d -Author: AboudyKreidieh -Date: Mon Dec 31 16:30:51 2018 -0800 - - Merge branch 'kernel_vehicle' into aimsun_kernel - -commit 535038f31ae4f1b195edea59738067de11fa1fff -Merge: 113954db 7b120807 -Author: AboudyKreidieh -Date: Mon Dec 31 16:29:39 2018 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into aimsun_tcp_api - -commit d3f9151d068fbed5a9be883ca956bc7d39f729f7 -Merge: 68940857 5cc0d1e1 -Author: AboudyKreidieh -Date: Mon Dec 31 16:24:13 2018 -0800 - - Merge branch 'kernel_scenario' into kernel_vehicle - -commit 5cc0d1e114953fc5e91c3da75cba6864f687f60e -Author: AboudyKreidieh -Date: Mon Dec 31 14:53:14 2018 -0800 - - pep8 - -commit 1dcd6432918e61231fe91cbceb3a8d946a237a9e -Author: AboudyKreidieh -Date: Mon Dec 31 14:42:43 2018 -0800 - - cleanup - -commit a366f4c675bab4f84e4442cb89e7b77f48cc6333 -Merge: a0f293dd 7b120807 -Author: AboudyKreidieh -Date: Mon Dec 31 13:18:48 2018 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into kernel_scenario - -commit 7b120807b779aca3db93a183dc19a38f7b1097ad -Merge: a4b32b7e cebacc65 -Author: Aboudy Kreidieh -Date: Mon Dec 31 13:18:22 2018 -0800 - - Merge pull request #344 from flow-project/aimsun_install - - Aimsun install - - renamed `config_default.py` -> `config.py` - - added setup instructions for Aimsun support - -commit a4b32b7e91a60f63ab02e41a22467d748869deae -Merge: 5aa1b980 f98b12a9 -Author: Aboudy Kreidieh -Date: Mon Dec 31 13:17:40 2018 -0800 - - Merge pull request #325 from flow-project/remove_make_routes - - Remove make routes - - stopped adding vehicles to the network before the environment is created (in `make_routes`). Vehicles are now only imported in the environment's `reset` method, which is more compatible with aimsun. Now `generate_starting_positions` is only called within the environment. - - removed `vehicle_arrangement_shuffle` and `starting_position_shuffle`, and replaced them with `shuffle` from `InitialConfig` (which essentially exists to perform the same task) - - Note: - - some of the tests needed to be modified by calling `reset` before they start since there are no cars in the network before reset. - -commit f98b12a9c52823f0038c473d1a615e8bf9c1a28b -Author: AboudyKreidieh -Date: Mon Dec 31 12:36:37 2018 -0800 - - undid rendering - -commit cebacc65ce9a476e1d90de2da1f9bf54983bb5b6 -Author: AboudyKreidieh -Date: Mon Dec 31 12:12:06 2018 -0800 - - minor - -commit 4cd4fd1b97c691b271fb1ce5ec9980c3b3ab91d3 -Author: AboudyKreidieh -Date: Mon Dec 31 12:04:49 2018 -0800 - - bug fixes - -commit 23b1a884a535ca03a31712b18f3e05e26afcdee4 -Author: AboudyKreidieh -Date: Mon Dec 31 11:19:16 2018 -0800 - - removed config from gitignore - -commit 26cbf7a9c8d2cd1f4f9391397434d030dcf84ad3 -Author: AboudyKreidieh -Date: Mon Dec 31 11:18:09 2018 -0800 - - final bug fixes - -commit 113954db7de2dc40c639692e8989191ce77f61fe -Author: AboudyKreidieh -Date: Mon Dec 31 11:15:10 2018 -0800 - - added aimsun apis and started writing tests - -commit 1f596d27114f62e340dfd7f23308e1ddbddf3d00 -Author: Fangyu Wu -Date: Mon Dec 31 00:25:40 2018 -0800 - - Propose pip for installation. - -commit bc20c7cdd6b745c9443f7d2fe28d1d26de8f2d41 -Author: Fangyu Wu -Date: Sun Dec 30 23:22:13 2018 -0800 - - Fix pep8. - -commit 2cfadb1c86a73c7f6169a36d087d7e7ed821a28f -Author: Fangyu Wu -Date: Sun Dec 30 23:10:42 2018 -0800 - - Add automatic garbage collection to base env. - -commit ae9ada9fd8f126de3ff87c4446f4e4f4be67b131 -Author: Fangyu Wu -Date: Sun Dec 30 23:10:01 2018 -0800 - - Support ray API change on get_agent_class. - -commit 819c4e44425a76773570fa366fbbda86083830e5 -Author: Cathy Wu -Date: Sun Dec 30 15:40:39 2018 -0800 - - update ray cluster docs - -commit f805ecfa4f847e08b3618cada3cfb7038d387754 -Author: AboudyKreidieh -Date: Sun Dec 30 13:01:43 2018 -0800 - - final PR fix - -commit a0f293dd19b177c34819beb261bb0a89cf90eecb -Merge: 84895e88 fe0d3044 -Author: AboudyKreidieh -Date: Sun Dec 30 12:56:35 2018 -0800 - - Merge branch 'remove_make_routes' into kernel_scenario - -commit fe0d3044961ba86b5cc477c1d3242e903f89b150 -Author: AboudyKreidieh -Date: Sun Dec 30 12:51:56 2018 -0800 - - PR fixes - -commit ce1ec01875fbef74a6afa15b2683086fd252b1dc -Merge: 9a9a7b7b 5aa1b980 -Author: AboudyKreidieh -Date: Sun Dec 30 11:43:10 2018 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into remove_make_routes - -commit a283b60b6a577c24af0439be06dbe9db443c59ed -Author: AboudyKreidieh -Date: Sun Dec 30 11:32:57 2018 -0800 - - added method for storing runtime data - -commit 66533e85c0f2caab50aba671ee9c8adc6a38c528 -Author: AboudyKreidieh -Date: Sat Dec 29 00:03:00 2018 -0800 - - functioning flow-aimsun api - -commit f0143c6fec399225f9123eff4cfbd6ab01df97bd -Merge: f2898f28 460ada08 -Author: AboudyKreidieh -Date: Fri Dec 28 12:24:31 2018 -0800 - - Merge branch 'aimsun_kernel' of https://github.com/flow-project/flow into aimsun_kernel - -commit f2898f28ec613f3086759a38d25e82c16e8625e4 -Author: AboudyKreidieh -Date: Fri Dec 28 12:22:41 2018 -0800 - - started adding tcp connection - -commit 460ada085158d9fe37981c4b6c9929c92b50a398 -Author: Yasharzf -Date: Fri Dec 28 12:20:11 2018 -0800 - - fixed node bugs - -commit 5aa1b98008b73544894f775ef88b55efff768d91 -Merge: 16078ea2 fbf0e433 -Author: Aboudy Kreidieh -Date: Thu Dec 27 22:33:20 2018 -0800 - - Merge pull request #316 from flow-project/custom_start_pos - - converted gen_custom_start_pos to a staticmethod - -commit a516f419f2db01442239b698357257d02fefd555 -Merge: 82810570 305f23b4 -Author: AboudyKreidieh -Date: Thu Dec 27 20:55:12 2018 -0800 - - Merge branch 'aimsun_install' of https://github.com/flow-project/flow into aimsun_kernel - -commit 8ea5aa1fe2d05d85fb7bc5620e8946bb745b97e8 -Merge: 5fc80824 82810570 -Author: Yasharzf -Date: Thu Dec 27 17:14:23 2018 -0800 - - Merge branch 'aimsun_kernel' of https://github.com/flow-project/flow into aimsun_kernel - -commit 5fc80824bcbfc2e6d200efe1d1b0efc49c536103 -Author: Yasharzf -Date: Thu Dec 27 17:13:51 2018 -0800 - - what - -commit 82810570661035911c5d4c257327019389a4a9a9 -Merge: 77e66056 b343621a -Author: AboudyKreidieh -Date: Thu Dec 27 17:09:29 2018 -0800 - - Merge branch 'aimsun_kernel' of https://github.com/flow-project/flow into aimsun_kernel - -commit 77e660566176130d5363afca095d9cc6587c4cf5 -Author: AboudyKreidieh -Date: Thu Dec 27 17:04:39 2018 -0800 - - type conversion in vehicles kernel - -commit b343621ac658b41a788d6e2742c26c5946e0b07f -Author: Yasharzf -Date: Thu Dec 27 17:04:26 2018 -0800 - - changed nodes, views, veh types - -commit 22bf6a369c40e461cb65ed32f19fe6e4fb578255 -Merge: cf83298a 68940857 -Author: AboudyKreidieh -Date: Thu Dec 27 15:50:19 2018 -0800 - - Merge branch 'kernel_vehicle' into aimsun_kernel - -commit 689408573075c4324149cc71b08809da5fc7a531 -Merge: 6f37124a 84895e88 -Author: AboudyKreidieh -Date: Thu Dec 27 15:45:09 2018 -0800 - - Merge branch 'kernel_scenario' into kernel_vehicle - -commit 84895e88bcb053a19528d4449fd747d3c5cbe6ec -Merge: 048cda3c 16078ea2 -Author: AboudyKreidieh -Date: Thu Dec 27 15:42:21 2018 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into kernel_scenario - -commit 16078ea263871a0e91009f1a1764fb166e753754 -Merge: b9272af5 9fe5be23 -Author: Aboudy Kreidieh -Date: Thu Dec 27 15:41:03 2018 -0800 - - Merge pull request #330 from flow-project/params_abstraction - - Params abstraction - -commit 6f37124abec448fa3b4e29a2ee306e2ec55fbb99 -Author: AboudyKreidieh -Date: Thu Dec 27 15:38:37 2018 -0800 - - bug fix - -commit a9e1577ba8b5d72b38aef6e38f77c9a0c9ac7655 -Merge: 0a162188 048cda3c -Author: AboudyKreidieh -Date: Thu Dec 27 15:36:10 2018 -0800 - - Merge branch 'kernel_scenario' into kernel_vehicle - -commit 9fe5be23adeb3a107abb74b1ef06e57876717479 -Merge: f8e31c42 b9272af5 -Author: AboudyKreidieh -Date: Thu Dec 27 14:56:08 2018 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into params_abstraction - -commit 048cda3cd0d2a29eb121a6869d96b6a6e1e74f14 -Merge: 88854d11 b9272af5 -Author: AboudyKreidieh -Date: Thu Dec 27 14:47:16 2018 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into kernel_scenario - -commit b9272af51eba518b2d3e5b5cd5f819f965c1021e -Merge: 1d608453 48bd8bde -Author: Aboudy Kreidieh -Date: Thu Dec 27 14:38:48 2018 -0800 - - Merge pull request #340 from flow-project/vehicle_params - - Vehicle params - - **Note**: don't let the size scare you, it's just because I cut and pasted a large chunk of code. - - changes - - renamed `Vehicles` -> `VehicleParams` - - moved the vehicles class to flow/core/params.py - - This is a prelude to the vehicles kernel, and mimics what we did to the traffic lights class - -commit 48bd8bde85bf7a82d60c02f6cd2df82571f40379 -Merge: 7a94bf75 1d608453 -Author: AboudyKreidieh -Date: Thu Dec 27 14:21:27 2018 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into vehicle_params - -commit 1d6084533fb014f9f43e7656d895d37a4a42c4cf -Merge: 2f718fe1 8889d082 -Author: Aboudy Kreidieh -Date: Thu Dec 27 14:13:30 2018 -0800 - - Merge pull request #343 from flow-project/aimsun_struct - - created objects that are used when passing data from aimsun - -commit 8889d0823cb38cf128a297f16b47e3d5c6601b1d -Author: AboudyKreidieh -Date: Thu Dec 27 13:48:49 2018 -0800 - - pep8 - -commit cf83298a74ccfd2c1a7c4b4fa14eac54ae68f65e -Author: AboudyKreidieh -Date: Thu Dec 27 13:45:00 2018 -0800 - - add_departed - -commit 5405898e13d77fb6b42303214c7cfc916ddad781 -Author: Yashar Zeinali Farid <34227133+Yasharzf@users.noreply.github.com> -Date: Thu Dec 27 13:36:51 2018 -0800 - - Apply suggestions from code review - - Co-Authored-By: AboudyKreidieh - -commit 2f718fe18602b72e819e38f55ddc64089aab8349 -Merge: ab5cb225 60007d66 -Author: Aboudy Kreidieh -Date: Thu Dec 27 13:32:48 2018 -0800 - - Merge pull request #341 from flow-project/cf_lc_params_abstractions - - Cf lc params abstractions - -commit 652be4f648a1c0135e695d1e8e721864bcf722ef -Author: eugenevinitsky -Date: Wed Dec 26 23:49:01 2018 -0500 - - revert changes to environment yml - -commit dca55d87c49698100bbfe9e3fa29b63471eaa3c9 -Author: eugenevinitsky -Date: Wed Dec 26 23:39:48 2018 -0500 - - change in travis - -commit e56d508c0e0934511b9e18fc65714edc9f2d5cdf -Author: eugenevinitsky -Date: Wed Dec 26 23:26:05 2018 -0500 - - added lz4 and psutil so rllib would stop complaining - -commit c7827835ca13b1b2620b0f82cd8fcea233c7bbc0 -Author: eugenevinitsky -Date: Wed Dec 26 23:20:17 2018 -0500 - - fixed pkl files for visualizer test - -commit 89dfe67883b64f0e48345a0fa8c32417851f0b34 -Author: eugenevinitsky -Date: Wed Dec 26 22:12:08 2018 -0500 - - importing get_agent_class from the wrong place, too many cpus called by default in the rllib runner scripts - -commit f2db165badeeaf560e44b99602b386537379fba0 -Author: eugenevinitsky -Date: Wed Dec 26 21:55:58 2018 -0500 - - temporary pointing at old branch of ray - -commit a0bbd3cc87f8004b2573448e8c9fd842d956ab61 -Author: eugenevinitsky -Date: Wed Dec 26 21:55:34 2018 -0500 - - fix for visualizer to update to ray 0.6.1 - -commit a66ae05f44343436818ecd245947fd01d760836e -Merge: 361d5c74 ab5cb225 -Author: eugenevinitsky -Date: Wed Dec 26 21:40:24 2018 -0500 - - Merge branch 'master' into remove_clipping - -commit 305f23b45ce43758e719134af181a19644430614 -Author: AboudyKreidieh -Date: Wed Dec 26 18:25:54 2018 -0800 - - bug fix - -commit 0ab15e5c6d96c42e5444a0a6b8d9a223af1725db -Author: AboudyKreidieh -Date: Wed Dec 26 18:14:59 2018 -0800 - - created setup instructions for Aimsun - -commit 275bf3ac009decdafadf6684e502dd71584de9f2 -Author: AboudyKreidieh -Date: Wed Dec 26 17:38:22 2018 -0800 - - renamed config_default -> config - -commit 64717b672daa1f2d0cd3b5c753795c52150e93ad -Author: AboudyKreidieh -Date: Wed Dec 26 17:33:38 2018 -0800 - - added support for entering and exiting vehicles, as well as getting edge names - -commit fbf0e43366402003d64b04b742a2402028c1afc7 -Merge: eee49293 ab5cb225 -Author: AboudyKreidieh -Date: Wed Dec 26 10:01:44 2018 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into custom_start_pos - -commit da821835446f5f0ac9b828a12483fa08f5f8d99f -Author: AboudyKreidieh -Date: Wed Dec 26 09:56:38 2018 -0800 - - created objects that are used when passing data from aimsun - -commit fe4757defb963f428f75f65bfbbf36a88194d72e -Author: AboudyKreidieh -Date: Wed Dec 26 09:54:01 2018 -0800 - - major modifications to aimsun tcp connection - -commit 370942588218012d534afc5f6db6a4a8e7e830cf -Author: Yasharzf -Date: Tue Dec 25 17:57:34 2018 -0800 - - modified junctions - -commit ab5cb2251d7767882dedb450d8f69e2d42a206f7 -Merge: fe0aba8d b73cdfb2 -Author: Aboudy Kreidieh -Date: Tue Dec 25 02:09:48 2018 -0800 - - Merge pull request #333 from cathywu/docsfix - - Re-org and fixes of setup instructions - -commit fe0aba8d8dac9452592ff4a6b05fa936bb247313 -Merge: 61353cea bf7d089c -Author: Aboudy Kreidieh -Date: Tue Dec 25 01:55:26 2018 -0800 - - Merge pull request #339 from cathywu/typos - - Tiny typos - -commit bf7d089cb8867c32a086acd718730a77efc2eee0 -Author: Cathy Wu -Date: Tue Dec 25 00:30:03 2018 -0800 - - SUMO capitalization - -commit 1ea644f10f937877f6544a28d638b39354b7b6cd -Author: Cathy Wu -Date: Tue Dec 25 00:28:35 2018 -0800 - - tiny typos - -commit 7a94bf75707f85fc42bb90b75e50057961f1bfc6 -Author: AboudyKreidieh -Date: Mon Dec 24 18:03:49 2018 -0800 - - bug fixes - -commit 88854d11ac68cde4931d7879da88c0ec8b6efd4a -Merge: f14ccbd7 dfbd4e41 -Author: AboudyKreidieh -Date: Mon Dec 24 18:00:43 2018 -0800 - - Merge branch 'vehicle_params' into kernel_scenario - -commit dfbd4e41283c1194720532e134825788b96af3a2 -Author: AboudyKreidieh -Date: Mon Dec 24 17:50:06 2018 -0800 - - renamed Vehicles -> VehicleParams - -commit 0a162188c2519fc19a0339a77e2b96262de6c658 -Author: AboudyKreidieh -Date: Mon Dec 24 17:13:54 2018 -0800 - - minor cleanup - -commit ebf39920ac018372b6f10b487c07feaaf7525fa4 -Author: AboudyKreidieh -Date: Mon Dec 24 17:11:42 2018 -0800 - - more tcp changes - -commit 327c886a6d204e60cd7367afa273589771dcd8ad -Author: AboudyKreidieh -Date: Mon Dec 24 14:32:19 2018 -0800 - - started adding tcp connection - -commit b73cdfb261185cc7e03bcbbe408da5c3fb4e86dc -Author: Cathy Wu -Date: Mon Dec 24 14:28:49 2018 -0800 - - Internal hyperlink fix; minor docs update - -commit 053b51b0900c28ce323120962b403cf0b3035fe2 -Author: Cathy Wu -Date: Mon Dec 24 13:59:03 2018 -0800 - - reordered sections to follow installation logic; cleaned up and added sub-section headers - -commit ea1b7b2e419c63f888191537f098ffdcd9b5ba89 -Author: Cathy Wu -Date: Mon Dec 24 13:34:17 2018 -0800 - - Small fixes to setup instructions - -commit c45c92c7ad747dc39d534d65994be0013af27882 -Author: AboudyKreidieh -Date: Sun Dec 23 19:44:31 2018 -0800 - - random changes - -commit fc3e69cf81b90b82df691cc5ab6d2fe6887a5c0d -Author: Yasharzf -Date: Sun Dec 23 11:24:42 2018 -0800 - - added edge with no shape - -commit 36e8afe8d5f7dc3d719ca1c041dd11e68122f56f -Merge: 6786657f b2217cae -Author: AboudyKreidieh -Date: Sat Dec 22 19:35:34 2018 -0800 - - Merge branch 'kernel_vehicle' into aimsun_kernel - -commit b2217cae69ca0b83be194027cc57fced94a63aa0 -Author: AboudyKreidieh -Date: Sat Dec 22 19:32:03 2018 -0800 - - bug - -commit f14ccbd7ee6c13f0453ea5a2b2b801d4a633f182 -Author: AboudyKreidieh -Date: Sat Dec 22 19:28:00 2018 -0800 - - bug fix - -commit ac67ef0ad6e88bb32856787a1b20fa303949776d -Author: AboudyKreidieh -Date: Sat Dec 22 19:27:08 2018 -0800 - - bug fix - -commit 2eb5e6bc1d14248c5c76bd0a9f0c34bea04173b3 -Merge: 3eb58e1a 80edce3f -Author: AboudyKreidieh -Date: Sat Dec 22 19:17:02 2018 -0800 - - Merge branch 'kernel_scenario' into kernel_vehicle - -commit 80edce3f51ed3afe8d0fab6c7375702f82b5f9d1 -Merge: 2e071be1 60007d66 -Author: AboudyKreidieh -Date: Sat Dec 22 19:07:30 2018 -0800 - - Merge branch 'cf_lc_params_abstractions' into kernel_scenario - -commit 61353ceaa11e21276941603a35ad52f6f7fe55d6 -Merge: d2046023 1df44e25 -Author: Aboudy Kreidieh -Date: Sat Dec 22 19:00:49 2018 -0800 - - Merge pull request #326 from CYBruce/master - - Update tutorial04_visualize.ipynb - -commit 6786657f5cc5fc2fcc9a299ee3d27c727548ce91 -Merge: 82fc4885 06ec45ee -Author: Yasharzf -Date: Sat Dec 22 18:15:42 2018 -0800 - - aimsun changes - -commit 3eb58e1ac23a94358a82f5a6e184934f62f5348e -Author: AboudyKreidieh -Date: Sat Dec 22 16:09:37 2018 -0800 - - pep8 - -commit 60007d66a797a2c11a9ecb281db14350bce7e46f -Author: AboudyKreidieh -Date: Sat Dec 22 15:58:27 2018 -0800 - - replaced sumo_lc_params with lane_change_params - -commit 6d3420d676e68cc475fffc1217e2ab847c71ac4c -Author: AboudyKreidieh -Date: Sat Dec 22 15:52:07 2018 -0800 - - replaced sumo_cf_params with car_following_params - -commit 7ae474bddbba99717790ccbc8bfafe5a44ded3f4 -Merge: d13135b1 2e071be1 -Author: AboudyKreidieh -Date: Sat Dec 22 15:23:02 2018 -0800 - - Merge branch 'kernel_scenario' into kernel_vehicle - -commit 2e071be1608b277ff3c4bce4319374969b27120e -Author: AboudyKreidieh -Date: Sat Dec 22 15:14:16 2018 -0800 - - fixed a test - -commit db2b9ca3d19ac95a7e1ecf171e3016b3a4386189 -Author: AboudyKreidieh -Date: Sat Dec 22 15:09:45 2018 -0800 - - rename simulation controllers - -commit 2f5432b636529831417a06a019be02ead817083a -Merge: 218a2440 f8e31c42 -Author: AboudyKreidieh -Date: Sat Dec 22 14:51:53 2018 -0800 - - Merge branch 'params_abstraction' into kernel_scenario - -commit f8e31c42f169fac592ef1a650477101994f7291a -Merge: 33730b34 d2046023 -Author: AboudyKreidieh -Date: Sat Dec 22 14:41:55 2018 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into params_abstraction - -commit d2046023fbdb1f901db5e6553f046d130d6dbd61 -Merge: 931aa2cf 9fcf346b -Author: Aboudy Kreidieh -Date: Sat Dec 22 14:37:24 2018 -0800 - - Merge pull request #329 from flow-project/easy_install_update - - flipped sumo installation instructions - -commit 931aa2cfcc58d46044e19589e5fa6a43d9c55050 -Merge: cae79fab e9c49c5c -Author: Aboudy Kreidieh -Date: Sat Dec 22 14:37:10 2018 -0800 - - Merge pull request #328 from flow-project/exp_abstraction - - replaced SumoExperiment with Experiment - -commit 33730b34638de5bd18f72efa626ef72f8a627a6c -Author: AboudyKreidieh -Date: Sat Dec 22 14:04:49 2018 -0800 - - replaced restart_sumo with restart_simulation - -commit 9fcf346bc84e61a5fb59deb2d6e026361c261161 -Author: AboudyKreidieh -Date: Sat Dec 22 14:02:01 2018 -0800 - - PR fix - -commit 5a7af32266c9104b7358f27bf4ce8e7b82da743b -Author: AboudyKreidieh -Date: Sat Dec 22 13:57:27 2018 -0800 - - flipped sumo installation instructions - -commit e9c49c5c818952ff0e5e613196283ed8425c40c1 -Author: AboudyKreidieh -Date: Sat Dec 22 13:47:39 2018 -0800 - - PR fix - -commit 7e8165619f60f1314a29b2393bc1c70973136909 -Author: AboudyKreidieh -Date: Sat Dec 22 13:39:44 2018 -0800 - - more parameter changes - -commit 1d634ea12fd14955b66c02f9c2666fb93c9653f6 -Author: AboudyKreidieh -Date: Sat Dec 22 13:31:13 2018 -0800 - - bug fixes - -commit a21f6bdfbfd3339be588f9fc433374ff0722a46f -Author: AboudyKreidieh -Date: Sat Dec 22 13:25:49 2018 -0800 - - replaced SumoExperiment with Experiment - -commit 2c53124caf018364fcf4243f2bbc4092df877998 -Author: AboudyKreidieh -Date: Sat Dec 22 13:10:28 2018 -0800 - - bug fix - -commit e6d619c80922b931cdaab349ee10efc5821e19bd -Author: AboudyKreidieh -Date: Sat Dec 22 13:09:02 2018 -0800 - - replaced sumo_params wit sim_params - -commit 82fc4885b847a2bd8f7048115973e4088f571232 -Author: Yasharzf -Date: Sat Dec 22 10:27:49 2018 -0800 - - Changes to Aimsun simulation - -commit 06ec45ee38b4f9a5e2f6f5f3f8ac8c6b428869ac -Author: AboudyKreidieh -Date: Sat Dec 22 00:08:57 2018 -0800 - - added comments - -commit 96146dbb4867cc006dece154e49c97d68f3c0364 -Author: AboudyKreidieh -Date: Fri Dec 21 23:57:15 2018 -0800 - - minor changes - -commit 1df44e25bc4433cb0ca349c2fe9581539f9abf69 -Author: CYBruce -Date: Sat Dec 22 15:49:55 2018 +0800 - - Update tutorial04_visualize.ipynb - -commit e45938eb6e83e16653793d2cad88f0f89550fcc7 -Merge: 59f39c4a d13135b1 -Author: AboudyKreidieh -Date: Fri Dec 21 23:08:15 2018 -0800 - - Merge branch 'kernel_vehicle' into aimsun_kernel - -commit d13135b14abe33653d0ad30ead2cd3147280837e -Merge: baa3daa6 218a2440 -Author: AboudyKreidieh -Date: Fri Dec 21 23:01:21 2018 -0800 - - Merge branch 'kernel_scenario' into kernel_vehicle - -commit 218a2440040da22101b64cc63c6b4c4135d569a7 -Author: AboudyKreidieh -Date: Fri Dec 21 23:00:18 2018 -0800 - - more bug fixes - -commit b24e76448ab289b368a900ef6d5bfa761873082d -Author: AboudyKreidieh -Date: Fri Dec 21 21:53:56 2018 -0800 - - bug fix - -commit baa3daa6ca0705daa71a5b0a0c0668cfd22b11bf -Author: AboudyKreidieh -Date: Fri Dec 21 21:52:34 2018 -0800 - - bug fix - -commit f3e09b19fc832d626fcf9f885f467baf3386a687 -Merge: 7d4f75ad 0fa7a8b8 -Author: AboudyKreidieh -Date: Fri Dec 21 21:50:01 2018 -0800 - - Merge branch 'kernel_scenario' into kernel_vehicle - -commit 0fa7a8b84b7e9ed18a13d46465585c7c48b40528 -Author: AboudyKreidieh -Date: Fri Dec 21 21:38:42 2018 -0800 - - more changes - -commit a833fc05f7b26b52abd5ae7fa44d57ca3f15bb48 -Merge: d0ef13e8 9a9a7b7b -Author: AboudyKreidieh -Date: Fri Dec 21 21:37:01 2018 -0800 - - Merge branch 'remove_make_routes' into kernel_scenario - -commit 9a9a7b7bb50b64e2939ecc7afe4ee82f5f4145af -Author: AboudyKreidieh -Date: Fri Dec 21 20:56:59 2018 -0800 - - bug fixes - -commit cae79fabd6f7245edaff810048b215118ba06d9a -Merge: 05d702bd 496b91c4 -Author: Aboudy Kreidieh -Date: Fri Dec 21 20:03:19 2018 -0800 - - Merge pull request #285 from flow-project/redis_error - - Redis error - -commit 70f7cace1fccbe8eacdfc5dd291012c1068ed063 -Author: AboudyKreidieh -Date: Fri Dec 21 20:01:00 2018 -0800 - - bug fixes - -commit d0ef13e83a608b84dc2c900a0267c5ae0c84b715 -Author: AboudyKreidieh -Date: Fri Dec 21 19:02:23 2018 -0800 - - pep8 - -commit a569a7db4d68c50fcf85dcc2498a5f8ff94db4a9 -Author: AboudyKreidieh -Date: Fri Dec 21 18:59:02 2018 -0800 - - minor cleanup - -commit 496b91c42352a288684d3a19a5de66e057cf6b77 -Merge: 882117dd 05d702bd -Author: AboudyKreidieh -Date: Fri Dec 21 18:45:48 2018 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into redis_error - -commit 882117ddb7cc5b191b16dc785c28f20d6814b624 -Author: AboudyKreidieh -Date: Fri Dec 21 18:45:44 2018 -0800 - - fixed parser bug - -commit e5ec930b041687421e880e0832d72da73cec03b0 -Author: AboudyKreidieh -Date: Fri Dec 21 18:38:43 2018 -0800 - - bug fix - -commit 552c0967ac171109c1b551bd43d05daaa1893998 -Author: AboudyKreidieh -Date: Fri Dec 21 18:17:10 2018 -0800 - - minor - -commit 2ea832212370602367367ca48886be7fc14ba528 -Author: AboudyKreidieh -Date: Fri Dec 21 18:09:38 2018 -0800 - - modified make_routes and removed shuffling methods: - -commit 59f39c4a5559cc4bb66895a931a83b58f4f97d8a -Merge: 77c88a46 f40bdb01 -Author: Yasharzf -Date: Fri Dec 21 15:31:50 2018 -0800 - - Merge branch 'kernel_scenario' of https://github.com/flow-project/flow into aimsun_kernel - -commit 77c88a46911e0b09bfc8a23f686d35e3cb894fb0 -Author: Yasharzf -Date: Fri Dec 21 15:30:20 2018 -0800 - - new changes - -commit f40bdb01512000322b1806904c96ce1ef6f831db -Merge: 08e746c3 05d702bd -Author: AboudyKreidieh -Date: Fri Dec 21 15:28:12 2018 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into kernel_scenario - -commit 05d702bd5eccea371046a3129f33d6c69d73e9ab -Merge: eb091514 d6e3a8b2 -Author: Aboudy Kreidieh -Date: Fri Dec 21 15:26:30 2018 -0800 - - Merge pull request #323 from flow-project/netfile_osm_merge - - Netfile osm merge - -commit d6e3a8b220089eef8c8aa34a9b937f83cc630c6a -Author: AboudyKreidieh -Date: Fri Dec 21 14:38:33 2018 -0800 - - bug fix - -commit 955ff8443e2d1cfb082a8d4c15ff998081ec698b -Author: AboudyKreidieh -Date: Fri Dec 21 14:13:58 2018 -0800 - - PR fixes - -commit 77027bd8b466ded40d148bc68877f9af0af3ee4e -Author: AboudyKreidieh -Date: Fri Dec 21 14:10:02 2018 -0800 - - some docstring cleanup - -commit 6346b9b49840c0e19b176d7fb46997efa2d7cfd2 -Merge: 99fdea14 eb091514 -Author: AboudyKreidieh -Date: Fri Dec 21 14:05:55 2018 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into netfile_osm_merge - -commit 08e746c3f358599803c5031a2401d7ee4221d159 -Merge: 4c81bb56 eb091514 -Author: AboudyKreidieh -Date: Fri Dec 21 13:58:15 2018 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into kernel_scenario - -commit eb091514d49bf3480aa47e9d7bf3c32070946fe6 -Merge: b41c0083 39b5658b -Author: Aboudy Kreidieh -Date: Fri Dec 21 13:57:40 2018 -0800 - - Merge pull request #310 from flow-project/kernel_traffic_lights - - Kernel traffic lights - -commit 794ed8bf67e1e952ddd58cb0a30c071823131d95 -Merge: 17b305b5 7d4f75ad -Author: AboudyKreidieh -Date: Thu Dec 20 23:54:28 2018 -0800 - - Merge branch 'kernel_vehicle' into aimsun_kernel - -commit 7d4f75adf9f7ef34490b0cd0f05ae62613cb7dba -Author: AboudyKreidieh -Date: Thu Dec 20 23:35:43 2018 -0800 - - more bug fixes - -commit c9dff8387151b61141779f7da22ef70ec730141a -Author: AboudyKreidieh -Date: Thu Dec 20 23:02:08 2018 -0800 - - more bug fixes - -commit a7e4cdbe428057f8cc4356bbfd4c67c0b2fdf9e8 -Author: AboudyKreidieh -Date: Thu Dec 20 22:03:10 2018 -0800 - - many bug fixes - -commit a9323c3b8f51c97e3c90796f599a66ae29b0176b -Author: AboudyKreidieh -Date: Thu Dec 20 21:24:50 2018 -0800 - - ugh - -commit f4380f978bbadcbcf29b42409729cbd3c6384735 -Author: AboudyKreidieh -Date: Thu Dec 20 21:12:59 2018 -0800 - - ugh - -commit bf5245900cb27696b9b6cd08f8941f894b12df7e -Author: AboudyKreidieh -Date: Thu Dec 20 21:01:49 2018 -0800 - - ugh - -commit b82428faaaca47cbd6cc946899e153d2cd8d3ae6 -Author: AboudyKreidieh -Date: Thu Dec 20 20:40:04 2018 -0800 - - another hacky fix - -commit 4aae6988d34eb9aa700bfde6dbf85d07767335cc -Author: AboudyKreidieh -Date: Thu Dec 20 20:16:19 2018 -0800 - - another hacky fix - -commit f0b8775fd2bd23715f71e8850e90c6a3ea8e1d2d -Author: AboudyKreidieh -Date: Thu Dec 20 20:07:21 2018 -0800 - - hacky solution: - -commit 18a93e26c6aa0889d18355a9aebf1e9e8d31c1b8 -Author: AboudyKreidieh -Date: Thu Dec 20 19:51:39 2018 -0800 - - using .get on some dicts - -commit 9028aa2bca0144c7943033594815452189517e65 -Author: AboudyKreidieh -Date: Thu Dec 20 19:40:28 2018 -0800 - - bug fixes - -commit c3b15a1f8a7e39eef0bd82a492317435b4d75cd4 -Author: AboudyKreidieh -Date: Thu Dec 20 19:32:46 2018 -0800 - - bug fixes - -commit 5dd7052dc5ff9dba0543aa83871449775d9d7f20 -Author: AboudyKreidieh -Date: Thu Dec 20 19:00:35 2018 -0800 - - bug fix - -commit ff38e817acfab48c5d8af43d96db0e2fe4837c30 -Author: AboudyKreidieh -Date: Thu Dec 20 18:59:52 2018 -0800 - - bug fix - -commit d2945982aaf90e34913eb88f8f48a03d2282282d -Author: AboudyKreidieh -Date: Thu Dec 20 17:57:10 2018 -0800 - - added changes from master - -commit 17b305b50651f4b33e19f309c9da9c0f36fcd508 -Author: AboudyKreidieh -Date: Thu Dec 20 17:55:33 2018 -0800 - - added changes from master - -commit ab1c963bf7c3dd8c003c9d0a7088e86ca9d93816 -Merge: ac30253d c6dffc8c -Author: AboudyKreidieh -Date: Thu Dec 20 17:42:11 2018 -0800 - - Merge branch 'kernel_vehicle' into aimsun_kernel - -commit c6dffc8c590171b4ec0dd123124a2352f16036ff -Author: AboudyKreidieh -Date: Thu Dec 20 17:41:03 2018 -0800 - - bug fixes - -commit 6a9bfb89ab94e943f5770d47a9e2c4a701e43e97 -Merge: 51bd153d 4c81bb56 -Author: AboudyKreidieh -Date: Thu Dec 20 15:17:38 2018 -0800 - - Merge branch 'kernel_scenario' into kernel_vehicle - -commit 4c81bb56d78eb2ac0540f1bab6bf06d79b7ce4d9 -Author: AboudyKreidieh -Date: Thu Dec 20 15:17:15 2018 -0800 - - pep8 - -commit 51bd153d2ceeb59f633045241803539e9c842bce -Merge: 92daad50 7ee4994b -Author: AboudyKreidieh -Date: Thu Dec 20 15:13:33 2018 -0800 - - Merge branch 'kernel_scenario' into kernel_vehicle - -commit 7ee4994b88ff35b748f998cd96268e175ba388d7 -Author: AboudyKreidieh -Date: Thu Dec 20 15:10:18 2018 -0800 - - bug fixes - -commit d806dbed704922e1d03e09dab54b7200f9723e10 -Author: AboudyKreidieh -Date: Thu Dec 20 11:36:40 2018 -0800 - - more bug fixes - -commit b41c008362cfd908e00eb3e5fe216d65fac4d625 -Merge: 8b760a64 c7d591cb -Author: Aboudy Kreidieh -Date: Thu Dec 20 10:41:07 2018 -0800 - - Merge pull request #322 from flow-project/check_junction - - Enable collision checks at intersections - -commit 485d9d79e3ce56dc6774e2688528326e0afda4bf -Merge: 92ea2e7c 99fdea14 -Author: AboudyKreidieh -Date: Thu Dec 20 10:30:40 2018 -0800 - - Merge branch 'netfile_osm_merge' into kernel_scenario - -commit 92ea2e7cb9c0efc20c6d6a1132bdcd0cf65d6657 -Author: AboudyKreidieh -Date: Thu Dec 20 09:52:49 2018 -0800 - - bug fixes - -commit c7d591cb62d94c946e5696413b07b745739fbb88 -Author: Fangyu Wu -Date: Wed Dec 19 23:33:21 2018 -0800 - - Enable collision checks at intersections. - -commit bb8edb5e03873eb962f6141b7fb24d1bf6a58a13 -Author: AboudyKreidieh -Date: Wed Dec 19 23:05:47 2018 -0800 - - some mods - -commit eee492930907dec7423f5ad99be14051b57c75f1 -Merge: 84ea1184 8b760a64 -Author: AboudyKreidieh -Date: Wed Dec 19 21:05:58 2018 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into custom_start_pos - -commit 92daad508208b2c07449cc1d741242d10ec8ba54 -Merge: 46a98639 abf7907d -Author: AboudyKreidieh -Date: Wed Dec 19 20:50:55 2018 -0800 - - Merge branch 'kernel_scenario' into kernel_vehicle - -commit abf7907db022d25ae729183a7ad2cf1b1157c1db -Merge: b1d134bb 39b5658b -Author: AboudyKreidieh -Date: Wed Dec 19 20:32:47 2018 -0800 - - Merge branch 'kernel_traffic_lights' into kernel_scenario - -commit 39b5658ba5c1d6b0417777390b318d35cdcc365a -Author: AboudyKreidieh -Date: Wed Dec 19 20:26:15 2018 -0800 - - renamed TrafficLights -> TrafficLightParams - -commit 408306eb49d4d31f00c2d21df17123762fa6f78b -Merge: 324707fd 8b760a64 -Author: AboudyKreidieh -Date: Wed Dec 19 17:41:20 2018 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into kernel_traffic_lights - -commit 8b760a645782cdc6cfaf7fdff3a9ec13d5d08161 -Merge: f39a7853 f82a1926 -Author: Aboudy Kreidieh -Date: Wed Dec 19 17:38:26 2018 -0800 - - Merge pull request #320 from flow-project/scenario_compatibility - - Scenario compatibility - -commit f39a785383d6125e5f8bd3b6b5188f2606a0a1ef -Merge: c53a3f44 ef27abcd -Author: Aboudy Kreidieh -Date: Wed Dec 19 17:32:09 2018 -0800 - - Merge pull request #313 from flow-project/tests_cleanup - - removed a redundant test - -commit 564ad5a3e4e3c94cd26cca9ed56b9ee0fc599cc2 -Merge: 3d342470 c53a3f44 -Author: AboudyKreidieh -Date: Wed Dec 19 17:21:27 2018 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into redis_error - -commit c53a3f44f5495cb0d88d137dcb67912290eea83f -Merge: 802a2c68 9f81931b -Author: Aboudy Kreidieh -Date: Wed Dec 19 17:11:20 2018 -0800 - - Merge pull request #281 from flow-project/kernel_simulation - - Kernel simulation - - added traci vehicle simulation kernel - - replaced `start_sumo` with kernel call - - replaced simulation-based traci calls with kernel calls - -commit f82a19267d6e54acdf5c57cd3e0a90de8b010e9c -Author: AboudyKreidieh -Date: Wed Dec 19 17:05:16 2018 -0800 - - PR fix - -commit ef27abcd74be04222d9a1b4079456fbc3284a91b -Merge: a5c4eab7 802a2c68 -Author: AboudyKreidieh -Date: Wed Dec 19 17:03:22 2018 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into tests_cleanup - -commit 99fdea14182bac7de64205e4d13520712aeeac57 -Author: AboudyKreidieh -Date: Wed Dec 19 11:44:02 2018 -0800 - - converted edges_distribution into a variable - -commit f1d6a1884b10c5394086e7f4727057b7612a893c -Author: AboudyKreidieh -Date: Wed Dec 19 11:20:36 2018 -0800 - - defined default edge_starts within base scenario class - -commit 802a2c683307776b9f7e11e963f56bfe4b8f3e9a -Author: Aboudy Kreidieh -Date: Wed Dec 19 11:09:01 2018 -0800 - - Sumo exp cleanup (#311) - - * removed scenario parameter from SumoExperiment objects - - * modified tutorials to be compatible with parameter removal from SumoExperiment - -commit dc57462112fe7a2232a1d9c6fdce9de7f6a921b4 -Author: Aboudy Kreidieh -Date: Wed Dec 19 11:06:34 2018 -0800 - - added a get_type method to the vehicles class (#312) - - * added a get_type method to the vehicles class - - * bug fix - -commit 1842d83c801e8f6df66e80514b95a4e01235fffe -Author: AboudyKreidieh -Date: Wed Dec 19 11:05:23 2018 -0800 - - moved generate_net methods of osm and net sceanrios to base scenario class - -commit 98d0fd6d1310a927d90930b62db44f1d7f82a105 -Author: Aboudy Kreidieh -Date: Wed Dec 19 11:03:54 2018 -0800 - - added test for wave attenuation reset (#314) - -commit 456d3cf4aaa6df9cd43753b5dc523b61e75ba2d4 -Author: Aboudy Kreidieh -Date: Wed Dec 19 11:03:15 2018 -0800 - - added test for reset in bottleneck env (#315) - -commit 324707fdb881a931c9ba90d3b474ebb512fd220f -Merge: 94920de7 cfaa64a6 -Author: AboudyKreidieh -Date: Tue Dec 18 21:45:52 2018 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into kernel_traffic_lights - -commit 9f81931bb12d65b455f597da602364f8c6d238d6 -Merge: 54190469 cfaa64a6 -Author: AboudyKreidieh -Date: Tue Dec 18 21:45:19 2018 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into kernel_simulation - -commit 33f10af275b3021a8881806c80aa80f2670ea97c -Merge: a6671e07 cfaa64a6 -Author: AboudyKreidieh -Date: Tue Dec 18 21:40:35 2018 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into scenario_compatibility - -commit cfaa64a6a99b473d7f7fe584663b1818afecb056 -Merge: 9b0fcc64 e52aad86 -Author: Aboudy Kreidieh -Date: Tue Dec 18 21:39:38 2018 -0800 - - Merge pull request #303 from flow-project/clip_rewards - - added action clipping for rewards - -commit e52aad8657f7a5bb36e9e3429aaffc61dafdb496 -Author: AboudyKreidieh -Date: Tue Dec 18 21:22:20 2018 -0800 - - docstring - -commit dbedbb78bd9fb4e616c1b43dd6b38509469be07f -Merge: a9689c27 c8805bcb -Author: AboudyKreidieh -Date: Tue Dec 18 21:22:00 2018 -0800 - - Merge branch 'travis_fix' into clip_rewards - -commit a9689c2790c29c5af2f5bd4caecb291518a07898 -Author: AboudyKreidieh -Date: Tue Dec 18 21:18:46 2018 -0800 - - minor cleanup to documentation - -commit 804ffe8e9c886c23900f4b53bded368f0fa8f7f5 -Author: AboudyKreidieh -Date: Tue Dec 18 21:16:01 2018 -0800 - - minor cleanup to documentation - -commit 94920de7983bdaf4da5fbab5cf3f851d91d85452 -Merge: 8ab584a1 54190469 -Author: AboudyKreidieh -Date: Tue Dec 18 12:38:28 2018 -0800 - - Merge branch 'kernel_simulation' into kernel_traffic_lights - -commit a6671e0702159bbc78bba9706d39a6a77f72b692 -Author: AboudyKreidieh -Date: Tue Dec 18 12:32:05 2018 -0800 - - bug fixes - -commit 8ab584a1c213ab0b991cd0aea08880fad82b56e0 -Merge: 22509745 c8805bcb -Author: AboudyKreidieh -Date: Tue Dec 18 12:25:24 2018 -0800 - - Merge branch 'travis_fix' into kernel_traffic_lights - -commit 541904690c01e92e74cbc2d5261087e81c67869a -Merge: 7e87b2e0 c8805bcb -Author: AboudyKreidieh -Date: Tue Dec 18 12:20:43 2018 -0800 - - Merge branch 'travis_fix' into kernel_simulation - -commit 46a986394f957c21690b01a59d27ff1d5a767374 -Merge: 7da86b0c b1d134bb -Author: AboudyKreidieh -Date: Tue Dec 18 11:35:55 2018 -0800 - - Merge branch 'kernel_scenario' into kernel_vehicle - -commit b1d134bb2c2e4227fae0ce24ee160daf8b739b8e -Merge: 3970b54b a481852e -Author: AboudyKreidieh -Date: Tue Dec 18 11:35:22 2018 -0800 - - Merge branch 'scenario_compatibility' into kernel_scenario - -commit a481852ea44f0c89e2bef72f87531560fdda610f -Author: AboudyKreidieh -Date: Tue Dec 18 11:33:00 2018 -0800 - - bug fixes - -commit ac30253d0b4384b8c025ac17cf368eccfe0eab2c -Author: AboudyKreidieh -Date: Tue Dec 18 11:27:46 2018 -0800 - - some modifications - -commit 908506a1d38023c89eb360b526dc3a73dc90dea1 -Merge: 3620da1a 7da86b0c -Author: AboudyKreidieh -Date: Tue Dec 18 11:02:01 2018 -0800 - - Merge branch 'kernel_vehicle' into aimsun_kernel - -commit 7da86b0cd6ce89ee7bca0471423bd272a31f945c -Merge: d2106254 3970b54b -Author: AboudyKreidieh -Date: Tue Dec 18 10:53:41 2018 -0800 - - Merge branch 'kernel_scenario' into kernel_vehicle - -commit 3970b54bc6dc5b049268aabe172142d7d164eaef -Merge: bd8bd182 4fafa333 -Author: AboudyKreidieh -Date: Tue Dec 18 10:52:35 2018 -0800 - - Merge branch 'scenario_compatibility' into kernel_scenario - -commit 4fafa333d7f3d0e41275959507747b6750a5bb34 -Merge: 6502c701 c8805bcb -Author: AboudyKreidieh -Date: Tue Dec 18 10:31:10 2018 -0800 - - Merge branch 'travis_fix' into scenario_compatibility - -commit c8805bcbb2b41e3ff06a683e97c28b351c5b522a -Author: AboudyKreidieh -Date: Tue Dec 18 10:30:44 2018 -0800 - - fixed miniconda issues in travis - -commit 6502c701b3a91f7661e0db15904ac9372d21934e -Author: AboudyKreidieh -Date: Tue Dec 18 10:27:51 2018 -0800 - - modified definition of node, edge, connections, and types - -commit 3620da1a8c8f8f9af4045136075602999bbb4423 -Author: Yasharzf -Date: Mon Dec 17 15:55:45 2018 -0800 - - added aimsun kernel components - -commit d21062541b5d74bc5d5aee410c100c71f57c8f39 -Merge: 0633ef11 48664478 -Author: AboudyKreidieh -Date: Mon Dec 17 13:17:28 2018 -0800 - - Merge branch 'vehicle_params_2' into kernel_vehicle - -commit bd8bd182b1691d15a1871c81a706d93ce91539a9 -Merge: 19d871f0 48664478 -Author: AboudyKreidieh -Date: Mon Dec 17 13:16:58 2018 -0800 - - Merge branch 'vehicle_params_2' into kernel_scenario - -commit 4866447812b35b96b66f8c9ffcab13ba54bfea7e -Author: AboudyKreidieh -Date: Mon Dec 17 13:16:01 2018 -0800 - - remove comment - -commit 20b6ea517ab8a0f32305e24c468cbedbdbece6ae -Author: AboudyKreidieh -Date: Mon Dec 17 13:04:11 2018 -0800 - - cleanup travis - -commit 7e87b2e06a3ee2730edaf16c6f464961b6aaa069 -Author: AboudyKreidieh -Date: Mon Dec 17 12:46:13 2018 -0800 - - bug fix - -commit 16aa96abed81dd854cdee827952ac24b852a49c1 -Merge: e3e835c9 9b0fcc64 -Author: AboudyKreidieh -Date: Mon Dec 17 12:41:35 2018 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into kernel_simulation - -commit 9f8b2cf8798093aaf7caaf388c918d9010b7e46a -Merge: ceb51eeb 9b0fcc64 -Author: AboudyKreidieh -Date: Mon Dec 17 12:41:07 2018 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into vehicle_params_2 - -commit 9b0fcc6478cb02f8b47c53d321893368498701e0 -Merge: e89684ea b7be1ec0 -Author: Aboudy Kreidieh -Date: Mon Dec 17 12:40:20 2018 -0800 - - Merge pull request #254 from flow-project/vehicle_params - - Vehicle params - - In this PR, the sumo speed and lane change modes are moved from the `add` method of the vehicles class and into the `SumoCarFollowingParams` and `SumoLaneChangeParams` objects, respectively. This is meant to move all sumo-specific vehicle parameters to a few set of objects, and keep it out of the `Vehicles` class as a whole. - - Example usage: - - Before: - - ``` - vehicles.add( - veh_id="test", - sumo_car_following_params=SumoCarFollowingParams(), - sumo_lc_params=SumoLaneChangeParams(), - speed_mode=9, - lane_change_mode=0 - ) - ``` - - After: - - ``` - vehicles.add( - veh_id="test", - sumo_car_following_params=SumoCarFollowingParams( - speed_mode=9, - ), - sumo_lc_params=SumoLaneChangeParams( - lane_change_mode=0, - ), - ) - ``` - -commit 0633ef111e2fd493877c12c6003a1ff681987f7f -Merge: 357db27a e89684ea -Author: AboudyKreidieh -Date: Mon Dec 17 01:00:19 2018 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into kernel_vehicle - -commit 19d871f0982851f4810d67c3a3465e875368ac05 -Merge: e5bfdfc2 e89684ea -Author: AboudyKreidieh -Date: Mon Dec 17 00:59:49 2018 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into kernel_scenario - -commit 22509745f496bbc25a83bef85a192641cae25166 -Merge: 4c9e7c2e e89684ea -Author: AboudyKreidieh -Date: Mon Dec 17 00:59:11 2018 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into kernel_traffic_lights - -commit e3e835c93329494ebef2637e7831700c5188b5d6 -Merge: 0290fd0f e89684ea -Author: AboudyKreidieh -Date: Mon Dec 17 00:58:33 2018 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into kernel_simulation - -commit e89684ead97822f6cdecc7433b0dd95812444937 -Merge: 473154ae 71bb00e1 -Author: Aboudy Kreidieh -Date: Mon Dec 17 00:57:52 2018 -0800 - - Merge pull request #253 from flow-project/kernel_abstract - - Kernel abstractions - -commit b7be1ec0e571c1bbc9e615805392693faf765f08 -Author: AboudyKreidieh -Date: Mon Dec 17 00:48:53 2018 -0800 - - PR fix - -commit 71bb00e12af959cb643f9e127a35865dedf72201 -Author: AboudyKreidieh -Date: Mon Dec 17 00:40:02 2018 -0800 - - changes from newer flow commits - -commit e5bfdfc278c886aefc513ec27a6d92e44cd50230 -Author: AboudyKreidieh -Date: Sun Dec 16 15:40:31 2018 -0800 - - bug fixes - -commit 357db27a099bb2b4780dce3e129dbc98792b12ce -Author: AboudyKreidieh -Date: Sun Dec 16 15:37:26 2018 -0800 - - bug fixes - -commit 58834b94ff81710a214b703f4c041d0a883f8d4a -Author: AboudyKreidieh -Date: Sat Dec 15 23:32:12 2018 -0800 - - pep8 - -commit 5c8b32f86e69e992b2110f8e2f88efe74cb5ecb2 -Author: AboudyKreidieh -Date: Sat Dec 15 22:32:24 2018 -0800 - - bug fixes - -commit 66f3ab9c6e32ccaca3998ca6cadc54bd2cea7239 -Author: AboudyKreidieh -Date: Sat Dec 15 22:29:07 2018 -0800 - - more traci cleanup - -commit d464177ba14d63d5b4532340741ed75989fb0093 -Merge: bf88123a d480ed0a -Author: AboudyKreidieh -Date: Sat Dec 15 22:18:25 2018 -0800 - - Merge branch 'traci_cleanup' into kernel_vehicle - -commit d480ed0a865d8041dfa231f15156202edd3ef694 -Author: AboudyKreidieh -Date: Sat Dec 15 22:10:05 2018 -0800 - - removed some traci calls - -commit bf88123a01fce532e6d3ecfe6879b4896836a8f3 -Author: AboudyKreidieh -Date: Sat Dec 15 20:28:16 2018 -0800 - - minor bug fixes - -commit 758c61eda0730a3b94d7664ee23e9d1a86b3eea5 -Merge: 41b75b90 473154ae -Author: AboudyKreidieh -Date: Sat Dec 15 20:09:26 2018 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into kernel_vehicle - -commit 41b75b90719816bff2766d4120ed62bc0f4851fd -Author: AboudyKreidieh -Date: Sat Dec 15 20:05:09 2018 -0800 - - replaced many of the vehicle class calls - -commit ceac732c62b7975fcb33ae9c2af05c21de1bca20 -Author: AboudyKreidieh -Date: Sat Dec 15 18:09:03 2018 -0800 - - moved the Vehicles class to params.py - -commit 3fe2f0160de20fe95db7a30db06c0132409da360 -Merge: 5c6229b4 4c9e7c2e -Author: AboudyKreidieh -Date: Sat Dec 15 17:56:03 2018 -0800 - - Merge branch 'kernel_traffic_lights' into kernel_vehicle - -commit 5c6229b4d9587bb86bb97ae0f96a5b93c490b729 -Author: AboudyKreidieh -Date: Sat Dec 15 16:35:45 2018 -0800 - - started adding vehicles kernel - -commit 84ea118447728573e1a2e1f314c74df29f723448 -Author: AboudyKreidieh -Date: Sat Dec 15 16:07:32 2018 -0800 - - bug fixes - -commit 22f9bdf2ac3bd1da51b5465708cd6e9fa23d5a4d -Merge: b6bbda14 473154ae -Author: AboudyKreidieh -Date: Sat Dec 15 16:04:59 2018 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into custom_start_pos - -commit 473154ae156e8aad8bba8828fa6f442aee28366b -Merge: ed11d58a d0d540e4 -Author: Aboudy Kreidieh -Date: Sat Dec 15 16:02:41 2018 -0800 - - Merge pull request #248 from flow-project/tests_rewards - - Tests rewards - -commit d0d540e4a182fa147e7273fae391a7fb7fb787a4 -Author: AboudyKreidieh -Date: Sat Dec 15 15:21:34 2018 -0800 - - PR fixes - -commit 5754a2f602963f2c3243e9dd923c5d178f657d5c -Merge: 1e4b0f07 5f1708c1 -Author: AboudyKreidieh -Date: Sat Dec 15 11:58:03 2018 -0800 - - Merge branch 'vehicle_params' into kernel_scenario - -commit ceb51eeb80467846ff663b77a6cb7d2e20632933 -Merge: cd1d8c36 5f1708c1 -Author: AboudyKreidieh -Date: Sat Dec 15 11:57:18 2018 -0800 - - Merge branch 'vehicle_params' into vehicle_params_2 - -commit 5f1708c1abbf3e7bc8ab43433abe6dd7c86fdbb1 -Author: AboudyKreidieh -Date: Sat Dec 15 11:56:32 2018 -0800 - - bug fix - -commit b6bbda14655bfb5f0699dd5a71b50a8261787a4c -Author: AboudyKreidieh -Date: Sat Dec 15 11:12:54 2018 -0800 - - bug fixes - -commit 1e4b0f073d18b75ffdb2f34553fe7ac787984da7 -Author: AboudyKreidieh -Date: Sat Dec 15 11:10:35 2018 -0800 - - custom spacing for grid - -commit a5c4eab7e98e586e41f827655769fcf860e6110d -Author: AboudyKreidieh -Date: Sat Dec 15 11:02:09 2018 -0800 - - minor cleanup - -commit 233b03907559134d0b0c0cc62a818a7d66a50969 -Author: AboudyKreidieh -Date: Sat Dec 15 10:46:17 2018 -0800 - - some compatibility issues - -commit 65045549d9c3dec9c97e350e992caf82c80f9ec3 -Author: AboudyKreidieh -Date: Fri Dec 14 23:23:43 2018 -0800 - - cleanup - -commit dbda3a7cc2c15c89d56a8eefe4deba5eac695a60 -Author: AboudyKreidieh -Date: Fri Dec 14 23:16:58 2018 -0800 - - converted gen_custom_start_pos to a staticmethod - -commit 622b66132cd49fcf808a23f8f8136699a959a109 -Author: AboudyKreidieh -Date: Fri Dec 14 22:54:09 2018 -0800 - - modified grid to support custom spacing - -commit f5635829bba6bf9f2ea5a3005e49bde1e26896eb -Author: AboudyKreidieh -Date: Fri Dec 14 19:59:40 2018 -0800 - - turned gen_custom_start_pos to staticmethod - -commit a7f5c7e84a1338460bc56299528e6daac5735f36 -Merge: da14fecd fe9b26f1 -Author: AboudyKreidieh -Date: Fri Dec 14 19:16:44 2018 -0800 - - Merge branch 'test_bottleneck_reset' into kernel_scenario - -commit fe9b26f18a89e7035f5ac2a84fab61241c79d54f -Author: AboudyKreidieh -Date: Fri Dec 14 17:23:52 2018 -0800 - - added test for reset in bottleneck env - -commit da14fecd395df2c8db42b9504fd92c2d992220b2 -Author: AboudyKreidieh -Date: Fri Dec 14 16:51:43 2018 -0800 - - passing the custom start pos to the scenario kernel - -commit e1b628ef8e8765382dc2ef73a3fa059493a875ab -Author: AboudyKreidieh -Date: Fri Dec 14 15:21:29 2018 -0800 - - more minor - -commit e6c5724e3e18489b104aac0a2c257afacf1be169 -Author: AboudyKreidieh -Date: Fri Dec 14 15:09:34 2018 -0800 - - minor - -commit 80db85e36ae03d6300f0af5d8d4b36e25cc31fe2 -Merge: f970aeb0 af9d0e87 -Author: AboudyKreidieh -Date: Fri Dec 14 14:53:47 2018 -0800 - - Merge branch 'tests_wave_attenuation' into kernel_scenario - -commit af9d0e876abc82a14e03e6cc82339bb695ac5b03 -Author: AboudyKreidieh -Date: Fri Dec 14 14:52:20 2018 -0800 - - added test for wave attenuation reset - -commit f970aeb0e133b7b5cfcb0a8b3477f92d7862e2a9 -Author: AboudyKreidieh -Date: Fri Dec 14 14:33:52 2018 -0800 - - more fixes - -commit 00e6dcb2a3b8dd3bbd6db57d476fcee19b72657b -Author: AboudyKreidieh -Date: Fri Dec 14 11:44:00 2018 -0800 - - some tests for mods - -commit 1d8cc480e08c59fe07366fad118a35fa12b27f25 -Merge: f8c405cb cd1d8c36 -Author: AboudyKreidieh -Date: Fri Dec 14 11:33:47 2018 -0800 - - Merge branch 'vehicle_params_2' into kernel_scenario - -commit f8c405cbce43d1f4ff03d8e7f6646ba6cba8826d -Author: AboudyKreidieh -Date: Fri Dec 14 11:28:10 2018 -0800 - - some more minor changes - -commit c57c2f424935cb7b4332a8d4b590a88a774d30c7 -Merge: 2922720e 0290fd0f -Author: AboudyKreidieh -Date: Fri Dec 14 11:20:22 2018 -0800 - - Merge branch 'kernel_simulation' into kernel_scenario - -commit 0290fd0f15cba724e96478d6cc21842b5bf5fc62 -Author: AboudyKreidieh -Date: Fri Dec 14 11:19:32 2018 -0800 - - moved simulation subscription to the kernel - -commit 2922720e56617b5464c7de36a7f73743a2b8bd16 -Author: AboudyKreidieh -Date: Fri Dec 14 11:17:34 2018 -0800 - - started trying to resolve tests - -commit 00115cc376112037f2c6620f66041603d24733fb -Merge: 000e643f 8921dce6 -Author: AboudyKreidieh -Date: Fri Dec 14 11:11:23 2018 -0800 - - Merge branch 'tests_cleanup' into kernel_scenario - -commit 8921dce6099b39b65f74475fa694c8f7f348a749 -Author: AboudyKreidieh -Date: Fri Dec 14 11:08:49 2018 -0800 - - removed a redundant test - -commit 000e643f277ad6dee3fea654869a6badcf1cb4ae -Author: AboudyKreidieh -Date: Fri Dec 14 11:07:52 2018 -0800 - - more changes for scenario kernel - -commit a6939405f94ce986f6e37e9106bff7750929755b -Author: AboudyKreidieh -Date: Thu Dec 13 23:52:19 2018 -0800 - - more fixes to support integration - -commit b42a2d39dc425aa60f75bede5ecef4a954bfdbb6 -Merge: ecb59630 721e5273 -Author: AboudyKreidieh -Date: Thu Dec 13 23:38:29 2018 -0800 - - Merge branch 'get_type' into kernel_scenario - -commit 721e52730c298a1f891f9acbf43a3e79706eb2df -Author: AboudyKreidieh -Date: Thu Dec 13 23:38:06 2018 -0800 - - bug fix - -commit ecb596308dc381ae26f0130aa721a9f440705a01 -Merge: 1f01d602 bffc2ee6 -Author: AboudyKreidieh -Date: Thu Dec 13 23:36:20 2018 -0800 - - Merge branch 'get_type' into kernel_scenario - -commit bffc2ee691bb5a9cb6b8a284b0a674d13ea9250c -Author: AboudyKreidieh -Date: Thu Dec 13 23:32:51 2018 -0800 - - added a get_type method to the vehicles class - -commit ed11d58ad66dd5b8f3a5a958d1178f833be3a4d7 -Merge: bd1d75d7 18548438 -Author: Aboudy Kreidieh -Date: Thu Dec 13 23:14:10 2018 -0800 - - Merge pull request #309 from CYBruce/patch-2 - - some trivial edit. - -commit 1f01d602b090843522eacc2031fba1f4b5ae87a2 -Author: AboudyKreidieh -Date: Thu Dec 13 19:07:04 2018 -0800 - - more changes for scenario kernel - -commit 5eac1ca70cce59c57655e5520c814eaba05f5c83 -Merge: c7a72cee 9d043758 -Author: AboudyKreidieh -Date: Thu Dec 13 18:42:51 2018 -0800 - - Merge branch 'sumo_exp_cleanup' into kernel_scenario - -commit 9d043758f8f16a62012e6b163b25e45113e127bc -Author: AboudyKreidieh -Date: Thu Dec 13 18:37:57 2018 -0800 - - modified tutorials to be compatible with parameter removal from SumoExperiment - -commit c05c4c5cbd58c92520a6393e43d604f17c7b7aba -Author: AboudyKreidieh -Date: Thu Dec 13 18:30:31 2018 -0800 - - removed scenario parameter from SumoExperiment objects - -commit c7a72ceeb5d8b7ee379fac48ccca22790fcc0704 -Author: AboudyKreidieh -Date: Thu Dec 13 18:01:55 2018 -0800 - - started adding scenario kernel - -commit 4c9e7c2eb76fb5e28f8ce7bb8d48563615585e03 -Author: AboudyKreidieh -Date: Thu Dec 13 13:46:49 2018 -0800 - - compatibility with utils test - -commit bcf01852bc7d587633da492593d0ddbaa6a31d40 -Author: AboudyKreidieh -Date: Thu Dec 13 13:24:38 2018 -0800 - - changed traffic light to kernel calls - -commit bd1d75d77d39a53bf8eacf42774ba0ad0a22837e -Author: CYBruce -Date: Fri Dec 14 05:24:06 2018 +0800 - - Update tutorial06_environments.ipynb (#308) - -commit a64dcbd5d509593876a13c3d14af2f9f540e949d -Author: AboudyKreidieh -Date: Thu Dec 13 12:59:53 2018 -0800 - - more bug fixes - -commit 18548438e3cecabb8c8de145aab7d59370951708 -Author: CYBruce <34786389+CYBruce@users.noreply.github.com> -Date: Thu Dec 13 16:26:13 2018 +0800 - - some trivial edit. - - Actually, the edge0 is not a node (from my understanding). So, I think this sentence may confuse some new reader like me. - -commit 741daba35dead5684ca00cb6ec32486f0bd0973f -Author: AboudyKreidieh -Date: Thu Dec 13 00:09:01 2018 -0800 - - bug fixes - -commit 9f9bb1e58619e48defdc33ca082783b57c588d1b -Author: AboudyKreidieh -Date: Wed Dec 12 23:54:23 2018 -0800 - - added traffic light kernel - -commit 0ca137125b987ed5f3489291437c159fccf21cd0 -Author: AboudyKreidieh -Date: Wed Dec 12 23:25:30 2018 -0800 - - moved the traffic light class to params.py - -commit 564c1e5540f7c52b7f34d30febeec5c0a0184f47 -Author: AboudyKreidieh -Date: Wed Dec 12 21:41:43 2018 -0800 - - bug fix - -commit 7e1e729335d78e7bd748d50c56031a9b67f967cb -Merge: 7dd90a01 f028e824 -Author: AboudyKreidieh -Date: Wed Dec 12 18:08:15 2018 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into kernel_simulation - -commit cd1d8c36ff290fbb82d70607dea312a18cbe5cac -Author: AboudyKreidieh -Date: Wed Dec 12 11:59:09 2018 -0800 - - fixed tests - -commit f028e8245a112d871c6226ba475674af5fd4ce40 -Merge: 69b66935 2d3e57c2 -Author: Aboudy Kreidieh -Date: Wed Dec 12 11:35:52 2018 -0800 - - Merge pull request #190 from flow-project/cloudpickleversion - - cloudpickle 0.5.3 doesn't work - -commit 2d3e57c2d4332789500be202d717da4e5da086e9 -Merge: 67cb9930 69b66935 -Author: AboudyKreidieh -Date: Wed Dec 12 00:47:34 2018 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into cloudpickleversion - -commit 695580a01cf6fe0ed93e43fd2e10036545e9fe13 -Author: AboudyKreidieh -Date: Wed Dec 12 00:40:47 2018 -0800 - - bug fixes - -commit f713b0c9f258067e5761de9b7f028bd8d1eba919 -Merge: a12e5e26 d012d4cd -Author: AboudyKreidieh -Date: Tue Dec 11 22:03:54 2018 -0800 - - Merge branch 'vehicle_params' into vehicle_params_2 - -commit d012d4cd9578ad13b965b28a314ec66ed33d36ef -Author: AboudyKreidieh -Date: Tue Dec 11 21:46:04 2018 -0800 - - bug fixes - -commit 69b66935ec9f76445461a43d8985522208aebcb7 -Author: Kanaad Parvate -Date: Tue Dec 11 21:10:42 2018 -0800 - - Benchmark regression tests (#258) - - * added regression test autoscale script, and modified rllib runners to be more general - - * added run all benchmarks script - - * pep8 - - * added special case for grid0, grid1, clean up runscript - - * addressed PR comments - - * spot price - - * flake8 - - * Update README.md - - * Update benchmark_autoscale.yaml - - * Update es_runner.py - -commit 51b5977ba92d0a1854aa65727d15faf8b374dd50 -Author: Eugene Vinitsky -Date: Tue Dec 11 21:09:16 2018 -0800 - - Update .coveragerc - -commit 81159e096f90b9ed523016b4dfe5bcb9c7ba9126 -Author: AboudyKreidieh -Date: Tue Dec 11 20:46:23 2018 -0800 - - modifications to the jsons for new params - -commit 4dc462510ec53791ec6ed06189ff8c68ca3e84e2 -Author: AboudyKreidieh -Date: Tue Dec 11 20:41:44 2018 -0800 - - bug fix - -commit c9838a8a77e213049972789bd377fec4f92cbf7e -Merge: 42488371 d0633429 -Author: AboudyKreidieh -Date: Tue Dec 11 20:39:28 2018 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into vehicle_params - -commit f442d57f8cde97d89b51780d741bbf4a0e1f71b4 -Author: AboudyKreidieh -Date: Tue Dec 11 20:25:11 2018 -0800 - - PR fixes - -commit 3304e7c9737c5da0b4e838f53c89bb4d0c23f513 -Merge: 8bd7ba53 d0633429 -Author: AboudyKreidieh -Date: Tue Dec 11 20:07:38 2018 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into tests_rewards - -commit d06334298be2770968085eb5cb81f7f2eec56d33 -Merge: 2b16f6f2 02618ab6 -Author: Aboudy Kreidieh -Date: Tue Dec 11 19:47:40 2018 -0800 - - Merge pull request #295 from flow-project/debugger - - Minor bug fixes - -commit 2b16f6f2d37f1e369c03d0b00dee7f210dadc18d -Merge: 77da84e7 61c46ad8 -Author: Aboudy Kreidieh -Date: Tue Dec 11 19:39:59 2018 -0800 - - Merge pull request #297 from flow-project/config_sync_s3 - - added flow/config to gitignore, and fixed scripts/syncs3 - -commit 8e7e14e0a663ea81eb08a4234da5608b52387211 -Author: eugenevinitsky -Date: Fri Dec 7 18:15:17 2018 -0800 - - bug fix - -commit 8abab0b858b33a7e270f033df4da92d74210b37e -Author: eugenevinitsky -Date: Fri Dec 7 17:50:13 2018 -0800 - - added action clipping for rewards - -commit 361d5c746e5513fb353daede6b5c4679ebd5042d -Author: eugenevinitsky -Date: Fri Dec 7 14:43:09 2018 -0800 - - pep8 again - -commit c5d53a54f9c95dd369acaaceb7a13af13d1a208b -Author: eugenevinitsky -Date: Fri Dec 7 14:34:53 2018 -0800 - - pep8 - -commit 7b04b9e55469c7063521c862c64e6094b5aa3eea -Author: eugenevinitsky -Date: Fri Dec 7 14:26:46 2018 -0800 - - added fixme flag - -commit 6d7fd07281d0772ee5adb7db81486f5a428aa00c -Author: eugenevinitsky -Date: Wed Dec 5 13:33:20 2018 -0800 - - changed bottleneck values up - -commit e2c85691aec93bc057499da206cfab9f85fe6201 -Author: eugenevinitsky -Date: Tue Dec 4 14:04:45 2018 -0800 - - updated ubuntu1604 path - -commit 4451d54aa025dd5f0b5960744fb5238fa39d4a30 -Merge: db7d5b4d 77da84e7 -Author: eugenevinitsky -Date: Tue Dec 4 12:41:11 2018 -0800 - - master merge - -commit db7d5b4dceaa2751c89285f6153294fa550dd989 -Author: eugenevinitsky -Date: Tue Dec 4 12:03:24 2018 -0800 - - minor - -commit 77da84e768958c823ea191dc0508369319858bbe -Merge: e19d0bad 37c97786 -Author: Aboudy Kreidieh -Date: Tue Dec 4 01:20:22 2018 -0800 - - Merge pull request #263 from kjang96/benchmark_baseline_tests - - Tests for benchmarks and baselins - -commit e19d0bad1f0c8e4503be6163c7a5c457dfc4ba30 -Merge: 0ee8ce91 37f695d4 -Author: Aboudy Kreidieh -Date: Mon Dec 3 23:20:06 2018 -0800 - - Merge pull request #256 from flow-project/base_env_cleanup - - Base env cleanup - -commit 0ec94a046b34f043ea609ba244390e6ba837b46a -Author: eugenevinitsky -Date: Mon Dec 3 21:41:24 2018 -0800 - - minor - -commit 465d765d9d035899fc2a0b6ea52467f052ee0687 -Author: eugenevinitsky -Date: Mon Dec 3 21:40:20 2018 -0800 - - found missing error - -commit 68240688d5c005ff08db23bc0eb5a52bcc07c81e -Author: eugenevinitsky -Date: Mon Dec 3 21:38:23 2018 -0800 - - minor - -commit 1859c9fe57de5e9d908f9992c8d48fc4a742663f -Author: eugenevinitsky -Date: Mon Dec 3 20:55:36 2018 -0800 - - changed 1804 s3 path - -commit 21e174684ca2e6fb3d8c5bdaf59a23610ded6128 -Author: eugenevinitsky -Date: Mon Dec 3 20:02:02 2018 -0800 - - changed where files are pulled from - -commit 0ee8ce914917c31c58fe4f7429887a338c2b9b19 -Merge: ee82a5a1 ef93f596 -Author: nskh -Date: Mon Dec 3 19:02:10 2018 -0800 - - Merge pull request #40 from nskh/rllab_tutorial - - rllab ec2 tutorial - -commit ef93f5966e42a51fdaed2fcd6f416ebd8f907c8a -Author: Nishant Kheterpal -Date: Mon Dec 3 17:08:47 2018 -0800 - - localdocker - -commit c48e077cc671ceee52590ba9312e18b06320e3f4 -Merge: 00671ce9 ee82a5a1 -Author: Nishant Kheterpal -Date: Mon Dec 3 16:32:10 2018 -0800 - - pulled in master - -commit 8e0f38f373189458d1aaf8d4533c548660c39b7e -Author: Umang Sharaf -Date: Mon Dec 3 15:14:35 2018 -0800 - - commit for no collision - -commit 96863eb207675f4c1343f6ad6e3f102dd0a0881d -Author: eugenevinitsky -Date: Mon Dec 3 13:50:04 2018 -0800 - - not a global install - -commit 915288e06847164c7b886bc395508764a3bfff6f -Author: eugenevinitsky -Date: Mon Dec 3 13:43:54 2018 -0800 - - minor - -commit fddfc501bb75b28c05dfe01c78590024fbca228a -Author: eugenevinitsky -Date: Mon Dec 3 13:35:54 2018 -0800 - - bug in flake8 - -commit 0ceda40465f03b99abaec3b6c8d0c9fcd7ae76dd -Author: eugenevinitsky -Date: Mon Dec 3 13:29:01 2018 -0800 - - minor - -commit bba89139e593226146dd18ba756ecfbbc6963fb9 -Author: eugenevinitsky -Date: Mon Dec 3 12:35:46 2018 -0800 - - attempted to swap out sumo binaries - -commit a7886afbeb1f9f5b85e81de11c98a2e4817594b9 -Author: eugenevinitsky -Date: Sun Dec 2 19:46:31 2018 -0800 - - temporary - -commit 24796713211148cd8ded10b6c4affb1a006b1b7c -Author: eugenevinitsky -Date: Sun Dec 2 17:02:31 2018 -0800 - - minor - -commit 184f2b9962c74ccca1b860cf163447a3ef8e6459 -Author: eugenevinitsky -Date: Sun Dec 2 16:54:53 2018 -0800 - - minor - -commit 3f1bf1364c572085d97c67ad9fc5f07bfc10948f -Merge: 48058618 5a80599f -Author: eugenevinitsky -Date: Sun Dec 2 16:32:05 2018 -0800 - - Merge branch 'new_sumo_pr' of https://github.com/flow-project/flow into new_sumo_pr - -commit 480586185b79f5a5c8ec64057ccaa4ea9508c59d -Author: eugenevinitsky -Date: Sun Dec 2 16:31:54 2018 -0800 - - fixes for tests - -commit ee82a5a1d27c451b75e7d6e49ee9eba8d247cc4f -Author: yunerzxy -Date: Sun Dec 2 15:54:01 2018 -0800 - - solve naming conflict for new sumo (#292) - -commit 5a80599f0a76c69de290b5718b173c565beba59c -Author: Kanaad Parvate -Date: Fri Nov 30 21:28:23 2018 -0800 - - udpated ami in autoscale script - -commit 61c46ad8ddb49bcc70516763aa1b40f38cb5e518 -Author: Kanaad Parvate -Date: Fri Nov 30 20:30:46 2018 -0800 - - added flow/config to gitignore, and fixed scripts/syncs3 - -commit cb1f453e738ee644c6c49d4214c3d7d44a65cff4 -Merge: 85406913 0e1f7791 -Author: Fangyu Wu -Date: Fri Nov 30 17:55:48 2018 -0800 - - Merge pull request #294 from flow-project/pyglet_renderer_docs - - Add pyglet renderer to docs. - -commit 02618ab66c8bb87f5f1f36d8609460e76dade599 -Author: Fangyu Wu -Date: Fri Nov 30 17:03:03 2018 -0800 - - Fix test_examples import error. - -commit 0e1f779154dc6a5f797858cc6d6caddb33f082dc -Author: Fangyu Wu -Date: Fri Nov 30 16:57:15 2018 -0800 - - Fix typos and add a grayscale example. - -commit ec6b04702b88fcd64347953a18d6f40bb477c8a2 -Author: eugenevinitsky -Date: Fri Nov 30 16:42:52 2018 -0800 - - minor - -commit d3a08fd4ed53a95a9485c9e4a12d7636083f6373 -Author: eugenevinitsky -Date: Fri Nov 30 16:21:35 2018 -0800 - - missing methods in figure eight scenario - -commit 923b9c7925159e78ecea2111eff485153240e1cb -Author: Fangyu Wu -Date: Fri Nov 30 16:13:13 2018 -0800 - - Make sure number of lanes is properly reset. - -commit 3e2160a30593190ad33b1820f7c313f8271012c3 -Author: Fangyu Wu -Date: Fri Nov 30 16:09:35 2018 -0800 - - Rename to avoid conflict with pandas. - -commit 5a242d105b6c4156fcdf3bd8802e11ce76244ce5 -Author: Fangyu Wu -Date: Fri Nov 30 16:04:53 2018 -0800 - - Add pyglet renderer to docs. - -commit 5e2c6309fa245cfa016138086c625366792c1c34 -Author: eugenevinitsky -Date: Fri Nov 30 16:00:08 2018 -0800 - - pep8 - -commit dbc9a69665bf2e7c1b57a0339907beeb191f68b7 -Merge: a2d0d409 85406913 -Author: eugenevinitsky -Date: Fri Nov 30 15:45:36 2018 -0800 - - merged in master - -commit 37c977864442c17e8e3b493d20da21b92c95e83d -Author: Kathy Jang -Date: Fri Nov 30 15:05:20 2018 -0800 - - got rid of useless config and decreased batch size - -commit a35a1bd0d548fc7cda7b255e305b5306b47d7e15 -Merge: 10264c6f 85406913 -Author: eugenevinitsky -Date: Fri Nov 30 13:23:21 2018 -0800 - - Merge branch 'master' into visualize_benchmarks - -commit 8540691388a4eaea8a1207154158adb1079f6cb0 -Author: eugenevinitsky -Date: Fri Nov 30 13:18:35 2018 -0800 - - added save movie option to visualizer rllib (#283) - - * added save movie option to visualizer rllib - - * saved as datetime file - - * pep8 - - * made changes to pass tests and rename files - - * removed unneeded parser arg - - * consistent flags with bash - - * more descriptive - - * fix for code review - -commit 10264c6feff0c0d556ea06f03003e63bce764528 -Merge: 2f6451dd a0543907 -Author: eugenevinitsky -Date: Fri Nov 30 12:59:56 2018 -0800 - - Merge branch 'master' into visualize_benchmarks - -commit a0543907238063e31268bb4d7f7d11be30d3aaa9 -Merge: 37c01303 136a0b22 -Author: Aboudy Kreidieh -Date: Fri Nov 30 12:55:06 2018 -0800 - - Merge pull request #291 from flow-project/bug_fix - - Fix for accidental Ray dependencies - -commit 136a0b22b20d58a82f4c4b83adb2da4ecbc7d040 -Author: eugenevinitsky -Date: Fri Nov 30 11:24:42 2018 -0800 - - minor - -commit 262464d72c06d87ea15468f8e5e7a46efd4beaae -Author: eugenevinitsky -Date: Fri Nov 30 10:29:07 2018 -0800 - - minor - -commit 0ef70aff19078bde7b5f8b8b5fcceee49a016b84 -Author: eugenevinitsky -Date: Fri Nov 30 10:15:53 2018 -0800 - - minor - -commit 46ffaf7ef393595b17c8fcaf9d600c74b8490ad0 -Author: eugenevinitsky -Date: Fri Nov 30 10:14:58 2018 -0800 - - bug fix for issue - -commit 2f6451ddaeec52f69260dbfd47eea0dad0c643f1 -Author: eugenevinitsky -Date: Thu Nov 29 19:14:18 2018 -0800 - - working visualization and benchmark metric script - -commit 3c678a3441d39a01474e26f7e51e9aeb2abc3661 -Author: eugenevinitsky -Date: Thu Nov 29 14:29:27 2018 -0800 - - minor - -commit 25744592c6cf315036a8e055c7e8cad32472507e -Author: eugenevinitsky -Date: Thu Nov 29 13:44:16 2018 -0800 - - minor - -commit 42ee63bad94ef9cdb31da18e31192c7ecaffae26 -Author: eugenevinitsky -Date: Thu Nov 29 13:42:52 2018 -0800 - - better output flags - -commit c5facf457b9210db368d6cd0edfe6c334e63ed8f -Author: eugenevinitsky -Date: Thu Nov 29 13:21:44 2018 -0800 - - added benchmark tests to script - -commit 9f909a003676f3164c1e20def5a54bada155efbc -Author: eugenevinitsky -Date: Thu Nov 29 11:50:02 2018 -0800 - - minor - -commit df6b724740e8fa962de4fc59b1daac4a47d49af7 -Author: eugenevinitsky -Date: Thu Nov 29 10:56:00 2018 -0800 - - renamed - -commit 0abdb5d64b772581496f2af90250e2621d005837 -Author: eugenevinitsky -Date: Thu Nov 29 10:53:29 2018 -0800 - - moved visualization script - -commit 3d342470f0676d544587f275abb0d0e0e8c1b245 -Author: eugenevinitsky -Date: Thu Nov 29 10:51:14 2018 -0800 - - pep8 - -commit 37c013030393f563179e76f15460703d6a47cea3 -Author: Kathy Jang -Date: Thu Nov 29 10:50:06 2018 -0800 - - minor visualizer_rllib.py bug (#288) - -commit d39cd4c5962e75c6c1d24e1334b61baa452ed8d0 -Author: eugenevinitsky -Date: Thu Nov 29 10:49:03 2018 -0800 - - script is working - -commit 5ef7293343dec8ae2b5545ec919e56d22806a395 -Author: eugenevinitsky -Date: Thu Nov 29 10:46:38 2018 -0800 - - script to generate videos is working, need to find silent mode so that it can run in the background - -commit 753fa2527051d602cd962a515cb105b321cb735b -Merge: c495165e 8e9455b1 -Author: eugenevinitsky -Date: Thu Nov 29 10:44:17 2018 -0800 - - Merge branch 'save_movie' into visualize_benchmarks - -commit c495165e035c433fb48f7e1b52d51ef34d01b259 -Author: eugenevinitsky -Date: Wed Nov 28 17:56:13 2018 -0800 - - benchmark movie saving script - -commit 2e58f35fc381f8c793e8231e4e9efaf27729e3a7 -Author: eugenevinitsky -Date: Wed Nov 28 17:50:46 2018 -0800 - - start of benchmark visualization script - -commit 7dd90a01e780e17585d69f29b2dd395f5624ff8c -Author: AboudyKreidieh -Date: Wed Nov 28 17:17:10 2018 -0800 - - bug fix - -commit 462f1ef70bf2b8331b7ba2181f26b5e7a2318486 (tag: v0.2.1) -Author: Aboudy Kreidieh -Date: Wed Nov 28 16:17:18 2018 -0800 - - modified version to freeze for renderer (#286) - -commit 37f695d45ef35dbab0cd8c600df0f4adbe70bd4e -Author: AboudyKreidieh -Date: Wed Nov 28 12:20:14 2018 -0800 - - bug fix - -commit bf72dd08552c9ae1fbcafaabdac8cf97292d5fca -Merge: 1942999e 2e7fa4b0 -Author: AboudyKreidieh -Date: Wed Nov 28 12:18:42 2018 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into base_env_cleanup - -commit 2c502ef0372755c63daf44a2b1fb4c1b24b523a4 -Author: AboudyKreidieh -Date: Wed Nov 28 12:14:17 2018 -0800 - - bug fix - -commit 8962a57595ffb5c600d1ebfe1efac4cd664ed459 -Author: AboudyKreidieh -Date: Wed Nov 28 12:13:02 2018 -0800 - - bug fix - -commit 57c74e91ed935577c98cfd1bcd0e3a343f8f8a75 -Merge: 569321bd bc1a23ad -Author: AboudyKreidieh -Date: Wed Nov 28 12:11:44 2018 -0800 - - Merge branch 'kernel_abstract' into kernel_simulation - -commit 2e7fa4b01e6a1c393d7719dd6734c7c9ce426b01 -Merge: 21144b71 9b1ae704 -Author: Aboudy Kreidieh -Date: Wed Nov 28 12:10:01 2018 -0800 - - Merge pull request #267 from kjang96/registry_vehicles - - Deep copy vehicles variable in create_env, which will allow for clean… - -commit bc1a23ad39a99dc4227a8be95596dcabecce30dd -Merge: 74343a29 21144b71 -Author: AboudyKreidieh -Date: Wed Nov 28 12:06:16 2018 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into kernel_abstract - -commit ff35e49cde91a73735c6d54bf7c694185cfa3662 -Author: Kathy Jang -Date: Wed Nov 28 10:15:17 2018 -0800 - - Removed flow_params args from baseline - -commit 9715fee3718ed31c4d6d905595616aaa94db924e -Author: Kathy Jang -Date: Wed Nov 28 00:07:48 2018 -0800 - - pep8 - -commit 9b1ae704998a83d9341b07d0b5ec9b690c498ba5 -Author: Kathy Jang -Date: Tue Nov 27 22:17:49 2018 -0800 - - minor fix - -commit 2a15f358328abd357b33054cd5b2ee7be82c7b55 -Merge: 9825708a d97d8c89 -Author: Kathy Jang -Date: Tue Nov 27 22:17:25 2018 -0800 - - Merge branch 'registry_vehicles' of https://github.com/kjang96/flow-1 into registry_vehicles - -commit 9825708a5379c8b3b69bc61ca5b6a06bff63a5ae -Author: Kathy Jang -Date: Tue Nov 27 22:16:48 2018 -0800 - - got rid of redudant line - -commit dcde23a4ba2ca1d5ffca2863af94d3aab11d2c89 -Author: Kathy Jang -Date: Tue Nov 27 22:12:29 2018 -0800 - - added teardown and setup to unittests - -commit fb8d6a2c5ce93cf4de7d504c61fe1d5e13932dcf -Author: eugenevinitsky -Date: Tue Nov 27 21:16:06 2018 -0800 - - moved redis incompatibility over - -commit d18e3717283b8d2ec23cb695f6d15cb3bf2f54b7 -Merge: b0e37aa3 21144b71 -Author: Kathy Jang -Date: Tue Nov 27 21:15:45 2018 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into benchmark_baseline_tests - -commit 21144b719d34315ee35560525f4f9a845f5f9ce2 -Author: Aboudy Kreidieh -Date: Tue Nov 27 21:10:25 2018 -0800 - - Coverage cleanup (#269) - - * added ignores to coverage - - * decreased the number of vehicles in bay bridge - - * fix to coverage - - * cleanup to tests - - * undo change - - * removed setup from coverage - - * removing rllab from coverage report - -commit 8e9455b18e69f0a3559715fd215612c42dee2f38 -Author: eugenevinitsky -Date: Tue Nov 27 20:58:35 2018 -0800 - - removed unneeded parser arg - -commit 1affcae1532fe11831bd4bacb75f251760840e1c -Author: eugenevinitsky -Date: Tue Nov 27 20:39:03 2018 -0800 - - made changes to pass tests and rename files - -commit 50d1af9f81383c7b4cb961434ff394aa64d3cbd3 -Author: eugenevinitsky -Date: Tue Nov 27 20:18:25 2018 -0800 - - pep8 - -commit 12271b5ca61b545aeefcaa71bd3f04728de01f06 -Author: eugenevinitsky -Date: Tue Nov 27 20:11:28 2018 -0800 - - saved as datetime file - -commit 43412ae9fd469540c24f8308b6adef65c7e728a3 -Author: eugenevinitsky -Date: Tue Nov 27 20:09:05 2018 -0800 - - added save movie option to visualizer rllib - -commit 569321bd91be2a78cc16084e282bb2ebff418997 -Author: AboudyKreidieh -Date: Tue Nov 27 02:37:46 2018 -0800 - - bug fix - -commit 1942999eecf5441a64b15359d8d0841aa75116bf -Author: AboudyKreidieh -Date: Tue Nov 27 02:30:44 2018 -0800 - - pep8 - -commit 0a93c3ccf150eecab84008ee15dbe6a1b9849346 -Author: AboudyKreidieh -Date: Tue Nov 27 02:26:50 2018 -0800 - - pep8 - -commit 42488371510675d5cd1253278f194b30f2a2e241 -Author: AboudyKreidieh -Date: Tue Nov 27 02:24:35 2018 -0800 - - bug fix - -commit 288334e7c4448ad15232d9765e991f5e691efc6d -Author: AboudyKreidieh -Date: Tue Nov 27 00:49:14 2018 -0800 - - added simulation kernel - -commit 22d7652e42654d1df83bedf1ceb0bc5238c3e939 -Merge: 7b88f4ab a0d44389 -Author: AboudyKreidieh -Date: Mon Nov 26 23:50:31 2018 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into base_env_cleanup - -commit 74343a2916336841f2f7ae10ae654234981f991f -Author: AboudyKreidieh -Date: Mon Nov 26 23:45:31 2018 -0800 - - pep8 - -commit a12e5e26e555e158c9e7d3e60452d1291abb99cc -Merge: 8cf89f23 5e02b831 -Author: AboudyKreidieh -Date: Mon Nov 26 23:43:51 2018 -0800 - - Merge branch 'vehicle_params' into vehicle_params_2 - -commit 5e02b831189e7179dc59b6c4395f854d3540760c -Merge: 3a93d375 a0d44389 -Author: AboudyKreidieh -Date: Mon Nov 26 23:41:54 2018 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into vehicle_params - -commit 86f390a109b43d7d1c1fc7a46a85ce37f69859ec -Author: AboudyKreidieh -Date: Mon Nov 26 23:36:41 2018 -0800 - - doc fix - -commit 835f8818c709e35e2e04e98427c549c128e06002 -Merge: 984fec16 a0d44389 -Author: AboudyKreidieh -Date: Mon Nov 26 23:35:35 2018 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into kernel_abstract - -commit a0d443896becb7455cff5cc568d1b1c4b873f483 -Merge: 1abebb02 07c94f4d -Author: Aboudy Kreidieh -Date: Mon Nov 26 13:51:35 2018 -0800 - - Merge pull request #280 from flow-project/multiagent_change - - Multiagent change - -commit 07c94f4dd34c2de427e432c8ca050fc57eec0ef3 -Author: eugenevinitsky -Date: Mon Nov 26 14:52:03 2018 -0500 - - backwards compatibility hack for ray pip install - -commit 58df521d0e92308b348bb9a8d2fda92873a62dc3 -Author: eugenevinitsky -Date: Mon Nov 26 14:50:40 2018 -0500 - - adds a multiagent flag - -commit 1abebb020916e18bdce91319d2cf17246b4f1ec2 -Author: eugenevinitsky -Date: Mon Nov 26 13:22:14 2018 -0500 - - Sumo web3d upgrade (#278) - - * added in sumo web 3d things - - * added use and instructions for sumo web3d - - * added documentation - - * pep8 - - * hack for old pkl files to pass tests - -commit fbafbad278ee99def80a8670b5085e14d051659a -Author: eugenevinitsky -Date: Mon Nov 26 11:26:41 2018 -0500 - - Multiagent pr 2 (#270) - - * some reversions in base env for sumo 0.31.0 - - * more reversions - - * bug fix - - * updated utils - - * added dill - - * minor - - * minor - - * minor fix in visualizer_rllib - - * revert vehicles change - - * bug fix - - * flake8 - - * added relevant files - - * minor - - * tests pass locally - - * removed extra files - - * added pep8 for exceptions - - * missed a merge conflict - - * tests are passing locally again - - * pep8 - - * pep8 - - * shaved 20 seconds off visualizer test - - * decreased num samples in test_examples - - * pep8 - - * pep8 for vehicles - - * added tutorial - - * vehicle class fix as per code review - -commit eb00d06585f4f8ebaea65415d79322d928792e8d -Merge: efdf050e 4269de14 -Author: Aboudy Kreidieh -Date: Sun Nov 25 14:02:04 2018 -0800 - - Merge pull request #276 from flow-project/eugenevinitsky-patch-1 - - Update visualizing.rst - -commit 4269de14164ced6f7ada69777656de8242bd9b08 -Author: eugenevinitsky -Date: Sun Nov 25 15:30:00 2018 -0500 - - Update visualizing.rst - - This file is out of date and is now updated. - -commit 26e8c9d1bfddeaf7c8875d4407b8be17cc31803e -Author: yunerzxy -Date: Fri Nov 23 21:21:10 2018 -0800 - - add param.py docs - -commit 19779e65c83fba2a7cae59f1e5684410096c35cc -Author: yunerzxy -Date: Fri Nov 23 21:18:02 2018 -0800 - - add new features to base_scenario - -commit efdf050e6d8667f612a8f6cb550fbb6b4496879d -Merge: af89d271 f82cdc17 -Author: Aboudy Kreidieh -Date: Fri Nov 23 18:41:51 2018 -0800 - - Merge pull request #261 from flow-project/pyglet_renderer - - Add Pyglet renderer. - -commit f82cdc173a1302ba42f5b3a7e39017d09ff22602 -Author: Fangyu Wu -Date: Fri Nov 23 18:08:58 2018 -0800 - - Improve styles. - -commit ae838ba44033e67d16be979febd3ace32111540c -Author: AboudyKreidieh -Date: Fri Nov 23 16:59:33 2018 -0800 - - pep8 - -commit c9443d34c6ef185339750692b40a97ee48c104e3 -Author: Fangyu Wu -Date: Fri Nov 23 16:16:17 2018 -0800 - - Fix a minor bug. - -commit d1aa668fe1ffe3347a4de30333416aca44a02581 -Author: Fangyu Wu -Date: Fri Nov 23 16:08:06 2018 -0800 - - Fix minor bugs. - -commit 49d6c04e3e358b2d04f0e4d42e07451403f30ee0 -Merge: 384f2924 42920285 -Author: Fangyu Wu -Date: Fri Nov 23 15:56:13 2018 -0800 - - Merge branch 'pyglet_renderer' of https://github.com/flow-project/flow into pyglet_renderer - -commit 384f29248b03f9ff1840c396afa3db464e7b8f7a -Author: Fangyu Wu -Date: Fri Nov 23 15:55:24 2018 -0800 - - Improve styles. - -commit 42920285a8048eba7b505e143ff0d3947cc3d336 -Author: AboudyKreidieh -Date: Fri Nov 23 15:44:07 2018 -0800 - - temporarily commenting bay bridge example - -commit 6884ff4dede4ad244c582f800d98d1fb618fd5a5 -Author: Fangyu Wu -Date: Fri Nov 23 15:33:01 2018 -0800 - - Refactor code and add documentation. - -commit af89d2711dd180debbfcf2692528827c038231e4 -Merge: 842b27d3 71a34594 -Author: Aboudy Kreidieh -Date: Fri Nov 23 15:25:00 2018 -0800 - - Merge pull request #273 from flow-project/minicity_fix2 - - fix and refine minicity - -commit 71a3459408a53a1e85103f342b984a0ef08592cd -Author: yunerzxy -Date: Fri Nov 23 15:04:14 2018 -0800 - - fix pep8 for minicity scenario - -commit b33c9185c79ed7b33d40580702b77f9c5dd18a1d -Author: yunerzxy -Date: Thu Nov 22 22:55:58 2018 -0800 - - fix and refine minicity - -commit 578f031d74c9fa22d591a367345ebc36497ef7b9 -Author: Fangyu Wu -Date: Thu Nov 22 22:02:36 2018 -0800 - - Handle Travis test exception. - -commit d5ac6aa7002cfa96061f4d93a616ac395f6c3d9f -Author: Fangyu Wu -Date: Thu Nov 22 21:43:40 2018 -0800 - - Fix pep8. - -commit 1df81d71bb5525231c2ee2ff1f19bb8cf2fe1fab -Author: Fangyu Wu -Date: Thu Nov 22 21:25:27 2018 -0800 - - Add unit tests for PygletRenderer and SumoParams. - -commit b88e1a0bab0d0bf8abf2b1598ef0d4c42590460d -Author: Fangyu Wu -Date: Wed Nov 21 16:10:05 2018 -0800 - - Package majority of pyglet render code into a method. - -commit d4efed9343235e1cdccb6a6b6f5691410e4daad2 -Merge: 89ab7dc0 842b27d3 -Author: Fangyu Wu -Date: Wed Nov 21 00:13:24 2018 -0800 - - Merge branch 'master' into pyglet_renderer - -commit 89ab7dc079c99dd062ed6b4657095d2d6da74c3f -Author: Fangyu Wu -Date: Wed Nov 21 00:03:34 2018 -0800 - - Attempt again. - -commit da9b8f5b64b2415e11515560066ef8fbfe1a2e91 -Author: Fangyu Wu -Date: Tue Nov 20 23:58:46 2018 -0800 - - Add imutils to requirements.txt. - -commit 2b50d65ec645544e6720b8a83fa8ebb20ef4bb6e -Author: Fangyu Wu -Date: Tue Nov 20 23:54:09 2018 -0800 - - Attempt again. - -commit 8a0ef87c665287c92eb073bedf9b1bda416f54f0 -Author: Fangyu Wu -Date: Tue Nov 20 23:48:36 2018 -0800 - - Attempt again. - -commit ab9df54d2c27c6398fa717dc95878b3cd90bd35d -Author: Fangyu Wu -Date: Tue Nov 20 23:43:22 2018 -0800 - - Another attempt to fix pyglet test errors. - -commit b38aeda7f1a93a98fccdf57f5357d9fa7d25381f -Author: Fangyu Wu -Date: Tue Nov 20 23:35:55 2018 -0800 - - Attempt to fix test failures caused by importing glClearColor. - -commit c58280c3fcfc29c061bc368ec4c964d5369d7ebe -Author: Fangyu Wu -Date: Tue Nov 20 23:00:00 2018 -0800 - - Fix more pep8 error. - -commit 0b13175247aec11a4afd5535c9a25bad63db6919 -Author: Fangyu Wu -Date: Tue Nov 20 22:51:33 2018 -0800 - - Fix pep8 error. - -commit 34ca21a6b7ad81e33fc08f5fa00f07f8cce94cee -Author: Fangyu Wu -Date: Tue Nov 20 22:15:54 2018 -0800 - - Add docstring and fix various misc. issues. - -commit 0b631352e218764c08d8553d8842f56f439dd61e -Merge: 65a0af98 842b27d3 -Author: AboudyKreidieh -Date: Tue Nov 20 00:34:47 2018 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into new_sumo - -commit 842b27d3c278c75ede61d9282fee13a4ad04a13c -Merge: 9e36963c 67c8cafd -Author: Aboudy Kreidieh -Date: Mon Nov 19 23:31:13 2018 -0800 - - Merge pull request #268 from flow-project/minicity_pr - - Minicity Scenario - -commit 67c8cafdb17082bfeb64b08879b3aafdd2a12e9f -Author: AboudyKreidieh -Date: Mon Nov 19 22:52:35 2018 -0800 - - added test - -commit a93676f8e2989a17afc60e4bc8834be6c7198460 -Author: AboudyKreidieh -Date: Mon Nov 19 22:42:00 2018 -0800 - - pep8 - -commit bb467c398d36c1696680fa2dd16c6bd422b79436 -Author: yunerzxy -Date: Mon Nov 19 21:16:39 2018 -0800 - - remove print - -commit c4bc793e78e050885ca0f27e59572208d3fc6a11 -Author: yunerzxy -Date: Mon Nov 19 20:35:56 2018 -0800 - - add minicity router and fix base_scenario - -commit 7930fb2a6e223c351c1930c8a0fb4b45e1f110cb -Author: yunerzxy -Date: Mon Nov 19 20:26:35 2018 -0800 - - add minicity scenario - -commit d97d8c899d1b733f08d26bb3c5e5cd3ef0dcf54c -Author: Kathy Jang -Date: Mon Nov 19 16:41:15 2018 -0800 - - Fixed build error - - Fixed build error. Noticed redundant line which I hadn't in previous commit - -commit 7bb18a20541b002ad811d1caa09935e8ea6f9c86 -Author: Kathy Jang -Date: Mon Nov 19 16:20:42 2018 -0800 - - Fixing pep8 error - - It says the variable vehicles which I created and passed into the scenario initializer is not being used. It clearly is? Whatever the case is, that should be fixe dhere - -commit 748723e1db9aedaead07728fbab4bbe0eb0b7990 -Author: Kathy Jang -Date: Mon Nov 19 15:39:32 2018 -0800 - - Deep copy vehicles variable in create_env, which will allow for clean resets - -commit 9e36963c6312813eb3b031a0ddc85f08b55ec45d -Author: eugenevinitsky -Date: Sun Nov 18 20:03:50 2018 -0800 - - Visualizer test (#231) - - * minor - - * working visualizer tests - - * flake8 fixes - - * flake8 and docstrings - - * added to travis for tests - - * removed rllab test until we get it on traci - - * removed rllab tests for now - - * fix - - * flake8 fix - - * flake8 fixes - - * added data for visualizer tests - - * swapped python version - - * minor - - * added tests for rllib examples - - * flake8 - - * fixed wheel name - - * attempted segfault fix - - * test of the problem - - * put it back - - * travis only has 2 cores - - * trying out the upstream branch of ray - - * updated to ray 0.5.3 - - * flake8 - - * fixed numpy version - - * added correct pkl files and queued trials - - * syntax fix - - * minor - - * added queue trials in right position - - * attempted reduction of cpu usage for rllib tests - - * minor - - * trying to give ray an address to work with - - * trying to fix the redis address issue - - * minor travis changes - - * updated data files - - * minor changes to travis - - * pep8 - - * maybe fix to rllib tests - - * updated location of README - - * decreased minibatch size - - * reintroduced redis - - * added ray inits and shutdowns to tests - - * ray init fix - - * pep8 - - * ray shutdown removed - - * maybe - - * added jupyter - - * trying to remove the redis address - - * attempt to resolve redis incompatibility - - * removed conda env for speed - - * minor - - * reset the changes - -commit b0e37aa3749171bb633449af7efd25afcd96a8f9 -Author: Kathy Jang -Date: Sun Nov 18 19:31:58 2018 -0800 - - More style oops - -commit 65a0af98882dedf71d0f4879c664b87e3723ee31 -Merge: ab39868a 65151a90 -Author: Kanaad Parvate -Date: Sun Nov 18 19:07:41 2018 -0800 - - Merge branch 'benchmark_regression_tests' into new_sumo - -commit 65151a902e00290b0512a14ef4f9f8dedf6827af -Author: Kanaad Parvate -Date: Sun Nov 18 19:07:28 2018 -0800 - - added special case for grid0, grid1, clean up runscript - -commit 58a72c3afee64b5c2a8bc540d7d0524395845566 -Merge: dfac778c 88f07214 -Author: Kathy Jang -Date: Sun Nov 18 18:56:21 2018 -0800 - - Merge branch 'benchmark_baseline_tests' of https://github.com/kjang96/flow-1 into benchmark_baseline_tests - -commit dfac778ce0466ae2b7680a2af7101e75e5d8b105 -Author: Kathy Jang -Date: Sun Nov 18 18:55:54 2018 -0800 - - Style errors fixed - -commit 88f072144beec5c84157c0f873f8cebc21b9db93 -Merge: dd5bc7c7 fce5fae1 -Author: Kathy Jang -Date: Sun Nov 18 18:00:11 2018 -0800 - - Merge branch 'master' into benchmark_baseline_tests - -commit 4f6c3593131debb44af7775ff500fa567a127aff -Merge: fce5fae1 ac1ff04f -Author: Aboudy Kreidieh -Date: Sun Nov 18 15:59:47 2018 -1000 - - Merge pull request #250 from flow-project/tests_envs_2 - - Tests envs 2 - -commit dd5bc7c7d6297e5b552d6c64236352614a6ae09b -Author: Kathy Jang -Date: Sun Nov 18 17:57:46 2018 -0800 - - Added tests for running all benchmarks and rename test_benchmarks.py to test_baselines.py, which is what it actually is - -commit ac1ff04f9da2efe9b054cf137b71b74bdca6b59d -Author: AboudyKreidieh -Date: Sun Nov 18 17:46:48 2018 -0800 - - PR fix - -commit 984fec16b428d1ca7dbbaed23140ae775be48db6 -Author: AboudyKreidieh -Date: Sun Nov 18 17:44:36 2018 -0800 - - added empty test - -commit 7b88f4ab37a7fadaec8c4badf940cc5e4467f934 -Merge: 8ad5e525 fce5fae1 -Author: AboudyKreidieh -Date: Sun Nov 18 17:13:39 2018 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into base_env_cleanup - -commit 8cf89f23cd0938706d7dc78e894f332543751190 -Merge: edfc42aa fce5fae1 -Author: AboudyKreidieh -Date: Sun Nov 18 17:13:01 2018 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into vehicle_params_2 - -commit a33fa05ef83c137fdd85a8c229a32a7a42139ca8 -Merge: b867ebc5 fce5fae1 -Author: AboudyKreidieh -Date: Sun Nov 18 16:51:35 2018 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into tests_envs_2 - -commit 688174b38cebe00d119ff904529f0d2f1cb9cdc0 -Author: Fangyu Wu -Date: Sun Nov 18 16:48:17 2018 -0800 - - Add Pyglet renderer. - -commit 8bd7ba536f9a576ca2f068bbca9422efc9d4e702 -Merge: c1620d53 fce5fae1 -Author: AboudyKreidieh -Date: Sun Nov 18 16:47:05 2018 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into tests_rewards - -commit fce5fae1ca02a265ef259312568b5bd724565156 -Author: eugenevinitsky -Date: Sun Nov 18 16:41:37 2018 -0800 - - Update README.md (#260) - -commit 3dac25356de2eeb129ec7437c3aa1efe334421fa -Author: eugenevinitsky -Date: Sun Nov 18 16:23:24 2018 -0800 - - Update README.md - -commit dcef2beb1ba78c001a6d13d36af5e6e0ee74ae16 -Author: Aboudy Kreidieh -Date: Sun Nov 18 13:47:13 2018 -1000 - - Tests envs (#235) - - * testing lane change env is working - - * empty tests for environments - - * fixed TestEnv and added tests - - * fixed 0 initial vehicles bug - - * added tests for keyerrors - - * pep8 - - * bug fixes - - * more tests to envs - - * pep8 - - * converted tests into utility methods - -commit ab39868af50d4575f3ae23a31f7e956ce0eb742c -Merge: e0f20d68 3c65b22a -Author: Kanaad Parvate -Date: Sun Nov 18 15:42:43 2018 -0800 - - Merge branch 'benchmark_regression_tests' into new_sumo - -commit e0f20d68410576a5f2f9dede327193aac21bb1a8 -Merge: 730e5bb1 257420b6 -Author: Kanaad Parvate -Date: Sun Nov 18 15:40:25 2018 -0800 - - merge master - -commit c1620d538d535000bd78b26e93d3bb2a255e9286 -Merge: df9ef238 82f443b0 -Author: AboudyKreidieh -Date: Sun Nov 18 15:35:44 2018 -0800 - - Merge branch 'tests_rewards' of https://github.com/flow-project/flow into tests_rewards - -commit df9ef238b6e657ff52f9c3b2a1f86e77a2ece877 -Merge: d5395887 257420b6 -Author: AboudyKreidieh -Date: Sun Nov 18 15:35:25 2018 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into tests_rewards - -commit f0913ec56e55babc56aee1b4cb8ed6a826eeca15 -Merge: b3893418 257420b6 -Author: AboudyKreidieh -Date: Sun Nov 18 15:34:44 2018 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into tests_examples_extended - -commit b867ebc5cdcf65046bcfc6a3ee81c898b0f7a972 -Author: AboudyKreidieh -Date: Sun Nov 18 15:33:48 2018 -0800 - - added util for checking shape - -commit 730e5bb148040c78e874e8793d9d8a7f3fa917cd -Author: Kanaad Parvate -Date: Sun Nov 18 15:31:59 2018 -0800 - - undid changes for merge - -commit 3c65b22a226808b50cb5ab9cc5ae84f4b390a5e1 -Author: Kanaad Parvate -Date: Sun Nov 18 15:10:40 2018 -0800 - - added run all benchmarks script - -commit a6830e13cfa61a07777ad310482a9d22a7555c1b -Author: Kanaad Parvate -Date: Sun Nov 18 15:10:05 2018 -0800 - - remove runscript from this branch - -commit 41335c5028a81c8e041ed49f9459a1a4ee4232e5 -Author: Kanaad Parvate -Date: Sun Nov 18 15:09:03 2018 -0800 - - added regression test autoscale script, and modified rllib runners to be more general - -commit e0bf2bc0448b6e8fe75d443a3489abb4e537a5c5 -Author: Kanaad Parvate -Date: Sun Nov 18 15:00:08 2018 -0800 - - progress on benchmarks script - -commit 672254864aa273481399e74267f11ede516e4ef7 -Merge: 30f6a146 d18d1387 -Author: AboudyKreidieh -Date: Sun Nov 18 14:07:52 2018 -0800 - - Merge branch 'tests_envs' of https://github.com/flow-project/flow into tests_envs_2 - -commit d18d13879fb31452457c2e4b4622fddbda5e968f -Merge: f313d980 257420b6 -Author: AboudyKreidieh -Date: Sun Nov 18 13:42:20 2018 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into tests_envs - -commit 8ad5e525491b9161dbec6e8ddebf53d5ae23f99a -Merge: 001a4908 257420b6 -Author: AboudyKreidieh -Date: Sun Nov 18 13:39:57 2018 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into base_env_cleanup - -commit edfc42aa1863aba12c0ac33bdaba89b05c626bf2 -Merge: bd1d4fd0 3a93d375 -Author: AboudyKreidieh -Date: Sun Nov 18 13:39:09 2018 -0800 - - Merge branch 'vehicle_params' of https://github.com/flow-project/flow into vehicle_params_2 - -commit 3a93d37548413c52f1a443ccc95dd75329110cb7 -Merge: d41d46d5 257420b6 -Author: AboudyKreidieh -Date: Sun Nov 18 13:38:03 2018 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into vehicle_params - -commit 9f60836bf678ede753f857254647a1ab31c56d17 -Merge: 2ace5e25 257420b6 -Author: AboudyKreidieh -Date: Sun Nov 18 13:24:22 2018 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into kernel_abstract - -commit 257420b6eec0bb18218967f737566e8c2f42e0ef -Merge: 3d2bc6d0 3ee7b34e -Author: Aboudy Kreidieh -Date: Sun Nov 18 11:09:53 2018 -1000 - - Merge pull request #245 from flow-project/tests_base_env - - Tests base env - - removed a hack from base_env - - added tests to the abstraction in base_env - - added tests to the coloring aspect of base_env - -commit 3d2bc6d0b497e898b9748601e06c816371f37bb5 -Merge: 8a47af3b 181b08cc -Author: Aboudy Kreidieh -Date: Sun Nov 18 11:09:24 2018 -1000 - - Merge pull request #247 from flow-project/tests_experiments - - test xml->csv conversion - -commit 8a47af3b505dc41205a29b703490c991d3c14e76 -Merge: 15de37a4 715da1f8 -Author: Aboudy Kreidieh -Date: Sun Nov 18 11:07:21 2018 -1000 - - Merge pull request #249 from flow-project/tests_benchmarks_2 - - added benchmark flow_params to the baseline simulations - - By moving the `flow_params` dict to the simulations, we are added some coverage and certainty that these dictionaries are not broken (i.e. leading to failing simulations). This still needs to be complemented by tests regression tests, and ideally tests to ensure the baselines are receiving expected returns (although this is a bit difficult given the stochastic nature of some of the simulations). - -commit 715da1f87d138b86794166b910c492e43488cb10 -Author: AboudyKreidieh -Date: Sun Nov 18 12:45:28 2018 -0800 - - PR fixes - -commit bb2677bf9f88b82b1379985c5b64da28d7cdca92 -Merge: 23be95c2 17ad1b45 -Author: AboudyKreidieh -Date: Sun Nov 18 12:40:11 2018 -0800 - - Merge branch 'tests_benchmarks_2' of https://github.com/flow-project/flow into HEAD - -commit 23be95c2d3bc5b284c22a4af64825b261ed0bfdf -Author: AboudyKreidieh -Date: Sun Nov 18 12:35:31 2018 -0800 - - replaced double with single quotes - -commit 3ee7b34e9dd269095c7ff63b1465009a4d79e988 -Author: AboudyKreidieh -Date: Sun Nov 18 12:04:06 2018 -0800 - - PR fixes - -commit f313d980848a4a1d0f5206143424dca2984abd9f -Author: AboudyKreidieh -Date: Sun Nov 18 12:01:33 2018 -0800 - - converted tests into utility methods - -commit 82f443b0502138cf2441f0b5b4f5b3377911041c -Author: Kathy Jang -Date: Sun Nov 18 11:17:36 2018 -0800 - - Got rid of some useless comments - -commit 17ad1b457c5c96eb1df1843263aa4e82940a168d -Merge: 798becc2 b7dfa300 -Author: eugenevinitsky -Date: Sun Nov 18 11:09:51 2018 -0800 - - Merge branch 'tests_benchmarks_2' of https://github.com/flow-project/flow into tests_benchmarks_2 - -commit 798becc2d4b3a4a5a372d988b24e97b7eee302ca -Author: eugenevinitsky -Date: Sun Nov 18 11:09:38 2018 -0800 - - pep8 - -commit 181b08ccbd13ac13fded626f23faff1292e56c4b -Author: AboudyKreidieh -Date: Sun Nov 18 11:02:36 2018 -0800 - - typo - -commit d04a3e9ed3b81beecb39e84a042cf7a290e40b32 -Author: AboudyKreidieh -Date: Sun Nov 18 11:01:05 2018 -0800 - - removed magic numbers - -commit b7dfa300bcbb4505bad521c14424d46177f96f8f -Author: eugenevinitsky -Date: Sun Nov 18 10:59:41 2018 -0800 - - Update bottleneck1.py - -commit 0b20d4c918aabcf60e7b4d8d30ead162253a2cf5 -Author: eugenevinitsky -Date: Sun Nov 18 10:59:12 2018 -0800 - - Update bottleneck0.py - -commit 15de37a4bdbc0ac6ccd7fef6f92741a550f2a4ae -Author: Aboudy Kreidieh -Date: Sun Nov 18 08:31:20 2018 -1000 - - extended unit test coverage of utils (#246) - -commit 001a490826fbec8c12d16c49bf63cf83d275c805 -Author: AboudyKreidieh -Date: Sat Nov 17 21:08:20 2018 -0800 - - removed some traci calls - -commit 2ace5e25a9e05811bdbbf05c7c56309cc28bf974 -Author: AboudyKreidieh -Date: Sat Nov 17 20:21:50 2018 -0800 - - added abstractions to the kernel - -commit ef7d14647b3499522c28d4d2610f0296992c78db -Author: Kanaad Parvate -Date: Sat Nov 17 19:20:59 2018 -0800 - - run all benchmark script with correct num itr - -commit af155c2ec696a76748496a4daee95e7acb7a08c3 -Author: Kanaad Parvate -Date: Sat Nov 17 19:08:51 2018 -0800 - - pls im still stupid - -commit 441eb98b25fb9db49d5bca1159c62731f6c9a4e0 -Author: Kanaad Parvate -Date: Sat Nov 17 18:55:57 2018 -0800 - - i'm stupid - -commit b220e9483f434f9d3d4d17f65dca51cbe77bb8be -Author: Kanaad Parvate -Date: Sat Nov 17 18:22:13 2018 -0800 - - run all benchmarks script - -commit bd1d4fd02566beae42ce84fcedfd85f76cbdce90 -Author: AboudyKreidieh -Date: Sat Nov 17 02:06:35 2018 -0800 - - merge issue - -commit f38411ba1406427d557660492f9114fe2f9cbf8f -Merge: 96ae5d64 d41d46d5 -Author: AboudyKreidieh -Date: Sat Nov 17 02:03:25 2018 -0800 - - Merge branch 'vehicle_params' into vehicle_params_2 - -commit d41d46d5ad8c70d24d726c8cdde484e98569f797 -Merge: a8a35e76 e122bd12 -Author: AboudyKreidieh -Date: Sat Nov 17 01:56:38 2018 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into vehicle_params - -commit 0036c891abc2076a9e747a5d670e5f2938fd44f4 -Author: AboudyKreidieh -Date: Sat Nov 17 01:48:51 2018 -0800 - - slight cleanup - -commit d5395887b63763d1ef55ad88c10ddf238e14643e -Author: AboudyKreidieh -Date: Sat Nov 17 01:33:45 2018 -0800 - - test for boolean action reward - -commit 5c262cf503e25e0692f782c8ad877a20569ee963 -Author: AboudyKreidieh -Date: Sat Nov 17 01:33:29 2018 -0800 - - removed redundant reward function - -commit 6eb59c1eed63ceb8d2bba3579b6247e252dfd02b -Author: AboudyKreidieh -Date: Sat Nov 17 01:23:32 2018 -0800 - - added tests for rl headway reward - -commit c6ff30527cc949b85bd0143e37369fcb2ea5ef3c -Author: AboudyKreidieh -Date: Sat Nov 17 01:11:11 2018 -0800 - - removed prints from rl headway reward - -commit 2f5baa718fca90f2a09284284c75125b4eba51be -Author: AboudyKreidieh -Date: Sat Nov 17 01:08:50 2018 -0800 - - added option to choose with flow_params to simulate in merge and figure eight - -commit b3893418a75c750c44de80bce00d5b14d31fe772 -Author: AboudyKreidieh -Date: Fri Nov 16 17:33:08 2018 -0800 - - undid some changes - -commit 95e0b81af8e067bc0fc855e3662adfa62cd35685 -Author: AboudyKreidieh -Date: Fri Nov 16 17:11:15 2018 -0800 - - pep8 - -commit 4ed4423572d8b7dbe3e27f3fc2ff9b030381f3d8 -Author: AboudyKreidieh -Date: Fri Nov 16 17:06:19 2018 -0800 - - extended coverage of bay_bridge example - -commit 30f6a146a5244ff268ad76661bcb6af9a71b79e0 -Author: AboudyKreidieh -Date: Fri Nov 16 16:20:43 2018 -0800 - - pep8 - -commit b1b953b99ec03046a3cbd0c78a789791bf7988db -Author: AboudyKreidieh -Date: Fri Nov 16 16:16:09 2018 -0800 - - tests to TwoLoopsMergeEnv - -commit f13ce93aa61999e0fa7d99c0467982cdee6cc70d -Author: AboudyKreidieh -Date: Fri Nov 16 15:10:42 2018 -0800 - - added evaluate to the baselines - -commit a803aada09c89c4297870321d61e5d6d4f38e701 -Author: AboudyKreidieh -Date: Fri Nov 16 14:37:41 2018 -0800 - - bug fix - -commit 9ddb3d31c8d265fc1904514fdf4152f93fb374dc -Author: AboudyKreidieh -Date: Fri Nov 16 14:27:45 2018 -0800 - - bug fixes - -commit 57620dad729d59f27ee7745fa3a48491045f7c0c -Author: AboudyKreidieh -Date: Fri Nov 16 13:39:30 2018 -0800 - - added benchmark flow_params to the baseline simulations - -commit 7a474d5d5ffade9cd069b6154a6550999469d036 -Author: AboudyKreidieh -Date: Fri Nov 16 11:29:08 2018 -0800 - - more tests to reward functions - -commit 8c118902b507c9bf0a906dad26b206ea4ba56a37 -Author: AboudyKreidieh -Date: Fri Nov 16 10:55:52 2018 -0800 - - more tests to reward functions - -commit e385572f6e6da5fcc405e17ab88300e9e14d8d35 -Author: AboudyKreidieh -Date: Fri Nov 16 01:54:04 2018 -0800 - - test to xml->csv conversion - -commit 52f3bddad8e435cf5e96ee865f7e11894494dc5b -Author: AboudyKreidieh -Date: Fri Nov 16 01:12:29 2018 -0800 - - pep8 - -commit 9b8a098c59a37ec4396e7592442af4bc4d025c09 -Author: AboudyKreidieh -Date: Fri Nov 16 01:06:39 2018 -0800 - - more tests for base_env - -commit 2f0abfbc3974bf212aafddda66cc7944f943defd -Author: AboudyKreidieh -Date: Fri Nov 16 01:06:22 2018 -0800 - - slight cleanup to base_env - -commit a2f4c8f117495115894bfeb241a69dad1ed2f439 -Author: AboudyKreidieh -Date: Thu Nov 15 23:48:32 2018 -0800 - - more tests - -commit 90f2d83416f38c91ec15ac514d9069226c47c90e -Merge: 14be28b7 e122bd12 -Author: AboudyKreidieh -Date: Thu Nov 15 23:38:39 2018 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into tests_envs_2 - -commit 83daec4881ea9666ad79d82776e944ccfee82ad9 -Author: Kanaad Parvate -Date: Thu Nov 15 17:42:21 2018 -0800 - - benchmark testing - -commit e122bd12464fd87ca1eeb4c6ddc94b57b620a5f9 -Merge: 653bc670 7d404030 -Author: Aboudy Kreidieh -Date: Thu Nov 15 12:55:26 2018 -1000 - - Merge pull request #238 from flow-project/eugenevinitsky-patch-1 - - Update README.md - -commit 14be28b7100ffebe2edd7dccfb94fc6d5eecc9b2 -Author: AboudyKreidieh -Date: Thu Nov 15 14:54:16 2018 -0800 - - pep8 - -commit 34447a418b6c9e88097d42877142961b0f68912b -Author: AboudyKreidieh -Date: Thu Nov 15 14:49:22 2018 -0800 - - more tests to envs - -commit 7d404030f1465baefd7e88b9f803f03395f36ccd -Author: eugenevinitsky -Date: Thu Nov 15 14:04:53 2018 -0800 - - Update README.md - -commit c64a030629f54dc3538ab856b12e5089bb4baa4f -Merge: c75766d8 653bc670 -Author: AboudyKreidieh -Date: Thu Nov 15 13:42:20 2018 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into tests_envs - -commit 653bc6709f580804e7e07922bf56b644030c45c3 -Author: Aboudy Kreidieh -Date: Thu Nov 15 11:37:25 2018 -1000 - - fixed coverage badge (#234) - -commit 291679c3e10782509251401808637432103ec711 -Author: eugenevinitsky -Date: Tue Nov 13 16:48:23 2018 -0800 - - Update README.md - - Updated author list on readme - -commit 04448fabf61a11b3731f12bdef5f3fecf088948a -Merge: c22f2d0f db753400 -Author: Kanaad Parvate -Date: Sun Nov 11 12:42:12 2018 -1000 - - merged master - -commit db753400f11d69580c881642a093b929e45ef55c -Merge: 0b625475 25145eee -Author: Aboudy Kreidieh -Date: Sun Nov 11 07:56:08 2018 -1000 - - Merge pull request #228 from flow-project/tests_rewards - - tests for some rewards - -commit 25145eee25435b87aadebb66617f2ce2718504c4 -Author: AboudyKreidieh -Date: Sat Nov 10 20:44:22 2018 -0800 - - typo - -commit 1891f07dbd335f4770bd748bc250f2ef78cbdb1c -Merge: df2de338 0b625475 -Author: AboudyKreidieh -Date: Sat Nov 10 20:43:48 2018 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into tests_rewards - -commit c75766d839faecf105afe58131b9880ebcc3cf1b -Merge: ef779260 0b625475 -Author: AboudyKreidieh -Date: Sat Nov 10 20:38:50 2018 -0800 - - Merge branch 'master' of https://github.com/flow-project/flow into tests_envs - -commit 0b6254755a40e84f853ee4132b63b9d5ca3cd823 -Author: Aboudy Kreidieh -Date: Sat Nov 10 18:29:17 2018 -1000 - - removed unused and broken component of lc controller (#227) - -commit cc340b0651753a5a14a6fd2735e7da53318e3d6f -Author: Aboudy Kreidieh -Date: Sat Nov 10 18:26:48 2018 -1000 - - removed unused utility methods (#229) - -commit ef7792602fe43934028dbe53d319bf8ff79b42a3 -Author: AboudyKreidieh -Date: Sat Nov 10 16:56:22 2018 -0800 - - pep8 - -commit 64a15a54a8552087879f0919f9a3a2bd5208e79d -Author: AboudyKreidieh -Date: Sat Nov 10 16:35:21 2018 -0800 - - more tests to envs - -commit c6434a525d3ad6b6e3c0b12785294bd480252d60 -Author: AboudyKreidieh -Date: Sat Nov 10 16:35:10 2018 -0800 - - bug fixes - -commit dd74441c9fe4ed76394606c4caab67eed25bc47f -Merge: 5449dd3c 48d1d14c -Author: Kevin Chien -Date: Fri Nov 9 16:49:36 2018 -0800 - - Merge pull request #214 from flow-project/benchmark-desc - - added flow benchmark descriptions for flow-garden - -commit 48d1d14cc1c7a256518b301441d1c5051269f839 -Author: Kevin Chien -Date: Fri Nov 9 15:44:26 2018 -0800 - - temp explanation link for benchmarks - -commit c8edbfe2cf83bc54b0ea2f7518d4f7d72773eccf -Author: AboudyKreidieh -Date: Wed Nov 7 23:39:44 2018 -0800 - - pep8 - -commit 37ea3991ba40dfacc7f643d0581b0b8bf659c230 -Author: AboudyKreidieh -Date: Wed Nov 7 23:17:32 2018 -0800 - - added tests for keyerrors - -commit f387c9b74b91edc4a8c628cdf89a29c2211583e1 -Author: AboudyKreidieh -Date: Wed Nov 7 23:00:30 2018 -0800 - - fixed 0 initial vehicles bug - -commit 00de7306f7f549c6e8ee3cc085b24317f0094254 -Author: AboudyKreidieh -Date: Wed Nov 7 22:14:17 2018 -0800 - - fixed TestEnv and added tests - -commit 0eada0713c76f7b536a04f145f7b9ba49e3f1f81 -Author: AboudyKreidieh -Date: Wed Nov 7 21:44:47 2018 -0800 - - empty tests for environments - -commit 897f712dedc72d5bd6b4c976f59146dbcca339fb -Author: AboudyKreidieh -Date: Wed Nov 7 15:24:28 2018 -0800 - - testing lane change env is working - -commit 5449dd3cdbe15295cc45262583360ac88b92d8a9 -Author: eugenevinitsky -Date: Sun Nov 4 18:10:30 2018 -1000 - - Rllib fi (#226) - - * removed old rllib config param - - * minor - -commit d25f31006ae8bd5b5be58c853bff1f3d6b4be146 -Author: eugenevinitsky -Date: Sun Nov 4 08:16:56 2018 -1000 - - point travis at correct ray repo (#225) - -commit df2de33821bc8899888d3d3c77aa9b17771cf81a -Author: AboudyKreidieh -Date: Sat Nov 3 06:02:35 2018 -0700 - - tests for some rewards - -commit 985e51cdb3192fbdbe1c08af8fef0ee851ce95e3 -Merge: 56ec6b36 ca8de620 -Author: Aboudy Kreidieh -Date: Fri Nov 2 22:58:36 2018 -0700 - - Merge pull request #202 from flow-project/coverage - - Coverage - -commit ca8de620e4d5c12422ad24e8bdee803a2a2aef0a -Merge: 125c7fba 56ec6b36 -Author: AboudyKreidieh -Date: Fri Nov 2 22:46:33 2018 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow into coverage - -commit 56ec6b36f7e04c595b6a2a82be07bb20ff2fb55d -Merge: 9312d89f e7f38289 -Author: Aboudy Kreidieh -Date: Fri Nov 2 22:43:17 2018 -0700 - - Merge pull request #224 from flow-project/moved_ray - - pointed at the flow-project version of ray - -commit 9312d89ffc8249e52ab8f27c256ccac584a9ff66 -Merge: c64af60c cbe820fc -Author: Aboudy Kreidieh -Date: Fri Nov 2 22:40:58 2018 -0700 - - Merge pull request #223 from flow-project/experiment_checkup - - Experiment checkup - -commit ee320ba67bae3777c0f1c438356edf6b6b79bc9a -Author: Umang Sharaf -Date: Fri Nov 2 19:54:27 2018 -0700 - - Thanks Aboudy - -commit e7f38289f7d91cad50fdfeb385e8fd0c1cca2c2e -Author: eugenevinitsky -Date: Fri Nov 2 19:25:26 2018 -0700 - - pointed at the flow-project version of ray - -commit cbe820fc39cdffe9a17854f4bc66409396b066a0 -Author: eugenevinitsky -Date: Fri Nov 2 19:09:27 2018 -0700 - - flake8 - -commit d593a1bc8a8ede5b2a04fbd374bcfd0cf4c01d43 -Author: eugenevinitsky -Date: Fri Nov 2 18:59:47 2018 -0700 - - flake8 fixes - -commit f713982b7850fe64e6f8e1a0a91813733d857936 -Author: eugenevinitsky -Date: Fri Nov 2 18:36:15 2018 -0700 - - Update stabilizing_highway.py - - rllib experiments should not render - -commit 60a8ffaec65d0de081867e533fe35497d67f642b -Merge: d84725f3 c64af60c -Author: eugenevinitsky -Date: Sat Nov 3 01:57:50 2018 +0100 - - Merge branch 'master' into experiment_checkup - -commit c64af60c15b7afe68be54125209d1498ca273bfa -Author: Aboudy Kreidieh -Date: Fri Nov 2 17:56:53 2018 -0700 - - Gen scenario merge (#212) - - * removed 'state' from compute_reward - - * pep8 - - * moved generator components to scenario - - * removed all mentions of generators - - * removed generators from the tutorials - - * minor - -commit d84725f37177ddc569acacad1e2d0a80a36254dd -Author: eugenevinitsky -Date: Fri Nov 2 17:47:03 2018 -0700 - - Update velocity_bottleneck.py - -commit 3cae3c0181a2f7123f23ea924255f572bdb042f7 -Author: eugenevinitsky -Date: Fri Nov 2 17:46:23 2018 -0700 - - Update stabilizing_the_ring.py - -commit cfddae663fa79b6a394efc03d13df01aeea463ad -Merge: 20aa72e5 26c7d860 -Author: Umang Sharaf -Date: Fri Nov 2 17:42:17 2018 -0700 - - Merge branch 'gen_scenario_merge' into MENG-LustBranch - -commit 727725eaa07c2eb76d87910ab8dc226c63d0f19f -Merge: f4273c33 be5f2e89 -Author: Kevin Chien -Date: Fri Nov 2 17:40:38 2018 -0700 - - Merge branch 'master' into benchmark-desc - -commit 26c7d8607b2dbe6544a17b4fdd401e3d7fbab9d2 -Merge: a521015e be5f2e89 -Author: Umang Sharaf -Date: Fri Nov 2 17:36:58 2018 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow into gen_scenario_merge - -commit 20aa72e564c53006d1568670fc333ad7e5363c36 -Author: Lucfisc -Date: Fri Nov 2 17:21:50 2018 -0700 - - Aboudy helped - -commit 4f75d5ee45ca0b1292fb0d32fe8a0281c87c13f8 -Author: Kathy Jang -Date: Fri Nov 2 14:42:04 2018 -0700 - - All examples are in working condition, added bay_bridge and bay_bridge_toll to test_examples.py - -commit be5f2e89e4fee9769eb819224d0fbe2e18ca1585 -Merge: 8a621f5c 15bf1091 -Author: Aboudy Kreidieh -Date: Fri Nov 2 13:01:56 2018 -0700 - - Merge pull request #220 from flow-project/issue-templates - - Update issue templates - -commit 125c7fbaaa1cf9feb750e495d645c1e75ff383c2 -Merge: ccccd992 508baf25 -Author: AboudyKreidieh -Date: Fri Nov 2 12:59:48 2018 -0700 - - Merge branch 'coverage' of https://github.com/flow-project/flow into coverage - -commit ccccd9924e4af733e15678eb8d95387e41b162c0 -Merge: 2627a61c 8a621f5c -Author: AboudyKreidieh -Date: Fri Nov 2 12:58:53 2018 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow into coverage - -commit 508baf2598082e4b9d4cadcf235c808dbb360b45 -Merge: 2627a61c 8a621f5c -Author: eugenevinitsky -Date: Thu Nov 1 06:21:21 2018 +0100 - - Merge branch 'master' into coverage - -commit 8a621f5c64f2d524a6c650b15b612d9baf88e71c -Merge: 834d7d31 3bcc6313 -Author: Aboudy Kreidieh -Date: Wed Oct 31 12:13:21 2018 -0700 - - Merge pull request #215 from flow-project/eugenevinitsky-patch-1 - - Update README.md - -commit 834d7d31deaadca4c7909b6ec0300a7fba012f9d -Merge: b262f2c6 110f572a -Author: Aboudy Kreidieh -Date: Wed Oct 31 11:09:52 2018 -0700 - - Merge pull request #208 from flow-project/remove_state_comp_reward - - removed 'state' from compute_reward - -commit b262f2c6b52711b735e8061211d9f77104dfdcd2 -Merge: b73cde22 3a11e253 -Author: Aboudy Kreidieh -Date: Wed Oct 31 11:08:15 2018 -0700 - - Merge pull request #221 from flow-project/config_fix - - Config fix - -commit b73cde22d29d9a301f057d187ce980d8abc111bb -Merge: fab07b97 7ccf49c2 -Author: Aboudy Kreidieh -Date: Wed Oct 31 10:42:53 2018 -0700 - - Merge pull request #219 from flow-project/tutorial_06_fix - - Fixes get_rl_ids in tutorial06 - -commit 3a11e25375d0bc76d887f3d8259a336ba56d80e0 -Author: eugenevinitsky -Date: Wed Oct 31 14:27:54 2018 +0100 - - pointed to correct config defualt - -commit 57ed749bfe7b0cc6f4d7b2b4cc01e4573358a17a -Author: eugenevinitsky -Date: Wed Oct 31 14:25:04 2018 +0100 - - removed extra config file, made script pull from correct config - -commit 15bf10918894ea60e7e41063d9a18deab139fece -Author: eugenevinitsky -Date: Wed Oct 31 14:20:31 2018 +0100 - - Update and rename bug_report.md to issues.md - -commit 85c2eeda935a6dfaa1ad55c63adab2bc1716f69d -Author: eugenevinitsky -Date: Wed Oct 31 14:16:03 2018 +0100 - - Update issue templates - - I've created a template for issue submission. Thoughts? - -commit 7ccf49c2b86ec35e855e40331073ca2567734f23 -Author: eugenevinitsky -Date: Wed Oct 31 14:11:37 2018 +0100 - - fix comment - -commit 219092707ba2c9e5cc72b75be4ff7403fab97ea6 -Author: eugenevinitsky -Date: Wed Oct 31 14:09:29 2018 +0100 - - fix for bug marsalis noticed - -commit 3bcc6313afdd8953f9af38d7cac01af9921d9d1c -Author: eugenevinitsky -Date: Mon Oct 29 22:38:49 2018 +0100 - - Update README.md - - Remove google groups from the ReadME - -commit f4273c33614b16ef09c59f8cb95a236c772370b3 -Author: Kevin Chien -Date: Fri Oct 26 17:40:21 2018 -0700 - - added flow benchmark descriptions for flow-garden - -commit fab07b976412d0de94c192e9b754a30b76c7086b -Merge: 4ef3f962 59511557 -Author: Aboudy Kreidieh -Date: Wed Oct 24 17:00:04 2018 -0700 - - Merge pull request #211 from kjang96/issue_44 - - Changed the default value of detector gap to resolve the warning - -commit 5951155772e58cfe583d2f9443f79e25a69dcd23 -Author: Kathy Jang -Date: Wed Oct 24 14:39:37 2018 -0700 - - Changed the default value of detector gap to resolve the warning - -commit 4ef3f96253a05b3b56b2a1f04aefdc97c1a1df18 -Merge: 0e79abef 16636841 -Author: Mahesh Murag -Date: Wed Oct 24 14:32:07 2018 -0700 - - Merge pull request #204 from flow-project/checksum-bug - - Added print before SUMO Termination - -commit 1663684108bf8f58732db5c185436b8fe1155b18 -Author: maheshmurag -Date: Tue Oct 23 21:28:35 2018 -0700 - - Updated - - testing - - testing - - testing - - testing - - testing - - testing - - testing - - testing - - temp - -commit 14d781aa3363200402dd7fe905b4187edb2fb88e -Author: maheshmurag -Date: Mon Oct 22 16:50:08 2018 -0700 - - added print before termination - -commit 0e79abef03013cb02ce533444e245f4693840a2b -Author: Mahesh Murag -Date: Wed Oct 24 14:19:26 2018 -0700 - - Added caching and ensured flake8 runs on Python3 (#210) - -commit a521015e8f5a107dbcc2392e57ee9650339b2df8 -Author: AboudyKreidieh -Date: Wed Oct 24 14:19:04 2018 -0700 - - minor - -commit 63a186644fe383d9bbc7c8bd4044be0c03608b50 -Author: AboudyKreidieh -Date: Wed Oct 24 14:18:37 2018 -0700 - - removed generators from the tutorials - -commit 16a92308ab3f6b167d8f367e6a62843d4da51b91 -Author: AboudyKreidieh -Date: Wed Oct 24 13:21:35 2018 -0700 - - removed all mentions of generators - -commit 4c3478e32f0c83d314310bf673d70c0dbff1a5d7 -Author: AboudyKreidieh -Date: Wed Oct 24 13:17:04 2018 -0700 - - moved generator components to scenario - -commit 110f572af874f12700674761ce1b2b07c24985a9 -Author: AboudyKreidieh -Date: Tue Oct 23 23:48:02 2018 -0700 - - pep8 - -commit a9cf902ca6f0d5d157fea7e57938a6c89923faaa -Author: AboudyKreidieh -Date: Tue Oct 23 23:38:31 2018 -0700 - - removed 'state' from compute_reward - -commit 94e72e3242282a697f291a8e9398bc443b3f4b34 -Merge: bc44b212 ed03b96b -Author: Aboudy Kreidieh -Date: Tue Oct 23 23:16:44 2018 -0700 - - Merge pull request #188 from flow-project/save_rllib_alg_replay - - Save rllib algorithm and accessing param in visualizer_rllib - -commit 2627a61c24897ed63109bfee490a67bc5face5f2 -Author: AboudyKreidieh -Date: Sat Oct 20 00:18:33 2018 -0700 - - added coverage badge - -commit 1da8bfcca07954a73dcff29ad24270368c07d7be -Author: Lucfisc -Date: Fri Oct 19 19:41:33 2018 -0700 - - Netfile working for Luxembourg on my computer - -commit a12cb558e713e51e01767ba9a197f5477236da3a -Author: Lucfisc -Date: Fri Oct 19 18:52:53 2018 -0700 - - 'fixex Crystal import routes from net - -commit 299f551ac59b538f57790e242aca3f3896052525 -Author: Crystal Yan -Date: Fri Oct 19 18:26:15 2018 -0700 - - Adding Crystal's route extractor to scenario loading - -commit d095c82f2c80e6afcff725d3abce41ce95e80a11 -Author: Umang Sharaf -Date: Fri Oct 19 17:33:48 2018 -0700 - - Aboudy's changes - -commit 2eb5f457279fbb2505c684a57d74c9c37a0be0dd -Author: Lucfisc -Date: Fri Oct 19 17:02:01 2018 -0700 - - fixed a self._import_routes_from_net - -commit 9d0c589d80ef634ee6ae6e31b6f9914c136f675b -Author: Lucfisc -Date: Fri Oct 19 16:57:23 2018 -0700 - - changed some named in the list - -commit 79ac6a3b5690fb297efa0dea7fd60a1fb1b80065 -Author: AboudyKreidieh -Date: Fri Oct 19 02:23:14 2018 -0700 - - maybe? - -commit 66c3cccc66ac3154ba611fea093e0924a1733b05 -Author: AboudyKreidieh -Date: Fri Oct 19 01:25:48 2018 -0700 - - coverage report - -commit 65579898a72c3ab13fa8c22bf7c51b87374846ab -Author: AboudyKreidieh -Date: Fri Oct 19 01:12:10 2018 -0700 - - mod - -commit 1a30516b811521eb7042393ceb12a043be04febb -Author: AboudyKreidieh -Date: Fri Oct 19 01:03:59 2018 -0700 - - mod - -commit 69e823cb2fb5c116661cc05c0d204aa85364066c -Author: AboudyKreidieh -Date: Fri Oct 19 01:03:01 2018 -0700 - - coverage - -commit 6ef49db8962ff0c26847d0109ddf93cd050c7640 -Author: Lucfisc -Date: Thu Oct 18 18:15:20 2018 -0700 - - Typo fixed - -commit 35759cff6f41a00808a34d6d1f1adbd4397e6fa4 -Author: Lucfisc -Date: Thu Oct 18 17:30:32 2018 -0700 - - added vehicle information - -commit 448b2052a1a65ca3dadd5d5cd90ff22d1bbef0f5 -Author: Lucfisc -Date: Thu Oct 18 17:07:01 2018 -0700 - - deleted an import cmd not necessary - -commit 5b748dc84200576df5ad63f243b5f2c091e858f0 -Author: Lucfisc -Date: Thu Oct 18 17:04:51 2018 -0700 - - vehicle type added from vtypes.add.xml - -commit 4b4a1595b48b38ddbf0b2ef828a0a99cbb3df519 -Author: Lucfisc -Date: Thu Oct 18 15:26:13 2018 -0700 - - bug fixes - -commit d071ef29dd731ce6eafffc38c308d4de8dd14ebd -Author: Lucfisc -Date: Thu Oct 18 15:18:24 2018 -0700 - - typo indent fixes - -commit 9b7c1dd00f195901d59d22a827056e07a304cf18 -Author: Lucfisc -Date: Thu Oct 18 15:11:28 2018 -0700 - - typo fixes - -commit 79a81155dcacbae0852bb95cdc35615caaff11ae -Author: Lucfisc -Date: Wed Oct 17 22:51:34 2018 -0700 - - minor changes, load Traffic Light from Flow repo - -commit 010ed9d327e26616c655af93433c81dc8896daee -Author: Lucfisc -Date: Wed Oct 17 22:01:14 2018 -0700 - - merged with Umang TrafficLight - -commit ed03b96b0a3925359112c79a1a6726d746d6b806 -Author: Kevin Chien -Date: Tue Oct 16 17:35:10 2018 -0700 - - fixes flake8 whitespace - -commit cd3f1cefa6e9032ad103ff8eb15fc7141c6d4d6d -Author: Kevin Chien -Date: Mon Oct 15 18:02:41 2018 -0700 - - Updated examples, other files with save alg name usage for rllib - -commit e602f8dcf5ff1c6ab421a82152731eb4513677ad -Author: Lucfisc -Date: Fri Oct 12 17:59:10 2018 -0700 - - netfile update routes - -commit 67cb99303c45ecc070a9f87f04662858879febc8 -Author: Kanaad Parvate -Date: Fri Oct 12 13:29:05 2018 -0700 - - cloudpickle 0.5.3 doesn't work - -commit 96ae5d644d2a04f60292855d55d6a92840cf1cd8 -Author: AboudyKreidieh -Date: Sat Oct 6 20:37:22 2018 -0700 - - moved initial_speeds to the make_routes - -commit a8a35e760dbe2540f0f51ce719f12cda6f5108bb -Author: AboudyKreidieh -Date: Sat Oct 6 20:03:25 2018 -0700 - - bug fix - -commit 389325cbcdb50468532b10ffa2a5fa88aaf3d862 -Author: AboudyKreidieh -Date: Sat Oct 6 19:56:33 2018 -0700 - - moved speed_mode and lc_mode to the sumo-specific parameters - -commit 2d310b83b1cd5a733bc8db13013f6b171ebbfa10 -Author: Lucas Fischer -Date: Fri Oct 5 18:22:00 2018 -0700 - - Create routes from xml file - -commit 48b2f9166675734fdbf1232d56b3930b3727c33d -Author: Kevin Chien -Date: Fri Oct 5 17:47:18 2018 -0700 - - Moved run from flow_params to env_config - -commit 0d04285f08bd976dfbcbe87dbb83344d38714ed9 -Author: Kevin Chien -Date: Fri Oct 5 17:16:06 2018 -0700 - - Fixed Pep8 style issues - -commit b98b27e07f982e33f4015bbe994a315f8f62b2d1 -Author: Kevin Chien -Date: Fri Oct 5 02:01:11 2018 -0700 - - Added run param to usage example so visualizer can access - -commit 7a546733d91c4c40639c8e9d3870efecafe95102 -Author: Kevin Chien -Date: Fri Oct 5 01:57:30 2018 -0700 - - RLLib visualizer now checks for alg name in params.json of results - -commit bc44b212cd96cdaf8fb02b12a676977565f1bf09 -Merge: 2f547105 36dcbac6 -Author: AboudyKreidieh -Date: Sun Sep 30 21:32:24 2018 -0700 - - Merge pull request #180 from flow-project/corl_final - - CORL final version for flow 0.3.0 - -commit 36dcbac6e8c98ce00394056ad31e1ccea2410b99 -Author: AboudyKreidieh -Date: Sun Sep 30 21:10:24 2018 -0700 - - PR fixes - -commit 277f1ea3964c7b251435df51f3bcfdd41e8afea4 -Author: AboudyKreidieh -Date: Sun Sep 30 20:41:39 2018 -0700 - - pep8 - -commit 70281193201c692fa38498b926af6f9e3730d0ce -Author: eugenevinitsky -Date: Sun Sep 30 20:27:38 2018 -0700 - - more commits for corl final - -commit 65395b8b8f031f9b50160f4b9df022f1aadee16d -Author: eugenevinitsky -Date: Sun Sep 30 16:10:11 2018 -0700 - - flake8 - -commit 2a21e05749b38c6bf805c8c251490f9b2bb107a2 -Author: eugenevinitsky -Date: Sun Sep 30 16:01:05 2018 -0700 - - removed some changes - -commit b1949ed5acb3a631b3a45b1d0ae4976896bffd4d -Author: eugenevinitsky -Date: Sun Sep 30 15:48:36 2018 -0700 - - commit for flow 0.3.0 - -commit 91e4fcf72c8a35510a2c6db6953f13049ba5687d -Author: eugenevinitsky -Date: Sat Sep 29 07:59:30 2018 -0700 - - commit for lr 5e-4 lambda 0p3 gae true grid 0 ppo - -commit 8c1726e55ef9988aaf033744684931d231fb3135 -Author: eugenevinitsky -Date: Sat Sep 29 07:56:24 2018 -0700 - - commit for lr 5e-3 lambda 0p3 gae true grid 0 ppo - -commit 2b47819225dec1ebaeff2845a7bd362ee7a36228 -Author: eugenevinitsky -Date: Sat Sep 29 07:55:45 2018 -0700 - - commit for lr 1e-3 lambda 0p3 gae true grid 0 ppo - -commit ab610182c85b8d3c16161bb28d0b02a7d37c860f -Author: eugenevinitsky -Date: Sat Sep 29 07:53:38 2018 -0700 - - commit for lr 1e-2 lambda 0p3 gae true grid0 - -commit 9e3c9d874a5c722e0bba28c265f41f43eb852d4e -Author: eugenevinitsky -Date: Sat Sep 29 07:47:26 2018 -0700 - - commit for lambda 0.3 grid 1 gae true - -commit 2d6dcfb50cbcc1dbb5d82c98b371185b741dc8c0 -Author: eugenevinitsky -Date: Sat Sep 29 07:41:43 2018 -0700 - - commit for grid 1 lambda 0.1 gae true ppo - -commit 4e32e69945e0633b115f988762fb2027c4747f7f -Author: eugenevinitsky -Date: Sat Sep 29 07:37:28 2018 -0700 - - commit for grid 1 lambda 0.1 - -commit 76293fa4bcbeb5e52928fd36eef69dc52f1713af -Author: eugenevinitsky -Date: Sat Sep 29 00:00:24 2018 -0700 - - commit for grid 0 lambda p 05 gae true ppo - -commit a98dfc4317a52a02dd838fef51f2be63e24fa797 -Author: eugenevinitsky -Date: Fri Sep 28 23:55:38 2018 -0700 - - commit for grid 0 lambda p 05 gae false ppo - -commit b6b54e851730a062d171c05f8b46eb3bdd9214fb -Author: eugenevinitsky -Date: Fri Sep 28 23:53:44 2018 -0700 - - commit for grid 0 lambda p 05 gae true ppo - -commit 8e356d55957e645083f7687b607bf55380562113 -Author: eugenevinitsky -Date: Fri Sep 28 23:41:51 2018 -0700 - - comment for no gae grid 1 ppo experiments - -commit 0995986ae425402c690a6abdff365bb64cd2d24c -Author: eugenevinitsky -Date: Fri Sep 28 23:33:31 2018 -0700 - - decreased lambda for ppo grid 1 - -commit a24869430bb13d5353f5fbfa4e2698e59a8352dd -Author: eugenevinitsky -Date: Fri Sep 28 22:49:48 2018 -0700 - - commit for grid 1 lr .01 ppo - -commit 50150fb55fa317203522ef51abab3988a200bc93 -Author: eugenevinitsky -Date: Fri Sep 28 22:44:00 2018 -0700 - - commit for grid 1 lr 5e-3 lr te-2 - -commit 5d3c86e44c8cc8a8aed34b0f9a441a0786542077 -Author: eugenevinitsky -Date: Fri Sep 28 22:41:28 2018 -0700 - - commit for grid - lr5e-3 ppo - -commit a38284c838a241826b18db69d4917c9b7cdf9e8b -Author: eugenevinitsky -Date: Fri Sep 28 22:38:57 2018 -0700 - - commit for grid 0 lr 5e-2 ppo - -commit 6e2fa2b4a5d7e4afa51a020102019fc31ae64c4d -Author: eugenevinitsky -Date: Fri Sep 28 14:05:02 2018 -0700 - - commit for grid 1 s0 ppo - -commit f102ff1c01e97f840f0e257c8e1ff507252e6736 -Author: eugenevinitsky -Date: Fri Sep 28 14:02:45 2018 -0700 - - commit for grid 0 lr5e-5 ppo - -commit 2e97778640068dc1041445c96314043f1e1a39af -Author: eugenevinitsky -Date: Fri Sep 28 14:00:31 2018 -0700 - - commit for grid 0 s1 lr5e-4 ppo - -commit 16cfba99dabce7ad8055f22c5a836fd5c3329014 -Author: eugenevinitsky -Date: Fri Sep 28 13:53:16 2018 -0700 - - commit for grid 1 s0 es - -commit 1e0c4be59cfe7a4452fc20834949687e9ed56231 -Author: eugenevinitsky -Date: Fri Sep 28 13:51:15 2018 -0700 - - commit for grid 0 s1 sgd 0.02 es - -commit 002ebd855534e2388d6e471274881d5abae1e679 -Author: eugenevinitsky -Date: Fri Sep 28 13:48:30 2018 -0700 - - commit for grid 0 s0 es - -commit c21bab716fd2046f2f3a8208c88b23c12a0f66ab -Author: eugenevinitsky -Date: Fri Sep 28 13:42:03 2018 -0700 - - commit for grid 1 s0 ars - -commit 78ebc51e88338ff6f3ac59e5c06b11a18b750f00 -Author: eugenevinitsky -Date: Fri Sep 28 13:39:22 2018 -0700 - - commit for grid 0 s1 ars - -commit df23f99de057064ea6d57e1f7dab00215adfd72a -Author: eugenevinitsky -Date: Fri Sep 28 13:34:47 2018 -0700 - - commit for grid 0 s0 ars - -commit adb9397145caa5a858ad5f0f46a708fa2e4aa955 -Author: eugenevinitsky -Date: Fri Sep 28 02:57:20 2018 -0700 - - commit for merge2 lr5e-5 ppo - -commit 0cbc3cf4ba7edfa528abc56954a8e7491c9e05d0 -Author: eugenevinitsky -Date: Fri Sep 28 02:55:18 2018 -0700 - - commit for merge 2 lr5e-4 ppo - -commit e7208968560b83f81f87f2a3248313daef845700 -Author: eugenevinitsky -Date: Fri Sep 28 02:53:10 2018 -0700 - - commit for merge1 lr 5e-5 ppo - -commit 6346bdd073fb8f8c6995f1aedf4c8840dc625715 -Author: eugenevinitsky -Date: Fri Sep 28 02:50:20 2018 -0700 - - commit for merge 1 lr5e-4 ppo - -commit b83559b30223a3131c749d9fcbce2a5fa4bfc4db -Author: eugenevinitsky -Date: Fri Sep 28 02:47:15 2018 -0700 - - commit for merge 0 lr5e-5 ppo - -commit e2ec90aa456d30ba92386776d015691b70b4ab09 -Author: eugenevinitsky -Date: Fri Sep 28 02:44:57 2018 -0700 - - upped cpus for merge 0 lr5e-4 ppo - -commit 1a6d3d71221116daf11bfd578246accc544ee5cc -Author: eugenevinitsky -Date: Fri Sep 28 02:42:19 2018 -0700 - - commit for merge 0 lr5e-4 ppo - -commit c5bbe73c51d6edb1af5bd054e3319a9012702c0e -Author: eugenevinitsky -Date: Fri Sep 28 02:35:37 2018 -0700 - - commit for grid 1 seed 0 ppo - -commit 0ac93267f45f96562f4a144ce9dc476f58cc0f4d -Author: eugenevinitsky -Date: Fri Sep 28 02:33:02 2018 -0700 - - commit for grid0 lr5e-5 ppo - -commit 9dbf9091d79e4817c02bc0e733a103204988e1f3 -Author: eugenevinitsky -Date: Fri Sep 28 02:30:10 2018 -0700 - - commit for grid 0 lr5e-4 ppo - -commit 3262b7b1a8b591eb39cea511f7ee0dc053d2054b -Author: eugenevinitsky -Date: Fri Sep 28 02:28:04 2018 -0700 - - commit for figure eight 2 ppo - -commit 3bfe9eb0be37090f3c67ded5c7446a34d8c66dbd -Author: eugenevinitsky -Date: Fri Sep 28 02:25:47 2018 -0700 - - commit for figure eight 2 ppo - -commit b974e194fc30757883f22b901e1f7bcd0e9b0518 -Author: eugenevinitsky -Date: Fri Sep 28 02:23:30 2018 -0700 - - commit for figure eight 1 ppo - -commit 1964a90cd72aa63f0e122dc6c7a2b31f8bb11836 -Author: eugenevinitsky -Date: Fri Sep 28 02:13:16 2018 -0700 - - commit for figure eight 0 ppo - -commit b5e06791ccb01cb2a8504ed4a655d72689594b4e -Author: eugenevinitsky -Date: Fri Sep 28 02:03:27 2018 -0700 - - commit for bottleneck2 lr 5e-5 ppo - -commit 6f20ff7022913ba12534f1a8d3691030fbcb0a58 -Author: eugenevinitsky -Date: Fri Sep 28 01:41:26 2018 -0700 - - commit for bottleneck 2 lr 5e-4 ppo - -commit c829c9a48544175712bcbe29f01b3fab2f237f6b -Author: eugenevinitsky -Date: Fri Sep 28 01:37:47 2018 -0700 - - commit for bottleneck 1 5e-4 ppo - -commit 8a993dff450cb24bd46ec5af6c6655b8ecfc2a71 -Author: eugenevinitsky -Date: Fri Sep 28 01:27:22 2018 -0700 - - commit for bottleneck 1 lr 5e-4 ppo - -commit 9b0d9e09420f50bb1ea4bdf41091b01b5d85372e -Author: eugenevinitsky -Date: Fri Sep 28 01:21:33 2018 -0700 - - commit for bottleneck 1 lr5e-5 ppo - -commit 77cbde8107e4abdbdefabaa2c59b38df59e59cb9 -Author: eugenevinitsky -Date: Fri Sep 28 01:11:25 2018 -0700 - - commit for bottleneck 1 lr 5e-4 ppo - -commit 4886cedcadeaeff99da2b4ea713fe3dfb5887bb6 -Author: eugenevinitsky -Date: Fri Sep 28 01:03:54 2018 -0700 - - commit for bottleneck 1 lr 5e-5 ppo - -commit 53092ef3c034e5339029e241822079c96711d45b -Author: eugenevinitsky -Date: Fri Sep 28 00:56:04 2018 -0700 - - commit for bottleneck 0 lr 5e-4 ppo - -commit 599d3717e7aea0e89ee64cceec28f5eb10a0d736 -Author: eugenevinitsky -Date: Fri Sep 28 00:53:43 2018 -0700 - - minor downgrade in rollout number - -commit 17b00dd2691973e8f0265d7c0c6bb67c8eeda19a -Author: eugenevinitsky -Date: Fri Sep 28 00:51:55 2018 -0700 - - commit for merge 2 sgd 0.02 - -commit f1890ccbc37efc61b17f26e8e4f97587e14736e7 -Author: eugenevinitsky -Date: Fri Sep 28 00:49:17 2018 -0700 - - commit for merge 2 sgd 0.01 ars - -commit 1dcf8b7744fe99a21ad36b9151df499553c1e40f -Author: eugenevinitsky -Date: Fri Sep 28 00:46:49 2018 -0700 - - commit for merge1 sgd 0.02 ars - -commit bf145089fee212c021954344484bea49870d3742 -Author: eugenevinitsky -Date: Fri Sep 28 00:44:21 2018 -0700 - - commit for merge 1 sgd 0.01 ars - -commit fd027248f176b3b5c4ee85beaa68af317001e866 -Author: eugenevinitsky -Date: Fri Sep 28 00:40:56 2018 -0700 - - commit for merge 0 sgd 0.02 ars - -commit 0c4f88c97da41bbfb196e2c6356baef93ec71745 -Author: eugenevinitsky -Date: Fri Sep 28 00:35:12 2018 -0700 - - commit for merge 0 sgd 0.01 - -commit 3a163e547b4b9a086248ec8df7537b8d8ef9a5d6 -Author: eugenevinitsky -Date: Fri Sep 28 00:32:02 2018 -0700 - - commit for merge1 sgd 0.01 ars - -commit 6261cefd4a16df297221ec4108be108aec7bac02 -Author: eugenevinitsky -Date: Fri Sep 28 00:30:02 2018 -0700 - - commit for merge 0 sgd0.02 ars - -commit a749f14018d7f5d8430eafe0ecfd19f7b18f69d2 -Author: eugenevinitsky -Date: Fri Sep 28 00:26:04 2018 -0700 - - commit for merge 0 sgd 0.01 ars - -commit a8a3278ee135573eed2733d78840f3b673d72336 -Author: eugenevinitsky -Date: Fri Sep 28 00:19:49 2018 -0700 - - commit for grid 1 seed 0 ars - -commit 70253f9c9088ee6339d5ba561a5f0d6b6a41896f -Author: eugenevinitsky -Date: Fri Sep 28 00:17:40 2018 -0700 - - commit for grid 0 sgd 0.02 ars - -commit f49c5ee67d340d8a6e73b356e0a3920d00cc7f4d -Author: eugenevinitsky -Date: Fri Sep 28 00:14:12 2018 -0700 - - commit for grid 0 sgd 0.01 ars - -commit eddf915fd624e60a903af6bfaa78d274707af7bd -Author: eugenevinitsky -Date: Fri Sep 28 00:08:46 2018 -0700 - - commit for bottleneck2 sgd 0.02 ars - -commit 25c3603517afdf102278f08ecf739332c2315e6b -Author: eugenevinitsky -Date: Fri Sep 28 00:00:40 2018 -0700 - - commit for bottleneck 2 sgd 0 ars - -commit 0e75a8d3d8e043c2a9dc0b10def64ba3e863a223 -Author: eugenevinitsky -Date: Thu Sep 27 23:54:54 2018 -0700 - - commit for bottleneck 0 sgd 0.02 - -commit 192918bedd1d6a98740d984c50f8bf449f960ef1 -Author: eugenevinitsky -Date: Thu Sep 27 23:45:59 2018 -0700 - - commit for bottleneck 1 sgd 0.01 ars - -commit 33bc31d95d7d4190713c42d34836bbfb12d778b8 -Author: eugenevinitsky -Date: Thu Sep 27 23:29:06 2018 -0700 - - commit for bottleneck 0 sgd 0.02 - -commit d2f4c08fced8e7e2abf9dac63efd8727b9352486 -Author: eugenevinitsky -Date: Thu Sep 27 23:06:08 2018 -0700 - - commit for bottleneck 0 sgd 0.01 ars - -commit e127d83eab376d5a7b2c6d66765a7281b6588480 -Author: eugenevinitsky -Date: Thu Sep 27 23:01:17 2018 -0700 - - commit for grid0 sgd 0.02 es - -commit 070aeeace5e549f61b958f04c7f3545b3c089054 -Author: eugenevinitsky -Date: Thu Sep 27 22:59:16 2018 -0700 - - commit for grid 0 sgd 0.01 es - -commit a5f8a879d1a886630671b13842fdb6aea789c777 -Author: eugenevinitsky -Date: Thu Sep 27 22:56:20 2018 -0700 - - bug fix - -commit e51e8f101137765396e06c9a07ad82f02f1b36c3 -Author: eugenevinitsky -Date: Thu Sep 27 22:52:03 2018 -0700 - - commit for grid 1 sgd .02 es - -commit 6ed6e68ebe2b522623282a6103ceae5d51eeb713 -Author: eugenevinitsky -Date: Thu Sep 27 22:46:05 2018 -0700 - - commit for grid 0 sgd 0.01 es - -commit 3d8e45978a4f43b25cb62ff1e8c9066e47e7662f -Author: eugenevinitsky -Date: Thu Sep 27 22:43:40 2018 -0700 - - commit for merge 2 sgd 0.02 es - -commit 0697e59a50ea6b565032d68db559d99006d50612 -Author: eugenevinitsky -Date: Thu Sep 27 22:39:48 2018 -0700 - - commit for merge 2 sgd 0.01 es - -commit 97897cf43bf0b9423b53970de346aad38068354c -Author: eugenevinitsky -Date: Thu Sep 27 22:37:39 2018 -0700 - - commit for merge 1 sgd 0.02 es - -commit db6b2f7a9a5637e971ef6d8dd69504b77f179a32 -Author: eugenevinitsky -Date: Thu Sep 27 22:32:19 2018 -0700 - - commit for merge 1 sgd 0.01 es - -commit 2f093c1f0d2aab4df6d2aeb2e7d17b8bcb92bd4a -Author: eugenevinitsky -Date: Thu Sep 27 22:25:57 2018 -0700 - - commit for merge 0 sgd 0.02 es - -commit 6fabbc2796954ac8a548612f50e0f31990541e36 -Author: eugenevinitsky -Date: Thu Sep 27 22:23:45 2018 -0700 - - commit for merge 0 s0 es - -commit f8e02b26fb3cd757f11a0b3ed501a23985136d64 -Author: eugenevinitsky -Date: Thu Sep 27 22:16:57 2018 -0700 - - commit for grid 1 s0 es - -commit e8fe868d864fc4887d295606d3931bbaa02d177f -Author: eugenevinitsky -Date: Thu Sep 27 22:14:39 2018 -0700 - - commit for grid0 sgd .02 es - -commit dfaa9a02be1bbbfa83994cc17cb9b794ae8ab0db -Author: eugenevinitsky -Date: Thu Sep 27 22:12:29 2018 -0700 - - commit for grid 0 es - -commit 8683d4f9d5bac28657099302f7515f2d02680072 -Author: eugenevinitsky -Date: Thu Sep 27 22:09:23 2018 -0700 - - commit for figure eight 2 es - -commit 216e06f2ed2138d566976554110879c4dff1e7c8 -Author: eugenevinitsky -Date: Thu Sep 27 22:07:19 2018 -0700 - - commit for figure eight 1 es - -commit 050fee72a8fd5347cd19d2c87630f77c891bc7ef -Author: eugenevinitsky -Date: Thu Sep 27 22:03:37 2018 -0700 - - commit for figure eight 0 es - -commit c794206de4f0e5741de0d89b9d45cc31514345dc -Author: eugenevinitsky -Date: Thu Sep 27 21:58:13 2018 -0700 - - commit for bottleneck 2 sgd .02 es - -commit 66b52cb4bb644f14f7e7ec5e83fe79c3ecbc2ea2 -Author: eugenevinitsky -Date: Thu Sep 27 21:51:22 2018 -0700 - - commit for bottleneck 2 es - -commit ae8290a4584d17baff220a613841d00821ddc7fa -Author: eugenevinitsky -Date: Thu Sep 27 21:44:48 2018 -0700 - - commit for bottleneck 1 sgd .02 es - -commit 2ad20e1e9517463dbf49c254b522507dcd8f0d47 -Author: eugenevinitsky -Date: Thu Sep 27 21:37:04 2018 -0700 - - commit for ars figure eight 2 - -commit f7417da2c26ddef0c7fdb28a8f6b71234549e686 -Author: eugenevinitsky -Date: Thu Sep 27 21:35:09 2018 -0700 - - commit for figure eight 1 ars - -commit ade29067862e003ac538cae4fb2d295831d2d70f -Author: eugenevinitsky -Date: Thu Sep 27 21:32:37 2018 -0700 - - commit for figure eight 0 ars - -commit 74cf71a546641e2300aa3cb1354fdde9e2865d66 -Author: eugenevinitsky -Date: Thu Sep 27 21:24:52 2018 -0700 - - commit for figure eight 2 ars - -commit c034453c4372bf043c01c63f42f70171a4b5073a -Author: eugenevinitsky -Date: Thu Sep 27 21:22:45 2018 -0700 - - commit for figure eight 1 ars - -commit c383aa53263a0e2e5f558786f3f568cf89a1caca -Author: eugenevinitsky -Date: Thu Sep 27 21:18:36 2018 -0700 - - commit for figure eight 0 ars - -commit 136f84b567b399b1472dd52fa3cf1efebf7be903 -Author: eugenevinitsky -Date: Thu Sep 27 21:13:50 2018 -0700 - - commit for bottleneck 1 s0 es - -commit cfd275eb8c6b0967dc016af0c32383706c8df9dc -Author: eugenevinitsky -Date: Thu Sep 27 21:08:37 2018 -0700 - - commit for bottleneck 0 s3 es - -commit 6762766b6d26ae74550a5cc7760251fd5981aaf2 -Author: eugenevinitsky -Date: Thu Sep 27 21:03:06 2018 -0700 - - commit for bottleneck 0 s0 es - -commit 2942d6f8a030d091f367e1523a2145f9ea82586a -Author: eugenevinitsky -Date: Thu Sep 27 21:01:58 2018 -0700 - - commit for bottleneck 0 s3 es - -commit 9ddf9839abfa2ca00c3d3fb5b17ceb41a08e77f4 -Author: eugenevinitsky -Date: Thu Sep 27 20:58:46 2018 -0700 - - comment for bottleneck 0 s0 es - -commit a7399bf301504881873a0499d1f5f18d41473de2 -Author: eugenevinitsky -Date: Thu Sep 27 20:53:56 2018 -0700 - - comment for bottleneck 0 s0 es - -commit 8c8329f28043436995a2d9b56754053cf1babf98 -Author: eugenevinitsky -Date: Thu Sep 27 20:50:32 2018 -0700 - - comment for bottleneck 0 s0 es - -commit f2d21c1e6796dc02fa5174c2be03ce86c6bc9fa2 -Author: eugenevinitsky -Date: Thu Sep 27 20:42:04 2018 -0700 - - commit for bottleneck0_s0_es - -commit 2e379f5b9176e6934bdbd0619d22d335ca34b213 -Author: eugenevinitsky -Date: Thu Sep 27 20:08:06 2018 -0700 - - commit for bottleneck0_s0_es - -commit b8377fadafbdea7748d4dde4041a852722df1656 -Author: eugenevinitsky -Date: Thu Sep 27 20:04:30 2018 -0700 - - commit for es bottleneck0_s0 - -commit 1cad1b4f8d2e7c1a6803d526cc6daccea75b09be -Author: eugenevinitsky -Date: Thu Sep 27 19:57:24 2018 -0700 - - commit for final exps - -commit 96f22465d676f086aff170e8a1312f7be85ae3cc -Author: eugenevinitsky -Date: Thu Sep 27 18:45:10 2018 -0700 - - commit for first run of all aws experiments - -commit c22f2d0f2febcd6dae389338dd3676b05c8e198a -Merge: 7244c137 826400d6 -Author: AboudyKreidieh -Date: Wed Sep 26 14:47:27 2018 -0700 - - Merge branch 'new_sumo' of https://github.com/flow-project/flow into new_sumo - -commit 826400d68875e1fd9f6cb16cba22404bf0f7e40a -Author: eugenevinitsky -Date: Wed Sep 26 14:44:17 2018 -0700 - - changed upload folder - -commit 7244c137fbb2ae24e9a55c4802ca48b38588c6f6 -Author: AboudyKreidieh -Date: Wed Sep 26 14:37:44 2018 -0700 - - prevents non-sumo vehicles from colliding - -commit 4c3b85a58b673c375a4cc387289bf52abc46927d -Author: eugenevinitsky -Date: Wed Sep 26 14:33:05 2018 -0700 - - added standstill penalty - -commit 1385b9bf01832d89dceb00d1ede0173d4cd469f9 -Author: eugenevinitsky -Date: Wed Sep 26 13:56:24 2018 -0700 - - removed unnecessary line - -commit d26699f08e45a0b6e85a4996ada95e233b1fcbb4 -Author: eugenevinitsky -Date: Wed Sep 26 13:56:08 2018 -0700 - - updated params for bottleneck and merge - -commit e21266aec28c66e37fdd7f9e1b6e5e8910a34255 -Author: eugenevinitsky -Date: Wed Sep 26 13:16:50 2018 -0700 - - fixed visualizer rllib for ppo - -commit adc5a0ff1ec19363cc0f14e03c5f797b29bd0ab9 -Author: eugenevinitsky -Date: Wed Sep 26 10:44:58 2018 -0700 - - fixed up baselines to print outflow over the last 500 seconds - -commit 1d6bbd88b507f7bc4f38a10b01b69d43baee4a8e -Author: eugenevinitsky -Date: Wed Sep 26 10:29:33 2018 -0700 - - added more output to visualizer rllib - -commit 2b26de467b35d40d667ba1a08945b2f1c5bc5568 -Author: eugenevinitsky -Date: Tue Sep 25 21:39:58 2018 -0700 - - commit for merge 2 ppo - -commit a7d5cac67282756f9a1e0268c8c036130d1ebe0a -Author: eugenevinitsky -Date: Tue Sep 25 21:37:50 2018 -0700 - - commit for merge 1 - -commit c5c56bc6e50b2efad48b29cff7b7a26b240319c7 -Author: eugenevinitsky -Date: Tue Sep 25 21:34:55 2018 -0700 - - commit for merge 0 ppo - -commit 214f96a8e576d6a00767791d8690fb2c02d92f9e -Author: eugenevinitsky -Date: Tue Sep 25 21:30:32 2018 -0700 - - commit for grid 1 ppo - -commit c74816caff497c2d783e24194446f01ff0840f98 -Author: eugenevinitsky -Date: Tue Sep 25 21:26:54 2018 -0700 - - commit for grid 0 ppo - -commit 8ed20aebc025f642eea943d167d7edfc98d17d2a -Author: eugenevinitsky -Date: Tue Sep 25 21:23:55 2018 -0700 - - commit for bottleneck 2 ppo - -commit ccdf77e71fdb7928f46a90d1846097d3175a2d8c -Author: eugenevinitsky -Date: Tue Sep 25 21:21:49 2018 -0700 - - commit for bottleneck 1 ppo - -commit 3463ccf80810b764fdde04765f7d03029f9c563b -Author: eugenevinitsky -Date: Tue Sep 25 21:19:08 2018 -0700 - - commit for bottleneck 0 ppo - -commit d1ff092ffd566cd3b04df19630d383f5f67a8c46 -Author: eugenevinitsky -Date: Tue Sep 25 21:16:35 2018 -0700 - - figure eight 2 ppo commit - -commit f9d2f59bbb5d7d1b05901562220ca5204697891d -Author: eugenevinitsky -Date: Tue Sep 25 21:14:35 2018 -0700 - - commit for figure eight 1 ppo - -commit fa08ac4c1f715fb582aa746f3ad06f0c231580b3 -Author: eugenevinitsky -Date: Tue Sep 25 21:03:18 2018 -0700 - - commit for figure eight 0 ppo - -commit 1e21c6ead70deb96ba3ecb8a3770f8360f985b4c -Author: eugenevinitsky -Date: Tue Sep 25 20:55:26 2018 -0700 - - merge 2 commit for es - -commit d3aa83412f8627946f3f34bc0b2c7a20fd3e4e56 -Author: eugenevinitsky -Date: Tue Sep 25 20:51:36 2018 -0700 - - commit for merge 1 es - -commit 2a2457f126e835246987ab7b0bbf8810cdb47aee -Author: eugenevinitsky -Date: Tue Sep 25 20:49:01 2018 -0700 - - commit for es merge0 - -commit bb27c815b6a45c3de2f5d901ee35c020b17e41d1 -Author: eugenevinitsky -Date: Tue Sep 25 20:45:08 2018 -0700 - - commit for es grid1 - -commit 0dc6f71cf120ed5035729501f019acbc2156ffb4 -Author: eugenevinitsky -Date: Tue Sep 25 20:42:42 2018 -0700 - - commit for grid 0 es - -commit 66873c4bee4de5f4f8cc116d21d6e7d6191de09d -Author: eugenevinitsky -Date: Tue Sep 25 20:39:35 2018 -0700 - - commit for bottleneck 2 for es - -commit 13c1cd1a4364d58994290ea6b757d241fc49a5ce -Author: eugenevinitsky -Date: Tue Sep 25 20:36:58 2018 -0700 - - commit for bottleneck 1 es - -commit e483fbe41f5864ce23e299b30cdf019e87501034 -Author: eugenevinitsky -Date: Tue Sep 25 20:33:59 2018 -0700 - - commit for bottleneck 0 es - -commit abb3427ab309d6bced7b8e3a519edb526ac7728a -Author: eugenevinitsky -Date: Tue Sep 25 20:31:54 2018 -0700 - - commit for figure eight 2 es - -commit 42e4bf72ca414da3cb41bfc08fd0455567d8e1a1 -Author: eugenevinitsky -Date: Tue Sep 25 20:28:44 2018 -0700 - - figure eight 1 for es - -commit d7b01ca4b8cf05e6d3b4d78abf6deb76edefc44b -Author: eugenevinitsky -Date: Tue Sep 25 20:26:51 2018 -0700 - - commit for figure eight 0 es - -commit 20975ecc12a0c69dbd8b1975283ecf212f370acc -Author: eugenevinitsky -Date: Tue Sep 25 20:21:04 2018 -0700 - - commit for figureeight0 es - -commit 59b5a7909946eb8e74e9f56c02a7b75a9d427a66 -Author: eugenevinitsky -Date: Tue Sep 25 20:17:23 2018 -0700 - - commit for merge 2 for ars - -commit 43b831274ccf7e4a7b335a415ed4c4275856ab54 -Author: eugenevinitsky -Date: Tue Sep 25 20:15:20 2018 -0700 - - commit for merge1 ars - -commit 7fbaa2d3b9c422d166a174e577097923f5d28b55 -Author: eugenevinitsky -Date: Tue Sep 25 20:13:10 2018 -0700 - - commit for merge0 - -commit ea638c0b2689c061514244c13678b8435029d16d -Author: eugenevinitsky -Date: Tue Sep 25 20:09:20 2018 -0700 - - commit for grid 1 ars - -commit 8420c737d07eaf56c75f33da3e1e2cf41772b614 -Author: eugenevinitsky -Date: Tue Sep 25 20:06:33 2018 -0700 - - commit for grid0 - -commit b50a361213d36b4e7612d42d8955e6029635b243 -Author: eugenevinitsky -Date: Tue Sep 25 20:03:04 2018 -0700 - - commit for bottleneck2 ars - -commit 9c530c1cd2d346bd97543b1b7bd8e48950bc3267 -Author: eugenevinitsky -Date: Tue Sep 25 20:00:09 2018 -0700 - - commit for bottleneck0 ars - -commit 597ce00902948e9a3c9b997896e5660be072185b -Author: eugenevinitsky -Date: Tue Sep 25 19:57:43 2018 -0700 - - commit for bottleneck0 - -commit dafcb6552758b1e4bbcf3926ac5a298a0aa45ee7 -Author: eugenevinitsky -Date: Tue Sep 25 19:54:06 2018 -0700 - - commit for figure eight 2 - -commit 632468bb59b58804e64b8fe875e137e759e4d32f -Author: eugenevinitsky -Date: Tue Sep 25 19:51:10 2018 -0700 - - figure eight 1 commit for ars - -commit 7a766699e2a8169e40d14755bb361e6622e8a793 -Author: eugenevinitsky -Date: Tue Sep 25 19:48:59 2018 -0700 - - commit for figure_eight_0_ars - -commit e97f32a22d160a8197d27360dac15cc172da8855 -Author: eugenevinitsky -Date: Tue Sep 25 19:43:50 2018 -0700 - - commit for figure_eight_0_ars - -commit 2f55718f4e1bdd0248cd1366af406c5c888039ee -Author: eugenevinitsky -Date: Tue Sep 25 19:35:35 2018 -0700 - - test commit - -commit 55644e54db6732a06be3b699d123a38291f772fa -Author: eugenevinitsky -Date: Tue Sep 25 19:27:06 2018 -0700 - - commit for figure_eight_0 - -commit 84b2c177c685c0ddb3a002da5ca98f1bf25af467 -Author: eugenevinitsky -Date: Tue Sep 25 19:19:23 2018 -0700 - - final params for all run scripts - -commit 1c8110725f0e0547604ecb6218ac645e56ff55a7 -Author: eugenevinitsky -Date: Tue Sep 25 14:50:26 2018 -0700 - - modified bottleneck values back - -commit e6d2420e5a9e1f889af69e3cb35bb2b1817087ff -Merge: 3e583ecf 31cf1016 -Author: eugenevinitsky -Date: Tue Sep 25 14:44:55 2018 -0700 - - Merge branch 'corl_exps2' into new_sumo - -commit 31cf1016e8bad7eff182ecff1f99a81933c1c767 -Author: eugenevinitsky -Date: Tue Sep 25 14:44:50 2018 -0700 - - exp params - -commit 2f547105886458a62a99f2e753b6f6a34441a06f -Merge: d5e722af 7a6da63a -Author: AboudyKreidieh -Date: Tue Sep 25 11:45:41 2018 -0700 - - Merge pull request #75 from flow-project/leaderboard - - Leaderboard - -commit 7fb8a4705218138dcb9897fa65b6cdb71d713ea5 -Author: eugenevinitsky -Date: Mon Sep 24 23:54:28 2018 -0700 - - es for bottleneck0 - -commit 04b0117bd1f8440075679ad2b1cacba4a774f145 -Author: eugenevinitsky -Date: Mon Sep 24 23:48:40 2018 -0700 - - grid0 for es - -commit f3ac21116fb5d14cb8a7cb7e74fd1a314428e8b1 -Author: eugenevinitsky -Date: Mon Sep 24 23:48:24 2018 -0700 - - fix to es_runner - -commit 7d07fd6552adc1fd44b6b24be6974df15f0cff7a -Author: eugenevinitsky -Date: Mon Sep 24 23:41:57 2018 -0700 - - bottleneck0 ppo - -commit 8aa1be22d81c4b05246fec8f6b48091df32544bb -Author: eugenevinitsky -Date: Mon Sep 24 23:37:55 2018 -0700 - - switched to grid0 for ppo - -commit ed457116d98a9f5995a545ad6a637ec7d65117fd -Author: eugenevinitsky -Date: Mon Sep 24 23:33:57 2018 -0700 - - minor - -commit 7f0a824a8d6fbf50136717b6a3fc27c47f5a1ba2 -Author: eugenevinitsky -Date: Mon Sep 24 23:33:12 2018 -0700 - - updated ppo_config - -commit 3e583ecf6f36c836f8145f38afdce2c5975cd214 -Merge: 7f8aea6c b0b16335 -Author: eugenevinitsky -Date: Mon Sep 24 20:39:21 2018 -0700 - - Merge branch 'corl_exps2' into new_sumo - -commit b0b16335acd06d2376fb2cd51bc4c24acff14ab1 -Author: eugenevinitsky -Date: Mon Sep 24 20:38:57 2018 -0700 - - consistent max speed - -commit ce56d5fd2e393dc104b703d655fadcb676d4bd0c -Author: eugenevinitsky -Date: Mon Sep 24 20:37:28 2018 -0700 - - modified accel for the bottleneck env - -commit 7f8aea6cfe833e27ad1ffb48717fe18f20053179 -Author: eugenevinitsky -Date: Mon Sep 24 20:19:25 2018 -0700 - - removed branch name - -commit 716eaf1c06583d6aea2447a9d29ad6fd054f4e6b -Author: eugenevinitsky -Date: Mon Sep 24 20:17:59 2018 -0700 - - updated bottleneck params - -commit 1a0fe2eb1e8f900300f0c91e4676c44f7ed6057a -Author: eugenevinitsky -Date: Mon Sep 24 19:58:22 2018 -0700 - - changed out accel values to be sumo default values - -commit b843e91f085040381758c68e613ecd61c2b765d6 -Merge: d1393d90 74d77770 -Author: eugenevinitsky -Date: Mon Sep 24 10:40:18 2018 -0700 - - Merge branch 'new_sumo' into corl_exps2 - -commit 74d7777094bfcfb573d5e9884f0036f4a6f30ae5 -Author: eugenevinitsky -Date: Mon Sep 24 10:39:03 2018 -0700 - - fixed accel in bottleneck ernv to standard values - -commit b0a1edff6457971bc7457fa7b693d9892a4de442 -Author: eugenevinitsky -Date: Mon Sep 24 10:37:48 2018 -0700 - - upgraded bottleneck values - -commit d1393d902016288c01503a1943f416259851aa49 -Author: eugenevinitsky -Date: Sun Sep 23 23:35:25 2018 -0700 - - minor - -commit e68a67c4cd81a31b830c0dda3f78f67e377b75ba -Author: eugenevinitsky -Date: Sun Sep 23 17:58:20 2018 -0700 - - added a yellow time of 3 - -commit f0a34e84813bd20adf7b10a3ba30fefffd185770 -Author: eugenevinitsky -Date: Sun Sep 23 17:53:55 2018 -0700 - - grid0 - -commit 2fa48f3be02554d8a07dbef76d6c24c1783ec609 -Author: eugenevinitsky -Date: Sun Sep 23 17:51:23 2018 -0700 - - minor - -commit 5b141da55f717f4ea9d02b68f5a6004e89dbc5c5 -Author: eugenevinitsky -Date: Sun Sep 23 17:49:48 2018 -0700 - - minor - -commit c0502bcb31ba3e9b7fde5f821377f666a8433373 -Author: eugenevinitsky -Date: Sun Sep 23 17:44:23 2018 -0700 - - upgraded instance type - -commit 0884a987971d94a4bbb32d0fadee28244dce34aa -Author: eugenevinitsky -Date: Sun Sep 23 17:43:01 2018 -0700 - - fixed ars params - -commit 18bd42ac75acc656e3abfc8516357dbd1a47bae7 -Author: eugenevinitsky -Date: Sun Sep 23 17:21:34 2018 -0700 - - minor updates to travis - -commit 531fc959be4fac5adf6d27d475c9643b65072220 -Author: eugenevinitsky -Date: Sun Sep 23 17:04:34 2018 -0700 - - bug fix - -commit d04dbadc6eadb866eed70f1ab387231d7a9a4ab1 -Author: eugenevinitsky -Date: Sun Sep 23 16:21:15 2018 -0700 - - added correct inflow values to bottleneck - -commit f6a72eea7b44e8aaf0e6017afd03485e994a2c24 -Author: eugenevinitsky -Date: Sun Sep 23 16:18:17 2018 -0700 - - flake8 - -commit 8e0cb105f9fa3d2ffb5a3103cdc3b2a6932c6f5f -Author: eugenevinitsky -Date: Sun Sep 23 16:02:55 2018 -0700 - - minor - -commit 49ab98148cf19b9b4df97ba3c8d8ed5cbc399834 -Author: eugenevinitsky -Date: Sun Sep 23 16:02:26 2018 -0700 - - fixed traffic light baselines - -commit 4607f0bcdc0b3ae0f7c2ede4516c14604dd5f396 -Author: eugenevinitsky -Date: Sun Sep 23 15:33:03 2018 -0700 - - partial fix to traffic light actuated bug - -commit 8fcd1c2a2b6fbeaf15f5844f2b27658f21f76616 -Author: eugenevinitsky -Date: Sun Sep 23 14:12:21 2018 -0700 - - added capacity curve computation - -commit 7a6da63a935cfa77112c6b6945ec009fa7715078 -Merge: fc4278ab d5e722af -Author: AboudyKreidieh -Date: Sun Sep 23 00:29:47 2018 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow into leaderboard - -commit fc4278ab246ce4e0363a03d8b47cf18f669ddd4f -Author: Fangyu Wu -Date: Sat Sep 22 23:22:20 2018 -0700 - - Remove branch checkout and test installation with new SUMO. - -commit a2d0d40983eddfe3e63fcc0aca89cc5f49cfcf02 -Author: AboudyKreidieh -Date: Sat Sep 22 15:47:45 2018 -0700 - - fixed black cars bug - -commit 330b598a80dfc6581fd2fb221d7ad0b6c5438975 -Author: AboudyKreidieh -Date: Sat Sep 22 15:38:31 2018 -0700 - - subscriptions are immediately collected from new vehicles - -commit 0a2ae7f1000f4a963829b6b4ee894cc426057604 -Author: AboudyKreidieh -Date: Sat Sep 22 15:19:56 2018 -0700 - - fixed tests - -commit 786b4f24bc57ab150010b1cc7b8c604480427abb -Author: AboudyKreidieh -Date: Sat Sep 22 14:30:30 2018 -0700 - - removed debugger - -commit 18c2a0e66f757184176aa1974ab8884f7a7b9de4 -Author: AboudyKreidieh -Date: Sat Sep 22 14:28:42 2018 -0700 - - removed turns from figure eight network - -commit ff6b78cb88aa9d7737411d2e0fb242e013646772 -Merge: e4dd76a7 defc5483 -Author: AboudyKreidieh -Date: Sat Sep 22 14:16:57 2018 -0700 - - Merge branch 'new_sumo' of https://github.com/flow-project/flow into new_sumo - -commit e4dd76a785638223371b749a50f13d5602f00029 -Author: AboudyKreidieh -Date: Sat Sep 22 14:16:48 2018 -0700 - - dealt with subscriptions of entering/exiting vehicles - -commit defc54835e9fa7d3d0a1c9833cdd2c6b4edfa85b -Author: eugenevinitsky -Date: Fri Sep 21 19:23:02 2018 -0700 - - changed traffic lights to account for no left and right turns - -commit 8436249eb8032d70264acbb6cd5794061898fc24 -Author: AboudyKreidieh -Date: Fri Sep 21 17:19:41 2018 -0700 - - accel behavior in junctions by sumo - -commit d5e722af090a5f0bdbd4d1e228eec75a8ca2a4eb -Author: Kevin Chien -Date: Fri Sep 21 17:17:38 2018 -0700 - - fixed ppo and ray imports (#168) - -commit 7385f3d765ffeb769fa620ba3c869f9215b8a2c0 -Author: AboudyKreidieh -Date: Fri Sep 21 16:59:39 2018 -0700 - - modified connections in grid to not accept turns - -commit cbc6da81ef730c58b6c78f0caebc3e6df195dc8a -Merge: 5ac8570f fa6c702c -Author: AboudyKreidieh -Date: Fri Sep 21 14:01:01 2018 -0700 - - Merge branch 'new_sumo' of https://github.com/flow-project/flow into new_sumo - -commit 5ac8570f9b62a457bc49d260b6cc8fa001c1b641 -Merge: 00ca4c89 a1872418 -Author: AboudyKreidieh -Date: Fri Sep 21 13:58:24 2018 -0700 - - Merge branch 'sumo_wheel_instructions' into new_sumo - -commit a1872418f6bdd998fab40acb41ac3f56ad3e1c37 -Author: AboudyKreidieh -Date: Fri Sep 21 13:56:29 2018 -0700 - - changed setup with new sumo - -commit 85cb4f8b9be48c31e0e06ec0dcf990b6031e363a -Merge: 0e702e43 3f59f073 -Author: AboudyKreidieh -Date: Fri Sep 21 13:55:17 2018 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow into sumo_wheel_instructions - -commit 0e702e434adbae82254981a3cbae84d37b18a70d -Author: AboudyKreidieh -Date: Fri Sep 21 13:55:06 2018 -0700 - - minor updates - -commit 3f59f07319d28a0489897f84eb9bc5d99189a32c -Author: Kevin Chien -Date: Fri Sep 21 13:20:01 2018 -0700 - - Clarified tensorboard setup (#166) - -commit fa6c702c1a8a9c192115141b58a5a46f276cacbb -Author: eugenevinitsky -Date: Fri Sep 21 09:54:05 2018 -0700 - - Update ray_autoscale.yaml with upgraded sumo image - -commit 560b8b450da344aff0b9d6ff9751c1230c1b07ec (tag: v0.2.0) -Author: Kathy Jang -Date: Thu Sep 20 17:15:24 2018 -0700 - - Addressing issue 145 (#160) - - * Addressing issue 145 - - * Fixed setup script env_params to reflect new changes - - * Fixed pep8 issues - - * Added new green_wave_env requirements to rllib/green_wave.py - - * Added new env params to the benchmark experiments as well - - * Added env params to baseline as well. nose2 not passing for some figure_eight scenarios - -commit 4eb9b800dcac2af407b585dbde3369f522535432 -Merge: f2bf4783 f0f6cf3a -Author: AboudyKreidieh -Date: Thu Sep 20 13:24:11 2018 -0700 - - Merge pull request #152 from flow-project/sumo_wheel_instructions - - Sumo wheel instructions - - resolves #103 - - removed some unused files from docs/ - -commit f2bf4783c0530abe87076fc0e4027b60ba7c35f2 -Author: eugenevinitsky -Date: Thu Sep 20 13:19:52 2018 -0700 - - Script for syncing s3 files (#161) - - * removed whitespace error - - * a few more instructions - - * pep8 fixes - -commit f0f6cf3a6c15d0cde25a381b2e214360f39cc6e5 -Author: AboudyKreidieh -Date: Thu Sep 20 13:11:42 2018 -0700 - - a bit more cleanup - -commit 1dd289fbb0cbca4289bacb710f89f1436563776e -Author: AboudyKreidieh -Date: Thu Sep 20 13:08:42 2018 -0700 - - bit of PR cleanup - -commit 3c760cb327251f9ab40224652b8e0a42b5f5e591 -Merge: 1a53b251 1bbd6e5a -Author: AboudyKreidieh -Date: Thu Sep 20 12:58:37 2018 -0700 - - Merge pull request #162 from flow-project/ppo_remove - - removed PPO as a default from from visualizer_rllib - -commit 00ca4c89cfd213da08570d013023506bec66f8f6 -Author: AboudyKreidieh -Date: Thu Sep 20 12:57:38 2018 -0700 - - new sumo commit - -commit a2268630f47db9f6e5db5e63bf8da2ac047181be -Merge: 98ba8b3b 1a53b251 -Author: AboudyKreidieh -Date: Thu Sep 20 11:29:31 2018 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow into new_sumo - -commit 1bbd6e5ab01d1bd4e3f2ecb60b06bba234fcdbea -Author: eugenevinitsky -Date: Thu Sep 20 10:42:37 2018 -0700 - - removed PPO as a default from from visualizer_rllib - -commit 1a53b25125765c56fa9b826db7a4d57eecba022b -Author: AboudyKreidieh -Date: Wed Sep 19 11:43:40 2018 -0700 - - made setup_sumo_ubuntu1804 executable (#134) - -commit 27d13ed3d5c17333e4ca3084367741f2d40a77e3 -Merge: ce8634c6 9a7a29f1 -Author: AboudyKreidieh -Date: Tue Sep 18 12:28:39 2018 -0700 - - Merge pull request #149 from flow-project/pip_wheel - - moved wheel from scripts/ to setup.py - -commit ce8634c6907d8049fc7faf451aa5519ad6615c29 -Author: AboudyKreidieh -Date: Tue Sep 18 12:23:20 2018 -0700 - - some clarity to setup instructions (#135) - -commit 47106a91b8820a77aa8873c1cec878b83c77fa14 -Author: eugenevinitsky -Date: Tue Sep 18 12:05:36 2018 -0700 - - Update flow_setup.rst - - Updated checkout number in docs - -commit 0869f8789e65defa41d2b28254cf293b0d53900a -Author: AboudyKreidieh -Date: Mon Sep 17 22:04:53 2018 -0700 - - added image to visualizer.rst (#151) - - * added image to visualizer.rst - - * rst support - - * minor - - * minor - - * minor - -commit fb4195a0e961d4879e782fc396859b8b8eef0d5e -Merge: b34cf54e d0935c3a -Author: AboudyKreidieh -Date: Mon Sep 17 21:46:25 2018 -0700 - - Merge pull request #153 from flow-project/multi_lane_bug_fix - - Multi lane bug fix - -commit d0935c3aa3517bcdfea4d00c446581071e02bbe5 -Author: eugenevinitsky -Date: Mon Sep 17 14:54:10 2018 -0700 - - once more - -commit 698246464026489c83e0d999bbf189d5c352cf42 -Author: eugenevinitsky -Date: Mon Sep 17 14:50:42 2018 -0700 - - flake8 - -commit b9b2228726ae9bebcfccc56c81a552e0b71010a6 -Author: eugenevinitsky -Date: Mon Sep 17 14:37:22 2018 -0700 - - more flake8 - -commit 33b394a4cc1aab9c4f9d6d4386bdc2434d24d31f -Author: eugenevinitsky -Date: Mon Sep 17 14:31:36 2018 -0700 - - simplified code, props to aboudy - -commit 1809b06b582c6801c0746d6dbcbfb5be3b35e9ab -Author: eugenevinitsky -Date: Mon Sep 17 14:17:26 2018 -0700 - - another flake8 - -commit ae7ecb220f25f89913b92a3a2bcdf6bb2735eceb -Author: eugenevinitsky -Date: Mon Sep 17 14:10:30 2018 -0700 - - more flake8 - -commit 7736472e3553a9ec1954a5a7cfad3d4565e5939d -Author: eugenevinitsky -Date: Mon Sep 17 14:00:38 2018 -0700 - - flake8 fixes - -commit 1357bf679d03504d33309128cc077bd3f18a7f18 -Author: eugenevinitsky -Date: Mon Sep 17 13:54:44 2018 -0700 - - removed extra breakpoint - -commit c0c17f23b634c26cb20fe39dec10967782991cde -Author: eugenevinitsky -Date: Mon Sep 17 13:52:05 2018 -0700 - - passing multi lane tests - -commit d21f812078ad47237b492e6e0ff838f7f60a7cc7 -Author: eugenevinitsky -Date: Mon Sep 17 10:16:34 2018 -0700 - - added more tests for _multi_lane_headways_util - -commit 98ba8b3b0ca5289de331098a64bf3bf35a9a256f -Author: AboudyKreidieh -Date: Sun Sep 16 23:13:38 2018 -0700 - - travis fix - -commit 0c8d73ceaabdb218215694a727e4a6e20774fd69 -Author: AboudyKreidieh -Date: Sun Sep 16 23:10:09 2018 -0700 - - removed the try, which will cause issues - -commit 32904c58dd6b8168025502f75512d4539d074d49 -Author: AboudyKreidieh -Date: Sun Sep 16 23:09:19 2018 -0700 - - updated sumo wheel - -commit e30ee310ce9897f3d131b2636565132ea8df6316 -Merge: d9fb4cf5 9a7a29f1 -Author: AboudyKreidieh -Date: Sun Sep 16 23:08:02 2018 -0700 - - Merge branch 'pip_wheel' into new_sumo - -commit d9fb4cf5c476d18c5497e0b8461be62150657059 -Author: AboudyKreidieh -Date: Sun Sep 16 23:07:10 2018 -0700 - - updated scripts for sumo binaries - -commit 56373e4ff1a013c88467018bf10b639c87c51a10 -Author: AboudyKreidieh -Date: Sun Sep 16 22:28:54 2018 -0700 - - minor cleanup - -commit 90c70ecb0fe1e8968037e5dc00b88b2d2611e852 -Author: AboudyKreidieh -Date: Sun Sep 16 22:07:48 2018 -0700 - - tested and modified sumo wheel instructions - -commit 3c261d3af1c49b1a45f424c75f1179ca13930b3c -Merge: 5df0f023 b34cf54e -Author: AboudyKreidieh -Date: Sun Sep 16 21:34:23 2018 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow into sumo_wheel_instructions - -commit b34cf54e4a9da053fd2601e42a019e382103a4bc -Merge: 165b9391 1706da34 -Author: AboudyKreidieh -Date: Sun Sep 16 20:09:59 2018 -0700 - - Merge pull request #143 from flow-project/update_sumo_instructions - - added brew instructions - -commit 2c2004918c6ee34c997e6d8309fcbbe5f1146776 -Author: eugenevinitsky -Date: Sun Sep 16 19:07:55 2018 -0700 - - start of tests - -commit 7de23459b75b64277b7436cd3f0b689d2928e11e -Merge: ac0f1932 165b9391 -Author: AboudyKreidieh -Date: Sun Sep 16 19:06:51 2018 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow into new_sumo - -commit 9a7a29f1738543e5d94b70c84f43f4cb8550c641 -Author: AboudyKreidieh -Date: Sun Sep 16 19:01:42 2018 -0700 - - moved wheel from scripts/ to setup.py - -commit 1706da348991838be2d3e7c1e654b9c867852ed6 -Author: AboudyKreidieh -Date: Sun Sep 16 18:50:59 2018 -0700 - - PR fix - -commit 165b9391eff78febf266dfa2fa48d27732cde81c -Merge: ed3113d5 940f851f -Author: AboudyKreidieh -Date: Sun Sep 16 18:49:35 2018 -0700 - - Merge pull request #136 from flow-project/render - - Render - -commit ed3113d5096d1b448684b5b0f1a1218401f9e4f1 -Merge: 272e5183 7dae5547 -Author: AboudyKreidieh -Date: Sun Sep 16 18:49:20 2018 -0700 - - Merge pull request #148 from flow-project/reward_fix - - inverted reward - -commit 5df0f023a867338e1f4175ad4d0bfa5b72dda6d9 -Author: AboudyKreidieh -Date: Sun Sep 16 18:48:44 2018 -0700 - - first pass at documenting creating sumo wheels - -commit 855fb558e55f106dc88b3e964a31860f87f9ffc3 -Author: eugenevinitsky -Date: Sun Sep 16 18:11:47 2018 -0700 - - modified usage of initial config to make it possible to actually pass things to gen_custom_start_pos - -commit 940f851f61cb773c8bb5649d5bcac35c0f1a0c19 -Author: AboudyKreidieh -Date: Sun Sep 16 17:35:31 2018 -0700 - - PR fix - -commit 7dae5547e9ddf94fa3c66a0fba484ce5cbd736fb -Author: AboudyKreidieh -Date: Sun Sep 16 17:33:18 2018 -0700 - - inverted reward - -commit d5156f25bef6740b5b4b9c454f0ec051faf775d9 -Author: eugenevinitsky -Date: Sun Sep 16 17:26:37 2018 -0700 - - working highway - -commit 323705e693c99255874650a83aaad36057ae4d22 -Author: eugenevinitsky -Date: Sun Sep 16 17:09:45 2018 -0700 - - minor fixes to highway class - -commit 4956dc485f78ef2b7c5f4a13f8abb7a24cfbb1bb -Author: eugenevinitsky -Date: Sun Sep 16 16:18:15 2018 -0700 - - modified the highway class to make it easier to use for tests - -commit 43e0f4d062c1a16ee67be3b772d728a9564b3a12 -Author: eugenevinitsky -Date: Thu Sep 13 17:34:07 2018 +0400 - - added link to brew - -commit d455ec91809f07ceaac15be9d9d0a280d452565b -Author: eugenevinitsky -Date: Thu Sep 13 17:28:40 2018 +0400 - - added brew instructions - -commit 272e5183ae6c27baf123a5a2b89184c893fef1be -Author: AboudyKreidieh -Date: Thu Sep 13 06:09:07 2018 -0700 - - added deprecation warning for inflows (#141) - -commit 00671ce9640df1e749a32de7a83f8a6ca5ae1483 -Author: Nishant Kheterpal -Date: Sat Sep 8 14:19:03 2018 -0700 - - added tutorials substructure to docs - -commit 32fd8685b65bfd8cafb91c98c8eeb294e80d8284 -Merge: 09ee2d68 468bbd01 -Author: AboudyKreidieh -Date: Sat Sep 8 02:00:12 2018 -0700 - - Merge pull request #137 from flow-project/inflows_reset_warning - - added warning about inflows - -commit 468bbd0121036aa8e1b0f648d038d15ecdef0403 -Author: AboudyKreidieh -Date: Fri Sep 7 21:47:54 2018 -0700 - - renamed in_flow -> inflows - -commit 8066f65f0c19a11cd2ec823511206e2fde47a3a1 -Author: AboudyKreidieh -Date: Fri Sep 7 21:17:32 2018 -0700 - - made inflows by default and empty object - -commit 083ff221f61324a7064da574bdb8d52b6926c62f -Author: AboudyKreidieh -Date: Fri Sep 7 21:08:29 2018 -0700 - - removed unused import - -commit acff5e746879e487c871102e0208349a0769068d -Author: AboudyKreidieh -Date: Fri Sep 7 21:06:18 2018 -0700 - - added warning about inflows - -commit e3e8f312cceecca02a6a66849989b8dfe7dcd706 -Author: AboudyKreidieh -Date: Fri Sep 7 20:31:26 2018 -0700 - - removed sumo_binary from tutorials - -commit 967a0a58ce884bcde11937bb497aba90d343d218 -Author: AboudyKreidieh -Date: Fri Sep 7 20:24:53 2018 -0700 - - added deprecation warning to sumo_binary - -commit 97056123d6cfd002eaf47a946d0a1b4f4e461af5 -Merge: 068beba9 09ee2d68 -Author: AboudyKreidieh -Date: Fri Sep 7 20:09:22 2018 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow into render - -commit 09ee2d6821ef6efde654c123c5aac8662539c517 -Merge: 7bb3dc64 9af91f07 -Author: AboudyKreidieh -Date: Fri Sep 7 18:42:26 2018 -0700 - - Merge pull request #130 from flow-project/fixing_setup_py - - fixed env.yml and requirements.txt - -commit 4078eddcda92ab6d8c423c0cea07dbb7244347fc -Merge: ae372a7c 7bb3dc64 -Author: Nishant Kheterpal -Date: Fri Sep 7 18:13:26 2018 -0700 - - Merge branch 'master' of github.com:flow-project/flow into rllab_tutorial - -commit 7bb3dc64e52b200dffe9d4c13ba2881d76529902 -Merge: 36f9e34a 03bd9450 -Author: AboudyKreidieh -Date: Fri Sep 7 00:57:33 2018 -0700 - - Merge pull request #128 from kjang96/issue_106 - - Resolves #106 . Do we want to keep the numbering in the flow_setup.rst page? I removed them altogether. - -commit 36f9e34a123abe9185e5fb78a80363926e66a990 -Merge: b48ad148 9e7d1fc6 -Author: AboudyKreidieh -Date: Fri Sep 7 00:57:05 2018 -0700 - - Merge pull request #99 from kjang96/inflow_name - - Resolves #97 This allows for customizable flow names. I add a new optional name parameter to the Inflow class' add function, which defaults to "flow" (what it was originally). Inflow experiments run as expected with this change. - -commit 9af91f078d9b8b3f8bdce70bfd11734aaf589e9d -Author: Kanaad Parvate -Date: Fri Sep 7 00:24:46 2018 -0700 - - fixed env.yml and requirements.txt - -commit b48ad14863acd910999e0c77414c6c4dcc9496bd -Merge: 153eee1c 1a1fb250 -Author: AboudyKreidieh -Date: Thu Sep 6 16:36:18 2018 -0700 - - Merge pull request #119 from flow-project/updated_setup - - Updated setup - -commit 03bd9450df3afd3a56d8efc9b47c76f192af508b -Author: Kathy Jang -Date: Thu Sep 6 15:15:21 2018 -0700 - - Addresses issue #106 - -commit 153eee1c34093e50e795b6b6fb4d44310e93b581 -Author: Kathy Jang -Date: Thu Sep 6 15:03:15 2018 -0700 - - Addressing part of issue #96 (#122) - -commit e34fff344e1fe9804fa8809bd5fae4624a1b7daf -Author: Kathy Jang -Date: Thu Sep 6 15:02:36 2018 -0700 - - Issue #125 (#126) - - * Addressing part of issue #96 - - * Restored all tutorials to a clean state - -commit c798174d3a7a2d34ffe918fa4a534cba0f0acb20 -Author: Kathy Jang -Date: Thu Sep 6 15:02:01 2018 -0700 - - Resolves issue #120 (#127) - -commit 1a1fb250b1e63ff1b6da7f417f3e20cc26f71204 -Author: Lucas Fischer -Date: Thu Sep 6 14:25:52 2018 -0700 - - Change Plotly version - -commit b4f0a86d9eec55d58ece5ad693a50ab221260758 -Author: nskh -Date: Thu Sep 6 13:21:18 2018 -0700 - - tiny docs changes (#123) - - * updated links. Closes #115 - - * rst formatting - -commit 4b7f3707ee0abb32e6656be44faeb19884ca5915 -Merge: a8ef8204 3f73129f -Author: Kathy Jang -Date: Thu Sep 6 12:43:53 2018 -0700 - - Merge pull request #121 from kjang96/issue_113 - - Addressing issue#113 - -commit a8ef820432a4cc81f38ae39467affd95564efb70 -Author: nskh -Date: Thu Sep 6 12:32:12 2018 -0700 - - updated links. Closes #115 (#118) - -commit 3f73129f418d910ea86aa9c51b4b65379ff74b95 -Author: Kathy Jang -Date: Thu Sep 6 12:29:22 2018 -0700 - - Addressing issue#113 - -commit 48c069adeba553d802a0175a569d7c537056c6c2 -Author: eugenevinitsky -Date: Thu Sep 6 12:26:05 2018 -0700 - - Update environment.yml - - fixed bug - -commit 691fdc5025c76d8462d656f53b25feb441744980 -Author: eugenevinitsky -Date: Thu Sep 6 12:07:16 2018 -0700 - - moved numpy - -commit 4e2e7416484a6a51bf4a25a007d91f85eebe4595 -Author: eugenevinitsky -Date: Thu Sep 6 11:54:46 2018 -0700 - - updated setup to move numpy to pip - -commit 0d7d7040cbd7c2aea72478b05629f4cbd9732f04 -Author: eugenevinitsky -Date: Thu Sep 6 02:30:01 2018 -0700 - - Cleanup of docker section of tutorial (#112) - - * added fixed setup instructions - - * cleaned up the docker section of setup instructions - -commit 979e28d6efe924ba23e45c79973baa4515b30cb0 -Merge: e70f577f d5d81c28 -Author: eugenevinitsky -Date: Wed Sep 5 23:34:28 2018 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow - -commit d5d81c28b88564e8797a66ef891143e69d36e9cf -Author: Cathy Wu -Date: Wed Sep 5 23:32:35 2018 -0700 - - More descriptive Flow introduction text (#105) - - * Flow intro text - - * Update credits --> contributors in README - -commit d27d37ef0ce93355440b23f82a4af3842aba48f6 -Author: Cathy Wu -Date: Wed Sep 5 22:07:16 2018 -0700 - - Update README.md (#111) - -commit 9c7005a296e02592aa7b40cfdee8a7ef71c64e61 -Merge: fe872cc8 6b8117f2 -Author: AboudyKreidieh -Date: Wed Sep 5 13:07:52 2018 -0700 - - Merge pull request #94 from flow-project/tutorial-readme-typos - - Fixed small capitalization typos in tutorials README. - -commit 9e7d1fc67314838f7c47679fab560a8e5af49919 -Author: Kathy Jang -Date: Wed Sep 5 13:04:16 2018 -0700 - - Added flexibility for flow naming - -commit fe872cc8c6fac8921f8e5c97df3bd65fc217d241 -Merge: c0683bb5 dde176a4 -Author: AboudyKreidieh -Date: Wed Sep 5 12:49:14 2018 -0700 - - Merge pull request #85 from flow-project/install_sumo_binaries - - Install sumo binaries - - - modified the setup instructions to install sumo binaries into flow/bin. The binaries were built on my and Eugene's machines, as well as on AWS instances. - - sumo tools (e.g. traci) are installed in `setup.py` via a wheel. The wheel works for all operating systems (as far as I can tell so far) - - we need many people to test that the binaries work for them before this is merged. There may be some dependencies that won't work, and we can only really find out by testing this multiple times and finding the discrepancies - -commit 6b8117f27e0ffffad5d9b78c8d23ac5100323de5 -Author: Cathy Wu -Date: Wed Sep 5 09:54:03 2018 -0700 - - Update README.md - -commit dde176a4e998ae175352890ca735a8089be51983 -Author: AboudyKreidieh -Date: Tue Sep 4 23:36:03 2018 -0700 - - PR fix - -commit bcb5f9628f92702ec65396a2dca57b4e5171961e -Author: AboudyKreidieh -Date: Tue Sep 4 23:04:38 2018 -0700 - - flipped sumo installation instructions - -commit ab7154b3d649644be811413328dc9612692795be -Author: AboudyKreidieh -Date: Tue Sep 4 22:33:50 2018 -0700 - - removed unused modules - -commit ad9ccd1fd2922e8ce1023ec67bdd437a50ebb3cb -Author: AboudyKreidieh -Date: Tue Sep 4 22:31:45 2018 -0700 - - removed nose tests - -commit 62b8ca31b8a148c6ebe1a3d3e40ef45b1df72b59 -Author: AboudyKreidieh -Date: Tue Sep 4 22:29:39 2018 -0700 - - minor changes - -commit d14e3f7d982f645eb2329b7cb085a7d7edc6e20c -Author: AboudyKreidieh -Date: Tue Sep 4 22:29:28 2018 -0700 - - moved location of binaries to somewhere global - -commit 1f951e439ea4527f538de0dd8c3bfe15e0cf060c -Merge: 50af1162 c0683bb5 -Author: AboudyKreidieh -Date: Tue Sep 4 22:09:01 2018 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow into install_sumo_binaries - -commit c0683bb5db0675ade06ddcf429b4b9fc966ecc47 -Author: eugenevinitsky -Date: Tue Sep 4 22:06:47 2018 -0700 - - Update base_scenario.py to handle race condition (#89) - - * Update base_scenario.py - - self.name for base_scenario leads to race conditions by only using seconds in the naming scheme - - * ensured travis runs with python 3.6 - - * syntax fix - -commit 2d5edd366c155c11cdf5d9683e5034b710f46b30 -Author: AboudyKreidieh -Date: Tue Sep 4 21:33:56 2018 -0700 - - ensured travis runs with python 3.6 (#90) - -commit 50af116209991136000514d59ee7102b5eb4c0c8 -Merge: 6e64b523 f4dca193 -Author: AboudyKreidieh -Date: Mon Sep 3 22:27:36 2018 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow into install_sumo_binaries - -commit 6e64b523feb8ad13cd49096fabeca33325a72603 -Author: AboudyKreidieh -Date: Mon Sep 3 21:31:46 2018 -0700 - - typo - -commit e70f577f758000eb62f05c43c16a9566112f6b51 -Merge: c5e5a525 f4dca193 -Author: eugenevinitsky -Date: Mon Sep 3 20:48:37 2018 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow - -commit f4dca193054375e58dff8c0c21be58af29d1e262 -Author: eugenevinitsky -Date: Mon Sep 3 20:48:22 2018 -0700 - - updated rllib examples to conform to rllib verison 0.5.0 DO NOT MERGE (#23) - - * updated rllib examples to conform to rllib verison 0.5.0 - - * attempting travis fix - - * attempted fix - - * more fixes for tests - - * updated wheels - - * more attempts to resolve travis errors - - * added fixed setup instructions - - * updated run script - - * updated es run script - - * minor updates to es runner - - * minor for testing - - * minor tuning - - * minor - - * minor - - * fix to ars - - * another ars fix - - * minor fixes to upgrade to ray 0.5.0 - - * pointed at local setup instructions - - * minor yapf - - * flake8 fixes - - * minor - - * flake8 - - * Update ppo_runner.py - - repeat is deprecated in rllib 0.5.1 - - * fixed the review edits - - * updated version it is looking at - -commit 3a967073fbdaf87b04c863a71af2727dbd517fe1 -Author: AboudyKreidieh -Date: Mon Sep 3 20:06:00 2018 -0700 - - change instructions to choose your own sumo setup depending on OS - -commit 961fef733df48768ab20a746bab894c401b0349b -Author: AboudyKreidieh -Date: Mon Sep 3 19:56:09 2018 -0700 - - run bashrc or bash_profile when done - -commit 0bc47b7b429e8dd4b3b4cb46a80583b495b91b13 -Author: AboudyKreidieh -Date: Mon Sep 3 19:50:46 2018 -0700 - - commented binary installation - -commit d8fdc17a5d6312ff8c0011b2f9b64859c585ce6c -Author: AboudyKreidieh -Date: Mon Sep 3 19:50:10 2018 -0700 - - minor changes - -commit c0c070e37a23bfa606e0940cdf0ac7eacfdd0fe4 -Author: AboudyKreidieh -Date: Mon Sep 3 17:53:08 2018 -0700 - - typo - -commit 3af262e3aa7f6f1143fd7e2f3b63613e8df8067a -Author: AboudyKreidieh -Date: Mon Sep 3 17:43:47 2018 -0700 - - PYTHONPATH -> PATH$ - -commit 87a717e47eb835f8238f399f50ff378588dddbc2 -Author: AboudyKreidieh -Date: Mon Sep 3 17:03:01 2018 -0700 - - updated setup instructions - -commit 456bb0c567b7fb95b6a134eabc1824fa927823f5 -Author: AboudyKreidieh -Date: Mon Sep 3 16:29:12 2018 -0700 - - bug fixes sumo setup scripts - -commit 5d7ec76e0a6a40e88d5892323e5d38f80144ade8 -Merge: 4460173d 2f509462 -Author: AboudyKreidieh -Date: Mon Sep 3 16:27:34 2018 -0700 - - Merge branch 'install_sumo_binaries' of https://github.com/flow-project/flow into install_sumo_binaries - -commit 4460173de688913a5b926cd9a8620fdbc3bfd6d9 -Merge: 27e545cb 99120c80 -Author: AboudyKreidieh -Date: Mon Sep 3 16:24:15 2018 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow into install_sumo_binaries - -commit 99120c8062853edd8a17af053fbaa5b6f514b53c -Merge: b55fbe0f f08c5843 -Author: lucfisc -Date: Mon Sep 3 16:10:05 2018 -0700 - - Merge pull request #62 from lucfisc/lucfisc-new-installation - - New way to install flow - -commit 2f5094629c0adee7715be49b3edc01e536781994 -Author: Ubuntu -Date: Mon Sep 3 19:57:11 2018 +0000 - - bug fixes - -commit c5e5a52517792a99ba2055090af6861d265f1f7f -Merge: 016ba88c b55fbe0f -Author: eugenevinitsky -Date: Mon Sep 3 12:52:32 2018 -0700 - - resolved merge conflict - -commit b55fbe0f203bfa13cb524deacd1b37c343f9b635 -Author: AboudyKreidieh -Date: Mon Sep 3 12:51:04 2018 -0700 - - Docstring controllers utils (#52) - - * renamed solution_template.py -> solution.py.template - - * docstring cleanup to utils - - * misc docstring fixes - - * cleanup to docstrings in controllers - - * returned the attribute documentation to the constructor - - * removed redundancy - - * typos fixed - -commit 0ed609b399a693ae7c0f18d5674c2feb5e444abb -Author: AboudyKreidieh -Date: Mon Sep 3 12:45:56 2018 -0700 - - cleaned up docstring in envs (#49) - - * cleaned up docstring in envs - - * added Nish fixes - -commit f08c5843be9504aab986fab839e851d261457f8e -Merge: 60db0578 31037582 -Author: eugenevinitsky -Date: Mon Sep 3 12:45:10 2018 -0700 - - Merge branch 'master' into lucfisc-new-installation - -commit 31037582e46a60330f49c76232827b2e8599588d -Author: AboudyKreidieh -Date: Mon Sep 3 12:36:37 2018 -0700 - - cleanup to docstrings in tests (#46) - -commit 27e545cb102f7f398aa3765aea40cb157ce2c247 -Author: AboudyKreidieh -Date: Mon Sep 3 12:30:54 2018 -0700 - - sumo binaries and tools installed from setup.py - -commit a7428aa07306616e17eaa7b0e205ef5ac96efc1d -Author: Fangyu Wu -Date: Mon Sep 3 12:16:12 2018 -0700 - - Fix ray sudo install bug (#76) - - * Fix ray sudo install bug. - - * Update flow_setup.rst - - python3 removed - -commit 60db05788ffd872ac5a75f957109cb67cf60f36e -Author: lucfisc -Date: Mon Sep 3 02:51:51 2018 -0700 - - Add word to solve conflict - - Added two lines in order to solver the merging conflict I had - -commit c4d421e1c09188e0c08e0f4cd4a199719853b094 -Author: lucfisc -Date: Mon Sep 3 02:46:52 2018 -0700 - - Update flow_setup.rst - -commit ac0f1932f4398e6f59983a61bfc1c0d8f2bab71c -Author: AboudyKreidieh -Date: Mon Sep 3 01:02:56 2018 -0700 - - sumotools wheel and binaries - -commit 068beba91b2426c3cc907776675c8667ccd92cca -Author: AboudyKreidieh -Date: Sun Sep 2 17:48:42 2018 -0700 - - replaced sumo_binary with render - -commit e822a450f5c5ec41a13bb7c54fc62a74c5628aab -Author: AboudyKreidieh -Date: Sun Sep 2 16:47:55 2018 -0700 - - resolved lane change test issue - -commit c7a31e4fa1ce64838f55d8b145a585c717c5638b -Author: AboudyKreidieh -Date: Sun Sep 2 16:37:29 2018 -0700 - - fixed shapes in figure eight - -commit 05c96b91897451c9eed016994be68f4a12331e50 -Author: AboudyKreidieh -Date: Sun Sep 2 14:54:01 2018 -0700 - - bug fixes - -commit ee822031137bb1de495ae583746c73d41b0b146f -Author: AboudyKreidieh -Date: Sun Sep 2 13:50:00 2018 -0700 - - minor changes - -commit 3d3f04a295fdfdd55f2235fce708075f851ef9c5 -Author: AboudyKreidieh -Date: Sun Sep 2 13:07:01 2018 -0700 - - prevent collisions from abrupt decelerations - -commit 4bda180da21c04f9d3a42d74406894c190d883a2 -Author: AboudyKreidieh -Date: Sun Sep 2 09:11:46 2018 -0700 - - bug fix to avoid large decelerations when a vehicles enters the network - -commit 25772884342099fc323b68bd1cbd5da655058e9d -Author: AboudyKreidieh -Date: Sat Sep 1 15:07:34 2018 -0700 - - modified IDM to deal with new changes at intersections - -commit d8dcf4374e35df73400aab6a4d5b0eca1907a47c -Author: AboudyKreidieh -Date: Sat Sep 1 14:47:06 2018 -0700 - - working on sumo binaries for travis - -commit 7cbdc08396fb43f344fbc4e96abc730041e27ca7 -Author: AboudyKreidieh -Date: Sat Sep 1 14:46:40 2018 -0700 - - compatibility with the new sumo version - -commit 9ccd83d1223339746877c9174e850afba398d454 -Author: AboudyKreidieh -Date: Sat Sep 1 14:45:33 2018 -0700 - - new sumo version - -commit 915db47a92e46e6989261ce4410f6842f73e419d -Author: Fangyu Wu -Date: Fri Aug 31 22:11:23 2018 -0700 - - Fix "json not imported" bug. Ignore visual studio folder. - -commit 47bbf7e6d354b1f31ec2f6b2d67a29667754a0b7 -Author: lucfisc -Date: Fri Aug 31 17:15:55 2018 -0700 - - TYPO in the text - -commit 9657395b9b02ee00b5938717681d87c440cfe680 -Author: lucfisc -Date: Fri Aug 31 17:13:11 2018 -0700 - - Update flow_setup.rst - -commit 6ad96ed7fd6cac35647a79b01be7062e7e8ee269 -Author: lucfisc -Date: Fri Aug 31 17:12:39 2018 -0700 - - Remote Desktop dockerfile - -commit 7c5591c9d0241480009c7d8b707c0326ad0dc9dd -Author: lucfisc -Date: Fri Aug 31 17:11:46 2018 -0700 - - Delete Dockerfile - -commit ae372a7c0e421b65da2d1aefe8c4ac2caa8dbde3 -Merge: e43e1ed4 bc97132e -Author: Nishant -Date: Fri Aug 31 14:44:00 2018 -0700 - - merging master - -commit bc97132e9e2d05262bb6bbad5bda173fd9f4ae92 -Merge: 04861cad 7c15dc6d -Author: AboudyKreidieh -Date: Fri Aug 31 13:48:19 2018 -0700 - - Merge pull request #50 from flow-project/tests_rename - - fixed tests that weren't running - -commit 04861cad930db84415661786c860ca595e3e4eae -Merge: 10daae67 7d1cb9b2 -Author: AboudyKreidieh -Date: Fri Aug 31 13:30:29 2018 -0700 - - Merge pull request #45 from flow-project/benchmarks_fix - - Benchmarks fix - -commit 7c15dc6d1b5a83c4c9b896a0d2c69259413ee366 -Author: AboudyKreidieh -Date: Fri Aug 31 13:27:13 2018 -0700 - - PR fixes - -commit 7d1cb9b2a2af48202390a17baf08ec86408669aa -Author: AboudyKreidieh -Date: Fri Aug 31 13:21:55 2018 -0700 - - PR fix - -commit 4d9545a7293fc7482d4773414688c33591fc78fc -Author: lucfisc -Date: Fri Aug 31 12:18:06 2018 -0700 - - Dockerfile remote desktop - - Docker file to install the remote desktop - -commit 10daae675ab93836744af0cd08360991aa2d222e -Author: Kathy Jang -Date: Fri Aug 31 11:57:47 2018 -0700 - - Setup instruction fixes (#73) - -commit 4224de985fd0ddab0b61db1da776a1289e6b1792 -Merge: a8083d0c 6dc6e228 -Author: AboudyKreidieh -Date: Wed Aug 29 22:25:03 2018 -0700 - - Merge pull request #68 from flow-project/eugenevinitsky-patch-1 - - Update flow_setup.rst - -commit 6dc6e228d92d840e4bf50c8d48493928a1dbdcc7 -Author: eugenevinitsky -Date: Wed Aug 29 17:46:52 2018 -0700 - - Update flow_setup.rst - - Mac users have to open XQuartz before SumoGui will work - -commit 8668bc1329e88dcdf7d58f491dd8f0a63e5e88ff -Merge: 617abdc8 e5f90b02 -Author: lucfisc -Date: Wed Aug 29 17:03:11 2018 -0700 - - Merge pull request #4 from lucfisc/lucfisc-new-installation-v2-1 - - Changes in the table of content to make it work - -commit e5f90b02e369d2a344f84ce4fc22500f1ba2b523 -Author: lucfisc -Date: Wed Aug 29 17:00:21 2018 -0700 - - Update flow_setup.rst - -commit a8083d0c526903f2cf67b3787c45a17968f3f4a2 -Merge: b895773a 0dda1540 -Author: AboudyKreidieh -Date: Wed Aug 29 16:17:49 2018 -0700 - - Merge pull request #53 from flow-project/docstring_core - - docstring cleanup for flow/core/ - -commit b895773a5202e0830755b00314781f8cae1f37f3 -Merge: 307ac21e 5f2544d5 -Author: AboudyKreidieh -Date: Wed Aug 29 16:17:13 2018 -0700 - - Merge pull request #54 from flow-project/docstring_examples - - docstring cleanup to examples - -commit 0dda15406fd06bda543fdc1c9ec49a8ad10a0344 -Merge: 266c23d6 307ac21e -Author: AboudyKreidieh -Date: Wed Aug 29 16:09:34 2018 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow into docstring_core - -commit 5f2544d551243ef2dfbfc5ad2a04f2e828398be9 -Author: AboudyKreidieh -Date: Wed Aug 29 16:07:03 2018 -0700 - - PR fixes - -commit 307ac21ef1a546dbac5810dc689bb1c0a94817fc -Merge: 4d36c9aa 0c88df4c -Author: nskh -Date: Wed Aug 29 15:45:41 2018 -0700 - - Merge pull request #67 from flow-project/flow-readthedocs - - Update README.md with flow.readthedocs.io - -commit 4d36c9aa8f540b39c0f954dc2710c63a1cb91142 -Merge: ad393229 1491b3c8 -Author: nskh -Date: Wed Aug 29 15:44:34 2018 -0700 - - Merge pull request #66 from nskh/master - - title case for akvo flow redirect - -commit 0c88df4c30ea75128279f71779c1ee37f7313a2c -Author: Cathy Wu -Date: Wed Aug 29 15:15:17 2018 -0700 - - Update README.md - -commit 1491b3c88fed0ccadbd5bd54043f45c6c35f6794 -Author: Nishant -Date: Wed Aug 29 15:01:32 2018 -0700 - - docs links on readme.md - -commit e4f6f6adc97d84d3e233f87521b6c0588fff3a62 -Author: Nishant -Date: Wed Aug 29 15:00:58 2018 -0700 - - updating docs passing badge - -commit 9f83f9389607f1bb001577ed506bd79244284147 -Author: Nishant -Date: Wed Aug 29 14:44:47 2018 -0700 - - title case for akvo flow redirect - -commit 617abdc8af107032264d14b89aea742f383c4bf2 -Author: lucfisc -Date: Tue Aug 28 20:35:19 2018 -0700 - - Update flow_setup.rst - -commit e6140d591cb67a2fc84e78cd8a2af7981df8b74f -Author: lucfisc -Date: Tue Aug 28 12:55:57 2018 -0700 - - Update flow_setup.rst - -commit 98ce6fa5c9abf1448ff309f58e45cf692e38de68 -Merge: c97339e0 d180c335 -Author: lucfisc -Date: Tue Aug 28 12:53:43 2018 -0700 - - Merge pull request #2 from lucfisc/lucfisc-patch-v2-INSTALLATION - - Added a summary - -commit d180c3355186022deba450afe7f5923e6ad29a73 -Author: lucfisc -Date: Tue Aug 28 12:52:33 2018 -0700 - - Update of flow setup with summary - - Added a summary - -commit 2b094522605ca271e90a14e4290568cd7c2d8860 -Author: lucfisc -Date: Tue Aug 28 12:45:12 2018 -0700 - - Update flow_setup.rst - -commit ad393229f5e0b02b7c8828750c39b8f34272502d -Merge: 8510b3e2 ebf78656 -Author: AboudyKreidieh -Date: Tue Aug 28 12:45:06 2018 -0700 - - Merge pull request #56 from flow-project/docstring_scenarios - - docstring cleanup for scenarios - -commit c97339e0014f8284e20fceec740bb115ab2a4e88 -Author: lucfisc -Date: Tue Aug 28 12:41:42 2018 -0700 - - Summary added - -commit ab60b97e355863ad056ed2cca994782bc49e1aca -Author: lucfisc -Date: Tue Aug 28 12:41:20 2018 -0700 - - Update flow_setup.rst - -commit ebf7865666d80f93226bf4b462f534e92b397fe8 -Author: AboudyKreidieh -Date: Tue Aug 28 12:37:09 2018 -0700 - - PR fixes - -commit 8510b3e288d3b16df0a5817e4ce3e4b4431a701e -Author: eugenevinitsky -Date: Tue Aug 28 12:34:54 2018 -0700 - - Fixed setup (#65) - - * added fixed setup instructions - - * fix to PR - -commit e9972d5156589e6e9ec8b291a3ee4b19bcb13a3f -Author: AboudyKreidieh -Date: Tue Aug 28 12:16:21 2018 -0700 - - documentation cleanup for visualizers (#57) - -commit d19da517f61f27727b85f414e4de81cf68a354ac -Author: lucfisc -Date: Tue Aug 28 12:15:28 2018 -0700 - - Change version of matplotlib (#63) - - As showed in one of the issues, I found a problem of conflict between matplotlib 2.2.2 and other librairies - Changing to matplotlib 2.0.2 works - -commit 016ba88c47674665ee7127b16ff4bad01c4813f9 -Author: eugenevinitsky -Date: Tue Aug 28 12:13:37 2018 -0700 - - added fixed setup instructions - -commit d8ff3997fff51aaa2a11800267f8035efd6c1331 -Author: lucfisc -Date: Tue Aug 28 11:34:23 2018 -0700 - - Update flow_setup.rst - -commit b321ac541634ba865d9e2f59043d4b603eb166cf -Author: lucfisc -Date: Tue Aug 28 11:24:42 2018 -0700 - - Update flow_setup.rst - -commit b0f5cb54d3dd52dce8aaf63346d4353f7de74a4e -Author: lucfisc -Date: Tue Aug 28 11:14:40 2018 -0700 - - New way to install flow - - Add a Dockerfile that can run with a desktop on your browser with every flow packages installed - -commit dfe19f5f58f975076d7df58de7939df36a221e8c -Merge: dc295f04 708f30ff -Author: AboudyKreidieh -Date: Mon Aug 27 00:58:03 2018 -0700 - - Merge pull request #39 from flow-project/setup_fix - - Setup fix - - The links to conda and miniconda were broken - - Makefile for docs was missing - -commit 064ca64831bb313a45b130ddd374f7ed9f5523fd -Author: AboudyKreidieh -Date: Mon Aug 27 00:22:27 2018 -0700 - - docstring cleanup for scenarios - -commit f42a7550d5d1c3326651b29948a3ee013ba1e314 -Author: AboudyKreidieh -Date: Sun Aug 26 23:16:50 2018 -0700 - - docstring cleanup to examples - -commit dc295f042f4f0edb5e3d07f02dfff98f975574df -Merge: 8a7f403d ee10e97e -Author: AboudyKreidieh -Date: Sun Aug 26 22:10:25 2018 -0700 - - Merge pull request #41 from flow-project/remove_initials - - removed positions and lanes from initial_config - - removed positions and lanes from `initial_config`. These attributes are modified by the generator class, and causes confusion and some bugs when trying to use the same parameters on a new task (e.g. what we do in the homework, which is all written in jupyter). This removes the need to write: - ``` - initial_config.lanes, initial_config.positions = None, None - ``` - - minor modifications to the docstrings - -commit 266c23d6f1f64ef9f573aa42271dbe197c11d04c -Author: AboudyKreidieh -Date: Sun Aug 26 21:59:34 2018 -0700 - - pep8 - -commit 5e130b303250c8f378ee4915dd0eaf5fcf791e1f -Author: AboudyKreidieh -Date: Sun Aug 26 21:54:10 2018 -0700 - - docstring cleanup for flow/core/ - -commit 929506ca7df29d9d280888cea13ca09ae4006410 -Author: AboudyKreidieh -Date: Sun Aug 26 17:53:43 2018 -0700 - - fixed tests that weren't running - -commit 8a7f403d62359b293f26eaf1ee919dfb4d675403 -Merge: fb3f0d54 58366075 -Author: nskh -Date: Sun Aug 26 17:24:41 2018 -0700 - - Merge pull request #47 from nskh/docs - - Adding redirect to flow.readthedocs.io owner on docs homepage - -commit 58366075c097a2d9e1acd258e80696b387fee62d -Merge: 48016436 0411728f -Author: Nishant -Date: Sun Aug 26 15:29:45 2018 -0700 - - Merge branch 'master' of github.com:nskh/flow into docs - -commit 0411728f983ff8062e489b630a571daf0629f93d -Author: Nishant -Date: Sun Aug 26 15:29:26 2018 -0700 - - one newline - -commit 4d34adac24f566c76949000557ef9a458fefe9a0 -Author: Nishant -Date: Sun Aug 26 15:28:49 2018 -0700 - - reflecting upstream/master - -commit 48016436fcf4b24645364147d7f068e98c7534dd -Author: Nishant -Date: Sun Aug 26 15:21:04 2018 -0700 - - akvo flow redirect - -commit 627c64eec2db39effee9c8218242ea685b098e68 -Author: AboudyKreidieh -Date: Sun Aug 26 13:34:12 2018 -0700 - - cleanup to benchmark docstrings - -commit ad8016cc012f36f920734ef6c9738dac554b36f7 -Author: AboudyKreidieh -Date: Sun Aug 26 13:33:11 2018 -0700 - - tests for baselines - -commit 2cae16a2670d8828d6c2fc655523c1c58e8c3ab1 -Author: AboudyKreidieh -Date: Sun Aug 26 12:49:25 2018 -0700 - - docstring cleanup - -commit 4a27afdffb12b89a4f051d6e1f61e4d7e619b4a6 -Author: AboudyKreidieh -Date: Sun Aug 26 12:13:16 2018 -0700 - - reintroduced changes from berkeleyflow - -commit ee10e97ebc5af9fd3c247684badcf8e52be21343 -Author: AboudyKreidieh -Date: Sun Aug 26 10:37:58 2018 -0700 - - removed positions and lanes from initial_config - -commit 708f30ff7849a125bc9c0a356eac1183b11de5dd -Author: AboudyKreidieh -Date: Sun Aug 26 00:32:04 2018 -0700 - - bolded "or" - -commit 5b2a6c774367d66bfd2be88710d2bc9b73433c89 -Merge: 8b4d140d fb3f0d54 -Author: Nishant -Date: Sat Aug 25 13:26:02 2018 -0700 - - merging master - -commit e43e1ed4b1c48829417375f4b626112353e5679f -Author: Nishant -Date: Fri Aug 24 23:02:20 2018 -0700 - - added rllab ec2 tutorial to docs - -commit 0328d1cd2d875cbe4a7e97c21f42b2e1ff912375 -Author: Nishant -Date: Fri Aug 24 22:48:28 2018 -0700 - - extra - -commit 30d9eb9bea809231247322979f51b95ca298d13c -Merge: a57d4481 fb3f0d54 -Author: Nishant -Date: Fri Aug 24 22:47:01 2018 -0700 - - Merge branch 'master' of github.com:flow-project/flow into rllab_tutorial - -commit a2f78e7db36a81a96b1834f79d764cc0b488714f -Merge: 598bf71a fb3f0d54 -Author: AboudyKreidieh -Date: Fri Aug 24 19:08:59 2018 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow into setup_fix - -commit fb3f0d54e06b9e940b7a2ba8772395ee7ea0f17b -Merge: 8ac6cc29 fba1ade1 -Author: AboudyKreidieh -Date: Fri Aug 24 19:06:29 2018 -0700 - - Merge pull request #38 from flow-project/yapf - - Yapf - -commit a57d4481ce09cb89d50b9ddd1d1f05f08b1021bf -Merge: 5f3ebc20 8ac6cc29 -Author: Nishant -Date: Fri Aug 24 18:28:51 2018 -0700 - - Merge branch 'master' of github.com:flow-project/flow into rllab_tutorial - -commit 5f3ebc20450aa9ced952540bbba11710c1233ec3 -Author: Nishant -Date: Fri Aug 24 17:41:49 2018 -0700 - - deleting cell - -commit 598bf71aa721cc66c58ce2f5520e105effe14e48 -Merge: 8def09d6 fba1ade1 -Author: eugenevinitsky -Date: Fri Aug 24 17:32:06 2018 -0700 - - Merge branch 'yapf' into setup_fix - -commit 8def09d644b8443bb27fb6232197d687b3d57a34 -Author: eugenevinitsky -Date: Fri Aug 24 17:24:38 2018 -0700 - - fixed flow setup to link properly - -commit fba1ade155409ca7987943d6481ed73f5e0cb8c8 -Author: eugenevinitsky -Date: Fri Aug 24 16:31:35 2018 -0700 - - minor fixes - -commit 18ec521b84870d31b11321dc92397f8aaa001d1b -Author: eugenevinitsky -Date: Fri Aug 24 16:17:48 2018 -0700 - - more yapf - -commit fe9073755d7c79b09cfc4321bed58a3535f8cc78 -Author: Fangyu Wu -Date: Fri Aug 24 16:14:41 2018 -0700 - - Add tested benchmark Dockerfile. - -commit f8a9bcd540d81c3c775cfd6bcfe750238933d2fd -Author: eugenevinitsky -Date: Fri Aug 24 14:20:41 2018 -0700 - - more yapf; - -commit 504c3c817b284b21c45c0cd2d964a55249738ca9 -Author: eugenevinitsky -Date: Fri Aug 24 13:57:59 2018 -0700 - - yapf fixes - -commit 8ac6cc299f7427eb282f250a63e96922c18d485b -Merge: 1cf8ec51 1a2e0c57 -Author: AboudyKreidieh -Date: Fri Aug 24 10:04:31 2018 -0700 - - Merge pull request #36 from flow-project/setup_bugfix - - bug fix in setup instructions - -commit 1a2e0c57b165b870ee563befd71f288c34642631 -Author: eugenevinitsky -Date: Fri Aug 24 09:15:09 2018 -0700 - - minor - -commit d38336e2a1ce6250272576d2c02b07634307ec9d -Author: Fangyu Wu -Date: Thu Aug 23 21:52:58 2018 -0700 - - Fix a minor bug. - -commit 425cc355dcfc96b9a2d3bdd6c2a42717693b92ab -Author: Fangyu Wu -Date: Thu Aug 23 21:50:11 2018 -0700 - - Fix minor bugs. - -commit 1cf8ec51171388b2acd453bcaa1620d589625e4b -Merge: ccf07ed1 8be63bfd -Author: Fangyu Wu -Date: Thu Aug 23 19:02:59 2018 -0700 - - Merge pull request #27 from flow-project/leaderboard - - Add leaderboard utility. - -commit ccf07ed182aff2fe8ff7381da766a6fa03b0b24d -Merge: 043865f1 a91bba33 -Author: AboudyKreidieh -Date: Thu Aug 23 14:54:37 2018 -0700 - - Merge pull request #28 from flow-project/amend_setup - - Amend setup - - Created an environment.yml file that supersedes the rllab-multi-agent environment.yml file - - updated the setup instructions to handle it - -commit a91bba33ac60edd4d3f1e4f5cae6e947fde00d15 -Author: AboudyKreidieh -Date: Thu Aug 23 14:15:07 2018 -0700 - - merged separated thing - -commit 043865f1e39faedafa2a7a4b4d08966a451dafff -Merge: 0a3b7d36 f1ee2f8e -Author: AboudyKreidieh -Date: Thu Aug 23 14:04:14 2018 -0700 - - Merge pull request #26 from flow-project/eugenevinitsky-patch-1 - - Update requirements.txt - -commit 744d797544cc54c7e8bc5fcf98724283f99e2e68 -Author: eugenevinitsky -Date: Thu Aug 23 13:34:28 2018 -0700 - - added bashrc vs profile - -commit f466c547573cc9b4f00f0830259e9c4a879b73ac -Author: eugenevinitsky -Date: Thu Aug 23 12:45:36 2018 -0700 - - attempt to resolve travis issues take 2 - -commit e538bd16903be7b65de95832a95986633458a8b8 -Author: eugenevinitsky -Date: Thu Aug 23 12:40:39 2018 -0700 - - attempting to pass travis tests - -commit 6d857260e81cf1917d2536645b886591734c8113 -Author: eugenevinitsky -Date: Thu Aug 23 12:07:59 2018 -0700 - - updated setup instructions for OSX - -commit 5497c1d69f7c66dbed99c17bd052fee42f457cbe -Author: eugenevinitsky -Date: Thu Aug 23 11:59:59 2018 -0700 - - working environment.yml file - -commit cdd465e05c2400480856df40f9731ee67e703136 -Merge: 467e5cf6 0a3b7d36 -Author: eugenevinitsky -Date: Thu Aug 23 11:40:06 2018 -0700 - - Merge branch 'master' of https://github.com/flow-project/flow into amend_setup - -commit 467e5cf6d2fd6d627fa5fed05e19fcbe7cfbcc1f -Author: eugenevinitsky -Date: Thu Aug 23 11:40:02 2018 -0700 - - started environment.yml - -commit 8be63bfd33443ff42209606239b659c0705a075c -Author: Fangyu Wu -Date: Wed Aug 22 23:52:46 2018 -0700 - - I hope this is the last PEP violation. - -commit f6002f4da39b7ea93de07de2e88c53f35db643ab -Author: Fangyu Wu -Date: Wed Aug 22 23:45:45 2018 -0700 - - Fix more PEP violations. - -commit e7b52580a38518116122e807402ddbb8f5780df4 -Author: Fangyu Wu -Date: Wed Aug 22 23:35:03 2018 -0700 - - Fix E402 violation. - -commit 2f4070492c53af96649089497baa47fa756eb46c -Author: Fangyu Wu -Date: Wed Aug 22 23:14:36 2018 -0700 - - Add leaderboard utility. - -commit f1ee2f8eff2f94238cb00446b60f9f57217ca09b -Author: eugenevinitsky -Date: Wed Aug 22 19:25:38 2018 -0700 - - Update requirements.txt - - 1.1.0 is not correct and suggests that 1.1.0 would work. It doesn't and appears to break pip somehow - -commit 0a3b7d368bbb9c2acf98be1b4e6863821edfed6e -Author: AboudyKreidieh -Date: Wed Aug 22 16:14:03 2018 -0700 - - modified the rllab setup instructions so that they now work: (#24) - -commit d9b53134ba6ca8c02852908d94796f12023c860d -Author: AboudyKreidieh -Date: Wed Aug 22 10:52:33 2018 -0700 - - Version 020 (#21) - - * changes from berkeleyflow - - * replaced berkeleyflow with flow-project - - * more mods to links - - * more mods to links - - * travis build - - * berkeleyflow -> flow-project - - * modified local directory call - -commit e9f7ea00725f1a171f402720b51b8affa11fdf13 -Author: Nishant -Date: Mon Aug 20 18:20:10 2018 -0700 - - result dir - -commit 9ff877d4678b1fee442b7601ac37663882db1c75 -Author: Nishant -Date: Mon Aug 20 18:16:49 2018 -0700 - - draft tutorial - -commit d13abdb781c02b08dccc2cf5537133ef2a1256ad -Merge: 86dfa8d9 8ab2a3ff -Author: Nishant -Date: Thu Aug 16 11:40:26 2018 -0700 - - Merge branch 'master' of github.com:berkeleyflow/flow into rllab_tutorial - -commit 8ab2a3ffed220365ea4cdae48939aecb62f78a52 -Merge: 00fd0786 7b5b36b2 -Author: AboudyKreidieh -Date: Thu Aug 16 10:55:54 2018 -0700 - - Merge pull request #32 from berkeleyflow/tests_utils - - Tests utils - - added tests for methods in flow/utils - - bug fix to the assignment of traffic lights in `get_flow_params` method in utils/rllib.py - - modified the `types` attribute of the `Vehicles` class for it to be more easily unittestable - -commit 7b5b36b25203e51e201f4c7dfaa5c93a05a997da -Author: AboudyKreidieh -Date: Thu Aug 16 10:42:08 2018 -0700 - - typo - -commit e33916f6534503668a1b5da3e878d5d6b4215a97 -Author: AboudyKreidieh -Date: Thu Aug 16 10:39:28 2018 -0700 - - test includes inflows now - -commit 04a226f95b5bae1c3847c240dea966163567a544 -Merge: c8912c7d 00fd0786 -Author: AboudyKreidieh -Date: Thu Aug 16 10:27:44 2018 -0700 - - Merge branch 'master' of https://github.com/berkeleyflow/flow into tests_utils - -commit 00fd07863242046863b015ae043e3f0bc5da61d5 -Merge: 4453d0d9 217bf74e -Author: eugenevinitsky -Date: Thu Aug 16 10:03:22 2018 -0700 - - Merge pull request #33 from berkeleyflow/cleanup_bloat - - minor cleanup - -commit c8912c7d26dcd2ea0472805018502a4476d6dddd -Author: eugenevinitsky -Date: Thu Aug 16 09:57:00 2018 -0700 - - minor pep8 fixes - -commit 4453d0d90ea9a88fc9a16eca090fa9c95c18083f -Merge: 442fe1cc a7a6f5f6 -Author: eugenevinitsky -Date: Thu Aug 16 09:39:05 2018 -0700 - - Merge pull request #31 from berkeleyflow/traffic_lights_env - - discrete traffic light env - -commit 442fe1cc0a708423d0c167433f4369d1d1658fe2 -Merge: 3a3212cf 041fc247 -Author: eugenevinitsky -Date: Thu Aug 16 09:37:44 2018 -0700 - - Merge pull request #25 from berkeleyflow/examples_fix - - Examples fix - -commit 041fc24719f0a7c3158c87808e12e5d57f464e00 -Author: AboudyKreidieh -Date: Wed Aug 15 15:34:48 2018 -0700 - - PR fix - -commit 3a3212cffe6892d782a1afe48cb25a277d864d59 -Merge: bdb3f743 6eda6214 -Author: eugenevinitsky -Date: Wed Aug 15 15:28:55 2018 -0700 - - Merge pull request #38 from berkeleyflow/nskh-patch-1 - - fixing typo (rllab->rllib) - -commit 6eda62141d2f682a6c042f9321df443609cfb601 -Author: nskh -Date: Wed Aug 15 15:22:50 2018 -0700 - - fixing typo (rllab->rllib) - -commit 217bf74e405b37110aabd50ed22db219b47f6c49 -Author: AboudyKreidieh -Date: Mon Aug 13 00:57:20 2018 -0700 - - removed a file from the front page of flow that I don't think is used by anyone - -commit 8cadd7637b8aad956074170c97b69212d98c81ea -Author: AboudyKreidieh -Date: Sun Aug 12 18:49:07 2018 -0700 - - pep8 - -commit c9b050b77b0bb8fa23eab7503681971315772122 -Author: AboudyKreidieh -Date: Sun Aug 12 18:36:55 2018 -0700 - - added test for utils/registry.py - -commit 716eb2acf6c1f4a831b3ae3f766825661c6d011b -Author: AboudyKreidieh -Date: Sun Aug 12 18:19:00 2018 -0700 - - tests for methods in utils/rllib - -commit bdb3f743096605db00b7b06b50fb5eb91d203fc5 -Merge: dc9c5151 ca6fe568 -Author: AboudyKreidieh -Date: Sat Aug 11 15:45:44 2018 -0700 - - Merge pull request #18 from berkeleyflow/linux_build_instructions - - Linux build instructions - -commit a7a6f5f6522a64c2d596d95ba401f6276d690e78 -Author: AboudyKreidieh -Date: Fri Aug 10 13:39:46 2018 -0700 - - discrete traffic light env - -commit 27f3c6552e07488c82cbc595d288b53628b47040 -Merge: d0fd5cda dc9c5151 -Author: AboudyKreidieh -Date: Fri Aug 10 13:25:54 2018 -0700 - - Merge branch 'master' of https://github.com/berkeleyflow/flow into examples_fix - -commit dc9c51513aeacd3cd718669eb7d78ea90e22324f -Merge: 5700337c 63c12f5b -Author: AboudyKreidieh -Date: Fri Aug 10 13:24:52 2018 -0700 - - Merge pull request #23 from berkeleyflow/flow_devel_merge - - moved changes from flow-devel - -commit d0fd5cdae8c4f4f6a0c5d2a3d5d9a5b43e1cfd42 -Author: AboudyKreidieh -Date: Thu Aug 9 23:53:35 2018 -0700 - - added missing example - -commit 1191fcd190668f9e71f1c52f700e65d493afa4b6 -Author: AboudyKreidieh -Date: Thu Aug 9 23:52:28 2018 -0700 - - test fixed - -commit 7fdf0a59175adff6ba227530e0b47fa393de6014 -Merge: f266a6bf 5700337c -Author: AboudyKreidieh -Date: Thu Aug 9 23:35:58 2018 -0700 - - Merge branch 'master' of https://github.com/berkeleyflow/flow into examples_fix - -commit f266a6bf354fb78658d03b557fa3cef186b128a8 -Author: AboudyKreidieh -Date: Thu Aug 9 23:35:07 2018 -0700 - - cleaned up examples folder - -commit 5700337c4cc57d9a2c1fee6bba8587a0947d03fc -Author: Fangyu Wu -Date: Thu Aug 9 23:17:47 2018 -0700 - - Add __version__ macro (#17) - -commit 6e3fa53791d0b7c8dbab1184105e1831f059b563 -Merge: 8b4d140d 7c54bb46 -Author: AboudyKreidieh -Date: Thu Aug 9 22:46:17 2018 -0700 - - Merge pull request #16 from berkeleyflow/unit_test_backoff - - Extremely minor change to have the tests run faster. Backoff is not applied if we are in unit test mode. - -commit 7c54bb46e2441ef066187c74f8912d51d49e92ef -Merge: 0ad7e26c 8b4d140d -Author: AboudyKreidieh -Date: Thu Aug 9 22:05:31 2018 -0700 - - Merge branch 'master' of https://github.com/berkeleyflow/flow into unit_test_backoff - -commit 8b4d140d3d9e6f81991269dbd321673dee6640f4 -Merge: 7289422b de3a3f69 -Author: AboudyKreidieh -Date: Thu Aug 9 22:00:21 2018 -0700 - - Merge pull request #19 from berkeleyflow/docs - - mock imports for docs - -commit 7289422b90a485fa291e5516e982a65a11f9c474 -Merge: 3ddd3635 b3ed531d -Author: AboudyKreidieh -Date: Thu Aug 9 21:58:04 2018 -0700 - - Merge pull request #24 from berkeleyflow/stress_test - - backoff adjustment - -commit b3ed531d8f97c655895475aeca6133fb77d056c8 -Author: Nishant -Date: Thu Aug 9 17:32:36 2018 -0700 - - duplicating berkeleyflow/flow-devel/#87 - -commit 86dfa8d9f4142e4a6e442bc08a25ab3f94725908 -Author: Nishant -Date: Thu Aug 9 17:30:32 2018 -0700 - - initial tutorial 11 commit - -commit 63c12f5bea2cd1baa7b41f21bbc288579c8c4c5b -Author: AboudyKreidieh -Date: Thu Aug 9 17:24:55 2018 -0700 - - moved changes from flow-devel - -commit de3a3f690584b38ec55ced1192b159e7867c0680 -Author: Nishant -Date: Thu Aug 9 16:51:57 2018 -0700 - - restored setup.py - -commit cde075c33b8eeeb1526dc379979143ef1c4ff9f5 -Author: Nishant -Date: Thu Aug 9 16:12:00 2018 -0700 - - mock matplotlib - -commit af0b1fa35e1bc5b619f6895ff441ea38b35eaa85 -Author: Nishant -Date: Thu Aug 9 16:07:39 2018 -0700 - - mock flow is a bad idea - -commit ca6fe568d5e55e63a08f77d089736c066e1f06c9 -Author: eugenevinitsky -Date: Thu Aug 9 16:00:25 2018 -0700 - - fixed sumo build instructions for linux - -commit 4b1d0962c6f0710085d52cba45e673f93a0069fb -Author: Nishant -Date: Thu Aug 9 15:48:20 2018 -0700 - - mock flow? - -commit 775b5d7c787a0e27e0c8e628a233e9e0cca2c83b -Merge: 3f3adecf 3ddd3635 -Author: eugenevinitsky -Date: Thu Aug 9 15:42:44 2018 -0700 - - Merge branch 'master' of https://github.com/berkeleyflow/flow - -commit 82cf114bf67c64d0bd63125494f7672c4064e888 -Author: Nishant -Date: Thu Aug 9 15:41:32 2018 -0700 - - more mocks - -commit b11dead20e31bbd5630b984fbfaf771ff4003e3a -Merge: 5c6d8eb9 3ddd3635 -Author: Nishant -Date: Thu Aug 9 15:31:40 2018 -0700 - - Merge branch 'master' of github.com:berkeleyflow/flow into docs - -commit 0ad7e26cec9931cd33efec9ed7605c9b3881a8bc -Merge: 3f3adecf 3ddd3635 -Author: eugenevinitsky -Date: Thu Aug 9 15:29:23 2018 -0700 - - Merge branch 'master' of https://github.com/berkeleyflow/flow into unit_test_backoff - -commit 3f3adecf65fc500a0963d0fed80183f168083050 -Author: eugenevinitsky -Date: Thu Aug 9 15:29:07 2018 -0700 - - no backoff in unit tests - -commit 3ddd363575f47c4e34421055205597f699dc5d34 -Merge: 21829349 1742149d -Author: eugenevinitsky -Date: Thu Aug 9 14:17:56 2018 -0700 - - Merge pull request #15 from berkeleyflow/setup_update - - added requirements, minor changes to setup instructions - -commit 1742149d72a3d34df93f2d123b26b8e7ee5aea49 -Author: eugenevinitsky -Date: Thu Aug 9 13:33:42 2018 -0700 - - Update requirements.txt - - Added scipy to requirements - -commit 5abc40fecc0418391c23b75d13315a919ce999e3 -Author: eugenevinitsky -Date: Thu Aug 9 13:18:03 2018 -0700 - - added requirements, minor changes to setup instructions - -commit 5c6d8eb9f5f6a99e97aa99618743d995a74c4ee4 -Author: Nishant -Date: Thu Aug 9 12:28:53 2018 -0700 - - more print - -commit 1d3b7e2a0d35b7f86cfae359dc962f243a719a77 -Author: Nishant -Date: Thu Aug 9 12:27:15 2018 -0700 - - print - -commit 2227917faa4c77264582fd2579119bea89ba2829 -Author: Nishant -Date: Thu Aug 9 12:25:56 2018 -0700 - - setup - -commit 325e5fb2afbe0d3a27a7d1287b3ed744f934c2af -Author: Nishant -Date: Thu Aug 9 11:52:11 2018 -0700 - - rip == - -commit 9e8a6e1655742f66419f6756bc968433c3015ac4 -Author: Nishant -Date: Thu Aug 9 11:44:46 2018 -0700 - - req - -commit 218293493a4ab6c2611c6ca71c88018c83be1edc -Merge: a85691d5 bc42d798 -Author: eugenevinitsky -Date: Thu Aug 9 10:25:54 2018 -0700 - - Merge pull request #8 from berkeleyflow/docs - - Documentation and README changes - -commit bc42d7989003fa50bf38b8a59f330b70ef971d8d -Author: Nishant -Date: Wed Aug 8 18:42:05 2018 -0700 - - updating per comments - -commit 7a892582ce10637252fe1ed1e413c5ee65eaa734 -Author: Nishant -Date: Wed Aug 8 16:49:47 2018 -0700 - - more links - -commit 0a200a1b9c3ec7b0c572b7c0a4455f3d0c85599a -Author: Nishant -Date: Wed Aug 8 16:48:49 2018 -0700 - - adding website links - -commit 86d3a90269b9ed4a38e5ca4684a4b74801da013a -Author: Nishant -Date: Wed Aug 8 14:59:30 2018 -0700 - - pulling in Aboudy's updated setup instructions - -commit 0a82c6f9b00f640ed86e29e54d9eaf83e61341a7 -Author: Nishant -Date: Wed Aug 8 10:49:18 2018 -0700 - - moved position of tutorials - -commit 0048feb89487b93a9db6ef2c56d7d918bc144985 -Author: Nishant -Date: Wed Aug 8 10:47:51 2018 -0700 - - added sidebar links to tutorials - -commit 2d1aa479f52d0ba5ff1c538d6c01d57ba598ebd8 -Merge: 67705487 a85691d5 -Author: Nishant -Date: Mon Aug 6 17:20:17 2018 -0700 - - Merge branch 'master' of github.com:berkeleyflow/flow into docs - -commit 677054878cc44d8ae302acbd7209ea3c3ba4d87d -Author: Nishant -Date: Mon Aug 6 17:19:03 2018 -0700 - - comments in conf.py, fixing so that build badge shows passing, and changing index to highlight tutorials more - -commit a85691d5943bef87ff50dd7c47ec88c1b1026ad9 -Author: Kathy Jang -Date: Mon Aug 6 16:25:22 2018 -0700 - - Incorporated changes from flow-devel which specifies which sumo commit and pulls the patch from aws (#6) - -commit 184311ab64fbc1164f7a88ba732e5380d084cd63 -Author: Nishant -Date: Thu Jul 26 18:09:05 2018 -0700 - - removing module prefixes - -commit 083a6c6c953d4419a88b34706d49eb82e50e4cda -Author: Nishant -Date: Thu Jul 26 17:30:38 2018 -0700 - - hope this works - -commit 7a3b6c6d1b02c5e7e434d7c917a017cf99716123 -Author: Nishant -Date: Thu Jul 26 17:23:44 2018 -0700 - - removing all mock imports - -commit eba18b4c7aa86ba7b0c9457d8f99869f03b38523 -Author: Nishant -Date: Thu Jul 26 17:15:42 2018 -0700 - - back to before - -commit 8c63c7dfb738a2f6e85592dba1dbe9a8e2222f84 -Author: Nishant -Date: Thu Jul 26 17:10:00 2018 -0700 - - no sumolib mock - -commit 3ccddadc8a9ee51b3a9585a9aa49a0272673186e -Author: Nishant -Date: Thu Jul 26 17:05:58 2018 -0700 - - more - -commit 9edd9e4dd00f39467e0b064df310704c48faf296 -Author: Nishant -Date: Thu Jul 26 16:58:05 2018 -0700 - - different mock imports - -commit fa4dc2b2f51232939bfb54f28b431f3aa495284e -Author: Nishant -Date: Wed Jul 18 12:32:07 2018 -0700 - - removing sumolib mock import - -commit 7ec281284bc14933c45d4e938ca2fa47e6419b56 -Author: Nishant -Date: Wed Jul 18 12:14:45 2018 -0700 - - more mock - -commit 67a6e8533f8a3277d44a5dc9e14ed7c1251c7958 -Author: Nishant -Date: Wed Jul 18 12:07:40 2018 -0700 - - minor - -commit f15090c463cd7b26f03773905aa3c2dbc00f2b5c -Author: Nishant -Date: Fri Jul 13 16:39:12 2018 -0700 - - undoing - -commit 44775dd9fa294aed6a87e28effa8244f29e4ae62 -Author: Nishant -Date: Fri Jul 13 16:35:48 2018 -0700 - - deleted file - -commit 53b84482213fe4b1c94e48227da68f70376c7528 -Author: Nishant -Date: Fri Jul 13 16:27:54 2018 -0700 - - attempting to fix imports - -commit eafca86ef5154b1a661290805b3214fec3592ae5 -Author: Nishant -Date: Fri Jul 13 16:11:39 2018 -0700 - - only traci - -commit 1232a8b976d21c0c1cb57f942d9ceaae8629d752 -Author: Nishant -Date: Fri Jul 13 16:00:14 2018 -0700 - - mock imports for autodoc functionality on readthedocs - -commit 0508cd8792f2db435475dcd5057efa8e9996ea34 -Merge: ee3a90ca c2b3ee3d -Author: eugenevinitsky -Date: Sat Jun 30 13:43:32 2018 -0700 - - Merge pull request #3 from berkeleyflow/version_0_1_0 - - Version 0 1 0 - -commit c2b3ee3d9ca09f54cbaf22c1bda286b94001069d -Author: AboudyKreidieh -Date: Sat Jun 30 13:47:06 2018 +0300 - - version 0.1.0 - -commit d47d0c2dcf48dbfabfd5ecaffb60abdff2ced9d8 -Author: AboudyKreidieh -Date: Sat Jun 30 13:21:17 2018 +0300 - - tutorials - -commit ee3a90caa78db7208ef288fd3683da573854e2b8 -Merge: 99773415 4ea7f68c -Author: eugenevinitsky -Date: Fri May 25 09:39:33 2018 -0700 - - Merge pull request #2 from berkeleyflow/remove_bay_bridge - - temporarily deleted bay bridge components - -commit 4ea7f68c529abccdc72da427492f91f981a3fe9b -Author: AboudyKreidieh -Date: Fri May 25 09:16:18 2018 -0700 - - removed bay bridge components from scenario - -commit c7e7757e24cd094a2569a03b6013bc30742e212a -Author: AboudyKreidieh -Date: Fri May 25 08:54:13 2018 -0700 - - travis fix - -commit 86b6bab4d9ca1f7088294e9c4270ce92d09c6cc9 -Author: AboudyKreidieh -Date: Fri May 25 08:49:02 2018 -0700 - - temporarily deleted bay bridge components - -commit 99773415f0ab38b4aceb755e487b45b756d28bde -Merge: 94b255d7 0b59d01a -Author: AboudyKreidieh -Date: Tue May 15 22:55:07 2018 -0700 - - Merge pull request #444 from cathywu/rllib_update - - Rllib runscript update - - created a generic `make_create_env` which accepts our params (e.g. `SumoParams`) and strings for the scenario and generator classes (which need to now be the __init__ file for `flow/scenarios`) - - updated `visualizer_rllib.py` - -commit 0b59d01a4043d089e3a8645aec1cee8993b74a77 -Author: AboudyKreidieh -Date: Tue May 15 22:24:25 2018 -0700 - - fixed figure8 run scripts - -commit f3ac7d3bc2583c46de853cc70b3a3ef8120dd545 -Author: AboudyKreidieh -Date: Tue May 15 22:17:35 2018 -0700 - - pep8 - -commit 5d3d4e0291445715cd5c9e4a25789ff533db8475 -Merge: 36e5a34d 94b255d7 -Author: AboudyKreidieh -Date: Tue May 15 22:00:20 2018 -0700 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic into rllib_update - -commit 36e5a34de3a09785a483e128a86ae1217b0ce426 -Author: AboudyKreidieh -Date: Mon May 14 23:13:42 2018 -0700 - - minor fixes - -commit 94b255d7cad44a2668bdf5b92615e11253ba15a9 -Merge: c70a25eb 29b08cb0 -Author: eugenevinitsky -Date: Mon May 14 16:56:51 2018 -0700 - - Merge pull request #446 from cathywu/velocity_bottleneck - - Velocity bottleneck - -commit 29b08cb089e4db0bfce0d4eef855f7ff4e72bbd0 -Author: eugenevinitsky -Date: Mon May 14 16:29:31 2018 -0700 - - spacing - -commit a45b9f2b76017abfb7c4913fb1e0694a5b7f51f9 -Author: eugenevinitsky -Date: Mon May 14 16:25:29 2018 -0700 - - changed env names - -commit c9bba4c538c5244248fd660c6a535a043cc0ce8a -Author: AboudyKreidieh -Date: Mon May 14 16:21:03 2018 -0700 - - gae for all rllib examples - -commit e6ee0855f91baad1e1b6eaf11e0f490064e1af5c -Merge: 06ed841e bfe3bdef -Author: eugenevinitsky -Date: Mon May 14 16:20:10 2018 -0700 - - Merge branch 'velocity_bottleneck' of https://github.com/cathywu/learning-traffic into velocity_bottleneck - -commit 06ed841e22186f04d2a85243a7353688da6380d9 -Author: eugenevinitsky -Date: Mon May 14 16:19:59 2018 -0700 - - addressed comments - -commit 95f5c3e0b4a00424dd0cb980128e87e7f0373959 -Author: AboudyKreidieh -Date: Mon May 14 16:18:01 2018 -0700 - - PR fixes - -commit bfe3bdef2c5a9ec6dbde42baefa6aa991c470fd3 -Merge: 9b73cbd1 c70a25eb -Author: eugenevinitsky -Date: Mon May 14 16:17:02 2018 -0700 - - Merge branch 'master' into velocity_bottleneck - -commit 627694f95a8133c7c0613bc9938b08198eebad15 -Merge: f4ec66ad c70a25eb -Author: AboudyKreidieh -Date: Mon May 14 15:35:27 2018 -0700 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic into rllib_update - -commit c70a25ebcf59d61286fe5b86d4af7112df34cb49 -Merge: c550a5c9 eb60faf9 -Author: AboudyKreidieh -Date: Mon May 14 15:34:38 2018 -0700 - - Merge pull request #443 from cathywu/pythonic_init_files - - pythonified __init__ files - - added relevant imports to the `flow.controllers`, `flow.envs`, and `flow.scenarios` - - added an `__all__` to each __init__ file for pep8 compliance to imports - - replace controller imports in the run scripts to imports from `flow.controllers` - -commit c550a5c965d557ced43aa9f3d3a7f9c1fc1b130f -Merge: 0fe6c9cf d4ddbf20 -Author: AboudyKreidieh -Date: Mon May 14 15:29:44 2018 -0700 - - Merge pull request #442 from cathywu/more_cleanup - - More cleanup: - - removed extra rllib examples - - renames two_loops_one_merging -> loop_merge - - updated wave attenuation environment (observation was wrong) - - updated documentation to the traffic lights class - -commit 9b73cbd1fa5a80da1c0a3feff6146aa873aab951 -Author: eugenevinitsky -Date: Mon May 14 15:19:19 2018 -0700 - - fix to test_controllers - -commit eb60faf90e8c6dd08f72b8c21546fbfbea5e6957 -Author: AboudyKreidieh -Date: Mon May 14 15:14:47 2018 -0700 - - PR fix - -commit d4ddbf209bfc4c6e5396ad7d6114faa4eed1c436 -Author: AboudyKreidieh -Date: Mon May 14 15:12:56 2018 -0700 - - PR fix - -commit b07c656e09dc4cb6ce698ecb15d8c52d51e89972 -Author: AboudyKreidieh -Date: Mon May 14 14:40:09 2018 -0700 - - reintroduced two level rllib policies - -commit 2573969f8e211b394e4df30cfad346c3398a13e8 -Author: eugenevinitsky -Date: Mon May 14 14:29:49 2018 -0700 - - comments addressed - -commit 63c5db06a6e3d6c24e5f956105dff811adbd20bf -Author: eugenevinitsky -Date: Mon May 14 12:19:20 2018 -0700 - - cleanup - -commit 52031d8d80dc3a6d0e4247e5a0b56ad8f9ccb2cb -Author: eugenevinitsky -Date: Mon May 14 12:16:30 2018 -0700 - - updated tests - -commit 7f88847c9d40639040129b709f186a496146eeed -Author: eugenevinitsky -Date: Mon May 14 12:11:16 2018 -0700 - - pep8 fixes - -commit 96cbe8694daf66f2b905707511590f88135c1cb2 -Merge: 987079e3 0fe6c9cf -Author: eugenevinitsky -Date: Mon May 14 11:52:55 2018 -0700 - - cleanup - -commit 987079e3ba2fd8f5caf5f7fee6fee70e042ec54c -Author: eugenevinitsky -Date: Mon May 14 11:10:20 2018 -0700 - - cleaned up sumo bottleneck - -commit f4ec66ad1e0f4ded04fc5cadbedd852737665e57 -Author: AboudyKreidieh -Date: Mon May 7 01:37:46 2018 -0700 - - pep8 fixes - -commit 743ff5b5e7504bc0acdccfc82fd309d8b304ef07 -Author: AboudyKreidieh -Date: Mon May 7 01:10:17 2018 -0700 - - fixed test - -commit 00abc29eae9af2c32f6128075fd7642e3e57a8fd -Merge: 6e6c1e58 820baa18 -Author: AboudyKreidieh -Date: Mon May 7 00:16:53 2018 -0700 - - Merge branch 'more_cleanup' into rllib_update - -commit 6e6c1e58486614edf9a6b1c8b4317442345bee4a -Merge: 1c016b3e 17ca3ce8 -Author: AboudyKreidieh -Date: Mon May 7 00:14:23 2018 -0700 - - Merge branch 'pythonic_init_files' into rllib_update - -commit 17ca3ce8205b98580712412e2dc94f35a0862c6f -Author: AboudyKreidieh -Date: Mon May 7 00:03:03 2018 -0700 - - pythonified __init__ files - -commit 820baa184dc3e4a6330d6acaa2d9abc963caff51 -Author: AboudyKreidieh -Date: Sun May 6 23:31:47 2018 -0700 - - modified wave attenuation env to match actual experiment - -commit 037d19604ca7a0c17a15414783fae4cb7ec8ece8 -Author: AboudyKreidieh -Date: Sun May 6 23:31:17 2018 -0700 - - modified documentation to traffic lights class - -commit b43e03b833283fa76aa40ab6c422ed51d6a34f67 -Author: AboudyKreidieh -Date: Sun May 6 23:30:53 2018 -0700 - - removed more examples, some pep8 and cleanup - -commit 1c016b3e14c5e13034481a15bbdacd402750a50a -Author: AboudyKreidieh -Date: Sun May 6 22:58:03 2018 -0700 - - updated rllib experiments - -commit 0fe6c9cf958d9a49b13baaf86860a4ffaeb62758 -Merge: 8d4aff83 a1248952 -Author: AboudyKreidieh -Date: Sun May 6 22:25:46 2018 -0700 - - Merge pull request #441 from cathywu/merge - - changes: - - added merge scenario, environment, and experiment (from ITSC) - - removed bounds on accel and decel in the controllers (they mess with IDM dynamics) - -commit a1248952e75ceec7452e180fde540a7dd383cd17 -Author: AboudyKreidieh -Date: Sun May 6 22:14:12 2018 -0700 - - PR fix - -commit 1db676b99fca31f2451a434ce12c849b3043b7e3 -Merge: 89c57f17 8ed9eb7d -Author: AboudyKreidieh -Date: Thu May 3 19:39:07 2018 -0700 - - Merge branch 'merge' into rllib_update - -commit 8ed9eb7dd428e919dd10deee35d049ba7f4a8fe9 -Author: AboudyKreidieh -Date: Thu May 3 19:25:25 2018 -0700 - - added sumo test for merge - -commit a1a2777df4a6cd70cb662c6724691463fa570410 -Merge: ecd52bb6 8d4aff83 -Author: AboudyKreidieh -Date: Thu May 3 19:17:24 2018 -0700 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic into merge - -commit 89c57f172872b7bfaf47ec49fc06f091ce25f66c -Author: AboudyKreidieh -Date: Thu May 3 19:16:45 2018 -0700 - - mods - -commit 8d4aff83b3cfc29c615b42da4235d62de36f7ce7 -Merge: 6248de16 2d317f6f -Author: AboudyKreidieh -Date: Thu May 3 18:53:04 2018 -0700 - - Merge pull request #439 from cathywu/cleanup - - Cleanup - - changes: - - large scale pep8 cleanup - - removed `aws-build-tester.py` - - removed `examples/sumo/cooperative_merge.py` (it is redundant) - - updated documentation to `base_env.py` - - removed `max_accel`, `max_decel`, and `lane_change_duration` from `EnvParams`, with approprraite changes to the environments - - removed `loop_merges` scenario and environments - - renames `two_loops_one_merging` -> `loop_merges` - - removed `flow/visualize/space_time_plotter.py` (it is very experiment specific) - -commit 6248de16e3e67e19c642b90547802acf06faaf62 -Merge: 7a15fbb5 73888845 -Author: AboudyKreidieh -Date: Thu May 3 15:06:35 2018 -0700 - - Merge pull request #411 from cathywu/visualizer_rllab_update - - changes to `visualizer_rllab.py`: - - removed `--run_long`, which has always been broken - - since we always want to activate the gui when running the visualizer, removed `--use_sumogui` as well - - added prints for the cumulative return from each rollout, and then the average return across rollouts - -commit 2d317f6f3b90e65775f62f9006157433861a65b2 -Author: AboudyKreidieh -Date: Thu May 3 15:05:48 2018 -0700 - - PR fixes - -commit 738888452b0285019933d6eaccc9fcc30c5ad519 -Author: AboudyKreidieh -Date: Thu May 3 14:54:29 2018 -0700 - - PR fix - -commit bf98657336f55f3d432fecb491d62a428acc1ea1 -Author: AboudyKreidieh -Date: Thu May 3 14:41:07 2018 -0700 - - important cleanup to wave attenuation env - -commit 326a3bae55c1ba5b3c9aca9ee5218d0ca98a72d9 -Author: AboudyKreidieh -Date: Thu May 3 14:30:34 2018 -0700 - - pythonic __init__ files - -commit c625beedb53470e7883112ad15b2fcd59d26c731 -Author: AboudyKreidieh -Date: Thu May 3 12:44:20 2018 -0700 - - reintroduced changes (someone deleted them) - -commit c88644e2bda51e561bec8a0875584ee6185db9e9 -Author: AboudyKreidieh -Date: Thu May 3 12:43:04 2018 -0700 - - initial changes to rllib run scripts - -commit a1c15ab1ac146137ff2c723fad441070632dc5b2 -Merge: 7224411b ecd52bb6 -Author: AboudyKreidieh -Date: Thu May 3 02:27:35 2018 -0700 - - Merge branch 'merge' into rllib_update - -commit 7224411bb69477809b6a578478f1e0b92c85c413 -Author: AboudyKreidieh -Date: Thu May 3 02:27:23 2018 -0700 - - removed rllib run scripts - -commit 35845557390af93e22c43b4cd432c737568b8c82 -Merge: ad139560 7a15fbb5 -Author: AboudyKreidieh -Date: Wed May 2 18:53:47 2018 -0700 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic into visualizer_rllab_update - -commit ecd52bb694f54385abd5eac245d3578cf0202cf9 -Author: AboudyKreidieh -Date: Tue May 1 21:01:36 2018 -0700 - - open merge experiment - -commit f7169909e15b52de521bd58000c7346b0c54b3a8 -Merge: 84e1ff2c 7a15fbb5 -Author: AboudyKreidieh -Date: Sun Apr 29 23:58:49 2018 -0700 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic into cleanup - -commit 7a15fbb5bf1e3294e272467040a27dd829701be9 -Merge: d8182a40 bce5ec3d -Author: AboudyKreidieh -Date: Sun Apr 29 23:52:08 2018 -0700 - - Merge pull request #415 from cathywu/rllib_visualizer_update - - Rllib visualizer update - - - Fixed rllib visualizer so it works with inflows, and pulls the flow params from the env_config of the rllib config. - - Pep8 fixes - -commit bce5ec3de19af46eefb74558247d371f99be9c65 -Merge: bd75c63a d8182a40 -Author: AboudyKreidieh -Date: Sun Apr 29 23:36:22 2018 -0700 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic into rllib_visualizer_update - -commit bd75c63a169841518937c78630b766fb4bd348f6 -Author: AboudyKreidieh -Date: Sun Apr 29 23:11:57 2018 -0700 - - PR fix - -commit 84e1ff2cbd32ab4a11c0b0356cbf89fe132b5bd8 -Author: AboudyKreidieh -Date: Sun Apr 29 23:02:10 2018 -0700 - - major pep8 cleanup and some documentation to base_env - -commit 12fb698204142974be124b23367f3f438e789552 -Author: eugenevinitsky -Date: Thu Apr 26 16:14:05 2018 -0700 - - minor - -commit 2e70db2c55062605baa17b8a91ddd1f7901f4ba9 -Author: eugenevinitsky -Date: Thu Apr 26 16:08:37 2018 -0700 - - added in separate observation size contorl - -commit 76c03fb52689761bb11cfedf010d6d9c362de629 -Author: eugenevinitsky -Date: Thu Apr 26 11:02:47 2018 -0700 - - updated ALINEA, deprecation of trafficlights fix - -commit ccb62c377584f8cc0852241da3fe3deb93145087 -Author: eugenevinitsky -Date: Wed Apr 25 23:20:54 2018 -0700 - - merged ALINEA branch in - -commit 8ab9067fdf987fb2666522ecfba22ac525c67a5b -Merge: 3c820d33 213967be -Author: eugenevinitsky -Date: Wed Apr 25 23:19:52 2018 -0700 - - merged ALINEA branch in - -commit 3c820d3321b208108d2ef17ecd0de0965e9e0ab5 -Author: eugenevinitsky -Date: Wed Apr 25 23:16:11 2018 -0700 - - set up a run script for ALINEA experiments - -commit bb2c43a3fcb6f11441bb45689f5fdb97e0661aa5 -Author: eugenevinitsky -Date: Wed Apr 25 16:32:03 2018 -0700 - - added reset method back in - -commit a20d23a76b2c5998e6bed50a48867274b8f8bb42 -Author: eugenevinitsky -Date: Wed Apr 25 11:49:50 2018 -0700 - - fixed bug in number of segments - -commit 213967beebef2c9870328def8ef716776a092d11 -Author: eugenevinitsky -Date: Tue Apr 24 22:07:15 2018 -0700 - - better cycle offset - -commit e06604a73cd5c849781b3e68c99fd496c8e9ad3e -Author: eugenevinitsky -Date: Tue Apr 24 19:45:38 2018 -0700 - - more tuning - -commit 11a0357ce4422ec7e272e26a431dd2cee3b0a153 -Author: eugenevinitsky -Date: Tue Apr 24 19:24:55 2018 -0700 - - alinea tuning - -commit 51e3156289cca3744069ae824ff43b41721f9cf9 -Author: eugenevinitsky -Date: Tue Apr 24 19:15:51 2018 -0700 - - updated run script so that I can send up multiple inflow experiments in one pass - -commit 76fe63baec47c82c3806ed5b6aa4a4ded044304c -Author: eugenevinitsky -Date: Tue Apr 24 18:47:26 2018 -0700 - - updated alinea params - -commit df17a22d53ebcab8ebbd38ec06dd1ff7f9ca88fc -Author: eugenevinitsky -Date: Tue Apr 24 16:50:17 2018 -0700 - - mild tuning - -commit 3025e6e1bbdb270f546fe2d2a9cd34b61a68b266 -Merge: c4ab408e d8182a40 -Author: eugenevinitsky -Date: Tue Apr 24 15:47:57 2018 -0700 - - working now - -commit 0f85493fac9aff518be80aeda8115f347a7d0044 -Author: eugenevinitsky -Date: Tue Apr 24 15:02:06 2018 -0700 - - added outflow to state space - -commit d8182a40023c585971a8e26725dd775aa2605926 -Merge: b63de31b b45feb97 -Author: AboudyKreidieh -Date: Mon Apr 23 16:21:44 2018 -0700 - - Merge pull request #416 from cathywu/loop_envs_cleanup - - Loop envs cleanup - - changes: - - removed the loop_merge scenario/generator/environment - - added env params exposure to the loop environments. Any loop environment can refer to `ADDITIONAL_ENV_PARAMS` to determine what parameters are needed. - -commit b45feb97fad98b628e9be476821a329a6cf68327 -Author: AboudyKreidieh -Date: Mon Apr 23 15:58:50 2018 -0700 - - PR changes - -commit f831ddd7e65b3a0b256098d0f0ab531b72f9b3dd -Merge: e8b982cf 1206b0a6 -Author: AboudyKreidieh -Date: Mon Apr 23 15:44:14 2018 -0700 - - Merge branch 'tutorials' of https://github.com/cathywu/learning-traffic into loop_envs_cleanup - -commit b63de31bfdefc071213b88553e15f612a1498f79 -Merge: ce03cce7 4f774274 -Author: AboudyKreidieh -Date: Mon Apr 23 15:23:34 2018 -0700 - - Merge pull request #410 from cathywu/params_documentation - - documentation for params - -commit e8b982cf856d1306e7467a4f63933a5438d81168 -Merge: 229ea017 ce03cce7 -Author: AboudyKreidieh -Date: Mon Apr 23 15:22:14 2018 -0700 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic into loop_envs_cleanup - -commit ad139560466c99c588d615c0a117aa657f3e99ce -Merge: f1667526 ce03cce7 -Author: eugenevinitsky -Date: Mon Apr 23 14:35:57 2018 -0700 - - Merge branch 'master' into visualizer_rllab_update - -commit f1667526a27fe0fc55a9230b739a5f264f131f12 -Author: eugenevinitsky -Date: Mon Apr 23 14:33:09 2018 -0700 - - Revert "updates to visualizer_rllab" - - This reverts commit fa988bffb611965c9523b9910944c24591a4a6f8. - -commit 2a08a23a98d23a28218409b65a595fc58ba23c25 -Author: eugenevinitsky -Date: Mon Apr 23 14:32:57 2018 -0700 - - added resets to bottleneck env - -commit ce03cce736768e84181b53b0ad59bdce92cd425f -Merge: d9be0f98 aab2b859 -Author: AboudyKreidieh -Date: Mon Apr 23 13:02:39 2018 -0700 - - Merge pull request #409 from cathywu/scenario_documentation - - modified documentation for scenarios - -commit d9be0f98f5a84828abf9005d69c5c8a285af3883 -Merge: d6e76c49 5b1bc076 -Author: Kanaad Parvate -Date: Mon Apr 23 11:46:41 2018 -0700 - - Merge pull request #385 from cathywu/max_speed - - removed max_speed from EnvParams - -commit aab2b859e53b325d3415f210efcccb69d166c285 -Author: Kanaad Parvate -Date: Mon Apr 23 11:44:49 2018 -0700 - - added documentation for -1001 cases - -commit d6e76c49c1477159138fa0ba73f361b1f9fec237 -Merge: dc553132 20692f75 -Author: Kanaad Parvate -Date: Mon Apr 23 11:42:27 2018 -0700 - - Merge pull request #408 from cathywu/cleanup_controllers - - cleaned up controllers - -commit 5b1bc076cb5aea55375cfe20f2120c766a20bbfb -Merge: 63d685c0 dc553132 -Author: Kanaad Parvate -Date: Mon Apr 23 11:33:05 2018 -0700 - - Merge branch 'master' into max_speed - -commit 345f68a3ed3faa106f107474c55bb8c22aa4cc36 -Author: eugenevinitsky -Date: Fri Apr 20 20:10:43 2018 -0700 - - minor - -commit 64a1efe05f542e76139e5bf9ffb6b9bb3c07c3c0 -Author: eugenevinitsky -Date: Fri Apr 20 20:08:36 2018 -0700 - - set min speed to zero - -commit 943188ee6ca3ef3837d8e3d4991fa911d6e1146b -Author: eugenevinitsky -Date: Fri Apr 20 17:53:54 2018 -0700 - - Revert "fix" - - This reverts commit 1e4172a0f2462a82470fbc5d3d1512ac07af0cdf. - -commit 8308107bca06a7fe783900ad4da11d14c7e61d36 -Author: eugenevinitsky -Date: Fri Apr 20 17:47:17 2018 -0700 - - Revert "pep8 fix" - - This reverts commit 8f7b4c085f66644a69d1ab06e2cd5fadf96963a5. - -commit 1e4172a0f2462a82470fbc5d3d1512ac07af0cdf -Author: eugenevinitsky -Date: Fri Apr 20 17:12:13 2018 -0700 - - fix - -commit 8f7b4c085f66644a69d1ab06e2cd5fadf96963a5 -Author: eugenevinitsky -Date: Fri Apr 20 16:51:46 2018 -0700 - - pep8 fix - -commit 1055a8c245231dc9ee45cf962565ccdb2614def7 -Author: eugenevinitsky -Date: Fri Apr 20 16:51:02 2018 -0700 - - added removed import statements - -commit 5e6e8ee7cb062eab554b84cd5c0df45c0eaa56d1 -Author: eugenevinitsky -Date: Fri Apr 20 16:44:21 2018 -0700 - - update json test - -commit 4d16a1e0e4d4270a870c72b4f7f5f8a2ef132731 -Author: eugenevinitsky -Date: Fri Apr 20 16:42:58 2018 -0700 - - update - -commit 73ee12970d66c23d7559260bfba98c5225e850a9 -Merge: 10d2afe4 e400b770 -Author: eugenevinitsky -Date: Fri Apr 20 15:56:27 2018 -0700 - - working util for json_tst - -commit 10d2afe449efe2dad7a7ab1765bf413ce3451f23 -Author: eugenevinitsky -Date: Fri Apr 20 15:54:11 2018 -0700 - - fixed utils for rllib test - -commit e400b770e7390a1af14c1070e0edfb3ae0cd329a -Author: eugenevinitsky -Date: Fri Apr 20 15:54:11 2018 -0700 - - fixed utils for rllib test - -commit 1616c52eb25efdaea146c7bcc7f624830da3f59d -Author: eugenevinitsky -Date: Fri Apr 20 15:49:13 2018 -0700 - - update json test - -commit 1206b0a6a375f5f885629ba09f731b8a5ba6c3aa -Author: Nishant -Date: Fri Apr 20 15:06:42 2018 -0700 - - updated tutorial 1: sumo - -commit 7cfd5b87190a5c32265a0193668529501d3777d5 -Author: AboudyKreidieh -Date: Fri Apr 20 15:05:43 2018 -0700 - - PR fix - -commit 229ea0173f96c6ffd3db8b3a18067b8636f005c4 -Author: AboudyKreidieh -Date: Fri Apr 20 15:02:42 2018 -0700 - - env params exposure to the loop environments - -commit b33a183f8207663572e6f324d0c4eb4404d4e8b2 -Author: eugenevinitsky -Date: Fri Apr 20 15:02:27 2018 -0700 - - fixed travis failure - -commit 9bef04839f4683c7b7dad6db1a60d0f84d95c9bd -Author: eugenevinitsky -Date: Fri Apr 20 14:55:04 2018 -0700 - - flake8 and updated visualizer class - -commit f2bd78aa3b208a4b04915638f140579680086f17 -Merge: 9687b922 c5975305 -Author: eugenevinitsky -Date: Fri Apr 20 14:42:38 2018 -0700 - - merged in vel early lc - -commit 80231373c2fcfd55661862b6b5b177deaabaedb0 -Author: eugenevinitsky -Date: Fri Apr 20 14:40:49 2018 -0700 - - update visualizer rllib and flake fixes - -commit 681ed1cdff75cea3f82959b69f53a3439f9be439 -Author: eugenevinitsky -Date: Fri Apr 20 14:40:12 2018 -0700 - - update visualizer rllib and flake fixes - -commit 591e9850fb0a2744711b7716f9cf84523720d6a0 -Merge: f42de9d0 dc553132 -Author: eugenevinitsky -Date: Fri Apr 20 14:30:41 2018 -0700 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic - -commit 09f77aa4aa7b61c6e65293a396c562a70596bdee -Author: AboudyKreidieh -Date: Thu Apr 19 20:03:57 2018 -0700 - - removed loop_merge - -commit c4ab408ede8c9f0f03f436318ed88c9644c663ea -Author: eugenevinitsky -Date: Thu Apr 19 19:00:46 2018 -0700 - - updated to new gym - -commit 045ec4f3e6c4d3eb20b1bdf3756c3fbba2dbb30a -Author: AboudyKreidieh -Date: Thu Apr 19 18:40:10 2018 -0700 - - tutorials, modified AccelEnv, and small change to base_env - -commit c5975305abd359f935183208e0f470b119473bb5 -Author: eugenevinitsky -Date: Thu Apr 19 18:26:12 2018 -0700 - - lane changing off - -commit 25f4735427c623cc60b12f828ab4d5d6d5df205d -Author: eugenevinitsky -Date: Thu Apr 19 14:36:23 2018 -0700 - - updated action to generate a change in max speed rather than a max speed, this prevents sharp accelerations - -commit dc55313245a3cf47f2062b1c5a0f820216d04216 -Merge: aa527e3d 8638b97b -Author: AboudyKreidieh -Date: Wed Apr 18 20:34:17 2018 -0700 - - Merge pull request #407 from cathywu/clutter_removal - - Clutter removal - - changes: - - removed superfluous or unused environments, scenarios, generators, examples - - renames `two_loops_one_merging_new` --> `two_loops_one_merging` - - pep8 to tests - - removed examples: - - rllab/two_lane_mixed.py - - rllab/two_way_intersection.py - - rllib/two_loops_straight_merge.py - - sumo/two_lane_change_changer.py - - sumo/two_loops_merge.py - - sumo/two_way_intersection.py - - removed environments: - - AccelPOEnv - - TwoIntersectionEnv - - removed scenarios/generators: - - two_loops_one_merging - - intersection - -commit 8638b97b7b01fb74857c25fbe1bd4b1ee8727d53 -Merge: f78f0c2d aa527e3d -Author: AboudyKreidieh -Date: Wed Apr 18 17:49:18 2018 -0700 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic into clutter_removal - -commit 8d3705bda9b14d705422bcd20e8e871d400c0e83 -Author: eugenevinitsky -Date: Wed Apr 18 17:39:15 2018 -0700 - - removed print statement - -commit 203371543458a7de1cfa46e8cf923ad7f1128377 -Merge: ab74597e 318437bb -Author: eugenevinitsky -Date: Wed Apr 18 17:33:47 2018 -0700 - - working lane changes tried out fix to race condition - -commit aa527e3d1e463b10cda96547ef8c5b19f5794724 -Merge: c7887e77 02983458 -Author: AboudyKreidieh -Date: Wed Apr 18 15:02:20 2018 -0700 - - Merge pull request #378 from cathywu/gui_colors - - Gui colors - - the main purpose behind this PR is to incorporate the colors we decided to standardize on for all visualizations. - - color choices: - - red: autonomous (rl) vehicles - - white: unobserved vehicles - - cyan: observed vehicles - - grey: background - - changes: - - updated documentation for the base generator class - - added default colors for the background in the generator, and for the vehicles in base_env - - added a method to the vehicles class to specify which vehicles are observed, and accordingly which should be colored blue - - started incorporating which vehicle are observed in the different environments (namely the envs in `loop_accel`, `lane_changing`, and `wave_attenuation`) - - modified the env in `wave_attenuation` to use the new warmup steps method instead of what it previously did. the effect is the same, but this is needed to start the colors off correctly - -commit ab74597e8bfa4efbb7c914b33accbb08375b6e38 -Author: eugenevinitsky -Date: Wed Apr 18 10:27:39 2018 -0700 - - cleanup - -commit 9687b922ed595c76439b410221af1b990c57ae56 -Author: eugenevinitsky -Date: Wed Apr 18 10:14:52 2018 -0700 - - update - -commit fa988bffb611965c9523b9910944c24591a4a6f8 -Author: AboudyKreidieh -Date: Tue Apr 17 12:21:59 2018 -0700 - - updates to visualizer_rllab - -commit 4f7742742aa3a32aeb07e076cb48ac29c5643920 -Author: AboudyKreidieh -Date: Mon Apr 16 21:18:00 2018 -0700 - - doc fix - -commit f0e9bdd65a6a261bfd954c0c38a0db5c97a33ed9 -Author: AboudyKreidieh -Date: Mon Apr 16 21:05:19 2018 -0700 - - documentation for params - -commit b2a19ef21f871c40f1a546fe5445a4d9d5c6eee8 -Author: AboudyKreidieh -Date: Mon Apr 16 20:59:01 2018 -0700 - - modified documentation for scenarios - -commit 20692f755675935dbb6e46a8983605ed5430964d -Author: AboudyKreidieh -Date: Mon Apr 16 19:28:09 2018 -0700 - - cleaned up controllers - -commit f78f0c2d9c88dc8b1c078156cb23826513bf82f3 -Author: AboudyKreidieh -Date: Mon Apr 16 18:57:14 2018 -0700 - - removed intersection scenario - -commit 747c49fcbda0a111bd008a3ad7161661c3512fc9 -Merge: 87beff42 c7887e77 -Author: AboudyKreidieh -Date: Mon Apr 16 18:49:00 2018 -0700 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic into clutter_removal - -commit 87beff4207b107e57182b036d3916b54ab1a0979 -Author: AboudyKreidieh -Date: Mon Apr 16 18:47:42 2018 -0700 - - renamed two_loops_one_merging_new -> two_loops_one_merging - -commit c7887e77975620d726de6935bc4156003e19f956 -Merge: 4d868161 ace98e3d -Author: eugenevinitsky -Date: Mon Apr 16 14:39:34 2018 -0700 - - Merge pull request #395 from cathywu/docker_pull - - Docker file w/ updated gym and sumo install - -commit 4d8681615aa40a095906f488e426d890216831b7 -Merge: ade03f93 cd0616cd -Author: eugenevinitsky -Date: Mon Apr 16 14:38:26 2018 -0700 - - Merge pull request #402 from cathywu/restart_fix - - fixed a bug in restarts when there are inflows - -commit 318437bb7496a90d308f62c106d063a9e0dfc782 -Merge: b01b540c 1d862174 -Author: Nishant -Date: Sun Apr 15 19:10:02 2018 -0700 - - pulling in velocity_bottleneck - -commit b01b540c676c2c49dc8b417a4a02718ec2167054 -Author: Nishant -Date: Sun Apr 15 19:07:22 2018 -0700 - - lane by lane experiment changes - -commit 8c1bfe5226bfb72ae024b48ccf1b8e6ff36dc7b7 -Author: Nishant -Date: Sat Apr 14 15:55:03 2018 -0700 - - lane by lane experiments - -commit 081dded55de9fe6a92c0fae3c8ece6f589b6031d -Author: Nishant -Date: Sat Apr 14 15:49:45 2018 -0700 - - fixing action space and stuff - -commit 1d862174ed4cea1304026e2ee5cea45bf9e7b1ca -Merge: c6942456 cb30ac8c -Author: eugenevinitsky -Date: Sat Apr 14 15:41:54 2018 -0700 - - merged - -commit 2bc704a3465a9e5ab0e7961031d89d1c994256e7 -Author: Nishant -Date: Sat Apr 14 15:27:02 2018 -0700 - - removed debug statement - -commit c6942456d9cebe0895acfee79a1069ca83107d7d -Author: eugenevinitsky -Date: Sat Apr 14 15:26:29 2018 -0700 - - changed bottleneck length - -commit a70636e01767c274e78fee32c6e26749308930ef -Merge: 530fc204 42291b10 -Author: Nishant -Date: Sat Apr 14 15:22:33 2018 -0700 - - Merge branch 'vel_early_lc' of github.com:cathywu/learning-traffic into vel_early_lc - -commit 530fc2047c7563f57634bebc95297daba1316d0a -Author: Nishant -Date: Sat Apr 14 15:22:19 2018 -0700 - - changed lane by lane control - -commit 42291b10cfd30b171ae634cbbdadc0c99a258d09 -Author: Kathy Jang -Date: Sat Apr 14 15:21:39 2018 -0700 - - Added documentation for apply_rl_actions - -commit f3b47761dd16c90961cb99d4f2bd5b99e5154535 -Author: Nishant -Date: Sat Apr 14 15:16:54 2018 -0700 - - updates - -commit 169fca76605958a67df11be39105b6b5c2c5e4fd -Author: Nishant -Date: Sat Apr 14 14:28:46 2018 -0700 - - fixed action space bug - -commit 042cd5ccd5ee54a707d1f6c33318d4a37317ee3a -Merge: cce2939f 02983458 -Author: eugenevinitsky -Date: Sat Apr 14 12:38:14 2018 -0700 - - Merge branch 'gui_colors' of https://github.com/cathywu/learning-traffic into velocity_bottleneck - -commit 39c068f3b0f64b5c7456ac6a30e9698d2aaeb76c -Author: Nishant -Date: Sat Apr 14 10:40:04 2018 -0700 - - eugene's better reward function - -commit cce2939f536b73234b90f2eaf09efeff2fb2fa6a -Merge: 7200fd0c cd0616cd -Author: eugenevinitsky -Date: Sat Apr 14 10:26:46 2018 -0700 - - Merge branch 'restart_fix' of https://github.com/cathywu/learning-traffic into velocity_bottleneck - -commit 5c1b3d7b8b8bd5a961277182b9e8cc69f2e6199c -Author: Nishant -Date: Sat Apr 14 10:16:07 2018 -0700 - - minor - -commit 85200d41469c72a3504853d36ce1b79af76b8df2 -Merge: 4362b719 cb30ac8c -Author: Nishant -Date: Sat Apr 14 00:34:04 2018 -0700 - - Merge branch 'velocity_bottleneck' of github.com:cathywu/learning-traffic into vel_early_lc - -commit 4362b719678d46f1523b8794add81f5cfb218278 -Merge: bdd2be8c 5b043a29 -Author: Nishant -Date: Sat Apr 14 00:33:53 2018 -0700 - - Merge branch 'velocity_bottleneck' of github.com:cathywu/learning-traffic into vel_early_lc - -commit cb30ac8c2cca0b5a6069745c1f8c49b46206748d -Author: Kanaad Parvate -Date: Fri Apr 13 23:18:02 2018 -0700 - - fixed outlfow printing - -commit 9e464da709e0bfff72b952a9517641ec5a2943fd -Author: Kanaad Parvate -Date: Fri Apr 13 23:09:20 2018 -0700 - - density exp - -commit 5b043a29638c2c88bec16af4748ae65181f790ae -Author: Kanaad Parvate -Date: Fri Apr 13 22:56:13 2018 -0700 - - updating density exp and velocity bottleneck to reflect original experiments - -commit bdd2be8c1006f79d6ad42cb4bba6f22b0a4303df -Merge: 4dad270e 7200fd0c -Author: Nishant -Date: Fri Apr 13 22:54:52 2018 -0700 - - Merge branch 'velocity_bottleneck' of github.com:cathywu/learning-traffic into vel_early_lc - -commit 4dad270e79a5009858a1aa3047da551f8f9f1bbf -Author: Nishant -Date: Fri Apr 13 22:54:48 2018 -0700 - - grid search changes - -commit 7200fd0c1f0137618ddbe251ebd9e6ef14f0e5c9 -Merge: 9983d223 36755919 -Author: eugenevinitsky -Date: Fri Apr 13 22:26:38 2018 -0700 - - Merge branch 'velocity_bottleneck' of https://github.com/cathywu/learning-traffic into velocity_bottleneck - -commit 9983d223b1381c6c2f069656c98101701bf03651 -Author: eugenevinitsky -Date: Fri Apr 13 22:26:30 2018 -0700 - - added new states to state space - -commit f4de154e3245ebae1b4d9351dc687ad5edb7fe71 -Author: Nishant -Date: Fri Apr 13 22:25:50 2018 -0700 - - changed apply_rl_actins - -commit 554453c44e228ad1e5d0a0052f28b7e9e48d9647 -Merge: 0e2b2dab 36755919 -Author: Nishant -Date: Fri Apr 13 21:54:16 2018 -0700 - - Merge branch 'velocity_bottleneck' of github.com:cathywu/learning-traffic into vel_early_lc - -commit 0e2b2dab034337d0fe4b5b4216ba47b86364c048 -Author: Nishant -Date: Fri Apr 13 21:54:14 2018 -0700 - - small updates - -commit 367559192b70f3a79b05aef9097fa334fc0c68be -Author: Kanaad Parvate -Date: Fri Apr 13 21:02:54 2018 -0700 - - use ray - -commit 2d6609ea18d804d9a6f5a6c123d2c7fc000a0873 -Author: Kanaad Parvate -Date: Fri Apr 13 21:01:30 2018 -0700 - - change to sumo from sumo-gui - -commit 2e290619be2a88b218f9a606b7f58d2ff06253ef -Author: Kanaad Parvate -Date: Fri Apr 13 21:00:15 2018 -0700 - - changeed to probabiltiy, enabled sumo restarts - -commit 12b5bcd0425cbf4e60a09f693d7de26007ec5834 -Merge: 0c8d88bb cc748d4a -Author: Nishant -Date: Fri Apr 13 20:51:58 2018 -0700 - - Merge branch 'velocity_bottleneck' of github.com:cathywu/learning-traffic into vel_early_lc - -commit cc748d4afac28c889788d5b1a0b482d91c5a28d3 -Author: Kanaad Parvate -Date: Fri Apr 13 20:19:15 2018 -0700 - - density experiment - -commit 0c8d88bb6f03868072e83c12653144744d516ef3 -Merge: 5b9e33b1 53cdae88 -Author: Nishant -Date: Fri Apr 13 20:19:05 2018 -0700 - - Merge branch 'velocity_bottleneck' of github.com:cathywu/learning-traffic into vel_early_lc - -commit 5b9e33b1010574141a8e7e8f5af48f052681841f -Merge: ae199085 61ce8254 -Author: Nishant -Date: Fri Apr 13 20:19:02 2018 -0700 - - merging - -commit 53cdae880ac3b6e73d36d40e73a608d47f228caf -Merge: fb2a248e 61ce8254 -Author: Kanaad Parvate -Date: Fri Apr 13 20:18:31 2018 -0700 - - Merge branch 'velocity_bottleneck' of https://github.com/cathywu/learning-traffic into velocity_bottleneck - -commit fb2a248e641ab552762c9d5eb18d5b38e404a8fc -Author: Kanaad Parvate -Date: Fri Apr 13 20:18:19 2018 -0700 - - remove print statements - -commit ae1990853b24d167ae223906d03f1a52a5656094 -Author: Nishant -Date: Fri Apr 13 20:08:04 2018 -0700 - - adding grid search script - -commit a1dff54f97bd4c37560afd62d75e5c67bcbaf24d -Author: Nishant -Date: Fri Apr 13 20:07:50 2018 -0700 - - deleting random file and editing K to Kp - -commit 61ce8254af930a476ac6e064495c8817b212577e -Merge: 11a1481b 55f6934e -Author: eugenevinitsky -Date: Fri Apr 13 20:07:45 2018 -0700 - - Merge branch 'velocity_bottleneck' of https://github.com/cathywu/learning-traffic into velocity_bottleneck - -commit 11a1481b7f8ff05129ee5887774b7e9170dff49d -Author: eugenevinitsky -Date: Fri Apr 13 20:07:36 2018 -0700 - - removed print - -commit 55f6934ea63791c6af3887906eea6fe823926c9c -Author: Kanaad Parvate -Date: Fri Apr 13 20:05:08 2018 -0700 - - remove discount - -commit 04207ee4163f63c72740b8922865dabe75842746 -Merge: e96085ba ca091a75 -Author: Kanaad Parvate -Date: Fri Apr 13 19:57:47 2018 -0700 - - Merge branch 'velocity_bottleneck' of https://github.com/cathywu/learning-traffic into velocity_bottleneck - -commit e96085bac1fb638288577b1115ef7060d3a7faab -Author: Kanaad Parvate -Date: Fri Apr 13 19:57:27 2018 -0700 - - added sumo params to base controller - -commit ca091a75351b0884f9a7027df6f2fdb823b4d5ee -Merge: b137a836 fd7cbffc -Author: eugenevinitsky -Date: Fri Apr 13 19:50:33 2018 -0700 - - Merge branch 'velocity_bottleneck' of https://github.com/cathywu/learning-traffic into velocity_bottleneck - -commit b137a8363be903a938d8751406ec16e680f262d2 -Author: eugenevinitsky -Date: Fri Apr 13 19:50:23 2018 -0700 - - changed to tsumo controllers - -commit 7cdc36b0a177d45c00fb423436aa3b4d1291d01a -Author: Nishant -Date: Fri Apr 13 19:40:37 2018 -0700 - - updating feedback controller experiment - -commit a76733cdc299e473ac78d513e061570bfefe3b63 -Merge: bbfe4b34 fd7cbffc -Author: Nishant -Date: Fri Apr 13 19:35:37 2018 -0700 - - Merge branch 'velocity_bottleneck' of github.com:cathywu/learning-traffic into vel_early_lc - -commit fd7cbffc0108cd58f6d121fd317c515858366f16 -Author: Kanaad Parvate -Date: Fri Apr 13 19:35:15 2018 -0700 - - feedback controller - -commit bd5cdf0a4c5ac81ed8e9f5fdc9931464a6823768 -Merge: dc9f5921 4374f317 -Author: eugenevinitsky -Date: Fri Apr 13 19:29:22 2018 -0700 - - update - -commit dc9f592180edf428c232b4d7605d82bea498eba7 -Merge: 2a7c961d c028e578 -Author: eugenevinitsky -Date: Fri Apr 13 19:27:18 2018 -0700 - - Merge branch 'velocity_bottleneck' of https://github.com/cathywu/learning-traffic into velocity_bottleneck - -commit 4374f3170aa68316014f8ea92074f8eb5882a112 -Author: eugenevinitsky -Date: Fri Apr 13 19:26:48 2018 -0700 - - update - -commit bbfe4b34ae9d985837e1498d43704df91342e6b1 -Merge: 598d9936 c028e578 -Author: Nishant -Date: Fri Apr 13 19:02:33 2018 -0700 - - Merge branch 'velocity_bottleneck' of github.com:cathywu/learning-traffic into vel_early_lc - -commit 598d99369abc59a52273251e3f00d8d84aba25bf -Author: Nishant -Date: Fri Apr 13 19:02:29 2018 -0700 - - updated default - -commit c028e57858e30a3b5f5666b83590eff16b354387 -Merge: 3156a451 36386aa8 -Author: Kanaad Parvate -Date: Fri Apr 13 19:00:53 2018 -0700 - - Merge branch 'velocity_bottleneck' of https://github.com/cathywu/learning-traffic into velocity_bottleneck - -commit 3156a4510710650e03fc77e1d98e549008e00125 -Author: Kanaad Parvate -Date: Fri Apr 13 19:00:14 2018 -0700 - - updated velocity bottleneck code - -commit 3e394f36ec8bb03a7a6de3cadfb21dfc9e632c89 -Merge: 4ee9d567 36386aa8 -Author: Nishant -Date: Fri Apr 13 18:00:26 2018 -0700 - - merging in velocity_bottleneck - -commit e5188f640f2ca46646aefd52e2a79c0c0dfd15a0 -Author: eugenevinitsky -Date: Fri Apr 13 16:16:37 2018 -0700 - - returned to old traci connection method - -commit 04bee509241524246119a52bedc6ed19fb2689c2 -Author: eugenevinitsky -Date: Fri Apr 13 16:01:43 2018 -0700 - - minor - -commit 5fca44bb1a847a1fdb03d1f42431c58656c4b7b2 -Author: eugenevinitsky -Date: Fri Apr 13 15:57:16 2018 -0700 - - update - -commit 2a7c961dd2048e186694944ed753fc9dfdc42a2b -Author: eugenevinitsky -Date: Fri Apr 13 15:37:08 2018 -0700 - - fix to hang error hopefully - -commit 36386aa80b34a7ef4a02a825a0849cc008390e2d -Author: eugenevinitsky -Date: Fri Apr 13 14:57:19 2018 -0700 - - rescaled inflows - -commit 4ee9d5670b60c175b3af0f7162153bdb2f92f194 -Merge: 3d2431ae 3ca9b7a2 -Author: Nishant -Date: Fri Apr 13 00:50:22 2018 -0700 - - merging in velocity_bottleneck - -commit 3d2431ae73265dc55676f3e8f8be1d4d98e28eb6 -Author: Nishant -Date: Fri Apr 13 00:32:13 2018 -0700 - - sending None command when out of controlled edge set - -commit 9313db7c17a0adac3175a598fb5d9727a52032a1 -Author: eugenevinitsky -Date: Thu Apr 12 18:13:10 2018 -0700 - - changed AV frac - -commit ace98e3d954228a397d9aa999822a4662d8d3b01 -Merge: f5a5d5fd 69961770 -Author: Eugene -Date: Thu Apr 12 17:48:14 2018 -0700 - - merged - -commit f5a5d5fda6a1601c1079b4c1a2f16f6534856553 -Author: Eugene -Date: Thu Apr 12 17:46:56 2018 -0700 - - added working patch - -commit 3ca9b7a2841918f0eb31e1aed26004f7c80bf128 -Author: eugenevinitsky -Date: Thu Apr 12 16:57:47 2018 -0700 - - 75 p avs - -commit 2d2b4080077ef204dba23e9d820849cce8696ce0 -Author: eugenevinitsky -Date: Thu Apr 12 16:27:23 2018 -0700 - - temp - -commit 41a187d7cc340ccaa21141249feaeac45ad4efb3 -Author: eugenevinitsky -Date: Thu Apr 12 15:20:36 2018 -0700 - - update - -commit aa8a422d583b433f83eec6bdcb55e1a94cf5841c -Author: eugenevinitsky -Date: Thu Apr 12 15:19:59 2018 -0700 - - made it so you dont have to control every edge - -commit 02983458e8520530b8dca669e3f6c7575d26eb6b -Merge: 87da3f9e ade03f93 -Author: AboudyKreidieh -Date: Thu Apr 12 11:59:06 2018 -0700 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic into gui_colors - -commit 09bfc314d4782e30983bb3096eb2f3a65719203a -Author: AboudyKreidieh -Date: Thu Apr 12 11:54:18 2018 -0700 - - more clutter removal - -commit 64fe0d4a800235c47646efa804e810ff878ad1df -Author: eugenevinitsky -Date: Thu Apr 12 10:48:13 2018 -0700 - - temp update - -commit bfda33759945a2e4ce8190c0c9efac1b46ba7fd5 -Author: eugenevinitsky -Date: Thu Apr 12 01:25:30 2018 -0700 - - fixes to visualizer rllib - -commit 1807107dc3e420a956b4a7ea7865bc63f46e361e -Author: eugenevinitsky -Date: Wed Apr 11 19:43:50 2018 -0700 - - update - -commit 060e52d523a93b6ded48b99133f37f87a9c858b2 -Author: eugenevinitsky -Date: Wed Apr 11 19:27:13 2018 -0700 - - update - -commit 070637e7bc92d9a5afb7824185166f4f735f5252 -Author: eugenevinitsky -Date: Wed Apr 11 19:25:30 2018 -0700 - - update for run - -commit f7934519617ef7261cc8043df8e51ceb7b781dc7 -Merge: 4110483b 1a435c2e -Author: eugenevinitsky -Date: Wed Apr 11 19:05:20 2018 -0700 - - Merge branch 'velocity_bottleneck' of https://github.com/cathywu/learning-traffic into velocity_bottleneck - -commit 4110483be0bbf9de75ac84b45ceda6f59a2c1b57 -Author: eugenevinitsky -Date: Wed Apr 11 19:05:09 2018 -0700 - - fixed rllib visualizer to read out flow params from the env config - -commit b22765832991b4a1c02bd76475acf5da251e50b8 -Author: eugenevinitsky -Date: Wed Apr 11 18:10:41 2018 -0700 - - temp - -commit 7547b0e0cf18e07527d4143f67ce6d885aeb8e2f -Author: AboudyKreidieh -Date: Wed Apr 11 17:23:33 2018 -0700 - - removed two_loops_one_merging and repurposed its tests for two_loops_one_merging_new - -commit 3da6b574482d9fbf9615236d1e4b076cc6a204c3 -Author: AboudyKreidieh -Date: Wed Apr 11 17:10:27 2018 -0700 - - more clutter removal - -commit f4dd1d4125eec805a224750b1c5737ecf2a75fe9 -Author: AboudyKreidieh -Date: Wed Apr 11 17:03:19 2018 -0700 - - deleted two way intersection and pep8 to tests - -commit cd0616cd7bb01f77ff5f2428bfcec6c493610f1a -Author: AboudyKreidieh -Date: Wed Apr 11 14:34:51 2018 -0700 - - fixed a bug in restarts when there are inflows - -commit 2d67710c817c5396bf0c5721e62f3e5aee2f7b67 -Merge: ccb91895 1a435c2e -Author: Nishant -Date: Wed Apr 11 12:43:11 2018 -0700 - - Merge branch 'velocity_bottleneck' of github.com:cathywu/learning-traffic into vel_early_lc - -commit 2f05a0117b3323d5f4f03c3cf9b784ab07703138 -Author: eugenevinitsky -Date: Wed Apr 11 12:23:14 2018 -0700 - - temp - -commit 63d685c09b060ef9a9061b1cc52b77bde3d62e80 -Author: AboudyKreidieh -Date: Wed Apr 11 12:05:56 2018 -0700 - - PR fix - -commit 1a435c2e32bd8918ec06f02808814a2c31df7420 -Author: eugenevinitsky -Date: Wed Apr 11 11:31:39 2018 -0700 - - Update velocity_bottleneck.py - -commit 230e7c642859d84ffec47b1cedf2e5522f90e188 -Merge: 3ab731dd ade03f93 -Author: eugenevinitsky -Date: Wed Apr 11 11:28:13 2018 -0700 - - Merge branch 'master' into velocity_bottleneck - -commit 0e7c6f952ef3655af49231b8b58da87a0c01f05b -Merge: 8687f006 3ab731dd -Author: eugenevinitsky -Date: Wed Apr 11 11:24:29 2018 -0700 - - Merge branch 'velocity_bottleneck' of https://github.com/cathywu/learning-traffic into velocity_bottleneck - -commit 8687f006101c25338636d794e941673a80ac0dce -Merge: 128b9d4f ade03f93 -Author: eugenevinitsky -Date: Wed Apr 11 11:24:18 2018 -0700 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic into velocity_bottleneck - -commit f42de9d03929c78fd9558a4bf84505c0d5970da3 -Merge: 02b00ef8 ade03f93 -Author: eugenevinitsky -Date: Wed Apr 11 02:12:33 2018 -0700 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic - -commit 21ec89d841fa1956a89e269e45ecbf1ca8909225 -Author: Eugene -Date: Wed Apr 11 01:54:55 2018 -0700 - - upgrade - -commit 3ab731dd043b66aaf3295db5cb7fa87bd4f6e5ce -Author: Kanaad Parvate -Date: Wed Apr 11 00:26:42 2018 -0700 - - added settling time scripts, and tweaked hand tuned controller - -commit 64225fea89883af83ce55356a3259e5c5c007e9c -Merge: d048a22a 433460ab -Author: Kanaad Parvate -Date: Wed Apr 11 00:25:26 2018 -0700 - - merge bottleneck - -commit 546777f008812d1bd1113cdcf7e8a3154284b0ad -Author: Eugene -Date: Wed Apr 11 00:19:30 2018 -0700 - - working docker file as of april - -commit ccb918955abe0b59fc898f79db7afa6f11d03e8a -Author: Nishant -Date: Wed Apr 11 00:15:30 2018 -0700 - - supporting default velocity for rl vehicles leaving controlled edges and lanes - -commit f001dabe1fac7f70918bf206c86b26239399dee1 -Merge: 24afdfe3 433460ab -Author: Nishant -Date: Tue Apr 10 22:06:03 2018 -0700 - - merging in velocity_bottleneck - -commit 24afdfe30c300c54cb311d4a76c12d885b5eb78f -Merge: 32850478 ade03f93 -Author: Nishant -Date: Tue Apr 10 20:28:52 2018 -0700 - - Merge branch 'master' of github.com:cathywu/learning-traffic into vel_early_lc - -commit 128b9d4fb39b7e58177254b3a902d2fcd0974cd4 -Author: eugenevinitsky -Date: Tue Apr 10 18:46:04 2018 -0700 - - moved flow params to json config - -commit 16a112d25b9b2ee42c2f6959bd651904377603c7 -Author: eugenevinitsky -Date: Tue Apr 10 18:07:10 2018 -0700 - - minor - -commit ade03f93699000be783c9bafe10f01dd8a2e6e8b -Merge: 393a8e40 4296a202 -Author: eugenevinitsky -Date: Tue Apr 10 15:36:12 2018 -0700 - - Merge pull request #392 from cathywu/rllib_update - - Rllib update - -commit 699617702f19beb0d61c8dc1da1be9e2366088b3 -Author: eugenevinitsky -Date: Tue Apr 10 15:34:20 2018 -0700 - - working dockerfile - -commit 433460ab656c7bc3be7e1b77b0ce151f2f2149ed -Author: eugenevinitsky -Date: Mon Apr 9 22:46:19 2018 -0700 - - simplified visualizer choice for rllib run script - -commit cbdd1b11c817a9753ac6e7d18304a6437c796103 -Author: eugenevinitsky -Date: Mon Apr 9 22:37:59 2018 -0700 - - normalize - -commit 8bd6fa8ad96053a87f77a1976627bd6ea7e5f541 -Author: eugenevinitsky -Date: Mon Apr 9 22:34:00 2018 -0700 - - changed net - -commit 3dd556265901221174f086082e15662f1dca58b2 -Author: eugenevinitsky -Date: Mon Apr 9 22:31:35 2018 -0700 - - added mean segment speed to state space - -commit 328504780928611f9fffcd500ee6c7b490446a81 -Author: Nishant -Date: Mon Apr 9 22:11:58 2018 -0700 - - added support for different desired velocity per lane within a segment - -commit 945eea815ffbc996368b96213a2f2d0342a70214 -Author: eugenevinitsky -Date: Mon Apr 9 22:06:04 2018 -0700 - - fixed rllib visualizer script - -commit eeb8596cb5de85bdd829e78cfae91a89bcd65da7 -Author: eugenevinitsky -Date: Mon Apr 9 21:50:55 2018 -0700 - - semi working visualizer - -commit 9898b7ebd10c7b2ee47fbec59e1464ce32e3f95f -Author: Eugene -Date: Mon Apr 9 20:34:37 2018 -0700 - - minor - -commit 346ec9a96fb888d24b9f25938722a530fe84d62a -Author: Nishant -Date: Mon Apr 9 19:26:23 2018 -0700 - - more bottleneck & early lane-change related reward functions - -commit e1186f935a9eb9aabd556bcf1499ed298717b336 -Author: eugenevinitsky -Date: Mon Apr 9 17:56:28 2018 -0700 - - update - -commit c5c51492c199e4a47fd5d585d07dfe899db4a67c -Author: eugenevinitsky -Date: Mon Apr 9 17:56:11 2018 -0700 - - update - -commit 8d655d7b7b06bef4554db577fb7d12beddcd1477 -Author: eugenevinitsky -Date: Mon Apr 9 17:53:45 2018 -0700 - - actions werent being clipped! - -commit be741527c8c44dbcacafdcdb6aa679c6e4e4a0d6 -Author: eugenevinitsky -Date: Mon Apr 9 17:43:01 2018 -0700 - - fixed bug - -commit 034e467506caf4cfcc039bcf398f9b383a0eb126 -Author: eugenevinitsky -Date: Mon Apr 9 17:34:04 2018 -0700 - - minor - -commit 7d8f6b2284bde9cca33574669c0d521804320788 -Author: eugenevinitsky -Date: Mon Apr 9 17:32:34 2018 -0700 - - added more vehicles - -commit dbd0babbb46a505cf3ec65022f926d48d5e4871b -Author: eugenevinitsky -Date: Mon Apr 9 17:17:53 2018 -0700 - - update - -commit b6290021690561266d275384f6c8dc138254613f -Author: eugenevinitsky -Date: Mon Apr 9 17:13:13 2018 -0700 - - edit - -commit 85a8a77bef43c66ac178bd93fac097543dde0b7a -Author: eugenevinitsky -Date: Mon Apr 9 16:21:32 2018 -0700 - - update - -commit 5c2c2ab4ab22da96cc29b10ebc9ebb83684a6e5e -Author: eugenevinitsky -Date: Mon Apr 9 16:20:13 2018 -0700 - - update - -commit fbb26857fc6ad696220a4372837c4464c0ae7c21 -Author: eugenevinitsky -Date: Mon Apr 9 16:19:27 2018 -0700 - - normalized - -commit b1e1f9e0be449fe6815d61969961b595c2623dde -Author: Nishant -Date: Mon Apr 9 15:29:49 2018 -0700 - - more stuff with lanes - -commit ea93ac117a1e5334772d65ce425b5cf89eea1f22 -Author: eugenevinitsky -Date: Mon Apr 9 15:24:13 2018 -0700 - - update - -commit ddbb9b6725d9aa7440e23075dc9e05386c7da635 -Author: eugenevinitsky -Date: Mon Apr 9 14:49:10 2018 -0700 - - upgrade - -commit 419bb6f5b4038242afff73facafab71ed4e71924 -Author: eugenevinitsky -Date: Mon Apr 9 13:30:05 2018 -0700 - - update - -commit b647237e2cdbe317da8334c5f89d04b8555cb5f7 -Author: eugenevinitsky -Date: Mon Apr 9 13:20:46 2018 -0700 - - ready for pull request - -commit 82edf39f6a880986419cd678b339c44e7fc11418 -Author: eugenevinitsky -Date: Mon Apr 9 08:36:10 2018 -0700 - - need to restart sumo - -commit 6f4a48d0c20d45b2583277299462bf787f2f5bf2 -Author: Nishant -Date: Mon Apr 9 01:09:30 2018 -0700 - - changed env to control only one edge and also outside lanes only - -commit b6d7a99a3c813c6e4af9176e6c4e181574f0bca7 -Author: eugenevinitsky -Date: Mon Apr 9 00:34:43 2018 -0700 - - updated horizon - -commit 45106600b81fa2f11f08797a8bd6b2183d27832f -Author: eugenevinitsky -Date: Mon Apr 9 00:33:51 2018 -0700 - - normalizing - -commit 6f37ef5a953bb9f50e03fa63f7c24bcce0be4ee3 -Author: eugenevinitsky -Date: Mon Apr 9 00:29:14 2018 -0700 - - normalized the vehicles - -commit 12651a6b2901e616dd7e083796a61cfffb99cffd -Author: eugenevinitsky -Date: Mon Apr 9 00:06:17 2018 -0700 - - minor update - -commit 592bd4ebda45b9e375e74b49a65ae9f049d3eee4 -Author: eugenevinitsky -Date: Sun Apr 8 23:32:49 2018 -0700 - - added outflow reward - -commit 514d664ddf856d220e8518c163981f2ec54ba82d -Author: eugenevinitsky -Date: Sun Apr 8 22:56:17 2018 -0700 - - quieted rollouts - -commit d6f678ffa2de4616f06e5a618cd2a1a680b5d474 -Merge: b27dab11 06d968e7 -Author: eugenevinitsky -Date: Sun Apr 8 22:53:30 2018 -0700 - - Merge branch 'print_warnings' into velocity_bottleneck - -commit 06d968e7cbbb61a12a7e2dbfe92c41de6497906f -Author: eugenevinitsky -Date: Sun Apr 8 22:53:19 2018 -0700 - - added ability to silence warnings - -commit b27dab110286738ac883adcfb33eb1916b6f4644 -Author: eugenevinitsky -Date: Sun Apr 8 22:29:52 2018 -0700 - - updated autoscaler script - -commit a0468182b54067657fad3da31f5b4a509c7217ad -Author: eugenevinitsky -Date: Sun Apr 8 22:15:03 2018 -0700 - - update - -commit ee87a31a55b86b935b85a2ef4480643a47d9c5c9 -Merge: 8e5e5024 02b00ef8 -Author: eugenevinitsky -Date: Sun Apr 8 22:13:14 2018 -0700 - - Merge branch 'master' into velocity_bottleneck - -commit 02b00ef8927b553aef51ec5ac152601776d3918c -Merge: d982b6df 393a8e40 -Author: eugenevinitsky -Date: Sun Apr 8 22:13:03 2018 -0700 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic - -commit 8e5e5024222e4b4caaaa1228d9a11991ef1c69b5 -Author: eugenevinitsky -Date: Sun Apr 8 22:12:56 2018 -0700 - - update - -commit 3aa9d2d96e7b6384090ffa7b65b031f01a973884 -Author: eugenevinitsky -Date: Sun Apr 8 22:10:57 2018 -0700 - - changed safety so it can be active when needed - -commit b6d16ccd8999075439608bc641babcf3da7332ad -Author: eugenevinitsky -Date: Sun Apr 8 19:32:59 2018 -0700 - - update - -commit 45f1b24262aacab2c18884b5a457da9531372fc9 -Author: eugenevinitsky -Date: Sun Apr 8 18:46:48 2018 -0700 - - update - -commit 61c698bbec6718fcb4e65fc6fa7b61df95c40934 -Author: eugenevinitsky -Date: Sun Apr 8 18:44:01 2018 -0700 - - added safe velocity - -commit 723700e09f87daac9de2e5bb947f472a629ba7df -Author: eugenevinitsky -Date: Sun Apr 8 18:34:11 2018 -0700 - - update - -commit eaf34a37e3ac76567445449432c6aef4206b7211 -Author: eugenevinitsky -Date: Sun Apr 8 18:25:42 2018 -0700 - - update - -commit f72214b461730db5454ef9898bcf3657ed6ae260 -Author: eugenevinitsky -Date: Sun Apr 8 18:18:50 2018 -0700 - - update - -commit 747d7de8d4604d8391db548b098f7a509af46979 -Author: eugenevinitsky -Date: Sun Apr 8 18:14:01 2018 -0700 - - update - -commit 3db123351f5714b47d064e65842871682e386899 -Merge: 1b166bd5 479c4025 -Author: eugenevinitsky -Date: Sun Apr 8 18:11:27 2018 -0700 - - merged - -commit 1b166bd52e598e6f4bdde4dea04f127e6c779a54 -Author: eugenevinitsky -Date: Sun Apr 8 18:10:33 2018 -0700 - - updated rllib bottleneck script - -commit d048a22a78e81f89cc6110587f4a1d354532fcda -Author: Kanaad Parvate -Date: Sun Apr 8 17:44:36 2018 -0700 - - more progress - -commit 0737d7ee7390d9e69a4d114f9847f1d6f5b1a7bf -Merge: 8f8d8923 144fbb27 -Author: Kanaad Parvate -Date: Sun Apr 8 16:35:48 2018 -0700 - - Merge branch 'rl_early_merge' into velocity_bottleneck - -commit 8f8d8923161a668ea3d996e92967fbed565ec703 -Author: Kanaad Parvate -Date: Sun Apr 8 16:12:15 2018 -0700 - - progress - -commit 4b183359fe886808c986cd9117f8dd7edcabc320 -Merge: 3f9cc664 4296a202 -Author: eugenevinitsky -Date: Sun Apr 8 15:42:05 2018 -0700 - - Merge branch 'rllib_update' into velocity_bottleneck - -commit 479c4025db367e5b0cc04e0927c527b95651e201 -Merge: d95efaac 393a8e40 -Author: Kanaad Parvate -Date: Sun Apr 8 15:36:09 2018 -0700 - - Merge branch 'master' into velocity_bottleneck - -commit d95efaac1269c5302daa3ec183782ec3e90d1b43 -Merge: a75c747b 12949ec0 -Author: Kanaad Parvate -Date: Sun Apr 8 15:33:25 2018 -0700 - - Merge branch 'fixing_accel' into velocity_bottleneck - -commit 4296a202182abd7b012ed4e89921abaf9eedba6b -Author: eugenevinitsky -Date: Sun Apr 8 15:29:05 2018 -0700 - - swapped gym version - -commit 3f9cc664702713a02b5d5d8fda3efecc5c33b267 -Author: eugenevinitsky -Date: Sun Apr 8 15:28:45 2018 -0700 - - started rllbi script for velocity bottleneck - -commit c3f5a02ca96f6fc7e163b0221f09922ce9ac4095 -Merge: 148d3e2a 393a8e40 -Author: eugenevinitsky -Date: Sun Apr 8 15:26:00 2018 -0700 - - merged master - -commit 148d3e2ae913c5e74408d8ada97f7a8679a0225e -Merge: 22e46f77 a75c747b -Author: eugenevinitsky -Date: Sun Apr 8 15:20:34 2018 -0700 - - merged - -commit d10524322ae0f1343d0cf8cbbd5eb454758cf578 -Author: eugenevinitsky -Date: Sun Apr 8 14:36:08 2018 -0700 - - update - -commit 2893f325024626f9798ea3053299d51b1c6d2ab9 -Author: eugenevinitsky -Date: Sun Apr 8 14:26:49 2018 -0700 - - updated to new gym - -commit 393a8e4084260a546ac8d764b6d16b5f44eaa754 -Merge: 1f657c3c 2ad416e7 -Author: eugenevinitsky -Date: Sun Apr 8 14:08:39 2018 -0700 - - Merge pull request #390 from cathywu/outflow_2 - - total inflow and outflow calculations - -commit 1f657c3c0e2d281a682def85c01a4aa08bc73872 -Merge: e75f026c 12949ec0 -Author: eugenevinitsky -Date: Sun Apr 8 14:06:17 2018 -0700 - - Merge pull request #387 from cathywu/fixing_accel - - Fixing accel - -commit 0ac3ee25b9860af06d95eebb4f3f247b3ebe3f67 -Author: eugenevinitsky -Date: Sun Apr 8 14:02:24 2018 -0700 - - change instance type for ray cluster - -commit 144fbb27c577e468e5e5c26f1784fe3438ffed15 -Author: Kanaad Parvate -Date: Sun Apr 8 00:20:56 2018 -0700 - - increase pre-junction length - -commit 59d4fe97aab6d97d0f3c162999b49afacd88f4ee -Merge: a6a176b2 a75c747b -Author: Kanaad Parvate -Date: Sun Apr 8 00:15:31 2018 -0700 - - Merge branch 'velocity_bottleneck' of https://github.com/cathywu/learning-traffic into rl_early_merge - -commit 2ad416e7050721ffd5b86ae39bdfe5f35897edd7 -Author: AboudyKreidieh -Date: Fri Apr 6 22:30:02 2018 -0700 - - total inflow and outflow calculations - -commit 12949ec015bef9c8559d535583fbccfdc843716b -Author: Kanaad Parvate -Date: Fri Apr 6 21:27:41 2018 -0700 - - flake8 and other fixes - -commit a75c747b1aef3ea1336d119a67c33c1387581c30 -Author: Kanaad Parvate -Date: Fri Apr 6 19:13:35 2018 -0700 - - merge fixing_accel - -commit acea98401eab88785c854585079a1301b3c22370 -Merge: 67329e27 e75f026c -Author: Kanaad Parvate -Date: Fri Apr 6 19:10:19 2018 -0700 - - merged master - -commit 69127c93d9f7ba7d9bd0c3c65cabdde120d56e55 -Author: Kanaad Parvate -Date: Fri Apr 6 19:05:06 2018 -0700 - - tests pass - -commit 79afbb4f350f1bd8d0c2cba954dee88ddd691d3b -Merge: e48353fa e75f026c -Author: Kanaad Parvate -Date: Fri Apr 6 17:06:33 2018 -0700 - - merged master - -commit e48353fae803f17d35eb850f648ceb052be78851 -Author: Kanaad Parvate -Date: Fri Apr 6 17:03:24 2018 -0700 - - controller update - -commit d5f93a0de85f52f1d8d89d037d7133246fae8d38 -Merge: 1e3cd4c4 54bad74d -Author: eugenevinitsky -Date: Thu Apr 5 23:31:23 2018 -0700 - - Merge branch 'rllib_testing' of https://github.com/cathywu/learning-traffic into rllib_testing - -commit 1e3cd4c49d97a01fba0d86b99194572a64fc7af6 -Merge: 866e11c5 93f79e06 -Author: eugenevinitsky -Date: Thu Apr 5 22:50:56 2018 -0700 - - Merge branch 'rllib_testing' of https://github.com/cathywu/learning-traffic into rllib_testing - -commit 54bad74d93c70b30656fee08b814a9b98dea3856 -Merge: 866e11c5 93f79e06 -Author: eugenevinitsky -Date: Thu Apr 5 22:50:56 2018 -0700 - - Merge branch 'rllib_testing' of https://github.com/cathywu/learning-traffic into rllib_testing - -commit 866e11c5ab0340714489cdfda8e3afe3bf04e351 -Author: eugenevinitsky -Date: Thu Apr 5 22:23:34 2018 -0700 - - minor - -commit 93f79e06e9d19c0cc7d911de0168211d6b171c3e -Author: eugenevinitsky -Date: Thu Apr 5 22:23:34 2018 -0700 - - minor - -commit 1bd56c9413ae72950ded038556d6bcaf5d5c7665 -Merge: 09e0266e da2b5595 -Author: eugenevinitsky -Date: Thu Apr 5 22:12:48 2018 -0700 - - Merge branch 'rllib_testing' of https://github.com/cathywu/learning-traffic into rllib_testing - -commit 09e0266e7d77c3b1843ec8b1629e2ae71a97451c -Author: eugenevinitsky -Date: Thu Apr 5 22:05:44 2018 -0700 - - minor - -commit da2b5595044947c7f9a977e788c4f81eb23f9273 -Author: eugenevinitsky -Date: Thu Apr 5 22:05:44 2018 -0700 - - minor - -commit 73ddc187a3e98d7f414f9e991ba0875972c4a5b4 -Merge: 42679463 da77c3ed -Author: eugenevinitsky -Date: Thu Apr 5 19:25:01 2018 -0700 - - Merge branch 'rllib_testing' of https://github.com/cathywu/learning-traffic into rllib_testing - -commit 4267946343de7a5fd360883c581b3557d7fe83cd -Author: eugenevinitsky -Date: Thu Apr 5 19:17:43 2018 -0700 - - minor - -commit da77c3edad1e00d9264be3957f63d7e1cedb07c8 -Author: eugenevinitsky -Date: Thu Apr 5 19:17:43 2018 -0700 - - minor - -commit 0e2978f85814570f7a3f2a1f448fd7ff205dafef -Author: eugenevinitsky -Date: Thu Apr 5 19:14:04 2018 -0700 - - minor - -commit 0f4c9583d994205561de0d2b2d3089c845df3635 -Author: eugenevinitsky -Date: Thu Apr 5 18:33:11 2018 -0700 - - changed run style for rllib examples - -commit dec986dfe32bb4eb59757bace65e9f721fe9c6a8 -Author: eugenevinitsky -Date: Thu Apr 5 17:50:52 2018 -0700 - - updated travis - -commit 7e3009f2c2cbe3b172939839f1819a37a89421eb -Author: eugenevinitsky -Date: Thu Apr 5 17:49:27 2018 -0700 - - added instructions - -commit b3a7c03e52f17387052e31c5db9ace36f06a334f -Author: eugenevinitsky -Date: Thu Apr 5 16:54:06 2018 -0700 - - update - -commit 4e1ba49ee5f0b9431db405160e2968a4076ea363 -Author: eugenevinitsky -Date: Thu Apr 5 16:43:21 2018 -0700 - - minor - -commit 7aecd5cb1b3137d052f7320ac23e561e7b6175a8 -Author: eugenevinitsky -Date: Thu Apr 5 16:38:58 2018 -0700 - - updated cooperative merge setup script - -commit 88775375c426e4f0a38d932bb566fcb906e17b89 -Author: eugenevinitsky -Date: Thu Apr 5 16:37:29 2018 -0700 - - working setup script - -commit 3477071489c61e6740811b439e3d4b3fee793ea5 -Author: AboudyKreidieh -Date: Wed Apr 4 13:51:05 2018 -0700 - - removed max_speed from EnvParams - -commit 266b1aef0d2d0ac5d97e4169437652ec7be2ea97 -Author: Kanaad Parvate -Date: Wed Apr 4 00:50:02 2018 -0700 - - more bug fixes - -commit e75f026ca057ae80a1776bb2a0f071bc22e7fff2 -Merge: 78d586eb 5983245c -Author: eugenevinitsky -Date: Tue Apr 3 20:48:58 2018 -0700 - - Merge pull request #383 from cathywu/flakefixes - - added no crash custom mode to vehicles, flake 8 fixes - -commit d982b6df52d999eccef37fbaf805551cfde2b98e -Merge: 0d3dcd6e 95626f96 -Author: eugenevinitsky -Date: Tue Apr 3 20:46:02 2018 -0700 - - Merge branch 'rllib_testing' - -commit 0d3dcd6e14a7e7e0fef7ea807618dffdceaf66ae -Merge: 5983245c 78d586eb -Author: eugenevinitsky -Date: Tue Apr 3 20:45:54 2018 -0700 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic - -commit 95626f961ae1a428538e3383e02a883612fd4edf -Author: eugenevinitsky -Date: Tue Apr 3 20:45:46 2018 -0700 - - minor - -commit 66b3b6dd4fbcd8649f1a28d3e2c1e488c0dd7fb3 -Merge: c9e3e7a5 78d586eb -Author: eugenevinitsky -Date: Tue Apr 3 20:43:49 2018 -0700 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic into rllib_testing - -commit 78d586eb1b4620c708ae21f44bd7c2825bed2603 -Merge: e99713b1 bd42a1cb -Author: AboudyKreidieh -Date: Tue Apr 3 19:49:24 2018 -0700 - - Merge pull request #379 from cathywu/sims_per_step_bug_fix - - bug fix for collisions with multiple sims_per_steps - - added checking for collisions within the sims_per_step loop. This way, if there is a collision no new simulations are run, which may cause the exp to terminate on an error - -commit 5983245c894acaff8539e403465345506e71ff79 -Author: eugenevinitsky -Date: Tue Apr 3 19:45:37 2018 -0700 - - added no crash custom mode to vehicles, flake 8 fixes - -commit c9e3e7a567583aa7ed19667e5eed9dca3afbbed8 -Author: eugenevinitsky -Date: Tue Apr 3 19:35:48 2018 -0700 - - autoscaler modification - -commit 3fde1d9992d3d33053dd0f04d0a3c0bb49b6bf85 -Author: eugenevinitsky -Date: Tue Apr 3 17:31:25 2018 -0700 - - updating dtype - -commit 52cc38ccfd6ab39e35171cbe92e6881816893eb2 -Author: eugenevinitsky -Date: Mon Apr 2 14:47:35 2018 -0700 - - updated run script for stabilizing the ring rllib verision - -commit c1868e66b692ee6ffb646376742f2bad47e21dd5 -Author: eugenevinitsky -Date: Mon Apr 2 14:40:54 2018 -0700 - - updated setup script - -commit 22e46f775cefde2e107ba652e641d1230b521610 -Author: eugenevinitsky -Date: Mon Apr 2 12:27:14 2018 -0700 - - cleanup - -commit e431bbda4c755a80b2b144a04e60bf34f1e1c665 -Author: eugenevinitsky -Date: Mon Apr 2 11:41:16 2018 -0700 - - debugging - -commit 6971ce645c4aa0c71e5c0775bd4192b3b312cbcb -Author: Kanaad Parvate -Date: Sun Apr 1 18:32:54 2018 -0400 - - updating velocity controllers appropriately - -commit 7a1c025721d4e4f6154d8332697b0cdfb5aed8fb -Author: Kanaad Parvate -Date: Sun Apr 1 18:28:59 2018 -0400 - - correct accessing of params from SumoCFParams aka i'm dum - -commit 427b0e7e05cb21deba0270a5049990c2ef966fac -Author: Kanaad Parvate -Date: Sun Apr 1 18:20:48 2018 -0400 - - added sumo params as a paramter for flow controllers, and adjusted some of the controllers acordingly. THIS CHANGE BREAKS THE BUILD, NEED TO UDPATE MORE - -commit e99713b142c0651c9e6af60f13ec1f943ff59cf6 -Merge: 063874c7 4212d697 -Author: AboudyKreidieh -Date: Sun Apr 1 10:55:38 2018 -0700 - - Merge pull request #380 from cathywu/lane_change_directions_only - - removed target lanes from lane change actions - - changes: - - removed `target_lane` from `apply_lane_change`. - - The idea behind this is that it's a bit confusing that rl lane change actions are chosen by a direction and human-driven vehicle actions by target lane. This could also get confusing when we move on to use lateral speeds as well. If we don't think it's a good idea, we can all just not do this and move on, but I think we should do this. - -commit 67329e278be42786c1bbcf55ec37d9c930302ffa -Merge: ee42b06c c57c5a5e -Author: Kanaad Parvate -Date: Fri Mar 30 14:41:32 2018 -0400 - - Merge branch 'velocity_bottleneck' of https://github.com/cathywu/learning-traffic into velocity_bottleneck - -commit 4212d697109e5b915497313721a8a3fc1a8e03b9 -Author: AboudyKreidieh -Date: Wed Mar 28 20:57:24 2018 -0700 - - removed target lanes from lane change actions - -commit bd42a1cbaf69408d6147f3ef6e2a1ce6bba9844d -Author: AboudyKreidieh -Date: Wed Mar 28 20:31:14 2018 -0700 - - bug fix for collisions with multiple sims_per_steps - -commit 87da3f9e399f7e1991dab939abcf6701596399a6 -Author: AboudyKreidieh -Date: Wed Mar 28 20:19:56 2018 -0700 - - changes to wave attenuation env, and observed colors to envs - -commit 7500289b6aa0eaaa9f6162987e34ecf5cfde0818 -Author: AboudyKreidieh -Date: Wed Mar 28 19:05:23 2018 -0700 - - added methods in order to allow base_env to automatically change the colors of vehicles base on their type - -commit f40dcf84732c396dbcb7e18e433a96c9fb4a3fb2 -Author: AboudyKreidieh -Date: Wed Mar 28 18:58:09 2018 -0700 - - updated documentation for base generator and defaulted color of background to grey - -commit c57c5a5eac968995a7010ee6f83cd0b8ea67e31f -Author: eugenevinitsky -Date: Wed Mar 28 12:16:20 2018 -0700 - - minor changes - -commit 063874c78eb9c1d9a904f35b1353bb9b38eb5668 -Merge: 3f4921c4 8ec9ebe5 -Author: eugenevinitsky -Date: Tue Mar 27 17:09:53 2018 -0700 - - Merge pull request #370 from cathywu/reset_mod - - restart mod - -commit 3f4921c4e61fc0dde34c02ee951b7616d2a02f59 -Merge: c014f6e9 54866d4c -Author: eugenevinitsky -Date: Tue Mar 27 17:08:53 2018 -0700 - - Merge pull request #375 from cathywu/bottleneck_fix - - increased bottleneck radius - -commit c014f6e99ae0a8128f4440206c53b821439652fe -Merge: e6cc4c53 1300568c -Author: eugenevinitsky -Date: Tue Mar 27 17:08:39 2018 -0700 - - Merge pull request #376 from cathywu/visualizer_bug_fix - - refactoring bug fix to visualizer_rllab.py - -commit 1300568c23b708545724a1078ecad0efb7f04b7e -Author: AboudyKreidieh -Date: Tue Mar 27 16:23:40 2018 -0700 - - refactoring bug fix to visualizer_rllab.py - -commit 8ec9ebe55f920ddda5d88d06562ba7f7a3c19dcf -Author: AboudyKreidieh -Date: Tue Mar 27 16:19:09 2018 -0700 - - PR review additions - -commit ee42b06c8e9fa4f4b5f4afd2d85503980ca161f3 -Merge: 52debf8d cbfbdd21 -Author: Kanaad Parvate -Date: Tue Mar 27 18:08:16 2018 -0400 - - Merge branch 'velocity_bottleneck' of https://github.com/cathywu/learning-traffic into velocity_bottleneck - -commit 52debf8d980184d66ca4ca892540928b133910e8 -Author: Kanaad Parvate -Date: Tue Mar 27 18:08:12 2018 -0400 - - density experiments - -commit e6cc4c53031e29d2c9b7d0c14a47713e2d298a88 -Merge: b3aabac1 2d51dbaf -Author: eugenevinitsky -Date: Tue Mar 27 15:04:54 2018 -0700 - - Merge pull request #371 from cathywu/bottleneck_run_scripts - - updated bottleneck run scripts - -commit cbfbdd219fb5b01cbeb96c8659e20795696b2963 -Merge: f42f092f 54866d4c -Author: eugenevinitsky -Date: Tue Mar 27 15:00:58 2018 -0700 - - modified velocity bottleneck slighty - -commit 54866d4ca225606b584abe80ccc5e3a18a6b8a1b -Author: eugenevinitsky -Date: Mon Mar 26 13:37:55 2018 -0700 - - flake fixup, error handling - -commit 1712dd72c14322b835a66ee7c23af218f3820880 -Author: eugenevinitsky -Date: Mon Mar 26 12:58:29 2018 -0700 - - increased bottleneck radius - -commit 2d51dbaf6367abfa977f13664eb4f1f2c4eb53c7 -Author: AboudyKreidieh -Date: Wed Mar 21 10:11:30 2018 -0700 - - added random inflows, slow initial number of vehicles, updated sumo cfm params - -commit a28178b366d390198711a13c037dd7102eeb12a2 -Author: AboudyKreidieh -Date: Wed Mar 21 09:58:34 2018 -0700 - - restart mod - -commit f42f092f3f0e9f8ba600739bbb611b9ef625c5eb -Author: eugenevinitsky -Date: Wed Mar 21 08:41:45 2018 -0700 - - minor - -commit b3aabac1b4b46ce46b310fbed36abdd1903a11b9 -Author: nskh -Date: Mon Mar 19 10:31:50 2018 -0700 - - added plotter (#369) - - * added plotter - - * @eugenevinitsky's suggested tweaks - -commit 1e29cb1027b69c99f2b35dbb9058b16bb277e175 -Merge: b5d5543c 7ae658d8 -Author: eugenevinitsky -Date: Sat Mar 17 17:59:46 2018 -0700 - - Merge pull request #368 from cathywu/bottlenecks - - Update bottlenecks.py - -commit 48dc1bd2be91f24fc5bef5c88d8af239062c7974 -Author: Kanaad Parvate -Date: Sat Mar 17 17:58:42 2018 -0700 - - move density exp to examples/sumo - -commit 6f1cda0b2493981ad942ba583f5e2cd50acc42b8 -Merge: 5eb33aad 61f629fe -Author: Zian Hu -Date: Sat Mar 17 17:35:32 2018 -0700 - - jhf - -commit b5d5543cd813d8d36a164da8a0802ee37c8f2288 -Merge: 61f629fe 906ed2d9 -Author: AboudyKreidieh -Date: Sat Mar 17 17:25:13 2018 -0700 - - Merge pull request #341 from cathywu/cleanup_environments - - Cleanup environments - - changes: - - pep8 fixes and documentation fixes to most environment classes - - I'm proposing a systematic way of us documenting our environments if someone else wants to get a somewhat detailed description of their contents. We essentially always provide four components: states, actions, rewards, and termination, but also may have additional components at the four main onces (such as additional or sorting). In addition, like any class each environment needs a brief an detailed description at the top. The documentation currently presented is mostly in skeleton form (lots of blanks), but I'm hoping we can fill them out prior to any new release - - Note: - - `two_loops_one_merging` needs to be merged in, so best to punt any argument over the deleted commented portions in it. - -commit f2ffb90799a0e407aeb48303ad0ed00d08a76bc3 -Merge: 921e3437 8bd4e25c -Author: eugenevinitsky -Date: Sat Mar 17 16:18:51 2018 -0700 - - merged in remote - -commit 921e3437b1004abbea34f179352eca9256449dae -Author: eugenevinitsky -Date: Sat Mar 17 16:13:44 2018 -0700 - - working alinea, uncalibrated v 2 - -commit 8bd4e25cc3b77b6a22801fafc00ed74008577f02 -Author: eugenevinitsky -Date: Sat Mar 17 16:13:44 2018 -0700 - - working alinea, uncalibrated v 2 - -commit da290c1f16dffdbbc1fe96b08ccd03a41700acae -Author: eugenevinitsky -Date: Sat Mar 17 15:37:55 2018 -0700 - - alinea running uncalibrated - -commit d1e40ec159e0e7bedc3c8eb7b32bb87e52c4fbff -Author: eugenevinitsky -Date: Sat Mar 17 14:42:43 2018 -0700 - - started building out ALINEA - -commit 61f629febc053c505d67268f5182686e88bf5ab4 -Merge: bec57cab f8936cb5 -Author: AboudyKreidieh -Date: Sat Mar 17 12:09:11 2018 -0700 - - Merge pull request #364 from cathywu/figure_eight_exp - - Adding rllab and rllib figure-eight experiments - - Aboudy wrote these and for some reason they're not in `master`. I'm making this PR to add these two. - -commit 5eb33aad52365040947c16c4abcf212ea41523f3 -Author: Kanaad Parvate -Date: Fri Mar 16 18:34:08 2018 -0700 - - hand tuned vel control - -commit bec57cab536c0978d183248794b91a3b8b9942e1 -Merge: 884eeb4e 2b9ef314 -Author: Kanaad Parvate -Date: Fri Mar 16 17:07:19 2018 -0700 - - Merge pull request #365 from cathywu/subscription_bug - - Fixed bug with removing subscriptions - -commit a6a176b2a97920ef38fc0e9dd9c96c8b22b92284 -Author: Kanaad Parvate -Date: Fri Mar 16 16:53:28 2018 -0700 - - ready for multiagent - -commit f8936cb5aa5d392f2b9123a97e39ad32e8426ec3 -Author: AboudyKreidieh -Date: Fri Mar 16 14:50:59 2018 -0700 - - wrong scenario specified - -commit 2b9ef314723c84b1a5711da7addb2f54b9300ac0 -Author: Nishant -Date: Fri Mar 16 14:49:36 2018 -0700 - - inflow begin - -commit b4a7e878c30d17f7a91f6fc76cfc2b3edb6ce5b4 -Merge: b98488c7 884eeb4e -Author: AboudyKreidieh -Date: Fri Mar 16 14:41:09 2018 -0700 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic into figure_eight_exp - -commit 32b525b8fee14b13f4aab5554268ad9fbeed72e9 -Author: Kanaad Parvate -Date: Fri Mar 16 14:28:25 2018 -0700 - - allowed for inflows w/out starting vehicles and removed second unsubscribe - -commit 884eeb4e4274c643b75d46ade634e59897bddf19 -Merge: d1357a16 3fca6220 -Author: eugenevinitsky -Date: Fri Mar 16 14:06:04 2018 -0700 - - Merge pull request #363 from cathywu/aws_dying_seeds_fix - - fixed aws dying seeds bug - -commit 3fca622022d55a4b71d38ad07bd06551b7e13d07 -Author: AboudyKreidieh -Date: Wed Mar 14 17:05:10 2018 -0700 - - fixed aws dying seeds bug - -commit f649cb7874fd9c90322cb64c9ff4d2da4bbda9c9 -Author: eugenevinitsky -Date: Wed Mar 14 13:12:17 2018 -0700 - - experiment seems to run without crashes - -commit 07c33ef32f04297b940b306b1b587bdf1c1b0f6c -Author: eugenevinitsky -Date: Wed Mar 14 10:46:57 2018 -0700 - - working experiments - -commit 766a7c43054bf9dbde11a8131e21105c052b5df8 -Author: eugenevinitsky -Date: Wed Mar 14 10:22:31 2018 -0700 - - running bottleneck velocity experiment - -commit de28d82400ca187d2731d2d954ddf06ac7aef0fd -Author: eugenevinitsky -Date: Tue Mar 13 18:29:43 2018 -0700 - - added working experiment, need to add danger edges - -commit f4c1c081fdb749f84176a7686ad7a0391482e6b1 -Author: eugenevinitsky -Date: Tue Mar 13 17:53:38 2018 -0700 - - started preliminary env - -commit 906ed2d9f49bfadf1fe7d13adc66d049a9f2f14a -Merge: b4ece0b4 ac99ec24 -Author: AboudyKreidieh -Date: Tue Mar 13 16:09:37 2018 -0700 - - Merge branch 'multiagent_bottleneck' of https://github.com/cathywu/learning-traffic into cleanup_environments - -commit ac99ec241c5b8b036c56425c148643fd7f659040 -Merge: 1df86f3c d1357a16 -Author: AboudyKreidieh -Date: Tue Mar 13 15:52:52 2018 -0700 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic into multiagent_bottleneck - -commit c892459cb6839a05d17fd2187726818ee58aaf25 -Merge: 2717ad27 d1357a16 -Author: eugenevinitsky -Date: Tue Mar 13 15:50:42 2018 -0700 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic into velocity_bottleneck - -commit 2717ad272dc0fa9e46b72cb2f8f492b74f23dec2 -Author: eugenevinitsky -Date: Tue Mar 13 15:50:39 2018 -0700 - - started new environment - -commit d1357a1699a717354f3b373ca49589332d76056b -Merge: 92721e4b 96a123df -Author: AboudyKreidieh -Date: Tue Mar 13 15:47:12 2018 -0700 - - Merge pull request #361 from cathywu/warmup_multiple_steps - - Warmup multiple steps - - changes: - - added a `warmup_steps` attribute to `EnvParams`, which can be used to warmup the simulation for a few steps before running a training rollout - - added a `sims_per_step` attribute to `EnvParams`, which can be used to run multiple simulation steps with the same rl action. - - tests for the two above methods - - added an internal `_apply_rl_actions` method, which should be used instead of `apply_rl_actions` for all children classes. This lets the actions by rl agents be dictated by sumo when the rl algo is not issuing commands (e.g. during a warmup for when using `SumoExperiment`) - - Note: - - currently, the `Vehicles` and `TrafficLights` classes do not store information for every simulation step in `sims_per_step`, but instead only the last sim step - - -------------------- - - Cleanup params - - changes: - - pep8 and cleanup to `flow.core.params`. This includes removing `shared_policy` and `shared_rewards` from `EnvParams`, since they are not used and calling similar methods in the future will be from rllib - - added a default (large) value for the `end` parameter in `InFlows`. This is because new versions of sumo default this to 24 hours, meaning that after 24 hours of simulation vehicles stop flowing into the network. - - created method for issuing deprecation warnings - - added deprecation warnings for refactoring changes in `flow.core.params` - - modified documentation to the classes in `flow.core.params` (more still needed) - - tests for deprecation warning, `SumoLaneChangeParams`, and `SumoCarFollowingParams` - -commit 9895ab8a73b55b8964d4e2a647368f02ef9d7680 -Author: Kanaad Parvate -Date: Tue Mar 13 14:31:17 2018 -0700 - - hand-tuned sumo bottleneck with followerstopper cars(called bottleneck_dan.py). followerstopper can release control back to sumo by returning None, generator has fixed speeds of 23m/s - -commit 96a123dfeaa9d7fad6ba3403bb1b3dbb7dcbe62b -Author: AboudyKreidieh -Date: Tue Mar 13 13:01:15 2018 -0700 - - warmup steps, sims per step, and default rl actions - -commit 78eb0338b2d4484cf39812ae4cd2078b4fc57fa3 -Author: AboudyKreidieh -Date: Tue Mar 13 11:57:52 2018 -0700 - - pep8 and cleanup to params - -commit 0eb45887397240d3a8383879a1d4eb291bc54ac5 -Author: AboudyKreidieh -Date: Tue Mar 13 11:57:27 2018 -0700 - - created method for issuing deprecation warnings - -commit 8562f0c707e91cc75bddf64ebb69e0c29f702998 -Author: Kanaad Parvate -Date: Mon Mar 12 18:21:27 2018 -0700 - - some code - -commit 065d96f428b68ca29a2f092059a7a503b516fa9e -Author: Kanaad Parvate -Date: Mon Mar 12 17:00:55 2018 -0700 - - some code - -commit 92721e4ba37a4ff36ee815ac275917c531fc3db2 -Merge: 2e5edf28 896ef8e7 -Author: Kanaad Parvate -Date: Mon Mar 12 14:23:30 2018 -0700 - - Merge pull request #359 from cathywu/dans_models - - added dan's controllers - -commit 896ef8e7f6d11ec9cd5c89785e5b1ef13c24c7a7 -Author: Kanaad Parvate -Date: Mon Mar 12 14:22:03 2018 -0700 - - added url to dan's paper - -commit 1df86f3c6e34efeacbf6fe7ddcf0bab695c078d4 -Author: eugenevinitsky -Date: Mon Mar 12 11:18:58 2018 -0700 - - added outflow velocity function - -commit 2e5edf2866bf93239985f988fac4816da51291d6 -Merge: 7c8d6f55 712e1a31 -Author: eugenevinitsky -Date: Mon Mar 12 10:32:15 2018 -0700 - - Merge pull request #358 from cathywu/enforce-gym-version - - forced gym to be 0.9.2 b/c 0.10.3 breaks naming in env - -commit 31e52d8c92bfd5e337b581cf8dfb510923b552a5 -Merge: acd455d7 68a7416d -Author: eugenevinitsky -Date: Mon Mar 12 10:28:45 2018 -0700 - - Merge branch 'multiagent_bottleneck' of https://github.com/cathywu/learning-traffic into multiagent_bottleneck - -commit acd455d7afef8eeea84f1f601077a268e4389989 -Author: eugenevinitsky -Date: Thu Mar 8 17:07:21 2018 -0800 - - walking the walk and doing pep8 formatting - -commit 811b9a9b7dc18a4279a6265b47236e836217de41 -Author: AboudyKreidieh -Date: Sun Mar 11 19:28:56 2018 -0700 - - added dan's controllers - -commit 712e1a31fa27cc81e242aea22dbdf61f136fcbde -Author: Kanaad Parvate -Date: Fri Mar 9 15:07:22 2018 -0800 - - Update requirements.txt - - forgot an = - -commit 14402dcf1228104438d63a7b3156ef8bed93a19b -Author: Kanaad Parvate -Date: Fri Mar 9 15:05:04 2018 -0800 - - forced gym to be 0.9.2 b/c 0.10.3 breaks naming in env - -commit 68a7416d6213f53bed3946fcea2f8ab8b8a662ca -Author: eugenevinitsky -Date: Thu Mar 8 17:07:21 2018 -0800 - - walking the walk and doing pep8 formatting - -commit 8157bd3da015b0d785f0d06fdf3a6c0868ad1f49 -Merge: a0115238 7c8d6f55 -Author: eugenevinitsky -Date: Thu Mar 8 16:46:58 2018 -0800 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic into multiagent_bottleneck - -commit a0115238002f4d51f72a8a7436df6f51fc14f0b5 -Author: eugenevinitsky -Date: Thu Mar 8 16:46:51 2018 -0800 - - minor - -commit a10831052ad611bed66f3af66cc79b036aa1ff06 -Author: eugenevinitsky -Date: Wed Mar 7 13:21:42 2018 -0800 - - switched reward gain - -commit b5db3affc309048658176639a69bd10d2f2628a6 -Author: eugenevinitsky -Date: Wed Mar 7 13:20:30 2018 -0800 - - removed line from visualizer rllib - -commit 2fe2087055890e8416ba0b3124ea1bf2fb991447 -Author: eugenevinitsky -Date: Wed Mar 7 09:51:04 2018 -0800 - - minor - -commit c99bdd0cba76d12ad5428aa7889cb9d407cf1d15 -Author: eugenevinitsky -Date: Tue Mar 6 15:45:08 2018 -0800 - - running multiagent - -commit 13b5404563d72a82012ede9e35a64a052c5754a6 -Author: eugenevinitsky -Date: Tue Mar 6 09:25:46 2018 -0800 - - added run script for rllib multiagent bottleneck, not yet functional - -commit 9ac09b599c50134aa3511d4ede2f718695d1e1e2 -Author: eugenevinitsky -Date: Tue Mar 6 07:23:59 2018 -0800 - - reformatting - -commit 8cdf46d9861158a686400d1153a7c5458b96caa8 -Author: eugenevinitsky -Date: Mon Mar 5 21:19:44 2018 -0800 - - added multiagent bottlenecks, not yet functional - -commit 7c8d6f55fadc93fed59c1f8027f335264c80afa4 -Merge: 04c8b235 966b8358 -Author: AboudyKreidieh -Date: Mon Mar 5 19:01:56 2018 -0800 - - Merge pull request #354 from cathywu/colorfix - - bug fix to black cars - - fixed an where vehicles as come out as black when using a new version of sumo. The 4th color term needs to be 255 now instead of 0. - -commit f874132c8792135a38a5222b677a2ec1d96edd5f -Merge: 467d5681 966b8358 -Author: eugenevinitsky -Date: Mon Mar 5 18:55:58 2018 -0800 - - Merge branch 'colorfix' of https://github.com/cathywu/learning-traffic into bottlenecks - -commit 966b8358215b4e64dac2896fa912881ba9d210fa -Author: AboudyKreidieh -Date: Mon Mar 5 18:40:32 2018 -0800 - - bug fix to black cars - -commit 467d568131b5c5866d7f5b90a6cc2ef2b3aee90d -Author: eugenevinitsky -Date: Mon Mar 5 13:40:21 2018 -0800 - - minor edits - -commit 91b6be6751f9df86c7202f24ff585a844a3f3750 -Author: eugenevinitsky -Date: Mon Mar 5 11:51:22 2018 -0800 - - modified reward function - -commit 7ae658d8567f95b830869e6999f231dfa5bd5de7 -Author: eugenevinitsky -Date: Mon Mar 5 11:31:00 2018 -0800 - - Update bottlenecks.py - - Error in safety code for failsafe - -commit 078eab44ec6c0f9b11f67f5c5b6d80008e026226 -Author: eugenevinitsky -Date: Sun Mar 4 22:32:38 2018 -0800 - - seemingly working - -commit 0e745e9d68513f043141370389390ca7bfb644fe -Merge: f1cb850e 04c8b235 -Author: eugenevinitsky -Date: Sun Mar 4 22:01:02 2018 -0800 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic into bottlenecks - -commit 04c8b235a9aa18bd93a3f2f343a59d40cdc3c5c6 -Author: nskh -Date: Sun Mar 4 19:48:56 2018 -0800 - - added documentation about visualizer (#350) - - * added documentation about visualizer - - * Update visualizing.rst - -commit f1cb850e3acd471350cd98f85e7075cf7a504d7b -Author: eugenevinitsky -Date: Sun Mar 4 19:00:07 2018 -0800 - - working bottleneck example with added vehicles - -commit 1a21ecddc88e52adb29e77a50570858e2ea95dc6 -Author: eugenevinitsky -Date: Sun Mar 4 18:48:47 2018 -0800 - - added code to move rl vehicles back to front of bottleneck, not yet functional - -commit 58cd61063f454e9aeb0e16d242205b49f996a4ae -Merge: 8ed98fdd 2667b9f0 -Author: eugenevinitsky -Date: Fri Mar 2 16:40:19 2018 -0800 - - Merge pull request #351 from cathywu/bottlenecks_merge - - Bottlenecks merge - -commit 2667b9f04a2c9b82f189adc0812309101784bf50 -Merge: 804845cf 7d0fa6b5 -Author: eugenevinitsky -Date: Fri Mar 2 16:31:19 2018 -0800 - - Merge branch 'bottlenecks_merge' of https://github.com/cathywu/learning-traffic into bottlenecks_merge - -commit 804845cf36f98ad3c83f9c4e2189cbf7a3d3c5f3 -Author: eugenevinitsky -Date: Fri Mar 2 16:31:07 2018 -0800 - - addressed comments - -commit 5d71c9e0b063e51810d3c8771cbc4f9b89467c94 -Author: eugenevinitsky -Date: Fri Mar 2 16:11:51 2018 -0800 - - cleanup - -commit 7d0fa6b557c7e69b9281649729ac3b7c634436df -Author: eugenevinitsky -Date: Fri Mar 2 16:11:51 2018 -0800 - - cleanup - -commit f0964787bb637a97a622943e1b838c3ceaeecf89 -Author: eugenevinitsky -Date: Fri Mar 2 16:05:10 2018 -0800 - - working code for if the rl vehicles leave the system - -commit e864877540a3df370a3649ce4cccb22c4ab942ef -Author: eugenevinitsky -Date: Fri Mar 2 13:07:47 2018 -0800 - - added a bottleneck sumo script - -commit e4f548d7f184332d6ab06beb80cd628c480e5ea3 -Author: eugenevinitsky -Date: Thu Mar 1 17:56:01 2018 -0800 - - currently working bottleneck and collision tests - -commit ab57edbe92e14e4b1f60ac6f5da0b7d5c041d797 -Author: eugenevinitsky -Date: Thu Mar 1 16:59:21 2018 -0800 - - added bottleneck test - -commit 8ed98fddaa7bb76b1977c2991339bd0cbfb1909e -Merge: 44b73efd 87682657 -Author: AboudyKreidieh -Date: Thu Mar 1 16:36:03 2018 -0800 - - Merge pull request #340 from cathywu/cleanup_controllers - - Cleanup controllers - - changes: - - modifications to the documentation - - cleanup and pep8 - - removed redundant classes - - all classes now use their base controllers - -commit c77f61f1741272721eca9bec3217bb602ae8723f -Merge: 7969736f 44b73efd -Author: eugenevinitsky -Date: Thu Mar 1 16:17:14 2018 -0800 - - merged in master - -commit 44b73efd6a206cebce55c116c1a35f1ada8515ce -Merge: f0d705e5 39cea1d8 -Author: eugenevinitsky -Date: Thu Mar 1 16:14:37 2018 -0800 - - Merge pull request #349 from cathywu/collision_test - - Collision test - -commit 39cea1d89d6d19db7275ba11aa4887eb46c757f0 -Merge: 0d7811a6 4bd7ff6d -Author: eugenevinitsky -Date: Thu Mar 1 16:06:18 2018 -0800 - - Merge branch 'collision_test' of https://github.com/cathywu/learning-traffic into collision_test - -commit 0d7811a6cdb7051967aa1b5b1f1e387c9e583b75 -Author: eugenevinitsky -Date: Thu Mar 1 16:01:22 2018 -0800 - - removed unnecessary param - -commit 7969736ff1e4f3f9eb6395ec8ee9045b3b7b52bf -Author: eugenevinitsky -Date: Thu Mar 1 16:00:52 2018 -0800 - - changes for timing, should be removed later - -commit 4bd7ff6dd33ab9e585d3c940c87c29472db478ba -Author: AboudyKreidieh -Date: Thu Mar 1 15:41:53 2018 -0800 - - bug fixes to prevent early termiantions from collisions - -commit 9f54baaaf05deea675c58ab0a2fc256d43cfdbc8 -Author: eugenevinitsky -Date: Thu Mar 1 14:41:01 2018 -0800 - - actually added collision test - -commit 8768265765d207733fded617295869acf1fb6c8c -Merge: 76a15cc5 f0d705e5 -Author: AboudyKreidieh -Date: Thu Mar 1 14:22:17 2018 -0800 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic into cleanup_controllers - -commit 5f095a69e4a7c94849a2202bf225d9cadc7c99b7 -Author: eugenevinitsky -Date: Wed Feb 28 17:31:28 2018 -0800 - - blah - -commit db47bc8cfde543a2bc5f44685b9b3738695b740f -Author: eugenevinitsky -Date: Wed Feb 28 13:53:38 2018 -0800 - - added a collision test - -commit 545b797caef5973188c549fed6b5336a81a63d71 -Merge: 587be4e8 f0d705e5 -Author: eugenevinitsky -Date: Wed Feb 28 13:45:20 2018 -0800 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic - -commit 52f2b9ecff8fe8db9b23ffa213dfed9a21442cfc -Merge: 87ad93d6 f0d705e5 -Author: eugenevinitsky -Date: Tue Feb 27 09:56:17 2018 -0800 - - added forward progress reward function - -commit f0d705e5c991c89f4afe8d323f8373fba74d3ba4 -Merge: c95c7f23 98203f85 -Author: AboudyKreidieh -Date: Mon Feb 26 18:04:51 2018 -0800 - - Merge pull request #344 from cathywu/vehicles_dict_get - - changes: - - replaced `dict` calls in the `Vehicles` class with `.get()` methods, which return a user specifiable `error` message if no vehicle is found - - documentation and pep8 changes to the `Vehicles` class - -commit b98488c7b6093ee52fdc60a2784fe5de65003d3f -Author: AboudyKreidieh -Date: Mon Feb 26 17:50:43 2018 -0800 - - figure eight experiments - -commit 587be4e834ac930b5b522bef0a6a48a6fb175c00 -Author: eugenevinitsky -Date: Mon Feb 26 16:31:16 2018 -0800 - - added a reset to avoid exceeding the 24 day limit - -commit 76a15cc5cae3cbd4ed77917d18047a727a86a8d7 -Author: AboudyKreidieh -Date: Mon Feb 26 11:40:37 2018 -0800 - - reverted changes to vehicles class - -commit 98203f85bec514e5059b318eed522a4229c0632a -Author: AboudyKreidieh -Date: Mon Feb 26 11:34:24 2018 -0800 - - replaced dict calls in the Vehicles class with .get(), and documentation - -commit c95c7f232a1e604968de2bca2c05e5520224515c -Merge: 95481b66 b62e6cca -Author: eugenevinitsky -Date: Fri Feb 23 19:46:24 2018 -0600 - - Merge pull request #343 from cathywu/flow_grid_rl - - Flow grid rl - -commit b62e6cca4fa0bf5e8d4cd8c26a9e28953c870d45 -Merge: a237d5b6 95481b66 -Author: eugenevinitsky -Date: Fri Feb 23 19:31:31 2018 -0600 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic into flow_grid_rl - -commit 87ad93d6a6463005dc0eb76785b1c94aa1399dc8 -Author: eugenevinitsky -Date: Thu Feb 22 23:44:48 2018 -0600 - - scaled vehicles - -commit 67f6d47d9e61f28d455319c868c38fbc11e73366 -Author: eugenevinitsky -Date: Thu Feb 22 16:08:20 2018 -0600 - - added a scaling factor that lets you generate arbitrary sized bottlenecks - -commit 95481b667e2722998bff81f99f7dea224cdfc3f6 -Merge: b3c60300 f55c4faf -Author: eugenevinitsky -Date: Thu Feb 22 15:32:01 2018 -0600 - - Merge pull request #338 from cathywu/flow_grid_merge - - Flow grid merge - -commit a237d5b6ae6e0da04646ff4425f1c976c27eb2ba -Author: AboudyKreidieh -Date: Thu Feb 22 07:13:25 2018 -0800 - - green wave rllib and rllab examples - -commit f55c4faf05170922af84fe33519c36b3b03538df -Author: AboudyKreidieh -Date: Wed Feb 21 19:07:54 2018 -0800 - - bug fixes - -commit c3e2bddac97626d057c363fd65c892d02f78d21a -Author: eugenevinitsky -Date: Wed Feb 21 15:17:58 2018 -0600 - - added print statements - -commit 852174e04127aeb8f0ed654db7440978655210ae -Author: AboudyKreidieh -Date: Wed Feb 21 12:52:27 2018 -0800 - - revert - -commit 6232e3fd4190a546980421a24206cbc349d4a3b8 -Merge: 59f8ee3a b3c60300 -Author: AboudyKreidieh -Date: Wed Feb 21 12:45:42 2018 -0800 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic into cleanup_controllers - -commit 59f8ee3ad1b881155e0d6ea100b2882403f9bc03 -Author: AboudyKreidieh -Date: Wed Feb 21 12:43:36 2018 -0800 - - doc cleanup - -commit c4ed01e176251c4aa639bb637e66575a8172a044 -Author: eugenevinitsky -Date: Wed Feb 21 14:28:19 2018 -0600 - - tiny fix - -commit 7134f8a445c4f51fad8d7a30887683cff8226f80 -Merge: 75d13e40 b3c60300 -Author: eugenevinitsky -Date: Wed Feb 21 14:27:54 2018 -0600 - - pulled in master - -commit b3c60300f2816064e2d2c1f7214d45963efedd89 -Merge: 60219d4d fef673c8 -Author: eugenevinitsky -Date: Wed Feb 21 12:26:23 2018 -0800 - - Merge pull request #339 from cathywu/aws_fix - - Aws fix - -commit 9abfb90f39a5803ccff1ff06089664ce2451c0c9 -Author: AboudyKreidieh -Date: Wed Feb 21 12:09:28 2018 -0800 - - bug fixes - -commit fef673c80b7901863fbbe64aa0670a7325cef57b -Author: eugenevinitsky -Date: Wed Feb 21 14:07:18 2018 -0600 - - sped up tests - -commit 4352a15330384855960f420846bd90de9117d914 -Author: eugenevinitsky -Date: Wed Feb 21 13:52:41 2018 -0600 - - added test flag to travis - -commit 2437ead1f4b1dd7de370df730d4e7f755d4884f7 -Author: eugenevinitsky -Date: Wed Feb 21 13:13:41 2018 -0600 - - flake8 fixes - -commit 60219d4dede15e4348004a9678cff801a557c8ea -Merge: ca41442e 06ba0d0d -Author: AboudyKreidieh -Date: Wed Feb 21 11:10:38 2018 -0800 - - Merge pull request #329 from cathywu/bay_bridge_merge - - Bay bridge merge - - This PR introduces the bay bridge to `master`, allowing us to add methods to master while also testing them on the bay bridge experiment and ensuring that changes do not break any of the bay bridge components. - - changes: - - added working sumo examples of the bay bridge and bottleneck experiments. These scripts download the net.xml file from AWS, so not local files are needed. - - added bay bridge and bottleneck scenario and generator methods - - added base bay bridge environment class - - todo: - - a later PR will introduce tests to make sure we do not break any of the functionality of the base bay bridge environment and run scripts - -commit 75d13e40f3c3d59006e185d850c3a3b328f4f311 -Author: eugenevinitsky -Date: Wed Feb 21 12:50:57 2018 -0600 - - removed gen custom start pos, not needed for this pull request - -commit 5552aaa089fef01c884da97e2c406ad9db75ae15 -Merge: 1d84abcd 09cc0e6c -Author: eugenevinitsky -Date: Wed Feb 21 12:49:08 2018 -0600 - - Merge branch 'flow_grid_merge' of https://github.com/cathywu/learning-traffic into flow_grid_merge - -commit 1d84abcdf3bc6a4d5250a2abe300613f5c2bd2bd -Author: eugenevinitsky -Date: Wed Feb 21 12:48:47 2018 -0600 - - added better reward - -commit 09cc0e6c3bc11e4515551e5c8ffd6ba02b8f76dd -Author: AboudyKreidieh -Date: Wed Feb 21 10:48:08 2018 -0800 - - next guess at bug fix - -commit 8956af6df17e638726f08286b652a023bd0c771c -Author: eugenevinitsky -Date: Wed Feb 21 12:39:08 2018 -0600 - - removed 24 hr bug fix, not tested sufficiently - -commit 06ba0d0ddc5885375b3bf92dc5b5090e239eecee -Author: AboudyKreidieh -Date: Wed Feb 21 10:37:39 2018 -0800 - - PR changes - -commit 79e5671d26d7e4aa300bd99534d2a7d6c8436fed -Author: eugenevinitsky -Date: Wed Feb 21 12:36:27 2018 -0600 - - changed sumo sleep time to fix aws bug but added a flag to set it back to .1 if test time - -commit 6fafbe8dc98b7e87fb4e9096c4f396a79143e161 -Author: AboudyKreidieh -Date: Wed Feb 21 10:23:10 2018 -0800 - - maybe bug fix? - -commit ef62dad2862e3b025857c272db587b9e0e8ed9e5 -Author: AboudyKreidieh -Date: Wed Feb 21 09:37:12 2018 -0800 - - tests and documentation - -commit 62401ea79646d552976e31cdc6ec92bd1fc9a865 -Author: AboudyKreidieh -Date: Wed Feb 21 09:09:59 2018 -0800 - - added tests - -commit 815e127db379b929d0db100be984c6e0f7c3160f -Author: eugenevinitsky -Date: Wed Feb 21 11:05:41 2018 -0600 - - added restart to avoid 24 day bug - -commit 66189443c3b3b6cbd2c3b184878e61dde5c9618c -Author: AboudyKreidieh -Date: Wed Feb 21 08:55:28 2018 -0800 - - cleanup and pep8 to the grid components - -commit 126bb38fcf69d0e41c3f507bd0bab6de115db6c6 -Author: AboudyKreidieh -Date: Wed Feb 21 08:06:44 2018 -0800 - - bug fixes - -commit b4ece0b49467eac98aced7167dcba39f89aac14a -Author: AboudyKreidieh -Date: Wed Feb 21 07:49:30 2018 -0800 - - minor doc changes - -commit e425e272897acb6abf438e7e1d7a50078bd8d45a -Author: AboudyKreidieh -Date: Tue Feb 20 21:58:29 2018 -0800 - - templates for all environment documentation - -commit da25e18d9f524afbeead11511d24dfd25647691c -Author: AboudyKreidieh -Date: Tue Feb 20 20:13:47 2018 -0800 - - pep8 - -commit 394a5b722978f1acc53f7106b2e03f65f68ca77d -Author: AboudyKreidieh -Date: Tue Feb 20 20:07:23 2018 -0800 - - grid scenario and example - -commit d8e6c2186e92072d6a6f229625b530fada15fbe7 -Author: AboudyKreidieh -Date: Tue Feb 20 20:06:43 2018 -0800 - - grid generator, scenario, and routing controller - -commit 857c355a1c8122c19d1a7194c07d30cb6ba48d40 -Author: AboudyKreidieh -Date: Tue Feb 20 18:33:39 2018 -0800 - - green wave environment - -commit 0eaf06ba5f25233f0c79b13fe57411ece5e939b8 -Author: AboudyKreidieh -Date: Tue Feb 20 00:06:37 2018 -0800 - - documentaion for environments - -commit 930084315d987e68d4471a1e47dc2353ac5fb75b -Author: AboudyKreidieh -Date: Mon Feb 19 23:00:46 2018 -0800 - - bug fix - -commit debbc889ab56d42a341acdd278ee0a5d1dc0eb62 -Author: AboudyKreidieh -Date: Mon Feb 19 22:53:51 2018 -0800 - - pep8 and documentation cleanups - -commit 117232d40d5dc67aa174573aeccb743818ec36f7 -Author: AboudyKreidieh -Date: Mon Feb 19 08:57:29 2018 -0800 - - replacing dict calls with .get() - -commit 3393819fa842d0db56c9be25bd4d211c4eaa0b27 -Author: eugenevinitsky -Date: Sun Feb 18 11:34:34 2018 -0800 - - minor visualzier fix - -commit 769859c33bef6ba163ab8c4d6c85b671894b9afe -Merge: ba6ecbb5 b0c11155 -Author: eugenevinitsky -Date: Sat Feb 17 20:39:52 2018 -0800 - - merged in vehicles crash fixes - -commit b0c11155b1af8c1908ad7bf58ac30f6ada06d860 -Author: AboudyKreidieh -Date: Sat Feb 17 19:08:05 2018 -0800 - - cleanup - -commit 5b84ee560da7d76a3e30ea50aded332e2a5fe383 -Author: AboudyKreidieh -Date: Sat Feb 17 19:06:40 2018 -0800 - - tries on everything - -commit ca41442e1040583b472271b8f084f531e7e3bdae -Merge: 780e0bc5 68bbe79f -Author: eugenevinitsky -Date: Sat Feb 17 16:28:20 2018 -0800 - - Merge pull request #335 from cathywu/ballistic_fix - - ballistic now an option - -commit 68bbe79fcdb2862ae7908f48bb5112644235f593 -Author: AboudyKreidieh -Date: Sat Feb 17 16:07:27 2018 -0800 - - ballistic now an option - -commit ba6ecbb55e0ff1ace9e47650b069860431d951bc -Author: eugenevinitsky -Date: Sat Feb 17 16:00:35 2018 -0800 - - remove ballistic - -commit a7c1e0940cd4eca84197b429fd7b28a3859b45f0 -Merge: 548a30d6 4762546a -Author: eugenevinitsky -Date: Sat Feb 17 15:29:02 2018 -0800 - - Merge branch 'bottlenecks' of https://github.com/cathywu/learning-traffic into bottlenecks - -commit 4762546aacbb6c240e6cf23a7cb8270aac7609b0 -Author: AboudyKreidieh -Date: Sat Feb 17 15:28:15 2018 -0800 - - another collision bug fix - -commit 548a30d63c86df0373243ddd4061495e70ef19de -Merge: dba98b31 4432243a -Author: eugenevinitsky -Date: Sat Feb 17 15:21:19 2018 -0800 - - merged in master - -commit 4432243a98681aaaf90953c65992883ae84bd46b -Author: AboudyKreidieh -Date: Sat Feb 17 15:15:34 2018 -0800 - - collision bu fix - -commit 482a521d05ad6e4e278892f50bed3f5222f8d187 -Author: AboudyKreidieh -Date: Sat Feb 17 14:27:37 2018 -0800 - - bug fix - -commit dba98b313e9b66c33fae7d09ecac4fb242e028d4 -Author: eugenevinitsky -Date: Sat Feb 17 14:22:07 2018 -0800 - - log for very small bottleneck - -commit df38eee662f86de1e33bdb45e1979254552a37c4 -Author: eugenevinitsky -Date: Sat Feb 17 14:11:27 2018 -0800 - - log for small bottleneck experiment - -commit 2343a84507ef56a465db70a935d27bd63bf0c3f9 -Merge: 970d3638 9672a57a -Author: eugenevinitsky -Date: Sat Feb 17 13:32:50 2018 -0800 - - Log for small bottleneck experimentd - -commit 9672a57a7588e3ff221d489c09b42f24c2d2351f -Author: AboudyKreidieh -Date: Sat Feb 17 13:13:57 2018 -0800 - - reduced version of bottleneck - -commit 970d36389fc80842b8d6832acfa0ef6f9112662a -Merge: 2e15817b bd9027a5 -Author: eugenevinitsky -Date: Sat Feb 17 13:12:51 2018 -0800 - - log for BottleNeckLarge replay - -commit bd9027a51ca5a2dfe711808477577a515779a562 -Author: AboudyKreidieh -Date: Sat Feb 17 12:37:15 2018 -0800 - - mods - -commit 2e15817b1601c3848a546508d31e123889b8dede -Author: eugenevinitsky -Date: Sat Feb 17 12:18:13 2018 -0800 - - minor changes - -commit 2549f6daa47addc6e3097274ac7d574c1bb97bb1 -Author: eugenevinitsky -Date: Fri Feb 16 21:34:26 2018 -0800 - - added run script - -commit 0389b936ea99a97d7af4126011a0a6dcbab61182 -Author: AboudyKreidieh -Date: Fri Feb 16 20:41:08 2018 -0800 - - observation space appended to base bottleneck env - -commit 4a1f7b6fe74c39ec45320a0c472aa72839145d94 -Merge: fd716769 e7bab699 -Author: AboudyKreidieh -Date: Fri Feb 16 20:35:28 2018 -0800 - - Merge branch 'bottlenecks' of https://github.com/cathywu/learning-traffic into bottlenecks - -commit fd716769257614505f2721c7f7a31a58241c0187 -Author: AboudyKreidieh -Date: Fri Feb 16 20:35:09 2018 -0800 - - observation space for bay bridge toll - -commit e7bab699e99d735113e41efaa3646de34fdb9173 -Author: eugenevinitsky -Date: Fri Feb 16 20:31:11 2018 -0800 - - aded working toll booth control - -commit 17b244fb19fd3d67b2987ac0842f2fe7508f3fb4 -Author: AboudyKreidieh -Date: Fri Feb 16 19:25:03 2018 -0800 - - modified toll booth - -commit 226a5542e11c1300f2d2cdcbae57e5b0900c0d12 -Merge: 67d383d4 780e0bc5 -Author: AboudyKreidieh -Date: Fri Feb 16 18:28:06 2018 -0800 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic into bottlenecks - -commit 780e0bc54d9b89c62dbdcd2c8a6f1ad2fd36ca80 -Author: nskh -Date: Fri Feb 16 15:53:27 2018 -0800 - - added a util function and modified three rllib examples to log out experiment env names (#332) - -commit 9b2ec9b7926fdad0f2ee74df2be682a7a338c27f -Author: AboudyKreidieh -Date: Thu Feb 15 18:30:57 2018 -0800 - - PR changes - -commit 2b3ac591905f6376603bb4bbb38633d51fb0c4e9 -Merge: 97a732d8 78873dfc -Author: eugenevinitsky -Date: Wed Feb 14 11:47:48 2018 -0800 - - Merge pull request #321 from cathywu/fix_autoscaler_script - - Update ray autoscaling configuration script - -commit 97a732d81ac7f9834044178861420064756518f3 -Merge: 0704dce0 a43114ee -Author: eugenevinitsky -Date: Wed Feb 14 11:47:01 2018 -0800 - - Merge pull request #331 from cathywu/variable_num_vehicles_reset - - support for resets in cases of dynamic numbers of vehicles - -commit 0704dce0ba5d3a10f8237a07b073a4a2d2e5b01c -Merge: d72bc425 7093fff6 -Author: eugenevinitsky -Date: Wed Feb 14 10:03:10 2018 -0800 - - Merge pull request #330 from cathywu/scenario_crash_fix - - bug fix to get_x method - -commit a43114eec594dd34515485f337de06cde854488e -Author: AboudyKreidieh -Date: Tue Feb 13 21:26:32 2018 -0800 - - added num_vehicles parameter to generate_starting_positions method to support dynamic numbers of vehicles during reset - -commit 7093fff642861db0549133204783d413b1f25141 -Author: AboudyKreidieh -Date: Tue Feb 13 12:53:19 2018 -0800 - - bug fix to get_x method - -commit 1ebe1bcaf9a1b4a2b1adb499b472004205050a67 -Merge: 0e63bc46 d72bc425 -Author: AboudyKreidieh -Date: Tue Feb 13 12:04:36 2018 -0800 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic into bay_bridge_merge - -commit 0e63bc4625d0762cafbeaba802d3e317edc0c5b8 -Author: AboudyKreidieh -Date: Tue Feb 13 12:02:50 2018 -0800 - - added scenarios and generators for the bay bridge and bottleneck - -commit d72bc425b796a0079d056a195d5fc8063bd878be -Author: nskh -Date: Mon Feb 12 23:40:33 2018 -0800 - - Updating rllib visualizer (#320) - - * added None input to render_env - - * removed required --run argument since we always use PPO - - * fixed the way config files are loaded, should also fix agent.restore(checkpoint) bugs - - * fixed horizon not found bug - - * forgot how dictionary keys work - -commit 9b2d573220becbf8aa4654b8f19b110b4a5344ca -Author: AboudyKreidieh -Date: Mon Feb 12 19:43:29 2018 -0800 - - working bay bridge and bottleneck examples - -commit 117536225ef8c306962076c0a485d9be71c7d3f1 -Merge: 2cfb3c60 8247b105 -Author: AboudyKreidieh -Date: Mon Feb 12 19:06:48 2018 -0800 - - Merge pull request #328 from cathywu/speedups - - Speedups - - changes: - - lane change durations only applied to rl vehicles - - deepcopies of vehicle observations are made using the `.copy()` method, which as far as I can tell works - -commit 8247b1057bc1f43aa28927c03f5a3039e033bf12 -Merge: 65bd3c2d 2cfb3c60 -Author: AboudyKreidieh -Date: Mon Feb 12 17:08:26 2018 -0800 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic into speedups - -commit 2cfb3c60c4df6b53e3ef8c84bebe0f7c152d03c2 -Merge: ccdc56a7 3b55915a -Author: AboudyKreidieh -Date: Mon Feb 12 16:36:41 2018 -0800 - - Merge pull request #326 from cathywu/vehicles_all_checks - - changes in vehicles class from flow_grid - -commit ccdc56a712c6bb86ca8672b2130ee6fa7ac53da2 -Merge: db21c289 6fdcb394 -Author: AboudyKreidieh -Date: Mon Feb 12 16:26:31 2018 -0800 - - Merge pull request #319 from cathywu/pythonic_changes - - Pythonic changes - - made of pythonic changes to the codebase: - - use of iterable: `next`, `reversed`, etc.. - - minimized used of `range(len())` - - sorting via `sorted` instead of `numpy` - - also, deleted the environment `loop_with_perturbation` - -commit db21c289df7d3c0a58550ef7fdae83d0be678665 -Merge: 6fe8ac57 a631ff79 -Author: AboudyKreidieh -Date: Mon Feb 12 16:22:16 2018 -0800 - - Merge pull request #325 from cathywu/random_cleanup - - minor cleanups from bay_bridge_multiagent - - changes: - - random cleanups from `bay_bridge_multiagent` - - identified an issue with setting `tau` too large (commented next to the default value) - -commit a631ff79a96c58bd5d392e66a11a36144fdeee9e -Author: AboudyKreidieh -Date: Mon Feb 12 16:05:46 2018 -0800 - - Update params.py - -commit 3b55915a28d60ae48c36cb045b9efee3ebcc2457 -Author: AboudyKreidieh -Date: Mon Feb 12 15:59:36 2018 -0800 - - changes in vehicles class from flow_grid - -commit 64da4eb06b55eff97b306a9f43ebfc89f9d20093 -Author: AboudyKreidieh -Date: Mon Feb 12 14:58:50 2018 -0800 - - minor cleanups from bay_bridge_multiagent - -commit 6fdcb394a8f6a61b9dbeba3cc715846dfaffca19 -Merge: 28af80a0 6fe8ac57 -Author: AboudyKreidieh -Date: Mon Feb 12 14:38:10 2018 -0800 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic into pythonic_changes - -commit 78873dfc41c769723c756818358caddbf742b44e -Merge: c5c9d6d8 6fe8ac57 -Author: AboudyKreidieh -Date: Mon Feb 12 14:37:14 2018 -0800 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic into fix_autoscaler_script - -commit 6fe8ac57840f06b4433f46d478bb65e3651f61f5 -Merge: 1816602c a3d4a590 -Author: AboudyKreidieh -Date: Mon Feb 12 14:01:48 2018 -0800 - - Merge pull request #322 from cathywu/cleanup - - cleanups to openstreetmap and skipping ray test - - changes: - - some cleanup to the openstreetmap methods; the subprocess sometimes fails in the other form - - skipping `testRay` temporarily, until the issue is resolved in ray. In the meantime, it is advice to run the slow test locally (it passes with these new changes) - -commit 65bd3c2db9b43065f3f15fd0160c94b1618df4d6 -Author: AboudyKreidieh -Date: Mon Feb 12 10:27:16 2018 -0800 - - faster vehicle observation copying and lane change duration only applies to rl vehicles - -commit a3d4a5908dc43f90a7089acc8d218bc618a622ca -Author: aboudy -Date: Fri Feb 9 18:29:14 2018 -0800 - - cleanups to openstreetmap and skipping ray test - -commit c5c9d6d8888cd69accfa7e1f48c87c1eab16074a -Author: Cathy Wu -Date: Fri Feb 9 15:29:04 2018 -0800 - - autoscaler fixes - -commit 28af80a0e4fea5db750efa553f2204001261fbb1 -Author: aboudy -Date: Thu Feb 8 13:39:23 2018 -0800 - - removed print - -commit 5278addd9e8a02d128d1f3848251e6521d11fd48 -Author: aboudy -Date: Thu Feb 8 12:17:42 2018 -0800 - - modified sorting method - -commit 4045c03ccf5a4c0fa244e87843a2788893ba027d -Author: aboudy -Date: Thu Feb 8 10:21:29 2018 -0800 - - more pythonic changes - -commit b0e80fe56df8b34831f35f6f66dd2a6144653029 -Author: aboudy -Date: Thu Feb 8 01:30:20 2018 -0800 - - cleanup and pythonic changes - -commit 1816602ca2c574527fc10a213bf6367def7fe50f -Merge: 3f61c34a 6288f5b1 -Author: AboudyKreidieh -Date: Tue Feb 6 18:27:59 2018 -0800 - - Merge pull request #317 from cathywu/speedups - - Speedups - - changes: - - speedups to the multi_lane_data method in the vehicles class, which only provided data to rl vehicles now (may be temporary) - - speedups to the `get_x` method in the scenario class - - `get_x` returns a value of 0 if no valid edgestart is found (which should support code that doesn't define them in `specify_internal_edgestarts`) - -commit 3f61c34ab5b02d50e3d42f54b6aefff5b880808c -Merge: 9ca97d90 fa4cd632 -Author: AboudyKreidieh -Date: Tue Feb 6 18:24:28 2018 -0800 - - Merge pull request #316 from cathywu/get_state_fix - - get_state() fix - - changes: - - modified `get_state()` call in base_env's `step()` function to allow for all forms of rl control (not just autonomous vehicles) - - removed the `self.mult_agent` attribute from base_env, since the condition only applies to rllab (not rllib) - -commit 6288f5b1c876b5ca12654505163d2af846b8615a -Author: aboudy -Date: Tue Feb 6 18:17:00 2018 -0800 - - PR fixes - -commit 913649adc3c2f542285473eb3ada806f25a9af95 -Author: aboudy -Date: Tue Feb 6 17:32:22 2018 -0800 - - defaulted internal edgestarts to zero (if not found) - -commit 357b94469453cabc1d16ac3f87195c6e763bb40e -Author: aboudy -Date: Tue Feb 6 17:07:29 2018 -0800 - - backwards compatability fix - -commit 00b85ca3ca280d0bc43c765bca1afb1110ef6320 -Author: aboudy -Date: Tue Feb 6 16:30:41 2018 -0800 - - speedups to the get_x method in the scenario class - -commit 552b063c80f0a9738c3f29f3b20d9530a30d4921 -Author: aboudy -Date: Tue Feb 6 16:21:59 2018 -0800 - - speedups to the multi_lane_data method in the vehicles class, which only provided data to rl vehicles now (may be temporary) - -commit fa4cd63249283af8cde23201828224a2f51e7dbe -Author: aboudy -Date: Tue Feb 6 16:09:10 2018 -0800 - - modified get_state() call in base_env's step() function to allow for all forms of rl control (not just autonomous vehicles) - -commit 9ca97d90180ccbcbbaaa007f02acc20ec907857e -Merge: 3ceead86 5289873a -Author: AboudyKreidieh -Date: Tue Feb 6 15:17:17 2018 -0800 - - Merge pull request #315 from cathywu/sorting_option - - Sorting option - - changes: - - introduces an option to choose when `self.sorted_ids` actually sorts the vehicles ids. This is to avoid sorting in every step. - - tests for the new option - -commit 3ceead86113fce181431f433fa9ce5e0054e3121 -Merge: 3db35e59 4d9a1366 -Author: AboudyKreidieh -Date: Tue Feb 6 15:16:43 2018 -0800 - - Merge pull request #312 from cathywu/base_env_cleanup - - Base env cleanup - - changes: - - code cleanup to `base_env`, including: improper uses of `except`, creating attributes outside of the `__init__` method, etc. - - removed unnecessary attributes - - removed redundant uses of some methods, such as changing the colors in `setup_initial_state` - -commit 5289873a83bfb4f19bd45e77fe66417a8e00b55e -Merge: a61efd56 3db35e59 -Author: aboudy -Date: Tue Feb 6 15:03:09 2018 -0800 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic into sorting_option - -commit a61efd56e85a10a8cc08efa680e83391ca1f99db -Author: aboudy -Date: Tue Feb 6 15:02:49 2018 -0800 - - added option for choosing when to sort vehicles - -commit 3db35e592f085fea40048b0e29fb39db647784a0 -Merge: f291b1e0 4b36d923 -Author: eugenevinitsky -Date: Tue Feb 6 14:59:47 2018 -0800 - - Merge pull request #313 from cathywu/scenario_net_params_cleanup - - Scenario net params cleanup - -commit 4b36d92340075a88749be4fb906dbfa7eb21691b -Author: aboudy -Date: Mon Feb 5 16:36:11 2018 -0800 - - added additional_net_params from scenarios to the sumo examples - -commit dc8575fb0f01287743566882ec2a01cbd5cf40b8 -Author: aboudy -Date: Mon Feb 5 15:54:47 2018 -0800 - - added ADDITIONAL_NET_PARAMS dict to all scenarios, modified documentation, and code cleanup - -commit 4d9a13669429b214b0a2d2efa77304d554601600 -Merge: 484418eb f291b1e0 -Author: aboudy -Date: Mon Feb 5 12:33:12 2018 -0800 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic into base_env_cleanup - -commit f291b1e03a0540bd983fbb062908555b58d7847e -Merge: 47050913 51bd2329 -Author: eugenevinitsky -Date: Fri Feb 2 13:19:52 2018 -0800 - - Merge pull request #310 from cathywu/sumo_update - - changed travis to use a version of sumo that doesnt have traffic light bugs - -commit 51bd2329e8f03e5dc569aeafa973c6952fe30897 -Author: eugenevinitsky -Date: Fri Feb 2 12:10:49 2018 -0800 - - changed travis to use a version of sumo that doesnt have traffic light bugs - -commit 47050913beb238f8fbe94c4d94488c131def0bda -Merge: b97f3af1 ca9b1b67 -Author: AboudyKreidieh -Date: Thu Feb 1 16:13:21 2018 -0800 - - Merge pull request #306 from cathywu/multi_lane_headways - - Multi lane headways - - changes: - - added `get_lane_headways()`, `get_lane_leaders()`, `get_lane_followers`, and `get_lane_tailways()` methods to the `Vehicles` class to collect multi-lane local data for the vehicle. - - added `get_ids_by_edge` method to the `Vehicles` class to collect the names of all vehicles in a specific edge - - bug fixes to the `next_edge` and `prev_edge` methods in the base scenario class - - tests for all above methods - - minor cleanup - - Note: - - the methods mentioned in the first bullet point of changes assume all edge/lane pairs are connect to only one other edge/lane pair. This is not always the case, but for now it handles almost all cases without failing - -commit ca9b1b671a8ba7d819d6f9fa4ed4def2a273f8e0 -Author: aboudy -Date: Thu Feb 1 15:19:46 2018 -0800 - - remove via - -commit b97f3af131b8235e99f5a30bbcf0b8df269b5e6c -Merge: 7fb72ccc 9c25915c -Author: AboudyKreidieh -Date: Thu Feb 1 13:48:54 2018 -0800 - - Merge pull request #305 from cathywu/starting_position_speedups - - speedups to starting position methods - - changes: - - replaces `self._edges` with `self._edge_list` in the osm and netfile scenarios to ensure that junctions aren't considered during starting position generation - - modified the `self.get_edge` method in the base scenario class to provide some additional speedups when generating starting positions (especially useful when the number of edges and junctions is very large) - -commit 9c25915c8cebee079440746419bae90135f293df -Author: aboudy -Date: Thu Feb 1 13:27:50 2018 -0800 - - PR fix - -commit 5faecbc8179101391e95c0785eb8d3be0d12d95d -Author: aboudy -Date: Thu Feb 1 13:19:35 2018 -0800 - - reverted experiment class - -commit d5ceaf591f57c28a78b21ced2ceb386fea3df5b2 -Author: aboudy -Date: Thu Feb 1 13:16:23 2018 -0800 - - tests for multi_lane_data methods and get_ids_by_edge - -commit 484418ebb5e638d4abe0df3ffc180715900f2d1f -Author: aboudy -Date: Thu Feb 1 11:32:25 2018 -0800 - - mod to the way emission_path is added to the sumo_call - -commit 5dd2b15292dbe0b8d1185a9e6dcbb588d38c9cfe -Author: aboudy -Date: Thu Feb 1 10:27:34 2018 -0800 - - continued cleanup to base_env - -commit 5a88a8638dbe5531326f37b22a24d87aa624a156 -Author: aboudy -Date: Thu Feb 1 09:17:28 2018 -0800 - - minor cleanup to base_env - -commit debff77e520d23da163266df7a36f636d0f0c49d -Author: aboudy -Date: Thu Feb 1 00:35:18 2018 -0800 - - speedups to starting position methods - -commit f1bd3851f437cfbc34b13c881f4626b5f6ef3657 -Merge: 1218ef44 7fb72ccc -Author: aboudy -Date: Wed Jan 31 17:03:50 2018 -0800 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic into multi_lane_headways - -commit 1218ef441ce2bc93c7aab8f7ff82ba70a1c74e18 -Author: aboudy -Date: Wed Jan 31 17:03:25 2018 -0800 - - bug fixes to multi_lane_data - -commit 7fb72ccc8ac1a4662ef05639eddfb6a8e6ef320f -Merge: aed870a3 e5ff55e9 -Author: AboudyKreidieh -Date: Wed Jan 31 13:47:07 2018 -0800 - - Merge pull request #304 from cathywu/netfile_fix - - bug fix in scenario generators - -commit e5ff55e9df677332e53ba6ab86e0cfcdbfbdaac5 -Author: eugenevinitsky -Date: Wed Jan 31 13:04:50 2018 -0800 - - fixed osm generator - -commit 380babd61d9b879b107c858d108c04bec6084f6e -Author: eugenevinitsky -Date: Wed Jan 31 13:03:53 2018 -0800 - - bug fix in scenario generators - -commit aed870a381b5ea8e42a1c1643d70aea9cf3b2419 -Merge: 1770983f 6c325ff5 -Author: eugenevinitsky -Date: Wed Jan 31 12:59:05 2018 -0800 - - Merge pull request #302 from cathywu/traffic_get_ids_patch - - traffic lights get_id patch - -commit 6c325ff586bed3e6d9f2350e0e6ba2842602d340 -Author: aboudy -Date: Wed Jan 31 12:49:33 2018 -0800 - - traffic lights get_id patch - -commit 1770983f995be8c3ee69ccc4f445bf461c0dc158 -Merge: 98667fad a9d5809c -Author: eugenevinitsky -Date: Wed Jan 31 12:42:07 2018 -0800 - - Merge pull request #290 from cathywu/sumo_logging - - Sumo logging - -commit a9d5809c2120b8ea00dcbcb21eedb53111ed3fcd -Merge: 5783f1e7 98667fad -Author: eugenevinitsky -Date: Wed Jan 31 12:14:11 2018 -0800 - - Merge branch 'master' into sumo_logging - -commit 98667fad306fb83a3891a9b9d14c8f8460667207 -Merge: bf830744 180f25f8 -Author: eugenevinitsky -Date: Wed Jan 31 12:13:23 2018 -0800 - - Merge pull request #293 from cathywu/overtake_right - - added functionality to configure overtaking on the right - -commit bf830744cfe8599b56ecdef459515af2af6b3fd6 -Merge: aa4dd4bd 72f25c50 -Author: eugenevinitsky -Date: Wed Jan 31 12:03:08 2018 -0800 - - Merge pull request #298 from cathywu/expanded_scenario_methods - - Expanded scenario methods - -commit 2e1726149346f5f555c2df28dccc629283d836c0 -Author: aboudy -Date: Tue Jan 30 22:56:43 2018 -0800 - - working version of lane leader and follower data, with the assumption of one outgoing junction per lane - -commit 72f25c505d6317a6e34736d65a31cb8a0e00167a -Author: eugenevinitsky -Date: Tue Jan 30 20:11:37 2018 -0800 - - reduced worker numbers to avoid race condition? - -commit ef92d284862b3bef25515dca4e70903e133616b1 -Author: aboudy -Date: Tue Jan 30 19:22:09 2018 -0800 - - semi-working version of lane leaders - -commit 41ebe2f2a219f3717ab75ddeb849d0113e3c74a9 -Author: eugenevinitsky -Date: Tue Jan 30 18:54:28 2018 -0800 - - fixed gym version in travis - -commit 47270730e7f1b9a2f43032670ea05fd2db9ebc97 -Author: eugenevinitsky -Date: Tue Jan 30 18:06:39 2018 -0800 - - speedup in ray slowtests - -commit bea0790016e432a767eef0ce3515818d0507751a -Author: eugenevinitsky -Date: Tue Jan 30 17:45:24 2018 -0800 - - added num steps as an env param - -commit 6c25f5f2eea0e395b4ed35f0b9cc190fbbac9b70 -Author: aboudy -Date: Tue Jan 30 16:43:23 2018 -0800 - - PR fix - -commit fa1b41f4ecce0e4d0c8d199b9c305fd929c45708 -Author: aboudy -Date: Tue Jan 30 16:12:34 2018 -0800 - - reverted changed to vehicles class - -commit eb67ae7c68aa13093cc6e3fd09b8b23581378072 -Author: aboudy -Date: Tue Jan 30 16:08:27 2018 -0800 - - added tests for new methods in the scenario class - -commit f6eadc451a2c21d65d9d89790806064e8f43ca65 -Author: aboudy -Date: Tue Jan 30 13:01:59 2018 -0800 - - modified _import_edges_from_net to output junction and connection data as well - -commit f3320989c2afe6025b7feed5e51ea045a6fa0c35 -Author: aboudy -Date: Tue Jan 30 10:23:37 2018 -0800 - - first pass on lane leaders and followers - -commit 180f25f88dbf38c3155cd5dd8161b4086233cc40 -Author: eugenevinitsky -Date: Fri Jan 26 17:18:12 2018 -0800 - - Update params.py - - Added description of overtake right to docstring - -commit a70b2965170af14eed3125af0d24dff4c64ae96c -Author: Kanaad Parvate -Date: Fri Jan 26 14:39:55 2018 -0800 - - added functionality to configure overtaking on the right - -commit aa4dd4bdada6d9269768a8b4ea600914e3e10775 -Author: Kanaad Parvate -Date: Fri Jan 26 14:15:11 2018 -0800 - - fixed bug where traci_connection.trafficlight -> traci_connection.trafficlights - -commit ef5c313140fe45808321df8fc1473ebfd7f25e38 -Merge: 8cc61524 8fc1f82b -Author: AboudyKreidieh -Date: Fri Jan 26 11:16:21 2018 -0800 - - Merge pull request #289 from cathywu/traffic_lights - - Traffic lights - - This PR adds support for implemented and controlling traffic lights. - - changes: - - created a `TrafficLights` class - - integrated traffic lights into the base scenario, generator, and environment classes - - created tests for the `set_state`, `get_state`, and `update` traffic light methods - - minor cleanups and pep8 changes - -commit 5783f1e79e7263e4679f7ee0879dbda9af8c7db4 -Merge: a45490eb 8cc61524 -Author: aboudy -Date: Fri Jan 26 00:13:42 2018 -0800 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic into sumo_logging - -commit 8fc1f82bfa9befbf39604729d69161c2bebb3b8a -Author: aboudy -Date: Thu Jan 25 23:56:11 2018 -0800 - - tests for traffic lights - -commit f14289158a62debf1ffe8dc20f5bc45f23043821 -Author: aboudy -Date: Thu Jan 25 22:22:22 2018 -0800 - - undid change to sugiyaama example - -commit d819e99cf719e8c3d1852e311bfd3398de3565e7 -Author: aboudy -Date: Thu Jan 25 22:07:34 2018 -0800 - - added traffic lights to the scenario and generator classes, updated Env to support traffic lights, and pep8 changes - -commit 6ea01a9990851e607937447066320d9d1686878e -Author: aboudy -Date: Thu Jan 25 16:33:10 2018 -0800 - - traffic light class and update method - -commit 8cc6152443c941fa98609327b3424804606b262c -Merge: 4c9ecdb1 5c6c0429 -Author: AboudyKreidieh -Date: Thu Jan 25 10:10:17 2018 -0800 - - Merge pull request #281 from cathywu/unittest_fix - - Unittest fix, Resolve #197. - Update: the fix didn't resolve the unit test. The test itself is flawed (routing isn't supposed to work the way it is written), so I think it may be best to just remove this test. - -commit 4c9ecdb125924fd909c78cfe1233fb553be49765 -Merge: 1118613a ef90a42c -Author: AboudyKreidieh -Date: Tue Jan 23 13:59:19 2018 -0800 - - Merge pull request #274 from cathywu/net_file_scenarios - - adding net.xml-based generators as well as rllab cooperative_merge experiment - -commit ef90a42c569c417fd36822dae13f677fee01a95f -Merge: 0f812785 6c5f1ddf -Author: Nishant -Date: Tue Jan 23 13:41:03 2018 -0800 - - Merge branch 'net_file_scenarios' of github.com:cathywu/learning-traffic into net_file_scenarios - -commit 0f8127852905ad551606e5f8c49682ecfb69f788 -Author: Nishant -Date: Tue Jan 23 13:40:48 2018 -0800 - - updated comments in params.py:NetParams regarding netfile input - -commit ab176f5812645b2e42e3c40d6db94564ee7626c7 -Merge: 204d6768 1118613a -Author: Nishant -Date: Tue Jan 23 13:38:29 2018 -0800 - - Merge branch 'master' of github.com:cathywu/learning-traffic into net_file_scenarios - -commit 5c6c0429a14d7c49087a5f458212cd0bb7a9df27 -Merge: cb161b66 1118613a -Author: aboudy -Date: Mon Jan 22 17:35:29 2018 -0800 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic into unittest_fix - -commit cb161b6652dd03f39201bf66630bc68625ea7bce -Author: aboudy -Date: Mon Jan 22 17:35:07 2018 -0800 - - removed broken unittest - -commit 1118613a4d16cdacecd78ee3d3cd2f0f3fa431e8 -Merge: e262ff5c 0b85ebea -Author: AboudyKreidieh -Date: Mon Jan 22 16:28:18 2018 -0800 - - Merge pull request #254 from cathywu/tests_for_examples - - This PR makes sumo example unit-testable by transforming them into functions that can be called and run without sumo's gui. Tests were also created for each sumo example located in the test_examples.py file in tests.fast_tests - -commit a45490eb00eb0b6f00cd7a38894c3a3e9c3dc132 -Author: aboudy -Date: Mon Jan 22 16:21:24 2018 -0800 - - disabled generator logging - -commit e262ff5c9bb0c598952efcc1c4ae5f7170bea3b2 -Author: nskh -Date: Mon Jan 22 15:51:19 2018 -0800 - - Removed opencv install from travis.yml (#279) - - * removed Fetching package metadata ....... - Solving package specifications: . from .travis.yml - - * travis build now points to testing branch - -commit 0b85ebea44ac248edffc29f307391334291ff6f8 -Author: aboudy -Date: Mon Jan 22 15:34:24 2018 -0800 - - fixed PR bug - -commit e377bdb2488ec2802155d341363cbc60e0cf6497 -Author: aboudy -Date: Mon Jan 22 15:30:28 2018 -0800 - - fixed cooperative_merge example - -commit 5f3eab01d613178f97be77311449ca46e9e31163 -Merge: a8f2c46f de52a54a -Author: aboudy -Date: Mon Jan 22 15:25:22 2018 -0800 - - Merge branch 'tests_for_examples' of https://github.com/cathywu/learning-traffic into tests_for_examples - -commit 80d483bb77350fad715d3909165d1fdfe94d9a07 -Merge: 8f2aa9e6 b2b35c19 -Author: aboudy -Date: Mon Jan 22 15:21:44 2018 -0800 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic into unittest_fix - -commit 8f2aa9e696a3658cd3893a24241779c81281d520 -Author: aboudy -Date: Mon Jan 22 15:20:17 2018 -0800 - - added fix to occasionally failing unit test - -commit de52a54a9d3cd5fa6ea1dc7f66f560f956226406 -Author: eugenevinitsky -Date: Mon Jan 22 11:11:38 2018 -0800 - - resolved all pep8 errors in edited files - -commit bdf8a01b222e9d1288cadaeb84fff21cf590f957 -Merge: 189ebda7 b2b35c19 -Author: eugenevinitsky -Date: Mon Jan 22 10:50:52 2018 -0800 - - Merge branch 'master' into tests_for_examples - -commit 6c5f1ddf4bd671bc8536dd351f6f18507266f709 -Merge: 204d6768 b2b35c19 -Author: eugenevinitsky -Date: Mon Jan 22 10:42:38 2018 -0800 - - Merge branch 'master' into net_file_scenarios - -commit b2b35c196729c88848c8c6410bcb9403c13bab3d -Merge: 4c33b68f 6da7c3d5 -Author: eugenevinitsky -Date: Mon Jan 22 10:37:36 2018 -0800 - - Merge pull request #272 from cathywu/docker_fix - - Contains the most up-to-date Dockerfile and environment.yml being stored on the lab machine - -commit 4c33b68f5b72903b4d21d5d88ec40cf23db0d6ed -Merge: 2640da85 c8911fdb -Author: AboudyKreidieh -Date: Mon Jan 22 10:17:12 2018 -0800 - - Merge pull request #276 from cathywu/min_max_accel_fix - - removed large max/min accels - -commit c8911fdbe0bfced1c6073e059a56974488cb2796 -Author: eugenevinitsky -Date: Sun Jan 21 23:46:05 2018 -0800 - - pointed Travis to hierarchy - -commit 204d676886798c42fdf9cfdef51e44a4c4a33c8f -Author: Nishant -Date: Sun Jan 21 18:01:14 2018 -0800 - - changed vehicle.add_vehicles() to vehicles.add() - -commit c359f369717127584fd079db5660cf78081355c6 -Author: Nishant -Date: Sun Jan 21 17:42:08 2018 -0800 - - adding required change to params.py - -commit b4e8a521403a2e34f18f91b5bddc033e272eeb3d -Author: Nishant -Date: Sun Jan 21 17:39:10 2018 -0800 - - adding net.xml-based generators as well as rllab cooperative_merge experiment - -commit 1a2ccba26e4e9a1baad905e04392e10f5bd232e2 -Author: aboudy -Date: Sun Jan 21 17:36:45 2018 -0800 - - removed large max/min accels - -commit 2640da85797206725305fea8a5956d9825d0ce17 -Merge: 8338bb68 f11faa28 -Author: eugenevinitsky -Date: Sun Jan 21 17:18:02 2018 -0800 - - Merge pull request #269 from cathywu/merge_hierarchy - - Merge hierarchy - -commit 6da7c3d544312827925cdebe97b8a3606da0223c -Author: Kathy Jang -Date: Sun Jan 21 17:16:11 2018 -0800 - - Contains the most up-to-date Dockerfile being stored on the lab machine - -commit f11faa28749e26907d28ab5f16e877e920cefde8 -Author: eugenevinitsky -Date: Sun Jan 21 15:58:07 2018 -0800 - - updated TwoMergeEnv to correctly work in scenario where there are no lane changes - -commit 278061e0dbfd59f41d62d215a7e15e636576871c -Author: eugenevinitsky -Date: Sun Jan 21 15:51:48 2018 -0800 - - added horizon import statement to tests - -commit 67d383d4a80a8f9859761c9f7f1f7ef7a3ad0695 -Author: aboudy -Date: Sun Jan 21 15:32:42 2018 -0800 - - mod to toll example - -commit 6673d4b2ad2e1947477ea8dd758595380fdd9bbf -Author: eugenevinitsky -Date: Sun Jan 21 15:07:22 2018 -0800 - - more nits - -commit 2b5dbe717b8c14b35e97f58d73d060aab4c4ba45 -Author: eugenevinitsky -Date: Sun Jan 21 15:02:53 2018 -0800 - - fixed the nits - -commit d9e2c0bb1c094f75c6b73692440b1881683dfd9d -Author: eugenevinitsky -Date: Sun Jan 21 14:33:51 2018 -0800 - - switched travis to use the hierarchy branch - -commit 8c888fb31cfe55a6d84de87fcfce87744f2bc44a -Merge: 2313fb3b 0ca44f43 -Author: eugenevinitsky -Date: Sun Jan 21 14:19:59 2018 -0800 - - Merge branch 'merge_hierarchy' of https://github.com/cathywu/learning-traffic into merge_hierarchy - -commit 2313fb3bc22369124c2d599eef22a3e7858ef61b -Author: eugenevinitsky -Date: Sun Jan 21 14:19:44 2018 -0800 - - fixed up all rllib examples, and ray_test - -commit fb6afd1902f7cac4593bfe8e40411a3f2c799010 -Merge: 7ff9bd3e 74adce7d -Author: eugenevinitsky -Date: Sun Jan 21 13:34:04 2018 -0800 - - Merge branch 'master' into merge_hierarchy - -commit 74adce7d83e967c11ea9d0b8b99080e368f89c81 -Merge: 3a040ab6 8338bb68 -Author: eugenevinitsky -Date: Fri Jan 19 16:35:36 2018 -0800 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic - -commit 8338bb68d804ea970986765ba8bc62f7e8a698c3 -Merge: da63c797 929350dc -Author: eugenevinitsky -Date: Fri Jan 19 16:27:42 2018 -0800 - - Merge pull request #260 from cathywu/inflow_bug_fixes - - bug fixes to inflows - -commit 3a040ab6dbc10cfc0732c991ff67fdf01cd6a631 -Merge: 9f8351bf da63c797 -Author: eugenevinitsky -Date: Fri Jan 19 12:10:05 2018 -0800 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic - -commit 0ca44f431a6fd69cc3767546dbfae081a3480abf -Merge: f473d088 da63c797 -Author: Cathy Wu -Date: Fri Jan 19 11:24:26 2018 -0800 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic into merge_hierarchy - -commit 929350dcb1478ab008ae48f1bd5982fc49e371f0 -Author: aboudy -Date: Thu Jan 18 21:34:28 2018 -0800 - - bug fixes to inflows - -commit ec036f1c28f576e6c304b2cdd5cce042e62078d4 -Author: aboudy -Date: Thu Jan 18 21:33:20 2018 -0800 - - created bb toll network - -commit da63c797e87e3f1b0c9189dfa7a36715659ef7fa -Merge: b70ec61c 6d750bc1 -Author: eugenevinitsky -Date: Wed Jan 17 13:38:37 2018 -0800 - - Merge pull request #256 from cathywu/vehicles_cleanup - - Vehicles cleanup - -commit 6d750bc19c4bdf840686ca92255c7792b884520a -Author: aboudy -Date: Wed Jan 17 13:20:23 2018 -0800 - - PR requested changes - -commit ad43fc119e8756bfd4fd34ac547b13ecbe4e8922 -Merge: f22319bb b70ec61c -Author: aboudy -Date: Tue Jan 16 18:31:54 2018 -0800 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic into vehicles_unittests - -commit f22319bb67f20fb36d4529fc88a19f01bde036e4 -Author: aboudy -Date: Tue Jan 16 18:31:14 2018 -0800 - - created set functions in the vehicles class for speed, position, lane, and edge - -commit dbfaf9fe0d354bfcf2dcb7d0c688a5463ab1a518 -Author: aboudy -Date: Tue Jan 16 17:32:53 2018 -0800 - - fixed bug with inflow vehicles entering in first time step, and removed redundancies from the vehicles' function - -commit b70ec61c9c84ce0b98382a611ef7ba1e4e8fb66a -Author: nskh -Date: Tue Jan 16 17:18:18 2018 -0800 - - fixed bug where vehicle_params in flow_params wouldn't be used by make_create_env (#251) - -commit 9f8351bfe7495165d416841a61762a0356da0e76 -Merge: dffc3a88 5249464c -Author: eugenevinitsky -Date: Tue Jan 16 15:29:27 2018 -0800 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic - -commit a8f2c46ff85d9a733327be175781678df39e1274 -Merge: 189ebda7 5249464c -Author: aboudy -Date: Tue Jan 16 14:45:37 2018 -0800 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic into tests_for_examples - -commit 5249464c910bbc42c5602356354636a7c81302c2 -Merge: 37a71431 a1f2591b -Author: aboudy -Date: Tue Jan 16 14:31:40 2018 -0800 - - This PR is supposed to update the naming of some environments to following a naming convention, resolving #207 . It also fixes the names of some functions/ attributes. - - Environment changes: - - `SumoEnvironment` -> `Env` - - `SimpleAccelerationEnvironment` -> `AccelEnv` - - `MultiAgentAccelerationEnvironment` -> `AccelMAEnv` - - `PartiallyObservableAccelerationEnvironment` -> `AccelPOEnv` - - `LaneChangeAccelerationEnvironment` -> `LaneChangeAccelEnv` - - `TwoLoopsOneMergingEnvironment` -> `TwoLoopsMergingEnv` - - `TwoIntersectionEnvironment` -> `TwoIntersectionEnv` - - `IntersectionEnvironment` -> `IntersectionEnv` - - other environments follows the same convention - - Vehicle changes: - - `add_vehicles` -> `add` - - `set_sumo_observations` -> `update` - - EnvParams changes: - - `max_acc` -> `max_accel` - - `max_deacc` -> `max_decel` - -commit 7ff9bd3e87de62eb9bf95282b5c693b411f1d47f -Merge: 65d0870c cd819007 -Author: eugenevinitsky -Date: Mon Jan 15 16:21:38 2018 -0800 - - Merge branch 'building_on_ramp' into merge_hierarchy - -commit cd819007c317502628e7d650c8665233d366dbf7 -Author: eugenevinitsky -Date: Mon Jan 15 16:21:20 2018 -0800 - - added ability to control inner and outer lane number - -commit 65d0870c6dbe505064815a2ca2d4ecde5d4faa93 -Author: eugenevinitsky -Date: Mon Jan 15 14:24:38 2018 -0800 - - merged in multiagent - -commit 189ebda7761db434782fe13abe8a43a3edefe546 -Author: aboudy -Date: Fri Jan 12 01:39:13 2018 -0800 - - created tests for sumo examples - -commit 2d27ad6d4ff7d25183e08bf98d1d7a20cca714f1 -Author: eugenevinitsky -Date: Wed Jan 10 12:09:15 2018 -0500 - - added description to visualizer_rllib of what each command means - -commit f473d088d5c3af8a42db541a98074ec0903682c2 -Author: eugenevinitsky -Date: Tue Jan 9 15:44:25 2018 -0500 - - modified hierarchical merge reward - -commit d8c0781c636f2d44860d2bca554b90ea2bf985df -Author: eugenevinitsky -Date: Tue Jan 9 15:36:41 2018 -0500 - - fixed punish small headways reward funciton to use new vehicles function calls - -commit 1ed1e383ddf064f2bc2b114428a92c5d98984812 -Author: eugenevinitsky -Date: Tue Jan 9 15:32:38 2018 -0500 - - changed headway penalty to use punish_small_headways - -commit 6f1b5e0fb0609c9be31e557d210c654ea8c87020 -Author: eugenevinitsky -Date: Tue Jan 9 10:47:30 2018 -0500 - - added headway penalty back into reward - -commit a1f2591b5c86bbe9aaf323f45a553f06babd32d6 -Merge: 3bdc9b98 37a71431 -Author: aboudy -Date: Tue Jan 9 03:20:32 2018 -0800 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic into renaming - -commit 1754a0e579583b8e7f3b1c65e3a696e015c91356 -Author: eugenevinitsky -Date: Tue Jan 9 02:41:51 2018 -0500 - - removed the normalization - -commit e6ef9071b13bd19a17672ffb803ac1b0d187b0c4 -Author: eugenevinitsky -Date: Tue Jan 9 02:02:16 2018 -0500 - - changed the reward function to normalize for the number of vehicles in the inner ring - -commit aa0190bf9df84c74d1743ad039a2f7dc8c3024a2 -Author: eugenevinitsky -Date: Tue Jan 9 00:59:08 2018 -0500 - - updated to new parameter saving style - -commit a14aff98679d140d8cac9e7860c0c57eec6eafb0 -Merge: c5302e2f dffc3a88 -Author: eugenevinitsky -Date: Tue Jan 9 00:21:04 2018 -0500 - - Merge branch 'master' into merge_hierarchy - -commit dffc3a8825db1be7256a2d14ccb51991e02ed140 -Merge: 0aaeea54 37a71431 -Author: eugenevinitsky -Date: Tue Jan 9 00:20:50 2018 -0500 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic - -commit c5302e2fd4ff6f0439c151e6730e17f49556438a -Author: eugenevinitsky -Date: Tue Jan 9 00:20:37 2018 -0500 - - added a reward that doesnt contain the outer ring - -commit 37a714315c5f199ff160d1e5f32cf33f30563c4d -Author: Cathy Wu -Date: Mon Jan 8 17:28:52 2018 -0800 - - Update ray autoscaler script (#249) - - ## Summary - - - Updates the default configuration for ray cluster autoscaling (2 nodes, c5.4xlarge instances) - - Updates to use the latest AMI, which uses `cathywu/ray:testing` and cleans up the setup paths - - Updates setup instructions for ray setup and ray autoscaler. - - ---- - - * Update AMI for autoscaler and defaults - - * move and rename autoscaling scripts - - * New AMI with updated cloudpickle version - - * Update docs - -commit 6161ef4c120187a4360ccbc785e9f9ea05e3ff73 -Merge: b290ee4c b4db49b0 -Author: Cathy Wu -Date: Sun Jan 7 22:49:52 2018 -0800 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic into merge_hierarchy - -commit b4db49b0409a3f09aa5ecc52eaf39fee9ac0ec3c -Author: nskh -Date: Mon Jan 8 01:44:35 2018 -0500 - - Saving flow parameters in experiment directory (#245) - - * updated visualizer example usage - - * changed make_create_env for cooperative_merge to support flow_params input - - * running into json serializability errors for actual objects - - * it's possible this works - - * cooperative_merge.py works with flow_param logging; next up are the other two rllib examples i've been working on - - * i think this works - - * forgot imports - - * oh sweet jesus it works - - * tentatively saying this works, but needs prettyifying - - * fixed up some small stuff - - * documentation and PEP8 changes - - * fixed test_ray to work with new flow_params structure... Travis should work on this commit - - * committing partial work - - * added json import/export integration test, prettified json output, changed some utility functions - - * documentation omg - - * very small docs changes - - * fixed a bug and implemented a backwards-compatability tweak - - * example usage - -commit 302fc5258b30d551178d73119af193dcd0d29677 -Author: Cathy Wu -Date: Sun Jan 7 15:09:22 2018 -0800 - - SUMO-only merge reference experiment (#244) - - ## Summary - - Prerequisite: PR #243 - - - Introduces SUMO-only merging experiment (`examples/sumo/cooperative_merge.py`), which serves as a reference for computing the reward/return without external RL control - - Introduces a class `TwoLoopsMergeNoRLPOEnv`, which extends `TwoLoopsMergePOEnv` and overwrites the `get_state` function (which requires information about RL vehicles). - - Modified `SumoExperiment:run()` and `base_env` to support computing returns for SUMO-only runs. Namely, `base_env:compute_reward()` now defaults to returning 0 instead of raising a `NotImplementedError`. - - See video `2018-01-05-cooperative_merge_sumo.mov` (posted to Slack #emergentbehaviors) - - ## Testing done - The following runs fine and has the expected output. - ``` - python examples/sumo/cooperative_merge.py - ``` - - ----- - - * Refactored ray dependencies and examples for integration tests; added integration test for an end-to-end ray (rllib) run using stabilizing_the_ring example. - - * separated tests into fast and slow tests, now that we have our first integration test - - * add ray install to travis - - * fix ray install for travis - - * fix ray install for travis - - * set up conda in travis - - * link ray in docker and add ray to pythonpath - - * oops my bad - - * not sure.. - - * linux version - - * remove docker - - * non-interactive linux setup for SUMO - - * add conda - - * switch order to see why ray install is failing - - * Partial implementation of two-level fcnet example - - * missing init - - * sigh - - * oops - - * BROKEN passing function through options - - * install ray from wheels - - * restructure config params, use cloudpickle - - * my bad - - * add ray testing branch - - * Manually move ray clone to site-packages - - * path - - * rllib - - * make sure - - * Cleanup - - * integration test for two-level policy - - * change env name to permit re-registration - - * missing test file - - * tensorflow - - * refactor to support multiple ray tests - - * add conda and opencv - - * minor edit - - * conda switches python versions? - - * install opencv without conda - - * download sumo build directly - - * fix - - * chmod - - * different ubuntu setup scripts - - * sumo build - ubuntu14.04 version - - * typo - - * add netconvert - - * python path - - * add data, indent stuff - - * wrong dir - - * opencv - - * py3.5 -> py3.6 (miniconda) to support opencv dependency of ray - - * updated travis - - * cleanup - - * cleanup, remove apt-get update; fix test? - - * remove linux setup - - * typo - - * integration test fix - - * organize examples by usage - - * rename files - - * fix tests - - * rename two level policy example - - * add rllib merge example; rename merge env - - * fix integration test - - * smaller sgd batch - - * Update params.py - - * merge sort fix - - * update merging env - - * non-two-level merge rllib example - - * fix labels - - * Partially observed version of merge env; usage example (cooperative_merge.py) - - * running partially observed merging env - - * fix test - - * Revised stabilizing the ring example - - * stabilizing the ring params - - * merge reverted this change - - * broken rllib visualizer - - * Operational rllib visualizer (basic); switched up merging scenario to place the RL agent in the inner ring - - * pass params was missing version - - * revise merge POMDP (state space was configured incorrectly) - - * comments from aboudy's code review - - * undo - - * handle nans - - * remove extra env creation; remove unneeded exception handling; cls --> agent_cls - - * Observation space was slightly wrong (was getting merging vehicles from the inner loop as well as the outer loop). Position 0 seems to correspond to both the inner and outer ring merge positions, so I added a check for vehicles that start with merge (= outer ring). I don't think this would make a huge difference for training though. - - * handle errors - - * augment reward to penalize headway variance - - * decrease weight on headway variance - - * merge - - * cleanup - - * cleanup - - * cleanup - - * cleaner printing of returns - - * base_env compute_reward defaults to 0 - -commit 3bdc9b98184797b0367aedec5f61cd1d75818a7b -Author: aboudy -Date: Sun Jan 7 12:40:53 2018 -0800 - - replaced max_acc with max_accel and max_deacc with max_decel - -commit b290ee4c9dec4c74fbe4494f6621e9cce93d12e9 -Author: Cathy Wu -Date: Sat Jan 6 17:56:08 2018 -0800 - - need to threshold on normalized position - -commit 24cb8a839778088eab1a46e72a938c733359b74c -Author: Cathy Wu -Date: Sat Jan 6 17:37:04 2018 -0800 - - safer defaults; more aggressive subpolicy split - -commit 3de4c629d6d683a3057d484b772fbe975a40d294 -Merge: 6a7fc7ae a3d7eeef -Author: Cathy Wu -Date: Sat Jan 6 14:13:13 2018 -0800 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic into merge_hierarchy - -commit a3d7eeefa2014f0664d077c345d97e966c60503e -Author: Cathy Wu -Date: Sat Jan 6 01:01:31 2018 -0800 - - POMDP merge experiment (#243) - - ## Summary - - - Fully operational POMDP merge experiment (1 learning agent, 16 IDM vehicles). - - `examples/rllib/cooperative_merge.py`: example script - - `flow/envs/two_loops_one_merging.py`: - - Observation space is the single RL vehicle, 2 vehicles preceding it, 2 vehicles following it, the next 2 vehicles to merge in, the queue length, and the average velocity of the inner and outer rings. - - Reward is a combination of the usual target velocity reward and a penalty on headway variance (with some hand-tuned trade-off) - - Introduces a reward function which penalizes headway variance. - - Catches errors in `base_env` which occur when vehicles teleport temporarily in SUMO. - - For a video of the performance, see `2018-01-05-TwoLoopsMergePOEnv-v0_PPO_2018-01-05_10-03-085dur9ua8-itr181-lower_headway_penality-slower-horizon1500.mov` (posted to Slack #emergentbehaviors). - - ---- - - - * Refactored ray dependencies and examples for integration tests; added integration test for an end-to-end ray (rllib) run using stabilizing_the_ring example. - - * separated tests into fast and slow tests, now that we have our first integration test - - * add ray install to travis - - * fix ray install for travis - - * fix ray install for travis - - * set up conda in travis - - * link ray in docker and add ray to pythonpath - - * oops my bad - - * not sure.. - - * linux version - - * remove docker - - * non-interactive linux setup for SUMO - - * add conda - - * switch order to see why ray install is failing - - * Partial implementation of two-level fcnet example - - * missing init - - * sigh - - * oops - - * BROKEN passing function through options - - * install ray from wheels - - * restructure config params, use cloudpickle - - * my bad - - * add ray testing branch - - * Manually move ray clone to site-packages - - * path - - * rllib - - * make sure - - * Cleanup - - * integration test for two-level policy - - * change env name to permit re-registration - - * missing test file - - * tensorflow - - * refactor to support multiple ray tests - - * add conda and opencv - - * minor edit - - * conda switches python versions? - - * install opencv without conda - - * download sumo build directly - - * fix - - * chmod - - * different ubuntu setup scripts - - * sumo build - ubuntu14.04 version - - * typo - - * add netconvert - - * python path - - * add data, indent stuff - - * wrong dir - - * opencv - - * py3.5 -> py3.6 (miniconda) to support opencv dependency of ray - - * updated travis - - * cleanup - - * cleanup, remove apt-get update; fix test? - - * remove linux setup - - * typo - - * integration test fix - - * organize examples by usage - - * rename files - - * fix tests - - * rename two level policy example - - * add rllib merge example; rename merge env - - * fix integration test - - * smaller sgd batch - - * Update params.py - - * merge sort fix - - * update merging env - - * non-two-level merge rllib example - - * fix labels - - * Partially observed version of merge env; usage example (cooperative_merge.py) - - * running partially observed merging env - - * fix test - - * Revised stabilizing the ring example - - * stabilizing the ring params - - * merge reverted this change - - * broken rllib visualizer - - * Operational rllib visualizer (basic); switched up merging scenario to place the RL agent in the inner ring - - * pass params was missing version - - * revise merge POMDP (state space was configured incorrectly) - - * comments from aboudy's code review - - * undo - - * handle nans - - * remove extra env creation; remove unneeded exception handling; cls --> agent_cls - - * Observation space was slightly wrong (was getting merging vehicles from the inner loop as well as the outer loop). Position 0 seems to correspond to both the inner and outer ring merge positions, so I added a check for vehicles that start with merge (= outer ring). I don't think this would make a huge difference for training though. - - * handle errors - - * augment reward to penalize headway variance - - * decrease weight on headway variance - - * cleanup - - * cleanup - - * cleanup - -commit 0238cccf6ebb0e81e810d3ea636fcd03cf51bfd3 -Author: Cathy Wu -Date: Fri Jan 5 21:20:51 2018 -0800 - - compute average return of rollouts; check that horizon is the same (or issue a warning); increase default number of rollouts (#238) - - ## Summary - - compute average return of rollouts - - check that horizon is the same between the experiment horizon and the rendering env horizon (issue a warning if different). The discrepancy is due to the fact that the rendering env horizon is set in the example file, and not from the loaded experiment horizon. - - increase default number of rollouts to 10 - -commit 6a7fc7ae5f272ccd3e3395dc717668cc58a57336 -Merge: a2c88343 0df1d34c -Author: Cathy Wu -Date: Fri Jan 5 20:56:59 2018 -0800 - - Merge branch 'merge' of https://github.com/cathywu/learning-traffic into merge_hierarchy - -commit 0df1d34c573aaf4156ce03a0853ed4ca371afd12 -Author: Cathy Wu -Date: Fri Jan 5 20:14:27 2018 -0800 - - cleanup - -commit 2b6b2e7f6028a83e144507238800ec95c4547ec7 -Author: Cathy Wu -Date: Fri Jan 5 20:05:36 2018 -0800 - - cleanup - -commit fb50ca1af8218352d31be6c16f4f1a7aa1bd759f -Author: Cathy Wu -Date: Fri Jan 5 20:03:54 2018 -0800 - - cleanup - -commit a2c8834343bae524602a7852756127348770fadf -Author: Cathy Wu -Date: Fri Jan 5 19:53:12 2018 -0800 - - partial implementation to replace cloudpickle function serialization - -commit 5915c22e553c69e8de0120db5b46acf58468ec7f -Author: Cathy Wu -Date: Fri Jan 5 17:45:37 2018 -0800 - - for reproducing segfault - -commit 193a7c5a6b793dc5e8dc23cca2c0beb2ad59ae12 -Merge: 3dfb19ce 5882e4e0 -Author: Cathy Wu -Date: Fri Jan 5 15:53:41 2018 -0800 - - Merge branch 'rllib_viz_logging' of https://github.com/cathywu/learning-traffic into merge_hierarchy - -commit 5882e4e004feaa1ebda61400e0f04e500ebbe308 -Author: Cathy Wu -Date: Fri Jan 5 15:47:53 2018 -0800 - - compute average return of rollouts; check that horizon is the same (or issue a warning); increase default number of rollouts - -commit 3dfb19ce3cd0de27af81c6dd4265ff492bfe704f -Merge: 64e8077d a72f3b4f -Author: Cathy Wu -Date: Fri Jan 5 14:41:08 2018 -0800 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic into merge_hierarchy - -commit a72f3b4f76447fc4427a9defa0be84a6e527fae0 -Author: nskh -Date: Fri Jan 5 17:10:44 2018 -0500 - - Fixing colors (#236) - - Resolves #232. - - Cyan remains as a color; just remove `COLORS[3]` at the top of `base_env.py` to get rid of that. I also updated the example usage of the rllib visualizer (v1.0). - - ---- - - * updated visualizer example usage - - * removed blue (0, 0, 255) but not cyan (0, 255, 255) - -commit c05cc3390e12eef50bed8f9e4d2e03d1678a39e9 -Author: aboudy -Date: Fri Jan 5 08:14:41 2018 -0800 - - modified names of environments - -commit 3c5345826a5a60725971d6745fd71cee39bb396b -Author: aboudy -Date: Fri Jan 5 07:47:01 2018 -0800 - - replaced add_vehicles with add and set_sumo_observations with update - -commit 64e8077d9090c15a1f5bf7f8e772eb2f16c91ca1 -Author: Cathy Wu -Date: Fri Jan 5 03:57:46 2018 -0800 - - two-level policy + POMDP merge - -commit cbaabac2a1943b6addd57113e1021eff857afa65 -Author: Cathy Wu -Date: Fri Jan 5 01:48:42 2018 -0800 - - decrease weight on headway variance - -commit 986947996453cec91615e58cff13eaf1afad567d -Merge: ce8364e5 899be271 -Author: Cathy Wu -Date: Thu Jan 4 23:57:56 2018 -0800 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic into merge - -commit 899be2718d8f603135159f30db7dd9f7ae9d2e46 -Author: nskh -Date: Fri Jan 5 01:26:01 2018 -0500 - - Completed rllib_visualizer (#233) - - * Refactored ray dependencies and examples for integration tests; added integration test for an end-to-end ray (rllib) run using stabilizing_the_ring example. - - * separated tests into fast and slow tests, now that we have our first integration test - - * add ray install to travis - - * fix ray install for travis - - * fix ray install for travis - - * set up conda in travis - - * link ray in docker and add ray to pythonpath - - * oops my bad - - * not sure.. - - * linux version - - * remove docker - - * non-interactive linux setup for SUMO - - * add conda - - * switch order to see why ray install is failing - - * Partial implementation of two-level fcnet example - - * missing init - - * sigh - - * oops - - * BROKEN passing function through options - - * install ray from wheels - - * restructure config params, use cloudpickle - - * my bad - - * add ray testing branch - - * Manually move ray clone to site-packages - - * path - - * rllib - - * make sure - - * Cleanup - - * integration test for two-level policy - - * change env name to permit re-registration - - * missing test file - - * tensorflow - - * refactor to support multiple ray tests - - * add conda and opencv - - * minor edit - - * conda switches python versions? - - * install opencv without conda - - * download sumo build directly - - * fix - - * chmod - - * different ubuntu setup scripts - - * sumo build - ubuntu14.04 version - - * typo - - * add netconvert - - * python path - - * add data, indent stuff - - * wrong dir - - * opencv - - * py3.5 -> py3.6 (miniconda) to support opencv dependency of ray - - * updated travis - - * cleanup - - * cleanup, remove apt-get update; fix test? - - * remove linux setup - - * typo - - * integration test fix - - * organize examples by usage - - * rename files - - * fix tests - - * rename two level policy example - - * add rllib merge example; rename merge env - - * fix integration test - - * smaller sgd batch - - * Update params.py - - * merge sort fix - - * update merging env - - * non-two-level merge rllib example - - * fix labels - - * Partially observed version of merge env; usage example (cooperative_merge.py) - - * running partially observed merging env - - * fix test - - * Revised stabilizing the ring example - - * stabilizing the ring params - - * merge reverted this change - - * broken rllib visualizer - - * Operational rllib visualizer (basic); switched up merging scenario to place the RL agent in the inner ring - - * pass params was missing version - - * revise merge POMDP (state space was configured incorrectly) - - * comments from aboudy's code review - - * undo - - * handle nans - - * remove extra env creation; remove unneeded exception handling; cls --> agent_cls - - * revert merge (moved development to branch merge) - - * revert merge (moved development to branch merge) - - * progress towards params.json support - - * got params.json support working (changed input formats to enable this) - - * fixed typo - - * i think visualizer support for generic envs works now... testing - - * updated cooperative_merge to take in a sumo binary - - * changes to experiment runner files - - * tweaks cathy suggested in PR - -commit ce8364e53c5119b891979af0bb51d31991534be9 -Author: Cathy Wu -Date: Thu Jan 4 15:36:01 2018 -0800 - - augment reward to penalize headway variance - -commit 3104d9ede5aec2d8f6bb208146b1e72f1fab203f -Merge: 1bf5edac c7b35f35 -Author: Cathy Wu -Date: Thu Jan 4 13:50:17 2018 -0800 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic into merge - -commit c7b35f35aefb413aeae007a208ecdcebf77e24ac -Author: Cathy Wu -Date: Thu Jan 4 13:48:47 2018 -0800 - - rllib visualizer and 1-RL cooperative merging scenario (#230) - - ## Summary - - Prerequisite: PR #229. - - - Introduces a basic rllib visualizer, which loads a checkpoint saved by rllib during training and renders using `sumo-gui`. See #188. - - example usage: - `./visualizer_rllib.py /tmp/ray/checkpoint_dir/checkpoint-0 --run PPO - --flowenv TwoLoopsMergePOEnv` - - Currently supports `TwoLoopsMergePOEnv` and `TwoLoopsMergeEnv` - - Moves and renames the rllab visualizer. - - ----- - - * Refactored ray dependencies and examples for integration tests; added integration test for an end-to-end ray (rllib) run using stabilizing_the_ring example. - - * separated tests into fast and slow tests, now that we have our first integration test - - * add ray install to travis - - * fix ray install for travis - - * fix ray install for travis - - * set up conda in travis - - * link ray in docker and add ray to pythonpath - - * oops my bad - - * not sure.. - - * linux version - - * remove docker - - * non-interactive linux setup for SUMO - - * add conda - - * switch order to see why ray install is failing - - * Partial implementation of two-level fcnet example - - * missing init - - * sigh - - * oops - - * BROKEN passing function through options - - * install ray from wheels - - * restructure config params, use cloudpickle - - * my bad - - * add ray testing branch - - * Manually move ray clone to site-packages - - * path - - * rllib - - * make sure - - * Cleanup - - * integration test for two-level policy - - * change env name to permit re-registration - - * missing test file - - * tensorflow - - * refactor to support multiple ray tests - - * add conda and opencv - - * minor edit - - * conda switches python versions? - - * install opencv without conda - - * download sumo build directly - - * fix - - * chmod - - * different ubuntu setup scripts - - * sumo build - ubuntu14.04 version - - * typo - - * add netconvert - - * python path - - * add data, indent stuff - - * wrong dir - - * opencv - - * py3.5 -> py3.6 (miniconda) to support opencv dependency of ray - - * updated travis - - * cleanup - - * cleanup, remove apt-get update; fix test? - - * remove linux setup - - * typo - - * integration test fix - - * organize examples by usage - - * rename files - - * fix tests - - * rename two level policy example - - * add rllib merge example; rename merge env - - * fix integration test - - * smaller sgd batch - - * Update params.py - - * merge sort fix - - * update merging env - - * non-two-level merge rllib example - - * fix labels - - * Partially observed version of merge env; usage example (cooperative_merge.py) - - * running partially observed merging env - - * fix test - - * Revised stabilizing the ring example - - * stabilizing the ring params - - * merge reverted this change - - * broken rllib visualizer - - * Operational rllib visualizer (basic); switched up merging scenario to place the RL agent in the inner ring - - * pass params was missing version - - * revise merge POMDP (state space was configured incorrectly) - - * comments from aboudy's code review - - * undo - - * handle nans - - * remove extra env creation; remove unneeded exception handling; cls --> agent_cls - - * revert merge (moved development to branch merge) - - * revert merge (moved development to branch merge) - -commit 1bf5edac13f047317269a62de9e6502fe83c76eb -Author: Cathy Wu -Date: Wed Jan 3 02:36:32 2018 -0800 - - handle errors - -commit 3d6e9aa2d5c5ec4f8fdf43baa1d4d32ecf894632 -Author: Cathy Wu -Date: Wed Jan 3 02:28:10 2018 -0800 - - Observation space was slightly wrong (was getting merging vehicles from the inner loop as well as the outer loop). Position 0 seems to correspond to both the inner and outer ring merge positions, so I added a check for vehicles that start with merge (= outer ring). I don't think this would make a huge difference for training though. - -commit a72a8f51b22d30342820621e47bb1eda08c9d69c -Author: Cathy Wu -Date: Wed Jan 3 01:47:49 2018 -0800 - - remove extra env creation; remove unneeded exception handling; cls --> agent_cls - -commit f5bb48ad667e1934140039a485c18c150e6a1bd7 -Author: Cathy Wu -Date: Tue Jan 2 16:18:10 2018 -0800 - - handle nans - -commit 136dd0779ff5644d99a9350082661af61321cd56 -Author: Cathy Wu -Date: Tue Jan 2 16:08:13 2018 -0800 - - undo - -commit df90f8ae1d1ca54913f0a394a16bdfa80b55e30e -Merge: f100de17 c3528400 -Author: Cathy Wu -Date: Tue Jan 2 15:33:43 2018 -0800 - - merge - -commit f100de176509df61a72d6c942fb703e5d1cfa6f8 -Author: Cathy Wu -Date: Tue Jan 2 15:30:34 2018 -0800 - - comments from aboudy's code review - -commit c35284007cc1ad7d87d370b19adeb4ed153b82dc -Author: Cathy Wu -Date: Tue Jan 2 15:29:53 2018 -0800 - - Fully and partially observable merging examples (rllib) (#229) - - ## Summary - - Prerequisite: PR #226. - - - Introduces partially observable merge environment, which observes a few vehicles preceding and following the RL vehicle (only 1 allowed for now), as well as the first few vehicles nearest to the merge point. - - Added a few attributes to `flow/scenarios/two_loops_one_merging_new/scenario.py` to support this. - - Adds a run script for this merge POMDP (`cooperative_merge.py`) - - ---- - - * Refactored ray dependencies and examples for integration tests; added integration test for an end-to-end ray (rllib) run using stabilizing_the_ring example. - - * separated tests into fast and slow tests, now that we have our first integration test - - * add ray install to travis - - * fix ray install for travis - - * fix ray install for travis - - * set up conda in travis - - * link ray in docker and add ray to pythonpath - - * oops my bad - - * not sure.. - - * linux version - - * remove docker - - * non-interactive linux setup for SUMO - - * add conda - - * switch order to see why ray install is failing - - * Partial implementation of two-level fcnet example - - * missing init - - * sigh - - * oops - - * BROKEN passing function through options - - * install ray from wheels - - * restructure config params, use cloudpickle - - * my bad - - * add ray testing branch - - * Manually move ray clone to site-packages - - * path - - * rllib - - * make sure - - * Cleanup - - * integration test for two-level policy - - * change env name to permit re-registration - - * missing test file - - * tensorflow - - * refactor to support multiple ray tests - - * add conda and opencv - - * minor edit - - * conda switches python versions? - - * install opencv without conda - - * download sumo build directly - - * fix - - * chmod - - * different ubuntu setup scripts - - * sumo build - ubuntu14.04 version - - * typo - - * add netconvert - - * python path - - * add data, indent stuff - - * wrong dir - - * opencv - - * py3.5 -> py3.6 (miniconda) to support opencv dependency of ray - - * updated travis - - * cleanup - - * cleanup, remove apt-get update; fix test? - - * remove linux setup - - * typo - - * integration test fix - - * organize examples by usage - - * rename files - - * fix tests - - * rename two level policy example - - * add rllib merge example; rename merge env - - * fix integration test - - * smaller sgd batch - - * Update params.py - - * merge sort fix - - * update merging env - - * non-two-level merge rllib example - - * fix labels - - * Partially observed version of merge env; usage example (cooperative_merge.py) - - * running partially observed merging env - - * fix test - - * Revised stabilizing the ring example - - * stabilizing the ring params - - * merge reverted this change - - * pass params was missing version - -commit db71fae045b84e5c176eb0511ce5b5507773e428 -Merge: 126b8527 e3021210 -Author: Cathy Wu -Date: Tue Jan 2 15:27:07 2018 -0800 - - Merge branch 'merge_rllib' of https://github.com/cathywu/learning-traffic into rllib_visualizer - -commit 126b8527625559cdc0b510275b14709fea16a310 -Author: Cathy Wu -Date: Tue Jan 2 15:25:13 2018 -0800 - - revise merge POMDP (state space was configured incorrectly) - -commit e30212108bdca46b13195d21514d42d42f5ce588 -Merge: 8cde92c9 c228de73 -Author: Cathy Wu -Date: Tue Jan 2 13:18:38 2018 -0800 - - merge - -commit c228de73e06761d75aea96067f636af881753089 -Author: Cathy Wu -Date: Tue Jan 2 13:17:13 2018 -0800 - - Hierarchical policy example (#226) - - ## Summary - - Prerequisite PR: #225. - - - `examples/rllib/ring_two_level_policy.py`: Example usage of two-level (hierarchical) policies in rllib (currently only in `cathywu/ray:testing` and `cathywu/ray:hierarchy`). - - Refactor `stabilizing_the_ring` example for re-use in integration tests and two-level policy usage example. - - Added integration test for two-level policy in rllib. - - Somewhat more tuned parameters for `stabilizing_the_ring` rllib example. - - ----- - - * Refactored ray dependencies and examples for integration tests; added integration test for an end-to-end ray (rllib) run using stabilizing_the_ring example. - - * separated tests into fast and slow tests, now that we have our first integration test - - * add ray install to travis - - * fix ray install for travis - - * fix ray install for travis - - * set up conda in travis - - * link ray in docker and add ray to pythonpath - - * oops my bad - - * not sure.. - - * linux version - - * remove docker - - * non-interactive linux setup for SUMO - - * add conda - - * switch order to see why ray install is failing - - * Partial implementation of two-level fcnet example - - * missing init - - * sigh - - * oops - - * BROKEN passing function through options - - * install ray from wheels - - * restructure config params, use cloudpickle - - * my bad - - * add ray testing branch - - * Manually move ray clone to site-packages - - * path - - * rllib - - * make sure - - * Cleanup - - * integration test for two-level policy - - * change env name to permit re-registration - - * missing test file - - * tensorflow - - * refactor to support multiple ray tests - - * add conda and opencv - - * minor edit - - * conda switches python versions? - - * install opencv without conda - - * download sumo build directly - - * fix - - * chmod - - * different ubuntu setup scripts - - * sumo build - ubuntu14.04 version - - * typo - - * add netconvert - - * python path - - * add data, indent stuff - - * wrong dir - - * opencv - - * py3.5 -> py3.6 (miniconda) to support opencv dependency of ray - - * updated travis - - * cleanup - - * cleanup, remove apt-get update; fix test? - - * remove linux setup - - * typo - - * integration test fix - - * organize examples by usage - - * fix tests - - * rename two level policy example - - * Update params.py - - * Revised stabilizing the ring example - - * stabilizing the ring params - - * merge reverted this change - - * pass params was missing version - -commit 13e969e69c9869ba05731123c7370c4e52bd213a -Merge: eea957a5 8cde92c9 -Author: Cathy Wu -Date: Tue Jan 2 12:27:48 2018 -0800 - - Merge branch 'merge_rllib' of https://github.com/cathywu/learning-traffic into rllib_visualizer - -commit 8cde92c96a14c5e29a34b4d9d3dfd7b1007a9a0a -Merge: 45d9107f a7a5cae5 -Author: Cathy Wu -Date: Tue Jan 2 12:26:17 2018 -0800 - - merge - -commit a7a5cae51dae079c6fcf389113d3f5a935fc5bd3 -Merge: d923582d 63233423 -Author: Cathy Wu -Date: Tue Jan 2 12:25:26 2018 -0800 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic into hierarchy - -commit 6323342362062d6076a469eddaf9ed5776dc56f0 -Author: AboudyKreidieh -Date: Tue Jan 2 12:25:11 2018 -0800 - - modified reset() to work with collisions and open networks (#231) - - This PR modifies the `_reset()` function in `base_env` to work with open networks and networks where collisions might occur. Resolves an issue mentioned in #228 - -commit d923582dbec53e7264b6b70605966f8c2cef26ff -Merge: 6f74bf0f 1fac095f -Author: Cathy Wu -Date: Tue Jan 2 10:03:38 2018 -0800 - - merge - -commit 1fac095f01a84f39e86e1b1c09a17e5349ebdd2d -Merge: c18e993f 0dbd6ac9 -Author: aboudy -Date: Tue Jan 2 09:32:51 2018 -0800 - - This adds support for importing OpenStreetMap networks. - - Prerequisite: PR #221 - - Changes: - - created osm generator and scenario classes - - added import method for .net.xml files to collect edge data for use by the scenario class - - added `osm_path` attribute to `NetParams` - -commit 0dbd6ac963638b4537faa23582c84811c7a639cf -Merge: edf624cf c18e993f -Author: Cathy Wu -Date: Tue Jan 2 00:54:51 2018 -0800 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic into osm_support - -commit eea957a5bfbc6f54a88e8bbb5a04a0f8914700e0 -Merge: 149f69c2 45d9107f -Author: Cathy Wu -Date: Tue Jan 2 00:53:38 2018 -0800 - - merge - -commit 45d9107f62fbb9d7f8bd8d3cdac8389eb87a9beb -Merge: 770abc1e 6f74bf0f -Author: Cathy Wu -Date: Tue Jan 2 00:52:00 2018 -0800 - - merge - -commit 6f74bf0f97bf9a7a9377e2faf80db4049b578470 -Author: Cathy Wu -Date: Tue Jan 2 00:49:53 2018 -0800 - - pass params was missing version - -commit 149f69c232773ad0e215c5ae5b535bf73e9ff6f3 -Author: Cathy Wu -Date: Tue Jan 2 00:25:55 2018 -0800 - - Operational rllib visualizer (basic); switched up merging scenario to place the RL agent in the inner ring - -commit 96bf5d48eadb4bf5a5419a853a7e42e6d88318c1 -Author: Cathy Wu -Date: Mon Jan 1 22:22:02 2018 -0800 - - broken rllib visualizer - -commit 18d41f36c53687750506dcd30ed6ca527656f84a -Author: Cathy Wu -Date: Mon Jan 1 21:25:53 2018 -0800 - - merge reverted this change - -commit 67e793e098acf259b3c343a6bf630d193f7890bb -Author: Cathy Wu -Date: Mon Jan 1 20:32:19 2018 -0800 - - stabilizing the ring params - -commit 35f7404bb048af431e72006cd70d231400e9a0b9 -Merge: 0d4518a7 c18e993f -Author: Cathy Wu -Date: Mon Jan 1 20:27:32 2018 -0800 - - merge - -commit 0d4518a78ddf816dfca6af3cc3a7208bba1b549b -Merge: 5eb0a9d1 ddf61ca7 -Author: Cathy Wu -Date: Mon Jan 1 20:26:06 2018 -0800 - - Merge branch 'hierarchy' of https://github.com/cathywu/learning-traffic into hierarchy - -commit 5eb0a9d1134691886073d5f8e8e4c45330bb3691 -Author: Cathy Wu -Date: Mon Jan 1 20:26:03 2018 -0800 - - Revised stabilizing the ring example - -commit 770abc1ec329acb169203730b9ebad3238a5d328 -Author: Cathy Wu -Date: Mon Jan 1 20:16:41 2018 -0800 - - fix test - -commit f8e3663765dcb1be0826a061c7f748838ccd3e7f -Merge: 59db4aba c18e993f -Author: Cathy Wu -Date: Mon Jan 1 20:14:44 2018 -0800 - - merge - -commit 59db4aba975f214050294696df9b16ddae0b7fad -Author: Cathy Wu -Date: Mon Jan 1 20:02:15 2018 -0800 - - running partially observed merging env - -commit c18e993f595d3b82b48eb29d9e83311874b98129 -Author: Cathy Wu -Date: Mon Jan 1 19:47:07 2018 -0800 - - Two-loop merge example (#227) - - ## Summary - - Prerequisite PR: #225. - - - Pulls "straight" merge example (uses `flow.scenarios.two_loops_one_merging_new`) out of `braess_merges_experiments`. - - Renames files slightly - - ----- - - * organize examples by usage - - * rename files - - * fix tests - - * update merging env - -commit ff3223ec76a2697dd814d4fbe1a9542ef8fa2838 -Author: Cathy Wu -Date: Mon Jan 1 18:19:55 2018 -0800 - - Partially observed version of merge env; usage example (cooperative_merge.py) - -commit d3c108d130ccc8eac41dd0ae52231d3c1c13c7c8 -Author: Cathy Wu -Date: Mon Jan 1 17:22:49 2018 -0800 - - fix labels - -commit 7caeeabf9cbb327fd124491b8d208466590c2d58 -Author: Cathy Wu -Date: Mon Jan 1 17:14:42 2018 -0800 - - non-two-level merge rllib example - -commit 28601daed2620396b846b78794150aa3a624a8a5 -Merge: a9854cbe da03fd1b -Author: Cathy Wu -Date: Mon Jan 1 17:06:41 2018 -0800 - - merge - -commit da03fd1bde5d2d4836e11def61d19dcc2d4c2b6b -Author: Cathy Wu -Date: Mon Jan 1 17:03:28 2018 -0800 - - update merging env - -commit ed68b20a96103c74d37afbe6fd0f35c58aa86e32 -Merge: af72ca74 f86b1d33 -Author: Cathy Wu -Date: Mon Jan 1 17:01:32 2018 -0800 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic into merge_hierarchy - -commit a9854cbe8a3801c2e3b24d2a95c01d0939c13b04 -Author: Cathy Wu -Date: Mon Jan 1 16:54:19 2018 -0800 - - merge sort fix - -commit f86b1d33031bcfecc3d700ef76deb944252e0076 -Author: Cathy Wu -Date: Mon Jan 1 16:24:48 2018 -0800 - - Organize examples by usage (#225) - - ## Summary - - Organizes flow examples by usage, resolves #219. - - `examples/sumo`: contains versions that do not use RL. This is primarily used for baseline examples (without RL control), debugging, and playing out and visualizing a network. - - `examples/rllab`: contains rllab versions. These have RL control via rllab. - - `examples/rllib`: contains rllib versions. These have RL control via rllib. - - Renamed examples to use underscores instead of dashes; removed "rl", "test", and "ray" from filenames. - - ---- - - * organize examples by usage - - * fix tests - -commit ddf61ca79567cf5fc236176145a6cec0f0bef2b4 -Author: AboudyKreidieh -Date: Mon Jan 1 16:00:42 2018 -0800 - - Update params.py - -commit edf624cf49136d103bc423bdfa6385c605886b0c -Author: aboudy -Date: Mon Jan 1 15:57:25 2018 -0800 - - test fix - -commit 0d834c6fd63f1722e88f758b04d51a8b7ae21454 -Author: Cathy Wu -Date: Mon Jan 1 15:16:33 2018 -0800 - - smaller sgd batch - -commit 0bb2916e474b52c561d8221b832b76b37cf3f9c1 -Author: Cathy Wu -Date: Mon Jan 1 15:12:21 2018 -0800 - - fix integration test - -commit 910c2a72183f1d68104a61b3d99608e9bc990751 -Author: Cathy Wu -Date: Mon Jan 1 15:01:22 2018 -0800 - - add rllib merge example; rename merge env - -commit c7aade74ea0809c5af4cc68635909c0af0bef446 -Merge: af72ca74 2cdcd73e -Author: Cathy Wu -Date: Mon Jan 1 14:38:15 2018 -0800 - - Merge branch 'hierarchy' of https://github.com/cathywu/learning-traffic into merge_rllib - -commit 2cdcd73e3e7bb71fc009631e40a3a79c82b9e575 -Author: Cathy Wu -Date: Mon Jan 1 14:16:24 2018 -0800 - - rename two level policy example - -commit 6e14567dc57abb821aa3df4cfe06c115e7bcd0a9 -Merge: 772cd383 4094b085 -Author: Cathy Wu -Date: Mon Jan 1 14:12:53 2018 -0800 - - merge - -commit 772cd383a0a1676d827bcafa2f02fb53db36214c -Merge: e90bc982 67a4de8a -Author: Cathy Wu -Date: Mon Jan 1 14:11:43 2018 -0800 - - merge - -commit af72ca74ebda9daf2fc38aec69d14ea59d7cd5c1 -Merge: 98a8c0ca 4094b085 -Author: Cathy Wu -Date: Mon Jan 1 14:07:05 2018 -0800 - - Merge branch 'organize_examples' of https://github.com/cathywu/learning-traffic into merge_hierarchy - -commit 4094b08539889a3ab399f87c60418642b97dc11f -Merge: baeb011f 67a4de8a -Author: Cathy Wu -Date: Mon Jan 1 14:06:07 2018 -0800 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic into organize_examples - -commit baeb011fc3ce174bf2342bc9564877f6215e749f -Author: Cathy Wu -Date: Mon Jan 1 14:05:53 2018 -0800 - - fix tests - -commit 67a4de8af7347cc0894ecbc67b281f3fa6af3dde -Author: Cathy Wu -Date: Mon Jan 1 14:02:57 2018 -0800 - - Documentation on edge types for network generation (#224) - - * Documentation on edge types for network generation - - * correction - - * Clarified distinction between edge types and edge data; refactored - -commit 98a8c0ca3dd876ee8b1eeefb95c3d178bda24c51 -Author: Cathy Wu -Date: Mon Jan 1 14:02:02 2018 -0800 - - rename files - -commit c81fb5b908e02ad1c6c8804fb9fa2f6341e38b22 -Merge: c0ae5d43 d1c1367c -Author: aboudy -Date: Mon Jan 1 14:01:14 2018 -0800 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic into osm_support - -commit d1c1367c7983b8a58a9c72d1b14166d383e084dc -Merge: 60650c91 708057ad -Author: aboudy -Date: Mon Jan 1 13:58:42 2018 -0800 - - Merge branch 'variable_num_lanes_support' - -commit 5c231846407899fcd5d47465e7b50e9695b8d063 -Author: Cathy Wu -Date: Mon Jan 1 13:52:25 2018 -0800 - - organize examples by usage - -commit 708057ade918c23646f273d49eeaee2d2897e24d -Author: aboudy -Date: Mon Jan 1 12:38:17 2018 -0800 - - PR fix - -commit 6031d1fb243218bcca0ce42c1e2a5ea04bfe8276 -Merge: 343d3438 60650c91 -Author: aboudy -Date: Mon Jan 1 12:14:01 2018 -0800 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic into variable_num_lanes_support - -commit 60650c91947c37c25c4d5ab828dd42ecaef4aa94 -Merge: 0cf3355f 25478990 -Author: aboudy -Date: Mon Jan 1 12:10:51 2018 -0800 - - This is a prelude to supporting starting positions and lane-change methods for networks with variable number of lanes per edge. It introduces a few methods to the scenario class that allow us to access some edge information as we need it. - - Changes: - - generator provides edge data - reorganized components of scenario class - added speed_limit(), edge_length(), num_lanes() to scenario class to get specific edge data - removed rerouters from generator class - tests to verify the new functions work - -commit c0ae5d43eef7767c512c7802e31b61e656be2702 -Author: aboudy -Date: Mon Jan 1 08:27:45 2018 -0800 - - test bug fix - -commit fd14bc2e82616af480228cc2ecfddf17f3b49d22 -Merge: ad9a1880 343d3438 -Author: aboudy -Date: Mon Jan 1 07:54:30 2018 -0800 - - Merge branch 'variable_num_lanes_support' of https://github.com/cathywu/learning-traffic into osm_support - -commit 343d34385f42cd703375ec6e9875bd630a8e8d25 -Author: aboudy -Date: Mon Jan 1 07:52:38 2018 -0800 - - test bug fix - -commit ad9a188004a6a515dc4644dd7aae02c89d38afdf -Author: aboudy -Date: Mon Jan 1 07:27:21 2018 -0800 - - created osm generator and scenario - -commit cfae8914def6f352950896b6104025a7f6b44ac2 -Merge: 7230e062 25478990 -Author: aboudy -Date: Mon Jan 1 06:58:39 2018 -0800 - - Merge branch 'scenario_edge_methods' of https://github.com/cathywu/learning-traffic into modified_starting_positions - -commit 25478990e204dffea6594fd2d5e9856c1ff3cfb6 -Merge: dc80f94b 0cf3355f -Author: aboudy -Date: Mon Jan 1 02:58:48 2018 -0800 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic into scenario_edge_methods - -commit 0cf3355f951d9eb229efa9459423049f48059ff3 -Merge: 2491677a 6d95cc3f -Author: aboudy -Date: Mon Jan 1 02:50:55 2018 -0800 - - Adds support for vehicles entering and exiting a network: - - changes: - - added a `Vehicles.remove_vehicle()` method to prevent the experiment from crashing once a vehicle leaves. - - built up support for inflows for vehicles of different types in different edges. This also works with flow-controlled vehicles and, potentially, rl vehicles. - - added some tests for the `Vehicles` class - - created a multi-lane highway network - -commit 6d95cc3f7ba2e9950e514f9575628e2c3edc6391 -Merge: 13cde797 d692079a -Author: aboudy -Date: Mon Jan 1 02:19:52 2018 -0800 - - Merge branch 'headway_fix' of https://github.com/cathywu/learning-traffic into entering_exiting_vehicles - -commit 13cde7973b0cd7fb2841cda0cebf91ae0644dbe9 -Author: aboudy -Date: Mon Jan 1 02:09:53 2018 -0800 - - review_fixes - -commit 41739fa9711f6cb3f9a0f4a0a9b1af77037a614c -Merge: ed43e1cf e0929851 -Author: aboudy -Date: Mon Jan 1 01:37:18 2018 -0800 - - Merge branch 'entering_exiting_vehicles' of https://github.com/cathywu/learning-traffic into entering_exiting_vehicles - -commit ed43e1cfc6fa6665e0bc0bcb5f6b4e4a36f0e1f4 -Merge: a58ec952 2491677a -Author: aboudy -Date: Mon Jan 1 01:36:15 2018 -0800 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic into entering_exiting_vehicles - -commit e90bc98255c6fd28491b223d43bca1063ec2967a -Author: Cathy Wu -Date: Sun Dec 31 02:26:25 2017 -0800 - - integration test fix - -commit 7230e062cd6d03ab3535fe5353d3fcb86e213f0f -Author: aboudy -Date: Sun Dec 31 00:32:11 2017 -0800 - - added starting position test for networks with variable lanes per edges - -commit 91ae8a51fe6a9c2a3169c753bc4e312b27419e00 -Merge: a3a66291 2491677a -Author: Cathy Wu -Date: Sat Dec 30 15:37:39 2017 -0800 - - merge - -commit d692079ae90a8c9e0d922f142e4a06dbff56c9dc -Merge: b77ecaf2 2491677a -Author: Cathy Wu -Date: Sat Dec 30 15:30:41 2017 -0800 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic into headway_fix - -commit e0929851f0a85521f09c2d16ba4e678a736ce130 -Merge: a58ec952 2491677a -Author: Cathy Wu -Date: Sat Dec 30 15:30:04 2017 -0800 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic into entering_exiting_vehicles - -commit 2491677a20768f5d459dd94b83c96e89afb36328 -Author: Cathy Wu -Date: Sat Dec 30 15:28:48 2017 -0800 - - Integration testing and fast Travis builds (#216) - - ## Summary - - The following changes make the Travis build 7x faster and support a new dependency (`ray`) so that we can have integration tests. This PR supercedes PR #214 (no longer needed). - - In `.travis.yml`: - - Deprecates `rllab` (no longer installs it) - - Supports `ray/rllib` and its missing dependencies - - Installs ray from whl. This reduces ray "build" time from 10 minutes to 2.5 minutes. See #208. - - Installs local rllib changes by copying over `cathywu/ray:testing` branch - - Removes dependence on docker build (had a lot of trouble integrating ray) - - Supports manually built SUMO binaries and python tools (hosted on AWS S3). This reduces the SUMO "build" time from 20 minutes to ~20 seconds. :) Resolves #208. Resolves #215 (not doing this). - - In ` tests/slow_tests/test_ray.py`: - - Introduces first integration test, which tests a ray/rllib + flow example (based on `stabilizing_the_ring_ray`). - - Additional changes: - - Refactoring to support this integration test. - - `flow/utils/tuple_preprocessor.py`: Moved preprocessor for ease of importing - - `examples/stabilizing_the_ring_ray.py`: re-organized code so that `create_env` can be imported without triggering `ray.init()`, etc. - - Split up fast tests from slow tests - - Creates different linux instructions for Ubuntu 14.04 and 16.04. Resolves #211. The Ubuntu 14.04 version is used to manually build a SUMO binary for use in `.travis.yml`. The Ubuntu 16.04 version was formerly the "linux" setup script. - - Renames wave attenuation env in accordance with #207. - - ---- - - Instead of 30 minutes, testing now takes 5 minutes (4 minutes setup time instead of 29). The breakdown is as follows: - - 114s: opencv [ray] - - 72s: nose2 (including a 40s integration test and 64 unit tests) - - 20s: ray - - 17s: conda [opencv] - - 19s: sumo - - 14s: tensorflow - - ------- - - * Refactored ray dependencies and examples for integration tests; added integration test for an end-to-end ray (rllib) run using stabilizing_the_ring example. - - * separated tests into fast and slow tests, now that we have our first integration test - - * add ray install to travis - - * fix ray install for travis - - * fix ray install for travis - - * set up conda in travis - - * link ray in docker and add ray to pythonpath - - * oops my bad - - * not sure.. - - * linux version - - * remove docker - - * non-interactive linux setup for SUMO - - * add conda - - * switch order to see why ray install is failing - - * sigh - - * oops - - * install ray from wheels - - * my bad - - * add ray testing branch - - * Manually move ray clone to site-packages - - * path - - * rllib - - * make sure - - * Cleanup - - * missing test file - - * tensorflow - - * add conda and opencv - - * conda switches python versions? - - * install opencv without conda - - * updated travis - - * cleanup - - * cleanup, remove apt-get update; fix test? - - * remove linux setup - -commit 01331da3d56791c507ed17d6e486e8922f335814 -Author: aboudy -Date: Sat Dec 30 14:46:46 2017 -0800 - - added starting position support for networks with different number of lanes per edge - -commit 3cb05c66aea220019f4ec4fd78193f16e67e4381 -Author: aboudy -Date: Sat Dec 30 14:07:29 2017 -0800 - - support of variable num_lanes lane-changing - -commit dc80f94b3af0b8959eadf188800b48949e8609c6 -Author: aboudy -Date: Sat Dec 30 09:57:52 2017 -0800 - - tests for new methods in the scenario class - -commit 2d1ccb69af3c914fe9b74239661cddf43cd5065e -Author: aboudy -Date: Sat Dec 30 09:29:01 2017 -0800 - - added methods to get edge data from the scenario class - -commit b77ecaf21e1ad7810dfb90d951c9f0241ceb1090 -Author: aboudy -Date: Sat Dec 30 09:04:59 2017 -0800 - - bug fixes - -commit a58ec9521d909e1b16ad37a10757ec092fc87971 -Author: aboudy -Date: Fri Dec 29 09:55:44 2017 -0800 - - cleanup to vehicles class - -commit 0bdaafa661e652c339987d09bcd308949cc8be81 -Author: aboudy -Date: Fri Dec 29 09:21:02 2017 -0800 - - added support to inflows - -commit a3a662919d762b08fb5b21e9348c9c5f8172e3df -Author: Cathy Wu -Date: Fri Dec 29 04:34:55 2017 -0800 - - typo - -commit 5bd37a29efb8cecbc11afbd85047982907e2aeea -Author: aboudy -Date: Fri Dec 29 03:53:05 2017 -0800 - - added method to remove vehicles vehicle from the Vehicles class once it leaves the network - -commit d6b88bd725faeec1a15e62d885dfc11ebe84ea90 -Merge: cb0181eb d473b5ba -Author: Cathy Wu -Date: Fri Dec 29 03:41:25 2017 -0800 - - Merge branch 'ray_test' of https://github.com/cathywu/learning-traffic into hierarchy - -commit d473b5ba5d4b76ec91c9831192a176703cc748c0 -Author: Cathy Wu -Date: Fri Dec 29 03:35:17 2017 -0800 - - remove linux setup - -commit cb0181eba18ffb65c3d58e0c3d8e5508590f6dbe -Merge: 9aa97bc0 0782ba52 -Author: Cathy Wu -Date: Fri Dec 29 03:06:08 2017 -0800 - - merge - -commit 0782ba5258c16ffa86e6317be09a4d256937a4d4 -Author: Cathy Wu -Date: Fri Dec 29 03:04:17 2017 -0800 - - cleanup, remove apt-get update; fix test? - -commit 5470beb0699654eb6df3d1f256639c7323f5a924 -Author: aboudy -Date: Fri Dec 29 03:02:00 2017 -0800 - - created highway scenario - -commit a8902ecb0374c2f8431bae5dddb31aa6ee402666 -Author: Cathy Wu -Date: Fri Dec 29 02:57:03 2017 -0800 - - cleanup - -commit 5b371d53c124b44688d8811e8c84c5158f31f46d -Author: Cathy Wu -Date: Fri Dec 29 02:49:40 2017 -0800 - - updated travis - -commit 9aa97bc0c7c356d25b39a7f798b6bca1a98f7713 -Author: Cathy Wu -Date: Fri Dec 29 02:48:03 2017 -0800 - - py3.5 -> py3.6 (miniconda) to support opencv dependency of ray - -commit 3003a695128e198868a124684fefc8b9e61dab6a -Author: Cathy Wu -Date: Fri Dec 29 02:00:13 2017 -0800 - - opencv - -commit 8a9ba73c487388ee3ae94ef6bf22657605253b6d -Author: Cathy Wu -Date: Fri Dec 29 01:53:05 2017 -0800 - - wrong dir - -commit 5b84fef59d37cd11250cb5bda46c6996c5dcf2fd -Author: Cathy Wu -Date: Fri Dec 29 01:48:16 2017 -0800 - - add data, indent stuff - -commit 2fa33c013c877646bc6e15f9a1a2577764e1a46d -Author: Cathy Wu -Date: Fri Dec 29 01:32:31 2017 -0800 - - python path - -commit e61a4ffb5adcf08eac6e3bfa7d0e666aece605f3 -Author: Cathy Wu -Date: Fri Dec 29 01:25:54 2017 -0800 - - add netconvert - -commit 187afc9b3f4626dfd30112803604fe22204500d1 -Author: Cathy Wu -Date: Fri Dec 29 01:12:31 2017 -0800 - - typo - -commit 9086fdac2e50f55c628bce464111d0658c1d1730 -Author: Cathy Wu -Date: Fri Dec 29 01:08:08 2017 -0800 - - sumo build - ubuntu14.04 version - -commit fca6205d7780176a91f7ded179f442f185a9f115 -Author: Cathy Wu -Date: Fri Dec 29 01:02:56 2017 -0800 - - different ubuntu setup scripts - -commit 2ba686b235127cd29e467b4192ddae459205b0bc -Author: Cathy Wu -Date: Fri Dec 29 00:33:27 2017 -0800 - - chmod - -commit 44c52637b60310a8162cd6d2b4b57b25bc9e9cc3 -Author: Cathy Wu -Date: Fri Dec 29 00:28:10 2017 -0800 - - fix - -commit 4d982cf798b87710c4feedac7d12a66d209e6e4a -Author: Cathy Wu -Date: Fri Dec 29 00:25:20 2017 -0800 - - download sumo build directly - -commit 13a1419bcb27655024d1652a95a4ec3fb2241f73 -Author: Cathy Wu -Date: Thu Dec 28 21:53:53 2017 -0800 - - install opencv without conda - -commit e20e9587bfb328547afe0e85c89f5418ac06faf6 -Author: Cathy Wu -Date: Thu Dec 28 21:45:28 2017 -0800 - - conda switches python versions? - -commit 5d7b33f4b79736a9031b633247239b48eefe4f3f -Author: Cathy Wu -Date: Thu Dec 28 21:35:47 2017 -0800 - - minor edit - -commit e2b4b8d02d8b988f9f60e2a2d09c1fda5b4c9330 -Author: Cathy Wu -Date: Thu Dec 28 21:23:41 2017 -0800 - - add conda and opencv - -commit 190c0b7fbf774aedd5048203cf71e2ff55f9caf5 -Author: Cathy Wu -Date: Thu Dec 28 21:22:02 2017 -0800 - - refactor to support multiple ray tests - -commit f0d17f54f41ad9767e2d019af8b2a783a7ffe3d9 -Merge: 277505be 9f92f7fc -Author: Cathy Wu -Date: Thu Dec 28 19:01:26 2017 -0800 - - Merge branch 'ray_test' of https://github.com/cathywu/learning-traffic into hierarchy - -commit 9f92f7fc8ba5f2ba4efbf99d2bf134f77c48a267 -Author: Cathy Wu -Date: Thu Dec 28 18:19:46 2017 -0800 - - tensorflow - -commit 16a86d3b5062d4bca6edea96bfaa4ed5cd039311 -Author: Cathy Wu -Date: Thu Dec 28 18:18:11 2017 -0800 - - missing test file - -commit 277505be1104b98c2a377c49849809bd33fc36aa -Author: Cathy Wu -Date: Thu Dec 28 18:05:09 2017 -0800 - - change env name to permit re-registration - -commit db5d92ac8c5504d3d8526611a1149a1cb2e85d4e -Author: Cathy Wu -Date: Thu Dec 28 17:16:42 2017 -0800 - - integration test for two-level policy - -commit f0f9e0053db07bcd64fb40355af1f010df8687b6 -Merge: 302e32a1 2ccbe615 -Author: Cathy Wu -Date: Thu Dec 28 17:12:37 2017 -0800 - - Merge branch 'ray_test' of https://github.com/cathywu/learning-traffic into hierarchy - -commit 2ccbe6150d026b13fb8805adfb92f205b0bd5dbe -Merge: 15385958 fd6c269d -Author: Cathy Wu -Date: Thu Dec 28 17:04:24 2017 -0800 - - merge - -commit fd6c269d8e203b795fb1860b1c317dcb0f1b70c2 -Author: Cathy Wu -Date: Thu Dec 28 16:57:26 2017 -0800 - - Cleanup - -commit 3c1692c88daaf67c85964751bb781b3e3af05d13 -Author: Cathy Wu -Date: Thu Dec 28 16:27:59 2017 -0800 - - make sure - -commit 9b7c1c1c70acfc0b171ed7e012b7026823140ea5 -Author: Cathy Wu -Date: Thu Dec 28 16:22:36 2017 -0800 - - rllib - -commit 56ae4ff2a85138f5764e2967a23e90e870222105 -Author: Cathy Wu -Date: Thu Dec 28 16:17:06 2017 -0800 - - path - -commit 7d5d210ecde61640d1d92f13180b11e9e34a01b1 -Author: Cathy Wu -Date: Thu Dec 28 15:24:05 2017 -0800 - - Manually move ray clone to site-packages - -commit 1233525856cd9040581ca0fa54e35b4948ecb5ed -Author: Cathy Wu -Date: Thu Dec 28 14:50:09 2017 -0800 - - add ray testing branch - -commit 06d54c0ee07386f90ba00bc36bb08e943dfd405f -Author: Cathy Wu -Date: Thu Dec 28 14:40:55 2017 -0800 - - my bad - -commit 302e32a1d0b5da2d5278f99055fa1ec806b3112f -Author: Cathy Wu -Date: Thu Dec 28 14:39:11 2017 -0800 - - restructure config params, use cloudpickle - -commit 2e276de37a5de1154ea84b32004923791194f749 -Author: Cathy Wu -Date: Thu Dec 28 14:06:45 2017 -0800 - - install ray from wheels - -commit cef1ef1cbc285f66f2e549a17c4476946cb47f14 -Author: Cathy Wu -Date: Thu Dec 28 13:58:13 2017 -0800 - - BROKEN passing function through options - -commit 72c984316ae97c6450d9fe63a97dd36ef62f6a3f -Merge: 1e0934f6 15385958 -Author: Cathy Wu -Date: Thu Dec 28 13:55:45 2017 -0800 - - Merge branch 'ray_test' of https://github.com/cathywu/learning-traffic into hierarchy - -commit 0aaeea549e508e28c43f0ee857e2851dc2ffff0a -Merge: 4af14a40 1ec2a037 -Author: eugenevinitsky -Date: Thu Dec 28 14:51:12 2017 -0500 - - pulled in master - -commit ef12e40b65e838c429d23b6070e5716d510f570b -Author: Cathy Wu -Date: Thu Dec 28 03:55:55 2017 -0800 - - oops - -commit ddaba7bbdb6abce81e14be81efbc9396673d83d8 -Author: Cathy Wu -Date: Thu Dec 28 03:42:56 2017 -0800 - - sigh - -commit 1e0934f6ba5746fcb1cecde8c751a3e046d96315 -Author: Cathy Wu -Date: Thu Dec 28 03:39:40 2017 -0800 - - missing init - -commit a125b205520d55b70ca022e268562276a6007d75 -Author: Cathy Wu -Date: Thu Dec 28 03:38:55 2017 -0800 - - Partial implementation of two-level fcnet example - -commit 5dc585c5626611b025059df0a8d2a5816d6dcd1c -Author: Cathy Wu -Date: Thu Dec 28 03:27:33 2017 -0800 - - switch order to see why ray install is failing - -commit c712605ef09810a9702bfeb11e01feb5b1ea1417 -Author: Cathy Wu -Date: Thu Dec 28 02:53:29 2017 -0800 - - add conda - -commit 9a0ea68fe54f45c60dc8fd29d3c304e8745188f7 -Author: Cathy Wu -Date: Thu Dec 28 02:19:40 2017 -0800 - - non-interactive linux setup for SUMO - -commit d3789891072021cf35aeb9f4989350a0eb36e8a2 -Author: Cathy Wu -Date: Thu Dec 28 02:11:52 2017 -0800 - - remove docker - -commit 59df3af0b4174ae6312fd30f7ca7dac7200dab9f -Author: Cathy Wu -Date: Thu Dec 28 02:10:13 2017 -0800 - - linux version - -commit 1538595878d825ec7fa60eaf36fd69c4ccc3853e -Author: Cathy Wu -Date: Thu Dec 28 01:58:24 2017 -0800 - - not sure.. - -commit 141d9cd88921a35b8679e349f97c74e2f10933b4 -Merge: 066f1aa2 1ec2a037 -Author: Cathy Wu -Date: Thu Dec 28 01:53:59 2017 -0800 - - merge - -commit 1ec2a03781c0045756a5c61d34fbd2e08238929e -Author: AboudyKreidieh -Date: Thu Dec 28 01:50:02 2017 -0800 - - Cleanup examples (#210) - - changes: - - removed some redundant examples - - removed `two_loops_two_merging` environment (it shouldn't be in master) - - cleaned up comments and organization of examples - - resolves #206 - - ---- - - * cleaned up params.py, renamed time_step -> step_length, added option to ask for sumo step logs - - * delted redundant examples, cleaned up examples to match new refactoring, and deleted never-used scenario - -commit 1e734753d810eb11f03c9ac4c4286ec302eaee81 -Author: AboudyKreidieh -Date: Thu Dec 28 01:46:29 2017 -0800 - - Cleanup vehicles (#209) - - Some cleaning up to the vehicles class and its interaction with the environment class. Prelude to supporting dynamic numbers of vehicles. - - Changes: - - the list of human-driven vehicles can be collected from `vehicles.get_human_ids()`, and, like before, autonomous vehicles are collected from `vehicles.get_rl_ids()` - - Removed the `sumo_ids` list and produced to controlled_id lists (`controlled_ids` and `controlled_lc_ids`) to make it clear which vehicles are controlled by flow and which by sumo in terms of lane-change and acceleration actions. This in turn makes applying these actions in `base_env` somewhat simpler - - removed all vehicle id lists from the environment classes and replaced calls to them with calls to the vehicle class. This is meant to reduce confusion when these lists becomes dynamic when cars are allowed to enter and exit the network. - - modified the `wave_attenuation` environment to be compatible with the new modifications to `base_env` and the `vehicles` class - - --- - - * cleaned up params.py, renamed time_step -> step_length, added option to ask for sumo step logs - - * removed ids from the environment and replaced calls to it with calls to the vehicles class - - * fixed environments to support modifications to vehicles class - -commit 066f1aa26fe7dc74166bfe3d566f1f7edfbe161c -Author: Cathy Wu -Date: Thu Dec 28 01:30:49 2017 -0800 - - oops my bad - -commit d5570f00c58dce2115dbc1f94564343eb7c5db4f -Merge: b05f76a3 34779f82 -Author: AboudyKreidieh -Date: Thu Dec 28 00:32:59 2017 -0800 - - Merge pull request #172 from cathywu/ray_integration - - ray/rllib integration - -commit 94f3067a23c625ef6245724fe1cb835a8a831d01 -Author: Cathy Wu -Date: Wed Dec 27 18:53:07 2017 -0800 - - link ray in docker and add ray to pythonpath - -commit e5b4c44a2968b400d15b7d3ce71e7c3ff80130df -Author: Cathy Wu -Date: Wed Dec 27 18:24:07 2017 -0800 - - set up conda in travis - -commit 1d541d62ee4234d15dff072a65976811024c77a8 -Author: Cathy Wu -Date: Wed Dec 27 18:08:23 2017 -0800 - - fix ray install for travis - -commit dd7881fa1298d77ebf152840746175bde2748b06 -Author: Cathy Wu -Date: Wed Dec 27 17:57:56 2017 -0800 - - fix ray install for travis - -commit 88cd3ca4d7b7482fd35c7e422ec9ac6152574506 -Author: Cathy Wu -Date: Wed Dec 27 17:37:22 2017 -0800 - - add ray install to travis - -commit 981f19dafe483d7d944d0ac70b11038415c5e635 -Author: Cathy Wu -Date: Wed Dec 27 17:15:37 2017 -0800 - - separated tests into fast and slow tests, now that we have our first integration test - -commit 8c5e304ff3d4598b2f154302026407be4a538d33 -Author: Cathy Wu -Date: Wed Dec 27 17:05:15 2017 -0800 - - Refactored ray dependencies and examples for integration tests; added integration test for an end-to-end ray (rllib) run using stabilizing_the_ring example. - -commit 34779f82d49fdb51f2c3cb9205b40be9dd56fe0b -Merge: 0f0906c4 b05f76a3 -Author: Cathy Wu -Date: Wed Dec 27 13:28:18 2017 -0800 - - merge - -commit b05f76a3d4aa51aeeecb32d5e0c62d0d28567467 -Author: AboudyKreidieh -Date: Wed Dec 27 13:25:52 2017 -0800 - - Cleanup (#203) - - This pull request is just to clean up a few things and close some issues. - - Prerequisites: PR #185 - - Changes: - - cleaned up documentation in `params.py` and removed / moved around a few attributes in the parameter classes. - - Changed the name of `time_step` to `step_length`; resolves #168 - - added an option in `SumoParams` to choose whether or not to add sumo step logs (defaults to no step logging), resolved additional comments in #182 - - --- - - * cleaned up params.py, renamed time_step -> step_length, added option to ask for sumo step logs - - * replaced step_length with sim_step and timer with timer_counter - - * refactoring bug - -commit 0f0906c4f1f4a5a35979827529c720605fa0b0aa -Author: Cathy Wu -Date: Wed Dec 27 13:24:35 2017 -0800 - - missed a serialization initialization - -commit d22e255e1ea5ccdd28d7d05ffec963ac6d37d6d6 -Merge: 9c58e6b4 87667429 -Author: Cathy Wu -Date: Wed Dec 27 03:02:37 2017 -0800 - - merge - -commit 876674291ae1451bed55d4bd32885a53fdeed2aa -Merge: ab9443df f200206f -Author: AboudyKreidieh -Date: Wed Dec 27 01:55:22 2017 -0800 - - Merge pull request #185 from cathywu/speedups - - Speedups - -commit 4af14a402053e97cfd38214bf6c6ad7236aa4a55 -Merge: ade87f23 ab9443df -Author: eugenevinitsky -Date: Tue Dec 26 22:20:39 2017 -0500 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic - -commit 9c58e6b46540231748838b49ab08164cbeba7c7b -Author: Cathy Wu -Date: Tue Dec 26 15:41:08 2017 -0800 - - match hyperparameters to rllab - -commit f200206fd409b40f680e03cb80b92e6de24176db -Merge: a6050df1 ab9443df -Author: aboudy -Date: Tue Dec 26 14:31:27 2017 -0800 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic into speedups - -commit a6050df1e9321dc8a307aa5773b6871c42b1dba5 -Merge: 4cf8a31d ab5edaa5 -Author: aboudy -Date: Tue Dec 26 14:28:30 2017 -0800 - - Merge branch 'speedups' of https://github.com/cathywu/learning-traffic into speedups - -commit ab9443dfd3c18307ebfeac21dd5f7ac565d1f9fa -Author: Cathy Wu -Date: Tue Dec 26 13:07:45 2017 -0800 - - Support fixing a random seed for SUMO (#199) - - ## Summary - - - Supports fixing a SUMO random seed via `SumoParams`. Resolves #195. - - This is one step towards reproducible runs. - - ---- - - * support random seed - - * needs int - - * smaller seed - -commit 15b531f925b57d3c48740324cd9653f241c8a889 -Author: Cathy Wu -Date: Tue Dec 26 13:07:29 2017 -0800 - - Default config (#198) - - ## Summary - - - Introduces `config_default.py` as the default config parameters. - - `flow/core/config.py` is no longer required, but is supported. - - Reduced the default sleep time again (to 0.1 instead of 2.0 or 0.002). - - Resolves #194. - - --- - - * add default config, so config.py is no longer required - - * update docs - - * shouldn't need to copy over config in setup anymore (travis) - -commit c6d0bd231bb5b2228e3416b80a5da1b9306e5f69 -Author: Cathy Wu -Date: Sun Dec 24 13:14:28 2017 -0800 - - teardown method for sumo - -commit 0c31fcf00255775925585e31a6d30c9b3152f4a4 -Author: Cathy Wu -Date: Sun Dec 24 03:56:14 2017 -0800 - - probably don't need this - -commit 492d47bd41c67e4e2fabeb65a17ecdb13f8a230a -Author: Cathy Wu -Date: Sun Dec 24 03:44:10 2017 -0800 - - return if no error - -commit 4f3859615e6f6dfdd9567e5a649c31623c6880bc -Author: Cathy Wu -Date: Sun Dec 24 03:40:47 2017 -0800 - - find new port - -commit 5e29e3a8834d05f9b9369f543a17a7ce790ef650 -Author: Cathy Wu -Date: Sun Dec 24 03:23:06 2017 -0800 - - reset mechanism for sumo start instead of sumo restart - -commit ab5edaa52bdf04c486636dc9461a5e4f6ef941ac -Merge: d6a8e2ad eba92c5a -Author: Cathy Wu -Date: Sun Dec 24 01:08:13 2017 -0800 - - merge - -commit 576adb3d3c45ac8b1cb16f4443668c124382b33d -Merge: 85b234ca eba92c5a -Author: Cathy Wu -Date: Sun Dec 24 01:06:58 2017 -0800 - - merge - -commit eba92c5a513d329501c8b1ead5ebf5c1c9df87ee -Author: Cathy Wu -Date: Sun Dec 24 01:05:22 2017 -0800 - - rllab baseline and increased robustness of running experiments (#184) - - ## Summary - - Introduces benchmark for a direct comparison with rllib/ray version (sister PR to #172). Copies over `stabilizing-the-ring.py` (renamed to `stabilizing_the_ring.py`) and `envs/wave_attenuation.py` from branch `master_devel_aboudy`. - - For increased robustness of running experiments (resolves #173, workaround for #170): - - Increases default sleep time (for TraCI connections) to 2.00 sec (up from 0.02 sec) - - Re-tries SUMO restart 10x if connection fails (NOTE: 5x was not sufficient) - - --- - - * Remove rllab dependency; add eugene's gym registration (with params) to flow utils; add 2 working rllib examples (mixed_rl_single_lane and stabilizing_the_ring); ported over wave attenuation env + rllab version from aboudy's branch - - * add back rllab dependency - - * batch size - - * parallel - - * benchmark - - * benchmark - - * Add .travis.yml - - * Fix .travis.yml - - * travis fix - - * fix - - * there must be a better way.. - - * warmer? - - * build status - - * almost there.. - - * add rllab - - * run faster commands first, so we can see if things are working - - * install rllab linux dependencies; try mounting same directory as learning-traffic clone - - * -y - - * clone to parent dir - - * setup learning-traffic; cleanup - - * config - - * sumo restart retry mechanism; sleep longer by default - - * typo - - * remove SUMO step log (displays rollout progress, but conflicts with other outputs) - - * skip known broken test - - * skip known broken tests - - * is setup.py develop necessary? - - * beefier reset - - * typo - - * don't introduce ray examples in this branch - - * revert utils - -commit 85b234caf8fe71aeaf34c379b014be72e0560f37 -Author: Cathy Wu -Date: Sun Dec 24 01:03:43 2017 -0800 - - add visualizing training progress instructions - -commit d6a8e2ada8ecdd3cca2a50414f0c1476abad1b8d -Merge: 119faac2 0a0e382c -Author: Cathy Wu -Date: Sat Dec 23 22:44:02 2017 -0800 - - merge - -commit 9c27dfc55bb5d0962ad02bf4cdbd5738f83ba407 -Merge: d9ce2a94 0a0e382c -Author: Cathy Wu -Date: Sat Dec 23 22:38:37 2017 -0800 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic into ray_integration - -commit 0a0e382ca43d2dfb36c513f6acf34b82d6e0db1c -Author: Philipp Moritz -Date: Sat Dec 23 22:37:52 2017 -0800 - - Add script to install sumo in linux (#171) - - ## Summary - - - Setup instructions for SUMO on linux. - - Minor corrections to OSX instructions. - - ## Testing done - - Tested on Ubuntu 16.04 on a clean EC2 instance with 25 GB storage. - - --- - - * start writing script - - * add more commands - - * update - - * linux sumo installation script - - * fix - - * Fixes to linux setup instructions - - * fixed linux setup instructions and script; cleaned up osx scripts - - * revert docs - -commit d9ce2a94781b89ed2855bbe129b0819e80883d26 -Author: Cathy Wu -Date: Sat Dec 23 22:18:55 2017 -0800 - - cluster deployment instructions - -commit f0360f911c6584450e9dd2a5939aa4ea6f961926 -Author: Cathy Wu -Date: Sat Dec 23 21:48:25 2017 -0800 - - ray setup instructions - -commit 5cf82b6d16467518d90fda05f4c9301a3e16768f -Author: Cathy Wu -Date: Sat Dec 23 18:55:06 2017 -0800 - - Backwards compatibility with rllab (addresses #178) - -commit 32084238d3ae4cd55ba0dd829f354653975ce6dd -Merge: 3cfde841 2e9e41ac -Author: Cathy Wu -Date: Sat Dec 23 18:44:52 2017 -0800 - - merge - -commit 2e9e41ac76583905ae63da13b327e478758c461c -Author: Cathy Wu -Date: Fri Dec 22 13:06:10 2017 -0800 - - Fix Travis hook - - Fix Travis hook - -commit ade87f23d4e1e9bde51bacb16076b2c35674870f -Merge: 8ca11919 083460f7 -Author: eugenevinitsky -Date: Fri Dec 22 12:51:18 2017 -0500 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic - -commit 083460f73f264dc5a36be9ee5521c56e1bff4c4c -Author: Cathy Wu -Date: Fri Dec 22 07:48:44 2017 -0800 - - Travis set up properly (#180) - - **Summary**: Properly sets up Travis continuous integration. Resolves #174. In summary, the Travis configuration script clones and sets up `learning-traffic` and `rllab-multagent`, pulls down the `evinitsky/flow` docker image, links volumes as appropriate, and invokes the unit tests (via nose2) within the docker image. - - **WARNING**: The way this is set up, Travis will git clone `rllab-multiagent` (master) and test with that. There may be issues if simultaneous changes in `rllab-multiagent` and `flow` are needed. - - **Commit summary**: - - * Add .travis.yml - - * Fix .travis.yml - - * travis fix - - * fix - - * there must be a better way.. - - * warmer? - - * build status - - * almost there.. - - * add rllab - - * run faster commands first, so we can see if things are working - - * install rllab linux dependencies; try mounting same directory as learning-traffic clone - - * -y - - * clone to parent dir - - * setup learning-traffic; cleanup - - * config - - * skip known broken tests - - * is setup.py develop necessary? - -commit 119faac292b96459c050209d410fa6d78a49109c -Author: AboudyKreidieh -Date: Fri Dec 22 06:15:14 2017 -0800 - - quietted step logging from sumo - -commit 3cfde841a57b85e2957f90c767ba17a8009d66f6 -Merge: 45cecbce 4d41b920 -Author: Ubuntu -Date: Fri Dec 22 07:50:37 2017 +0000 - - Merge branch 'ray_integration' of github.com:cathywu/learning-traffic into ray_integration - -commit 45cecbce48334fff47d58eb10a86b15602af9107 -Merge: 0f77eb4a f6d1b8ad -Author: Ubuntu -Date: Fri Dec 22 07:50:00 2017 +0000 - - Merge branch 'travis' of github.com:cathywu/learning-traffic into ray_integration - -commit 4d41b920169060ea40a7b32c32406ba7b0fbe6ad -Author: Cathy Wu -Date: Thu Dec 21 22:54:27 2017 -0800 - - autoscale - -commit b267ce35a8ddf6e46ebb18e5ec4b36608fb0320e -Author: Cathy Wu -Date: Thu Dec 21 22:43:54 2017 -0800 - - remove rllab depencency - -commit 138d0422c0b08973fd853f8bda7facd5cb43bcfb -Author: Cathy Wu -Date: Thu Dec 21 22:30:05 2017 -0800 - - add reset mechanism - -commit 0f77eb4aad08408e314612370dd48973b9dbf41c -Merge: 0a7a17e3 dfd4d281 -Author: Ubuntu -Date: Fri Dec 22 06:26:04 2017 +0000 - - Merge branch 'ray_integration' of github.com:cathywu/learning-traffic into ray_integration - -commit 0a7a17e38d0a04d02fba7357828cdf0fd31e3a69 -Author: Ubuntu -Date: Fri Dec 22 06:25:25 2017 +0000 - - performance test - -commit f6d1b8ad7f7f45c15a399b19cda49075b93fc655 -Author: Cathy Wu -Date: Thu Dec 21 21:10:56 2017 -0800 - - is setup.py develop necessary? - -commit 36c7c69bc2c017ac0bb6370b027409da31a18347 -Author: Cathy Wu -Date: Thu Dec 21 20:41:35 2017 -0800 - - skip known broken tests - -commit 1f8c3de3eaace8a689fdab8b8372ecfa3f082c16 -Author: Cathy Wu -Date: Thu Dec 21 20:22:48 2017 -0800 - - config - -commit 0e90f4a02e8277dd7c88e25f4fb83ef5dfc668a6 -Author: Cathy Wu -Date: Thu Dec 21 20:08:44 2017 -0800 - - setup learning-traffic; cleanup - -commit cb8284956c9cbffdfe21f582cc9650628c9f4fa6 -Author: Cathy Wu -Date: Thu Dec 21 19:54:34 2017 -0800 - - clone to parent dir - -commit 54b532bcd39d81619d0f07ac2f1bda36cdf7ad86 -Author: Cathy Wu -Date: Thu Dec 21 19:51:51 2017 -0800 - - -y - -commit 9bb3d5480a5aa70ed9fa4f5079aae386c8ea4c1e -Author: Cathy Wu -Date: Thu Dec 21 19:51:06 2017 -0800 - - install rllab linux dependencies; try mounting same directory as learning-traffic clone - -commit 63a0aec7cf5ebf770ee220533c9bfdaf1de399f6 -Author: Cathy Wu -Date: Thu Dec 21 19:39:32 2017 -0800 - - run faster commands first, so we can see if things are working - -commit 6e2a9b24afbc6b3b3adc2e3589e00e383f0d30d8 -Author: Cathy Wu -Date: Thu Dec 21 19:21:31 2017 -0800 - - add rllab - -commit eda5f87245f9d9272cd2255d1a77a84129aadc53 -Author: Cathy Wu -Date: Thu Dec 21 19:12:54 2017 -0800 - - almost there.. - -commit aa125bcccda4f7d570e5f392db2d6487d391a80a -Author: Cathy Wu -Date: Thu Dec 21 19:03:44 2017 -0800 - - build status - -commit 9d1f2529cecb565382c38b4662b9d347325256b9 -Author: Cathy Wu -Date: Thu Dec 21 18:58:27 2017 -0800 - - warmer? - -commit 78a0eae70fbf79d2850d143eff6a0f435efcf79f -Author: Cathy Wu -Date: Thu Dec 21 18:27:23 2017 -0800 - - there must be a better way.. - -commit dfd4d281a547af735d958374ed2d9d990384a525 -Merge: 96eb9502 8f8a81e0 -Author: Cathy Wu -Date: Thu Dec 21 18:02:27 2017 -0800 - - Merge branch 'ray_integration' of https://github.com/cathywu/learning-traffic into ray_integration - -commit 96eb950271f9da2d7a0561b80d96f6488752e9a8 -Author: Cathy Wu -Date: Thu Dec 21 18:02:25 2017 -0800 - - autoscale config - -commit d8a5624c96305412b15eb93f051ab048f87498f1 -Author: Cathy Wu -Date: Thu Dec 21 17:38:44 2017 -0800 - - fix - -commit 116d4b00b03d273f133aaa00b461fc7313db1853 -Author: Cathy Wu -Date: Thu Dec 21 17:35:23 2017 -0800 - - travis fix - -commit dd606c839ddb9e31824b0fc30c1b4abd3bb05e07 -Author: Cathy Wu -Date: Thu Dec 21 17:15:04 2017 -0800 - - Fix .travis.yml - -commit 92ee9e48b850bf261138ea177d8eb56b530419c2 -Author: Cathy Wu -Date: Thu Dec 21 17:09:50 2017 -0800 - - Add .travis.yml - -commit 8ca1191964d74b38e278d13b49d8168837d7e316 -Author: eugenevinitsky -Date: Wed Dec 20 16:36:50 2017 -0800 - - added ray file for mixed rl case - -commit 8f8a81e02c4c588c982c4256686806ed7790abdc -Author: Ubuntu -Date: Wed Dec 20 08:04:14 2017 +0000 - - benchmark - -commit 46e820f79c36274a4d3480101ab3a3aa51458ae0 -Author: Cathy Wu -Date: Tue Dec 19 23:40:57 2017 -0800 - - remove rllab dependency - -commit df2ca1e44c364976512e54d08a70462413520103 -Author: Ubuntu -Date: Wed Dec 20 07:14:40 2017 +0000 - - benchmark - -commit defcda4de560e842a5ee8bfd58c0ec21d4239a4f -Author: Cathy Wu -Date: Tue Dec 19 18:56:07 2017 -0800 - - batch size - -commit 0eb0493e1c231379a71ce18b2e0085a7a9f45d68 -Author: Cathy Wu -Date: Tue Dec 19 18:49:04 2017 -0800 - - batch size - -commit 5145aa83dd9a9a4a2f8610aa37e386a81fdcd41a -Author: Cathy Wu -Date: Tue Dec 19 18:41:14 2017 -0800 - - merge - -commit 71b986f12aa017f3217f800f642b1abbbca3b860 -Author: Cathy Wu -Date: Tue Dec 19 00:55:12 2017 -0800 - - Remove rllab dependency; custom config for benchmark task - -commit 4cf8a31db4dc3e5d2ad054b864fc1a869c6c67b4 -Merge: dcac012b d94a9683 -Author: aboudy -Date: Tue Dec 19 00:44:13 2017 -0800 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic into speedups - -commit ed699b0af3d498f10e2430ab793bfb6a7ea22bcf -Author: Cathy Wu -Date: Tue Dec 19 00:22:03 2017 -0800 - - Remove rllab dependency; add eugene's gym registration (with params) to flow utils; add 2 working rllib examples (mixed_rl_single_lane and stabilizing_the_ring); ported over wave attenuation env + rllab version from aboudy's branch - -commit dcac012b29095c37ac6f9393ab0934bdaead9ab6 -Author: aboudy -Date: Mon Dec 18 14:55:18 2017 -0800 - - added new unittests for sumo lc/accel params and controller features, and fixed bugs associated with these unittests - -commit d94a9683bde70d5db81d82fdf6c183315ed140ca -Author: Cathy Wu -Date: Sat Dec 16 16:15:07 2017 -0800 - - Revised documentation and fixed unit tests (#166) - - * Cleanup of documentation; - * added SUMO_HOME to instructions; - * fixed unit tests (so that they run from the project root directory); - * added SUMO_SLEEP to config, which delays connections to TraCI before sockets are available (gives a large speedup to tests and runs) - * update README (contributors) - -commit a37e1350bd49b40cc28bad15a862f2370135e133 -Merge: 94a405c5 c5e4ce2e -Author: eugenevinitsky -Date: Thu Nov 16 11:05:35 2017 -0800 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic - -commit 1439884477e114f630a4dec1b043dc87d9254d98 -Author: Kanaad Parvate -Date: Fri Nov 3 14:30:18 2017 -0700 - - added sumo lane change controller and refactored how we provide parameters to sumo for controllers (new params classes) - -commit c5e4ce2ed0b758128c92956372306bb918065228 -Merge: d27a9ff1 ed12f932 -Author: Cathy Wu -Date: Fri Nov 3 11:07:24 2017 -0700 - - Merge pull request #165 from cathywu/update_lt_documentation - - Update lt documentation - -commit ed12f932bde135cd378398c555deccaf51b3163e -Merge: d27a9ff1 ec472ad8 -Author: Kanaad Parvate -Date: Fri Nov 3 11:04:26 2017 -0700 - - Merge branch 'master' of https://github.com/cathywu/flow - -commit d27a9ff13f4c12754027445cebc30f16c9781ddb -Merge: b0a56c93 f4a55a2c -Author: Cathy Wu -Date: Fri Nov 3 10:56:58 2017 -0700 - - Merge pull request #161 from cathywu/gitignore - - Update .gitignore to successfully ignore xml files - -commit ec472ad8f8afb8b1c7cf55bb4ae19e295ac7f22e -Author: Kanaad Parvate -Date: Thu Nov 2 14:50:39 2017 -0700 - - Unit tests (#16) - - Unit Tests and Bug Fixes - -commit 2827f882ebc48f113532eb99b3e83249e8a98a71 -Merge: 7743147f 3ae8d401 -Author: Kanaad Parvate -Date: Thu Nov 2 12:27:57 2017 -0700 - - merged speed up changes - -commit 7743147f61139f1b354a7c8e938dd42fca81f0e3 -Author: Kanaad Parvate -Date: Wed Nov 1 20:00:46 2017 -0700 - - speed and lane changing modes are configured by vehicle type, and unit tests for setting modes in vehicles was added - -commit 3ae8d4019ff26e5dc8f383220e3ada27bec1e7d7 -Merge: 7a157792 b0a56c93 -Author: aboudy -Date: Wed Nov 1 15:46:41 2017 -0700 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic into speedups - -commit 7a157792ef73831afdadf15868f2bf363ce45384 -Author: aboudy -Date: Wed Nov 1 15:38:37 2017 -0700 - - removed failsafes from env_params - -commit 7d51a69f59d36d93c7302dde7ca1f6b34a7edb77 -Author: aboudy -Date: Wed Nov 1 15:33:23 2017 -0700 - - moved failsafe calls from base_env to base_controller and made the fail_safe a parameter for the acceleration controllers - -commit fe2d8e1b69b10da4746b48dc30f21a0cf539e538 -Author: aboudy -Date: Wed Nov 1 12:07:33 2017 -0700 - - added open of convert emission files to csv from the experiment class - -commit f4a55a2c90bc717d2a466ffc09fe5036485fa0f6 -Author: Kathy Jang -Date: Wed Nov 1 11:45:06 2017 -0700 - - Update .gitignore to successfully ignore xml files - -commit e094e43f9e7b75eb2800a1b4c97d494e18e3581d -Author: Kanaad Parvate -Date: Tue Oct 31 11:46:53 2017 -0700 - - updated readme - -commit b0a56c9318fa3a467f776c21ca61b96fafc44d26 -Merge: 03c7867a c76ee980 -Author: Kanaad Parvate -Date: Tue Oct 31 14:45:33 2017 -0700 - - Merge pull request #153 from cathywu/unit_tests - - full unit test coverage for the current codebase, total of 62 tests that take around 12 sec to run. - bug fixes and methods to handle edge cases - The "safe_velocity" failsafe was also re-written, and now manages to always prevent crashes. - visualizer_flow no longer requires you to specify the type of scenario - Refactored components: - - visualizer_CISTAR renamed to visualizer_flow, and all other visualizers were deleted - some parts of the accelerations controllers were renamed to maintain some consistency between all controllers. - stuff that haven't been tested: - - get_headway_dict - run_long in visualizer_flow (this is still broken) - resets after collisions (this used to be broken, but I added a patch. I can't figure out how to recreate the problem though, since it doesn't happen all the time) - anything rl (tests take at least 3 sec because of rllab, so moving them all into integration tests) - generator base class (could not think of good unit tests) - -commit c76ee9805c57512bc224c915c4181fda97fd4bfa -Author: Kanaad Parvate -Date: Tue Oct 31 14:43:38 2017 -0700 - - removed unneeded comments - -commit bd8a96d9d8ad2b4dfc2d86d359d56c4eb3390c5b -Author: aboudy -Date: Mon Oct 30 13:31:40 2017 -0700 - - cleaned up tests to support changes to the vehicles class and modified instantaneous failsafe to support ballistic sumo step methods - -commit 1b763a737b70e3c2b2267af7a91fa7058483f745 -Author: aboudy -Date: Mon Oct 30 12:42:26 2017 -0700 - - bug fixes to the vehicles class regarding the speedups - -commit fe77359956e16a76d09deeadb360ac5f571c738b -Merge: 21e45c08 0f9fb990 -Author: aboudy -Date: Sun Oct 29 17:20:09 2017 -0700 - - Merge branch 'unit_tests' of https://github.com/cathywu/learning-traffic into speedups - -commit 0f9fb9901a54b80b942b82150019ecfc95839858 -Merge: e4becc6a 03c7867a -Author: aboudy -Date: Sun Oct 29 17:14:56 2017 -0700 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic into unit_tests - -commit 21e45c08bf3a6407025f2507532d1493c6eb9381 -Author: aboudy -Date: Sun Oct 29 16:58:51 2017 -0700 - - modified SumoController class and generator to allow vehicles to be controlled by sumo - -commit 94a405c5f6caafc99550d5267a6c94cf20af2d59 -Author: eugenevinitsky -Date: Fri Oct 27 18:23:09 2017 -0700 - - added multiagent example, it runs, but need to run tests to make sure it actually works - -commit e3d6d70aa6a3ea88d649f94ca81aa9d47a5b170c -Author: eugenevinitsky -Date: Fri Oct 27 16:58:45 2017 -0700 - - Update flow_setup.rst (#14) - - * Update flow_setup.rst - - Fix for the download of rllab-multiagent; it's off the master branch, not cistar_release. - - * Update flow_setup.rst - - * Update flow_setup.rst - - * Update flow_setup.rst - - * Update flow_setup.rst - - Removed comments to team - -commit 8f07d476f32cd5a7a670a2c58dd9080b89639cba -Merge: bd343205 e4becc6a -Author: aboudy -Date: Thu Oct 26 14:17:14 2017 -0700 - - Merge branch 'unit_tests' of https://github.com/cathywu/learning-traffic into speedups - -commit 03c7867a2264addd24866a66195948a15d3c451c -Merge: 2e675d27 cb99cb07 -Author: Kanaad Parvate -Date: Thu Oct 26 12:30:03 2017 -0700 - - Merge pull request #155 from cathywu/flow_release - - Update master to flow - -commit 2e675d275479651ef2fda74cdc11f0663302aa4f -Merge: 985a2d86 30c3008b -Author: Kanaad Parvate -Date: Thu Oct 26 12:29:41 2017 -0700 - - Merge pull request #156 from cathywu/rollback_master_code_owners - - remove codeowners - -commit 30c3008b23b692ac7fb715639b85325b21ef499c -Author: Kanaad Parvate -Date: Thu Oct 26 12:28:43 2017 -0700 - - remove codeowners - -commit e4becc6a70d1fb4ff170df9f8488a8e22aec5cfb -Author: aboudy -Date: Thu Oct 26 12:16:49 2017 -0700 - - cleaned up redundant unit tests and removed commented unit tests - -commit cb99cb075064268b41b0ade98f3da6621b1c208f -Merge: 8d8b8c0b 8550bea7 -Author: Kanaad Parvate -Date: Thu Oct 26 12:02:25 2017 -0700 - - Merge pull request #154 from cathywu/replacing_master - - backwards merging flow/master to flow_release (changes were made to cathywu/flow/master that need to be reincorporated into learning-traffic) - -commit 8550bea79f2c13177d3bbaf940ee56affc9685b0 -Merge: 8d8b8c0b 4f678563 -Author: Kanaad Parvate -Date: Thu Oct 26 11:50:42 2017 -0700 - - backwards merging flow/master - -commit bd3432058b7a9833c17c11309226bb8819b6c160 -Author: aboudy -Date: Thu Oct 26 11:30:33 2017 -0700 - - removed redundant step in the _step function when storing information about the state of vehicles - -commit 31e2850ae2c373471a933d811a8e3234c5a94bdd -Author: aboudy -Date: Wed Oct 25 18:28:44 2017 -0700 - - added tests for loop_merges and two_loops_one_merging, and some bug fixes. Generator class has no tests - -commit d1076bcff25eda2a0ab40b9400dd7a92e8d67077 -Author: aboudy -Date: Wed Oct 25 18:27:07 2017 -0700 - - cleaned up some tests and an example - -commit 29affb3c54635f7571e98eb19e9f285e149b5772 -Author: aboudy -Date: Wed Oct 25 17:31:50 2017 -0700 - - small modification to one of the arguments - -commit 4889d527757091863969d79a164f849038d81473 -Author: aboudy -Date: Wed Oct 25 17:28:58 2017 -0700 - - added tests for emission_to_csv and a few files needed when testing the visualizer and util functions - -commit 8c9ee60bda16f1c82e3a7e8f7e2f7ad2a65610e3 -Author: aboudy -Date: Wed Oct 25 17:02:11 2017 -0700 - - removed broken visualizers - -commit 60774afe7ad41b120b9a26355a4b934cedab2eef -Author: aboudy -Date: Wed Oct 25 17:01:23 2017 -0700 - - renamed visualizer_CISTAR visualizer_flow, and added a test for the visualizer - -commit 318d28dfe3fb9bde54c63a4ef0337e7def830731 -Author: aboudy -Date: Wed Oct 25 16:33:03 2017 -0700 - - modified visualizer_CISTAR and added a function to convert emission files to csv files - -commit faeeaccd636924c00f8cbe42ceac7c28e73a929c -Author: aboudy -Date: Mon Oct 23 16:19:22 2017 -0700 - - added setup script needed for most tests - -commit 3ec4a1e7851d65a3f651fa37d1d1434587a13613 -Author: aboudy -Date: Mon Oct 23 16:14:52 2017 -0700 - - added tests for the experiment class, removed redundant tests in the controllers, bug fixes for experiment class, and added test for emission path to prevent new memory leaks from this - -commit 58fec6db49ba97f3676431e79ea5b21e64f2b40f -Author: aboudy -Date: Mon Oct 23 15:44:35 2017 -0700 - - added tests for the base scenario class, base environment class, and controllers, as well as bug figures for bugs discovered during tests, and added support for edge cases (mostly when generating starting positions) - -commit 4f678563bcb945d18cb299a3f26d7b0b5423cebe -Merge: 679e601f 26f562da -Author: Cathy Wu -Date: Wed Oct 18 10:12:22 2017 +0900 - - Merge pull request #10 from cathywu/python_path - - added pythonpath documentation - -commit 26f562daaddef380b5b21030b8897c883de25dbf -Author: Kanaad Parvate -Date: Tue Oct 17 03:30:39 2017 -0700 - - added pythonpath documentation - -commit 679e601f702a829467c28e2421e84e0752c033c5 -Author: Cathy Wu -Date: Tue Oct 17 17:41:28 2017 +0900 - - Added arXiv link - -commit b81379a097be48b2a3075241483c1deb4aef845f -Author: Cathy Wu -Date: Tue Oct 17 17:40:24 2017 +0900 - - Revert to 56e05fced - -commit 8d17c92dcf66eefdadd1501ced3ee5f901cc5345 -Author: Cathy Wu -Date: Tue Oct 17 17:05:37 2017 +0900 - - Added arXiv link to README (#8) - - * Add arXiv link - - * minor text change - -commit 1239836fd5b295d04b35a676854812633e982d6c -Author: aboudy -Date: Mon Oct 16 13:23:26 2017 -0700 - - modification to the merge environment - -commit 4d389a997609f2be5937200be2259042cb59be78 -Author: eugenevinitsky -Date: Mon Oct 16 03:28:42 2017 -0700 - - Revert "Minor corrections and updates to the README" (#7) - -commit a54845f4dcbb6200dff42849c62962c20ea673da -Merge: cf9eae29 edf55364 -Author: eugenevinitsky -Date: Mon Oct 16 03:27:24 2017 -0700 - - Merge pull request #6 from cathywu/typo - - Minor corrections and updates to the README - -commit edf553644b883115396a94375e29635f005dee93 -Author: Cathy Wu -Date: Mon Oct 16 11:31:12 2017 +0900 - - quick links for docs - -commit f72a5d4027991f3ccaef89b52e43dd40a47d9b3d -Author: Cathy Wu -Date: Mon Oct 16 10:53:55 2017 +0900 - - Tweak README - -commit 958f0fe817a9f0143be6ff9a2e7029c79ab7f4b8 -Author: Cathy Wu -Date: Mon Oct 16 10:49:35 2017 +0900 - - fixed typo; updated README to include citation and links - -commit 8c4cde6cf684c029cf7efe0f70b7276139f1a36a -Author: aboudy -Date: Fri Oct 13 10:13:29 2017 -0700 - - termination bug - -commit cf9eae290936c93a0b070db8afec1cf7cf04e21d (tag: 0.1.0) -Author: Kanaad Parvate -Date: Fri Oct 13 05:22:21 2017 -0700 - - using environemnt.yml instead of requirements.txt - -commit 5f95fba0979fd46aab14a9a58bbe61ae516a9d43 -Author: Kanaad Parvate -Date: Fri Oct 13 05:19:38 2017 -0700 - - fixed patch and added version number + fixed minor bug in osx setup - -commit 9b05d213cd5007044ef08ffbea15e9d858e11f29 -Author: Kanaad Parvate -Date: Thu Oct 12 21:59:17 2017 -0700 - - added sumo patch - -commit 2d119feb55cb8e5ad63416f5174e9f82165e65ba -Author: Kanaad Parvate -Date: Thu Oct 12 21:57:48 2017 -0700 - - made osx script executable - -commit a8c81b1db61af2028a663d5e4eb2165c191f39f7 -Author: nskh -Date: Thu Oct 12 21:53:20 2017 -0700 - - Updated documentation for Flow source code (#5) - - * Updated Flow code documentation using raw HTML Sphinx autodoc output - - * Bypassed modules page since it was superfluous - -commit 28b657fc3e287873473a43da01b4db4b64d1ad03 -Author: Kanaad Parvate -Date: Thu Oct 12 21:51:47 2017 -0700 - - fixed all examples (#4) - -commit 3180a425e79de081a7aa9edc370c7634b702c481 -Author: Nishant -Date: Thu Oct 12 19:19:55 2017 -0700 - - updated conf.py for readthedocs to enable sphinx autodoc - -commit b270a67c52601686f6ea0671ae67cc9472cef061 -Author: Nishant -Date: Thu Oct 12 19:02:00 2017 -0700 - - updated conf.py - -commit b9989c0aadcab28ff94b396fd0310e164cb479d4 -Author: nskh -Date: Thu Oct 12 18:44:21 2017 -0700 - - Updating tutorial (#3) - - Updating Tutorial and Documentation - -commit ba54a88068c07af00b4cb26362788ee51af319be -Author: aboudy -Date: Thu Oct 12 16:38:25 2017 -0700 - - changes made to support environments with collisions and discrete lane change actions - -commit 8d8b8c0be8af20bef073f731ed7f848ad1d41169 -Author: Cathy Wu -Date: Thu Oct 12 10:54:29 2017 -0700 - - Create CODEOWNERS - -commit 985a2d8662ba874e0efaf4bb3f51872cd7e9f8a7 -Author: Cathy Wu -Date: Thu Oct 12 10:53:22 2017 -0700 - - Create CODEOWNERS - -commit e492275256e33a1da7f716c47208f8cf144b70cd -Merge: 5834d57e bc2af670 -Author: Nishant -Date: Wed Oct 11 16:58:43 2017 -0700 - - merged a very small change from master (in Docker_Tutorial.md) - -commit 5834d57e31766fd8ea2a34e21bc1dd2ecfbcc4b5 -Author: Nishant -Date: Wed Oct 11 16:55:28 2017 -0700 - - a lottt of documentation - -commit 8c2fe747b03de602c2575ccd7d7ca01b9c6ff988 -Author: Kanaad Parvate -Date: Tue Oct 10 23:14:32 2017 -0700 - - added MIT license - -commit 43d649018a0429e43d59d621e5059847a3e5fe5e -Author: Nishant -Date: Tue Oct 10 21:31:51 2017 -0700 - - modified gitignore to ignore data and debug directories - -commit 1c9203ca728e78dff31700cf3ff40f1206547eab -Author: Kanaad Parvate -Date: Wed Oct 4 23:30:50 2017 -0700 - - Flow initial release (#1) - - Initial Release of Flow. This version of flow contains: - * Rich interface for design and analysis of traffic control problems, complete with: - * Simulation of mixed autonomy traffic - * Advanced, easily generated road network configurations - * Configurable vehicle types and vehicle dynamics - * Learn policies to optimize reward functions - -commit e38d22cc4afa57a34347c9c80009cf0f271b1561 -Merge: 8c278c77 21871f90 -Author: Kanaad Parvate -Date: Wed Oct 4 20:00:41 2017 -0700 - - Merge branch 'cistar_release' of https://github.com/cathywu/learning-traffic into flow_release - -commit 8c278c77db2bb84bdb2f74976faee42b340fa983 -Author: Kanaad Parvate -Date: Wed Oct 4 19:59:30 2017 -0700 - - removed all traces of cistar, replaced with flow - -commit 566a0dec7c19d29e2f498d05573d7772113d2139 -Author: Kanaad Parvate -Date: Wed Oct 4 16:35:58 2017 -0700 - - rename cistar to flow - -commit 21871f905a8b22c62559988b7c0599510126f881 -Author: albeaik <31267700+albeaik@users.noreply.github.com> -Date: Wed Oct 4 13:34:48 2017 -0700 - - update base_env function for div by zero bug (#150) - -commit 493d71c6b7c0e595c28556797ebc991746503aa9 -Author: eugenevinitsky -Date: Tue Oct 3 00:01:23 2017 -0700 - - Update Docker_Tutorial.md - -commit b62c6ac7b623db06aa88c21e3dffd11ba808a025 -Author: eugenevinitsky -Date: Tue Oct 3 00:00:43 2017 -0700 - - Update Docker_Tutorial.md - -commit bc2af6704d812b4e47b2629252490e6e1c11032c -Author: eugenevinitsky -Date: Tue Oct 3 00:00:15 2017 -0700 - - Update Docker_Tutorial.md - -commit 0870e8a1784d21014fc4cb7f2315574289bbfe64 -Merge: c0e0abab a47fb341 -Author: Cathy Wu -Date: Sat Sep 30 23:51:44 2017 -0700 - - Merge branch 'cistar_release' of github.com:cathywu/learning-traffic into cistar_release - -commit c0e0ababc617bc2dca33a41d0e96310820b343d8 -Author: Cathy Wu -Date: Sat Sep 30 23:51:41 2017 -0700 - - easier setup scripts - -commit a47fb3417eb65034a3b0e6e79704cf695e3ba989 -Author: aboudy -Date: Sat Sep 30 00:10:47 2017 -0700 - - modified inputs to gen functions - -commit bda1395be78f8e61a67c9d98f11dac56e7a2e9e5 -Merge: cfc8dc94 c413b796 -Author: aboudy -Date: Fri Sep 29 16:03:33 2017 -0700 - - modified documentation and added option of noise to acceleration controllers - -commit c413b796aaf619351d0fea66970d24b3b6856d5f -Author: Nishant -Date: Wed Sep 27 19:11:14 2017 -0700 - - fixed get_state bug - -commit fcfafff3eb05887529fd4b85a21b3d1c913c3062 -Author: Eugene Vinitsky -Date: Mon Sep 25 17:58:38 2017 -0700 - - fixed visualizer to output plots correctly and work with new cistar version. Updated intersection environment to find distance to sort by intersection distance, normalize the states, and correctly only allow accelerations to speed cars up to enter speed - -commit 9f69c29f1aa32c10a1e7ffc644cf1d73349c1b94 -Author: Eugene Vinitsky -Date: Mon Sep 25 12:21:19 2017 -0700 - - added working rl intersection example to cistar_release - -commit cfc8dc942f171a2273cd4f62808992c8faced0ac -Merge: d325bb72 342c986c -Author: aboudy -Date: Mon Sep 25 11:44:31 2017 -0700 - - updated documentation - -commit f0da85737befee04bf1a72ca848d146e20b99184 -Author: Eugene Vinitsky -Date: Fri Sep 22 17:37:15 2017 -0700 - - Revert "system now accelerates vehicles with max accel when they pass the intersection" - - This reverts commit 1227cae4e5012105ca866ffd2fba40472dd0bcbc. - -commit 1227cae4e5012105ca866ffd2fba40472dd0bcbc -Author: Eugene Vinitsky -Date: Fri Sep 22 17:15:45 2017 -0700 - - system now accelerates vehicles with max accel when they pass the intersection - -commit 083a4b8259c656997e6641f2eedd1640c7ebff75 -Merge: 3a5c97f2 342c986c -Author: Eugene Vinitsky -Date: Fri Sep 22 13:01:10 2017 -0700 - - Merge branch 'cistar_release' of https://github.com/cathywu/learning-traffic into cistar_release - -commit 3a5c97f223296e84ae63a3d75a0877267aed280d -Author: Eugene Vinitsky -Date: Fri Sep 22 13:00:54 2017 -0700 - - Revert "removed missing environments" - - This reverts commit 3fa212034c471131272485ed98891bed39b45e92. - -commit 3fa212034c471131272485ed98891bed39b45e92 -Author: Eugene Vinitsky -Date: Fri Sep 22 12:59:28 2017 -0700 - - removed missing environments - -commit 342c986cbb07049adc9555998bc5af8b7959b097 -Author: Eugene Vinitsky -Date: Fri Sep 22 12:32:12 2017 -0700 - - removed missing environments from envs/__init__ - -commit 0e2ab192fed07d84e9ac511b075ac5919791160d -Merge: 3159ce4c a33ce283 -Author: Eugene Vinitsky -Date: Thu Sep 21 10:52:17 2017 -0700 - - Merge branch 'cistar_release' of https://github.com/cathywu/learning-traffic into cistar_release - -commit 3159ce4c31d1098abccf3d184f8460e8ccb0742c -Author: Eugene Vinitsky -Date: Thu Sep 21 10:51:44 2017 -0700 - - removed ngsim folder, added changes to intersection dist that views passing intersection as negative dist to intersection and changed abs distances in intersections to remove factor of 1000 - -commit a33ce283f3e5d5e9cc2077cac31114b21a8131fb -Author: Kanaad Parvate -Date: Thu Sep 21 10:43:09 2017 -0700 - - removed init.py from base dir - -commit 57e7091a0ca601938c4c021db74d411b9c688cb5 -Author: Kanaad Parvate -Date: Thu Sep 21 10:40:54 2017 -0700 - - removing old rl experiements - -commit e0d15b35f339c6dc2fc3fad62093f447d00881ff -Author: Kanaad Parvate -Date: Thu Sep 21 04:59:21 2017 -0700 - - removed cistar_dev folder, and moved everything the top level - -commit ea55a57a498dd4a82862f71ba3f12902464be67e -Author: Kanaad Parvate -Date: Thu Sep 21 04:58:24 2017 -0700 - - moved all files to cistar_dev and combined README.md's - -commit 6cbf760f63479d326f1bf9547c9ce9facfd599b7 -Author: Kanaad Parvate -Date: Thu Sep 21 04:54:08 2017 -0700 - - removed sumo binary - -commit d325bb723d83657e407d53933c5fc35b794e2cbd -Author: aboudy -Date: Wed Sep 20 21:05:33 2017 -0700 - - modified documentation - -commit 0e310b537271705df943af39cc47b09335d6e1de -Author: nskh -Date: Tue Sep 19 23:05:44 2017 -0700 - - Update AWS_tutorial.md - -commit 3587fdc23653d89144e9c9cd6557b16fb4b04362 -Author: Cathy Wu -Date: Tue Sep 19 21:51:24 2017 -0700 - - Fix unit tests, shorten tests, update requirements, remove a bunch of extra files - -commit a75e337aa6e3473f1de626d0654408865f00cf43 -Author: aboudy -Date: Tue Sep 19 11:15:24 2017 -0700 - - updated documentation - -commit 378b94d75b49238e2f95814ca8d8935b978228a4 -Author: aboudy -Date: Mon Sep 18 13:32:52 2017 -0700 - - modified documentation - -commit c539e9b45dbc8348c847617b1a42dd093f3a4dda -Author: Kanaad Parvate -Date: Thu Sep 14 12:03:09 2017 -0700 - - deleted deviations from params - -commit c50cc0154aba356bc2b2b43ac43c1be4003d4abc -Author: Kanaad Parvate -Date: Thu Sep 14 11:59:40 2017 -0700 - - more deletes + code cleanup - -commit 5f4cd8d5020f26e53118fef55d453ff7823ac636 -Author: Cathy Wu -Date: Thu Sep 14 11:06:09 2017 -0700 - - changed naming of unit tests (to support nose2 discovery) and made them smaller - -commit 30366ebbd4c759d272b3e2210498b095e060dd59 -Author: Kanaad Parvate -Date: Thu Sep 14 10:19:01 2017 -0700 - - added tests, cleaned code, removed print statements - -commit d18598bb69374439b627793e53de2a04202a1295 -Merge: ae581127 49c1b1c2 -Author: Kanaad Parvate -Date: Wed Sep 13 19:33:12 2017 -0700 - - Merge branch 'cistar_release' of https://github.com/cathywu/learning-traffic into cistar_release - -commit ae581127c243d1d73b98bf70154f811a966ccee8 -Author: Kanaad Parvate -Date: Wed Sep 13 19:32:56 2017 -0700 - - removing xml files + minor changes - -commit 49c1b1c25f25063840d1d4f6771ad80896cb1354 -Author: Cathy Wu -Date: Wed Sep 13 16:09:08 2017 -0700 - - instructions for config - -commit 2c9a41dfb48ea8c3a011b93ef7739935088543c2 -Author: Cathy Wu -Date: Wed Sep 13 16:08:19 2017 -0700 - - make config file into a template, since everyone will have their own - -commit ccedd522af616bea21b523a38631c128e559f5b1 -Author: nskh -Date: Thu Sep 7 11:31:01 2017 -0700 - - adding docs to cistar_release (#140) - - * initial docs branch commit - - * changed some stuff before pull request - -commit 10ba4ce8dec5a072e25de5954c104fe71ceaaf52 -Merge: cf0db8df 28c3d494 -Author: Kanaad Parvate -Date: Thu Sep 7 11:29:47 2017 -0700 - - Merge branch 'aboudy_cistar_release_2' into cistar_release - -commit 28c3d4947f3efd495f1fc84641b1ed0e1059ed8c -Author: Kanaad Parvate -Date: Thu Sep 7 11:27:00 2017 -0700 - - fixing missed merge issue - -commit 159733d1a036dea159bfd771e6e61c87b02187c2 -Merge: 70484dbf cf0db8df -Author: Kanaad Parvate -Date: Thu Sep 7 11:16:56 2017 -0700 - - merge net params and cistar dev - -commit cf0db8df8bc178f0b35766b7f3c7fca9772a23f7 -Author: Kanaad Parvate -Date: Thu Sep 7 10:47:54 2017 -0700 - - code clean up and correct set up of example experiments - -commit 70484dbf421f91dd61ea183c76278631db11dc87 -Merge: 0ab10d4e e2f1fcb1 -Author: aboudy -Date: Thu Aug 31 23:17:55 2017 -0700 - - Merge branch 'cistar_release' of https://github.com/cathywu/learning-traffic into cistar_release_aboudy - -commit aa08885560dee411a0964a6d7475bb52d6aa9aa0 -Author: Kanaad Parvate -Date: Thu Aug 31 11:09:29 2017 -0700 - - removed braess - -commit 0ab10d4eaa27bc7c2b342c69b253e99adb5b3c55 -Author: aboudy -Date: Thu Aug 31 11:06:25 2017 -0700 - - added NetParams and InitialConfig classes, merged sumo_binary into sumo_params and cfg_params is net_params - -commit e2f1fcb1b53c00a68091689244a63c03f83700a6 -Author: Kanaad Parvate -Date: Thu Aug 31 11:06:19 2017 -0700 - - added mulitagent rewards - -commit 1c07111e20016b2dce1b0ab61a75244990710a2e -Author: Kanaad Parvate -Date: Thu Aug 31 10:48:55 2017 -0700 - - removed old cistar code - -commit 463d2022bce0de121d4345084118e022803873f7 -Author: Kanaad Parvate -Date: Wed Aug 30 15:37:27 2017 -0700 - - made comments obey pydoc - -commit 4378faba25aa60ac883b29a365380958a60c15c4 -Author: Kanaad Parvate -Date: Thu Aug 31 10:40:54 2017 -0700 - - merge - -commit 011b080fca8edb3edf45c398c6dfa0f6d48a9b50 -Author: Kanaad Parvate -Date: Thu Aug 31 10:39:04 2017 -0700 - - merge - -commit b4c762781f1709297d37acbd02c1a7bcf95d21de -Author: aboudy -Date: Thu Aug 31 01:44:39 2017 -0700 - - added InitialConfig class - -commit 9080116c665801b49ea548458234a6fa8c6f1f2d -Author: aboudy -Date: Wed Aug 30 21:49:37 2017 -0700 - - fixing the merge - -commit 7f04d3ae1863bade0dcb1c081c15cd9de1dd24c1 -Author: aboudy -Date: Wed Aug 30 21:27:23 2017 -0700 - - added vehicles and routing classes - -commit 33cce53c6bb138885393cb7126b1e965e89a6a5a -Merge: cdf4dd75 a3593404 -Author: Eugene Vinitsky -Date: Tue Aug 29 15:22:42 2017 -0700 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic - -commit cdf4dd759ba1b87ec92f3174673405621b00534e -Author: Eugene Vinitsky -Date: Tue Aug 29 15:21:48 2017 -0700 - - branch is working - -commit a3593404bb775304853ff659622352a2cd391786 -Merge: bb644190 ff0b13d1 -Author: eugenevinitsky -Date: Tue Aug 29 10:24:02 2017 -0700 - - Merge pull request #135 from cathywu/multi_agent_vist - - minor fixes in emergent behavior experiments to make them compatible … - -commit ff0b13d143d7f056d579d5f733a135ba76242e94 -Author: Eugene Vinitsky -Date: Mon Aug 28 14:14:44 2017 -0700 - - minor fixes in emergent behavior experiments to make them compatible with hackathon changes - -commit bb644190b4d887125a03aa9a2c52ab6722eaec76 -Merge: 7d5d5637 4079ea5b -Author: AboudyKreidieh -Date: Sun Aug 27 17:21:47 2017 -0700 - - Merge pull request #132 from cathywu/braessParadox - - changed the inputs to a few functions - -commit 4079ea5b9840a8bb89d68364c8c6e63cb0a99fa8 -Author: aboudy -Date: Sun Aug 27 14:39:28 2017 -0700 - - changed the inputs to a few functions - -commit 7d5d5637f0a59e2733447f92aa7683444988c530 -Author: Eugene Vinitsky -Date: Thu Aug 24 17:39:40 2017 -0700 - - cleaned up emergent behaviors folder - -commit d723348d6e186c96f483875eb9623b645df9c04c -Merge: 07e548b2 679f28f2 -Author: eugenevinitsky -Date: Thu Aug 24 17:36:21 2017 -0700 - - Merge pull request #131 from cathywu/braessParadox - - Braess paradox - -commit 679f28f293ae4a7440c305f4c15f983be98cb2fa -Author: aboudy -Date: Thu Aug 24 11:37:29 2017 -0700 - - code cleanup - -commit cddb116112e76cfca652549db57348546f268788 -Author: aboudy -Date: Tue Aug 22 17:36:44 2017 -0700 - - made generator class more abstract, and modified subclasses - -commit 58937b650681e315064114f22e9586019851b521 -Author: aboudy -Date: Sat Aug 19 19:45:15 2017 -0700 - - replaced type_params with lists instead of dicts - -commit e8f621defff3284ee6f38c6f2e302fd5e6121160 -Author: aboudy -Date: Thu Aug 17 10:31:08 2017 -0700 - - restrcuturing of scenario class in order to make more abstract - -commit f66f9cae2714a9c11fb30fce1608f7e013a03287 -Author: aboudy -Date: Thu Aug 17 10:28:08 2017 -0700 - - some code cleanup and continued fixing merge - -commit 5ed0861e015b1a1caf41311ea25709da2456d8f4 -Author: aboudy -Date: Thu Aug 17 10:10:33 2017 -0700 - - some cleanup to examples - -commit 363373d37fa70bf53f5f9d84f04ff6e18a17f2ac -Merge: c25c5296 07e548b2 -Author: aboudy -Date: Mon Aug 14 19:18:00 2017 -0700 - - merged changes - -commit c25c5296e2f404f2b812dc177cbe221c7804096f -Author: aboudy -Date: Fri Aug 11 15:30:13 2017 -0700 - - bug fixes and documentation - -commit b82e5c726a7dbbc373afeaedb83dbae3020d3996 -Author: aboudy -Date: Fri Aug 11 15:26:39 2017 -0700 - - added subclass for partial observability - -commit 5f6bfb974e70d43bd4a7083512ca4f7e6134f774 -Author: aboudy -Date: Fri Aug 11 15:23:27 2017 -0700 - - added subscribe for headways into get_headway_dict() - -commit 07e548b2afa0933e3e0b725e2c322a19faaeb3eb -Merge: dac56ce1 00536cb4 -Author: Eugene Vinitsky -Date: Sun Aug 6 16:18:20 2017 -0700 - - merged with multi-agent updates - -commit 00536cb4777442076c1fb6c3026f50d72b9c0247 -Author: Eugene Vinitsky -Date: Sun Aug 6 15:58:21 2017 -0700 - - minor fixes to how experiments are run - -commit 8bd167cdea750fef847772fbf192eefa20f95a50 -Merge: a8f8cced dac56ce1 -Author: AboudyKreidieh -Date: Thu Aug 3 15:24:36 2017 -0700 - - Merge branch 'braessParadox' of https://github.com/cathywu/learning-traffic into braessParadox - -commit a8f8cceddd4115eabb285ab7f4e973edbf34d9ac -Author: AboudyKreidieh -Date: Thu Aug 3 15:24:28 2017 -0700 - - misc changes - -commit 5533d5ec472db420a1acfcb8125474648a2ba684 -Author: AboudyKreidieh -Date: Thu Aug 3 15:21:28 2017 -0700 - - misc changes - -commit 04ffdaeb26a446ce09407a6f8ababf011e5bb682 -Author: AboudyKreidieh -Date: Thu Aug 3 15:19:15 2017 -0700 - - locked down a method of acquiring robust policies - -commit 18c09435a74f4f77cf6677e354450b8d4f6ce06f -Author: AboudyKreidieh -Date: Thu Aug 3 15:18:05 2017 -0700 - - updated getState and sort_by_id - -commit 5ea78e55e811a22a2bc3bc3724aa6884b4ad6bb8 -Author: AboudyKreidieh -Date: Thu Aug 3 15:16:43 2017 -0700 - - added functionality to perform dynamic route changes (used in braess and loop-merges) - -commit 8601b2ba7384362b66a29df04f27fe212eb8c1aa -Author: AboudyKreidieh -Date: Thu Aug 3 13:24:19 2017 -0700 - - the function sort_by_position() added an extra output that can be used to speed getState function calls - -commit 6675ef7ddc08ab25eb6545943c7f4cc0234b62ee -Author: AboudyKreidieh -Date: Thu Aug 3 13:19:36 2017 -0700 - - modified braess paradox env and scenario to accept car following models and separate speed limits on the two portions of the network - -commit 8deb6baa48480fce402de4cf8704fd7df6390e66 -Author: Eugene Vinitsky -Date: Tue Aug 1 15:36:18 2017 -0700 - - updated multi-agent environments to have the correct observation space. Additionally made changes in base-env allowing for mixed, multiagent traffic - -commit eb542686f5e8cd82ef0a12925fd9265074970516 -Author: AboudyKreidieh -Date: Tue Aug 1 13:53:21 2017 -0700 - - fixed bug in IDMController and DrunkDriver when there are no leading cars - -commit 6460a9187f06792be2fc94568fe1323a2e3f9dbd -Author: AboudyKreidieh -Date: Tue Aug 1 13:42:25 2017 -0700 - - fixed bug in IDMController and DrunkDriver when there are no leading cars - -commit a082ea00744e1a4bd64db21f54f8488c12139977 -Author: Eugene Vinitsky -Date: Mon Jul 31 17:16:30 2017 -0700 - - fixed the visualizer to use gymenv - -commit c497896575dcc835580408ea130f9b66803e7e36 -Author: Eugene Vinitsky -Date: Mon Jul 31 11:35:46 2017 -0700 - - created lane changing only scenario - -commit 5caa4d8711b36b27e5930b262f00187265301868 -Author: AboudyKreidieh -Date: Fri Jul 28 12:01:11 2017 -0700 - - added option of running braess and loop_merge scenarios on visualizer_CISTAR - -commit 139b0daabb5011ff39ddd7a30759b424badb0662 -Merge: 03a509b2 da7e732f -Author: Eugene Vinitsky -Date: Fri Jul 28 11:50:31 2017 -0700 - - fixed up merge conflict in dockerfile svn - -commit d4f722a449186983ed02cec4f76c9afac5881455 -Author: AboudyKreidieh -Date: Fri Jul 28 11:21:38 2017 -0700 - - misc fixes - -commit 93bbb598d78a4413438f4b6248f4953bf798c07b -Author: AboudyKreidieh -Date: Thu Jul 27 22:52:47 2017 -0700 - - several different states to allow for partial observability and implicit labeling (latter did not work) - -commit 50de241d0097c43be9932c1878fdf9e4941067d7 -Author: AboudyKreidieh -Date: Thu Jul 27 22:49:11 2017 -0700 - - changes to allow even distribution of vehicles across lanes in figure 8 scenario - -commit e75436063abb9e78fa266b34d0ad6f6ea6aeba8c -Author: AboudyKreidieh -Date: Thu Jul 27 22:38:18 2017 -0700 - - additional options for getState and sorted_by_position which may speed up convergence - -commit 349297d55712cdc952cc9d1dfc8444ed65cf0d4f -Author: AboudyKreidieh -Date: Thu Jul 27 22:36:25 2017 -0700 - - added method for traci subscribing headways (already on another branch) - -commit e6d35789d4c62d2de9231af1c3c37469d54f2212 -Author: AboudyKreidieh -Date: Thu Jul 27 22:34:44 2017 -0700 - - misc fixes - -commit 225b8d59a8f252fd9199b5ab4e91b4d663263857 -Author: AboudyKreidieh -Date: Thu Jul 27 20:10:25 2017 -0700 - - added option of having only merge ins (no merge out) - -commit 03a509b2368e701c01ea8019fb1897062ad212a9 -Author: Eugene Vinitsky -Date: Thu Jul 27 18:07:01 2017 -0700 - - everything working in multiagent parallel form except for possibly multi-agent lane changing and the files in test-fast - -commit 64a15e3ed105eb31946bdbf62ac26586a9199345 -Author: AboudyKreidieh -Date: Thu Jul 27 16:39:55 2017 -0700 - - network for loops with merges - -commit 385933ad6227824a8ba000f292072d1b6a8d7fa1 -Author: AboudyKreidieh -Date: Thu Jul 27 16:39:04 2017 -0700 - - created network and environment for loops with merges - -commit 3b2653e26d0e606e3277dc51bab0deda8f0cd66c -Author: AboudyKreidieh -Date: Wed Jul 26 20:35:27 2017 -0700 - - minor changes to lane-change only environment - -commit 0d1ce4957095aa3f6d79806f2fc30cde8d5e3a4e -Author: Eugene Vinitsky -Date: Wed Jul 26 19:09:32 2017 -0700 - - all emergent behaviors are currently working as gym environments. Parallel does NOT work yet, some of the tests are still broken - -commit 7057ff3b112bc404c45670f42ef64fd65f292f36 -Author: AboudyKreidieh -Date: Wed Jul 26 15:51:59 2017 -0700 - - created scenario and environment for braess paradox, and setup a network that shows the parado in action - -commit b965d5f8cb0218e367b287b49ffa67792eeb0b1e -Author: AboudyKreidieh -Date: Wed Jul 26 15:22:51 2017 -0700 - - created environment and experiment for lane-change only control - -commit 98c8bc5c219ec6c1c4a5517f72e4c4fa59f297a0 -Author: AboudyKreidieh -Date: Fri Jul 21 12:18:46 2017 -0700 - - file to contain several observation functions - -commit f5553ee255f02951548e0fd2d4b2c756fb66342d -Author: AboudyKreidieh -Date: Fri Jul 21 01:21:33 2017 -0700 - - created braess paradox generator, scenario, and environment, as well as an example showing the paradox in action in the absence of rl vehicles - -commit dac56ce161ed8c122c66b6599bfa59c6ef285940 -Author: Cathy Wu -Date: Thu Jul 20 20:14:57 2017 -0700 - - Refactored multilane ring exp so that params.pkl are saved per iteration - -commit 232f1b3f58c0dc1d778dc3f82f2fe1ee6af97c6e -Author: Cathy Wu -Date: Thu Jul 20 18:07:38 2017 -0700 - - Stabilizing multilane ring (tensorflow version of moving bottleneck) - -commit 4f2e824895fba1d3600098ef2a066279f3ee91a5 -Author: AboudyKreidieh -Date: Thu Jul 20 17:05:14 2017 -0700 - - added everything moving-bottleneck related, including changes to lane_changing and the scenario - -commit bd6f8a1e4a6cb43049150052d1d857d6ea7d36ea -Author: Eugene Vinitsky -Date: Wed Jul 19 14:33:48 2017 -0700 - - added missing __init__ file - -commit 173765cac93962e352b186c063b15526ed3fea83 -Author: Eugene Vinitsky -Date: Wed Jul 19 14:27:18 2017 -0700 - - added appropriate cistar_dev files back in - -commit 794d506e07817cbb625bb4793fc7d6149825974f -Author: Eugene Vinitsky -Date: Wed Jul 19 14:15:21 2017 -0700 - - changed all intersection classes to use Gym classes as superclass - -commit 0206b2396e72ef1937e29715c2ce444909906565 -Author: Eugene Vinitsky -Date: Tue Jul 18 16:05:40 2017 -0700 - - registered things as gym environments - -commit da7e732f5280eb91d0fb848d90f88c5addcfd1a5 -Merge: 8b3398e2 7b14da92 -Author: Kanaad Parvate -Date: Mon Jul 17 15:29:12 2017 -0700 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic into laneChangeChChChChanges - -commit 8b3398e2f0273a4d0f69619d0f0de43603beb4b7 -Author: Kanaad Parvate -Date: Mon Jul 17 15:28:22 2017 -0700 - - updated docker-svn file to properly pull nightly build - -commit 434a7d6dccae2b5d9cf1242d950c195aa176554f -Author: AboudyKreidieh -Date: Mon Jul 17 14:17:39 2017 -0700 - - changes made to allow for vehicles to be placed in multiple lanes for the loop scenario - -commit 7b14da9229a63a0619c61d296bdcde61de58bf8c -Author: eugenevinitsky -Date: Mon Jul 17 10:25:24 2017 -0700 - - Update Docker_Tutorial.md - -commit 52be68b9d98661addaaae4909bc77e9f06bae2ef -Author: eugenevinitsky -Date: Mon Jul 17 10:22:05 2017 -0700 - - Update Docker_Tutorial.md - -commit 2aa5be5e4f6fd233f02132789e42f0c499b53a89 -Author: eugenevinitsky -Date: Fri Jul 14 17:42:20 2017 -0700 - - Create commit-practices.md - -commit 3744b51740348fd7b9b227a01b974eceaa2db6ec -Author: Eugene Vinitsky -Date: Fri Jul 14 14:10:28 2017 -0700 - - working two intersection experiment without shuffling of initial positions and noise - -commit ea56bf9d2a212391e09674b1114245911e22c921 -Merge: 35162db1 7d300af8 -Author: Cathy Wu -Date: Thu Jul 13 17:14:14 2017 -0700 - - merge - -commit 35162db162ea766f97e5662aa8d59612f1e0cc08 -Author: Cathy Wu -Date: Thu Jul 13 17:13:31 2017 -0700 - - gitignore .idea files - -commit 7d300af8eeb21301bc27a19da34233568b673c3d -Author: Cathy Wu -Date: Thu Jul 13 17:12:48 2017 -0700 - - Delete workspace.xml - -commit 778f4d80e622948c642e6b1bc90259303a3c1c48 -Author: Cathy Wu -Date: Thu Jul 13 17:12:36 2017 -0700 - - Delete vcs.xml - -commit d6c9826cd1974bbba35b507f8437af40dba48092 -Author: Cathy Wu -Date: Thu Jul 13 17:12:30 2017 -0700 - - Delete modules.xml - -commit 24cfcd78b51b6a25ddadf26a6fd57883bfce4df1 -Author: Cathy Wu -Date: Thu Jul 13 17:12:23 2017 -0700 - - Delete learning-traffic.iml - -commit 2e26fca243700592e6751a5ea40fb1fd368a33d8 -Author: Cathy Wu -Date: Thu Jul 13 17:12:16 2017 -0700 - - Delete misc.xml - -commit 40af3d7a34356eb1c6c8edcd5e6bb652314b1278 -Author: Eugene Vinitsky -Date: Wed Jul 12 15:12:13 2017 -0700 - - two way intersection is working. The max path length needs to be adjusted and a max speed be set such that the cars never exit the intersection in a single run - -commit b5f83bb614a9aca8656009707d086f862c01a7b6 -Author: AboudyKreidieh -Date: Tue Jul 11 16:59:02 2017 -0700 - - vehicles in the intersection scenario can now change positions and shuffle in between rollouts - -commit 42d847201e1a871a411219d2c483ccba98bb899f -Merge: a2928c87 088bb582 -Author: Eugene Vinitsky -Date: Tue Jul 11 15:43:09 2017 -0700 - - Merge branch 'intersectionControl' of https://github.com/cathywu/learning-traffic into intersectionControl - -commit a2928c87cbf491776bea434b5625201c2f4e176e -Author: Eugene Vinitsky -Date: Tue Jul 11 15:42:05 2017 -0700 - - changed start positions of two lane intersection - -commit 088bb582ebd8c7b7e4ce217b9a35e154919dbba5 -Author: AboudyKreidieh -Date: Tue Jul 11 15:36:48 2017 -0700 - - remove vehicle ids dynamically whenever a car exits to prevent the system from crashing - -commit e01964b95b8cf8e72438677b2042006a0f90dfff -Author: Eugene Vinitsky -Date: Tue Jul 11 15:11:59 2017 -0700 - - fixed bug where I had labelled start edge as right instead of bottom - -commit 7b2ff2d8345738ca4a9857863f375049a335ee02 -Author: Eugene Vinitsky -Date: Tue Jul 11 14:52:46 2017 -0700 - - fixed getting headway to use traci calls - -commit 762812ce370f7a145f8c9a137b2d12baab3d991c -Author: Eugene Vinitsky -Date: Tue Jul 11 11:26:07 2017 -0700 - - added start position generator that pushes all cars to the far left and bottom of the intersection - -commit c47e8164099e8119a3629307936c4c14e6b578f2 -Merge: a4ab96b4 05545200 -Author: eugenevinitsky -Date: Mon Jul 10 17:21:39 2017 -0700 - - Merge pull request #125 from cathywu/cleanup - - Cleanup - cleaned up example branches - cleaned up environments - shuffling between rollouts implemented - cross-intersection partially implemented - speedups via subscriptions - get_headway and get_x_by_id are sped up - -commit 0554520092e9c8692f9eadea28678f41fd6fbf58 -Merge: 4c3a5b58 a4ab96b4 -Author: eugenevinitsky -Date: Mon Jul 10 17:21:20 2017 -0700 - - Merge branch 'master' into cleanup - -commit 4c3a5b58af754619e107f9b45e7e7d81753b584b -Author: Eugene Vinitsky -Date: Mon Jul 10 17:18:44 2017 -0700 - - merged in master - -commit 1d8fae7ec59bc6375d69e8acd5fd6662af93974b -Author: Eugene Vinitsky -Date: Mon Jul 10 17:14:43 2017 -0700 - - merged in master branch - -commit 3a51289efc2e02028f46608381f31ec197f39c36 -Merge: 8a3eff57 c2878b7b -Author: Eugene Vinitsky -Date: Mon Jul 10 17:08:27 2017 -0700 - - Merge in changes from remote - - Merge branch 'cleanup' of https://github.com/cathywu/learning-traffic into cleanup - -commit 8a3eff578005d13e0ecd3d90fae8e92d77cbd585 -Author: Eugene Vinitsky -Date: Mon Jul 10 17:07:27 2017 -0700 - - added functional rl tests - -commit c2878b7b0bcf46f5c1ad8acf100a9fdc0b7c7ba3 -Author: AboudyKreidieh -Date: Mon Jul 10 16:57:14 2017 -0700 - - started adding partial observability to getState() - -commit c4de341c2bb5295193212d98c69b164d474157a2 -Merge: b9968875 e356547a -Author: AboudyKreidieh -Date: Mon Jul 10 16:48:22 2017 -0700 - - fixed merge conflicts - -commit b9968875e7bf05151900532270210e22daad45c2 -Author: AboudyKreidieh -Date: Mon Jul 10 16:45:18 2017 -0700 - - made changes to shuffling process in between rollouts - -commit c9160d49ecefe099970c5ea86bc7f94936027189 -Author: AboudyKreidieh -Date: Mon Jul 10 16:43:34 2017 -0700 - - recreated rewards file as a series of rewards functions - -commit d0d09e71d5cd8d6a3301224049a342aae677930b -Author: AboudyKreidieh -Date: Mon Jul 10 16:43:04 2017 -0700 - - cleaned up car-following models - -commit e356547ae4317016d33a83ba2b793876e4cf5560 -Author: Eugene Vinitsky -Date: Mon Jul 10 16:41:21 2017 -0700 - - removed unnecessary environments - -commit 32b94d43a666a0aacd814273640d22ec17460a5e -Author: Eugene Vinitsky -Date: Mon Jul 10 16:30:59 2017 -0700 - - cleaned up and commented example folder - -commit a4ab96b46c66de8d362ff8eb8ace7549b914aa53 -Merge: a8197566 6fd5e12c -Author: eugenevinitsky -Date: Mon Jul 10 12:02:04 2017 -0700 - - Merge pull request #121 from cathywu/Makefile - - Makefile template instead of Makefile - -commit 157c6d5b638470cbd0d5d0ed0a690db284b6af64 -Author: AboudyKreidieh -Date: Mon Jul 10 01:03:11 2017 -0700 - - changes to get_x_by_id(), collecting headways, and collecting observations for speed boosts. also added method for random initialization of positions - -commit 6fd5e12c94a1b98429123a54048950dfc86da7da -Author: Cathy Wu -Date: Sat Jul 8 10:19:48 2017 -0700 - - Makefile template instead of Makefile, to support custom paths for the rllab directory. - -commit c8d597f130b9b923d504366150b5609a1cf06b16 -Author: AboudyKreidieh -Date: Fri Jul 7 11:14:45 2017 -0700 - - added intersection scenario (still needs work) - -commit 24a345f13a28465efef67575a59eaaee2dc46271 -Author: AboudyKreidieh -Date: Wed Jul 5 12:38:26 2017 -0700 - - adding methods for performing simulations of intersections (work in progress) - -commit 071b27b1ffc1c38e84f64fafcc126fafa54369a1 -Author: AboudyKreidieh -Date: Wed Jul 5 12:33:51 2017 -0700 - - cleaned up various asepcts of cistar, added option of noise to observations and actions - -commit eb4ebeab4c01fe9cb4ba93235553b2ce17e7a25c -Merge: 92f823ce 9535ee03 -Author: AboudyKreidieh -Date: Thu Jun 29 03:52:02 2017 -0700 - - merged changes and placed each emergent behavior experiment is a separate python file - -commit 92f823ce24cbea9897b9b2e35412b2d4f60cd56b -Author: AboudyKreidieh -Date: Thu Jun 22 21:16:57 2017 -0700 - - changes made for paper, some temporary - -commit 9535ee0357e35b686da20dab20be8b282232f974 -Author: Eugene Vinitsky -Date: Fri Jun 16 16:14:50 2017 -0700 - - fixed rlonly to use both in lane and adj lane headway - -commit b85c67b7465be793a0646da90378fcdf7f9d063f -Author: Eugene Vinitsky -Date: Fri Jun 16 15:42:04 2017 -0700 - - switched mixed_human to use a state space that depends on headway and not absolute position - -commit 4fa8e8f43684a8ccd5d463585f7ffb5769c7c8be -Author: Eugene Vinitsky -Date: Fri Jun 16 01:05:57 2017 -0700 - - fixed simple accel to account for the fact that applying a reward of -20 can be crippling for code run without a failsafe - -commit 0fb5036b2bc417c379a0fb2ab69e5fafecd47898 -Author: Eugene Vinitsky -Date: Fri Jun 16 00:17:39 2017 -0700 - - fixed bug wherein time of lane change was updated whether the fail safe had let it happen or not. Now lane change time is only updated if the lane change has actually occurred - -commit 18069f57b931c154da77da3a3b26c7c7d100ce4b -Author: Eugene Vinitsky -Date: Thu Jun 15 19:22:43 2017 -0700 - - resolved the bug that was causing excessive lane changes - -commit f21b5c78974b522830866ed2fc3e6a4fea779b6b -Author: Eugene Vinitsky -Date: Thu Jun 15 18:52:23 2017 -0700 - - added drunk drivers - -commit d7906b4418f71266e6b8eb7c6f6489aad7a7c260 -Merge: 9b0f8da8 2a141ba6 -Author: AboudyKreidieh -Date: Thu Jun 15 12:19:33 2017 -0700 - - changes to instantaneous failsafe and observation space method for multi-lane - -commit 80dad993646d040f10f03bfa4b971cd16502fca3 -Author: Eugene Vinitsky -Date: Wed Jun 14 17:29:21 2017 -0700 - - added drunk driver class that gets perturbed every number of time steps by a perturbation of random size - -commit 531ecd851c431e9940f02258bdf62c37b23cb7c8 -Merge: 72fe3d87 db26c45c -Author: Eugene Vinitsky -Date: Wed Jun 14 13:52:57 2017 -0700 - - merged in aboudys changes to speed up the experiments - -commit 72fe3d87bf35cd3a41019cf72ab70796726e6e2b -Author: Eugene Vinitsky -Date: Wed Jun 14 10:17:30 2017 -0700 - - removed extraneous lane changing applied at each step - -commit 9b0f8da8052ddccdc9dc821c3e585dfabff449b2 -Author: AboudyKreidieh -Date: Tue Jun 13 13:13:56 2017 -0700 - - preparing for merge - -commit 2e58550f70b9897130fa5a72f57b4f71064062dd -Author: AboudyKreidieh -Date: Tue Jun 13 13:13:04 2017 -0700 - - preparing branch for merge - -commit db26c45c5e16296d77edbf39442360e817b0269a -Author: AboudyKreidieh -Date: Tue Jun 13 01:07:15 2017 -0700 - - removed unneccesary lane change commands - -commit 6a1dc31adbc10365e7426755ebd093c7c04eeee1 -Author: AboudyKreidieh -Date: Tue Jun 13 00:28:02 2017 -0700 - - fixed bug in getting lane index - -commit 38a9beb58ba44733c5f225ae8eb158ac033af84e -Author: AboudyKreidieh -Date: Mon Jun 12 21:31:01 2017 -0700 - - stopped traci get calls when unnecessary - -commit cc748db1c01a1b3af739c98d8359534c2668b5af -Author: Eugene Vinitsky -Date: Mon Jun 12 17:11:30 2017 -0700 - - fixed lane changing bug where command was not issued at every step - -commit dba8d28c5c7feb00bcc23c8da72d9b26901c5f51 -Author: AboudyKreidieh -Date: Mon Jun 12 15:43:53 2017 -0700 - - updates to parameters in experiments - -commit 80ea9a78eebb1b7d5131fc90193556e6152e212c -Author: AboudyKreidieh -Date: Mon Jun 12 15:40:48 2017 -0700 - - made iterations faster - -commit 8c560cb85af12a6c258b9caa5a7ae1a36b9bfe5b -Author: AboudyKreidieh -Date: Mon Jun 12 02:02:26 2017 -0700 - - added method for shuffling vehicles in between runs - -commit e4cada90ceb1be81785b4d26bd780a2ec3bd4bbf -Author: AboudyKreidieh -Date: Mon Jun 12 02:01:49 2017 -0700 - - added method for shuffling vehicles in between runs - -commit 14838154a17865cdbb377bac1ebe1634b8841d86 -Author: AboudyKreidieh -Date: Mon Jun 12 02:01:08 2017 -0700 - - added method for shuffling vehicles in between runs - -commit 2a141ba68b02858693b6be10cd8764f78851d64c -Author: Eugene Vinitsky -Date: Sun Jun 11 16:27:47 2017 -0700 - - added in aboudys changes so that a lane change command is applied every time to tell the vehicle to stay in lane if lane_change_duration has not passed - -commit fc025a6ffd8fd8dd30896bd967a5cb47399038b0 -Author: AboudyKreidieh -Date: Sun Jun 11 13:21:34 2017 -0700 - - get_headway by default looks in current headway - -commit 93a7f518a7eefd0d5492f8c77b253d7f40af3b4f -Author: AboudyKreidieh -Date: Sat Jun 10 19:18:13 2017 -0700 - - fixed bugs with lane changing cars running sumo commands - -commit cff2408027703d8cc73facfb02e748380acbbfb9 -Author: Eugene Vinitsky -Date: Sat Jun 10 14:23:36 2017 -0700 - - created new file for visualizing policies created through tensorflow - -commit b801c3bddca1bb3f52f9b47c0f1ae295588bf7ed -Merge: c171d10f 2a2600d2 -Author: AboudyKreidieh -Date: Sat Jun 10 00:16:33 2017 -0700 - - fixed merge conflicts - -commit 2a2600d2d278cf7b7a68e0fd5a22e99a10bc8d0c -Author: Eugene Vinitsky -Date: Fri Jun 9 23:45:59 2017 -0700 - - changed base_env to handle the fact there isnt a safe_target_lane for non-rl cars - -commit c171d10f74fe392e816e66b8c8e71fecb094ba76 -Author: AboudyKreidieh -Date: Fri Jun 9 23:20:32 2017 -0700 - - added method to implement sumo IDM controller - -commit 482d52c6b760efc3bd5094223bb032574116a992 -Author: AboudyKreidieh -Date: Fri Jun 9 23:19:48 2017 -0700 - - method to penalize non-compliance with rl requests - -commit 40f3187e7221547708079507348a7684059f0e88 -Author: Eugene Vinitsky -Date: Fri Jun 9 23:11:20 2017 -0700 - - fixed sheparding aggressive drivers to work with automlp - -commit a0250cadab34a5eb90f7ec08a8f2c115de814553 -Merge: 293a8acd a8197566 -Author: AboudyKreidieh -Date: Fri Jun 9 23:05:55 2017 -0700 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic into funWithPandas - -commit 293a8acda3f8adf4c0dbfb1e18a9c61dd3284c9e -Author: AboudyKreidieh -Date: Fri Jun 9 23:05:43 2017 -0700 - - cases to mixed-rl - -commit 7d94f965f72486727b69b0dcd2e1ac7373d1dd3d -Author: Eugene Vinitsky -Date: Fri Jun 9 22:18:45 2017 -0700 - - fixed lane changing to use mixed and discrete policy - -commit 8004e3d8ca98e3224fe8d8a78147df40731a536e -Author: Eugene Vinitsky -Date: Fri Jun 9 14:31:28 2017 -0700 - - added all car rl lc example - -commit 4e2a5cb241b8cd957a1ff08787c4304426dc4a86 -Author: Eugene Vinitsky -Date: Fri Jun 9 14:07:37 2017 -0700 - - made base-env changes, changed lane-changing to use discrete version - -commit 4cac22502f6b0c2b196312d8aff0621424aa0f01 -Author: AboudyKreidieh -Date: Thu Jun 8 16:16:02 2017 -0700 - - all sumo functions in base_env, method to set lc_mode and speed_mode (maybe to replace fail-safes), some documentation, modified lane_changing.py to perform actions we want in the continuous space, and added (possible) method to perform lane_changing in a mixed discrete-continuous action space - -commit a8197566078913601ee508fd3775dd04a0205d62 -Merge: af08c531 7ddd57c0 -Author: eugenevinitsky -Date: Thu Jun 8 14:40:58 2017 -0700 - - Merge pull request #107 from cathywu/prepare_automlp - - Switch to AutoMLPPolicy for cistar envs - -commit 7ddd57c027a710714b928a414acbba72e4cf93a6 -Author: eugenevinitsky -Date: Thu Jun 8 14:04:15 2017 -0700 - - Create AWS_tutorial.md - -commit fb29ad1e249837540bdb82cbbad4aa04af00904f -Author: AboudyKreidieh -Date: Tue Jun 6 16:46:28 2017 -0700 - - base lane changing controller - -commit d6e190ed21eb8678bf1e80bec788d8bfec64b631 -Merge: e673c301 af08c531 -Author: AboudyKreidieh -Date: Tue Jun 6 16:44:02 2017 -0700 - - fixed merge - -commit e673c301c42f64a5ff53b78effdf78b0855e83e5 -Author: AboudyKreidieh -Date: Tue Jun 6 15:57:14 2017 -0700 - - reorganizing location of sumo commands - -commit af08c5311b972a379e90e53709466530d65b85e3 -Merge: 99a6e9bf 78960b8c -Author: AboudyKreidieh -Date: Tue Jun 6 15:53:42 2017 -0700 - - Merge pull request #105 from cathywu/laneChangeChChChChanges - - changed compute reward to take kwargs for additional arguments - -commit 91168c063736e244be55d53c51415467628f1955 -Merge: 02b80b3d 99a6e9bf -Author: Cathy Wu -Date: Mon Jun 5 21:46:13 2017 -0700 - - Merge - -commit 02b80b3dbcfe573382cae99336a6db4f6cdabeda -Author: Cathy Wu -Date: Mon Jun 5 21:44:32 2017 -0700 - - mixed-human-rl: switch GaussianMLPPolicy to AutoMLPPolicy, switch Theano uses of rllab to Tensorflow - -commit 78960b8cab9c014196bce2cbc37d6b011618eca9 -Author: Kanaad Parvate -Date: Mon Jun 5 11:33:54 2017 -0700 - - changed docker file t onot use the patch anymore - -commit 99a6e9bf1e667f403bf6d6f48bde603a982c7095 -Author: eugenevinitsky -Date: Mon Jun 5 14:28:44 2017 -0400 - - Update AWS_tutorial.md - -commit a93016c48be23a5d6070f27a606f8f4cb372ec12 -Author: eugenevinitsky -Date: Thu Jun 1 17:36:33 2017 -0700 - - Update Docker_Tutorial.md - -commit 0542eaaaa3001bb984a5d5f6b76208d3d3c7fc35 -Author: eugenevinitsky -Date: Thu Jun 1 17:36:17 2017 -0700 - - Update Docker_Tutorial.md - -commit 3a825151eddb6830724776efd59187c68aa17aba -Author: Eugene Vinitsky -Date: Thu Jun 1 17:08:52 2017 -0700 - - added some docker files to the svn folder - -commit 7fc287dc4aa2dc4d82a75e980057469670f7728f -Author: Cathy Wu -Date: Thu Jun 1 16:28:16 2017 -0700 - - Instructions corresponding with commit f40f033cb3986c657de39c34f253f0236bc337a7 in cathywu/rllab repo (incorporated several of leah's steps into the rllab setup script) - -commit 0cba6f8cc11168186e194440f971d2dbd207a4da -Author: Eugene Vinitsky -Date: Thu Jun 1 14:19:03 2017 -0700 - - changed compute reward to take kwargs for additional arguments - -commit 8e45f8895ea1cd6ed65d1871f994128c2a066db2 -Merge: 847aac6a 761597fe -Author: eugenevinitsky -Date: Thu Jun 1 13:26:31 2017 -0700 - - Merge pull request #102 from cathywu/idm_simulations - - Idm simulations - -commit 761597fe6910aefe77887932b0d9e7973f64cd2d -Merge: 86f856e8 847aac6a -Author: eugenevinitsky -Date: Wed May 31 10:26:10 2017 -0700 - - Merge branch 'master' into idm_simulations - -commit 86f856e8a2ab52269e72923292cad3fc6f98e972 -Author: AboudyKreidieh -Date: Wed May 31 10:10:00 2017 -0700 - - modified reward function and states to be compatible with newest approaches - -commit 847aac6a320541c4f99e9f769b6b61ad31d8c22a -Author: Eugene Vinitsky -Date: Wed May 31 10:09:33 2017 -0700 - - unit tests fixed now? - -commit 0441b9f4988a56da387a1253ba320e60a133d3ca -Author: AboudyKreidieh -Date: Wed May 31 10:08:43 2017 -0700 - - added function to compute distance to intersection - -commit e9b6f6c11a576df16f79036f1605d0d511ea570f -Author: AboudyKreidieh -Date: Wed May 31 10:06:55 2017 -0700 - - fixed typo in IDM model - -commit 77a560c0332b49782167722e913049d7615103b3 -Author: AboudyKreidieh -Date: Wed May 31 10:06:13 2017 -0700 - - modified intersection representation and edge names in figure8 scenario - -commit 2fe232c86fa5ef76d3acebec1135df7a4bf6c60f -Author: AboudyKreidieh -Date: Wed May 31 10:04:35 2017 -0700 - - added absolute position and fail variable to compute_reward - -commit d7e039c0709a561ad27e2a44a0117f53d7669edb -Author: Eugene Vinitsky -Date: Wed May 31 10:04:17 2017 -0700 - - fixed unit tests to use an arbitrary port - -commit 2607edaf6955c6dc74c780bb38b1a1bbd0044a66 -Author: AboudyKreidieh -Date: Wed May 31 10:02:20 2017 -0700 - - added intersection crash, absolute position - -commit f231d3cf0865f29213cf473a60611412f4259eca -Author: AboudyKreidieh -Date: Wed May 31 10:01:26 2017 -0700 - - script to train vehicles to not crash at intersections - -commit 6aac1b422fb8baeede06b869a3b91f2d6db52f26 -Author: AboudyKreidieh -Date: Wed May 31 10:00:42 2017 -0700 - - added intersection fail-safe - -commit 5fbfaafd10f65f6fc722cd06192201080d6e647b -Merge: 8d5bc354 de993ddc -Author: eugenevinitsky -Date: Wed May 31 09:57:20 2017 -0700 - - Merge pull request #99 from cathywu/dockerSVN - - Docker svn - -commit de993ddc255e6b7b0a369924beae9ce72c1641ef -Author: Eugene Vinitsky -Date: Wed May 31 09:31:03 2017 -0700 - - dockerfile for pulling stable sumo is in dockerfile, svn dockerfile is in docker-svn - -commit c44f594fcffe135b26327f37ad87accad52d1422 -Author: Eugene Vinitsky -Date: Wed May 31 09:28:38 2017 -0700 - - changed based_env to color cars differently for each car type, added dockerfile that works for svn - -commit 6e86c3e131f2e3c9293e42d4b2156112cb97a976 -Author: Eugene Vinitsky -Date: Mon May 29 11:54:29 2017 -0700 - - fixed minor bug in instantaneous failsafe where we were occasionally dividing by zero - -commit 9b421a342edab0adb0b2907a3e16e224bf1d636f -Author: Eugene Vinitsky -Date: Mon May 29 10:27:40 2017 -0700 - - changed visualizer_CISTAR to have a loop_length input argument that lets you choose how long the loop should be in replay - -commit c941352ea85df13766a91047f550ba4d80bd3937 -Author: Eugene Vinitsky -Date: Sun May 28 14:11:22 2017 -0700 - - fixed bug in IDM where a factor of 2 was replaced by headway - -commit 43cb6928ac66e43ddbae6dffa90fe86ebc839074 -Author: Eugene Vinitsky -Date: Thu May 25 13:44:29 2017 -0700 - - fixed bug in lanechanging.py that caused it to be unable to be used by visualizer_cistar - -commit 34b64e4c68f51de34f017450e30d5677ba527209 -Author: AboudyKreidieh -Date: Thu May 25 13:36:00 2017 -0700 - - made end time larger for bigger experiments - -commit 5ed29086e6a94838de7bfe33a8c47b6711354bc9 -Author: AboudyKreidieh -Date: Thu May 25 13:35:23 2017 -0700 - - modified reward function in sheparding class - -commit 4f442caccf5ffa0c3d3f46e48ee9a04ed80938af -Author: AboudyKreidieh -Date: Thu May 25 13:13:21 2017 -0700 - - updated experiments to be compatible with latest version of cistar - -commit 152f1864e38caa830f448e40836b79d41bfaad9a -Author: AboudyKreidieh -Date: Thu May 25 13:09:53 2017 -0700 - - added condition to ensure rollout ends after crash - -commit 748d836d1bc399835e9f64b77dd540547a6c194d -Author: AboudyKreidieh -Date: Thu May 25 13:08:35 2017 -0700 - - vehicles at figure8 generator can pass through junctions - -commit 92811e6929b131ec9dea9604efe3841905ca7ad7 -Author: AboudyKreidieh -Date: Thu May 25 13:03:47 2017 -0700 - - added experiment for platooning - -commit 91892f936d19fa3174e042c858cfbf2931b8616f -Author: Eugene Vinitsky -Date: Tue May 23 15:14:56 2017 -0700 - - created docker file that downloads from svn instead of stable build - -commit 27abf261ffc11c189eb706dc904238782bd47828 -Author: Eugene Vinitsky -Date: Tue May 23 08:47:13 2017 -0700 - - changed dockerfile to pull nightly SUMO build - pulled in environment.yml changes from new rllab dockerfile - -commit 51db8e1776ea90ebe5995e9963b7ca30d0b268c5 -Author: Eugene Vinitsky -Date: Tue May 23 08:37:43 2017 -0700 - - increased max length of run in gen.py, added positive only reward to simpleEmission - -commit e65481aaf5c75d1977c0cf554626cac814428ba2 -Merge: b777df4e 8d5bc354 -Author: Eugene Vinitsky -Date: Mon May 22 14:34:22 2017 -0700 - - Pulled in changes to state for lc environment - - Merge branch 'master' of https://github.com/cathywu/learning-traffic - -commit b777df4e38bda68c760a97945b2ffc1e63382ecb -Author: Eugene Vinitsky -Date: Mon May 22 14:34:02 2017 -0700 - - added fully positive reward function to mixed-human-rl.py - -commit 8d5bc3544e22838b51ab949b179ae3504234a287 -Merge: 483def55 2e09d18c -Author: eugenevinitsky -Date: Mon May 22 14:32:58 2017 -0700 - - Merge pull request #98 from cathywu/idm_simulations - - Updated map generator to resolve -1001 errors - -commit 483def558e23827a442ab05ed90023dd6ddaa1cc -Merge: 735ffbab 3dcb10ae -Author: eugenevinitsky -Date: Mon May 22 14:32:43 2017 -0700 - - Merge pull request #82 from cathywu/docker - - current Dockerfile, still need to make gpu_Dockerfile - -commit 2e09d18cc15de10e89db0e196f704390e7a1bec4 -Merge: 77ea67e5 dcc2b550 -Author: AboudyKreidieh -Date: Mon May 22 14:25:14 2017 -0700 - - modified observation space in lane_changing - -commit 77ea67e58154f02617cda121847158973eb19700 -Author: AboudyKreidieh -Date: Mon May 22 13:32:47 2017 -0700 - - updates to figure 8 scenario - -commit dcc2b550aa1412841f5968160e39072fd95021af -Merge: 5243cc2d c658cff9 -Author: Eugene Vinitsky -Date: Mon May 22 13:16:14 2017 -0700 - - added aboudy's intersection and instantaneous fix - - Merge branch 'origin/idm_simulations' into routerFix - -commit 5243cc2d8ac2379613c52dc1ae1ed85ae9029c13 -Author: Eugene Vinitsky -Date: Mon May 22 13:13:41 2017 -0700 - - fixed state space in lane changing, made emission acceleration controlled instead of velocity controlled - -commit 9339457b4de4f40b6b958b32ea5ec3488070cf75 -Author: Eugene Vinitsky -Date: Mon May 22 12:01:57 2017 -0700 - - changed generator.py so it now has rerouters on every node. This should fix the -1001 error in the getDistance call. There is still a -1001 error when there is a crash however - -commit c658cff99ed95f7f15bdb466a85b1528e7dbc8c7 -Author: AboudyKreidieh -Date: Sun May 21 16:31:55 2017 -0700 - - added IDM controller, generator and scenario for figure8, updated instantaneous failsafe - -commit 735ffbab9f8d0d7a4c353ccfe24b501838c55ba7 -Merge: 9ae8bafa 497307ef -Author: eugenevinitsky -Date: Wed May 17 21:26:57 2017 -0700 - - Merge pull request #91 from cathywu/orderedDictionaryFix - - Ordered dictionary fix - minor changes to stochastic simulator - -commit 497307ef4b86883e7337d8762fc0c0179bdbb5d7 -Author: Eugene Vinitsky -Date: Wed May 17 21:13:20 2017 -0700 - - changed vehicles in base_env to be an ordered dictionary. Now each iteration will have the inputs to the neural net keep the same order from iteration to iteration - -commit 415c09308796828741e4252e0edb4d459d080c22 -Author: Eugene Vinitsky -Date: Wed May 17 21:05:00 2017 -0700 - - added flag to visualizer to let the policy be run for shorter or longer than max_path_length - -commit 64d2dec00eb0ced7e69571eee048d28b9c606962 -Author: Eugene Vinitsky -Date: Tue May 16 20:39:31 2017 -0700 - - added plots of the mean for all cars to visualizer, added naming of emissions files to base - -commit 9ae8bafa89e4069f7c71368906db9be6dc0a293a -Merge: 1f83b473 46db1868 -Author: eugenevinitsky -Date: Mon May 15 17:10:39 2017 -0700 - - Merge pull request #90 from cathywu/idm_simulations - - Idm simulations - -commit 46db1868c83cb245874a267f99583980e2c6511b -Author: AboudyKreidieh -Date: Mon May 15 17:09:56 2017 -0700 - - right code - -commit a696370e3bed78a8a3b590a23a333418aa05041b -Author: AboudyKreidieh -Date: Mon May 15 16:54:36 2017 -0700 - - fixed vehicle counting bug - -commit 1f83b473cfdf3b5d26f157af6150e50b079f347a -Merge: 70fe7de6 f62373da -Author: eugenevinitsky -Date: Mon May 15 16:21:09 2017 -0700 - - Merge pull request #89 from cathywu/idm_simulations - - fixed bug where all cars disappear - -commit f62373dade6133781cccb5c183c5fa94e45fe3b7 -Author: AboudyKreidieh -Date: Mon May 15 16:19:40 2017 -0700 - - fixed bug where all cars disappear - -commit 70fe7de649f855d449a5932eb74a7d3d83af1b26 -Merge: 7bc416f1 44e1a971 -Author: eugenevinitsky -Date: Mon May 15 14:26:03 2017 -0700 - - Merge pull request #88 from cathywu/idm_simulations - - fixed headway bug - -commit 44e1a9719f949d67c535468ba84ed3ef223f3a4b -Author: AboudyKreidieh -Date: Mon May 15 14:04:16 2017 -0700 - - fixed headway bug - -commit 7bc416f1940858d849220477215f99f15bb0ed4b -Merge: 956ce1fb 424d826a -Author: eugenevinitsky -Date: Mon May 15 13:56:49 2017 -0700 - - Merge pull request #87 from cathywu/idm_simulations - - fixed space-time diagram - -commit 424d826aca32227c78ec2cf91ce1e9e84992e4cb -Author: AboudyKreidieh -Date: Mon May 15 13:41:54 2017 -0700 - - fixed space-time diagram - -commit 956ce1fb181e3daaef194bc20f6642861bbd0a0e -Merge: 4ef3df75 3b1957f4 -Author: eugenevinitsky -Date: Mon May 15 13:19:28 2017 -0700 - - Merge pull request #86 from cathywu/stochastic-sim-idm - - Stochastic sim idm - -commit 3b1957f4c655f881b54067cc1da6dc377f1b38b4 -Author: Eugene Vinitsky -Date: Mon May 15 11:42:06 2017 -0700 - - cleaned up unnecessary files from stochastic_simulation folder - -commit 91b03819924d9fa6c75664d5d708772b60b3be70 -Merge: fc99ebbe 4ef3df75 -Author: Eugene Vinitsky -Date: Mon May 15 11:37:56 2017 -0700 - - Pulled in new stochastic lane changing simulation that uses IDM instead of OVM - - Merge branch 'master' of https://github.com/cathywu/learning-traffic - -commit 4ef3df75cac3346d1c178d5708bf296c4d494c28 -Merge: bd8226f4 ea96955c -Author: eugenevinitsky -Date: Mon May 15 11:37:41 2017 -0700 - - Merge pull request #85 from cathywu/idm_simulations - - Idm simulations - -commit fc99ebbe143586e4aa76c5dbb8efb4c63aa3e15f -Merge: 755a5712 bd8226f4 -Author: Eugene Vinitsky -Date: Mon May 15 11:36:12 2017 -0700 - - Needed IDM code - - Merge branch 'master' of https://github.com/cathywu/learning-traffic - -commit ea96955caaf197e22eb3f37a25026d53f9959ddf -Merge: 675a1f49 bd8226f4 -Author: eugenevinitsky -Date: Mon May 15 11:35:20 2017 -0700 - - Merge pull request #84 from cathywu/master - - idm simulations - -commit 675a1f49c20557f1431ce19560949a70071a24b1 -Author: AboudyKreidieh -Date: Mon May 15 11:33:22 2017 -0700 - - IDM simualtions with lane-cahnging - -commit bd8226f41d6678586b49eb13b72c5c8cbf088905 -Author: eugenevinitsky -Date: Mon May 15 11:30:38 2017 -0700 - - Update current-bugs.md - -commit ceafcbd9aef40bbaf19cd1b7efcc22020b9bd4fb -Author: AboudyKreidieh -Date: Mon May 15 11:28:38 2017 -0700 - - got IDM with stochastic lane-changing working - -commit 755a5712e34edf9b803e4053985bda84aa1eafaa -Author: Eugene Vinitsky -Date: Mon May 15 10:00:05 2017 -0700 - - fixed cost function in loop_emission.py. It was dependent on the headway instead of position - -commit 5c4e19c170e01bbebc4ca8cae487b07bdbf329ca -Author: eugenevinitsky -Date: Thu May 11 21:29:13 2017 -0700 - - Create current-bugs.md - -commit d38ec1f24f71036efba1b3da55d3ed161a982396 -Merge: 12157dbe 48287c1d -Author: Eugene Vinitsky -Date: Thu May 11 21:27:51 2017 -0700 - - Pulling the master branch in? - Merge branch 'master' of https://github.com/cathywu/learning-traffic - -commit 12157dbec6464d09576370bdd7a4dd935f04208c -Author: Eugene Vinitsky -Date: Thu May 11 21:27:40 2017 -0700 - - entering cars in stochastic lane changes ovm now cannot enter with a velocity that would cause them to crash. We added a failsafe to them - -commit 5e644cfd261ecd861e2ff09fe528851bd66e23fa -Author: Eugene Vinitsky -Date: Thu May 11 21:27:02 2017 -0700 - - entering cars in stochastic lane changes ovm now cannot enter with a velocity that would cause them to crash. We added a failsafe to them - -commit 8e7c11ddf0bf38469bf7f78520ad5e905436e9a2 -Author: Eugene Vinitsky -Date: Thu May 11 19:06:07 2017 -0700 - - cleaned up the directory by removing extraneous experiment files from emergent behavior - -commit 48287c1d800f170eed35e8c06e1ac6cd55429cc1 -Author: eugenevinitsky -Date: Thu May 11 16:23:01 2017 -0700 - - Update things-arent-working.md - -commit 7ab76342cfe2fc38b389d660a8a15355777eaf93 -Author: eugenevinitsky -Date: Thu May 11 16:22:41 2017 -0700 - - Create things-arent-working.md - -commit 3dcb10ae12d43b1a99af94e695fef9d6510c0af6 -Author: Leah Dickstein -Date: Thu May 11 16:20:10 2017 -0700 - - added tutorial - -commit c07e8a53174f80056cd33d6eaeb24440aad4d9f3 -Author: Leah Dickstein -Date: Thu May 11 16:16:49 2017 -0700 - - updated gpu dockerfile - -commit 11ace7c3ced4ece2257cbd090dad345c03aa6507 -Author: Leah Dickstein -Date: Thu May 11 16:03:14 2017 -0700 - - current Dockerfile, still need to make gpu_Dockerfile - -commit 28448d4c8f66a22cc79f9dbec92fc2d86900ebd9 -Author: Eugene Vinitsky -Date: Thu May 11 13:16:04 2017 -0700 - - modified the velocity of entering cars so that they dont enter with more than the failsafe velocity in stochastic_lane_changes-OVM - -commit 2c4883132ec806cde445690973115d0cc21a3961 -Author: Eugene Vinitsky -Date: Tue May 9 16:13:35 2017 -0700 - - snapshot for aws testing - -commit ca611eefb1556343986ecdb54f78800e8bb81f16 -Merge: 7ff6f36e 39f593fe -Author: Eugene Vinitsky -Date: Tue May 9 15:52:59 2017 -0700 - - changed state space in loop emission to be on headway rather than position - -commit 7ff6f36e5e3f11a966aae8a47da9dbb016a1d962 -Merge: de335dc4 bdbd22b9 -Author: Eugene Vinitsky -Date: Tue May 9 15:49:37 2017 -0700 - - Added fixes to headway computation and made state space function on headway instead of position for loop_emission - - Merge branch 'joao-new-state' - -commit de335dc4ef136c3a19a15610badcfd8db8a032fd -Author: Nishant -Date: Fri May 5 16:49:20 2017 -0700 - - updated plotting script - -commit 39f593fee2098d2b3c12d79a4b84025c2f53aeff -Author: Joao Carlos Menezes Carreira -Date: Fri May 5 11:09:54 2017 -0700 - - Update - -commit a0fa87747b17db2b4b3434aba7288840258eecc5 -Author: Joao Carlos Menezes Carreira -Date: Fri May 5 00:06:30 2017 -0700 - - Adding some experiments - -commit aa44954c842c862bb2f1b757d8e7a16069295e62 -Author: Eugene Vinitsky -Date: Thu May 4 23:58:27 2017 -0700 - - changed mixed human to have 22 cars and an emission reward function - -commit 7f2adf74fcbe64764c5c433ac4b2ca9c27c2c2a1 -Author: Eugene Vinitsky -Date: Thu May 4 18:56:36 2017 -0700 - - fixed up mixed human - -commit 4f149f0f5dc189640a04b9c3772ad33a038de52d -Author: Eugene Vinitsky -Date: Thu May 4 18:55:21 2017 -0700 - - added mixed file - -commit 0df68b48d88f8b4b357e0b21146c94ac1792512f -Author: Eugene Vinitsky -Date: Thu May 4 17:39:40 2017 -0700 - - added two car experiment with original parameters - -commit 54b89a4633d6c357bd8389e7ed7b61263c1afd12 -Merge: 1739ab64 2ed8a5df -Author: Kanaad Parvate -Date: Thu May 4 16:20:18 2017 -0700 - - merge with visualizer - -commit 1739ab64519aeeefc94693efaf5637c0cf25fd17 -Author: Kanaad Parvate -Date: Thu May 4 16:15:33 2017 -0700 - - rl lane changing progress - -commit 51e235f3f1091941934d0fd89f071d9ff3ff545d -Author: Kanaad Parvate -Date: Thu May 4 16:10:38 2017 -0700 - - makefile uses local rllab path - -commit de2cdb4f341337bd42aa645f05bec9d8218560d7 -Author: Eugene Vinitsky -Date: Thu May 4 11:33:11 2017 -0700 - - working in parallel - -commit 2026b60a4c80106cf287251abf6c3b1b7ffd8d72 -Merge: f6cc6c70 a717f223 -Author: Kanaad Parvate -Date: Wed May 3 15:55:38 2017 -0700 - - merged rl-lane-changing and parallel branches - -commit b949a109ccc0a8608269a561ac95edffa99ac43b -Author: Joao Carreira -Date: Wed May 3 15:48:25 2017 -0700 - - 8-car TRPO experiment - -commit a717f223abfd2bdf8cafd4523efdde7261da00fb -Author: Kanaad Parvate -Date: Wed May 3 15:46:54 2017 -0700 - - deleted a print statement - -commit 15e810aa083f840f141f141ebd71600158f71c2d -Author: Eugene Vinitsky -Date: Wed May 3 15:31:11 2017 -0700 - - removed the port from 1-car-rl.py - -commit 5732897e1f9eba20940b8a5bd92e37f5aec4f6dc -Merge: 7bdf0a45 f6cc6c70 -Author: Eugene Vinitsky -Date: Wed May 3 15:23:37 2017 -0700 - - Adding parallelizing! Instead of traci calls we now open a connection with traci and make all the calls to that connection - Merge branch 'parallel' into joao - -commit f6cc6c70157fd36a6ffa29bca0a5691358be2e44 -Author: Kanaad Parvate -Date: Wed May 3 15:11:32 2017 -0700 - - working parallelized rollouts - -commit 7bdf0a45e16347b700c71ace4030e5216c21e9a3 -Author: Eugene Vinitsky -Date: Wed May 3 14:17:39 2017 -0700 - - eh - -commit 0594bd65b4668c52072eed16f2ed09c926493997 -Author: Kanaad Parvate -Date: Wed May 3 14:17:37 2017 -0700 - - preliminary rl-lane-changing code - -commit 8ab728e7284c8c1ca9171af821cd812f5da392e5 -Author: Eugene Vinitsky -Date: Wed May 3 14:16:52 2017 -0700 - - setup mixed experiment - -commit feb6e23b3bea1fe5c5052efdae5ce24845ff6d1a -Author: Eugene Vinitsky -Date: Tue May 2 21:10:55 2017 -0700 - - fixed state space to be headway for ExtendedEmissionEnvironment - -commit 21e3d6d0990d1e8a69f93444453294fa29cce997 -Author: Eugene Vinitsky -Date: Tue May 2 19:21:58 2017 -0700 - - fixed batch size. Batch size over max_path_length is the number of rollout - -commit 3cd4eb26b4bf57f1bd91dce37a4ee5259321808a -Merge: ee5ec75d 2efc2e51 -Author: Kanaad Parvate -Date: Tue May 2 17:33:58 2017 -0700 - - Merge branch 'rl-lane-changing' of https://github.com/cathywu/learning-traffic into rl-lane-changing - -commit ee5ec75d4cb8adce7b29dc3e51a056488daae520 -Author: Kanaad Parvate -Date: Tue May 2 17:33:52 2017 -0700 - - some rl changes - -commit 2efc2e5169f3976ab2e40ae89c2c5b51d9b806bc -Author: Nishant -Date: Tue May 2 17:32:36 2017 -0700 - - maybe this works - -commit 6673e533930b0d37e9371671d543c7ff37bccc6c -Author: Joao Carreira -Date: Tue May 2 17:22:01 2017 -0700 - - New 1-car experiment. Disabled safe actions for 1 car - -commit cf83e6204564564d9b60b110601ffc14ef278e6e -Author: Eugene Vinitsky -Date: Tue May 2 16:52:35 2017 -0700 - - changed state to be absolute position - -commit dbc5e23e0aae14ee3b712e26a364898c53d525db -Merge: 60e3c96f 161d5e03 -Author: Kanaad Parvate -Date: Tue May 2 15:26:01 2017 -0700 - - Merge branch 'sumo-lane-changing' into rl-lane-changing - -commit 161d5e03604838457fcc7ddf22c884510b632d31 -Merge: fa9d5cfa 60e3c96f -Author: Kanaad Parvate -Date: Tue May 2 15:25:18 2017 -0700 - - merge - -commit aff1cf705e7c325e90b5cf9558183fde56e1be52 -Author: Eugene Vinitsky -Date: Tue May 2 15:11:25 2017 -0700 - - fixed loop_accel_pos_vel reward computation correctly this time - -commit 0abd1cb271436b5bd21b443db7387352374fe1dd -Author: Eugene Vinitsky -Date: Tue May 2 15:07:55 2017 -0700 - - fixed the reward function for loop_accel_pos_vel - -commit 4bc77a08b039b5f74c4e94e47d05825cb3a7ad53 -Author: Eugene Vinitsky -Date: Tue May 2 15:04:08 2017 -0700 - - 1-car-rl now works with ExtendedEmissionEnvironment instead - -commit bdbd22b9a3650db8bba7994aab4f5722f83c1677 -Author: Eugene Vinitsky -Date: Tue May 2 14:59:00 2017 -0700 - - added state as position in file loop_accel_post-vel.py - -commit fa9d5cfaed2ef935635ed018952fce3283156417 -Author: Nishant -Date: Tue May 2 14:32:51 2017 -0700 - - commented out some nonsense in loop.py - -commit 9dbc7fb6ea5030747f25c27db226ee67f81bfdb5 -Author: Nishant -Date: Tue May 2 14:17:39 2017 -0700 - - some updates to null lane-change handling - -commit 60e3c96fbc5ac8f869ce327849017c273a0f112f -Author: Kanaad Parvate -Date: Tue May 2 11:24:41 2017 -0700 - - lane changing logic complete, needs null checking - -commit 2c61f9818ed4529161749325c3e13774c9162159 -Author: Joao Carreira -Date: Mon May 1 12:03:03 2017 -0700 - - First update - -commit 2ee778d0f69ab17bf837c63ed9d8414ce1f1c173 -Author: Kanaad Parvate -Date: Sun Apr 30 22:49:01 2017 -0700 - - added testing file - -commit 35e778f1cf1dd9587a9f8fbbc654922f7b3e186a -Author: Kanaad Parvate -Date: Sun Apr 30 22:46:51 2017 -0700 - - halfway through refactoring basenv - -commit 2ed8a5dfba8f7804541291a3bd4fe772e620f323 -Author: Leah Dickstein -Date: Sun Apr 30 12:19:21 2017 -0700 - - final version of visualizer pre testing - -commit 5c0135919424020323d8d4c74d23d3c8f356347d -Merge: c360de7f 89227c37 -Author: Leah Dickstein -Date: Sun Apr 30 12:12:32 2017 -0700 - - fixed merge conflict - -commit e6473e39b0339374cd0d06aa561e29a9b7068323 -Author: Nishant -Date: Sat Apr 29 17:23:33 2017 -0700 - - fixed merge, whoops - -commit 93b3dc2dc65bd1d38f51ec7e7ed7a5e9f196070b -Merge: a4cd451b e93b2d80 -Author: Nishant -Date: Sat Apr 29 17:21:03 2017 -0700 - - Merge branch 'master' of github.com:cathywu/learning-traffic into sumo-lane-changing - -commit e93b2d8034d4efaaf45e3c0edad91a0beef6c0db -Merge: 14b0345c 5385e867 -Author: Nishant -Date: Sat Apr 29 17:06:39 2017 -0700 - - Merge branch 'master' of github.com:cathywu/learning-traffic - -commit 14b0345c3fc35b213b056858ade6627d8e0dbab9 -Author: Nishant -Date: Sat Apr 29 17:06:31 2017 -0700 - - updated perturbation code to allow multiple perturbations - -commit c360de7face6e816f807bd5190326707dbdb631e -Author: Leah Dickstein -Date: Sat Apr 29 15:30:17 2017 -0700 - - post team meeting - -commit 5385e867855e755925aa4c57bcbe31dbea9e1a35 -Author: Kanaad Parvate -Date: Fri Apr 28 12:37:45 2017 -0700 - - removed python path - -commit b4aec2bc8a76dc8a44c8fe7772c59c795fccaf6a -Author: Leah Dickstein -Date: Fri Apr 28 11:45:49 2017 -0700 - - merged in eugene' stuff - -commit 6c8ee3322e17f0578dc3499b6f1deb8d55772592 -Author: Leah Dickstein -Date: Fri Apr 28 11:39:24 2017 -0700 - - updated to get more information from pkl - -commit a4cd451b3ce3da6ae5a4d7a2ab18237b278c4dd3 -Author: Nishant -Date: Thu Apr 27 16:26:39 2017 -0700 - - plotting changes, attempts at using default sumo lane-changing - -commit 89227c376711062346c331fc76dfef2f27a0b820 -Author: Eugene Vinitsky -Date: Thu Apr 27 16:15:48 2017 -0700 - - added code to visualizer_cistar and base-env such that visualizer cistar plays movies - -commit 6816dad9572a5bff003d81c9b504c90df310208e -Author: Nishant -Date: Tue Apr 25 15:51:06 2017 -0700 - - updated plotting script - -commit 80e212eb3c4ed415e0cb5b97db0acba65130b1d2 -Author: Kanaad Parvate -Date: Mon Apr 24 17:51:20 2017 -0700 - - removed requirement for endtime - -commit f5437f5f9bc1e76167459fbbef5927bd62232b0c -Author: Nishant -Date: Mon Apr 24 17:40:41 2017 -0700 - - really bad code - -commit 14108c5660da09c8a7aa2ecef6ed9422e6549fcc -Author: Leah Dickstein -Date: Mon Apr 24 11:29:06 2017 -0700 - - updated visualizer to handle multiple observation variables, still need to make small fix to handle AWS run experiments - -commit 5cae0663ccac221d90b5437474e9e594234cca52 -Merge: e0202099 810b91da -Author: Kanaad Parvate -Date: Sat Apr 22 20:23:09 2017 -0700 - - Merge branch 'refactor' - -commit e02020992c0ea20f537d1640bb461f10fb9b4f4a -Author: Kanaad Parvate -Date: Sat Apr 22 20:23:03 2017 -0700 - - added no failsafe option - -commit 810b91dadb2a0c31e7221c8328e35b7ce8d64b20 -Author: Kanaad Parvate -Date: Sat Apr 22 19:27:01 2017 -0700 - - can reset with new sumo_paramsD - -commit 22c5d5b104aaebe9abf1d975b5077edbbcad9b6d -Author: Kanaad Parvate -Date: Sat Apr 22 19:05:46 2017 -0700 - - added visualizer file - -commit b79957fbb031219e79ea92a092a50fce440d77f4 -Author: Kanaad Parvate -Date: Sat Apr 22 18:58:07 2017 -0700 - - restart-base-env - -commit 5154baa479904c254d4a84b7b80acc91e01ba40d -Author: Kanaad Parvate -Date: Thu Apr 20 15:35:37 2017 -0700 - - emission file-per environment - -commit 6acd781f6d5ff89971039a0ee21e38d63ebcd1b8 -Author: Kanaad Parvate -Date: Thu Apr 20 15:07:02 2017 -0700 - - refactor 1 - -commit 58b8b580bb4b32d6bdbbb8645e42f894f26d98ae -Author: Leah Dickstein -Date: Thu Apr 20 14:28:31 2017 -0700 - - tweak to AWS tutorial - -commit f78119a12d077ed59335575d759696263155ea62 -Author: Leah Dickstein -Date: Thu Apr 20 14:26:29 2017 -0700 - - tweak to AWS tutorial - -commit a2810b21b049a1f08137e1ebe2e0cf1f0fe01a14 -Author: Leah Dickstein -Date: Thu Apr 20 14:16:46 2017 -0700 - - AWS tutorial - -commit 98ec9b8d33c1742fb16e553b688bf086c35f87df -Merge: 32075a74 6da7dd86 -Author: Leah Dickstein -Date: Thu Apr 20 13:57:22 2017 -0700 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic - -commit 32075a749ae459571c9e02395f9b9b0321feba06 -Author: Leah Dickstein -Date: Thu Apr 20 13:57:14 2017 -0700 - - Makefile - -commit 6da7dd8608aad7acb705abd697b2eccbfd4c2f65 -Merge: 4cca855a bfeeb66f -Author: Kanaad Parvate -Date: Thu Apr 20 12:26:16 2017 -0700 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic - -commit 4cca855a492e355a92f1685823b0d56e6791afae -Author: Kanaad Parvate -Date: Thu Apr 20 12:26:09 2017 -0700 - - removed old cistar folder - -commit bfeeb66fd98e29728d9836e82952dae1e7ffe91a -Author: Nishant -Date: Fri Apr 14 15:29:09 2017 -0700 - - made more tweaks to plotting code - -commit f7ba1f46663587440d22e1664eecc0015244b60b -Author: Nishant -Date: Fri Apr 14 01:44:14 2017 -0700 - - fixed a stupid bug in plot index code - -commit eae6a72dc848f461129122e6bb9b8646a8b811b1 -Merge: 53dc6aeb 08d00889 -Author: Nishant -Date: Thu Apr 13 22:07:48 2017 -0700 - - merged - -commit 53dc6aebbc21d4c938b94bef6a8f51d9966d7ce9 -Author: Nishant -Date: Thu Apr 13 22:06:26 2017 -0700 - - added plotting code, updated for some lane-change dependencies - -commit f62f95d01ce6d8755c3ddfc1d07f9ee54480db19 -Author: Leah Dickstein -Date: Tue Apr 11 20:57:59 2017 -0700 - - Script for creating plots of observation variables averaged over rollouts. Note this is a WIP: I will be updating it with better code once we have a working emissions experiment, since emissions has an observation matrix instead of observation array. Not ready to be merged yet. - -commit 08d00889595938f06b50aa7314c3515e81bc4ad1 -Merge: 91d7b486 aea22fdb -Author: eugenevinitsky -Date: Mon Apr 10 12:09:26 2017 -0700 - - Merge pull request #76 from cathywu/ITSC-lane-plots - - Itsc lane plots - -commit aea22fdbecea3f3af41cba5ad9b05ab753bb2534 -Merge: 91d7b486 cef90669 -Author: Eugene Vinitsky -Date: Mon Apr 10 12:02:14 2017 -0700 - - merged in changes to stochastic-lane-changes ovm - -commit cef9066981e4ab83801bda7ed573593ecbf91d65 -Author: Eugene Vinitsky -Date: Mon Apr 10 11:34:25 2017 -0700 - - added variance and percentage fail-safe calculations to stochastic_lane_changes-ovm - -commit 91d7b486373bee61662b50bfba07380f5d164445 -Author: Kanaad Parvate -Date: Mon Apr 10 02:54:42 2017 -0700 - - velocity check for emission-env - -commit fe79b650fd5f9ec7d78c9e6d9f10604f4bc62328 -Author: Kanaad Parvate -Date: Sun Apr 9 20:33:12 2017 -0700 - - reasonable testing numbers, and moving emission to itsc_experiments folder - -commit a695e5bd43455063061e080da55dfc4ce90933cb -Merge: fe910cc4 37fe5eb7 -Author: Kanaad Parvate -Date: Sun Apr 9 20:01:24 2017 -0700 - - merge - -commit fe910cc41e91a819189678e6336fe3e91c087e7d -Author: Kanaad Parvate -Date: Sun Apr 9 19:55:40 2017 -0700 - - small typo - -commit 25be7422562d7cabd9988c9a072164d233ee01a7 -Author: Kanaad Parvate -Date: Sun Apr 9 19:48:35 2017 -0700 - - multi-car-rl experiment - -commit 37fe5eb731d31cf03e0cc8ca398bd9e206845809 -Author: Leah Dickstein -Date: Sun Apr 9 17:24:57 2017 -0700 - - fixed emission env to be less hacky - -commit 3b39204a958cb413de8722a123898d38c6451c0b -Author: Leah Dickstein -Date: Fri Apr 7 11:48:36 2017 -0700 - - rl build tester emission - -commit be9e9e4bf16174b4f17e2a17987b2f9d8d87e89d -Author: Kanaad Parvate -Date: Thu Apr 6 22:14:38 2017 -0700 - - fixed experiements lane changing - -commit 5e295758c9c411f7e560019e8e199c5f208f5866 -Merge: 38ea3ca4 9ebd004e -Author: Kanaad Parvate -Date: Thu Apr 6 18:59:57 2017 -0700 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic - -commit 38ea3ca4d9940bde2f9e524d0be5f5b1ec3580ee -Author: Kanaad Parvate -Date: Thu Apr 6 18:59:51 2017 -0700 - - removed old files - -commit 9ebd004ebee525df4e048996946e94fe9bb533ef -Author: Nishant -Date: Thu Apr 6 14:11:07 2017 -0700 - - changed lane-change controllers to be objects, not higher-order functions - -commit 574cfe5c57fe22d52451dd782e1645414ca2e466 -Author: AboudyKreidieh -Date: Thu Apr 6 14:03:35 2017 -0700 - - Stochastic fail safes (#75) - - * fixed initial conditions to extend backwards in history, added failsafe - - * fixed major bug in initial conditions for entering cars. we were setting the past history to be a constant headway, which led to the length of the track not being conserved - -commit 3abe7deba27748a355db06f01091d7daecf91601 -Author: Eugene Vinitsky -Date: Wed Apr 5 20:22:52 2017 -0700 - - fixed bug in computing when to check if a lane change has occured. There was a floating point error in the mod that was making lane changes way too infrequent - -commit fe843f3ef785bfb571f02279c0cb7b1180026c78 -Author: Eugene Vinitsky -Date: Tue Apr 4 23:02:02 2017 -0700 - - fixed major bug in initial conditions for entering cars. we were setting the past history to be a constant headway, which led to the length of the track not being conserved - -commit b1e6fe67ec8dc79c6f200edc93f00270170cff80 -Author: AboudyKreidieh -Date: Tue Apr 4 15:58:46 2017 -0700 - - fixed initial conditions to extend backwards in history, added failsafe - -commit 1a0c65c639c91abd85a28a80dd1ab108b9ded7e6 -Merge: fa98091e b7932f39 -Author: eugenevinitsky -Date: Mon Apr 3 12:24:31 2017 -0700 - - Merge pull request #74 from cathywu/Stochastic_Lane_Changes - - added updated OVM code - -commit b7932f397e362f0cab801f9597acd1b89a3e1e9d -Author: Eugene Vinitsky -Date: Mon Apr 3 12:22:34 2017 -0700 - - added updated OVM code that uses velocity of lag car and headway of lag car at entry time as the delay history of the entering car - -commit fa98091e7de42263141c1250c2770e918941406f -Author: Kanaad Parvate -Date: Mon Apr 3 11:38:20 2017 -0700 - - accidentally pushed local only changes - -commit 7ebc21c159bf21004c57bab4b5e97ed8260d5d14 -Author: Kanaad Parvate -Date: Mon Apr 3 11:34:45 2017 -0700 - - merge - -commit a36cadd8030efc6420304d58c05287d3ca7673f7 -Author: Nishant -Date: Sun Apr 2 16:18:22 2017 -0700 - - minor cistar tweaks (using safe-velocity safety controller, removing print statements, fixing small perturbation bug) - -commit b8be09efe51679e275a08cbd55c9da01f0f0cb73 -Author: Cathy Wu -Date: Sun Apr 2 15:07:20 2017 -0700 - - Working target velocity experiment (#72) - - * Eugene's working version + a few minor tweaks - - * arange --> linspace; space time diagram with limited time; a few parameter tweaks - - * time scaling for stochastic lane change model - - * tweaked simulation steps - - * EVERYTHING WORKS. We changed mu_appear to be 3.2 to make the number of average cars consistent with the data - - * leah's configuration (ish) - - * test config - - * FIX JSON serialization error when using stub from rllab by making our classes serializable and stub-ing at the right place in our experiment script; velocity experiment now works locally! and this should fix some issues with the AWS mode too. - - * modified velocity version of RL experiment for JSON serializable fixes; parameter tweaks - - * tweak simulation time step and max velocity - - * PEP8 - - * PEP8 - - * PEP8 - - * ITSC CISTAR: target velocity experiment configuration for the current plots in the paper (v1 of submitted paper) - -commit 1959ab683d5cb97c28c65ee0e12c8b4daf0dee5d -Merge: 5d4f5341 95ac38ef -Author: eugenevinitsky -Date: Mon Mar 20 15:45:10 2017 -0700 - - Merge pull request #73 from cathywu/stochastic_lane_pull - - Stochastic lane pull - -commit 95ac38efe05f0dc5aabe3102f94dbbdf355c8379 -Merge: 43d6a11d 5d4f5341 -Author: Eugene Vinitsky -Date: Mon Mar 20 15:43:44 2017 -0700 - - merged the stochastic simulation code - -commit 43d6a11d699303a8c19d516c40d28a0346a5442e -Author: Eugene Vinitsky -Date: Mon Mar 20 14:44:45 2017 -0700 - - untracked all the xml files - -commit 3419ba8b471da9c8945f8d153b43b0f8fa89ed87 -Merge: 7bfeac2b bfc7c107 -Author: Eugene Vinitsky -Date: Mon Mar 20 14:32:54 2017 -0700 - - Merge branch 'Stochastic_Lane_Changes' - - Added working ipython notebooks that are calibrated to give the right amount of lane changes and car density for the stochastic lane changing system - -commit bfc7c107dbf23f3bd30c05cfb28eabdb56ad28cb -Author: Eugene Vinitsky -Date: Mon Mar 20 14:32:10 2017 -0700 - - calibrated mu_appear and lane change time-step to give the right density and number of lane changes - -commit 8107c9ab0ebe1056c91eb6ea6d74579521b2bc6c -Author: Eugene Vinitsky -Date: Mon Mar 20 14:31:45 2017 -0700 - - calibrated mu_appear and lane change time-step to give the right density and number of lane changes - -commit 7e794e946d90bb3a61fe3998b242fab961d6a1ef -Author: Eugene Vinitsky -Date: Mon Mar 20 12:19:10 2017 -0700 - - added code for computing average number lane change distributions. Also added aboudys file that sets the delayed history of newly entering cars to be just a constant, which is their velocity upon entering - -commit 5d4f5341b9ca5a060f89dffd0c623a00b285f04e -Author: Nishant -Date: Thu Mar 16 15:26:13 2017 -0700 - - adding sugiyama experiments - -commit be12deba6d4d7f109bfa00b0ff59e849b7d05c19 -Author: Cathy Wu -Date: Tue Mar 14 17:41:53 2017 -0700 - - FIX JSON serialization error when using stub from rllab (#67) - - * Eugene's working version + a few minor tweaks - - * arange --> linspace; space time diagram with limited time; a few parameter tweaks - - * time scaling for stochastic lane change model - - * tweaked simulation steps - - * EVERYTHING WORKS. We changed mu_appear to be 3.2 to make the number of average cars consistent with the data - - * leah's configuration (ish) - - * test config - - * FIX JSON serialization error when using stub from rllab by making our classes serializable and stub-ing at the right place in our experiment script; velocity experiment now works locally! and this should fix some issues with the AWS mode too. - -commit c0ff2b337bc17b06e50aca81df0807884e5f3c71 -Author: Cathy Wu -Date: Tue Mar 14 00:17:01 2017 -0700 - - this gives the plots I generated for the first draft of the paper (which sent to alex last night) - -commit 54fa34f1a1c4d554531384d6f4f2169b62521afc -Author: Leah Dickstein -Date: Mon Mar 13 17:03:16 2017 -0700 - - I think this velocity exp works - -commit cc07035a087e8b8a14f7436e3c42aa3523679e98 -Author: Leah Dickstein -Date: Mon Mar 13 16:09:42 2017 -0700 - - super hacky version that appears to work - -commit 038822b94e38a0e77f04ec85f54171d1e3850434 -Author: Leah Dickstein -Date: Mon Mar 13 16:00:13 2017 -0700 - - getting emisison env to work - -commit 7bfeac2b04af649cd8ed434c7827c0abd994f3b1 -Author: Leah Dickstein -Date: Mon Mar 13 15:18:15 2017 -0700 - - getting emissionenv to work - -commit 2b6e1d5ca0428995c682b8138f40e5bfb8f34470 -Author: Leah Dickstein -Date: Mon Mar 13 14:55:20 2017 -0700 - - making emission env - -commit d103664e2376293901ebd099ff487e74a6e5a1b1 -Author: Cathy Wu -Date: Sun Mar 12 22:16:31 2017 -0700 - - requirements.txt: dependencies - -commit 39a117b6b3f9084b8193a5588f64a444e422c4e7 -Author: Eugene Vinitsky -Date: Sun Mar 12 20:05:42 2017 -0700 - - EVERYTHING WORKS. We changed mu_appear to be 3.2 to make the number of average cars consistent with the data - -commit 5c8dcc66ca79ff71c1f21986bd972d70ac210f4f -Author: Cathy Wu -Date: Sun Mar 12 18:40:56 2017 -0700 - - tweaked simulation steps - -commit 19f7027311dfb7738612980046927fea78447523 -Author: Cathy Wu -Date: Sun Mar 12 18:16:01 2017 -0700 - - time scaling for stochastic lane change model - -commit cb01655bb6231efa682189622487c17f67f64bf9 -Author: Cathy Wu -Date: Sun Mar 12 17:38:46 2017 -0700 - - arange --> linspace; space time diagram with limited time; a few parameter tweaks - -commit acd5ee4a1a4dcaf407bd2e18d2af0108ca90ba91 -Author: Cathy Wu -Date: Sun Mar 12 12:49:12 2017 -0700 - - Eugene's working version + a few minor tweaks - -commit 711deba6ca379b8341db58a9f25dd184cbdb88b7 -Merge: e16c0bf2 9fac0bfe -Author: eugenevinitsky -Date: Sat Mar 11 22:16:58 2017 -0800 - - Merge pull request #65 from cathywu/Stochastic_Lane_Changes - - Changes to SLC - -commit 9fac0bfe9cc3e37ada605930bed2f562325cd668 -Author: AboudyKreidieh -Date: Sat Mar 11 22:07:58 2017 -0800 - - Changes to SLC - -commit e16c0bf2feef8517980f661789afb0ea3073f1b1 -Author: Nishant -Date: Sat Mar 11 16:23:31 2017 -0800 - - updated parse_and_plot.py - -commit be964ca4d1851fd7116ea84e4b58af6f85509850 -Author: Kanaad Parvate -Date: Fri Mar 10 20:45:33 2017 -0800 - - perturbation code - -commit dbb0ec9bb22cf76b794817feede065528507856d -Author: Nishant -Date: Fri Mar 10 18:17:07 2017 -0800 - - diff failsafe - -commit 2b7337b1ab6294ea909bbea80bd20c612cc1fe43 -Author: Kanaad Parvate -Date: Fri Mar 10 17:52:09 2017 -0800 - - itsc experiments - -commit 020a91687279da30ab9dba2a1db80a66b61630c0 -Author: Kanaad Parvate -Date: Fri Mar 10 17:38:22 2017 -0800 - - further expanded spacing - -commit 0c4259231ec72a87fa76d79b6ea5094da8b72baa -Author: Kanaad Parvate -Date: Fri Mar 10 14:20:27 2017 -0800 - - better spacing options + clean up base_controller - -commit 9e9decd0f6bd8ea248fd499eb4491d0ce60f1103 -Merge: 5cc3fffe 0ba7f684 -Author: Kanaad Parvate -Date: Fri Mar 10 12:00:30 2017 -0800 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic - -commit 5cc3fffebb499f0e58aff5a51235139416ab9f53 -Author: Kanaad Parvate -Date: Fri Mar 10 12:00:23 2017 -0800 - - v_safe can be 0, fail-safes should work - -commit 0ba7f684df80770dea3681296cbdd8408f931663 -Author: Nishant -Date: Fri Mar 10 01:51:22 2017 -0800 - - added dan work's FollowerStopper controller (constant-velocity with safety-checking) - -commit 79eb9ae5ee3dbd69fa731f46dd936bd2d1987329 -Merge: 1fcec743 1eedee46 -Author: Kanaad Parvate -Date: Thu Mar 9 23:27:10 2017 -0800 - - merge - -commit 1fcec7431e6b28dcc1ff8230626f9afd55a80ff2 -Author: Kanaad Parvate -Date: Thu Mar 9 23:24:48 2017 -0800 - - naming and ovm default parameter is negative bug - -commit 1eedee465fa7eddfc644c188ac9cebca74b00dbe -Author: Kanaad Parvate -Date: Thu Mar 9 23:11:30 2017 -0800 - - another minor naming bug fix - -commit 37c4bb7c762429539dace147da579be31142eecf -Author: Kanaad Parvate -Date: Thu Mar 9 23:09:57 2017 -0800 - - minor naming bug fix - -commit 963042af02ce8d0a0edf9c7480395a25d878ffb2 -Merge: 44b0922b 71df5932 -Author: Kanaad Parvate -Date: Thu Mar 9 23:07:24 2017 -0800 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic - -commit 44b0922ba986723ffdf4b9ff7430e1740610ec6d -Author: Kanaad Parvate -Date: Thu Mar 9 23:07:14 2017 -0800 - - printing safe_vel for debugging safety - -commit 71df593261c665a85b330b45d468f0c4b0230b9b -Author: nskh -Date: Thu Mar 9 21:48:45 2017 -0800 - - merging plotting code with master (#64) - - * first pass at adding plotting capability, probably won't work - - * plotting works! using parse_and_plot.py - - * removed old logging code from base_env - - * changed controller params a bit - -commit cce52581cd9abb295398319bcef7ae090ece0e50 -Author: Kanaad Parvate -Date: Thu Mar 9 21:39:10 2017 -0800 - - new experiments - -commit 3353b5f71b5fe7656ac5221e8e447e776f4fd90f -Author: Kanaad Parvate -Date: Thu Mar 9 21:35:26 2017 -0800 - - fixed failsafes; fixed bug with reset_env - -commit 5c3097b7a184dad0a39757e0870c7c31fc84382c -Author: Kanaad Parvate -Date: Thu Mar 9 21:28:32 2017 -0800 - - observation space is all vehicles, action space is only rl - -commit 3237221b044eea80fb521c0154e4fffb84ab4527 -Author: Kanaad Parvate -Date: Wed Mar 8 19:59:30 2017 -0800 - - rl velocity controllers - -commit bc103972a80978e6ca0a41d33925b5f2e28ad9c8 -Author: eugenevinitsky -Date: Wed Mar 8 18:46:21 2017 -0800 - - updated safe_action to account for the fact that the lead vehicle (#62) - - * updated safe_action to account for the fact that the lead vehicle could have a smaller position than the following vehicle due to the mod in ring road - - * added some init files - - * Changes to SLC - - * sumo binary - - * deleting xml files - -commit 8e9194177128743f124baca9d27d265f2bd5df72 -Merge: 5075f027 ede13b25 -Author: Kanaad Parvate -Date: Wed Mar 8 18:00:42 2017 -0800 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic - -commit 5075f027e8465013e7bd03329d63fa27471b04ca -Author: Kanaad Parvate -Date: Wed Mar 8 18:00:26 2017 -0800 - - sumo binary - -commit ede13b25ca82d2f59502daa5236ca1bdf0257613 -Merge: 2358a295 abe99520 -Author: eugenevinitsky -Date: Wed Mar 8 11:38:18 2017 -0800 - - Merge pull request #63 from cathywu/Stochastic_Lane_Changes - - Changes to SLC - -commit abe99520804c208fbd67334fcfc0224d231498e4 -Author: AboudyKreidieh -Date: Wed Mar 8 11:36:14 2017 -0800 - - Changes to SLC - -commit 2358a2959b2215d834d790da88fb19736c51f0c3 -Author: Leah Dickstein -Date: Tue Mar 7 22:02:58 2017 -0800 - - added some init files - -commit a6c551798cc6d84bffc62c12a9a4e2379d62aff0 -Author: Eugene Vinitsky -Date: Tue Mar 7 14:54:53 2017 -0800 - - added abouds stochastic lane changing code. This is used to simulate a single lane with cars popping in and out. I didnt do a pull request because it doesnt touch CSTAR and Im not sorry - -commit 7edf47a1d56a74f43a7524eebc569f1cfc95a9c8 -Author: Kanaad Parvate -Date: Tue Mar 7 03:27:02 2017 -0800 - - old aws file, sumo issue documentation - -commit c5557fa10df44d5d7aa2e26fc1e9a4b1c6432411 -Merge: 41d9ef84 3fc8a3c5 -Author: Kanaad Parvate -Date: Tue Mar 7 02:57:42 2017 -0800 - - Merge branch 'master' into fixing-rl - -commit 41d9ef84e217a87cfd0734c941644aae7ce14687 -Author: Kanaad Parvate -Date: Tue Mar 7 02:56:56 2017 -0800 - - using safe_action now, parameters need to be tuned for successfully avoiding crashes - -commit 1a876e8f0ed28ee49191f84cb4815adc561f3e5e -Author: Kanaad Parvate -Date: Tue Mar 7 02:22:37 2017 -0800 - - refactored examples - -commit 7d0d447664b8e3fd1abbdd7752866b555d818c10 -Author: Kanaad Parvate -Date: Tue Mar 7 02:17:02 2017 -0800 - - deleted xml files - -commit 53321c96e39f325d13fed0ba18d6662fc8ed5dbb -Author: Eugene Vinitsky -Date: Mon Feb 27 13:48:54 2017 -0800 - - properly subclassed controllers - -commit e1e10a9f487a03b4c6e91639683ed7946e509b12 -Author: Eugene Vinitsky -Date: Mon Feb 27 13:05:48 2017 -0800 - - adding xml - -commit a5dbcffcdc36833912c15313c70b5cfa0b71ed70 -Author: Eugene Vinitsky -Date: Tue Feb 28 07:54:14 2017 -0800 - - adding file - -commit bc2c83dc06b76528f594e1a60e7e88c7bf771f82 -Author: Kanaad Parvate -Date: Tue Mar 7 02:08:13 2017 -0800 - - deleting net files - -commit a767813b1aae7c7b4ba59b88c2dc9beab1e8c1ba -Author: Eugene Vinitsky -Date: Mon Feb 27 13:15:57 2017 -0800 - - fixed a bug in safe_action wherein it was returning the desired velocity, not the desired acceleration - -commit 9eb76785d9de85e61ff34c905637782e48650aff -Author: Eugene Vinitsky -Date: Mon Feb 27 13:04:29 2017 -0800 - - switched the environment to use safe-action instead of get-action - -commit 78d1de2c29dd6564c93f602c3aef7cd8cb806ea5 -Author: Eugene Vinitsky -Date: Mon Feb 27 12:52:57 2017 -0800 - - added base controllers and base car - -commit d2a266ca413a017df2d17305db2126a3a1922d8e -Author: Kanaad Parvate -Date: Mon Mar 6 11:47:07 2017 -0800 - - update base_env to handle rl - -commit f497a6c04bd82803bf0f23ff1ef14db37958e200 -Author: nskh -Date: Sun Feb 26 18:43:56 2017 -0800 - - Merging car-following controllers that now use classes into master (#61) - - * first commit for controllers that are classes, not functions - - * made controllers classes and changed base_env.py to fit that - - * fixed some dumb mistakes - - * fixed more in the tests - -commit a6f960ce8e406c3fd7b7951b2f9d0a6be1fc3ead -Author: Leah Dickstein -Date: Sun Feb 26 18:11:05 2017 -0800 - - sorry quick fix - -commit 73eb4eb9cd38ab1b5d8847fdd616ff72e3470616 -Author: Kanaad Parvate -Date: Mon Mar 6 17:54:33 2017 -0800 - - minor typo - -commit 4e2373c0a08ea8643b1f5a2c5c37e422affebaa3 -Author: Leah Dickstein -Date: Sun Feb 26 18:10:39 2017 -0800 - - aws compatibility - -commit 1db7a38c9083a699bc676b9396808fc64d5b8841 -Author: Kanaad Parvate -Date: Mon Mar 6 17:52:27 2017 -0800 - - fixed rl-build-tester - -commit 3fc8a3c550a45a9eefad86af4e2a037ab4b423f1 -Author: Kanaad Parvate -Date: Mon Mar 6 11:47:07 2017 -0800 - - update base_env to handle rl - -commit 1fc495d6b479b77154e035d0b5d21b55136a5290 -Author: Eugene Vinitsky -Date: Wed Mar 1 18:49:25 2017 -0800 - - chagned base_env.py to use safe_action - -commit 14083c6abe300880a98b61c1900d3bee29a01d69 -Author: Eugene Vinitsky -Date: Tue Feb 28 07:54:14 2017 -0800 - - added file describing failsafe in fail-safe.md - -commit 5fe50d7794e05783c0a9a4040804cd8120fb5042 -Author: Eugene Vinitsky -Date: Mon Feb 27 13:48:54 2017 -0800 - - properly subclassed controllers - -commit 11aecadfacf1c4e95fac567afd007e2135f2c86b -Author: Eugene Vinitsky -Date: Mon Feb 27 13:15:57 2017 -0800 - - fixed a bug in safe_action wherein it was returning the desired velocity, not the desired acceleration - -commit f63c990b61921c2a3b320e127412cddceaa1f69c -Author: Eugene Vinitsky -Date: Mon Feb 27 13:05:48 2017 -0800 - - added xml files to gitignore - -commit 761bfcf56688f5d76a73db4e6277dd93df9519bd -Author: Eugene Vinitsky -Date: Mon Feb 27 13:04:29 2017 -0800 - - switched the environment to use safe-action instead of get-action - -commit 66e40ba5cb49f0ff3f6ac98085a46de3641d4f0f -Author: Eugene Vinitsky -Date: Mon Feb 27 12:52:57 2017 -0800 - - added base controllers and base car - -commit f0b2ca4d7d48a9397759c56c0cbc7a6d63c2bc74 -Author: Leah Dickstein -Date: Sun Feb 26 18:45:41 2017 -0800 - - RL tutorial file working on AWS - -commit a1ef6c369100f169c71a152c1f957ac8c4e56b6a -Author: nskh -Date: Sun Feb 26 18:43:56 2017 -0800 - - Merging car-following controllers that now use classes into master (#61) - - * first commit for controllers that are classes, not functions - - * made controllers classes and changed base_env.py to fit that - - * fixed some dumb mistakes - - * fixed more in the tests - -commit 97d69cbfa4d60e0ab822db0b7b3b7e69fcb41677 -Author: Leah Dickstein -Date: Sun Feb 26 18:11:05 2017 -0800 - - sorry quick fix - -commit 4d63324eeab7670ede6fe6e5186496d0d7decaf4 -Author: Leah Dickstein -Date: Sun Feb 26 18:10:39 2017 -0800 - - aws compatibility - -commit 4e31e6e32a81430696b6dcbd2d2b5ad96afac4fb -Author: Kanaad Parvate -Date: Sun Feb 26 17:58:10 2017 -0800 - - fixed tests - -commit 224cc4b6ac454db300811301e3a8d6ae45fd9950 -Author: Leah Dickstein -Date: Sun Feb 26 17:56:48 2017 -0800 - - Congested env (#57) - - * standardize initial_params to cfg_params - - * set initial config shuffle default to false - - * quick fix to make_routes - - * quick add to readme - - * added departSpeed to type_params - - * slight change for readability - - * can't read my own code, minor bugfix - - * added departSpeeds as 0 - -commit 56aba9170de6acdd4ef8725a9f090d23264d1033 -Author: eugenevinitsky -Date: Sun Feb 26 17:47:44 2017 -0800 - - Update README.md - -commit c693957a4f69936f2e518e8db5887793b9318441 -Author: eugenevinitsky -Date: Sun Feb 26 17:47:04 2017 -0800 - - Update README.md - -commit 10ca921eb1740c5675569bf6205b7445e24585b6 -Author: Kanaad Parvate -Date: Sun Feb 26 17:44:56 2017 -0800 - - missing sim-step - -commit 3e9163fff30e9fbc8a8ed134b80586df31391289 -Merge: 413b9720 39f9c5af -Author: Kanaad Parvate -Date: Sun Feb 26 16:52:02 2017 -0800 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic - -commit 39f9c5af60dfe4ed6ece787a6f4ae86cd47e184f -Author: Kanaad Parvate -Date: Sun Feb 26 16:51:56 2017 -0800 - - loop code review (#60) - -commit 413b9720200cac479e21b7668876597fc34ddea6 -Author: Kanaad Parvate -Date: Sun Feb 26 16:50:06 2017 -0800 - - testing part 3 - -commit b4b14fdafb25b908de1901731ed18e63fcf2bc28 -Author: Kanaad Parvate -Date: Sun Feb 26 16:48:26 2017 -0800 - - testing tests - -commit ace2ab540313a8be5d497e1d582462d6b7236031 -Author: Cathy Wu -Date: Sun Feb 26 16:44:52 2017 -0800 - - Sample unit tests + commit hook for running unit tests (#58) - - * A few starter unit tests for cistar-dev, along with git commit hook for - automatically running the tests when running `git commit`. - - * Update unit testing instructions - -commit c5e2a8a6c244d476355c2a86cafb0f8814cbc3ed -Author: AboudyKreidieh -Date: Sun Feb 26 16:05:45 2017 -0800 - - code review for lan_change_controllers, velocity_controllers, and gen (#56) - -commit aae224d9f2efb6f86ac8cfe905076a66546dae34 -Author: Leah Dickstein -Date: Sun Feb 26 15:12:10 2017 -0800 - - base_env documentation (#55) - - * base_env documentation - - * cleaned up a bit - -commit 940903cb6558258e6eee50bca788c44cf78ce688 -Author: Cathy Wu -Date: Sun Feb 26 14:45:16 2017 -0800 - - CISTAR documentation: loop_scenario.py (#54) - -commit d353f41e7890c682a0da7d20340ea5cd288d1f5e -Author: Cathy Wu -Date: Sun Feb 26 13:28:20 2017 -0800 - - CISTAR Documentation: Scenario class (#53) - -commit d59202ca558e38e3768561fd79ff033e4414dd79 -Author: Cathy Wu -Date: Sun Feb 26 12:01:25 2017 -0800 - - CISTAR Documentation (lane changing models) - -commit 5997f0005c2897031f95375e60c17bea9092e72c -Merge: e0f7655e 86940c5c -Author: Kanaad Parvate -Date: Sun Feb 26 11:58:59 2017 -0800 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic - -commit e0f7655e224d025586eee20b07c591f386376336 -Author: Kanaad Parvate -Date: Sun Feb 26 11:58:34 2017 -0800 - - minor changes to the example builds - -commit 86940c5ca0386a68dc23cc7f5f2ee9304dc1e6b1 -Merge: c5639726 37057cd0 -Author: Leah Dickstein -Date: Fri Feb 24 12:18:37 2017 -0800 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic - -commit c5639726a0c7d8d3835ad06bb9b6303bcbe59de3 -Author: Leah Dickstein -Date: Fri Feb 24 12:18:29 2017 -0800 - - readme - -commit 37057cd065dd18b511af1c2167ecd1e5ff8eb394 -Author: Cathy Wu -Date: Fri Feb 24 11:48:44 2017 -0800 - - Minor documentation and cleanup on sumo experiment params - -commit 55b80e3cd6529fdcb345f195693fbf584c6f606c -Author: Kanaad Parvate -Date: Fri Feb 24 02:40:44 2017 -0800 - - rl testing - -commit 30f870e8a5534244c91ccfc5fc5e7ca6dcb6290d -Author: Kanaad Parvate -Date: Thu Feb 23 16:58:23 2017 -0800 - - split loop controller, and created separate file for rl-build-testing - -commit 4d530a7f3227ceb8c9b791afaa44e8c9d60e237f -Author: Nishant -Date: Thu Feb 23 16:24:05 2017 -0800 - - added lane-checking to car following models. needs validation. - -commit 6664d9b78aa6c1d9b235eb5882c2ffe63adb1015 -Author: Nishant -Date: Thu Feb 23 00:25:49 2017 -0800 - - left a man behind - -commit a47c8acf4f7cca3377629ad65b16c22775061be2 -Author: Nishant -Date: Thu Feb 23 00:25:20 2017 -0800 - - TODO: make car-following models track lanes but LANE CHANGES HAPPEN - -commit e863c4f9ca65d28b7bbe312c3f7628a2bf704cb7 -Merge: 47e5167d e9e154ac -Author: Leah Dickstein -Date: Tue Feb 21 14:04:36 2017 -0800 - - merge conflict - -commit 47e5167d6ca63b12dad4a1cd467e249e49a8e8fe -Author: Leah Dickstein -Date: Tue Feb 21 14:00:11 2017 -0800 - - connecting cistar to rllab architecture - -commit e9e154ac48d491e6d6acc9b001274918fa454843 -Merge: d6ee34c9 75028b69 -Author: Kanaad Parvate -Date: Tue Feb 21 12:47:04 2017 -0800 - - merge - -commit 75028b69a20261c44081f807a4a18d6d4bcb2929 -Author: Leah Dickstein -Date: Tue Feb 21 11:28:19 2017 -0800 - - leah getting her first exp set up - -commit b069a1514fca38d4164243736ef54e777f3a5af3 -Author: Leah Dickstein -Date: Tue Feb 21 10:10:59 2017 -0800 - - added init files - -commit d6ee34c979aaef712809f77d9c5693ba0090633a -Author: Kanaad Parvate -Date: Mon Feb 20 19:17:10 2017 -0800 - - bulletproofing - -commit b25f7a1e3a331f479e3221ca28c2ba3d10e7a655 -Merge: 132e92ce b4796c21 -Author: Leah Dickstein -Date: Mon Feb 20 19:01:46 2017 -0800 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic - -commit 132e92ce93bfd482c50ea16abbd404d3c37b8a26 -Author: Leah Dickstein -Date: Mon Feb 20 18:52:38 2017 -0800 - - leah learning cistar - -commit b4796c212b5517c0bec2f55e13493c4b7ba13525 -Author: Cathy Wu -Date: Sat Feb 18 00:18:51 2017 -0800 - - working implementation of V(s) function approximation; variance computation and reduction via V(s) baseline; tf definitions for action baseline - -commit c3bd40806fa494c36c5c2d0a119b8207dea51c06 -Merge: b7efdc78 64fbc79a -Author: Cathy Wu -Date: Fri Feb 17 22:01:35 2017 -0800 - - Merge branch 'master' of github.com:cathywu/learning-traffic - -commit b7efdc787a7b9cc78f47e16fbd91e36ab5d12225 -Author: Cathy Wu -Date: Fri Feb 17 22:01:31 2017 -0800 - - Compute gradient in a batch; score --> output; parameter changes - -commit 64fbc79aa935a906061e2e81e7d4267af4d95d1c -Author: Nishant -Date: Thu Feb 16 18:34:16 2017 -0800 - - added bad ovm controller - -commit aadc5416e449dd709fbd3e412622832f7f061792 -Merge: c0ad1172 49a2bbc9 -Author: Cathy Wu -Date: Wed Feb 15 10:04:46 2017 -0800 - - Merge branch 'master' of github.com:cathywu/learning-traffic - -commit c0ad1172fd3452a407704553cf305f0cabfd75b1 -Author: Cathy Wu -Date: Wed Feb 15 10:00:55 2017 -0800 - - - Small initialization of output layer weights - - Normalization of observations - - Learn log stds instead of stds - - Partial implementation of computing gradients in a batch - - Partial implementation of V baseline - - Psuedocode for action baseline - - Added many TODOs and FIXMEs; general cleanup - -commit 49a2bbc9152daa4a58c1e91de59c9db7d0615deb -Merge: 4f61455e f10a216a -Author: Kanaad Parvate -Date: Mon Feb 13 11:57:30 2017 -0800 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic - -commit 4f61455e58e54e27b4d038702f7fbe983e3ca9a0 -Author: Kanaad Parvate -Date: Mon Feb 13 11:57:20 2017 -0800 - - better cfms - -commit f10a216a5f1cc1b70df62b2ba8c96f05da7cd4c9 -Author: Cathy Wu -Date: Sat Feb 11 18:27:21 2017 -0800 - - Partial prototype implementation: deep copy of score, variance without baseline and with value baseline, appropriate surrogate loss with log likelihood ratio (Issue: nans) - -commit b218992684dc70689ee883e8912d005c87ae5f1d -Merge: 4b5f6967 8d5721ce -Author: Cathy Wu -Date: Sat Feb 11 17:31:20 2017 -0800 - - Merge branch 'master' of github.com:cathywu/learning-traffic - -commit 4b5f6967ad76666a376bd69dcb5aaf966c8facb6 -Author: Cathy Wu -Date: Sat Feb 11 17:31:17 2017 -0800 - - Partial prototype implementation: Gaussian MLP and log likelihood function, minor refactoring and cleanup - -commit 8d5721cea290a3038ae4cfae6292c6b5b1ed4b2d -Author: Kanaad Parvate -Date: Thu Feb 9 23:13:52 2017 -0800 - - 'working' controller - -commit ad2e04bceba6df3999283d650bd0595022d9b2f9 -Author: Nishant -Date: Thu Feb 9 22:33:23 2017 -0800 - - 0.03% percent chance this works - -commit e59f6f18dcb0d4165d8148b1cdaa83cce354e10d -Author: Kanaad Parvate -Date: Thu Feb 9 21:50:27 2017 -0800 - - higher-order cfm half done - -commit 7228824a24624487132e264b4d3953da5c4a76b1 -Author: Nishant -Date: Thu Feb 9 21:41:44 2017 -0800 - - bad car following models - -commit f339b6f7c66860346508c7629be13099d2f3140a -Author: Kanaad Parvate -Date: Thu Feb 9 21:38:35 2017 -0800 - - controllers folder - -commit 7ea19076c2532f85fd0c57e065d65f21b9b1b349 -Author: Kanaad Parvate -Date: Thu Feb 9 21:36:20 2017 -0800 - - merge + added folder - -commit 08ea5f02a14fd109dff43fc00304d6ea1909125b -Author: Nishant -Date: Thu Feb 9 21:31:45 2017 -0800 - - changed apply_action - -commit f4c179c8e42535b11749e17f4fa34f67e01ddb1e -Author: Cathy Wu -Date: Wed Feb 8 19:38:12 2017 -0800 - - Slightly more general setup - -commit 36e5aa8df0311767056ed58a47336a5f6fdfa3a5 -Author: Cathy Wu -Date: Wed Feb 8 19:08:12 2017 -0800 - - tensorflow + OpenAI gym + Mujoco example - -commit 09061e4f00f2679a75b6b1e4e2f1a7e4b4123a58 -Author: Cathy Wu -Date: Wed Feb 8 14:14:46 2017 -0800 - - Basic OpenAI example - -commit fcb70aaaec1ecfc402f35ea188a125c98c1b44fe -Merge: df374bd0 20112e36 -Author: Cathy Wu -Date: Wed Feb 8 14:14:13 2017 -0800 - - Merge branch 'master' of github.com:cathywu/learning-traffic - -commit df374bd06f72ee52cca3eb94f6aa1d8e8dc45d2d -Author: Cathy Wu -Date: Wed Feb 8 14:14:10 2017 -0800 - - Old changes; use scipy instead of controls toolbox; integrate sspade - -commit 20112e3678692ed70b2a231b5a427b6c7d2ac98a -Author: Kanaad Parvate -Date: Mon Feb 6 18:22:11 2017 -0800 - - reset, loading vehicles, equal spacing - -commit c8dbb8fa50331c6b797bf8c1a23e44ae5a430b4f -Author: Kanaad Parvate -Date: Wed Feb 1 14:08:20 2017 -0800 - - working reset function - -commit b9ce411af98f94c78b92bd509a7c07a6e11c5985 -Merge: 9f0a67fd 3f12e8a3 -Author: Kanaad Parvate -Date: Mon Jan 30 19:06:33 2017 -0800 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic - -commit 9f0a67fdbf75641cfdd6ddd1dd8c192fe3634942 -Author: Kanaad Parvate -Date: Mon Jan 30 19:06:18 2017 -0800 - - CISTAR progress - -commit 3f12e8a32e4a805239541f277ca0d18e0e449d53 -Author: Eugene Vinitsky -Date: Thu Jan 26 10:33:59 2017 -0800 - - Wrote a symmetric exponential moving average filter for analyzing the NGSIM velocities - -commit fe51c6a19ada210b96fc7a7776968a897c304696 -Author: Kanaad Parvate -Date: Fri Jan 20 16:17:49 2017 -0800 - - delete old files - -commit a5721169b0c22fbb165a60608a462f2ebcb6c742 -Author: Kanaad Parvate -Date: Fri Jan 20 16:16:43 2017 -0800 - - cistar-cfg files - -commit 173ba70b1a2ee29388a933bcb9431aaf568d8de5 -Merge: 47f5afa2 51347b52 -Author: Kanaad Parvate -Date: Fri Jan 20 16:15:55 2017 -0800 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic - -commit 47f5afa28ef114c60697d9305a86dbea739ea2ed -Author: Kanaad Parvate -Date: Fri Jan 20 16:15:25 2017 -0800 - - cistar v1.0 - -commit 51347b52ca0d1a513aba7fe22a496e517f84e653 -Merge: 8a1f25b2 345ecacd -Author: Cathy Wu -Date: Wed Jan 18 18:59:42 2017 -0800 - - Merge branch 'master' of github.com:cathywu/learning-traffic - -commit 8a1f25b2d06a3e77bb7b096a43f94bd010f4d323 -Author: Cathy Wu -Date: Wed Jan 18 18:59:39 2017 -0800 - - BROKEN CODE: partial implementation, replacing pade approximation with a mix of pade and bessel filter in state space representation to support a closer fit for an impulse response to a delayed system. Unresolved: a working cascade of systems. - -commit 345ecacd8862256e1080feb49daa2837a4e3b3dd -Merge: 37eb6973 dcca40cd -Author: Eugene Vinitsky -Date: Wed Jan 18 11:39:00 2017 -0800 - - Merge branch 'pval_analysis' - - Added eigenvalue code for the bilateral case - -commit dcca40cd88ea3547014d2d0b0bd50104ca0d787c -Author: Eugene Vinitsky -Date: Wed Jan 18 11:38:25 2017 -0800 - - added code for computing the eigenvalues for the bilateral case. Can also compute the eigenvalues for systems in which manual and automated cars are randomly distributed - -commit 37eb6973c22a44078571f8b4c45b829568463a05 -Author: Cathy Wu -Date: Sat Jan 14 12:37:33 2017 -0800 - - Alternating communication delays, following L2 and Linfty string stability conditions. First commit for #18. Linfty plots relies on resolution of #17. - -commit bc0161d49350303f91596083f16b95a32fe8b936 -Author: Cathy Wu -Date: Sat Jan 14 12:14:00 2017 -0800 - - Code to reproduce Ploeg2014 Figures 4(a) and 4(b). 4(a) looks close, but it trends in the wrong direction (why?); subsequently, 4(b) is just wrong. Why??? First commit for #17 - -commit 617f79b55499c1839c9794dd50fe107b8ed9604a -Author: Cathy Wu -Date: Sat Jan 14 11:35:49 2017 -0800 - - Add useful titles, setup for reproducing Figure 4(a) from Ploeg2014 - -commit 411801cff7d511315d4eef097320769399a9c0a9 -Author: Cathy Wu -Date: Sat Jan 14 11:26:49 2017 -0800 - - Refactored system generation into functions; added reproduction of Figure 3(b) from Ploeg (though I believe they are using different constants because my reproduction is consistent with 3(a) whereas theirs may not be); added some minor documentation. - -commit 18374c1f02e3c6427075dfcf05594deb86470b82 -Author: Cathy Wu -Date: Fri Jan 13 18:50:07 2017 -0800 - - Actually, it was reproducing Ploeg2014 plots, just with different units! I've re-done the axes, added some more documentation. Resolves #16. - -commit 86b370f3b246c891a2909955a4e959c0fcf8e1c9 -Merge: 10db3e51 ccb48171 -Author: Cathy Wu -Date: Fri Jan 13 16:23:16 2017 -0800 - - Merge branch 'master' of github.com:cathywu/learning-traffic - -commit 10db3e511096ccde23e348ae684c55748ecbf023 -Author: Cathy Wu -Date: Fri Jan 13 16:23:12 2017 -0800 - - Two attempts at reproducing Figure 3(a) of Ploeg2014. - -commit ccb48171179eafa0701fdf72702e9ff416b36f3b -Author: Eugene Vinitsky -Date: Fri Jan 13 14:47:54 2017 -0800 - - rewrote the code so it doesnt re-analyze the headways everytime, instead it pulls them from an output file. Cuts down the runtime a lot - -commit adf6f01a758b7c7d5f7308c7a9b105e50fad4602 -Author: Eugene Vinitsky -Date: Wed Jan 11 13:15:54 2017 -0500 - - added in analysis of US-101 code - -commit ea641cc5df0a289fc927b6174588f80fcc77c6a1 -Author: Eugene Vinitsky -Date: Tue Jan 10 14:27:31 2017 -0500 - - updated to pep8 - -commit f052be905a06fd306dc96f6e7327078c980c6bfa -Author: Eugene Vinitsky -Date: Tue Jan 10 13:34:23 2017 -0500 - - added code that computes the headway when a car begins entering the lane for a lane change. Also added code that divides each bin in the histogram by the total number of counts in that bin for the whole span of NGSIM data, which normalizes the counts by their likelihood of appearing - -commit d29800e977994e1c055bc07bd71b15a7f91b8d49 -Author: Eugene Vinitsky -Date: Fri Dec 23 18:41:25 2016 -0500 - - updated to PEP8 - -commit dccc19946011d8f5064e20544b30061a27081771 -Author: Eugene Vinitsky -Date: Fri Dec 23 18:38:00 2016 -0500 - - added code that computes the headway from the following vehicle when its leading vehicle exits the lane. The procedure is based on Kestin, Thiemann 2008. - -commit 1b9a513f8d3609e268b4ab7f4b9ec9f688b3fb1d -Author: Eugene Vinitsky -Date: Thu Dec 22 15:51:45 2016 -0500 - - added code that computes headways before a lane change in and out for ngsim data - -commit 3f5c05c064bacbcd79d2bfc48f3810963941cbf8 -Author: Nathan Mandi -Date: Tue Dec 20 23:21:27 2016 -0500 - - ExperimentEnv starters - -commit d17a5f4de7976ed7fe7ea0659142d97b1a7c8917 -Author: Nathan Mandi -Date: Thu Dec 15 19:10:30 2016 -0500 - - Minor changes - -commit e43ed6d50af21a79cb30c5de0f36e0c042cee6e9 -Author: Leah Dickstein -Date: Wed Nov 30 14:07:28 2016 -0800 - - Code needs cleanup, but it moves a lot of code changes to the train file to be more compatible with CISTAR - -commit 0ec1c1148fbecb89a0816d4b0627aa72c5cf23c9 -Author: Leah Dickstein -Date: Fri Nov 25 00:13:41 2016 -0800 - - working on emission env and visualizer - -commit 74b1d5cba3feca83eb839a07f13d78618913cf76 -Author: Leah Dickstein -Date: Thu Nov 24 16:51:11 2016 -0800 - - working toy speed example with larger highway circle called leah-3 and 12 cars on the track - -commit f63d1d4cceb9f87c3ae6a8d3c978f37d6e9ad8d1 -Merge: 8561f30d 20f9987f -Author: Nathan Mandi -Date: Thu Nov 17 18:25:39 2016 -0800 - - Merge branch 'master' of https://github.com/cathywu/learning-traffic - -commit 8561f30de4e36114ac4ccd5ac8bdd6efec715cd4 -Author: Nathan Mandi -Date: Thu Nov 17 18:22:45 2016 -0800 - - Changes to rllab interface - -commit 20f9987f098604482b7ad45b7cb5fc01105f3f6d -Author: Kanaad Parvate -Date: Thu Nov 17 17:29:22 2016 -0800 - - minor changes to sumo environment - -commit 724d46f88218c1098d30055efab59323fcc40a40 -Author: Kanaad Parvate -Date: Thu Nov 17 04:57:54 2016 -0800 - - vehicle list processing + loop file generation + skeleton for interfacing with env - -commit 2e2d5739b1488e340655bcaece75d199ebb35c76 -Author: Leah Dickstein -Date: Wed Nov 16 15:00:06 2016 -0800 - - shouldn't break up privacy - -commit d00a148e81799e1ca4f417a4f4b3e65d3ec99f9b -Author: Leah Dickstein -Date: Wed Nov 16 14:54:13 2016 -0800 - - oops, can't go on public github - -commit 619c68d7b24751b6ba87cc3119375d79d888774b -Author: Leah Dickstein -Date: Wed Nov 16 11:42:31 2016 -0800 - - Adding docker information and figuring out how to run aws train from different dir - -commit cd1aea3ae5b23473e0a5a3f082d16c6b336452b2 -Author: Leah Dickstein -Date: Thu Oct 27 21:25:44 2016 -0700 - - update with sumo linked training environment + TRPO train script - -commit 85ea3711ca9678fd0560b04a3cc0d2c52e071817 -Author: Nathan Mandi -Date: Tue Nov 15 17:36:53 2016 -0800 - - Changes to sumo interface - -commit 070a57b22f3ea1e51aa42cf79c1ef8cfe42e3c25 -Author: Nathan Mandi -Date: Mon Nov 7 12:49:19 2016 -0800 - - First skeletons of sumo++ - -commit b55f2592c8e46a3bf6d99c0763fed5ad8a6f9f48 -Author: Kanaad Parvate -Date: Sun Oct 30 21:39:21 2016 -0700 - - step test - -commit ec7195ca0cf0d53cdc2fb9fae0eb43ef86f14a0a -Author: Kanaad Parvate -Date: Sun Oct 30 21:38:00 2016 -0700 - - added stetest.py - -commit c40c854349bea718acea951bb4f55fb280f35c04 -Author: Nathan Mandi -Date: Fri Oct 28 01:14:07 2016 -0700 - - Typo - -commit e79c686bf8485327ae9c102e36295c339947e332 -Author: Leah Dickstein -Date: Thu Oct 27 21:25:44 2016 -0700 - - update with sumo linked training environment + TRPO train script - -commit 7f6b978f5df06fe942d12167db2ca97bd41ff3c3 -Author: Leah Dickstein -Date: Thu Oct 27 21:06:42 2016 -0700 - - test push - -commit 7b265817b3574a30f5f60d978ded45bbcb2cc2c5 -Author: Kanaad Parvate -Date: Tue Oct 4 12:47:59 2016 -0700 - - mit circle simulation - -commit 79b71adace89928e62819ca3b645b5c200acfbf3 -Author: Cathy Wu -Date: Fri Sep 16 14:19:47 2016 -0700 - - Initial commit From e3c2a24858c6dc0e9148086d40e0143456614492 Mon Sep 17 00:00:00 2001 From: liljonnystyle Date: Mon, 6 Jul 2020 16:38:57 -0700 Subject: [PATCH 50/60] rename pkl files --- flow/energy_models/toyota_energy.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/flow/energy_models/toyota_energy.py b/flow/energy_models/toyota_energy.py index 36c7f4005..864dabd2b 100644 --- a/flow/energy_models/toyota_energy.py +++ b/flow/energy_models/toyota_energy.py @@ -31,13 +31,14 @@ class PriusEnergy(ToyotaModel): """Toyota Prius (EV) energy model class.""" def __init__(self, kernel, soc=0.9): - super(PriusEnergy, self).__init__(kernel, filename='prius_test.pkl') + super(PriusEnergy, self).__init__(kernel, filename='prius_ev.pkl') self.soc = soc def get_instantaneous_power(self, accel, speed, grade): """See parent class.""" socdot = self.toyota_energy(self.soc, accel, speed, grade) self.soc -= socdot * self.k.env.sim_step + # FIXME (Joy): convert socdot to power return socdot @@ -45,7 +46,7 @@ class TacomaEnergy(ToyotaModel): """Toyota Tacoma energy model class.""" def __init__(self, kernel): - super(TacomaEnergy, self).__init__(kernel, filename='tacoma_test.pkl') + super(TacomaEnergy, self).__init__(kernel, filename='tacoma.pkl') def get_instantaneous_power(self, accel, speed, grade): """See parent class.""" From 24b036ef4d28612adcc6a977a2c5f368b2a1f85d Mon Sep 17 00:00:00 2001 From: liljonnystyle Date: Mon, 6 Jul 2020 16:41:05 -0700 Subject: [PATCH 51/60] update docstring --- flow/energy_models/base_energy.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/flow/energy_models/base_energy.py b/flow/energy_models/base_energy.py index 4bfbdeafb..6c10d1eeb 100644 --- a/flow/energy_models/base_energy.py +++ b/flow/energy_models/base_energy.py @@ -20,5 +20,17 @@ def get_instantaneous_power(self, accel, speed, grade): """Calculate the instantaneous power consumption of a vehicle. Must be implemented by child classes. + + Parameters + ---------- + accel : float + Instantaneous acceleration of the vehicle + speed : float + Instantaneous speed of the vehicle + grade : float + Instantaneous road grade of the vehicle + Returns + ------- + float """ pass From a6ca83aa87915ba79ce69045698a355e2e1b2ffe Mon Sep 17 00:00:00 2001 From: liljonnystyle Date: Mon, 6 Jul 2020 17:30:49 -0700 Subject: [PATCH 52/60] tweak energy_model default instantiation --- flow/core/params.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flow/core/params.py b/flow/core/params.py index 7932db3aa..cfa2cf853 100755 --- a/flow/core/params.py +++ b/flow/core/params.py @@ -43,7 +43,7 @@ "only_right_drive_safe": 576 } -ENERGY_MODELS = {PriusEnergy, TacomaEnergy, PDMCombustionEngine, PDMElectric} +ENERGY_MODELS = set([PriusEnergy, TacomaEnergy, PDMCombustionEngine, PDMElectric]) # Traffic light defaults PROGRAM_ID = 1 @@ -268,7 +268,7 @@ def add(self, num_vehicles=0, car_following_params=None, lane_change_params=None, - energy_model=(PDMCombustionEngine, {}), + energy_model=PDMCombustionEngine, color=None): """Add a sequence of vehicles to the list of vehicles in the network. From 2ce452391e1044c22dd745f9a7b6980fe8838b29 Mon Sep 17 00:00:00 2001 From: liljonnystyle Date: Mon, 6 Jul 2020 22:01:00 -0700 Subject: [PATCH 53/60] rm empty line --- flow/core/kernel/vehicle/traci.py | 1 - 1 file changed, 1 deletion(-) diff --git a/flow/core/kernel/vehicle/traci.py b/flow/core/kernel/vehicle/traci.py index 00ee1aeac..73a012451 100644 --- a/flow/core/kernel/vehicle/traci.py +++ b/flow/core/kernel/vehicle/traci.py @@ -115,7 +115,6 @@ def initialize(self, vehicles): self.__vehicles[veh_id] = dict() self.__vehicles[veh_id]['type'] = typ['veh_id'] self.__vehicles[veh_id]['initial_speed'] = typ['initial_speed'] - self.num_vehicles += 1 if typ['acceleration_controller'][0] == RLController: self.num_rl_vehicles += 1 From b7ad0e68b907ab41e9008f9c7c00f4c8aeb4906f Mon Sep 17 00:00:00 2001 From: liljonnystyle Date: Tue, 7 Jul 2020 11:16:45 -0700 Subject: [PATCH 54/60] push error handling downstream, fail silently --- flow/core/kernel/vehicle/base.py | 4 +++- flow/core/kernel/vehicle/traci.py | 8 ++------ flow/core/rewards.py | 27 +++++++++++++++++++-------- 3 files changed, 24 insertions(+), 15 deletions(-) diff --git a/flow/core/kernel/vehicle/base.py b/flow/core/kernel/vehicle/base.py index 2ca51a187..843ec7eb6 100644 --- a/flow/core/kernel/vehicle/base.py +++ b/flow/core/kernel/vehicle/base.py @@ -364,13 +364,15 @@ def get_fuel_consumption(self, veh_id, error=-1001): pass @abstractmethod - def get_energy_model(self, veh_id): + def get_energy_model(self, veh_id, error=""): """Return the energy model class object of the specified vehicle. Parameters ---------- veh_id : str or list of str vehicle id, or list of vehicle ids + error : str + value that is returned if the vehicle is not found Returns ------- subclass of BaseEnergyModel diff --git a/flow/core/kernel/vehicle/traci.py b/flow/core/kernel/vehicle/traci.py index 73a012451..23f65c3f6 100644 --- a/flow/core/kernel/vehicle/traci.py +++ b/flow/core/kernel/vehicle/traci.py @@ -555,15 +555,11 @@ def get_fuel_consumption(self, veh_id, error=-1001): return [self.get_fuel_consumption(vehID, error) for vehID in veh_id] return self.__sumo_obs.get(veh_id, {}).get(tc.VAR_FUELCONSUMPTION, error) * ml_to_gallons - def get_energy_model(self, veh_id): + def get_energy_model(self, veh_id, error=""): """See parent class.""" if isinstance(veh_id, (list, np.ndarray)): return [self.get_energy_model(vehID) for vehID in veh_id] - - if "energy_model" in self.__vehicles.get(veh_id, {}): - return self.__vehicles.get(veh_id, {})["energy_model"] - else: - raise KeyError("Energy model not set for {}".format(veh_id)) + return self.__vehicles.get(veh_id, {}).get("energy_model", error) def get_previous_speed(self, veh_id, error=-1001): """See parent class.""" diff --git a/flow/core/rewards.py b/flow/core/rewards.py index 6825043a2..f89e0c42e 100755 --- a/flow/core/rewards.py +++ b/flow/core/rewards.py @@ -444,7 +444,7 @@ def miles_per_gallon(env, veh_ids=None, gain=.001): return mpg * gain -def instantaneous_power(env, veh_id): +def instantaneous_power(env, veh_ids=None, gain=.001): """Calculate the instantaneous power for every simulation step specific to the vehicle type. Parameters @@ -452,12 +452,23 @@ def instantaneous_power(env, veh_id): env : flow.envs.Env the environment variable, which contains information on the current state of the system. - veh_id : str - veh_id to compute the reward for + veh_ids : [list] or str + list of veh_ids or single veh_id to compute the reward over + gain : float + scaling factor for the reward """ - speed = env.k.vehicle.get_speed(veh_id) - accel = env.k.vehicle.get_accel_no_noise_with_failsafe(veh_id) - grade = env.k.vehicle.get_road_grade(veh_id) - inst_power = env.k.vehicle.get_energy_model(veh_id).get_instantaneous_power(accel, speed, grade) + if veh_ids is None: + veh_ids = env.k.vehicle.get_ids() + elif not isinstance(veh_ids, list): + veh_ids = [veh_ids] - return inst_power + inst_power = 0 + for veh_id in veh_ids: + energy_model = env.k.vehicle.get_energy_model(veh_id) + if energy_model != "": + speed = env.k.vehicle.get_speed(veh_id) + accel = env.k.vehicle.get_accel_no_noise_with_failsafe(veh_id) + grade = env.k.vehicle.get_road_grade(veh_id) + inst_power += energy_model.get_instantaneous_power(accel, speed, grade) + + return inst_power * gain From c4e7b95aa38636d2450f8bd7b534e5faca6870da Mon Sep 17 00:00:00 2001 From: liljonnystyle Date: Tue, 7 Jul 2020 11:25:58 -0700 Subject: [PATCH 55/60] energy model not found error in traci --- flow/core/kernel/vehicle/traci.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/flow/core/kernel/vehicle/traci.py b/flow/core/kernel/vehicle/traci.py index 23f65c3f6..ef401d180 100644 --- a/flow/core/kernel/vehicle/traci.py +++ b/flow/core/kernel/vehicle/traci.py @@ -559,7 +559,11 @@ def get_energy_model(self, veh_id, error=""): """See parent class.""" if isinstance(veh_id, (list, np.ndarray)): return [self.get_energy_model(vehID) for vehID in veh_id] - return self.__vehicles.get(veh_id, {}).get("energy_model", error) + try: + return self.__vehicles.get(veh_id, {'energy_model': error})['energy_model'] + except KeyError: + print("Energy model not specified for vehicle {}".format(veh_id)) + raise def get_previous_speed(self, veh_id, error=-1001): """See parent class.""" From b79a69641c545c5934d3056b940e0ac4fe589a2f Mon Sep 17 00:00:00 2001 From: liljonnystyle Date: Tue, 7 Jul 2020 12:53:33 -0700 Subject: [PATCH 56/60] fix typo --- flow/energy_models/toyota_energy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flow/energy_models/toyota_energy.py b/flow/energy_models/toyota_energy.py index 864dabd2b..f3bc1efcd 100644 --- a/flow/energy_models/toyota_energy.py +++ b/flow/energy_models/toyota_energy.py @@ -19,7 +19,7 @@ def __init__(self, kernel, filename=None): self.toyota_energy = pickle.load(file) # delete pickle file - os.remove(file.pkl) + os.remove(file) @abstractmethod def get_instantaneous_power(self, accel, speed, grade): From 627803dc7c8e8d049825dcbdce27f2d8231a67cc Mon Sep 17 00:00:00 2001 From: liljonnystyle Date: Tue, 7 Jul 2020 12:57:22 -0700 Subject: [PATCH 57/60] set default energy in global scope --- flow/core/params.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/flow/core/params.py b/flow/core/params.py index cfa2cf853..e163970eb 100755 --- a/flow/core/params.py +++ b/flow/core/params.py @@ -44,6 +44,7 @@ } ENERGY_MODELS = set([PriusEnergy, TacomaEnergy, PDMCombustionEngine, PDMElectric]) +DEFAULT_ENERGY_MODEL = PDMCombustionEngine # Traffic light defaults PROGRAM_ID = 1 @@ -268,7 +269,7 @@ def add(self, num_vehicles=0, car_following_params=None, lane_change_params=None, - energy_model=PDMCombustionEngine, + energy_model=DEFAULT_ENERGY_MODEL, color=None): """Add a sequence of vehicles to the list of vehicles in the network. @@ -306,7 +307,7 @@ def add(self, lane_change_params = SumoLaneChangeParams() if energy_model not in ENERGY_MODELS: - energy_model = PDMCombustionEngine + energy_model = DEFAULT_ENERGY_MODEL type_params = {} type_params.update(car_following_params.controller_params) From 2a0ae2272f110b0c7329ce3c3db90c9349e84cd0 Mon Sep 17 00:00:00 2001 From: liljonnystyle Date: Tue, 7 Jul 2020 13:21:53 -0700 Subject: [PATCH 58/60] add temporary ray test fix --- tests/fast_tests/test_examples.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/fast_tests/test_examples.py b/tests/fast_tests/test_examples.py index b5faf6517..8e871afb4 100644 --- a/tests/fast_tests/test_examples.py +++ b/tests/fast_tests/test_examples.py @@ -168,6 +168,7 @@ def test_parse_args(self): self.assertDictEqual(vars(args), { 'exp_config': 'exp_config', + 'local_mode': False, 'rl_trainer': 'rllib', 'num_cpus': 1, 'num_steps': 5000, @@ -188,6 +189,7 @@ def test_parse_args(self): self.assertDictEqual(vars(args), { 'checkpoint_path': '5', 'exp_config': 'exp_config', + 'local_mode': False, 'num_cpus': 1, 'num_steps': 3, 'rl_trainer': 'h-baselines', @@ -409,7 +411,7 @@ def run_exp(flow_params, **kwargs): alg_run, env_name, config = setup_rllib_exps(flow_params, 1, 1, **kwargs) try: - ray.init(num_cpus=1) + ray.init(num_cpus=1, local_mode=True) except Exception as e: print("ERROR", e) config['train_batch_size'] = 50 From b90e43c38273473e53cbf082d325d9892390ffe2 Mon Sep 17 00:00:00 2001 From: liljonnystyle Date: Tue, 7 Jul 2020 18:41:37 -0700 Subject: [PATCH 59/60] implement true mpg correction and mpg reward --- flow/core/rewards.py | 157 +++------------------------- flow/energy_models/base_energy.py | 23 ++++ flow/energy_models/power_demand.py | 36 +++++-- flow/energy_models/toyota_energy.py | 4 + 4 files changed, 68 insertions(+), 152 deletions(-) diff --git a/flow/core/rewards.py b/flow/core/rewards.py index f89e0c42e..b4af4c5bc 100755 --- a/flow/core/rewards.py +++ b/flow/core/rewards.py @@ -306,146 +306,8 @@ def punish_rl_lane_changes(env, penalty=1): return total_lane_change_penalty -def energy_consumption(env, gain=.001): - """Calculate power consumption of a vehicle. - - Assumes vehicle is an average sized vehicle. - The power calculated here is the lower bound of the actual power consumed - by a vehicle. - """ - power = 0 - - M = 1200 # mass of average sized vehicle (kg) - g = 9.81 # gravitational acceleration (m/s^2) - Cr = 0.005 # rolling resistance coefficient - Ca = 0.3 # aerodynamic drag coefficient - rho = 1.225 # air density (kg/m^3) - A = 2.6 # vehicle cross sectional area (m^2) - for veh_id in env.k.vehicle.get_ids(): - if veh_id not in env.k.vehicle.previous_speeds.keys(): - continue - speed = env.k.vehicle.get_speed(veh_id) - prev_speed = env.k.vehicle.get_previous_speed(veh_id) - - accel = abs(speed - prev_speed) / env.sim_step - - power += M * speed * accel + M * g * Cr * speed + 0.5 * rho * A * Ca * speed ** 3 - - return -gain * power - - -def veh_energy_consumption(env, veh_id, gain=.001): - """Calculate power consumption of a vehicle. - - Assumes vehicle is an average sized vehicle. - The power calculated here is the lower bound of the actual power consumed - by a vehicle. - """ - power = 0 - - M = 1200 # mass of average sized vehicle (kg) - g = 9.81 # gravitational acceleration (m/s^2) - Cr = 0.005 # rolling resistance coefficient - Ca = 0.3 # aerodynamic drag coefficient - rho = 1.225 # air density (kg/m^3) - A = 2.6 # vehicle cross sectional area (m^2) - - if veh_id not in env.k.vehicle.previous_speeds: - return 0 - - speed = env.k.vehicle.get_speed(veh_id) - prev_speed = env.k.vehicle.get_previous_speed(veh_id) - - accel = abs(speed - prev_speed) / env.sim_step - - power += M * speed * accel + M * g * Cr * speed + 0.5 * rho * A * Ca * speed ** 3 - - return -gain * power - - -def miles_per_megajoule(env, veh_ids=None, gain=.001): - """Calculate miles per mega-joule of either a particular vehicle or the total average of all the vehicles. - - Assumes vehicle is an average sized vehicle. - The power calculated here is the lower bound of the actual power consumed - by a vehicle. - - Parameters - ---------- - env : flow.envs.Env - the environment variable, which contains information on the current - state of the system. - veh_ids : [list] - list of veh_ids to compute the reward over - gain : float - scaling factor for the reward - """ - mpj = 0 - counter = 0 - if veh_ids is None: - veh_ids = env.k.vehicle.get_ids() - elif not isinstance(veh_ids, list): - veh_ids = [veh_ids] - for veh_id in veh_ids: - speed = env.k.vehicle.get_speed(veh_id) - # convert to be positive since the function called is a penalty - power = -veh_energy_consumption(env, veh_id, gain=1.0) - if power > 0 and speed >= 0.1: - counter += 1 - # meters / joule is (v * \delta t) / (power * \delta t) - mpj += speed / power - if counter > 0: - mpj /= counter - - # convert from meters per joule to miles per joule - mpj /= 1609.0 - # convert from miles per joule to miles per megajoule - mpj *= 10 ** 6 - - return mpj * gain - - -def miles_per_gallon(env, veh_ids=None, gain=.001): - """Calculate mpg of either a particular vehicle or the total average of all the vehicles. - - Assumes vehicle is an average sized vehicle. - The power calculated here is the lower bound of the actual power consumed - by a vehicle. - - Parameters - ---------- - env : flow.envs.Env - the environment variable, which contains information on the current - state of the system. - veh_ids : [list] - list of veh_ids to compute the reward over - gain : float - scaling factor for the reward - """ - mpg = 0 - counter = 0 - if veh_ids is None: - veh_ids = env.k.vehicle.get_ids() - elif not isinstance(veh_ids, list): - veh_ids = [veh_ids] - for veh_id in veh_ids: - speed = env.k.vehicle.get_speed(veh_id) - gallons_per_s = env.k.vehicle.get_fuel_consumption(veh_id) - if gallons_per_s > 0 and speed >= 0.0: - counter += 1 - # meters / gallon is (v * \delta t) / (gallons_per_s * \delta t) - mpg += speed / gallons_per_s - if counter > 0: - mpg /= counter - - # convert from meters per gallon to miles per gallon - mpg /= 1609.0 - - return mpg * gain - - -def instantaneous_power(env, veh_ids=None, gain=.001): - """Calculate the instantaneous power for every simulation step specific to the vehicle type. +def instantaneous_mpg(env, veh_ids=None, gain=.001): + """Calculate the instantaneous mpg for every simulation step specific to the vehicle type. Parameters ---------- @@ -462,13 +324,22 @@ def instantaneous_power(env, veh_ids=None, gain=.001): elif not isinstance(veh_ids, list): veh_ids = [veh_ids] - inst_power = 0 + cumulative_gallons = 0 + cumulative_distance = 0 for veh_id in veh_ids: energy_model = env.k.vehicle.get_energy_model(veh_id) if energy_model != "": speed = env.k.vehicle.get_speed(veh_id) accel = env.k.vehicle.get_accel_no_noise_with_failsafe(veh_id) grade = env.k.vehicle.get_road_grade(veh_id) - inst_power += energy_model.get_instantaneous_power(accel, speed, grade) + gallons_per_hr = energy_model.get_instantaneous_fuel_consumption(accel, speed, grade) + if gallons_per_hr > 0 and speed >= 0.0: + cumulative_gallons += gallons_per_hr + cumulative_distance += speed + + cumulative_gallons /= 3600.0 + cumulative_distance /= 1609.0 + # miles / gallon is (distance_dot * \delta t) / (gallons_dot * \delta t) + mpg = cumulative_distance / cumulative_gallons - return inst_power * gain + return mpg * gain diff --git a/flow/energy_models/base_energy.py b/flow/energy_models/base_energy.py index 6c10d1eeb..bf1e16e09 100644 --- a/flow/energy_models/base_energy.py +++ b/flow/energy_models/base_energy.py @@ -15,6 +15,9 @@ class BaseEnergyModel(metaclass=ABCMeta): def __init__(self, kernel): self.k = kernel + # 15 kilowatts = 1 gallon/hour conversion factor + self.conversion = 15e3 + @abstractmethod def get_instantaneous_power(self, accel, speed, grade): """Calculate the instantaneous power consumption of a vehicle. @@ -34,3 +37,23 @@ def get_instantaneous_power(self, accel, speed, grade): float """ pass + + def get_instantaneous_fuel_consumption(self, accel, speed, grade): + """Calculate the instantaneous fuel consumption of a vehicle. + + Fuel consumption is reported in gallons per hour, with the conversion + rate of 15kW = 1 gallon/hour. + + Parameters + ---------- + accel : float + Instantaneous acceleration of the vehicle + speed : float + Instantaneous speed of the vehicle + grade : float + Instantaneous road grade of the vehicle + Returns + ------- + float + """ + return self.get_instantaneous_power(accel, speed, grade) * self.conversion diff --git a/flow/energy_models/power_demand.py b/flow/energy_models/power_demand.py index 03e859c33..ddf09b2fc 100644 --- a/flow/energy_models/power_demand.py +++ b/flow/energy_models/power_demand.py @@ -11,18 +11,28 @@ class PowerDemandModel(BaseEnergyModel, metaclass=ABCMeta): Calculate power consumption of a vehicle based on physics derivation. Assumes some vehicle characteristics. The power calculated here is the lower bound of the actual - power consumed by the vehicle. + power consumed by the vehicle plus a bilinear polynomial + function used as a correction factor. """ - def __init__(self, kernel, mass=2041, area=3.2, rolling_res_coeff=0.0027, aerodynamic_drag_coeff=0.4): + def __init__(self, + kernel, + mass=2041, + area=3.2, + rolling_res_coeff=0.0027, + aerodynamic_drag_coeff=0.4, + p1_correction=4598.7155, + p3_correction=975.12719): self.k = kernel self.g = 9.807 self.rho_air = 1.225 + self.gamma = 1 self.mass = mass + self.cross_area = area self.rolling_res_coeff = rolling_res_coeff self.aerodynamic_drag_coeff = aerodynamic_drag_coeff - self.cross_area = area - self.gamma = 1 + self.p1_correction = p1_correction + self.p3_correction = p3_correction def calculate_power_at_the_wheels(self, accel, speed, grade): """Calculate the instantaneous power required. @@ -40,7 +50,7 @@ def calculate_power_at_the_wheels(self, accel, speed, grade): float """ accel_slope_forces = self.mass * speed * ((np.heaviside(accel, 0.5) * (1 - self.gamma) + self.gamma)) * accel - accel_slope_forces += + self.g * math.sin(grade) + accel_slope_forces += self.g * math.sin(grade) rolling_friction = self.mass * self.g * self.rolling_res_coeff * speed air_drag = 0.5 * self.rho_air * self.cross_area * self.aerodynamic_drag_coeff * speed**3 power = accel_slope_forces + rolling_friction + air_drag @@ -66,8 +76,8 @@ def get_regen_cap(self, accel, speed, grade): """ pass - def get_instantaneous_power(self, accel, speed, grade): - """Apply the regenerative braking cap to the modelled power demand. + def get_power_correction_factor(self, accel, speed, grade): + """Calculate the instantaneous power correction of a vehicle. Parameters ---------- @@ -81,9 +91,17 @@ def get_instantaneous_power(self, accel, speed, grade): ------- float """ + return self.p1_correction * accel + self.p3_correction * accel * speed + + def get_instantaneous_power(self, accel, speed, grade): + """See parent class. + + Apply the regenerative braking cap to the modelled power demand. + """ regen_cap = self.get_regen_cap(accel, speed, grade) - power_at_the_wheels = self.calculate_power_at_the_wheels(accel, speed, grade) - return max(regen_cap, power_at_the_wheels) + power_at_the_wheels = max(regen_cap, self.calculate_power_at_the_wheels(accel, speed, grade)) + correction_factor = max(regen_cap, self.get_power_correction_factor(accel, speed, grade)) + return power_at_the_wheels + correction_factor class PDMCombustionEngine(PowerDemandModel): diff --git a/flow/energy_models/toyota_energy.py b/flow/energy_models/toyota_energy.py index f3bc1efcd..d24b41662 100644 --- a/flow/energy_models/toyota_energy.py +++ b/flow/energy_models/toyota_energy.py @@ -49,6 +49,10 @@ def __init__(self, kernel): super(TacomaEnergy, self).__init__(kernel, filename='tacoma.pkl') def get_instantaneous_power(self, accel, speed, grade): + """See parent class.""" + return self.get_instantaneous_fuel_consumption(accel, speed, grade) / self.conversion + + def get_instantaneous_fuel_consumption(self, accel, speed, grade): """See parent class.""" fc = self.toyota_energy(accel, speed, grade) return fc From 6bb8fce431edd55d3f48f65c8dbdb110f0c4c7f7 Mon Sep 17 00:00:00 2001 From: liljonnystyle Date: Tue, 7 Jul 2020 20:33:37 -0700 Subject: [PATCH 60/60] add print statement for defaulted energy model --- flow/core/params.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/flow/core/params.py b/flow/core/params.py index e163970eb..c6feb5086 100755 --- a/flow/core/params.py +++ b/flow/core/params.py @@ -307,6 +307,9 @@ def add(self, lane_change_params = SumoLaneChangeParams() if energy_model not in ENERGY_MODELS: + print('{} for vehicle {} is not a valid energy model. Defaulting to {}\n'.format(energy_model, + veh_id, + DEFAULT_ENERGY_MODEL)) energy_model = DEFAULT_ENERGY_MODEL type_params = {}