updated some imports

bin/pattern.py

@@ -1,12 +1,9 @@
 #!/usr/bin/env python
 
-from baker import pattern
-from baker.tools import smblog
+from interp.baker import pattern
+from interp.tools import log
 
-smblog.info(pattern(power = 2, phicount = 3, offset = -1))
-smblog.info()
-smblog.info(pattern(power = 2, phicount = 4, offset = -1))
-smblog.info()
-smblog.info(pattern(power = 3, phicount = 3, offset = -1))
-smblog.info()
-smblog.info(pattern(power = 3, phicount = 4, offset = -1))
+log.info(pattern(power = 2, phicount = 3, offset = -1))
+log.info(pattern(power = 2, phicount = 4, offset = -1))
+log.info(pattern(power = 3, phicount = 3, offset = -1))
+log.info(pattern(power = 3, phicount = 4, offset = -1))

bin/test3d-connectivity.py

@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 
 import sys
-from grid.DDD import random_grid
-from baker import get_phis, run_baker
-from baker.tools import exact_func, smberror, improved_answer, smblog
+from interp.grid.DDD import random_grid
+from interp.baker import get_phis, run_baker
+from interp.tools import exact_func, improved_answer, log
 from glob import glob
 from os import remove
 
@@ -57,8 +57,8 @@ if __name__ == '__main__':
           answer =  g.run_baker(X)
           d[improved_answer(answer, exact)] += 1
         except ValueError as e:
-          smblog.error(e)
-      except smberror as e:
+          log.error(e)
+      except Exception as e:
         print e
         print d
 

bin/test_baker.py

@@ -1,12 +1,12 @@
 #!/usr/bin/env python
 
-from baker        import run_baker
-from baker.tools import improved_answer
+from interp.baker        import run_baker
+from interp.tools import improved_answer
 
-from baker.tools import smblog
+from interp.tools import log
 
-from grid.DD      import grid
-from grid.simplex import contains
+from interp.grid.DD      import grid
+from interp.grid.simplex import contains
 
 import numpy as np
 
@@ -31,7 +31,6 @@ if __name__ == '__main__':
   X = [0.55, 0.45]
 
   g = grid(points, q)
-  g.construct_connectivity()
   R = g.create_mesh(range(3))
 
   try:
@@ -44,6 +43,6 @@ if __name__ == '__main__':
   for i in xrange(1,4):
     answer  = run_baker(X, R, S, i)
     exact   = exact_func(X)
-    smblog.debug(improved_answer(answer, exact))
+    log.debug(improved_answer(answer, exact))
 
-  smblog.debug(improved_answer(g.run_baker(X), exact))
+  log.debug(improved_answer(g.run_baker(X), exact))