Changeset 214


Ignore:
Timestamp:
03/22/10 15:35:37 (6 years ago)
Author:
altafang
Message:

Adding tentative implementation of convex solver that can handle nonlinear constraints

Location:
branches/cvxopt/mystic-0.1a2
Files:
2 added
2 edited

Legend:

Unmodified
Added
Removed
  • branches/cvxopt/mystic-0.1a2/examples/test_cvxquadratic.py

    r194 r214  
    1717 
    1818#--------------------------------------------------------------------- 
    19 # Test 1: Simple example of using conveqp() 
     19# Test 1: Simple example of using convexqp() 
    2020# Demonstrates minimal convexqp interface 
    2121 
     
    4848 
    4949       and b = [1.] 
    50              
    51         
    52  
    5350 
    5451    Expected results 
  • branches/cvxopt/mystic-0.1a2/mystic/cvx_quadratic.py

    r194 r214  
    196196        G = matrix(constraints['G']) 
    197197        h = matrix(constraints['h']) 
    198         A = matrix(constraints['A']) 
    199         b = matrix(constraints['b']) 
     198        try: 
     199            A = matrix(constraints['A']) 
     200            b = matrix(constraints['b']) 
     201        except: 
     202            A = None 
     203            b = None 
    200204        P = matrix(P) 
    201205        q = matrix(q) 
     
    960964def convexqp(P, q, constraints, x0=None, s0=None, y0=None, z0=None, 
    961965             reltol=1e-6, abstol=1e-7, refinement=None, correction=True, 
    962              dims = None, feastol=1e-7, args=(), maxiter=None,disp=1,retall=0,  
     966             dims = None, feastol=1e-7, args=(), maxiter=None, disp=1, retall=0,  
    963967             callback=None, full_output=True): 
    964968    """Minimize a quadratic convex problem subject to constraints. 
Note: See TracChangeset for help on using the changeset viewer.