Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for cold appliance ownership. #21

Merged
merged 2 commits into from
Feb 13, 2020
Merged

Fix for cold appliance ownership. #21

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
54f83ee
Fix for cold appliance ownership. If no fridge add one, if 3 freezers…
astridtijskens Feb 10, 2020
b1e352e
Forgot to un-comment new lines of code (+small typo).
astridtijskens Feb 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 35 additions & 9 deletions Corpus/residential.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,17 @@
from Data.Households import households
from Data.Appliances import set_appliances

#changes for new cold-appliance fix #######################################
# Based on 10000 runs, these new values combined with rule-based fix (see in def appliances)
# lead to the same overall ownership as the original values.
# We change it here so that the original remain in the Appliances file.
set_appliances['Refrigerator']['owner']=0.27 # original: 0.430
set_appliances['FridgeFreezer']['owner']=0.40 # original: 0.651
set_appliances['ChestFreezer']['owner']=0.19 # original: 0.163
set_appliances['UprightFreezer']['owner']=0.31 # original: 0.291

####################################################################

class Household(object):
'''
The Household class is the main class of ProclivityPy, defining the
Expand Down Expand Up @@ -90,6 +101,21 @@ def appliances():
obj = Equipment(**set_appliances[app])
owner = obj.owner >= random.random()
app_n.append(app) if owner else None

# Cold appliances fix: ###############################################
if not ('FridgeFreezer' in app_n) and not ('Refrigerator' in app_n): # if there was none of the two-> add one of the two.
# Find probability of household to own FF instead of R: (FF ownership over sum of two ownerships-> scale to 0-1 interval)
prob=set_appliances['FridgeFreezer']['owner']/(set_appliances['FridgeFreezer']['owner']+set_appliances['Refrigerator']['owner'])
# if random number is below prob, then the household will own a FF, otherwise a R -> add it
app_n.append('FridgeFreezer') if prob >= random.random() else app_n.append('Refrigerator')

if 'FridgeFreezer' in app_n and 'ChestFreezer' in app_n and 'UprightFreezer' in app_n: #if there were 3 freezers-> remove a freezer-only
#find probability of household to own CF instead of UF: (CF ownership over sum of two ownerships-> scale to 0-1 interval)
prob=set_appliances['ChestFreezer']['owner']/(set_appliances['ChestFreezer']['owner']+set_appliances['UprightFreezer']['owner'])
# if random number is below prob, then the household will own a CF, otherwise an UF-> remove the other
app_n.remove('UprightFreezer') if prob >= random.random() else app_n.remove('ChestFreezer') #remove the one you don't own

#########################################################################
return app_n

def tappings():
Expand Down Expand Up @@ -118,12 +144,12 @@ def clusters(members):
self.taps = tappings()
self.clusters = clusters(self.members)
# and return
print 'Household-object created and parameterized.'
print ' - Employment types are %s' % str(self.members)
print ('Household-object created and parameterized.')
print (' - Employment types are %s' % str(self.members))
summary = [] #loop dics and remove dubbles
for member in self.clusters:
summary += member.values()
print ' - Set of clusters is %s' % str(list(set(summary)))
print (' - Set of clusters is %s' % str(list(set(summary))))

return None

Expand Down Expand Up @@ -305,8 +331,8 @@ def merge(occ):
# and print statements
presence = [to for to in self.occ_m[0] if to < 2]
hours = len(presence)/6.
print ' - Total presence time is {0:.1f} out of {1} hours'.format(hours, self.nday*24)
print '\tbeing {:.1f} percent)'.format(hours*100/(self.nday*24))
print (' - Total presence time is {0:.1f} out of {1} hours'.format(hours, self.nday*24))
print ('\tbeing {:.1f} percent)'.format(hours*100/(self.nday*24)))
return None

def __plugload__(self):
Expand Down Expand Up @@ -363,7 +389,7 @@ def receptacles(self):
# output ##########################################################
# only the power load is returned
load = int(np.sum(result['P'])/60/1000)
print ' - Receptacle load is %s kWh' % str(load)
print (' - Receptacle load is %s kWh' % str(load))

return None

Expand Down Expand Up @@ -441,7 +467,7 @@ def lightingload(self):
# output ##########################################################
# only the power load is returned
load = int(np.sum(result['P'])/60/1000)
print ' - Lighting load is %s kWh' % str(load)
print (' - Lighting load is %s kWh' % str(load))

return None

Expand Down Expand Up @@ -487,7 +513,7 @@ def __dhwload__(self):
# only the power load is returned
load = np.sum(result['mDHW'])
loadpppd = int(load/self.nday/len(self.clusters))
print ' - Draw-off is %s l/pp.day' % str(loadpppd)
print (' - Draw-off is %s l/pp.day' % str(loadpppd))

return None

Expand Down Expand Up @@ -549,7 +575,7 @@ def __shsetting__(self):
sh_settings.update({room:shnon})
# and store
self.sh_settings = sh_settings
print ' - Average comfort setting is %s Celsius' % str(round(np.average(sh_settings['dayzone']),2))
print (' - Average comfort setting is %s Celsius' % str(round(np.average(sh_settings['dayzone']),2)))
return None

def roundUp(self):
Expand Down