Mercurial > hg > smallbox

changeset 5:f44689e95ea4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(none)
author idamnjanovic
date Mon, 22 Mar 2010 10:43:01 +0000
parents 2d7d8736ce6c
children f72603404233
files examples/SMALL_solver_test_Audio.m
diffstat 1 files changed, 12 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/examples/SMALL_solver_test_Audio.m	Mon Mar 22 10:42:47 2010 +0000
+++ b/examples/SMALL_solver_test_Audio.m	Mon Mar 22 10:43:01 2010 +0000
@@ -51,39 +51,40 @@
 SMALL.Problem = generateProblem(402,'show');
 %%
 
+i=1;
 %%
 % SMALL Conjugate Gradient test 
 
-SMALL.solver.toolbox='SMALL';    
-SMALL.solver.name='SMALL_cgp';
+SMALL.solver(i)=SMALL_init_solver;
+SMALL.solver(i).toolbox='SMALL';    
+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
 % parameters are needed for particular solver type "help <Solver name>" in
 % MATLAB command line
 
-SMALL.solver.param='1500, 1e-14';
+SMALL.solver(i).param='1500, 1e-14';
 
-SMALL=SMALL_solve(SMALL);
+SMALL.solver(i)=SMALL_solve(SMALL.Problem, SMALL.solver(i));
 
 
-SMALL_plot(SMALL);
-SMALL_playAudio(SMALL);
-
+i=i+1;
 %%
 % SolveOMP from SparseLab test 
 
-SMALL.solver.toolbox='SparseLab';  
-SMALL.solver.name='SolveBP';
+SMALL.solver(i)=SMALL_init_solver;
+SMALL.solver(i).toolbox='SparseLab';  
+SMALL.solver(i).name='SolveBP';
 
 % 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.param='10';
+SMALL.solver(i).param='10';
 
-SMALL=SMALL_solve(SMALL);
+SMALL.solver(i)=SMALL_solve(SMALL.Problem, SMALL.solver(i));
 
 SMALL_plot(SMALL);
 SMALL_playAudio(SMALL);