Skip to content

Commit

Permalink
Merge pull request #55 from daducci/fix_linf_norm
Browse files Browse the repository at this point in the history
Temporary workaround for issue #54
  • Loading branch information
daducci authored Nov 16, 2018
2 parents 4f5a10a + 3cc302e commit 8cdc892
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 0 additions & 2 deletions commit/proximals.pyx
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
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

0 comments on commit 8cdc892

Please sign in to comment.