working on the guarantee simplex routine. I have a test case to try it out against, and need to look at visiting neighbors of faces adjacent to points.

lib/baker/__init__.py

@@ -198,14 +198,6 @@ def run_baker(X, R, S, order=2):
   # calculate values only for the simplex triangle
   phi, qlin = qlinear(X, R)
 
-  if [i for i in phi if i <= 0.0]:
-    s = "this is not a containing simplex:\n"
-    s += "  X: %s\n" % X
-    s += "  R: %s\n" % R
-    s += "  phi: %s, sum(%0.4e)\n" % (phi, sum(phi))
-    print >> sys.stderr, s
-    raise smberror("simplex does not contain point")
-
   if len(S.points) == 0:
     answer = {
                'a': None,

lib/baker/tools.py

@@ -36,12 +36,15 @@ def exact_func_3D(X):
   z = X[2]
   return np.power((np.sin(x * np.pi / 2.0) * np.sin(y * np.pi / 2.0) * np.sin(z * np.pi / 2.0)), 2)
 
-def evaluate_answer(answer, exact):
-  print 'qlin' , answer['qlin']
-  print 'error', answer['error']
-  print 'final', answer['final']
+def improved_answer(answer, exact, verbose=False):
+  if verbose:
+    print 'qlin' , answer['qlin']
+    print 'error', answer['error']
+    print 'final', answer['final']
 
   if abs(answer['final'] - exact) <= abs(answer['qlin'] - exact):
-    print ":) improved result"
+    if verbose: print ":) improved result"
+    return True
   else:
-    print ":( damaged result"
+    if verbose: print ":( damaged result"
+    return False

lib/grid/__init__.py

@@ -7,7 +7,7 @@ import scipy.spatial
 
 from baker        import run_baker
 from baker.tools  import exact_func, smberror
-from simplex      import face
+from simplex      import face, contains
 from smcqdelaunay import *
 
 
@@ -49,6 +49,9 @@ class grid(object):
     q = [self.q[i]      for i in indicies]
     return grid(p, q)
 
+  def get_containing_simplex(self, X):
+    pass
+
 
   def get_simplex_and_nearest_points(self, X, extra_points = 3, simplex_size = 3):
     """
@@ -115,6 +118,8 @@ class grid(object):
 
     try:
       (R, S) = self.get_simplex_and_nearest_points(X)
+      if not contains(X, R.points):
+        raise smberror("run_baker with get_simplex_and_nearest_points returned non-containing simplex")
       answer = run_baker(X, R, S)
     except smberror, e:
       print >> sys.stderr, "caught error: %s, trying with connectivity-based mesh" % e

lib/grid/qhull.py

@@ -0,0 +1,15 @@
+
+def parse_qhull_file(filename, verbose=False):
+  f = open(filename, 'r')
+
+  if verbose:
+    print 'filename: ', filename
+    degree = int(f.readline().strip())
+    print "degree:", degree
+    print "number of points", f.readline().strip()
+
+  verts = []
+  for p in f:
+    v = [float(i) for i in p.strip().split()]
+    verts.append(v)
+  return verts