Changeset 1094

Show
Ignore:
Timestamp:
07/04/08 05:40:54 (2 months ago)
Author:
dmitrey.kroshko
Message:

minor change

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/openopt/scikits/openopt/Kernel/ooCheck.py

    r1093 r1094  
    1818        if hasattr(p, fn): 
    1919            attr = getattr(p, fn) 
    20             if not attr in p.solver.__optionalDataThatCanBeHandled__ and (callable(attr) and getattr(p.userProvided, fn)) or (not callable(attr) and attr not in ([], (), None) and asarray(attr).size>0 and any(isfinite(attr))): 
     20            if not fn in p.solver.__optionalDataThatCanBeHandled__ \ 
     21            and \ 
     22            ((callable(attr) and getattr(p.userProvided, fn)) or (not callable(attr) and attr not in ([], (), None) and asarray(attr).size>0 and any(isfinite(attr)))): 
    2123                p.err('the solver ' + p.solver.__name__ + ' cannot handle ' + "'" + fn + "' data") 
    2224