Mercurial > hg > smallbox
changeset 208:36b02a8d0add luisf_dev
merge
| author | bmailhe |
|---|---|
| date | Wed, 21 Mar 2012 14:13:31 +0000 |
| parents | 233e75809e4a (current diff) 2882992f9e6e (diff) |
| children | dfa795944aae |
| files | |
| diffstat | 4 files changed, 32 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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 +
--- 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);
--- 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
--- 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;