apunkt/GPy
1
0
Fork 0
mirror of https://github.com/SheffieldML/GPy.git synced 2026-06-11 15:15:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'devel' of git://github.com/kenokabe/GPy into kenokabe-devel

Browse source
This commit is contained in:
mzwiessele 2016-04-22 11:51:12 +01:00
commit 161fb18331
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
GPy/util/datasets.py
View file

@ -54,12 +54,12 @@ on_rtd = os.environ.get('READTHEDOCS', None) == 'True' #Checks if RTD is scannin
if not (on_rtd):
path = os.path.join(os.path.dirname(__file__), 'data_resources.json')
json_data=open(path).read()
json_data=open(path, encoding='utf-8').read()
data_resources = json.loads(json_data)
if not (on_rtd):
path = os.path.join(os.path.dirname(__file__), 'football_teams.json')
json_data=open(path).read()
json_data=open(path, encoding='utf-8').read()
football_dict = json.loads(json_data)
@ -1482,5 +1482,3 @@ def cmu_mocap(subject, train_motions, test_motions=[], sample_every=4, data_set=
if sample_every != 1:
info += ' Data is sub-sampled to every ' + str(sample_every) + ' frames.'
return data_details_return({'Y': Y, 'lbls' : lbls, 'Ytest': Ytest, 'lblstest' : lblstest, 'info': info, 'skel': skel}, data_set)