Merge pull request #121 from vais-ral/matlab_fix

fixes all matlab issues

Author: dkazanc

demos/demoMatlab_3Ddenoise.m demos/Matlab_demos/demoMatlab_3Ddenoise.mdemos/demoMatlab_3Ddenoise.m renamed to demos/Matlab_demos/demoMatlab_3Ddenoise.m

@@ -1,8 +1,11 @@
 % Volume (3D) denoising demo using CCPi-RGL
 clear; close all
-Path1 = sprintf(['..' filesep 'src' filesep 'Matlab' filesep 'mex_compile' filesep 'installed'], 1i);
-Path2 = sprintf(['data' filesep], 1i);
-Path3 = sprintf(['..' filesep 'src' filesep 'Matlab' filesep 'supp'], 1i);
+fsep = '/';
+
+
+Path1 = sprintf(['..' fsep '..' fsep 'src' fsep 'Matlab' fsep 'mex_compile' fsep 'installed'], 1i);
+Path2 = sprintf(['..' fsep 'data' fsep], 1i);
+Path3 = sprintf(['..' fsep '..' fsep 'src' fsep 'Matlab' fsep 'supp'], 1i);
 addpath(Path1);
 addpath(Path2);
 addpath(Path3);
@@ -18,7 +21,6 @@
 end
 vol3D(vol3D < 0) = 0;
 figure; imshow(vol3D(:,:,7), [0 1]); title('Noisy image');
-
 %%
 fprintf('Denoise a volume using the ROF-TV model (CPU) \n');
 lambda_reg = 0.03; % regularsation parameter for all methods

demos/demoMatlab_denoise.m demos/Matlab_demos/demoMatlab_denoise.mdemos/demoMatlab_denoise.m renamed to demos/Matlab_demos/demoMatlab_denoise.m

@@ -2,9 +2,9 @@
 clear; close all
 fsep = '/';
 
-Path1 = sprintf(['..' fsep 'src' fsep 'Matlab' fsep 'mex_compile' fsep 'installed'], 1i);
-Path2 = sprintf(['data' fsep], 1i);
-Path3 = sprintf(['..' fsep 'src' fsep 'Matlab' fsep 'supp'], 1i);
+Path1 = sprintf(['..' fsep '..' fsep 'src' fsep 'Matlab' fsep 'mex_compile' fsep 'installed'], 1i);
+Path2 = sprintf(['..' fsep 'data' fsep], 1i);
+Path3 = sprintf(['..' fsep '..' fsep 'src' fsep 'Matlab' fsep 'supp'], 1i);
 addpath(Path1);
 addpath(Path2);
 addpath(Path3);
@@ -15,8 +15,8 @@
 %%
 fprintf('Denoise using the ROF-TV model (CPU) \n');
 lambda_reg = 0.03; % regularsation parameter for all methods
-iter_rof = 2000; % number of ROF iterations
-tau_rof = 0.01; % time-marching constant 
+iter_rof = 1500; % number of ROF iterations
+tau_rof = 0.003; % time-marching constant 
 epsil_tol =  0.0; % tolerance / 1.0e-06
 tic; [u_rof,infovec] = ROF_TV(single(u0), lambda_reg, iter_rof, tau_rof, epsil_tol); toc; 
 energyfunc_val_rof = TV_energy(single(u_rof),single(u0),lambda_reg, 1);  % get energy function value

demos/demoMatlab_inpaint.m demos/Matlab_demos/demoMatlab_inpaint.mdemos/demoMatlab_inpaint.m renamed to demos/Matlab_demos/demoMatlab_inpaint.m

@@ -1,9 +1,14 @@
 % Image (2D) inpainting demo using CCPi-RGL
 clear; close all
-Path1 = sprintf(['..' filesep 'src' filesep 'Matlab' filesep 'mex_compile' filesep 'installed'], 1i);
-Path2 = sprintf(['data' filesep], 1i);
+
+fsep = '/';
+
+Path1 = sprintf(['..' fsep '..' fsep 'src' fsep 'Matlab' fsep 'mex_compile' fsep 'installed'], 1i);
+Path2 = sprintf(['..' fsep 'data' fsep], 1i);
+Path3 = sprintf(['..' fsep '..' fsep 'src' fsep 'Matlab' fsep 'supp'], 1i);
 addpath(Path1);
 addpath(Path2);
+addpath(Path3);
 
 load('SinoInpaint.mat');
 Sinogram = Sinogram./max(Sinogram(:));

src/Core/regularisers_CPU/MASK_merge_core.c

@@ -77,5 +77,5 @@
 delete Diffusion_Inpaint_core* NonlocalMarching_Inpaint_core*
 fprintf('%s \n', '<<<<<<< Regularisers successfully compiled! >>>>>>>');
 
-pathA2 = sprintf(['..' fsep '..' fsep '..' fsep '..' fsep 'demos'], 1i);
+pathA2 = sprintf(['..' fsep '..' fsep '..' fsep '..' fsep 'demos' fsep 'Matlab_demos'], 1i);
 cd(pathA2);