Bug fixes in simplex and new prox_diag code

ylp1332 · Jun 21, 2016 · eb46447 · eb46447
1 parent 8bae116
commit eb46447
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/private/tfocs_iterate.m b/private/tfocs_iterate.m
@@ -191,7 +191,9 @@
             if saddle,
 %                 errs(err_j) = errFcn{err_j}(f_w,x,out.dual);
                 % April 14 '14
-                if isempty( get_dual(cur_dual) )
+                %if isempty( get_dual(cur_dual) )
+                % March 10 '15
+                if isempty(cur_dual) || isempty( get_dual(cur_dual) )
                     errs(err_j) = errFcn{err_j}(f_v,cur_pri,0);
                 else
                     errs(err_j) = errFcn{err_j}(f_v,cur_pri,get_dual(cur_dual));

diff --git a/proj_simplex.m b/proj_simplex.m
@@ -42,7 +42,7 @@
 % VECTORIZE = true;
 
 if nargin > 4 && t > 0,
-	if any( x(:) < 0 ) || any( sum( x ) > q ),
+	if any( x(:) < 0 ) || any( sum( x ) > q ) || ( EQ && norm( sum( x ) - q)>1e-8/norm(q) ) 
         if VECTORIZE
             s     = sort( x(:), 'descend' );
         else

diff --git a/prox_diag.m b/prox_diag.m
@@ -18,7 +18,7 @@
 elseif ~isa( funcG, 'function_handle' ), 
     error( 'The second argument must be a function handle.' );
 end
-op = @(varargin)prox_diag_impl( funcF, funcF, n, varargin{:} );
+op = @(varargin)prox_diag_impl( funcF, funcG, n, varargin{:} );
 
 
 function [ v, x ] = prox_diag_impl( prox_f, prox_g, n, x, t )