merge

test/2dquadratic.py

@@ -12,7 +12,7 @@ from interp.grid.simplex import contains
 def exact_func(X):
   x = X[0]
   y = X[0]
-  return 1 - math.sin((x-0.5)**2 + (y-0.5)**2)
+  return 1 - x*x + y*y
 
 class TestSequenceFunctions(unittest.TestCase):
   def setUp(self):

test/baker2dorder.py

@@ -9,7 +9,9 @@ import numpy as np
 from interp.grid.simplex import contains
 
 def exact_func(point):
-  return 0.5 + point[0] * point[1]
+  x = point[0]
+  y = point[1]
+  return 0.5 + x*x + y
 
 def calculate_error_term(self, a,b,c,d,e,f):
     B = np.array([