Changeset 552 for branches

Timestamp:

09/05/12 16:09:26 (4 years ago)

Author:

tjs

Message:

Added 'sausage' branch with working OUQ sausage code using OUQPolytopeTools.

File:

• branches/UQ/math/legacy/TEST_OUQ_1dSurr_diam.py (modified) (5 diffs)

branches/UQ/math/legacy/TEST_OUQ_1dSurr_diam.py

@@ -11 +11 @@
 # hard-wired: use DE solver, don't use mpi, F-F' calculation
 #######################################################################
-npop = 32 #20 #40  #!!!
+npop = 20 #20 #40  #!!!
 maxiter = 1000
 maxfun = 1e+6
@@ -22 +22 @@
 # the model function and the dataset
 #######################################################################
-from StAlSurrogate import st_al_surr as model
-from legacydata import load_dataset
-data = load_dataset('ExampleDataset.txt', range(0,1))
-L = data.lipschitz
-
+#from StAlSurrogate import st_al_surr as model
+#from legacydata import load_dataset
+#data = load_dataset('ExampleDataset.txt', range(0,1))
+#L = data.lipschitz
+
+def model(x):
+  return x[0];
 
 #######################################################################
@@ -170 +172 @@
   from mystic.math.measures import mean
   y_mean = 0.5     #NOTE: SET THE 'mean' HERE!
-  y_error = 0.0001 #NOTE: SET THE 'error' HERE!
+  y_mean_error = 0.0 #NOTE: SET THE 'error' HERE!
   theta = 0.0      #NOTE: SET THE 'failure criteria' HERE!
-  Cy = 25.0          #NOTE: SET THE 'cutoff' HERE!
-  Cx = (1.0,1.0,1.0) #NOTE: SET THE 'wiggle' HERE!
-  valid_tol = 1.e-5  #NOTE: SET THE 'model tolerance' HERE!
-  target = (y_mean,theta,Cy,Cx); error = (y_error,None,valid_tol,None)
+  Cy = 1.0          #NOTE: SET THE 'cutoff' HERE!
+  Cx = (0.0,0.0,0.0) #NOTE: SET THE 'wiggle' HERE!
+  valid_tol = 1.e-6  #NOTE: SET THE 'model tolerance' HERE!
+  target = (y_mean,theta,Cy,Cx); error = (y_mean_error,None,valid_tol,None)
   pars = (target,error)
 
@@ -186 +188 @@
 
   #FIXME: check units versus those in model and in dataset
-  w_lower = [0.0]; Y_lower = [0.0]
-  w_upper = [1.0]; Y_upper = [1.0]
+  w_lower = [0.0]; Y_lower = [theta]
+  w_upper = [1.0]; Y_upper = [5.0]
   h_lower = [0.0]; a_lower = [0.0];  v_lower = [0.0]
   h_upper = [1.0]; a_upper = [0.0];  v_upper = [0.0]
@@ -218 +220 @@
 
   print " model: f(x) = %s(x)" % function_name
-  print " lipschitz: L = %s" % L
+  #print " lipschitz constant: L = %s" % L
   print " target: %s" % str(target)
   print " error: %s" % str(error)