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_StStSurr_Cy.py

    r585 r687  
    7070def maximize(params,npts,bounds): 
    7171 
    72   from mystic.math.dirac_measure import scenario 
     72  from mystic.math.discrete import scenario 
    7373  from numpy import inf 
    7474  target,error = params 
     
    107107    ##################### begin function-specific ##################### 
    108108    # impose mean on the values of the product measure 
    109     from mystic.math.dirac_measure import mean_y_norm_wts_constraintsFactory as factory 
     109    from mystic.math.discrete import mean_y_norm_wts_constraintsFactory as factory 
    110110    constrain = factory((target[0],error[0]), npts) 
    111111 
     
    194194  nz = 1  #NOTE: SET THE NUMBER OF 'v' POINTS HERE! 
    195195  npts = (nx,ny,nz) 
    196   from mystic.math.paramtrans import _npts 
     196  from mystic.math.distance import _npts 
    197197  _n = _npts(npts) 
    198198 
     
    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) 
     
    273273  try: _Cx = max(Cx) 
    274274  except TypeError: _Cx = Cx 
    275   from mystic.math.paramtrans import graphical_distance 
     275  from mystic.math.distance import graphical_distance 
    276276  Ry = graphical_distance(model, c, ytol=Cy, xtol=Cx, cutoff=0.0, imax=0) 
    277277  print "vertical_distance: %s <= %s" % (Ry, Cy + _Cx) 
Note: See TracChangeset for help on using the changeset viewer.