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

    r585 r687  
    7171def maximize(params,npts,bounds): 
    7272 
    73   from mystic.math.dirac_measure import scenario 
     73  from mystic.math.discrete import scenario 
    7474  from numpy import inf 
    7575  target,error = params 
     
    108108    ##################### begin function-specific ##################### 
    109109    # impose mean on the values of the product measure 
    110     from mystic.math.dirac_measure import mean_y_norm_wts_constraintsFactory as factory 
     110    from mystic.math.discrete import mean_y_norm_wts_constraintsFactory as factory 
    111111    constrain = factory((target[0],error[0]), npts) 
    112112 
     
    193193  nz = 2  #NOTE: SET THE NUMBER OF 'v' POINTS HERE! 
    194194  npts = (nx,ny,nz) 
    195   from mystic.math.paramtrans import _npts 
     195  from mystic.math.distance import _npts 
    196196  _n = _npts(npts) 
    197197 
     
    257257 
    258258  from numpy import array 
    259   from mystic.math.dirac_measure import scenario 
     259  from mystic.math.discrete import scenario 
    260260  c = scenario() 
    261261  c.load(solved,npts) 
Note: See TracChangeset for help on using the changeset viewer.