Changeset 588 for branches

Timestamp:

11/07/12 22:10:17 (4 years ago)

Author:

mmckerns

Message:

allow hausdorff normalization of y

Location:

branches/UQ/math

Files:

• legacy/TEST_OUQ_1dSurr_CxCy.py (modified) (1 diff)
• legacy/test_graph_dist.py (modified) (3 diffs)
• sausage/TEST_OUQ_1dSurr_diam.py (modified) (1 diff)
• sausage/TEST_OUQ_StStSurr.py (modified) (1 diff)

branches/UQ/math/legacy/TEST_OUQ_1dSurr_CxCy.py

@@ -190 +190 @@
   Cy = 0.1           #NOTE: SET THE 'cutoff' HERE!
   Cx = (2.0,0.0,0.0) #NOTE: SET THE 'wiggle' HERE!
-  hausdorff = (1.0,0.0,0.0) #NOTE: SET THE 'hausdorff normalization' HERE!
+  hausdorff = (1.0,0.0,0.0,1.0) #NOTE: SET THE 'hausdorff normalization' HERE!
   valid_tol = 0.0  #NOTE: SET THE 'model tolerance' HERE!
   imax_c = 200     #NOTE: SET THE 'max iterations to check valid' HERE!

branches/UQ/math/legacy/test_graph_dist.py

@@ -41 +41 @@
 # calculate hausdorff distances
 Cy = 0.0; Cx = 0.0  # enforce x = x'
-hausdorff = (1.0, 1.0, 1.0)
+hausdorff = (1.0, 1.0, 1.0, 1.0)
 print "dH(Cy=0.0,Cx=0.0):", graphical_distance(model, d, ytol=Cy, xtol=Cx, ipop=ipop, imax=imax, hausdorff=hausdorff)
 """
@@ -51 +51 @@
 print "dH(Cy=0.0,Cx=0.6,norm=True):", graphical_distance(model, d, ytol=Cy, xtol=Cx, ipop=ipop, imax=imax, hausdorff=hausdorff)
 """
-dH(Cy=0.0,Cx=0.6,norm=True): [ 0.  1.  2.  0.  0.  2.  1.  1.65
+dH(Cy=0.0,Cx=0.6,norm=True): [ 0.   0.2  0.4  0.   0.   0.4  1.   1. ]
 """
 
@@ -62 +62 @@
 
 Cy = 0.0; Cx = 0.6  # allow x != x'
-hausdorff = (1.0, 1.0, 1.0) # normalization given in each direction
-print "dH(Cy=0.0,Cx=0.6,norm=[1.0,1.0,1.0]):", graphical_distance(model, d, ytol=Cy, xtol=Cx, ipop=ipop, imax=imax, hausdorff=hausdorff)
+hausdorff = (1.0, 1.0, 1.0, 1.0) # normalization given in each direction
+print "dH(Cy=0.0,Cx=0.6,norm=[1.0,1.0,1.0,1.0]):", graphical_distance(model, d, ytol=Cy, xtol=Cx, ipop=ipop, imax=imax, hausdorff=hausdorff)
 """
-dH(Cy=0.0,Cx=0.6,norm=[1.0,1.0,1.0]): [ 0.  1.  2.  0.  0.  2.  0.5  0.9]
+dH(Cy=0.0,Cx=0.6,norm=[1.0,1.0,1.0,1.0]): [ 0.  1.  2.  0.  0.  2.  0.5  0.9]
 """
 

branches/UQ/math/sausage/TEST_OUQ_1dSurr_diam.py

@@ -92 +92 @@
   # generate primary constraints function
   def constraints(rv):
-    ## bounds
-    rv = [max(rv[i], lb[i]) for i in range(len(rv))]
-    rv = [min(rv[i], ub[i]) for i in range(len(rv))]
+    rrv = range(len(rv))
+    # impose range constraints: first try bounce-back to maintain randomness
+    rv = [2*lb[i]-rv[i] if max(rv[i], lb[i]) == lb[i] else rv[i] for i in rrv]
+    rv = [2*ub[i]-rv[i] if min(rv[i], ub[i]) == ub[i] else rv[i] for i in rrv]
+    # if bounceback fails, then use a hard cutoff  #FIXME: breaks randomness
+    rv = [max(rv[i], lb[i]) for i in rrv]
+    rv = [min(rv[i], ub[i]) for i in rrv]
 
     c = scenario()

branches/UQ/math/sausage/TEST_OUQ_StStSurr.py

@@ -91 +91 @@
   # generate primary constraints function
   def constraints(rv):
-    ## bounds
-    rv = [max(rv[i], lb[i]) for i in range(len(rv))]
-    rv = [min(rv[i], ub[i]) for i in range(len(rv))]
+    rrv = range(len(rv))
+    # impose range constraints: first try bounce-back to maintain randomness
+    rv = [2*lb[i]-rv[i] if max(rv[i], lb[i]) == lb[i] else rv[i] for i in rrv]
+    rv = [2*ub[i]-rv[i] if min(rv[i], ub[i]) == ub[i] else rv[i] for i in rrv]
+    # if bounceback fails, then use a hard cutoff  #FIXME: breaks randomness
+    rv = [max(rv[i], lb[i]) for i in rrv]
+    rv = [min(rv[i], ub[i]) for i in rrv]
 
     c = scenario()