Skip to content

Commit 90f425f

Browse files
NeeratyoyNeeratyoy
committed
Changing sting interpolation to format + minor edits
1 parent 8eb49a0 commit 90f425f

7 files changed

Lines changed: 137 additions & 104 deletions

File tree

‎openml/datasets/dataset.py‎

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -176,24 +176,27 @@ def __init__(self, name, description, format=None,
176176
def __str__(self):
177177
object_dict = self.__dict__
178178
output_str = ''
179-
name = '\n%-14s: %s\n' % ("Name", object_dict['name'])
180-
version = '%-14s: %s\n' % ("Version", object_dict['version'])
181-
format = '%-14s: %s\n' % ("Format", object_dict['format'])
182-
date = '%-14s: %s\n' % ("Upload Date", object_dict['upload_date'].replace('T', ' '))
183-
licence = '%-14s: %s\n' % ("Licence", object_dict['licence'])
184-
d_url = '%-14s: %s\n' % ("Download URL", object_dict['url'])
179+
header = "OpenML Dataset"
180+
header = '{}\n{}\n'.format(header, '=' * len(header))
181+
name = '{:.<14}: {}\n'.format("Name", object_dict['name'])
182+
version = '{:.<14}: {}\n'.format("Version", object_dict['version'])
183+
format = '{:.<14}: {}\n'.format("Format", object_dict['format'])
184+
date = '{:.<14}: {}\n'.format("Upload Date", object_dict['upload_date'].replace('T', ' '))
185+
licence = '{:.<14}: {}\n'.format("Licence", object_dict['licence'])
186+
d_url = '{:.<14}: {}\n'.format("Download URL", object_dict['url'])
185187
base_url = 'https://www.openml.org/d/'
186-
w_url = '%-14s: %s\n' % ("OpenML URL", base_url + str(self.dataset_id))
187-
local_file = '%-14s: %s\n' % ("Data file", object_dict['data_file'])
188-
pickle_file = '%-14s: %s\n' % ("Pickle file", object_dict['data_pickle_file'])
188+
w_url = '{:.<14}: {}\n'.format("OpenML URL", base_url + str(self.dataset_id))
189+
local_file = '{:.<14}: {}\n'.format("Data file", object_dict['data_file'])
190+
pickle_file = '{:.<14}: {}\n'.format("Pickle file", object_dict['data_pickle_file'])
191+
num_features = '{:.<14}: {}\n'.format("# of features", len(object_dict['features']))
189192
num_instances = ''
190193
if object_dict['qualities']['NumberOfInstances'] is not None:
191-
num_instances = '%-14s: %d\n' % ("# of instances",
192-
object_dict['qualities']['NumberOfInstances'])
193-
num_features = '%-14s: %d\n' % ("# of features", len(object_dict['features']))
194-
output_str = name + version + format + date + licence + d_url + w_url + local_file + \
195-
pickle_file + num_instances + num_features
196-
return(output_str)
194+
num_instances = '{:.<14}: {}\n'.format("# of instances",
195+
object_dict['qualities']['NumberOfInstances'])
196+
197+
output_str = '\n' + header + name + version + format + date + licence + d_url + w_url + \
198+
local_file + pickle_file + num_features + num_instances + '\n'
199+
return output_str
197200

198201
def _data_arff_to_pickle(self, data_file):
199202
data_pickle_file = data_file.replace('.arff', '.pkl.py3')

‎openml/evaluations/evaluation.py‎

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -51,29 +51,33 @@ def __init__(self, run_id, task_id, setup_id, flow_id, flow_name,
5151
def __str__(self):
5252
object_dict = self.__dict__
5353
output_str = ''
54+
header = "OpenML Evaluation"
55+
header = '{}\n{}\n'.format(header, '=' * len(header))
5456
base_url = 'https://www.openml.org/'
55-
upload = '\n%-15s: %s\n\n' % ('Upload Date', object_dict['upload_time'])
56-
run = '%-15s: %d\n' % ('Run ID', object_dict['run_id'])
57-
run = run + '%-15s: %s\n\n' % ('OpenML Run URL',
58-
base_url + 'r/' + str(object_dict['run_id']))
57+
upload = '{:.<14}: {}\n'.format('Upload Date', object_dict['upload_time'])
58+
run = '{:.<14}: {}\n'.format('Run ID', object_dict['run_id'])
59+
run = run + '{:.<14}: {}\n'.format('OpenML Run URL',
60+
base_url + 'r/' + str(object_dict['run_id']))
5961

60-
task = '%-15s: %d\n' % ('Task ID', object_dict['task_id'])
61-
task = task + '%-15s: %s\n\n' % ('OpenML Task URL',
62-
base_url + 't/' + str(object_dict['task_id']))
62+
task = '{:.<14}: {}\n'.format('Task ID', object_dict['task_id'])
63+
task = task + '{:.<14}: {}\n'.format('OpenML Task URL',
64+
base_url + 't/' + str(object_dict['task_id']))
6365

64-
flow = '%-15s: %d\n' % ('Flow ID', object_dict['flow_id'])
65-
flow = flow + '%-15s: %s\n' % ('Flow Name', object_dict['flow_name'])
66-
flow = flow + '%-15s: %s\n\n' % ('OpenML Flow URL',
67-
base_url + 'f/' + str(object_dict['flow_id']))
66+
flow = '{:.<14}: {}\n'.format('Flow ID', object_dict['flow_id'])
67+
flow = flow + '{:.<14}: {}\n'.format('Flow Name', object_dict['flow_name'])
68+
flow = flow + '{:.<14}: {}\n'.format('OpenML Flow URL',
69+
base_url + 'f/' + str(object_dict['flow_id']))
6870

69-
setup = '%-15s: %d\n\n' % ('Setup ID', object_dict['setup_id'])
71+
setup = '{:.<14}: {}\n'.format('Setup ID', object_dict['setup_id'])
7072

71-
data = '%-15s: %d\n' % ('Data ID', int(object_dict['data_id']))
72-
data = data + '%-15s: %s\n' % ('Data Name', object_dict['data_name'])
73-
data = data + '%-15s: %s\n\n' % ('OpenML Data URL',
74-
base_url + 'd/' + str(object_dict['data_id']))
73+
data = '{:.<14}: {}\n'.format('Data ID', int(object_dict['data_id']))
74+
data = data + '{:.<14}: {}\n'.format('Data Name', object_dict['data_name'])
75+
data = data + '{:.<14}: {}\n'.format('OpenML Data URL',
76+
base_url + 'd/' + str(object_dict['data_id']))
7577

76-
metric = '%-15s: %s\n' % ('Metric Used', object_dict['function'])
77-
value = '%-15s: %f\n' % ('Result', object_dict['value'])
78-
output_str = upload + run + task + flow + setup + data + metric + value
78+
metric = '{:.<14}: {}\n'.format('Metric Used', object_dict['function'])
79+
value = '{:.<14}: {}\n'.format('Result', object_dict['value'])
80+
81+
output_str = '\n' + header + upload + run + task + flow + setup + data + metric + \
82+
value + '\n'
7983
return output_str

‎openml/flows/flow.py‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -135,23 +135,24 @@ def __init__(self, name, description, model, components, parameters,
135135
def __str__(self):
136136
object_dict = self.__dict__
137137
output_str = ''
138-
id = '\n%-16s: %s\n' % ('Flow ID', object_dict['flow_id'])
139-
version = '%-16s: %s\n' % ('Flow Version', object_dict['version'])
140-
url = '%-16s: %s\n' % ('Flow URL',
141-
'https://www.openml.org/f/' + str(object_dict['flow_id']))
142-
name = '%-16s: %s\n' % ('Flow Name', object_dict['name'])
143-
description = '%-16s: %s\n\n' % ('Flow Description', object_dict['description'])
138+
header = "OpenML Flow"
139+
header = '{}\n{}\n'.format(header, '=' * len(header))
140+
id_version = '{:.<16}: {} (Version: {})\n'.format('Flow ID', object_dict['flow_id'],
141+
object_dict['version'])
142+
url = '{:.<16}: {}\n'.format('Flow URL',
143+
'https://www.openml.org/f/' + str(object_dict['flow_id']))
144+
name = '{:.<16}: {}\n'.format('Flow Name', object_dict['name'])
145+
description = '{:.<16}: {}\n'.format('Flow Description', object_dict['description'])
144146

145147
binary = ''
146148
if object_dict['binary_url'] is not None:
147-
binary = '%-16s: %s\n\n' % ('Binary URL', object_dict['binary_url'])
149+
binary = '{:.<16}: {}\n'.format('Binary URL', object_dict['binary_url'])
148150

149-
upload = '%-16s: %s\n' % ('Upload Date', object_dict['upload_date'].replace('T', ' '))
150-
language = '%-16s: %s\n' % ('Language', object_dict['language'])
151-
dependencies = '%-16s: %s\n' % ('Dependencies', object_dict['dependencies'])
151+
upload = '{:.<16}: {}\n'.format('Upload Date', object_dict['upload_date'].replace('T', ' '))
152+
dependencies = '{:.<16}: {}\n'.format('Dependencies', object_dict['dependencies'])
152153
# 3740 for example
153-
output_str = id + version + url + name + description + binary + upload + \
154-
language + dependencies
154+
output_str = '\n' + header + id_version + url + name + description + binary + \
155+
upload + dependencies + '\n'
155156
return output_str
156157

157158
def _to_xml(self) -> str:

‎openml/runs/run.py‎

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -66,37 +66,40 @@ def __init__(self, task_id, flow_id, dataset_id, setup_string=None,
6666
def __str__(self):
6767
object_dict = self.__dict__
6868
output_str = ''
69-
uploader = '\n%-16s: %s\n' % ('Uploader Name', object_dict['uploader_name'])
69+
header = 'OpenML Run'
70+
header = '{}\n{}\n'.format(header, '=' * len(header))
71+
uploader = '{:.<16}: {}\n'.format('Uploader Name', object_dict['uploader_name'])
7072
url = 'https://www.openml.org/u/' + str(object_dict['uploader'])
71-
uploader = uploader + '%-16s: %s\n\n' % ('Uploader Profile', url)
73+
uploader = uploader + '{:.<16}: {}\n'.format('Uploader Profile', url)
7274

73-
metric = '%-16s: %s\n' % ('Metric', object_dict['task_evaluation_measure'])
75+
metric = '{:.<16}: {}\n'.format('Metric', object_dict['task_evaluation_measure'])
7476
result = ''
7577
if object_dict['task_evaluation_measure'] in object_dict['evaluations']:
7678
value = object_dict['evaluations'][object_dict['task_evaluation_measure']]
77-
result = '%-16s: %s\n' % ('Result', value)
78-
run = '%-16s: %s\n' % ('Run ID', object_dict['run_id'])
79+
result = '{:.<16}: {}\n'.format('Result', value)
80+
run = '{:.<16}: {}\n'.format('Run ID', object_dict['run_id'])
7981
url = 'https://www.openml.org/r/' + str(object_dict['run_id'])
80-
run = run + '%-16s: %s\n\n' % ('Run URL', url)
82+
run = run + '{:.<16}: {}\n'.format('Run URL', url)
8183

82-
task = '%-16s: %s\n' % ('Task ID', object_dict['task_id'])
83-
task = task + '%-16s: %s\n' % ('Task Type', object_dict['task_type'])
84+
task = '{:.<16}: {}\n'.format('Task ID', object_dict['task_id'])
85+
task = task + '{:.<16}: {}\n'.format('Task Type', object_dict['task_type'])
8486
url = 'https://www.openml.org/t/' + str(object_dict['task_id'])
85-
task = task + '%-16s: %s\n\n' % ('Task URL', url)
87+
task = task + '{:.<16}: {}\n'.format('Task URL', url)
8688

87-
flow = '%-16s: %s\n' % ('Flow ID', object_dict['flow_id'])
88-
flow = flow + '%-16s: %s\n' % ('Flow Name', object_dict['flow_name'])
89+
flow = '{:.<16}: {}\n'.format('Flow ID', object_dict['flow_id'])
90+
flow = flow + '{:.<16}: {}\n'.format('Flow Name', object_dict['flow_name'])
8991
url = 'https://www.openml.org/f/' + str(object_dict['flow_id'])
90-
flow = flow + '%-16s: %s\n\n' % ('Flow URL', url)
92+
flow = flow + '{:.<16}: {}\n'.format('Flow URL', url)
9193

92-
setup = '%-16s: %s\n' % ('Setup ID', object_dict['setup_id'])
93-
setup = setup + '%-16s: %s\n\n' % ('Setup String', object_dict['setup_string'])
94+
setup = '{:.<16}: {}\n'.format('Setup ID', object_dict['setup_id'])
95+
setup = setup + '{:.<16}: {}\n'.format('Setup String', object_dict['setup_string'])
9496

95-
dataset = '%-16s: %s\n' % ('Dataset ID', object_dict['dataset_id'])
97+
dataset = '{:.<16}: {}\n'.format('Dataset ID', object_dict['dataset_id'])
9698
url = 'https://www.openml.org/d/' + str(object_dict['dataset_id'])
97-
dataset = dataset + '%-16s: %s\n' % ('Dataset URL', url)
99+
dataset = dataset + '{:.<16}: {}\n'.format('Dataset URL', url)
98100

99-
output_str = uploader + metric + result + run + task + flow + setup + dataset
101+
output_str = '\n' + header + uploader + metric + result + run + task + flow + setup + \
102+
dataset + '\n'
100103
return output_str
101104

102105
def _repr_pretty_(self, pp, cycle):

‎openml/setups/setup.py‎

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,14 @@ def __init__(self, setup_id, flow_id, parameters):
2828
def __str__(self):
2929
object_dict = self.__dict__
3030
output_str = ''
31-
setup = '\n%-15s: %s\n' % ("Setup ID", object_dict['setup_id'])
32-
flow = '%-15s: %s\n' % ("Flow ID", object_dict['flow_id'])
31+
header = 'OpenML Setup'
32+
header = '{}\n{}\n'.format(header, '=' * len(header))
33+
setup = '{:.<15}: {}\n'.format("Setup ID", object_dict['setup_id'])
34+
flow = '{:.<15}: {}\n'.format("Flow ID", object_dict['flow_id'])
3335
url = 'https://www.openml.org/f/' + str(object_dict['flow_id'])
34-
flow = flow + '%-15s: %s\n' % ("Flow URL", url)
35-
params = '%-15s: %s\n' % ("# of Parameters", len(object_dict['parameters']))
36-
output_str = setup + flow + params
36+
flow = flow + '{:.<15}: {}\n'.format("Flow URL", url)
37+
params = '{:.<15}: {}\n'.format("# of Parameters", len(object_dict['parameters']))
38+
output_str = '\n' + header + setup + flow + params + '\n'
3739
return(output_str)
3840

3941

@@ -75,16 +77,18 @@ def __init__(self, input_id, flow_id, flow_name, full_name, parameter_name,
7577
def __str__(self):
7678
object_dict = self.__dict__
7779
output_str = ''
78-
id = '\n%-18s: %s\n' % ("ID", object_dict['id'])
79-
flow = '%-18s: %s\n' % ("Flow ID", object_dict['flow_id'])
80-
flow = flow + '%-18s: %s\n' % ("Flow Name", object_dict['flow_name'])
81-
flow = flow + '%-18s: %s\n' % ("Flow Full Name", object_dict['full_name'])
80+
header = 'OpenML Parameter'
81+
header = '{}\n{}\n'.format(header, '=' * len(header))
82+
id = '{:.<18}: {}\n'.format("ID", object_dict['id'])
83+
flow = '{:.<18}: {}\n'.format("Flow ID", object_dict['flow_id'])
84+
flow = flow + '{:.<18}: {}\n'.format("Flow Name", object_dict['flow_name'])
85+
flow = flow + '{:.<18}: {}\n'.format("Flow Full Name", object_dict['full_name'])
8286
url = 'https://www.openml.org/f/' + str(object_dict['flow_id'])
83-
flow = flow + '%-18s: %s\n' % ("Flow URL", url)
84-
filler = " " * 4
85-
params = '%-18s: %s\n' % ("Parameter Name", object_dict['parameter_name'])
86-
params = params + filler + '%-14s: %s\n' % ("Data_Type", object_dict['data_type'])
87-
params = params + filler + '%-14s: %s\n' % ("Default", object_dict['default_value'])
88-
params = params + filler + '%-14s: %s\n' % ("Value", object_dict['value'])
89-
output_str = id + flow + params
87+
flow = flow + '{:.<18}: {}\n'.format("Flow URL", url)
88+
filler = " |" + "_" * 2
89+
params = '{:.<18}: {}\n'.format("Parameter Name", object_dict['parameter_name'])
90+
params = params + filler + '{:.<14}: {}\n'.format("Data_Type", object_dict['data_type'])
91+
params = params + filler + '{:.<14}: {}\n'.format("Default", object_dict['default_value'])
92+
params = params + filler + '{:.<14}: {}\n'.format("Value", object_dict['value'])
93+
output_str = '\n' + header + id + flow + params + '\n'
9094
return(output_str)

‎openml/study/study.py‎

Lines changed: 28 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -92,32 +92,33 @@ def __init__(
9292
def __str__(self):
9393
object_dict = self.__dict__
9494
output_str = ''
95-
id = '\n%-16s: %s\n' % ("ID", object_dict['id'])
96-
name = '%-16s: %s\n' % ("Name", object_dict['name'])
97-
status = '%-16s: %s\n' % ("Status", object_dict['status'])
98-
main_entity_type = '%-16s: %s\n' % ("Main Entity Type", object_dict['main_entity_type'])
95+
id = '{:.<16}: {}\n'.format("ID", object_dict['id'])
96+
name = '{:.<16}: {}\n'.format("Name", object_dict['name'])
97+
status = '{:.<16}: {}\n'.format("Status", object_dict['status'])
98+
main_entity_type = '{:.<16}: {}\n'.format("Main Entity Type",
99+
object_dict['main_entity_type'])
99100
url = 'https://www.openml.org/s/' + str(object_dict['id'])
100-
study_url = '%-16s: %s\n' % ("Study URL", url)
101+
study_url = '{:.<16}: {}\n'.format("Study URL", url)
101102
data = ''
102103
if object_dict['data'] is not None:
103-
data = '%-16s: %s\n' % ("# of Data", len(object_dict['data']))
104+
data = '{:.<16}: {}\n'.format("# of Data", len(object_dict['data']))
104105
tasks = ''
105106
if object_dict['tasks'] is not None:
106-
tasks = '%-16s: %s\n' % ("# of Tasks", len(object_dict['tasks']))
107+
tasks = '{:.<16}: {}\n'.format("# of Tasks", len(object_dict['tasks']))
107108
flows = ''
108109
if object_dict['flows'] is not None:
109-
flows = '%-16s: %s\n' % ("# of Flows", len(object_dict['flows']))
110+
flows = '{:.<16}: {}\n'.format("# of Flows", len(object_dict['flows']))
110111
runs = ''
111112
if object_dict['runs'] is not None:
112-
runs = '%-16s: %s\n' % ("# of Runs", len(object_dict['runs']))
113+
runs = '{:.<16}: {}\n'.format("# of Runs", len(object_dict['runs']))
113114

114115
url = 'https://www.openml.org/u/' + str(object_dict['creator'])
115-
creator = '\n%-16s: %s\n' % ("Creator", url)
116-
upload_time = '%-16s: %s\n' % ("Upload Time",
117-
object_dict['creation_date'].replace('T', ' '))
116+
creator = '{:.<16}: {}\n'.format("Creator", url)
117+
upload_time = '{:.<16}: {}\n'.format("Upload Time",
118+
object_dict['creation_date'].replace('T', ' '))
118119
output_str = id + name + status + main_entity_type + study_url + data + \
119120
tasks + flows + runs + creator + upload_time
120-
return(output_str)
121+
return output_str
121122

122123
def publish(self) -> int:
123124
"""
@@ -263,6 +264,13 @@ def __init__(
263264
setups=setups,
264265
)
265266

267+
def __str__(self):
268+
header = "OpenML Study"
269+
header = '{}\n{}\n'.format(header, '=' * len(header))
270+
body = super(OpenMLStudy, self).__str__()
271+
output_str = '\n' + header + body + '\n'
272+
return output_str
273+
266274

267275
class OpenMLBenchmarkSuite(BaseStudy):
268276

@@ -332,3 +340,10 @@ def __init__(
332340
runs=None,
333341
setups=None,
334342
)
343+
344+
def __str__(self):
345+
header = "OpenML Benchmark Suite"
346+
header = '{}\n{}\n'.format(header, '=' * len(header))
347+
body = super(OpenMLBenchmarkSuite, self).__str__()
348+
output_str = '\n' + header + body + '\n'
349+
return output_str

0 commit comments

Comments
 (0)