summaryrefslogtreecommitdiffstats
path: root/Wrappers/Python/src
diff options
context:
space:
mode:
authoralgol <dkazanc@hotmail.com>2018-04-17 13:05:17 +0100
committeralgol <dkazanc@hotmail.com>2018-04-17 13:05:17 +0100
commitec9b5742e243c60f2f7d31f38cd3d561c3ae3394 (patch)
tree530f73d52c3142b023673f2041ac451bfcab576b /Wrappers/Python/src
parentd0a33e4f941539ba44a071cfab75d7bf9543990f (diff)
downloadregularization-ec9b5742e243c60f2f7d31f38cd3d561c3ae3394.tar.gz
regularization-ec9b5742e243c60f2f7d31f38cd3d561c3ae3394.tar.bz2
regularization-ec9b5742e243c60f2f7d31f38cd3d561c3ae3394.tar.xz
regularization-ec9b5742e243c60f2f7d31f38cd3d561c3ae3394.zip
TNV demos
Diffstat (limited to 'Wrappers/Python/src')
-rw-r--r--Wrappers/Python/src/cpu_regularisers.pyx4
1 files changed, 2 insertions, 2 deletions
diff --git a/Wrappers/Python/src/cpu_regularisers.pyx b/Wrappers/Python/src/cpu_regularisers.pyx
index 898bb40..abbf3b0 100644
--- a/Wrappers/Python/src/cpu_regularisers.pyx
+++ b/Wrappers/Python/src/cpu_regularisers.pyx
@@ -21,7 +21,7 @@ cimport numpy as np
cdef extern float TV_ROF_CPU_main(float *Input, float *Output, float lambdaPar, int iterationsNumb, float tau, int dimX, int dimY, int dimZ);
cdef extern float TV_FGP_CPU_main(float *Input, float *Output, float lambdaPar, int iterationsNumb, float epsil, int methodTV, int nonneg, int printM, int dimX, int dimY, int dimZ);
cdef extern float SB_TV_CPU_main(float *Input, float *Output, float lambdaPar, int iterationsNumb, float epsil, int methodTV, int printM, int dimX, int dimY, int dimZ);
-cdef extern float TNV_CPU_main(float *Input, float *u, float lambda, int maxIter, float tol, int dimX, int dimY, int dimZ);
+cdef extern float TNV_CPU_main(float *Input, float *u, float lambdaPar, int maxIter, float tol, int dimX, int dimY, int dimZ);
cdef extern float dTV_FGP_CPU_main(float *Input, float *InputRef, float *Output, float lambdaPar, int iterationsNumb, float epsil, float eta, int methodTV, int nonneg, int printM, int dimX, int dimY, int dimZ);
@@ -254,7 +254,7 @@ def dTV_FGP_3D(np.ndarray[np.float32_t, ndim=3, mode="c"] inputData,
#****************************************************************#
#*********************Total Nuclear Variation********************#
#****************************************************************#
-def TNV_CPU_pyx(inputData, regularisation_parameter, iterationsNumb, tolerance_param):
+def TNV_CPU(inputData, regularisation_parameter, iterationsNumb, tolerance_param):
if inputData.ndim == 2:
return
elif inputData.ndim == 3: