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

Jump to bottom

Fix bugs concerning generation of lightning loads + appliances #4

Merged
merged 6 commits into from Apr 20, 2017
Merged

Fix bugs concerning generation of lightning loads + appliances #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
71e0ebb
Replace absolute paths with relative ones
frapac Jun 6, 2016
3f36821
[DEV] Fix importation of data
frapac Jun 10, 2016
af56240
[DEV] Add init file for module
frapac Jun 10, 2016
94d55ec
[DEV] Add a function to simulate scenarios
frapac Jun 10, 2016
04d15f6
[FIX] fix lighting load & generation of appliances
frapac Oct 20, 2016
be70562
[DOC] update documentation of simulation.py
frapac Jan 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Empty file added Corpus/__init__.py
View file
Open in desktop
Empty file.
16 changes: 8 additions & 8 deletions Corpus/data.py
View file
Open in desktop
Expand Up @@ -17,7 +17,7 @@ def get_clusters(employment, **kwargs):
'''
#first go the the correct location
cdir = os.getcwd()
PATH = 'E:\\3_PhD\\6_Python\\StROBe\\Data\\Aerts_Occupancy\\Crosstables\\'
PATH = '../Data/Aerts_Occupancy/Crosstables/'
os.chdir(PATH)
#create an empty dictionary
keys = ['wkdy', 'sat', 'son']
Expand Down Expand Up @@ -45,21 +45,21 @@ def get_occDict(cluster, **kwargs):
'''
#first go the the correct location
cdir = os.getcwd()
DATA_PATH = 'E:\\3_PhD\\6_Python\\StROBe\\Data\\Aerts_Occupancy'
PATH = DATA_PATH + '\\Pattern' + str(cluster)
DATA_PATH = '../Data/Aerts_Occupancy'
PATH = DATA_PATH + '/Pattern' + str(cluster)
os.chdir(PATH)
# create an empty dictionary
occDict = dict()
##########################################################################
# first we load the occupancy start states 'oss' from StartStates.txt
ss = dict()
ss = dict()
data = np.loadtxt('StartStates.txt', float)
for i in range(len(data)):
ss.update({str(i+1):data[i]})
# and add the 'oss' data to the occupancy dictionary
occDict.update({'ss':ss})
##########################################################################
# Second we load the occupancy transitions state probabilities 'osn'
# Second we load the occupancy transitions state probabilities 'osn'
# from TransitionProbability.txt
data = np.loadtxt('TransitionProbability.txt', float)
for i in range(3):
Expand Down Expand Up @@ -90,16 +90,16 @@ def get_actDict(cluster, **kwargs):
'''
#first go the the correct location
cdir = os.getcwd()
DATA_PATH = 'E:\\3_PhD\\6_Python\\StROBe\\Data\\Aerts_Activities'
DATA_PATH = '../Data/Aerts_Activities'
os.chdir(DATA_PATH)
# create an empty dictionary
actDict = dict()
##########################################################################
# first we define the dictionary used as legend for the load file
act = {0:'pc', 1:'food', 2:'vacuum', 3:'iron', 4:'tv', 5:'audio',
act = {0:'pc', 1:'food', 2:'vacuum', 3:'iron', 4:'tv', 5:'audio',
6:'dishes', 7:'washing', 8:'drying', 9:'shower'}
##########################################################################
# Second we load the activity proclivity functions 'agn'
# Second we load the activity proclivity functions 'agn'
# from Patter*cluster*.txt
FILNAM = 'Pattern'+str(cluster)+'.txt'
data = np.loadtxt(FILNAM, float)
Expand Down