Changeset 688 for branches

Timestamp:

06/15/13 19:36:31 (3 years ago)

Author:

mmckerns

Message:

merged UQ and OUQ examples into trunk; update use of pm.coords to pm.positions

Location:

branches

Files:

• UQ/design (copied) (copied from branches/UQ/math/examples3)
• UQ/funcIO.py (copied) (copied from branches/UQ/math/funcIO.py)
• UQ/legacy (copied) (copied from branches/UQ/math/legacy)
• UQ/legacy/MINMAX_StAlData.py (copied) (copied from branches/UQ/math/legacy/MINMAX_StAlData.py)
• UQ/legacy/MM_OUQ_StAlData.py (copied) (copied from branches/UQ/math/legacy/MM_OUQ_StAlData.py)
• UQ/legacy/TEST_OUQ_1dData.py (copied) (copied from branches/UQ/math/legacy/TEST_OUQ_1dData.py)
• UQ/legacy/TEST_OUQ_1dSurr_CxCy.py (copied) (copied from branches/UQ/math/legacy/TEST_OUQ_1dSurr_CxCy.py)
• UQ/legacy/TEST_OUQ_1dSurr_Cy.py (copied) (copied from branches/UQ/math/legacy/TEST_OUQ_1dSurr_Cy.py)
• UQ/legacy/TEST_OUQ_StAlData.py (copied) (copied from branches/UQ/math/legacy/TEST_OUQ_StAlData.py)
• UQ/legacy/TEST_OUQ_StStSurr_Cy.py (copied) (copied from branches/UQ/math/legacy/TEST_OUQ_StStSurr_Cy.py)
• UQ/legacy/envelope/Driver_BoLiSurr_Cy.py (copied) (copied from branches/UQ/math/legacy/envelope/Driver_BoLiSurr_Cy.py)
• UQ/legacy/envelope/Looper_BoLiSurr_Cy.py (copied) (copied from branches/UQ/math/legacy/envelope/Looper_BoLiSurr_Cy.py)
• UQ/legacy/envelope/conf_hausd.py (copied) (copied from branches/UQ/math/legacy/envelope/conf_hausd.py)
• UQ/legacy/envelope/envelope.py (copied) (copied from branches/UQ/math/legacy/envelope/envelope.py)
• UQ/legacy/envelope/hausdorff.py (copied) (copied from branches/UQ/math/legacy/envelope/hausdorff.py)
• UQ/legacy/envelope/sausage.py (copied) (copied from branches/UQ/math/legacy/envelope/sausage.py)
• UQ/legacy/test_ExampleDataset.py (copied) (copied from branches/UQ/math/legacy/test_ExampleDataset.py)
• UQ/legacy/test_StAlDataset.py (copied) (copied from branches/UQ/math/legacy/test_StAlDataset.py)
• UQ/legacy/test_graph_dist.py (copied) (copied from branches/UQ/math/legacy/test_graph_dist.py)
• UQ/math (deleted)
• UQ/pickle.py (copied) (copied from branches/UQ/math/pickle.py)
• UQ/sausage (copied) (copied from branches/UQ/math/sausage)
• UQ/sausage/TEST_OUQ_1dSurr_diam.py (copied) (copied from branches/UQ/math/sausage/TEST_OUQ_1dSurr_diam.py)
• UQ/sausage/TEST_OUQ_StStSurr.py (copied) (copied from branches/UQ/math/sausage/TEST_OUQ_StStSurr.py)
• collapse/TEST_OUQ_surrogate_diam_collapse.py (modified) (1 diff)

branches/collapse/TEST_OUQ_surrogate_diam_collapse.py

@@ -191 +191 @@
   c = product_measure()
   c.load(solved,npts)
-  print "solved: [wx,x]\n%s" % array(zip(c[0].weights,c[0].coords))
-  print "solved: [wy,y]\n%s" % array(zip(c[1].weights,c[1].coords))
-  print "solved: [wz,z]\n%s" % array(zip(c[2].weights,c[2].coords))
+  print "solved: [wx,x]\n%s" % array(zip(c[0].weights,c[0].positions))
+  print "solved: [wy,y]\n%s" % array(zip(c[1].weights,c[1].positions))
+  print "solved: [wz,z]\n%s" % array(zip(c[2].weights,c[2].positions))
 
   print "expect: %s" % str( c.expect(model) )