Changeset 555

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:

• branches/UQ/math/sausage/TEST_OUQ_StStSurr.py (modified) (3 diffs)

branches/UQ/math/sausage/TEST_OUQ_StStSurr.py

@@ -49 +49 @@
   solver = DifferentialEvolutionSolver2(ndim,npop)
   solver.SetRandomInitialPoints(min=lb,max=ub)
-  #solver.SetStrictRanges(min=lb,max=ub)
+  solver.SetStrictRanges(min=lb,max=ub)
   solver.SetEvaluationLimits(maxiter,maxfun)
   solver.SetEvaluationMonitor(evalmon)
@@ -217 +217 @@
                + (ny * w_upper) + (ny * a_upper) \
                + (nz * w_upper) + (nz * v_upper) \
-               + (_n * Y_lower)
+               + (_n * Y_upper)
   bounds = (lower_bounds,upper_bounds)
 
@@ -275 +275 @@
   print "fails valid wrt model:\n%s" % c.valid_wrt_model(model, xtol=Cx, \
                                                          tol=Cy, blamelist=True)
-  print "mean(y): %s >= %s" % (str( c.get_mean_value() ), y_mean)
+  print "mean(y): %s >= %s" % (str( c.get_mean_value() ), y_mean - y_mean_error)
   print "sum_wts: %s == 1.0" % [sum(w) for w in c.wts]
   from OUQPolytopeTools import UniformDistanceToModel