# HG changeset patch
# User bmailhe
# Date 1332339211 0
# Node ID 36b02a8d0add2491abd12ac79c9e6b66b8591efb
# Parent  233e75809e4afd6dc019a6c9924d3763ff85ecc8# Parent  2882992f9e6e841ad958e0130ead275ee609291c
merge

diff -r 233e75809e4a -r 36b02a8d0add SMALLboxInit.m
--- a/SMALLboxInit.m	Wed Mar 21 14:12:25 2012 +0000
+++ b/SMALLboxInit.m	Wed Mar 21 14:13:31 2012 +0000
@@ -1,4 +1,27 @@
+function SMALLboxInit(varargin)
+%%  SMALLboxInit
+%
+%   SMALLbox Initialization
+%
+%   Important: If running SMALLBox for the first time, 
+%   please run SMALLboxSetup instead
+
+%
+%   Centre for Digital Music, Queen Mary, University of London.
+%   This file copyright 2009 Ivan Damnjanovic, Matthew Davies.
+%
+%   This program is free software; you can redistribute it and/or
+%   modify it under the terms of the GNU General Public License as
+%   published by the Free Software Foundation; either version 2 of the
+%   License, or (at your option) any later version.  See the file
+%   COPYING included with this distribution for more information.
+%
+%%
+
 global SMALL_path;
 SMALL_path = fileparts(mfilename('fullpath'));
 
 addpath(genpath(SMALL_path));
+
+end
+
diff -r 233e75809e4a -r 36b02a8d0add SMALLboxSetup.m
--- a/SMALLboxSetup.m	Wed Mar 21 14:12:25 2012 +0000
+++ b/SMALLboxSetup.m	Wed Mar 21 14:13:31 2012 +0000
@@ -66,6 +66,7 @@
 
 end
 
+global SMALL_path;
 SMALL_path=fileparts(mfilename('fullpath'));
 SMALL_p=genpath(SMALL_path);
 addpath(SMALL_p);
diff -r 233e75809e4a -r 36b02a8d0add util/SMALL_learn.m
--- a/util/SMALL_learn.m	Wed Mar 21 14:12:25 2012 +0000
+++ b/util/SMALL_learn.m	Wed Mar 21 14:13:31 2012 +0000
@@ -21,6 +21,10 @@
 
 global SMALL_path
 
+if (isempty(SMALL_path))
+    error('SMALL_learn:varChk', '\nSMALL_path variable is not set... Please run SMALLboxInit and try again.\n\nExiting now...\n');
+end
+
 if (DL.profile)
     fprintf('\nStarting Dictionary Learning %s... \n', DL.name);
 end
diff -r 233e75809e4a -r 36b02a8d0add util/SMALL_solve.m
--- a/util/SMALL_solve.m	Wed Mar 21 14:12:25 2012 +0000
+++ b/util/SMALL_solve.m	Wed Mar 21 14:13:31 2012 +0000
@@ -20,6 +20,10 @@
 
 global SMALL_path
 
+if (isempty(SMALL_path))
+    error('SMALL_solve:varChk', '\nSMALL_path variable is not set... Please run SMALLboxInit and try again.\n\nExiting now...\n');
+end
+
 if isa(Problem.A,'float')
     A = Problem.A;
     SparseLab_A=Problem.A;