MAJOR: updated the baker method. it's more generic, and should allow me to 3D-ifiy it more simply. a ton of other things

2010-01-31 20:47:03 -07:00
parent 98b13fb8c5
commit 80720c45fe
6 changed files with 223 additions and 175 deletions
@@ -11,6 +11,19 @@ class TestSequenceFunctions(unittest.TestCase):
  def setUp(self):
    self.l = [[-1, 1], [-1, 0], [-1, 1], [0, -1], [0, 0], [0, 1], [1, -1], [1, 0], [1, 1]]
    self.approx_fmt = "%0.6f"
+    self.all_points = [
+                        [ 0, 0], # 0
+                        [ 1, 0], # 1
+                        [ 1, 1], # 2
+                        [ 0, 1], # 3
+                        [ 1,-1], # 4
+                        [ 0,-1], # 5
+                        [-1, 1], # 6
+                        [-1, 0], # 7
+                        [-1,-1], # 8
+                      ]
+    self.q = [1, 0, 0, 0, 0, 0, 0, 0, 0]
+    self.X = [1.5, 10.25]

  def testGetPhis(self):

@@ -48,29 +61,80 @@ class TestSequenceFunctions(unittest.TestCase):

    self.assertEqual(result, right_answer)

-  def testRunBaker(self):
-    X = [0.5, 0.25]
+  def testRunBaker_1(self):
+    size_of_simplex = 3
+    extra_points    = 3

-    all_points = [
-                   [ 0, 0], # 0
-                   [ 1, 0], # 1
-                   [ 1, 1], # 2
-                   [ 0, 1], # 3
-                   [ 1,-1], # 4
-                   [ 0,-1], # 5
-                   [-1, 1], # 6
-                   [-1, 0], # 7
-                   [-1,-1], # 8
-                 ]
-    q = [1, 0, 0, 0, 0, 0, 0, 0, 0]
-    mesh = grid.grid(all_points, q)
-    tree = scipy.spatial.KDTree(all_points)
-    (final, exact) = baker.run_baker(X, mesh, tree)
-    print final, exact
-    result = 3
-    right_answer = 3
+    R = grid.grid(self.all_points[:size_of_simplex],
+                           self.q[:size_of_simplex])

-    self.assertEqual(result, right_answer)
+    S = grid.grid(self.all_points[size_of_simplex:size_of_simplex + extra_points],
+                           self.q[size_of_simplex:size_of_simplex + extra_points])
+
+    answer = baker.run_baker(self.X, R, S)
+    a = self.approx_fmt % answer['a']
+    b = self.approx_fmt % answer['b']
+    c = self.approx_fmt % answer['c']
+
+    self.assertEqual(a, c)
+    self.assertEqual(c, self.approx_fmt % 0.00)
+    self.assertEqual(b, self.approx_fmt % (1/3.0))
+
+  def testRunBaker_2(self):
+    size_of_simplex = 3
+    extra_points    = 4
+
+    R = grid.grid(self.all_points[:size_of_simplex],
+                           self.q[:size_of_simplex])
+
+    S = grid.grid(self.all_points[size_of_simplex:size_of_simplex + extra_points],
+                           self.q[size_of_simplex:size_of_simplex + extra_points])
+
+    answer = baker.run_baker(self.X, R, S)
+    a = self.approx_fmt % answer['a']
+    b = self.approx_fmt % answer['b']
+    c = self.approx_fmt % answer['c']
+
+    self.assertEqual(a, c)
+    self.assertEqual(c, self.approx_fmt % float(2/3.0))
+
+  def testRunBaker_3(self):
+    size_of_simplex = 3
+    extra_points    = 5
+
+    R = grid.grid(self.all_points[:size_of_simplex],
+                           self.q[:size_of_simplex])
+
+    S = grid.grid(self.all_points[size_of_simplex:size_of_simplex + extra_points],
+                           self.q[size_of_simplex:size_of_simplex + extra_points])
+
+    answer = baker.run_baker(self.X, R, S)
+    a = self.approx_fmt % answer['a']
+    b = self.approx_fmt % answer['b']
+    c = self.approx_fmt % answer['c']
+
+    self.assertEqual(a, self.approx_fmt % float(13/14.0))
+    self.assertEqual(b, self.approx_fmt % float(2 / 7.0))
+    self.assertEqual(c, self.approx_fmt % float(15/14.0))
+
+  def testRunBaker_4(self):
+    size_of_simplex = 3
+    extra_points    = 6
+
+    R = grid.grid(self.all_points[:size_of_simplex],
+                           self.q[:size_of_simplex])
+
+    S = grid.grid(self.all_points[size_of_simplex:size_of_simplex + extra_points],
+                           self.q[size_of_simplex:size_of_simplex + extra_points])
+
+    answer = baker.run_baker(self.X, R, S)
+    a = self.approx_fmt % answer['a']
+    b = self.approx_fmt % answer['b']
+    c = self.approx_fmt % answer['c']
+
+    self.assertEqual(a, self.approx_fmt % float(48/53.0))
+    self.assertEqual(b, self.approx_fmt % float(15/53.0))
+    self.assertEqual(c, self.approx_fmt % float(54/53.0))

 if __name__ == '__main__':
  suite = unittest.TestLoader().loadTestsFromTestCase(TestSequenceFunctions)
@@ -1,76 +0,0 @@
-#!/usr/bin/python
-
-import unittest
-import baker
-
-import numpy as np
-import scipy.spatial
-
-class TestSequenceFunctions(unittest.TestCase):
-  def setUp(self):
-    self.l = [[-1, 1], [-1, 0], [-1, 1], [0, -1], [0, 0], [0, 1], [1, -1], [1, 0], [1, 1]]
-    self.r = [[1,2,3], [2,2,3], [1,3,3], [1,2,9]]
-    self.approx_fmt = "%0.6f"
-
-  def testGetPhis(self):
-
-    X = [0,0]
-    r = [[-1, -1], [0, 2], [1, -1]]
-
-    result = baker.get_phis(X, r)
-    result = [self.approx_fmt % i for i in result]
-
-    right_answer = [self.approx_fmt % i for i in [1/3.0, 1/3.0, 1/3.0]]
-
-    for a,b in zip(result, right_answer):
-      self.assertEqual(a,b)
-
-  def testGetPhis2(self):
-
-    X = [0.5,0.25]
-    r = [[0, 0], [1, 0], [1, 1]]
-
-    result = baker.get_phis(X, r)
-
-    right_answer = [0.5, 0.25, 0.25]
-
-    for a,b in zip(result, right_answer):
-      self.assertEqual(a,b)
-
-  def testQlinear(self):
-    X = [0.5, 0.25]
-    r = [[0, 0], [1, 0], [1, 1]]
-    q = [1, 0, 0]
-
-    result = baker.qlinear(X, r, q)
-
-    right_answer = 0.5
-
-    self.assertEqual(result, right_answer)
-
-  def testRunBaker(self):
-    X = [0.5, 0.25]
-
-    all_points = [
-                   [ 0, 0], # 0
-                   [ 1, 0], # 1
-                   [ 1, 1], # 2
-                   [ 0, 1], # 3
-                   [ 1,-1], # 4
-                   [ 0,-1], # 5
-                   [-1, 1], # 6
-                   [-1, 0], # 7
-                   [-1,-1], # 8
-                 ]
-    q = [1, 0, 0, 0, 0, 0, 0, 0, 0]
-
-    tree = scipy.spatial.KDTree(all_points)
-    baker.run_baker(X, 
-    result = 3
-    right_answer = 5
-
-    self.assertEqual(result, right_answer)
-
-if __name__ == '__main__':
-  suite = unittest.TestLoader().loadTestsFromTestCase(TestSequenceFunctions)
-  unittest.TextTestRunner(verbosity=2).run(suite)