Skip to content
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

Temporary workaround for issue #54 #55

Merged
merged 2 commits into from
Nov 16, 2018
Merged

Temporary workaround for issue #54 #55

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
a13de32
Import not needed
daducci Nov 16, 2018
3cc302e
Removed because of issue #54
daducci Nov 16, 2018
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
2 changes: 0 additions & 2 deletions commit/proximals.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ cimport cython
import numpy as np
cimport numpy as np
from math import sqrt
import sys


cpdef non_negativity(np.ndarray[np.float64_t] x, int compartment_start, int compartment_size):
"""
Expand Down
2 changes: 1 addition & 1 deletion commit/solvers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
norm2 = 2
norminf = np.inf
list_regnorms = [group_sparsity, non_negative, norm1, norm2]
list_group_sparsity_norms = [norm2, norminf]
list_group_sparsity_norms = [norm2]#, norminf] # removed because of issue #54

def init_regularisation(commit_evaluation,
regnorms = (non_negative, non_negative, non_negative),
Expand Down