diff --git a/Algorithms/ASD_POCS.m b/Algorithms/ASD_POCS.m index 862f6396..c5c6391a 100644 --- a/Algorithms/ASD_POCS.m +++ b/Algorithms/ASD_POCS.m @@ -147,14 +147,14 @@ % TV MINIMIZATION % ========================================================================= % Call GPU to minimize TV -% f=minimizeTV(f0,dtvg,ng); % This is the MATLAB CODE, the functions are sill in the library, but CUDA is used nowadays - for ii=1:ng -% Steepest descend of TV norm - tv(ng*(iter-1)+ii)=im3Dnorm(f,'TV','forward'); - df=weighted_gradientTVnorm2(f,0.002); - df=df./im3Dnorm(df,'L2'); - f=f-dtvg.*df; - end + f=minimizeTV(f0,dtvg,ng); % This is the MATLAB CODE, the functions are sill in the library, but CUDA is used nowadays +% for ii=1:ng +% % Steepest descend of TV norm +% tv(ng*(iter-1)+ii)=im3Dnorm(f,'TV','forward'); +% df=weighted_gradientTVnorm2(f,0.002); +% df=df./im3Dnorm(df,'L2'); +% f=f-dtvg.*df; +% end % update parameters % ========================================================================== diff --git a/Source/minTV.cpp b/Source/minTV.cpp index 0ee585fd..faacbada 100644 --- a/Source/minTV.cpp +++ b/Source/minTV.cpp @@ -102,14 +102,14 @@ void mexFunction(int nlhs , mxArray *plhs[], float * img = (float*)malloc(size_img[0] *size_img[1] *size_img[2]* sizeof(float)); // We need a float image, and, unfortunatedly, the only way of casting it is by value // Also, MATLAB is column mayor and C is row mayor! we need to deal with that - for(int i=0;i