Skip to content

Update and homologate syntax #21

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
CristopherA96 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update and homologate syntax #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b2ee220
Cleaning file for deprecated instructions
CristopherA96 Mar 12, 2023
cfa125e
Homologate dtype variable with the same way to assign its value
CristopherA96 Mar 12, 2023
f6fa78e
Solving some warnings when using <is> in python3
CristopherA96 Mar 12, 2023
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
8 changes: 4 additions & 4 deletions batch/job_template.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
#
# To test the script, run the following command from risk-slim directory:
#
# `bash batch/job_template.sh`
# bash batch/job_template.sh
#
# To see a detailed list of all arguments that can be passed into risk_slim, use:
#
# `python "batch/train_risk_slim.py --help`
# python batch/train_risk_slim.py --help
#
# or
#
# `python2 "batch/train_risk_slim.py --help`
# python3 batch/train_risk_slim.py --help
#
# Recommended Directory Structure for Batch Computing:
#
Expand All @@ -30,6 +30,7 @@
# The values can be changed directly using a text editor, or programmatically using a tool such as
# `jq` https://stedolan.github.io/jq/


#directories
repo_dir=$(pwd)
data_dir="${repo_dir}/examples/data" #change to /batch/data/ for your own data
Expand Down Expand Up @@ -88,4 +89,3 @@ python3 "${batch_dir}/train_risk_slim.py" \
--log "${log_file}"

exit
W
2 changes: 1 addition & 1 deletion riskslim/setup_functions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ def setup_loss_functions(data, coef_set, L0_max = None, loss_computation = None,
L0_max = L0_max)


Z = np.require(Z, requirements=['F'], dtype = float)
Z = np.require(Z, requirements=['F'], dtype = np.float_)
print_log("%d rows in lookup table" % (s_max - s_min + 1))

loss_value_tbl, prob_value_tbl, tbl_offset = get_loss_value_and_prob_tables(s_min, s_max)
Expand Down
8 changes: 4 additions & 4 deletions riskslim/solution_pool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,11 +184,11 @@ def sort(self):

def map(self, mapfun, target = 'all'):
assert callable(mapfun), 'map function must be callable'
if target is 'solutions':
if target == 'solutions':
return list(map(mapfun, self.solutions))
elif target is 'objvals':
elif target == 'objvals':
return list(map(mapfun, self.objvals))
elif target is 'all':
elif target == 'all':
return list(map(mapfun, self.objvals, self.solutions))
else:
raise ValueError('target must be either solutions, objvals, or all')
Expand Down Expand Up @@ -314,4 +314,4 @@ def __repr__(self):


def __str__(self):
return self.table()
return self.table()