# HG changeset patch # User luisf # Date 1335362738 -3600 # Node ID 423de9f24d98de2041f10adba30c36629fcf0c89 # Parent 04fb7249011e2ee3e08b292c65158a1ff2fa449c removed unnecessary files diff -r 04fb7249011e -r 423de9f24d98 To Do list.m --- a/To Do list.m Wed Apr 25 13:06:47 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ -CardiacMRI: -- Last thing I was dealing with was temporal fft operator that I have put in opFFTxd.m in util directory. -- Problem setup is now kind of realistic: - - user choose upload cardiac images from dataset - - he can shose the slice number (1-10 - default is 5) - - sigma level (0.05 by default) - - undersampling factor (fold default is 6) - - n image size (256 by default) - - read 3d matrix of n*n cardiac images in szt time points - - adds noise sigma*var(signal) - - do 2d circular fft per image and take random lines as specified by mask - - mask is made to sample n*szt/fold lines in phase encode and time dimensions - - play movies of original, undersampled cardiac images and mask - -SMALLboxSetup.m - Installation script: - -- Add make call for DL/RLS_DLA/private and Problems/private (still need to - shall these be private directories as in KSVD. Files inside are common - common routines that are used all around, so it makes sense to put them - in util directory) - SOLVED: A copy of "ksvd/private" is put into "util/ksvd utils" and istallation - script will run make command in the directory to compile mex files -- \ No newline at end of file diff -r 04fb7249011e -r 423de9f24d98 bugs.m --- a/bugs.m Wed Apr 25 13:06:47 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,166 +0,0 @@ -% MDP: File "COPYING" is not included in the distribution? - -% I encountered an error while running SMALL_solver_test_Audio : - -%??? Error using ==> -%problems\private\completeOps>@(x)reshape(data.B(x,1),data.signalSize) -%Too many input arguments. -%Error in ==> SMALL_playAudio at 17 -%SMALL.solver.reconstructed = SMALL.Problem.reconstruct(SMALL.solver.solution); -%Error in ==> SMALL_solver_test_Audio at 96 -%SMALL_playAudio(SMALL); - - -% version of Matlab used: 7.9.0.529 - 64 bits - - - -Bugs by Raja Giryes: -Using the tollbox on windows with Matlab R2010b: -bug1: -running SMALL_solver_test_Audio.m -I get: -Starting solver SMALL_cgp... -Solver SMALL_cgp finished task in 251.208410 seconds (cpu time). -Solver SMALL_cgp finished task in 159.905633 seconds (tic-toc time). - -Starting solver SolveBP... -??? Error using ==> eval -Undefined function or method 'SolveBP' for input arguments of type -'function_handle'. - -Error in ==> SMALL_solve at 46 - y = eval([solver.name,'(SparseLab_A, b, n,',solver.param,');']); - -Error in ==> SMALL_solver_test_Audio at 93 -SMALL.solver(i)=SMALL_solve(SMALL.Problem, SMALL.solver(i)); - -running SMALL_solver_test.m -I get: -Starting solver SMALL_cgp... -Solver SMALL_cgp finished task in 2.839218 seconds (cpu time). -Solver SMALL_cgp finished task in 2.821443 seconds (tic-toc time). - -Starting solver SolveOMP... -??? Error using ==> eval -Undefined function or method 'SolveOMP' for input arguments of type -'function_handle'. - -Error in ==> SMALL_solve at 46 - y = eval([solver.name,'(SparseLab_A, b, n,',solver.param,');']); - -Error in ==> SMALL_solver_test at 113 -SMALL.solver(i)=SMALL_solve(SMALL.Problem, SMALL.solver(i)); - - -Bug report from Mehrdad Yaghoobi: -1. The rice mdwt crashed on my matlab session runing on linux 64!!! -2. problem with hg merge using EasyMercurial. - - - - -% MDP: Files "my_dummy_solver.m" etc should include the boiler plate function -% header etc. - - - - -%%%%%%%%%%%%%%%%% -% bug by Valentin -%%%%%%%%%%%%%%%%% -% In SMALLboxSetup.m -% On Windows XP, 32 bits, Matlab R2010a -% -% > SMALLboxSetup -% ... -% Compiling the Rice Wavelet Toolbox MEX interfaces...Error mdwt.c: 39 undeclared identifier `intptr_t' -% Warning mdwt.c: 39 Statement has no effect -% Error mdwt.c: 39 syntax error; found `m' expecting `;' -% Error mdwt.c: 39 undeclared identifier `m' -% Error mdwt.c: 39 undeclared identifier `n' -% Error mdwt.c: 39 undeclared identifier `h_col' -% Error mdwt.c: 39 undeclared identifier `h_row' -% Error mdwt.c: 39 undeclared identifier `lh' -% Error mdwt.c: 39 undeclared identifier `L' -% Error mdwt.c: 39 undeclared identifier `i' -% Error mdwt.c: 39 undeclared identifier `po2' -% Error mdwt.c: 39 undeclared identifier `j' -% Warning mdwt.c: 39 Statement has no effect -% Error mdwt.c: 40 illegal statement termination -% Error mdwt.c: 40 skipping `double' -% Error mdwt.c: 40 undeclared identifier `mtest' -% Error mdwt.c: 40 undeclared identifier `ntest' -% Warning mdwt.c: 40 Statement has no effect -% Error mdwt.c: 62 operands of * have illegal types `int' and `pointer to double' -% Warning mdwt.c: 39 possible usage of po2 before definition -% Warning mdwt.c: 39 possible usage of intptr_t before definition -% Warning mdwt.c: 38 local `pointer to double Lf' is not referenced -% Error mdwt.c: 106 missing parameter type -% Error mdwt.c: 106 syntax error; found `m' expecting `)' -% Error mdwt.c: 106 skipping `m' `,' `intptr_t' `n' `,' -% Error mdwt.c: 106 syntax error; found `double' expecting `{' -% Error mdwt.c: 106 too many errors -% -% C:\PROGRA~1\MATLAB\R2010A\BIN\MEX.PL: Error: Compile of 'mdwt.c' failed. -% -% Warning: Could not compile Rice Wavelet Toolbox MEX interfaces.\n -% > In SMALLboxSetup at 365 -% -% ****************************************************************** -% -% Initialising SMALLbox Examples Setup -% ****************************************************************** -% -% SMALLbox Installation Complete! -% -% For more information on the installed toolboxes see -% -% Sparco: http://www.cs.ubc.ca/labs/scl/sparco/ -% -% SPGL1: http://www.cs.ubc.ca/labs/spgl1/?n=HomePage -% -% SparseLab: http://sparselab.stanford.edu/ (PLEASE REGISTER SPARSELAB!) -% -% Sparsify: http://www.see.ed.ac.uk/~tblumens/sparsify/sparsify.html -% -% GPSR: http://www.lx.it.pt/~mtf/GPSR/ -% -% OMPbox and KSVDBox: http://www.cs.technion.ac.il/~ronrubin/ -% -% -% Would you like to run a demo: ([y]/n)? -% -% 1 to run SMALL_solver_test -% 2 to run Dictionary Learning for Image Denoising demo -% q to quit: 1 -% -% Running SMALL_solver_test problem -% -% Example test of SMALL solvers against their counterparts on Sparco problems. -% -% ??? Undefined function or method 'mdwt' for input arguments of type -% 'double'. -% -% Error in ==> opWavelet>opWavelet_intrnl at 55 -% [y,l] = mdwt(reshape(x,[m,n]), h, levels); -% -% Error in ==> -% opWavelet>@(x,mode)opWavelet_intrnl(m,n,family,filter,levels,type,h,x,mode) -% at 37 -% op = @(x,mode) -% opWavelet_intrnl(m,n,family,filter,levels,type,h,x,mode); -% -% Error in ==> prob006 at 67 -% data.x0 = data.op.Daubechies(data.signal,2); -% -% Error in ==> generateProblem at 101 -% [data] = eval(sprintf('prob%03d(varargin{:});',index)); -% -% Error in ==> SMALL_solver_test at 61 -% SMALL.Problem = generateProblem(6, 'P', 6, 'm', 270,'n',1024, -% 'show'); -% -% Error in ==> SMALLboxSetup at 416 -% SMALL_solver_test; -% \ No newline at end of file diff -r 04fb7249011e -r 423de9f24d98 test.m --- a/test.m Wed Apr 25 13:06:47 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -test \ No newline at end of file