Changeset 735

Show
Ignore:
Timestamp:
08/27/10 18:32:57 (1 year ago)
Author:
dmitrey
Message:

some changes wrt FD getOrder

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • PythonPackages/FuncDesigner/FuncDesigner/examples/lp1.py

    r729 r735  
    1111f1 = 4*x+5*y + 3*z + 5 
    1212f2 = f1.sum() + 2*x + 4*y + 15 
    13 f3 = 5*f1 + 4*f2 + 20 
     13f3 = 5*f1 + 4*f2 + 20  
    1414 
    1515# Define objective; sum(a) and a.sum() are same as well as for numpy arrays 
    …… 
    2626 
    2727# Solve 
    28 r = p.solve('lpSolve') # glpk is name of solver involved, see OOF doc for more arguments 
     28r = p.solve('lpSolve', fixedVars=t) # glpk is name of solver involved, see OOF doc for more arguments 
    2929 
    3030# Decode solution 

  • PythonPackages/FuncDesigner/FuncDesigner/ooFun.py

    r734 r735  
    966966                    self._order = 1 
    967967            else: 
    968                 self._order = inf 
    969              
     968                orders = [(inp.getOrder(Vars, fixedVars) if isinstance(inp, oofun) else 0) for inp in self.input] 
     969                self._order = inf if any(asarray(orders) != 0) else 0 
     970 
     971#                dep = self.getDep() 
     972#                if (fixedVars is not None and self in fixedVars) or (Vars is not None and dep.isself not in Vars) 
     973                #self._order = inf 
    970974        return self._order 
    971975     

  • PythonPackages/OpenOpt/openopt/kernel/FDmisc.py

    r730 r735  
    5252    # TODO: mb use oovarsIndDict here as well (as for derivatives?) 
    5353    from FuncDesigner import oopoint 
    54     startDictData = [] if fixedVars is None else [(v, startPoint[v]) for v in fixedVars] 
     54    startDictData = [] 
     55    if fixedVars is not None: 
     56        for v in fixedVars: 
     57            val = startPoint.get(v, 'absent') 
     58            if val == 'absent': 
     59                p.err('value for fixed variable %s is absent in start point' % v.name) 
     60            startDictData.append((v, val)) 
    5561 
    5662    #vector2point = lambda x: oopoint(startDictData + [(oov, x[oovar_indexes[i]:oovar_indexes[i+1]]) for i, oov in enumerate(optVars)])