Changeset 1910 for inundation/utilities

Timestamp:

Oct 14, 2005, 6:00:56 AM (19 years ago)

Author:

ole

Message:

Made utilities a Python package
Added numerical_tools (and test) containing ensure_numeric from the old util module.
Added test_polygon.py

Location:

inundation/utilities

Files:

• __init__.py (added)
• compile.py (modified) (2 diffs)
• numerical_tools.py (added)
• polygon.py (modified) (3 diffs)
• polygon_ext.c (modified) (3 diffs)
• test_numerical_tools.py (added)
• test_polygon.py (added)

inundation/utilities/compile.py

@@ -240 +240 @@
     """
 
-    from config import use_extensions
+    #from config import use_extensions
 
     from os.path import splitext
@@ -247 +247 @@
     
     C=False
-    if use_extensions:
+
+    try:
+        s = 'import %s' %root
+        #print s
+        exec(s)
+    except:
         try:
-            s = 'import %s' %root
-            #print s
-            exec(s)
+            open(filename)
         except:
+            msg = 'C extension %s cannot be opened' %filename
+            print msg                
+        else:    
+            print '------- Trying to compile c-extension %s' %filename
+        
             try:
-                open(filename)
+                compile(filename)
             except:
-                msg = 'C extension %s cannot be opened' %filename
-                print msg                
-            else:    
-                print '------- Trying to compile c-extension %s' %filename
-            
+                print 'WARNING: Could not compile C-extension %s'\
+                      %filename
+            else:
                 try:
-                    compile(filename)
+                    exec('import %s' %root)
                 except:
-                    print 'WARNING: Could not compile C-extension %s'\
-                          %filename
+                    msg = 'C extension %s seems to compile OK, '
+                    msg += 'but it can still not be imported.'
+                    raise msg
                 else:
-                    try:
-                        exec('import %s' %root)
-                    except:
-                        msg = 'C extension %s seems to compile OK, '
-                        msg += 'but it can still not be imported.'
-                        raise msg
-                    else:
-                        C=True
-        else:
-            C=True
+                    C=True
+    else:
+        C=True
             
     if not C:

inundation/utilities/polygon.py

@@ -1 @@
-
-
-
-
-#####################################
-#POLYGON STUFF
-#
-#FIXME: All these should be put into new module polygon.py
-
-
+#!/usr/bin/env python
+"""Polygon manipulations
+
+"""
+
+from utilities.numerical_tools import ensure_numeric
 
 def point_on_line(x, y, x0, y0, x1, y1):
@@ -284 +280 @@
     M = points.shape[0]  #Number of points
 
-    from util_ext import separate_points_by_polygon
+    from polygon_ext import separate_points_by_polygon
 
     if verbose: print 'Allocating array for indices'
@@ -351 +347 @@
 
     def __call__(self, x, y):
-        from util import inside_polygon
         from Numeric import ones, Float, concatenate, array, reshape, choose
 

inundation/utilities/polygon_ext.c

@@ -245 +245 @@
 
 
-PyObject *gradient(PyObject *self, PyObject *args) {
-  //
-  // a,b = gradient(x0, y0, x1, y1, x2, y2, q0, q1, q2)
-  //
-
-  double x0, y0, x1, y1, x2, y2, q0, q1, q2, a, b;
-  PyObject *result;
-
-  // Convert Python arguments to C
-  if (!PyArg_ParseTuple(args, "ddddddddd", &x0, &y0, &x1, &y1, &x2, &y2,
-                        &q0, &q1, &q2))
-    return NULL;
-
-
-  // Call underlying routine
-  _gradient(x0, y0, x1, y1, x2, y2,
-            q0, q1, q2, &a, &b);
-
-  // Return values a and b
-  result = Py_BuildValue("dd", a, b);
-  return result;
-}
-
-PyObject *gradient2(PyObject *self, PyObject *args) {
-  //
-  // a,b = gradient2(x0, y0, x1, y1, q0, q1)
-  //
-
-  double x0, y0, x1, y1, q0, q1, a, b;
-  PyObject *result;
-
-  // Convert Python arguments to C
-  if (!PyArg_ParseTuple(args, "dddddd", &x0, &y0, &x1, &y1, &q0, &q1))
-    return NULL;
-
-
-  // Call underlying routine
-  _gradient2(x0, y0, x1, y1, q0, q1, &a, &b);
-
-  // Return values a and b
-  result = Py_BuildValue("dd", a, b);
-  return result;
-}
-
 // Method table for python module
 static struct PyMethodDef MethodTable[] = {
@@ -296 +252 @@
    */
 
-  //{"rotate", (PyCFunction)rotate, METH_VARARGS | METH_KEYWORDS, "Print out"},
-  {"gradient", gradient, METH_VARARGS, "Print out"},
-  {"gradient2", gradient2, METH_VARARGS, "Print out"},  
   {"point_on_line", point_on_line, METH_VARARGS, "Print out"},
   {"separate_points_by_polygon", separate_points_by_polygon, 
@@ -308 +261 @@
 
 // Module initialisation
-void initutil_ext(void){
+void initpolygon_ext(void){
   Py_InitModule("polygon_ext", MethodTable);