Changeset 555


Ignore:
Timestamp:
09/09/12 12:54:01 (4 years ago)
Author:
mmckerns
Message:

bug fix: correct upper bounds Y_upper not Y_lower, uncommented SetStrictRanges?

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/UQ/math/sausage/TEST_OUQ_StStSurr.py

    r553 r555  
    4949  solver = DifferentialEvolutionSolver2(ndim,npop) 
    5050  solver.SetRandomInitialPoints(min=lb,max=ub) 
    51   #solver.SetStrictRanges(min=lb,max=ub) 
     51  solver.SetStrictRanges(min=lb,max=ub) 
    5252  solver.SetEvaluationLimits(maxiter,maxfun) 
    5353  solver.SetEvaluationMonitor(evalmon) 
     
    217217               + (ny * w_upper) + (ny * a_upper) \ 
    218218               + (nz * w_upper) + (nz * v_upper) \ 
    219                + (_n * Y_lower) 
     219               + (_n * Y_upper) 
    220220  bounds = (lower_bounds,upper_bounds) 
    221221 
     
    275275  print "fails valid wrt model:\n%s" % c.valid_wrt_model(model, xtol=Cx, \ 
    276276                                                         tol=Cy, blamelist=True) 
    277   print "mean(y): %s >= %s" % (str( c.get_mean_value() ), y_mean) 
     277  print "mean(y): %s >= %s" % (str( c.get_mean_value() ), y_mean - y_mean_error) 
    278278  print "sum_wts: %s == 1.0" % [sum(w) for w in c.wts] 
    279279  from OUQPolytopeTools import UniformDistanceToModel 
Note: See TracChangeset for help on using the changeset viewer.