Mercurial > hg > smallbox
comparison util/SMALL_solve.m @ 232:15fd4c5be71a
merge
author | luisf <luis.figueira@eecs.qmul.ac.uk> |
---|---|
date | Thu, 19 Apr 2012 15:55:14 +0100 |
parents | 198d4d9cee74 |
children |
comparison
equal
deleted
inserted
replaced
223:efe179d9757c | 232:15fd4c5be71a |
---|---|
46 end | 46 end |
47 | 47 |
48 start=cputime; | 48 start=cputime; |
49 tStart=tic; | 49 tStart=tic; |
50 | 50 |
51 % solvers configuration file | 51 %% solvers configuration |
52 run(fullfile(SMALL_path, 'config/SMALL_solve_config.m')); | 52 % test if there is a locally modified version of the config |
53 % otherwise reads the "default" config file | |
54 if exist(fullfile(SMALL_path, 'config/SMALL_solve_config_local.m'), 'file') == 2 | |
55 run(fullfile(SMALL_path, 'config/SMALL_solve_config_local.m')); | |
56 else | |
57 run(fullfile(SMALL_path, 'config/SMALL_solve_config.m')); | |
58 end | |
53 | 59 |
54 %% | 60 %% |
55 % Sparse representation time | 61 % Sparse representation time |
56 tElapsed=toc(tStart); | 62 tElapsed=toc(tStart); |
57 solver.time = cputime - start; | 63 solver.time = cputime - start; |