summaryrefslogtreecommitdiffstats
path: root/Wrappers/Python/ccpi
diff options
context:
space:
mode:
authorDaniil Kazantsev <dkazanc3@googlemail.com>2018-05-02 15:59:06 +0100
committerGitHub <noreply@github.com>2018-05-02 15:59:06 +0100
commit885c2879cec3aef13b66604e899fd454aa53c65a (patch)
treea511d59b8ed9fff1faeddba83ad00b0f070806e4 /Wrappers/Python/ccpi
parent307d0459f6f22ff07e9d0b8d4090a27ba91cddd0 (diff)
parent6e285c109938a43b5f8a84b7a48afaeb6b058c90 (diff)
downloadregularization-885c2879cec3aef13b66604e899fd454aa53c65a.tar.gz
regularization-885c2879cec3aef13b66604e899fd454aa53c65a.tar.bz2
regularization-885c2879cec3aef13b66604e899fd454aa53c65a.tar.xz
regularization-885c2879cec3aef13b66604e899fd454aa53c65a.zip
Merge pull request #53 from vais-ral/inpaint_Heat
Inpainting methods added to the toolkit
Diffstat (limited to 'Wrappers/Python/ccpi')
-rw-r--r--Wrappers/Python/ccpi/filters/regularisers.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/Wrappers/Python/ccpi/filters/regularisers.py b/Wrappers/Python/ccpi/filters/regularisers.py
index eec8c4d..a07b39a 100644
--- a/Wrappers/Python/ccpi/filters/regularisers.py
+++ b/Wrappers/Python/ccpi/filters/regularisers.py
@@ -2,7 +2,7 @@
script which assigns a proper device core function based on a flag ('cpu' or 'gpu')
"""
-from ccpi.filters.cpu_regularisers_cython import TV_ROF_CPU, TV_FGP_CPU, TV_SB_CPU, dTV_FGP_CPU, TNV_CPU, NDF_CPU
+from ccpi.filters.cpu_regularisers import TV_ROF_CPU, TV_FGP_CPU, TV_SB_CPU, dTV_FGP_CPU, TNV_CPU, NDF_CPU, NDF_INPAINT_CPU, NVM_INPAINT_CPU
from ccpi.filters.gpu_regularisers import TV_ROF_GPU, TV_FGP_GPU, TV_SB_GPU, dTV_FGP_GPU, NDF_GPU
def ROF_TV(inputData, regularisation_parameter, iterations,
@@ -110,3 +110,10 @@ def NDF(inputData, regularisation_parameter, edge_parameter, iterations,
else:
raise ValueError('Unknown device {0}. Expecting gpu or cpu'\
.format(device))
+def NDF_INP(inputData, maskData, regularisation_parameter, edge_parameter, iterations,
+ time_marching_parameter, penalty_type):
+ return NDF_INPAINT_CPU(inputData, maskData, regularisation_parameter,
+ edge_parameter, iterations, time_marching_parameter, penalty_type)
+
+def NVM_INP(inputData, maskData, SW_increment, iterations):
+ return NVM_INPAINT_CPU(inputData, maskData, SW_increment, iterations)