Mercurial > hg > smallbox

diff util/SMALL_solve.m @ 232:15fd4c5be71a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author luisf <luis.figueira@eecs.qmul.ac.uk>
date Thu, 19 Apr 2012 15:55:14 +0100
parents 198d4d9cee74
children
line wrap: on
line diff
--- a/util/SMALL_solve.m	Wed Apr 11 16:28:46 2012 +0100
+++ b/util/SMALL_solve.m	Thu Apr 19 15:55:14 2012 +0100
@@ -48,8 +48,14 @@
 start=cputime;
 tStart=tic;
 
-% solvers configuration file
-run(fullfile(SMALL_path, 'config/SMALL_solve_config.m'));
+%% solvers configuration
+% test if there is a locally modified version of the config
+% otherwise reads the "default" config file
+if exist(fullfile(SMALL_path, 'config/SMALL_solve_config_local.m'), 'file') == 2
+    run(fullfile(SMALL_path, 'config/SMALL_solve_config_local.m'));
+else
+    run(fullfile(SMALL_path, 'config/SMALL_solve_config.m'));
+end
 
 %%
 %   Sparse representation time