diff options
Diffstat (limited to 'main_func')
-rw-r--r-- | main_func/regularizers_CPU/FGP_TV_core.h | 3 | ||||
-rw-r--r-- | main_func/regularizers_CPU/LLT_model_core.h | 3 | ||||
-rw-r--r-- | main_func/regularizers_CPU/SplitBregman_TV_core.h | 4 | ||||
-rw-r--r-- | main_func/regularizers_CPU/TGV_PD_core.h | 3 |
4 files changed, 9 insertions, 4 deletions
diff --git a/main_func/regularizers_CPU/FGP_TV_core.h b/main_func/regularizers_CPU/FGP_TV_core.h index 8d6af3e..db3cef4 100644 --- a/main_func/regularizers_CPU/FGP_TV_core.h +++ b/main_func/regularizers_CPU/FGP_TV_core.h @@ -23,6 +23,7 @@ limitations under the License. #include <memory.h> #include <stdio.h> #include "omp.h" +#include "utils.h" /* C-OMP implementation of FGP-TV [1] denoising/regularization model (2D/3D case) * @@ -51,7 +52,7 @@ limitations under the License. * */ -float copyIm(float *A, float *B, int dimX, int dimY, int dimZ); +//float copyIm(float *A, float *B, int dimX, int dimY, int dimZ); float Obj_func2D(float *A, float *D, float *R1, float *R2, float lambda, int dimX, int dimY); float Grad_func2D(float *P1, float *P2, float *D, float *R1, float *R2, float lambda, int dimX, int dimY); float Proj_func2D(float *P1, float *P2, int methTV, int dimX, int dimY); diff --git a/main_func/regularizers_CPU/LLT_model_core.h b/main_func/regularizers_CPU/LLT_model_core.h index ef8803d..f40794f 100644 --- a/main_func/regularizers_CPU/LLT_model_core.h +++ b/main_func/regularizers_CPU/LLT_model_core.h @@ -23,6 +23,7 @@ limitations under the License. #include <memory.h> #include <stdio.h> #include "omp.h" +#include "utils.h" #define EPS 0.01 @@ -61,4 +62,4 @@ float div_upd3D(float *U0, float *U, float *D1, float *D2, float *D3, unsigned s float calcMap(float *U, unsigned short *Map, int dimX, int dimY, int dimZ); float cleanMap(unsigned short *Map, int dimX, int dimY, int dimZ); -float copyIm(float *A, float *U, int dimX, int dimY, int dimZ); +//float copyIm(float *A, float *U, int dimX, int dimY, int dimZ); diff --git a/main_func/regularizers_CPU/SplitBregman_TV_core.h b/main_func/regularizers_CPU/SplitBregman_TV_core.h index ed9112c..78aef09 100644 --- a/main_func/regularizers_CPU/SplitBregman_TV_core.h +++ b/main_func/regularizers_CPU/SplitBregman_TV_core.h @@ -23,6 +23,8 @@ limitations under the License. #include <stdio.h> #include "omp.h" +#include "utils.h" + /* C-OMP implementation of Split Bregman - TV denoising-regularization model (2D/3D) * * Input Parameters: @@ -47,7 +49,7 @@ limitations under the License. * D. Kazantsev, 2016* */ -float copyIm(float *A, float *B, int dimX, int dimY, int dimZ); +//float copyIm(float *A, float *B, int dimX, int dimY, int dimZ); float gauss_seidel2D(float *U, float *A, float *Dx, float *Dy, float *Bx, float *By, int dimX, int dimY, float lambda, float mu); float updDxDy_shrinkAniso2D(float *U, float *Dx, float *Dy, float *Bx, float *By, int dimX, int dimY, float lambda); float updDxDy_shrinkIso2D(float *U, float *Dx, float *Dy, float *Bx, float *By, int dimX, int dimY, float lambda); diff --git a/main_func/regularizers_CPU/TGV_PD_core.h b/main_func/regularizers_CPU/TGV_PD_core.h index e25ae68..2c6a0d6 100644 --- a/main_func/regularizers_CPU/TGV_PD_core.h +++ b/main_func/regularizers_CPU/TGV_PD_core.h @@ -23,6 +23,7 @@ limitations under the License. #include <memory.h> #include <stdio.h> #include "omp.h" +#include "utils.h" /* C-OMP implementation of Primal-Dual denoising method for * Total Generilized Variation (TGV)-L2 model (2D case only) @@ -61,4 +62,4 @@ float UpdV_2D(float *V1, float *V2, float *P1, float *P2, float *Q1, float *Q2, float DualP_3D(float *U, float *V1, float *V2, float *V3, float *P1, float *P2, float *P3, int dimX, int dimY, int dimZ, float sigma); float newU(float *U, float *U_old, int dimX, int dimY, int dimZ); -float copyIm(float *A, float *U, int dimX, int dimY, int dimZ); +//float copyIm(float *A, float *U, int dimX, int dimY, int dimZ); |