Ignore:
Timestamp:
06/15/13 18:43:09 (3 years ago)
Author:
mmckerns
Message:

renaming of some of the measure methods, including dirac_measure to measure
moved dirac_measure.py to discrete.py, and paramtrans to distance
added isinstance to tools; added min, max, ess_min, ess_max to measures
moved dirac_measure.coords to dirac_measure.positions

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/UQ/math/legacy/envelope/Looper_BoLiSurr_Cy.py

    r675 r687  
    9898def maximize(params,npts,bounds,initial=None,job='',printmon=None): 
    9999 
    100   from mystic.math.dirac_measure import scenario 
     100  from mystic.math.discrete import scenario 
    101101  from numpy import inf 
    102102  target,error = params 
     
    140140    ##################### begin function-specific ##################### 
    141141    # impose mean on the values of the product measure 
    142     from mystic.math.dirac_measure import mean_y_norm_wts_constraintsFactory as factory 
     142    from mystic.math.discrete import mean_y_norm_wts_constraintsFactory as factory 
    143143    constrain = factory((target[0],error[0]), npts) 
    144144 
     
    250250 
    251251  npts = (nx,ny,nz) 
    252   from mystic.math.paramtrans import _npts 
     252  from mystic.math.distance import _npts 
    253253  _n = _npts(npts) 
    254254 
     
    316316 
    317317  from numpy import array 
    318   from mystic.math.dirac_measure import scenario 
     318  from mystic.math.discrete import scenario 
    319319  c = scenario() 
    320320  c.load(solved,npts) 
     
    333333# try: _Cx = max(Cx) 
    334334# except TypeError: _Cx = Cx 
    335   from mystic.math.paramtrans import graphical_distance 
     335  from mystic.math.distance import graphical_distance 
    336336  Ry = graphical_distance(model, c, ytol=Cy, xtol=Cx, cutoff=0.0, \ 
    337337                          imax=0, ipop=cde, hausdorff=hausdorff) 
Note: See TracChangeset for help on using the changeset viewer.