# HG changeset patch
# User luisf <luis.figueira@eecs.qmul.ac.uk>
# Date 1328808405 0
# Node ID 3cc204120431f6b6aa910371a720e05e58dd5928
# Parent  a0e0982a17fec5607a59309b1832c973ec07c99b# Parent  9c418bea7f6a689c21b99131351abc7bd4411329
Merge from branch "bug_386"

diff -r a0e0982a17fe -r 3cc204120431 Problems/generateAMTProblem.m
--- a/Problems/generateAMTProblem.m	Tue Feb 07 17:18:13 2012 +0000
+++ b/Problems/generateAMTProblem.m	Thu Feb 09 17:26:45 2012 +0000
@@ -40,10 +40,10 @@
 %%
 %ask for file name
 TMPpath=pwd;
-[pathstr1, name, ext, versn] = fileparts(which('SMALLboxSetup.m'));
+[pathstr1, name, ext] = fileparts(which('SMALLboxSetup.m'));
 cd([pathstr1,FS,'data',FS,'audio']);
 [filename,pathname] = uigetfile({'*.mat; *.mid; *.wav'},'Select a file to transcribe');
-[pathstr, name, ext, versn] = fileparts(filename);
+[pathstr, name, ext] = fileparts(filename);
 data.name=name;
 
 data.notesOriginal=[];
diff -r a0e0982a17fe -r 3cc204120431 Problems/generateAMT_Learning_Problem.m
--- a/Problems/generateAMT_Learning_Problem.m	Tue Feb 07 17:18:13 2012 +0000
+++ b/Problems/generateAMT_Learning_Problem.m	Thu Feb 09 17:26:45 2012 +0000
@@ -40,10 +40,10 @@
 %%
 %ask for file name
 TMPpath=pwd;
-[pathstr1, name, ext, versn] = fileparts(which('SMALLboxSetup.m'));
+[pathstr1, name, ext] = fileparts(which('SMALLboxSetup.m'));
 cd([pathstr1,FS,'data',FS,'audio']);
 [filename,pathname] = uigetfile({'*.mat; *.mid; *.wav'},'Select a file to transcribe');
-[pathstr, name, ext, versn] = fileparts(filename);
+[pathstr, name, ext] = fileparts(filename);
 data.name=name;
 
 data.notesOriginal=[];
diff -r a0e0982a17fe -r 3cc204120431 Problems/generateAudioDeclippingProblem.m
--- a/Problems/generateAudioDeclippingProblem.m	Tue Feb 07 17:18:13 2012 +0000
+++ b/Problems/generateAudioDeclippingProblem.m	Thu Feb 09 17:26:45 2012 +0000
@@ -58,10 +58,10 @@
 
 if ~ exist( 'soundfile', 'var' ) || isempty(soundfile)
     %ask for file name 
-    [pathstr1, name, ext, versn] = fileparts(which('SMALLboxSetup.m'));
+    [pathstr1, name, ext] = fileparts(which('SMALLboxSetup.m'));
     cd([pathstr1,FS,'data',FS,'audio']);
     [filename,pathname] = uigetfile({'*.mat; *.mid; *.wav'},'Select a file to transcribe');
-    [pathstr, name, ext, versn] = fileparts(filename);
+    [pathstr, name, ext] = fileparts(filename);
     data.name=name;
 
     if strcmp(ext,'.mid')
@@ -92,7 +92,7 @@
     end
 else
     [x.signal, x.fs, x.nbits]=wavread(soundfile);
-    [pathstr, name, ext, versn] = fileparts(soundfile);
+    [pathstr, name, ext] = fileparts(soundfile);
     data.name=name;
 end
 
diff -r a0e0982a17fe -r 3cc204120431 Problems/generateAudioDenoiseProblem.m
--- a/Problems/generateAudioDenoiseProblem.m	Tue Feb 07 17:18:13 2012 +0000
+++ b/Problems/generateAudioDenoiseProblem.m	Thu Feb 09 17:26:45 2012 +0000
@@ -57,10 +57,10 @@
 TMPpath=pwd;
 if ~ exist( 'soundfile', 'var' ) || isempty(soundfile)
     %ask for file name 
-    [pathstr1, name, ext, versn] = fileparts(which('SMALLboxSetup.m'));
+    [pathstr1, name, ext] = fileparts(which('SMALLboxSetup.m'));
     cd([pathstr1,FS,'data',FS,'audio']);
     [filename,pathname] = uigetfile({'*.mat; *.mid; *.wav'},'Select a file to transcribe');
-    [pathstr, name, ext, versn] = fileparts(filename);
+    [pathstr, name, ext] = fileparts(filename);
     data.name=name;
 
     if strcmp(ext,'.mid')
@@ -91,7 +91,7 @@
     end
 else
     [x.signal, x.fs, x.nbits]=wavread(soundfile);
-    [pathstr, name, ext, versn] = fileparts(soundfile);
+    [pathstr, name, ext] = fileparts(soundfile);
     data.name=name;
 end
 
diff -r a0e0982a17fe -r 3cc204120431 Problems/generateImageDenoiseProblem.m
--- a/Problems/generateImageDenoiseProblem.m	Tue Feb 07 17:18:13 2012 +0000
+++ b/Problems/generateImageDenoiseProblem.m	Thu Feb 09 17:26:45 2012 +0000
@@ -63,10 +63,10 @@
 FS=filesep;
 TMPpath=pwd;
 if ~ exist( 'im', 'var' ) || isempty(im)
-    [pathstr1, name, ext, versn] = fileparts(which('SMALLboxSetup.m'));
+    [pathstr1, name, ext] = fileparts(which('SMALLboxSetup.m'));
     cd([pathstr1,FS,'data',FS,'images']);
     [filename,pathname] = uigetfile({'*.png;'},'Select an image');
-    [pathstr, name, ext, versn] = fileparts(filename);
+    [pathstr, name, ext] = fileparts(filename);
     data.name=name;
     im = imread(filename);
     %im = double(im);
diff -r a0e0982a17fe -r 3cc204120431 Problems/generatePierreProblem.m
--- a/Problems/generatePierreProblem.m	Tue Feb 07 17:18:13 2012 +0000
+++ b/Problems/generatePierreProblem.m	Thu Feb 09 17:26:45 2012 +0000
@@ -45,10 +45,10 @@
 TMPpath=pwd;
 FS=filesep;
 if ~ exist( 'src', 'var' ) || isempty(src)
-[pathstr1, name, ext, versn] = fileparts(which('SMALLboxSetup.m'));
+[pathstr1, name, ext] = fileparts(which('SMALLboxSetup.m'));
 cd([pathstr1,FS,'data',FS,'images']);
 [filename,pathname] = uigetfile({'*.png;'},'Select a source image');
-[pathstr, name, ext, versn] = fileparts(filename);
+[pathstr, name, ext] = fileparts(filename);
 data.srcname=name;
 src = imread(filename);
 src = double(src);
@@ -58,7 +58,7 @@
 
 if ~ exist( 'trg', 'var' ) || isempty(trg)
 [filename,pathname] = uigetfile({'*.png;'},'Select a target image');
-[pathstr, name, ext, versn] = fileparts(filename);
+[pathstr, name, ext] = fileparts(filename);
 data.trgname=name;
 trg = imread(filename);
 trg = double(trg);
diff -r a0e0982a17fe -r 3cc204120431 Problems/generatePierre_Problem.m
--- a/Problems/generatePierre_Problem.m	Tue Feb 07 17:18:13 2012 +0000
+++ b/Problems/generatePierre_Problem.m	Thu Feb 09 17:26:45 2012 +0000
@@ -45,10 +45,10 @@
 TMPpath=pwd;
 FS=filesep;
 if ~ exist( 'src', 'var' ) || isempty(src)
-[pathstr1, name, ext, versn] = fileparts(which('SMALLboxSetup.m'));
+[pathstr1, name, ext] = fileparts(which('SMALLboxSetup.m'));
 cd([pathstr1,FS,'data',FS,'images']);
 [filename,pathname] = uigetfile({'*.png;'},'Select a source image');
-[pathstr, name, ext, versn] = fileparts(filename);
+[pathstr, name, ext] = fileparts(filename);
 data.srcname=name;
 src = imread(filename);
 src = double(src);
@@ -58,7 +58,7 @@
 
 if ~ exist( 'trg', 'var' ) || isempty(trg)
 [filename,pathname] = uigetfile({'*.png;'},'Select a target image');
-[pathstr, name, ext, versn] = fileparts(filename);
+[pathstr, name, ext] = fileparts(filename);
 data.trgname=name;
 trg = imread(filename);
 trg = double(trg);
diff -r a0e0982a17fe -r 3cc204120431 examples/ALPS solvers tests/SMALL_ImgDenoise_DL_test_KSVDvsTwoStepALPSandMahile.m
--- a/examples/ALPS solvers tests/SMALL_ImgDenoise_DL_test_KSVDvsTwoStepALPSandMahile.m	Tue Feb 07 17:18:13 2012 +0000
+++ b/examples/ALPS solvers tests/SMALL_ImgDenoise_DL_test_KSVDvsTwoStepALPSandMahile.m	Thu Feb 09 17:26:45 2012 +0000
@@ -36,7 +36,7 @@
 clear;
 TMPpath=pwd;
 FS=filesep;
-[pathstr1, name, ext, versn] = fileparts(which('SMALLboxSetup.m'));
+[pathstr1, name, ext] = fileparts(which('SMALLboxSetup.m'));
 cd([pathstr1,FS,'data',FS,'images']);
 load('test_image.mat');
 cd(TMPpath);
diff -r a0e0982a17fe -r 3cc204120431 examples/Automatic Music Transcription/SMALL_AMT_DL_test.m
--- a/examples/Automatic Music Transcription/SMALL_AMT_DL_test.m	Tue Feb 07 17:18:13 2012 +0000
+++ b/examples/Automatic Music Transcription/SMALL_AMT_DL_test.m	Thu Feb 09 17:26:45 2012 +0000
@@ -210,7 +210,7 @@
 
 FS=filesep;
 
-[pathstr1, name, ext, versn] = fileparts(which('SMALLboxSetup.m'));
+[pathstr1, name, ext] = fileparts(which('SMALLboxSetup.m'));
 cd([pathstr1,FS,'results']);
 
 [filename,pathname] = uiputfile({' *.mid;' },'Save KSVD result midi');
diff -r a0e0982a17fe -r 3cc204120431 examples/Automatic Music Transcription/SMALL_AMT_KSVD_Err_test.m
--- a/examples/Automatic Music Transcription/SMALL_AMT_KSVD_Err_test.m	Tue Feb 07 17:18:13 2012 +0000
+++ b/examples/Automatic Music Transcription/SMALL_AMT_KSVD_Err_test.m	Thu Feb 09 17:26:45 2012 +0000
@@ -130,7 +130,7 @@
 title('False Positives vs Edata');
 
 FS=filesep;
-[pathstr1, name, ext, versn] = fileparts(which('SMALLboxSetup.m'));
+[pathstr1, name, ext] = fileparts(which('SMALLboxSetup.m'));
 cd([pathstr1,FS,'results']);
 [filename,pathname] = uiputfile({' *.mid;' },'Save midi');
 if filename~=0 writemidi(BLmidi, [pathname,FS,filename]);end
diff -r a0e0982a17fe -r 3cc204120431 examples/Automatic Music Transcription/SMALL_AMT_KSVD_Sparsity_test.m
--- a/examples/Automatic Music Transcription/SMALL_AMT_KSVD_Sparsity_test.m	Tue Feb 07 17:18:13 2012 +0000
+++ b/examples/Automatic Music Transcription/SMALL_AMT_KSVD_Sparsity_test.m	Thu Feb 09 17:26:45 2012 +0000
@@ -141,7 +141,7 @@
 title('False Positives vs Tdata');
 
 FS=filesep;
-[pathstr1, name, ext, versn] = fileparts(which('SMALLboxSetup.m'));
+[pathstr1, name, ext] = fileparts(which('SMALLboxSetup.m'));
 cd([pathstr1,FS,'results']);
 [filename,pathname] = uiputfile({' *.mid;' },'Save midi');
 if filename~=0 writemidi(BLmidi, [pathname,FS,filename]);end
diff -r a0e0982a17fe -r 3cc204120431 examples/Automatic Music Transcription/SMALL_AMT_SPAMS_test.m
--- a/examples/Automatic Music Transcription/SMALL_AMT_SPAMS_test.m	Tue Feb 07 17:18:13 2012 +0000
+++ b/examples/Automatic Music Transcription/SMALL_AMT_SPAMS_test.m	Thu Feb 09 17:26:45 2012 +0000
@@ -142,7 +142,7 @@
 title('False Positives vs lambda');
 
 FS=filesep;
-[pathstr1, name, ext, versn] = fileparts(which('SMALLboxSetup.m'));
+[pathstr1, name, ext] = fileparts(which('SMALLboxSetup.m'));
 cd([pathstr1,FS,'results']);
 [filename,pathname] = uiputfile({' *.mid;' },'Save midi');
 if filename~=0 writemidi(BLmidi, [pathname,FS,filename]);end
diff -r a0e0982a17fe -r 3cc204120431 examples/Image Denoising/SMALL_ImgDenoise_DL_test_KSVDvsRLSDLA.m
--- a/examples/Image Denoising/SMALL_ImgDenoise_DL_test_KSVDvsRLSDLA.m	Tue Feb 07 17:18:13 2012 +0000
+++ b/examples/Image Denoising/SMALL_ImgDenoise_DL_test_KSVDvsRLSDLA.m	Thu Feb 09 17:26:45 2012 +0000
@@ -36,7 +36,7 @@
 clear;
 TMPpath=pwd;
 FS=filesep;
-[pathstr1, name, ext, versn] = fileparts(which('SMALLboxSetup.m'));
+[pathstr1, name, ext] = fileparts(which('SMALLboxSetup.m'));
 cd([pathstr1,FS,'data',FS,'images']);
 load('test_image.mat');
 cd(TMPpath);
diff -r a0e0982a17fe -r 3cc204120431 examples/Image Denoising/SMALL_ImgDenoise_DL_test_KSVDvsRLSDLAvsTwoStepMOD.m
--- a/examples/Image Denoising/SMALL_ImgDenoise_DL_test_KSVDvsRLSDLAvsTwoStepMOD.m	Tue Feb 07 17:18:13 2012 +0000
+++ b/examples/Image Denoising/SMALL_ImgDenoise_DL_test_KSVDvsRLSDLAvsTwoStepMOD.m	Thu Feb 09 17:26:45 2012 +0000
@@ -33,7 +33,7 @@
 clear;
 TMPpath=pwd;
 FS=filesep;
-[pathstr1, name, ext, versn] = fileparts(which('SMALLboxSetup.m'));
+[pathstr1, name, ext] = fileparts(which('SMALLboxSetup.m'));
 cd([pathstr1,FS,'data',FS,'images']);
 load('test_image.mat');
 cd(TMPpath);
diff -r a0e0982a17fe -r 3cc204120431 examples/Image Denoising/SMALL_ImgDenoise_DL_test_KSVDvsSPAMS.m
--- a/examples/Image Denoising/SMALL_ImgDenoise_DL_test_KSVDvsSPAMS.m	Tue Feb 07 17:18:13 2012 +0000
+++ b/examples/Image Denoising/SMALL_ImgDenoise_DL_test_KSVDvsSPAMS.m	Thu Feb 09 17:26:45 2012 +0000
@@ -41,10 +41,10 @@
 
 % TMPpath=pwd;
 % FS=filesep;
-% [pathstr1, name, ext, versn] = fileparts(which('SMALLboxSetup.m'));
+% [pathstr1, name, ext] = fileparts(which('SMALLboxSetup.m'));
 % cd([pathstr1,FS,'data',FS,'images']);
 % [filename,pathname] = uigetfile({'*.png;'},'Select a file containin pre-calculated notes');
-% [pathstr, name, ext, versn] = fileparts(filename);
+% [pathstr, name, ext] = fileparts(filename);
 % test_image = imread(filename);
 % test_image = double(test_image);
 % cd(TMPpath);
diff -r a0e0982a17fe -r 3cc204120431 examples/Image Denoising/SMALL_ImgDenoise_DL_test_KSVDvsTwoStepKSVD.m
--- a/examples/Image Denoising/SMALL_ImgDenoise_DL_test_KSVDvsTwoStepKSVD.m	Tue Feb 07 17:18:13 2012 +0000
+++ b/examples/Image Denoising/SMALL_ImgDenoise_DL_test_KSVDvsTwoStepKSVD.m	Thu Feb 09 17:26:45 2012 +0000
@@ -36,7 +36,7 @@
 clear;
 TMPpath=pwd;
 FS=filesep;
-[pathstr1, name, ext, versn] = fileparts(which('SMALLboxSetup.m'));
+[pathstr1, name, ext] = fileparts(which('SMALLboxSetup.m'));
 cd([pathstr1,FS,'data',FS,'images']);
 load('test_image.mat');
 cd(TMPpath);
diff -r a0e0982a17fe -r 3cc204120431 examples/Image Denoising/SMALL_ImgDenoise_DL_test_SPAMS_lambda.m
--- a/examples/Image Denoising/SMALL_ImgDenoise_DL_test_SPAMS_lambda.m	Tue Feb 07 17:18:13 2012 +0000
+++ b/examples/Image Denoising/SMALL_ImgDenoise_DL_test_SPAMS_lambda.m	Thu Feb 09 17:26:45 2012 +0000
@@ -27,10 +27,10 @@
 %% Load an image
 TMPpath=pwd;
 FS=filesep;
-[pathstr1, name, ext, versn] = fileparts(which('SMALLboxSetup.m'));
+[pathstr1, name, ext] = fileparts(which('SMALLboxSetup.m'));
 cd([pathstr1,FS,'data',FS,'images']);
 [filename,pathname] = uigetfile({'*.png;'},'Select a file containin pre-calculated notes');
-[pathstr, name, ext, versn] = fileparts(filename);
+[pathstr, name, ext] = fileparts(filename);
 test_image = imread(filename);
 test_image = double(test_image);
 cd(TMPpath);
diff -r a0e0982a17fe -r 3cc204120431 examples/Image Denoising/SMALL_ImgDenoise_DL_test_Training_size.m
--- a/examples/Image Denoising/SMALL_ImgDenoise_DL_test_Training_size.m	Tue Feb 07 17:18:13 2012 +0000
+++ b/examples/Image Denoising/SMALL_ImgDenoise_DL_test_Training_size.m	Thu Feb 09 17:26:45 2012 +0000
@@ -38,10 +38,10 @@
 %% Load an image
 TMPpath=pwd;
 FS=filesep;
-[pathstr1, name, ext, versn] = fileparts(which('SMALLboxSetup.m'));
+[pathstr1, name, ext] = fileparts(which('SMALLboxSetup.m'));
 cd([pathstr1,FS,'data',FS,'images']);
 [filename,pathname] = uigetfile({'*.png;'},'Select a file containin pre-calculated notes');
-[pathstr, name, ext, versn] = fileparts(filename);
+[pathstr, name, ext] = fileparts(filename);
 test_image = imread(filename);
 test_image = double(test_image);
 cd(TMPpath);
diff -r a0e0982a17fe -r 3cc204120431 examples/Image Denoising/SMALL_ImgDenoise_DL_test_TwoStep_KSVD_MOD_OLS_Mailhe.m
--- a/examples/Image Denoising/SMALL_ImgDenoise_DL_test_TwoStep_KSVD_MOD_OLS_Mailhe.m	Tue Feb 07 17:18:13 2012 +0000
+++ b/examples/Image Denoising/SMALL_ImgDenoise_DL_test_TwoStep_KSVD_MOD_OLS_Mailhe.m	Thu Feb 09 17:26:45 2012 +0000
@@ -36,7 +36,7 @@
 clear;
 TMPpath=pwd;
 FS=filesep;
-[pathstr1, name, ext, versn] = fileparts(which('SMALLboxSetup.m'));
+[pathstr1, name, ext] = fileparts(which('SMALLboxSetup.m'));
 cd([pathstr1,FS,'data',FS,'images']);
 load('test_image.mat');
 cd(TMPpath);
diff -r a0e0982a17fe -r 3cc204120431 examples/MajorizationMinimization tests/SMALL_AMT_DL_test_KSVD_MM.m
--- a/examples/MajorizationMinimization tests/SMALL_AMT_DL_test_KSVD_MM.m	Tue Feb 07 17:18:13 2012 +0000
+++ b/examples/MajorizationMinimization tests/SMALL_AMT_DL_test_KSVD_MM.m	Thu Feb 09 17:26:45 2012 +0000
@@ -254,7 +254,7 @@
 
 FS=filesep;
 
-[pathstr1, name, ext, versn] = fileparts(which('SMALLboxSetup.m'));
+[pathstr1, name, ext] = fileparts(which('SMALLboxSetup.m'));
 cd([pathstr1,FS,'results']);
 
 [filename,pathname] = uiputfile({' *.mid;' },'Save KSVD result midi');
diff -r a0e0982a17fe -r 3cc204120431 examples/MajorizationMinimization tests/SMALL_ImgDenoise_DL_test_KSVDvsMajorizationMinimization.m
--- a/examples/MajorizationMinimization tests/SMALL_ImgDenoise_DL_test_KSVDvsMajorizationMinimization.m	Tue Feb 07 17:18:13 2012 +0000
+++ b/examples/MajorizationMinimization tests/SMALL_ImgDenoise_DL_test_KSVDvsMajorizationMinimization.m	Thu Feb 09 17:26:45 2012 +0000
@@ -37,7 +37,7 @@
 clear;
 TMPpath=pwd;
 FS=filesep;
-[pathstr1, name, ext, versn] = fileparts(which('SMALLboxSetup.m'));
+[pathstr1, name, ext] = fileparts(which('SMALLboxSetup.m'));
 cd([pathstr1,FS,'data',FS,'images']);
 load('test_image.mat');
 cd(TMPpath);