Mercurial > hg > smallbox
changeset 41:83de4ea524df
(none)
author | idamnjanovic |
---|---|
date | Mon, 14 Mar 2011 15:41:04 +0000 (2011-03-14) |
parents | 6416fc12f2b8 |
children | 623fcf3a69b1 |
files | examples/SMALL_solver_test.m |
diffstat | 1 files changed, 23 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/examples/SMALL_solver_test.m Mon Mar 14 15:35:24 2011 +0000 +++ b/examples/SMALL_solver_test.m Mon Mar 14 15:41:04 2011 +0000 @@ -57,7 +57,7 @@ %% % Generate SPARCO problem - +clear SMALL.Problem = generateProblem(6, 'P', 6, 'm', 270,'n',1024, 'show'); %% @@ -80,10 +80,10 @@ % % i=i+1; %% -% SMALL OMP with Cholesky update test +% SMALL Conjugate Gradient test SMALL.solver(i)=SMALL_init_solver; SMALL.solver(i).toolbox='SMALL'; -SMALL.solver(i).name='SMALL_chol'; +SMALL.solver(i).name='SMALL_cgp'; % In the following string all parameters except matrix, measurement vector % and size of solution need to be specified. If you are not sure which @@ -92,9 +92,11 @@ SMALL.solver(i).param='200, 1e-14'; -SMALL.solver(i)=SMALL_solve(SMALL.Problem, SMALL.solver(i)); +SMALL.solver(i)=SMALL_solve(SMALL.Problem,SMALL.solver(i)); + i=i+1; + %% % SolveOMP from SparseLab test @@ -114,6 +116,23 @@ i=i+1; %% +% SMALL OMP with Cholesky update test +SMALL.solver(i)=SMALL_init_solver; +SMALL.solver(i).toolbox='SMALL'; +SMALL.solver(i).name='SMALL_chol'; + +% In the following string all parameters except matrix, measurement vector +% and size of solution need to be specified. If you are not sure which +% parameters are needed for particular solver type "help <Solver name>" in +% MATLAB command line + +SMALL.solver(i).param='200, 1e-14'; + +SMALL.solver(i)=SMALL_solve(SMALL.Problem, SMALL.solver(i)); + +i=i+1; + +%% % greed_pcgp from Sparsify test SMALL.solver(i)=SMALL_init_solver;