# HG changeset patch
# User bmailhe
# Date 1346233154 -3600
# Node ID 1fbd28dfb99efbcf84159e7b9c634309c55ac1bd
# Parent  b1db9e090542cf20959767f15e35d97bc7d64cb9
setup file

diff -r b1db9e090542 -r 1fbd28dfb99e SMALLboxSetup.m
--- a/SMALLboxSetup.m	Wed Apr 18 18:12:15 2012 +0100
+++ b/SMALLboxSetup.m	Wed Aug 29 10:39:14 2012 +0100
@@ -421,6 +421,34 @@
     end
     cd(SMALL_path);
 end
+
+%% UnlocBox setup
+if ~exist('init_unlocbox.m','file')
+    fprintf('\n ******************************************************************');
+    fprintf('\n\n Initialising UNLocBox Setup');
+    
+    try
+        UNL_path = [pwd,FS,'toolboxes',FS,'UNLocBox'];
+        if exist([UNL_path, FS, 'toolbox_lastest.zip'],'file'),
+            UNL_zip=[UNL_path, FS, 'toolbox_latest.zip'];
+        else
+            UNL_zip='http://wiki.epfl.ch/unlocbox/documents/toolbox_latest.zip';
+            fprintf('\n\n Downloading toolbox, please be patient\n\n');
+        end
+        unzip(UNL_zip,UNL_path);
+        UNL_p=genpath(UNL_path);
+        addpath(UNL_p);
+        fprintf('\n UNLocBox Installation Successful!\n');
+    catch
+        fprintf('\n UNLocBox Installation Failed\n');
+        cd(SMALL_path);
+    end
+    cd(SMALL_path);
+else
+    fprintf('\n ******************************************************************');
+    fprintf('\n\n UNLocBox is already installed');
+end
+
 %%
 fprintf('\n ******************************************************************');
 fprintf('\n\n Initialising SMALLbox Examples Setup');
diff -r b1db9e090542 -r 1fbd28dfb99e examples/AudioInpainting/Audio_Declipping_Example.m
--- a/examples/AudioInpainting/Audio_Declipping_Example.m	Wed Apr 18 18:12:15 2012 +0100
+++ b/examples/AudioInpainting/Audio_Declipping_Example.m	Wed Aug 29 10:39:14 2012 +0100
@@ -49,7 +49,7 @@
 
 %   Defining the Problem structure
 
-SMALL.Problem = generateAudioDeclippingProblem('male01_8kHz', 0.6, 256, 0.5, @wRect, @wSine, @wRect, @Gabor_Dictionary, 2);
+SMALL.Problem = generateAudioDeclippingProblem('male01_8kHz', 0.1, 256, 0.5, @wRect, @wSine, @wRect, @Gabor_Dictionary, 2);
 
 for idxSolver = 1:4
     
diff -r b1db9e090542 -r 1fbd28dfb99e examples/AudioInpainting/CVX_add_const_Audio_declipping.m
--- a/examples/AudioInpainting/CVX_add_const_Audio_declipping.m	Wed Apr 18 18:12:15 2012 +0100
+++ b/examples/AudioInpainting/CVX_add_const_Audio_declipping.m	Wed Aug 29 10:39:14 2012 +0100
@@ -56,7 +56,7 @@
             cvx_begin
             cvx_quiet(true)
             variable solution(j)
-            minimize(norm(Dict(:,idxCoeff)*solution-xObs))
+            minimize(norm(Dict(:,idxCoeff)*solution-signal))
             cvx_end
         end
     else
@@ -75,7 +75,7 @@
             cvx_begin
             cvx_quiet(true)
             variable solution(j)
-            minimize(norm(Dict(:,idxCoeff)*solution-xObs))
+            minimize(norm(Dict(:,idxCoeff)*solution-signal))
             cvx_end
         end
     end