Minor changes, turn off warning, change CG method line

ylp1332 · Apr 19, 2017 · 8379030 · 8379030
1 parent 48a5a35
commit 8379030
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/examples/smallscale/test_all.m b/examples/smallscale/test_all.m
@@ -9,6 +9,7 @@
 is working.
 
 %}
+warning('off','MATLAB:nargchk:deprecated') % narginchk not available prior to R2011b
 
 w   = what;
 fileList    = w.m;

diff --git a/examples/smallscale/test_blockNorm.m b/examples/smallscale/test_blockNorm.m
@@ -177,7 +177,7 @@ minimize sum(norms(xcvx,p,dim)) + mu/2*pow_pos( norm(xcvx-x0,'fro'), 2)
 fprintf('Error vs. IPM solution is %.2e\n',er(x) );
 
 % Check that we are within allowable bounds
-if er(x) < 1e-6
+if er(x) < 5e-6
     disp('Everything is working');
 else
     error('Failed the test');

diff --git a/solver_sLP.m b/solver_sLP.m
@@ -72,7 +72,7 @@
 
 obj    = smooth_linear(c);
 
-if exist('tfocs_CG','file')
+if exist('tfocs_CG','file') && exist('wp_ls','file') % wp_ls.m is the linesearch code for the nonliner CG
     if ~isfield(opts,'alg') || isempty(opts.alg)
         opts.alg = 'CG';
         disp('Using non-linear conjugate gradients');

diff --git a/solver_sLP_box.m b/solver_sLP_box.m
@@ -62,7 +62,7 @@
 
 obj    = smooth_linear(c);
 
-if exist('tfocs_CG','file')
+if exist('tfocs_CG','file')&& exist('wp_ls','file') % wp_ls.m is the linesearch code for the nonliner CG
     opts.alg = 'CG';
     disp('Using non-linear conjugate gradients');
 end

diff --git a/solver_sSDP.m b/solver_sSDP.m
@@ -86,7 +86,7 @@
 A      = linop_compose( A, 1 / normA );
 b      = b/normA;
 
-if exist('tfocs_CG','file')
+if exist('tfocs_CG','file') && exist('wp_ls','file') % wp_ls.m is the linesearch code for the nonliner CG
     opts.alg = 'CG';
     disp('Using non-linear conjugate gradients');
 end