From 492e063255b6c8d8596192b66ecea3ede773bae1 Mon Sep 17 00:00:00 2001 From: ebalogun01 <42688418+ebalogun01@users.noreply.github.com> Date: Fri, 29 Dec 2023 08:34:40 -0800 Subject: [PATCH] updating environ and utils to resolve MacOS numpy issues and missing seaborn package. --- charging_sim/utils.py | 9 ++++++--- environment.yml | Bin 420 -> 446 bytes 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/charging_sim/utils.py b/charging_sim/utils.py index ea8409a9..f403e7a2 100644 --- a/charging_sim/utils.py +++ b/charging_sim/utils.py @@ -77,13 +77,16 @@ def build_electricity_cost(controller, load, energy_prices_TOU, demand_charge=Fa return cost_electricity -def build_cost_PGE_BEV2S(controller, load, energy_prices_TOU, penalize_max_power=True, max_power_pen=1000): +def build_cost_PGE_BEV2S(controller, load, energy_prices_TOU, penalize_max_power=True, max_power_pen=1000, + use_smoothness=False, smoothness_alpha=0.1): # print(energy_prices_TOU, 'TOUU') """This will need to use a heuristic and take the average conservative estimate for gamma""" net_grid_load = load + controller.battery_power - controller.solar.battery_power - controller.solar.ev_power TOU_cost = cp.sum(cp.multiply(energy_prices_TOU, net_grid_load)) * controller.resolution/60 # ($) - smoothness_pen = np.mean(cp.abs(controller.battery_power[:-1] - controller.battery_power[1:])) - smoothness_alpha = 0 + if use_smoothness: + smoothness_pen = cp.sum(cp.abs(controller.battery_power[:-1] - controller.battery_power[1:])) + else: + smoothness_pen = 0 price_per_block = 95.56 # ($/Block) overage_fee = 3.82 # ($/kW) charging_block = controller.pge_gamma * 50 # gamma is an integer variable that's at least 1 diff --git a/environment.yml b/environment.yml index 560e219e1e1876508bada10e5d9013a0c6f20a58..835a33c7f3fe52d7f4571d2bfea271ae9518c6d6 100644 GIT binary patch delta 34 mcmZ3&ypMUq5=JRr1}+8#Ak+ooVun