From e856851f1e2f6f6d90475ee492f88023a6d238e9 Mon Sep 17 00:00:00 2001
From: Stephen Mardson McQuay <stephen@mardson.com>
Date: Mon, 21 Mar 2011 15:24:25 -0600
Subject: [PATCH] moved the qhull generator into the base grid class

---
 interp/grid/DDD.py      | 39 ---------------------------------------
 interp/grid/__init__.py | 21 +++++++++++++++++++++
 2 files changed, 21 insertions(+), 39 deletions(-)

diff --git a/interp/grid/DDD.py b/interp/grid/DDD.py
index 99fee98..c5f7e5f 100644
--- a/interp/grid/DDD.py
+++ b/interp/grid/DDD.py
@@ -8,26 +8,6 @@ class grid(basegrid):
   def __init__(self, verts, q):
     basegrid.__init__(self, verts, q)
 
-  def for_qhull_generator(self):
-    """
-      this returns a generator that should be fed into qdelaunay
-    """
-
-    yield '3';
-    yield '%d' % len(self.verts)
-
-    for p in self.verts:
-      yield "%f %f %f" % tuple(p)
-
-  def for_qhull(self):
-    """
-      this returns a single string that should be fed into qdelaunay
-    """
-    r  = '3\n'
-    r += '%d\n' % len(self.verts)
-    for p in self.verts:
-      r += "%f %f %f\n" % tuple(p)
-    return r
 
 class rect_grid(grid):
   def __init__(self, xres = 5, yres = 5, zres = 5):
@@ -60,26 +40,7 @@ class rect_grid(grid):
     grid.__init__(self, verts, q)
   # self.construct_connectivity()
 
-  def for_qhull_generator(self):
-    """
-      this returns a generator that should be fed into qdelaunay
-    """
 
-    yield '3';
-    yield '%d' % len(self.verts)
-
-    for p in self.verts:
-      yield "%f %f %f" % tuple(p)
-
-  def for_qhull(self):
-    """
-      this returns a single string that should be fed into qdelaunay
-    """
-    r  = '3\n'
-    r += '%d\n' % len(self.verts)
-    for p in self.verts:
-      r += "%f %f %f\n" % tuple(p)
-    return r
 
 class random_grid(rect_grid):
   def __init__(self, num_verts = 10):
diff --git a/interp/grid/__init__.py b/interp/grid/__init__.py
index 58b65ec..bfe1e16 100644
--- a/interp/grid/__init__.py
+++ b/interp/grid/__init__.py
@@ -135,6 +135,27 @@ class grid(object):
     answer = run_baker(X, R, S, order)
     return answer
 
+  def for_qhull_generator(self):
+    """
+      this returns a generator that should be fed into qdelaunay
+    """
+
+    yield '3';
+    yield '%d' % len(self.verts)
+
+    for p in self.verts:
+      yield "%f %f %f" % tuple(p)
+
+  def for_qhull(self):
+    """
+      this returns a single string that should be fed into qdelaunay
+    """
+    r  = '3\n'
+    r += '%d\n' % len(self.verts)
+    for p in self.verts:
+      r += "%f %f %f\n" % tuple(p)
+    return r
+
   def __str__(self):
     r = ''
     assert( len(self.verts) == len(self.q) )