Skip to content

A couple of changes that let the project compile #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: jp
Choose a base branch
from
Open

A couple of changes that let the project compile #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
540af2d
src/generate.py is now compatible with Python3
May 19, 2021
1df9f2f
Need to include <iostream> for bruteforceByCost to compile
May 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/algorithms/bruteforceByCost.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include <set>
#include <map>
#include <functional>
#include <iostream>

/*! \class bruteforceByCost

Expand Down
4 changes: 2 additions & 2 deletions src/generate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ def apply_defaults(params, defaults):
try:
if params is None:
params = defaults
if type(params) in [str, unicode, int, long, float]:
if type(params) in [str, int, float]:
pass
elif isinstance(params, list):
# If there is a default entry, the list must be length one
Expand All @@ -126,7 +126,7 @@ def apply_defaults(params, defaults):
raise ValueError("Params dictionary met with non-dictionary default: {}, {}".format(params, defaults))
else:
raise RuntimeException("Unable to apply defaults to {} (from {})".format(params, defaults))
except TypeError, e:
except TypeError as e:
raise TypeError("TypeError: Unable to apply defaults to {} (from {})".format(params, defaults))
return params

Expand Down