simplified a module, and adjusted tests for imports

test/baker2dorder.py

@@ -6,7 +6,7 @@ from interp import baker
 from interp.grid import grid
 import numpy as np
 
-from interp.grid.simplex import contains
+from interp.grid import contains
 
 def exact_func(point):
   x = point[0]
@@ -78,8 +78,8 @@ class Test(unittest.TestCase):
     self.answer = baker.run_baker(self.X,self.R,self.S)
 
 
-  # def test_R_contains_X(self):
-  #   self.assertTrue(contains(self.X, self.R.verts))
+  def test_R_contains_X(self):
+    self.assertTrue(contains(self.X, self.R.verts))
 
   def test_1(self):
     a,b,c,d,e,f = (0,1,   1,2,   2,0)

test/cubic2d.py

@@ -2,10 +2,10 @@
 
 import unittest
 
-from interp.baker        import run_baker
+from interp.baker import run_baker
 
-from interp.grid         import grid
-from interp.grid.simplex import contains
+from interp.grid  import grid
+from interp.grid  import contains
 
 def exact_func(X):
   x = X[0]

test/quadratic2d.py

@@ -2,10 +2,10 @@
 
 import unittest
 
-from interp.baker        import run_baker
+from interp.baker import run_baker
 
-from interp.grid         import grid
-from interp.grid.simplex import contains
+from interp.grid  import grid
+from interp.grid  import contains
 
 def exact_func(X):
   x = X[0]