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/MM_OUQ_StAlData.py

    r675 r687  
    7575def maximize(params,npts,bounds): 
    7676 
    77   from mystic.math.dirac_measure import scenario 
     77  from mystic.math.discrete import scenario 
    7878  from numpy import inf 
    7979  target,error = params 
     
    112112    ##################### begin function-specific ##################### 
    113113    # impose mean on the values of the product measure 
    114     from mystic.math.dirac_measure import mean_y_norm_wts_constraintsFactory as factory 
     114    from mystic.math.discrete import mean_y_norm_wts_constraintsFactory as factory 
    115115    constrain = factory((target[0],error[0]), npts) 
    116116 
     
    196196  nz = 2  #NOTE: SET THE NUMBER OF 'v' POINTS HERE! 
    197197  npts = (nx,ny,nz) 
    198   from mystic.math.paramtrans import _npts 
     198  from mystic.math.distance import _npts 
    199199  _n = _npts(npts) 
    200200 
     
    260260 
    261261  from numpy import array 
    262   from mystic.math.dirac_measure import scenario 
     262  from mystic.math.discrete import scenario 
    263263  c = scenario() 
    264264  c.load(solved,npts) 
Note: See TracChangeset for help on using the changeset viewer.