Skip to content

Commit 146f458

Browse files
committed
updated code comments based om @mfeurers requests
1 parent fe93b58 commit 146f458

2 files changed

Lines changed: 15 additions & 3 deletions

File tree

openml/runs/functions.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ def initialize_model_from_run(run_id):
133133
run = get_run(run_id)
134134
return initialize_model(run.setup_id)
135135

136+
136137
def initialize_model_from_trace(run_id, repeat, fold, iteration=None):
137138
'''
138139
Initialize a model based on the parameters that were set
@@ -142,7 +143,8 @@ def initialize_model_from_trace(run_id, repeat, fold, iteration=None):
142143
Parameters
143144
----------
144145
run_id : int
145-
The Openml run_id. Should contain a trace file
146+
The Openml run_id. Should contain a trace file,
147+
otherwise a OpenMLServerException is raised
146148
147149
repeat: int
148150
The repeat nr (column in trace file)
@@ -152,7 +154,9 @@ def initialize_model_from_trace(run_id, repeat, fold, iteration=None):
152154
153155
iteration: int
154156
The iteration nr (column in trace file). If None, the
155-
best (selected) iteration will be searched (slow)
157+
best (selected) iteration will be searched (slow),
158+
according to the selection criteria implemented in
159+
OpenMLRunTrace.get_selected_iteration
156160
157161
Returns
158162
-------

openml/runs/trace.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,13 @@ def __init__(self, run_id, trace_iterations):
1818
self.trace_iterations = trace_iterations
1919

2020
def get_selected_iteration(self, fold, repeat):
21+
'''
22+
Returns the trace iteration that was marked as selected. In
23+
case multiple are marked as selected (should not happen) the
24+
first of these is returned
25+
'''
2126
for (r, f, i) in self.trace_iterations:
22-
if r == repeat and f == fold and self.trace_iterations[(r, f, i)].selected == True:
27+
if r == repeat and f == fold and self.trace_iterations[(r, f, i)].selected is True:
2328
return i
2429
raise ValueError('Could not find the selected iteration for rep/fold %d/%d' %(repeat,fold))
2530

@@ -64,6 +69,9 @@ def get_parameters(self):
6469
return result
6570

6671
def __str__(self):
72+
'''
73+
tmp string representation, will be changed in the near future
74+
'''
6775
return '[(%d,%d,%d): %f (%r)]' %(self.repeat, self.fold, self.iteration,
6876
self.evaluation, self.selected)
6977

0 commit comments

Comments
 (0)