comparison pyCSalgos/BP/l1eq_pd.py @ 63:2fc28e2ae0a2

Fixed minor naming in l1eq_pd()

 
 import numpy
 import scipy.linalg
 import math
 
-class l1ecNotImplementedError(Exception):
+class l1eqNotImplementedError(Exception):
   pass
 
 #function xp = l1eq_pd(x0, A, At, b, pdtol, pdmaxiter, cgtol, cgmaxiter)
 def l1eq_pd(x0, A, At, b, pdtol=1e-3, pdmaxiter=50, cgtol=1e-8, cgmaxiter=200, verbose=False):
 

     gradf0 = numpy.hstack((numpy.zeros(N), numpy.ones(N)))
     
     # starting point --- make sure that it is feasible
     #if (largescale)
     if largescale:
-      raise l1qcNotImplementedError('Largescale not implemented yet!')
+      raise l1eqNotImplementedError('Largescale not implemented yet!')
     else:
       #if (norm(A*x0-b)/norm(b) > cgtol)
       if numpy.linalg.norm(numpy.dot(A,x0)-b) / numpy.linalg.norm(b) > cgtol:
         #disp('Starting point infeasible; using x0 = At*inv(AAt)*y.');
         if verbose:

     lamu2 = -1/fu2
     if (largescale):
       #v = -A(lamu1-lamu2);
       #Atv = At(v);
       #rpri = A(x) - b;
-      raise l1qcNotImplementedError('Largescale not implemented yet!')
+      raise l1eqNotImplementedError('Largescale not implemented yet!')
     else:
       #v = -A*(lamu1-lamu2);
       #Atv = A'*v;
       #rpri = A*x - b;
       v = numpy.dot(-A, lamu1-lamu2)

         #  return
         #end
         #dx = (w1 - w2.*sig2./sig1 - At(dv))./sigx;
         #Adx = A(dx);
         #Atdv = At(dv);
-        raise l1qcNotImplementedError('Largescale not implemented yet!')
+        raise l1eqNotImplementedError('Largescale not implemented yet!')
       else:
         #w1p = -(w3 - A*(w1./sigx - w2.*sig2./(sigx.*sig1)));
         w1p = -(w3 - numpy.dot(A,(w1/sigx - w2*sig2/(sigx*sig1))))
         #H11p = A*(sparse(diag(1./sigx))*A');
         H11p = numpy.dot(A, numpy.dot(numpy.diag(1/sigx),A.T))

       
       if verbose:
         print 'Iteration =',pditer,', tau =',tau,', Primal =',numpy.sum(u),', PDGap =',sdg,', Dual res =',numpy.linalg.norm(rdual),', Primal res =',numpy.linalg.norm(rpri)
       if largescale:
         #disp(sprintf('                  CG Res = #8.3e, CG Iter = #d', cgres, cgiter));
-        raise l1qcNotImplementedError('Largescale not implemented yet!')
+        raise l1eqNotImplementedError('Largescale not implemented yet!')
       else:
         #disp(sprintf('                  H11p condition number = #8.3e', hcond));
         if verbose:
           print '                  H11p condition number =',hcond
       #end