Changeset 731

Show
Ignore:
Timestamp:
08/27/10 12:27:58 (1 year ago)
Author:
dmitrey
Message:

some more changes wrt getOrder

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • PythonPackages/FuncDesigner/FuncDesigner/ooSystem.py

    r716 r731  
    111111            kwargs['constraints'] = constraints 
    112112 
    113         isLinear = objective.is_linear and all([c.oofun.is_linear for c in constraints]) 
     113        isLinear = objective.getOrder(self.optVars, self.fixedVars) < 2 and all([(c.oofun.getOrder(self.optVars, self.fixedVars) < 2) for c in constraints]) 
    114114        if isLinear: 
    115115            p = openopt.LP(objective, *args, **kwargs) 

  • PythonPackages/FuncDesigner/FuncDesigner/overloads.py

    r729 r731  
    103103        if y.size == 1:  
    104104            #r = np.empty(x.size) - use it? 
    105             r = np.empty(asarray(x).size) 
     105            r = np.empty_like(x) 
    106106            r.fill(y) 
    107107            r = Diag(r)