Skip to content

Commit

Permalink
style: format files following black update
Browse files Browse the repository at this point in the history
  • Loading branch information
rouille committed Feb 1, 2023
1 parent 3404d1c commit 5c9f8cd
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,7 @@ def generate_bev_vehicle_profiles(
# calculate demand for all geographic areas with scaling factors
state_demand_profiles = {}
for geographic_area, bev_vmt in geographic_area_bev_vmt.items():

if charging_strategy == "immediate":

if veh_type.lower() in {"ldv", "ldt"}:
normalized_demand = immediate.immediate_charging(
census_region=census_region,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ def calculate_charging_helper(
# -- setting the values in the rest of the trips --
pos = group.columns.get_loc("trip start battery charge")
for i in range(1, len(group)):

# setting the remaining trips' start SOC with the end SOC from the previous trip
# this will skip over the entries that are trip_number 1 since those already have a "trip start battery charge"
if group.iloc[i, group.columns.get_loc("trip_number")] != 1:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,6 @@ def smart_charging(

day_num = len(input_day)
for day_iter in range(day_num):

adjusted_load = [
external_signal[i] + model_year_profile[i]
for i in range(
Expand All @@ -160,12 +159,10 @@ def smart_charging(
i = 0

while i < nd_len:

# trip amount for each vehicle
total_trips = int(newdata.iloc[i, newdata.columns.get_loc("total_trips")])

if use_data_row(data_day[i], input_day[day_iter]):

# copy one vehicle information to the block
individual = newdata.iloc[i : i + total_trips].copy()

Expand Down Expand Up @@ -209,7 +206,6 @@ def smart_charging(

# find the feasible points
if exitflag == 0:

# can be an EV
individual.iloc[:, newdata.columns.get_loc("BEV could be used")] = 1

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ def test_immediate_charging_region1():


def test_immediate_charging_mdv():

result = immediate_charging_HDV.immediate_charging(
model_year=2050,
veh_range=200,
Expand Down Expand Up @@ -126,7 +125,6 @@ def test_immediate_charging_mdv():


def test_immediate_charging_hdv():

result = immediate_charging_HDV.immediate_charging(
model_year=2050,
veh_range=200,
Expand Down

0 comments on commit 5c9f8cd

Please sign in to comment.