Skip to content

Commit 248c32c

Browse files
committed
Fix BAIT naming
1 parent 96f65a9 commit 248c32c

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

demand_ninja/core.py

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
)
1212

1313

14-
def _beti(
14+
def _bait(
1515
weather: pd.DataFrame,
1616
smoothing: float,
1717
solar_gains: float,
@@ -59,7 +59,7 @@ def _beti(
5959
# we assume 2nd day smoothing is the square of the first day (i.e. compounded decay)
6060
N = smooth_temperature(N, weights=[smoothing, smoothing**2])
6161

62-
# Blend the smoothed BETI with raw temperatures to account for occupant
62+
# Blend the smoothed BAIT with raw temperatures to account for occupant
6363
# behaviour changing with the weather (i.e. people open windows when it's hot)
6464

6565
# These are fixed parameters we don't expose the user to
@@ -79,8 +79,8 @@ def _beti(
7979
return N
8080

8181

82-
def _energy_demand_from_beti(
83-
beti: pd.Series,
82+
def _energy_demand_from_bait(
83+
bait: pd.Series,
8484
heating_threshold: float,
8585
cooling_threshold: float,
8686
base_power: float,
@@ -92,7 +92,7 @@ def _energy_demand_from_beti(
9292
Convert temperatures into energy demand.
9393
9494
"""
95-
output = pd.DataFrame(index=beti.index.copy())
95+
output = pd.DataFrame(index=bait.index.copy())
9696
output["hdd"] = 0
9797
output["cdd"] = 0
9898
output["heating_demand"] = 0
@@ -101,12 +101,12 @@ def _energy_demand_from_beti(
101101

102102
# Add demand for heating
103103
if heating_power > 0:
104-
output["hdd"] = get_hdd(beti, heating_threshold)
104+
output["hdd"] = get_hdd(bait, heating_threshold)
105105
output["heating_demand"] = output["hdd"] * heating_power
106106

107107
# Add demand for cooling
108108
if cooling_power > 0:
109-
output["cdd"] = get_cdd(beti, cooling_threshold)
109+
output["cdd"] = get_cdd(bait, cooling_threshold)
110110
output["cooling_demand"] = output["cdd"] * cooling_power
111111

112112
# Apply the diurnal profiles if wanted
@@ -145,7 +145,7 @@ def demand(
145145
"""
146146
Returns a pd.DataFrame of heating_demand, cooling_demand, and total_demand. If
147147
`raw` is True (default False), then also returns the input data and the
148-
intermediate BETI.
148+
intermediate BAIT.
149149
150150
Params
151151
------
@@ -164,28 +164,28 @@ def demand(
164164

165165
daily_inputs = hourly_inputs.resample("1D").mean()
166166

167-
# Calculate BETI
168-
daily_beti = _beti(
167+
# Calculate BAIT
168+
daily_bait = _bait(
169169
daily_inputs,
170170
smoothing,
171171
solar_gains,
172172
wind_chill,
173173
humidity_discomfort,
174174
)
175175

176-
# Upsample BETI to hourly
177-
daily_beti.index = pd.date_range(
178-
daily_beti.index[0] + pd.Timedelta("12H"),
179-
daily_beti.index[-1] + pd.Timedelta("12H"),
176+
# Upsample BAIT to hourly
177+
daily_bait.index = pd.date_range(
178+
daily_bait.index[0] + pd.Timedelta("12H"),
179+
daily_bait.index[-1] + pd.Timedelta("12H"),
180180
freq="1D",
181181
)
182-
hourly_inputs["beti"] = daily_beti.reindex(hourly_inputs.index).interpolate(
182+
hourly_inputs["bait"] = daily_bait.reindex(hourly_inputs.index).interpolate(
183183
method="cubicspline", limit_direction="both"
184184
)
185185

186186
# Transform to degree days and energy demand
187-
result = _energy_demand_from_beti(
188-
hourly_inputs["beti"],
187+
result = _energy_demand_from_bait(
188+
hourly_inputs["bait"],
189189
heating_threshold,
190190
cooling_threshold,
191191
base_power,

0 commit comments

Comments
 (0)