Show
Ignore:
Timestamp:
01/26/2012 08:52:24 PM (4 months ago)
Author:
dmitrey
Message:

fix for interalg

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • PythonPackages/OpenOpt/openopt/solvers/UkrOpt/interalgT.py

    r1372 r1374  
    22asarray, inf, nan, argmin, argsort, tile, searchsorted 
    33from bisect import bisect_right 
    4 from FuncDesigner.Interval import adjustyWithDiscreteDomain, adjusteWithDiscreteDomain 
     4from FuncDesigner.Interval import adjust_lx_WithDiscreteDomain, adjust_ux_WithDiscreteDomain 
    55try: 
    66    from bottleneck import nanargmin, nanmin, nanargmax, nanmax 
    …… 
    4747#        nn = n_where_lx_2 + n_where_ux_2 
    4848         
    49         adjustyWithDiscreteDomain(y[:, i], v) 
    50         adjusteWithDiscreteDomain(e[:, i], v) 
     49        adjust_lx_WithDiscreteDomain(y[:, i], v) 
     50        adjust_ux_WithDiscreteDomain(e[:, i], v) 
    5151         
    5252#        n_where_lx_2 = where(y[:, i] <=-0.5)[0].size