Skip to content

Commit

Permalink
Solve merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
Sarah Krebs committed Dec 18, 2023
2 parents fda63ce + ea8554c commit b806b00
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
## Enhancements
- Fix lower bounds of dependency versions.

## Bug-Fixes
- Don't convert BOHB runs with status 'running' (consistent with SMAC).

# Version 1.1.3

## Bug-Fixes
Expand Down
3 changes: 1 addition & 2 deletions deepcave/runs/converters/bohb.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ def from_path(cls, path):

first_starttime = None
for bohb_run in bohb.get_all_runs():

times = bohb_run.time_stamps
starttime = times["started"]
endtime = times["finished"]
Expand Down Expand Up @@ -77,7 +76,7 @@ def from_path(cls, path):
if "SUCCESS" in status or "TERMINATED" in status or "COMPLETED" in status:
status = Status.SUCCESS
elif "RUNNING" in status or "QUEUED" in status or "REVIEW" in status:
status = Status.RUNNING
continue
else:
status = Status.CRASHED

Expand Down

0 comments on commit b806b00

Please sign in to comment.