Adding __str__ for OpenMLSetup and OpenMLParameter

Neeratyoy · Neeratyoy · commit 837cb9bd178e · 2019-05-29T13:01:28.000+02:00
diff --git a/openml/datasets/dataset.py b/openml/datasets/dataset.py
@@ -176,21 +176,21 @@ def __init__(self, name, description, format=None,
     def __str__(self):
         object_dict = self.__dict__
         output_str = ''
-        name = '\n%14s: %s\n' % ("Name", object_dict['name'])
-        version = '%14s: %s\n' % ("Version", object_dict['version'])
-        format = '%14s: %s\n' % ("Format", object_dict['format'])
-        date = '%14s: %s\n' % ("Upload Date", object_dict['upload_date'].replace('T', ' '))
-        licence = '%14s: %s\n' % ("Licence", object_dict['licence'])
-        d_url = '%14s: %s\n' % ("Download URL", object_dict['url'])
+        name = '\n%-14s: %s\n' % ("Name", object_dict['name'])
+        version = '%-14s: %s\n' % ("Version", object_dict['version'])
+        format = '%-14s: %s\n' % ("Format", object_dict['format'])
+        date = '%-14s: %s\n' % ("Upload Date", object_dict['upload_date'].replace('T', ' '))
+        licence = '%-14s: %s\n' % ("Licence", object_dict['licence'])
+        d_url = '%-14s: %s\n' % ("Download URL", object_dict['url'])
         base_url = 'https://www.openml.org/d/'
-        w_url = '%14s: %s\n' % ("OpenML URL", base_url + str(self.dataset_id))
-        local_file = '%14s: %s\n' % ("Data file", object_dict['data_file'])
-        pickle_file = '%14s: %s\n' % ("Pickle file", object_dict['data_pickle_file'])
+        w_url = '%-14s: %s\n' % ("OpenML URL", base_url + str(self.dataset_id))
+        local_file = '%-14s: %s\n' % ("Data file", object_dict['data_file'])
+        pickle_file = '%-14s: %s\n' % ("Pickle file", object_dict['data_pickle_file'])
         num_instances = ''
         if object_dict['qualities']['NumberOfInstances'] is not None:
-            num_instances = '%14s: %d\n' % ("# of instances",
+            num_instances = '%-14s: %d\n' % ("# of instances",
                                             object_dict['qualities']['NumberOfInstances'])
-        num_features = '%14s: %d\n' % ("# of features", len(object_dict['features']))
+        num_features = '%-14s: %d\n' % ("# of features", len(object_dict['features']))
         output_str = name + version + format + date + licence + d_url + w_url + local_file + \
             pickle_file + num_instances + num_features
         return(output_str)
diff --git a/openml/evaluations/evaluation.py b/openml/evaluations/evaluation.py
@@ -52,28 +52,28 @@ def __str__(self):
         object_dict = self.__dict__
         output_str = ''
         base_url = 'https://www.openml.org/'
-        upload = '\n%15s: %s\n\n' % ('Upload Date', object_dict['upload_time'])
-        run = '%15s: %d\n' % ('Run ID', object_dict['run_id'])
-        run = run + '%15s: %s\n\n' % ('OpenML Run URL',
+        upload = '\n%-15s: %s\n\n' % ('Upload Date', object_dict['upload_time'])
+        run = '%-15s: %d\n' % ('Run ID', object_dict['run_id'])
+        run = run + '%-15s: %s\n\n' % ('OpenML Run URL',
                                       base_url + 'r/' + str(object_dict['run_id']))
 
-        task = '%15s: %d\n' % ('Task ID', object_dict['task_id'])
-        task = task + '%15s: %s\n\n' % ('OpenML Task URL',
+        task = '%-15s: %d\n' % ('Task ID', object_dict['task_id'])
+        task = task + '%-15s: %s\n\n' % ('OpenML Task URL',
                                         base_url + 't/' + str(object_dict['task_id']))
 
-        flow = '%15s: %d\n' % ('Flow ID', object_dict['flow_id'])
-        flow = flow + '%15s: %s\n' % ('Flow Name', object_dict['flow_name'])
-        flow = flow + '%15s: %s\n\n' % ('OpenML Flow URL',
+        flow = '%-15s: %d\n' % ('Flow ID', object_dict['flow_id'])
+        flow = flow + '%-15s: %s\n' % ('Flow Name', object_dict['flow_name'])
+        flow = flow + '%-15s: %s\n\n' % ('OpenML Flow URL',
                                         base_url + 'f/' + str(object_dict['flow_id']))
 
-        setup = '%15s: %d\n\n' % ('Setup ID', object_dict['setup_id'])
+        setup = '%-15s: %d\n\n' % ('Setup ID', object_dict['setup_id'])
 
-        data = '%15s: %d\n' % ('Data ID', int(object_dict['data_id']))
-        data = data + '%15s: %s\n' % ('Data Name', object_dict['data_name'])
-        data = data + '%15s: %s\n\n' % ('OpenML Data URL',
+        data = '%-15s: %d\n' % ('Data ID', int(object_dict['data_id']))
+        data = data + '%-15s: %s\n' % ('Data Name', object_dict['data_name'])
+        data = data + '%-15s: %s\n\n' % ('OpenML Data URL',
                                         base_url + 'd/' + str(object_dict['data_id']))
 
-        metric = '%15s: %s\n' % ('Metric Used', object_dict['function'])
-        value = '%15s: %f\n' % ('Result', object_dict['value'])
+        metric = '%-15s: %s\n' % ('Metric Used', object_dict['function'])
+        value = '%-15s: %f\n' % ('Result', object_dict['value'])
         output_str = upload + run + task + flow + setup + data + metric + value
         return output_str
diff --git a/openml/flows/flow.py b/openml/flows/flow.py
@@ -135,19 +135,19 @@ def __init__(self, name, description, model, components, parameters,
     def __str__(self):
         object_dict = self.__dict__
         output_str = ''
-        id = '\n%16s: %s\n' % ('Flow ID', object_dict['flow_id'])
-        version = '%16s: %s\n' % ('Flow Version', object_dict['version'])
-        url = '%16s: %s\n' % ('Flow URL', 'https://www.openml.org/f/' + str(object_dict['flow_id']))
-        name = '%16s: %s\n' % ('Flow Name', object_dict['name'])
-        description = '%16s: %s\n\n' % ('Flow Description', object_dict['description'])
+        id = '\n%-16s: %s\n' % ('Flow ID', object_dict['flow_id'])
+        version = '%-16s: %s\n' % ('Flow Version', object_dict['version'])
+        url = '%-16s: %s\n' % ('Flow URL', 'https://www.openml.org/f/' + str(object_dict['flow_id']))
+        name = '%-16s: %s\n' % ('Flow Name', object_dict['name'])
+        description = '%-16s: %s\n\n' % ('Flow Description', object_dict['description'])
 
         binary = ''
         if object_dict['binary_url'] is not None:
-            binary = '%16s: %s\n\n' % ('Binary URL', object_dict['binary_url'])
+            binary = '%-16s: %s\n\n' % ('Binary URL', object_dict['binary_url'])
 
-        upload = '%16s: %s\n' % ('Upload Date', object_dict['upload_date'].replace('T', ' '))
-        language = '%16s: %s\n' % ('Language', object_dict['language'])
-        dependencies = '%16s: %s\n' % ('Dependencies', object_dict['dependencies'])
+        upload = '%-16s: %s\n' % ('Upload Date', object_dict['upload_date'].replace('T', ' '))
+        language = '%-16s: %s\n' % ('Language', object_dict['language'])
+        dependencies = '%-16s: %s\n' % ('Dependencies', object_dict['dependencies'])
         # 3740 for example
         output_str = id + version + url + name + description + binary + upload + \
             language + dependencies
diff --git a/openml/runs/run.py b/openml/runs/run.py
@@ -66,35 +66,35 @@ def __init__(self, task_id, flow_id, dataset_id, setup_string=None,
     def __str__(self):
         object_dict = self.__dict__
         output_str = ''
-        uploader = '\n%16s: %s\n' % ('Uploader Name', object_dict['uploader_name'])
+        uploader = '\n%-16s: %s\n' % ('Uploader Name', object_dict['uploader_name'])
         url = 'https://www.openml.org/u/' + str(object_dict['uploader'])
-        uploader = uploader + '%16s: %s\n\n' % ('Uploader Profile', url)
+        uploader = uploader + '%-16s: %s\n\n' % ('Uploader Profile', url)
 
-        metric = '%16s: %s\n' % ('Metric', object_dict['task_evaluation_measure'])
+        metric = '%-16s: %s\n' % ('Metric', object_dict['task_evaluation_measure'])
         result = ''
         if object_dict['task_evaluation_measure'] in object_dict['evaluations']:
             value = object_dict['evaluations'][object_dict['task_evaluation_measure']]
-            result = '%16s: %s\n' % ('Result', value)
-        run = '%16s: %s\n' % ('Run ID', object_dict['run_id'])
+            result = '%-16s: %s\n' % ('Result', value)
+        run = '%-16s: %s\n' % ('Run ID', object_dict['run_id'])
         url = 'https://www.openml.org/r/' + str(object_dict['run_id'])
-        run = run + '%16s: %s\n\n' % ('Run URL', url)
+        run = run + '%-16s: %s\n\n' % ('Run URL', url)
 
-        task = '%16s: %s\n' % ('Task ID', object_dict['task_id'])
-        task = task + '%16s: %s\n' % ('Task Type', object_dict['task_type'])
+        task = '%-16s: %s\n' % ('Task ID', object_dict['task_id'])
+        task = task + '%-16s: %s\n' % ('Task Type', object_dict['task_type'])
         url = 'https://www.openml.org/t/' + str(object_dict['task_id'])
-        task = task + '%16s: %s\n\n' % ('Task URL', url)
+        task = task + '%-16s: %s\n\n' % ('Task URL', url)
 
-        flow = '%16s: %s\n' % ('Flow ID', object_dict['flow_id'])
-        flow = flow + '%16s: %s\n' % ('Flow Name', object_dict['flow_name'])
+        flow = '%-16s: %s\n' % ('Flow ID', object_dict['flow_id'])
+        flow = flow + '%-16s: %s\n' % ('Flow Name', object_dict['flow_name'])
         url = 'https://www.openml.org/f/' + str(object_dict['flow_id'])
-        flow = flow + '%16s: %s\n\n' % ('Flow URL', url)
+        flow = flow + '%-16s: %s\n\n' % ('Flow URL', url)
 
-        setup = '%16s: %s\n' % ('Setup ID', object_dict['setup_id'])
-        setup = setup + '%16s: %s\n\n' % ('Setup String', object_dict['setup_string'])
+        setup = '%-16s: %s\n' % ('Setup ID', object_dict['setup_id'])
+        setup = setup + '%-16s: %s\n\n' % ('Setup String', object_dict['setup_string'])
 
-        dataset = '%16s: %s\n' % ('Dataset ID', object_dict['dataset_id'])
+        dataset = '%-16s: %s\n' % ('Dataset ID', object_dict['dataset_id'])
         url = 'https://www.openml.org/d/' + str(object_dict['dataset_id'])
-        dataset = dataset + '%16s: %s\n' % ('Dataset URL', url)
+        dataset = dataset + '%-16s: %s\n' % ('Dataset URL', url)
 
         output_str = uploader + metric + result + run + task + flow + setup + dataset
         return output_str
diff --git a/openml/setups/setup.py b/openml/setups/setup.py
@@ -25,6 +25,17 @@ def __init__(self, setup_id, flow_id, parameters):
         self.flow_id = flow_id
         self.parameters = parameters
 
+    def __str__(self):
+        object_dict = self.__dict__
+        output_str = ''
+        setup = '\n%-15s: %s\n' % ("Setup ID", object_dict['setup_id'])
+        flow = '%-15s: %s\n' % ("Flow ID", object_dict['flow_id'])
+        url = 'https://www.openml.org/f/' + str(object_dict['flow_id'])
+        flow = flow + '%-15s: %s\n' % ("Flow URL", url)
+        params = '%-15s: %s\n' % ("# of Parameters", len(object_dict['parameters']))
+        output_str = setup + flow + params
+        return(output_str)
+
 
 class OpenMLParameter(object):
     """Parameter object (used in setup).
@@ -60,3 +71,20 @@ def __init__(self, input_id, flow_id, flow_name, full_name, parameter_name,
         self.data_type = data_type
         self.default_value = default_value
         self.value = value
+
+    def __str__(self):
+        object_dict = self.__dict__
+        output_str = ''
+        id = '\n%-18s: %s\n' % ("ID", object_dict['id'])
+        flow = '%-18s: %s\n' % ("Flow ID", object_dict['flow_id'])
+        flow = flow + '%-18s: %s\n' % ("Flow Name", object_dict['flow_name'])
+        flow = flow + '%-18s: %s\n' % ("Flow Full Name", object_dict['full_name'])
+        url = 'https://www.openml.org/f/' + str(object_dict['flow_id'])
+        flow = flow + '%-18s: %s\n' % ("Flow URL", url)
+        filler = " "*4
+        params = '%-18s: %s\n' % ("Parameter Name", object_dict['parameter_name'])
+        params = params + filler + '%-14s: %s\n' % ("Data_Type", object_dict['data_type'])
+        params = params + filler + '%-14s: %s\n' % ("Default", object_dict['default_value'])
+        params = params + filler + '%-14s: %s\n' % ("Value", object_dict['value'])
+        output_str = id + flow + params
+        return(output_str)
