From a13de329e930cc0bf1c987ecad6ddb701e638cc6 Mon Sep 17 00:00:00 2001 From: Alessandro Daducci Date: Fri, 16 Nov 2018 14:31:05 +0100 Subject: [PATCH 1/2] Import not needed --- commit/proximals.pyx | 2 -- 1 file changed, 2 deletions(-) diff --git a/commit/proximals.pyx b/commit/proximals.pyx index bfa148e0..409c9d49 100644 --- a/commit/proximals.pyx +++ b/commit/proximals.pyx @@ -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): """ From 3cc302e9323cfcce2ef8b46503a1c2437cd1d566 Mon Sep 17 00:00:00 2001 From: Alessandro Daducci Date: Fri, 16 Nov 2018 14:32:06 +0100 Subject: [PATCH 2/2] Removed because of issue #54 --- commit/solvers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commit/solvers.py b/commit/solvers.py index 28bcf149..66905469 100755 --- a/commit/solvers.py +++ b/commit/solvers.py @@ -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),