Skip to content

Commit

Permalink
Explicit the arguments in methods the example files
Browse files Browse the repository at this point in the history
Do this only for the first occurence as there are many appliances and
users in examples 1 and 3
  • Loading branch information
Bachibouzouk committed May 14, 2024
1 parent f4cd862 commit 505e4aa
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 13 deletions.
6 changes: 3 additions & 3 deletions ramp/example/input_file_1.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"""

# Create new user classes
HI = User("high income", 11, 3)
HI = User(user_name="high income", num_users=11, user_preference=3)
User_list.append(HI)

HMI = User("higher middle income", 38, 3)
Expand All @@ -46,8 +46,8 @@
# Create new appliances

# Church
Ch_indoor_bulb = Church.add_appliance(10, 26, 1, 210, 0.2, 60, "yes", flat="yes")
Ch_indoor_bulb.windows([1200, 1440], [0, 0], 0.1)
Ch_indoor_bulb = Church.add_appliance(number=10, power=26, num_windows=1, func_time=210, time_fraction_random_variability=0.2, func_cycle=60, fixed="yes", flat="yes")
Ch_indoor_bulb.windows(window_1=[1200, 1440], window_2=[0, 0], random_var_w=0.1)

Ch_outdoor_bulb = Church.add_appliance(7, 26, 1, 150, 0.2, 60, "yes", flat="yes")
Ch_outdoor_bulb.windows([1200, 1440], [0, 0], 0.1)
Expand Down
8 changes: 3 additions & 5 deletions ramp/example/input_file_2.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,12 @@
"""

# Create new user classes
HH = User("generic households", 1)
HH = User(user_name="generic households", num_users=1)
User_list.append(HH)

HH_shower_P = pd.read_csv("ramp/example/shower_P.csv")

# High-Income
HH_shower = HH.add_appliance(1, HH_shower_P, 2, 15, 0.1, 3, thermal_p_var=0.2)
HH_shower.windows([390, 540], [1080, 1200], 0.2)
HH_shower = HH.add_appliance(number=1, power=HH_shower_P, num_windows=2, func_time=15, time_fraction_random_variability=0.1, func_cycle=3, thermal_p_var=0.2)
HH_shower.windows(window_1=[390, 540], window_2=[1080, 1200], random_var_w=0.2)


if __name__ == "__main__":
Expand Down
10 changes: 5 additions & 5 deletions ramp/example/input_file_3.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,19 @@
"""

# Create new user classes
HH = User("generic household", 1, 3)
HH = User(user_name="generic household", num_users=1, user_preference=3)
User_list.append(HH)

# Create new appliances

# Create Cooking appliances

HH_lunch1_soup = HH.add_appliance(
1, 1800, 2, 70, 0.15, 60, thermal_p_var=0.2, pref_index=1, fixed_cycle=1
number=1, power=1800, num_windows=2, func_time=70, time_fraction_random_variability=0.15, func_cycle=60, thermal_p_var=0.2, pref_index=1, fixed_cycle=1
)
HH_lunch1_soup.windows([12 * 60, 15 * 60], [0, 0], 0.15)
HH_lunch1_soup.specific_cycle_1(1800, 10, 750, 60, 0.15)
HH_lunch1_soup.cycle_behaviour([12 * 60, 15 * 60], [0, 0])
HH_lunch1_soup.windows(window_1=[12 * 60, 15 * 60], window_2=[0, 0], random_var_w=0.15)
HH_lunch1_soup.specific_cycle_1(p_11=1800, t_11=10, p_12=750, t_12=60, r_c1=0.15)
HH_lunch1_soup.cycle_behaviour(cw11=[12 * 60, 15 * 60], cw12=[0, 0])

HH_lunch2_rice = HH.add_appliance(
1, 1800, 2, 25, 0.15, 20, thermal_p_var=0.2, pref_index=2, fixed_cycle=1
Expand Down

0 comments on commit 505e4aa

Please sign in to comment.