updated vehicles, added uniform dataset

configs/easy.yaml

@@ -12,7 +12,7 @@ vehicle_init: 0.1               # initial soc of vehicles
 ##################
 # Data locations #
 ##################
-vehicle_dir: 'data/vehicles'
+vehicle_dir: 'data/paper/v_KL_city.csv'
 depot_dir: 'data/depots'
 consumer_dir: 'data/paper/c_easy.csv'
 producer_dir: 'data/paper/p_all.csv'

configs/extreme.yaml

@@ -12,7 +12,7 @@ vehicle_init: 0.1               # initial soc of vehicles
 ##################
 # Data locations #
 ##################
-vehicle_dir: 'data/vehicles'
+vehicle_dir: 'data/paper/v_KL_city.csv'
 depot_dir: 'data/depots'
 consumer_dir: 'data/paper/c_extreme.csv'
 producer_dir: 'data/paper/p_all.csv'

configs/moderate.yaml

@@ -12,7 +12,7 @@ vehicle_init: 0.1               # initial soc of vehicles
 ##################
 # Data locations #
 ##################
-vehicle_dir: 'data/vehicles'
+vehicle_dir: 'data/paper/v_KL_city.csv'
 depot_dir: 'data/depots'
 consumer_dir: 'data/paper/c_moderate.csv'
 producer_dir: 'data/paper/p_all.csv'

data/paper/v_KL_uniform.csv

@@ -0,0 +1,91 @@
+ID,cap[kWh],cap_0[kWh],node_0,consumption[kWh/km],power_cdc[kW],speed[km/h],name,costs
+car_01,95,95,0,0.200,200,250,car,1
+car_02,95,95,0,0.200,200,250,car,1
+car_03,95,95,0,0.200,200,250,car,1
+car_04,95,95,0,0.200,200,250,car,1
+car_05,95,95,0,0.200,200,250,car,1
+car_06,95,95,0,0.200,200,250,car,1
+car_07,95,95,0,0.200,200,250,car,1
+car_08,95,95,0,0.200,200,250,car,1
+car_09,95,95,0,0.200,200,250,car,1
+car_10,95,95,0,0.200,200,250,car,1
+car_11,95,95,0,0.200,200,250,car,1
+car_12,95,95,0,0.200,200,250,car,1
+car_13,95,95,0,0.200,200,250,car,1
+car_14,95,95,0,0.200,200,250,car,1
+car_15,95,95,0,0.200,200,250,car,1
+car_16,95,95,0,0.200,200,250,car,1
+car_17,95,95,0,0.200,200,250,car,1
+car_18,95,95,0,0.200,200,250,car,1
+car_19,95,95,0,0.200,200,250,car,1
+car_20,95,95,0,0.200,200,250,car,1
+car_21,95,95,0,0.200,200,250,car,1
+car_22,95,95,0,0.200,200,250,car,1
+car_23,95,95,0,0.200,200,250,car,1
+car_24,95,95,0,0.200,200,250,car,1
+car_25,95,95,0,0.200,200,250,car,1
+car_26,95,95,0,0.200,200,250,car,1
+car_27,95,95,0,0.200,200,250,car,1
+car_28,95,95,0,0.200,200,250,car,1
+car_29,95,95,0,0.200,200,250,car,1
+car_30,95,95,0,0.200,200,250,car,1
+car_31,95,95,0,0.200,200,250,car,1
+car_32,95,95,0,0.200,200,250,car,1
+car_33,95,95,0,0.200,200,250,car,1
+car_34,95,95,0,0.200,200,250,car,1
+car_35,95,95,0,0.200,200,250,car,1
+car_36,95,95,0,0.200,200,250,car,1
+car_37,95,95,0,0.200,200,250,car,1
+car_38,95,95,0,0.200,200,250,car,1
+car_39,95,95,0,0.200,200,250,car,1
+car_40,95,95,0,0.200,200,250,car,1
+car_41,95,95,0,0.200,200,250,car,1
+car_42,95,95,0,0.200,200,250,car,1
+car_43,95,95,0,0.200,200,250,car,1
+car_44,95,95,0,0.200,200,250,car,1
+car_45,95,95,0,0.200,200,250,car,1
+car_46,95,95,0,0.200,200,250,car,1
+car_47,95,95,0,0.200,200,250,car,1
+car_48,95,95,0,0.200,200,250,car,1
+car_49,95,95,0,0.200,200,250,car,1
+car_50,95,95,0,0.200,200,250,car,1
+car_51,95,95,0,0.200,200,250,car,1
+car_52,95,95,0,0.200,200,250,car,1
+car_53,95,95,0,0.200,200,250,car,1
+car_54,95,95,0,0.200,200,250,car,1
+car_55,95,95,0,0.200,200,250,car,1
+car_56,95,95,0,0.200,200,250,car,1
+car_57,95,95,0,0.200,200,250,car,1
+car_58,95,95,0,0.200,200,250,car,1
+car_59,95,95,0,0.200,200,250,car,1
+car_60,95,95,0,0.200,200,250,car,1
+car_61,95,95,0,0.200,200,250,car,1
+car_62,95,95,0,0.200,200,250,car,1
+car_63,95,95,0,0.200,200,250,car,1
+car_64,95,95,0,0.200,200,250,car,1
+car_65,95,95,0,0.200,200,250,car,1
+car_66,95,95,0,0.200,200,250,car,1
+car_67,95,95,0,0.200,200,250,car,1
+car_68,95,95,0,0.200,200,250,car,1
+car_69,95,95,0,0.200,200,250,car,1
+car_70,95,95,0,0.200,200,250,car,1
+car_71,95,95,0,0.200,200,250,car,1
+car_72,95,95,0,0.200,200,250,car,1
+car_73,95,95,0,0.200,200,250,car,1
+car_74,95,95,0,0.200,200,250,car,1
+car_75,95,95,0,0.200,200,250,car,1
+car_76,95,95,0,0.200,200,250,car,1
+car_77,95,95,0,0.200,200,250,car,1
+car_78,95,95,0,0.200,200,250,car,1
+car_79,95,95,0,0.200,200,250,car,1
+car_80,95,95,0,0.200,200,250,car,1
+car_81,95,95,0,0.200,200,250,car,1
+car_82,95,95,0,0.200,200,250,car,1
+car_83,95,95,0,0.200,200,250,car,1
+car_84,95,95,0,0.200,200,250,car,1
+car_85,95,95,0,0.200,200,250,car,1
+car_86,95,95,0,0.200,200,250,car,1
+car_87,95,95,0,0.200,200,250,car,1
+car_88,95,95,0,0.200,200,250,car,1
+car_89,95,95,0,0.200,200,250,car,1
+car_90,95,95,0,0.200,200,250,car,1

data/v_KL_city.CSV

@@ -0,0 +1,91 @@
+ID,cap[kWh],cap_0[kWh],node_0,consumption[kWh/km],power_cdc[kW],speed[km/h],name,costs
+car 88,95,95,0,0.211,200,250,Tesla Model X,236
+car 73,95,95,0,0.184,200,250,Tesla Model S,219
+car 80,72.5,72.5,0,0.161,200,250,Tesla Model 3,152
+car 10,64,64,0,0.173,77,167,Kia e-Niro 64,104
+car 16,39.2,39.2,0,0.167,50,155,Kia e-Niro 39,94
+car 24,56,56,0,0.172,100,157,Nissan Leaf e+,102
+car 30,36,36,0,0.164,46,144,Nissan Leaf,80
+car 37,41,41,0,0.161,45,135,Renault Zoe ZE40,80
+car 1,37.9,37.9,0,0.161,49,150,BMW i3,104
+car 20,58,58,0,0.173,46,150,Opel Ampera-e,115
+car 2,37.9,37.9,0,0.161,49,150,BMW i3,104
+car 3,37.9,37.9,0,0.161,49,150,BMW i3,104
+car 4,37.9,37.9,0,0.161,49,150,BMW i3,104
+car 5,37.9,37.9,0,0.161,49,150,BMW i3,104
+car 6,37.9,37.9,0,0.161,49,150,BMW i3,104
+car 7,37.9,37.9,0,0.161,49,150,BMW i3,104
+car 8,37.9,37.9,0,0.161,49,150,BMW i3,104
+car 9,37.9,37.9,0,0.161,49,150,BMW i3,104
+car 11,64,64,0,0.173,77,167,Kia e-Niro 64,104
+car 12,64,64,0,0.173,77,167,Kia e-Niro 64,104
+car 13,64,64,0,0.173,77,167,Kia e-Niro 64,104
+car 14,64,64,0,0.173,77,167,Kia e-Niro 64,104
+car 15,64,64,0,0.173,77,167,Kia e-Niro 64,104
+car 17,39.2,39.2,0,0.167,50,155,Kia e-Niro 39,94
+car 18,39.2,39.2,0,0.167,50,155,Kia e-Niro 39,94
+car 19,39.2,39.2,0,0.167,50,155,Kia e-Niro 39,94
+car 21,58,58,0,0.173,46,150,Opel Ampera-e,115
+car 22,58,58,0,0.173,46,150,Opel Ampera-e,115
+car 23,58,58,0,0.173,46,150,Opel Ampera-e,115
+car 25,56,56,0,0.172,100,157,Nissan Leaf e+,102
+car 26,56,56,0,0.172,100,157,Nissan Leaf e+,102
+car 27,56,56,0,0.172,100,157,Nissan Leaf e+,102
+car 28,56,56,0,0.172,100,157,Nissan Leaf e+,102
+car 29,56,56,0,0.172,100,157,Nissan Leaf e+,102
+car 31,36,36,0,0.164,46,144,Nissan Leaf,80
+car 32,36,36,0,0.164,46,144,Nissan Leaf,80
+car 33,36,36,0,0.164,46,144,Nissan Leaf,80
+car 34,36,36,0,0.164,46,144,Nissan Leaf,80
+car 35,36,36,0,0.164,46,144,Nissan Leaf,80
+car 36,36,36,0,0.164,46,144,Nissan Leaf,80
+car 38,41,41,0,0.161,45,135,Renault Zoe ZE40,80
+car 39,41,41,0,0.161,45,135,Renault Zoe ZE40,80
+car 40,41,41,0,0.161,45,135,Renault Zoe ZE40,80
+car 41,41,41,0,0.161,45,135,Renault Zoe ZE40,80
+car 42,41,41,0,0.161,45,135,Renault Zoe ZE40,80
+car 43,41,41,0,0.161,45,135,Renault Zoe ZE40,80
+car 44,41,41,0,0.161,45,135,Renault Zoe ZE40,80
+car 45,41,41,0,0.161,45,135,Renault Zoe ZE40,80
+car 46,41,41,0,0.161,45,135,Renault Zoe ZE40,80
+car 47,41,41,0,0.161,45,135,Renault Zoe ZE40,80
+car 48,41,41,0,0.161,45,135,Renault Zoe ZE40,80
+car 49,41,41,0,0.161,45,135,Renault Zoe ZE40,80
+car 50,41,41,0,0.161,45,135,Renault Zoe ZE40,80
+car 51,41,41,0,0.161,45,135,Renault Zoe ZE40,80
+car 52,41,41,0,0.161,45,135,Renault Zoe ZE40,80
+car 53,41,41,0,0.161,45,135,Renault Zoe ZE40,80
+car 54,41,41,0,0.161,45,135,Renault Zoe ZE40,80
+car 55,41,41,0,0.161,45,135,Renault Zoe ZE40,80
+car 56,41,41,0,0.161,45,135,Renault Zoe ZE40,80
+car 57,41,41,0,0.161,45,135,Renault Zoe ZE40,80
+car 58,41,41,0,0.161,45,135,Renault Zoe ZE40,80
+car 59,41,41,0,0.161,45,135,Renault Zoe ZE40,80
+car 60,41,41,0,0.161,45,135,Renault Zoe ZE40,80
+car 61,41,41,0,0.161,45,135,Renault Zoe ZE40,80
+car 62,41,41,0,0.161,45,135,Renault Zoe ZE40,80
+car 63,41,41,0,0.161,45,135,Renault Zoe ZE40,80
+car 64,41,41,0,0.161,45,135,Renault Zoe ZE40,80
+car 65,41,41,0,0.161,45,135,Renault Zoe ZE40,80
+car 66,41,41,0,0.161,45,135,Renault Zoe ZE40,80
+car 67,41,41,0,0.161,45,135,Renault Zoe ZE40,80
+car 68,95,95,0,0.184,200,250,Tesla Model S,219
+car 69,95,95,0,0.184,200,250,Tesla Model S,219
+car 70,95,95,0,0.184,200,250,Tesla Model S,219
+car 71,95,95,0,0.184,200,250,Tesla Model S,219
+car 72,95,95,0,0.184,200,250,Tesla Model S,219
+car 74,95,95,0,0.184,200,250,Tesla Model S,219
+car 75,95,95,0,0.184,200,250,Tesla Model S,219
+car 76,95,95,0,0.184,200,250,Tesla Model S,219
+car 77,95,95,0,0.184,200,250,Tesla Model S,219
+car 78,95,95,0,0.184,200,250,Tesla Model S,219
+car 79,95,95,0,0.184,200,250,Tesla Model S,219
+car 81,72.5,72.5,0,0.161,200,250,Tesla Model 3,152
+car 82,72.5,72.5,0,0.161,200,250,Tesla Model 3,152
+car 83,72.5,72.5,0,0.161,200,250,Tesla Model 3,152
+car 84,72.5,72.5,0,0.161,200,250,Tesla Model 3,152
+car 85,72.5,72.5,0,0.161,200,250,Tesla Model 3,152
+car 86,95,95,0,0.211,200,250,Tesla Model X,236
+car 87,95,95,0,0.211,200,250,Tesla Model X,236
+car 89,95,95,0,0.211,200,250,Tesla Model X,236
+car 90,95,95,0,0.211,200,250,Tesla Model X,236

utils.py

@@ -156,17 +156,23 @@ def get_vehicle_data(yaml_dict):
 
     Args:
         yaml_dict (dict): dictionary from the config file, 
-                          containing directory of vehicle files 
+                          containing source for vehicle files 
     Returns:
         v_data (pd.DataFrame): Dataframe containing all data
     '''
     v_max = yaml_dict['v_max']
-    vehicle_dir = os.path.join(dir_path, 
+    vehicle_src = os.path.join(dir_path, 
                                yaml_dict['vehicle_dir'])
     cols = ['ID','cap[kWh]','cap_0[kWh]','node_0',
             'consumption[kWh/km]','power_cdc[kW]',
             'speed[km/h]','name','costs']
-    vehicle_files = glob.glob(os.path.join(vehicle_dir,'*.CSV'))
+    if os.path.isdir(vehicle_src):
+        vehicle_files = glob.glob(os.path.join(vehicle_src,'*.CSV'))
+    elif os.path.isfile(vehicle_src) and vehicle_src.endswith('.csv'):
+        vehicle_files = [vehicle_src]
+    else:
+        exit(f'Could not interpet vehicle source {vehicle_src}!')
+
     vehicle_data = pd.DataFrame(columns=cols)
     for i in range(len(vehicle_files)):
         frame = pd.read_csv(vehicle_files[i])