[Numpy-svn] r3662 - trunk/numpy/doc/swig

numpy-svn@scip... numpy-svn@scip...
Wed Apr 4 12:44:07 CDT 2007


Author: wfspotz@sandia.gov
Date: 2007-04-04 12:44:03 -0500 (Wed, 04 Apr 2007)
New Revision: 3662

Modified:
   trunk/numpy/doc/swig/Makefile
   trunk/numpy/doc/swig/README
Log:
Updated the README file and added testing to the Makefile

Modified: trunk/numpy/doc/swig/Makefile
===================================================================
--- trunk/numpy/doc/swig/Makefile	2007-04-04 17:35:36 UTC (rev 3661)
+++ trunk/numpy/doc/swig/Makefile	2007-04-04 17:44:03 UTC (rev 3662)
@@ -26,6 +26,10 @@
 all: $(WRAPPERS) series.cxx series.h
 	./setup.py build
 
+test: all
+	test1D.py
+	test2D.py
+
 doc: html pdf
 
 %_wrap.cxx: %.i numpy.i series.h
@@ -54,4 +58,4 @@
 	$(RM) $(LATEX_FILES)
 	$(RM) *.aux *.dvi *.log *.out *~
 
-.PHONY : all doc html tex pdf clean
+.PHONY : all test doc html tex pdf clean

Modified: trunk/numpy/doc/swig/README
===================================================================
--- trunk/numpy/doc/swig/README	2007-04-04 17:35:36 UTC (rev 3661)
+++ trunk/numpy/doc/swig/README	2007-04-04 17:44:03 UTC (rev 3662)
@@ -14,21 +14,35 @@
     series.h
     series.cxx
     Series.i
-    testSeries.py
+    test1D.py
+    test2D.py
 
 The series.h header file contains prototypes for functions that
 illustrate the wrapping issues we wish to address.  Right now, this
 consists of functions with argument signatures of the form::
 
+    (type IN_ARRAY1[ANY])
     (type* IN_ARRAY1, int DIM1)
+    (int DIM1, type* IN_ARRAY1)
+
+    (type IN_ARRAY2[ANY][ANY])
     (type* IN_ARRAY2, int DIM1, int DIM2)
-    (int DIM1, type* IN_ARRAY1)``
-    (int DIM1, int DIM2, type* IN_ARRAY2)``
+    (int DIM1, int DIM2, type* IN_ARRAY2)
+
+    (type INPLACE_ARRAY1[ANY])
     (type* INPLACE_ARRAY1, int DIM1)
+    (int DIM1, type* INPLACE_ARRAY1)
+
+    (type INPLACE_ARRAY2[ANY][ANY])
     (type* INPLACE_ARRAY2, int DIM1, int DIM2)
-    (int DIM1, type* INPLACE_ARRAY1)
     (int DIM1, int DIM2, type* INPLACE_ARRAY2)
 
+    (type ARGOUT_ARRAY1[ANY])
+    (type* ARGOUT_ARRAY1, int DIM1)
+    (int DIM1, type* ARGOUT_ARRAY1)
+
+    (type ARGOUT_ARRAY2[ANY][ANY])
+
 which take a pointer to an array of type "type", whose length is
 specified by the integer(s) DIM1 (and DIM2).
 
@@ -45,8 +59,9 @@
 types.
 
 The source file series.cxx contains the actual implementations of the
-functions described in series.h.  The python script testSeries.py
-tests the resulting python wrappers using the unittest module.
+functions described in series.h.  The python scripts test1D.py and
+test2D.py test the resulting python wrappers using the unittest
+module.
 
 The SWIG interface file Series.i is used to generate the wrapper code.
 The SWIG_FILE_WITH_INIT macro allows numpy.i to be used with multiple
@@ -67,7 +82,7 @@
 To build and test the code, simply execute from the shell::
 
     $ make
-    $ testSeries.py
+    $ make test
 
 ================================================================================
 



More information about the Numpy-svn mailing list