summaryrefslogtreecommitdiff
path: root/doc/source/reference
diff options
context:
space:
mode:
authorEgor Zindy <ezindy@gmail.com>2013-06-16 22:50:40 +0100
committerEgor Zindy <ezindy@gmail.com>2013-06-16 22:50:40 +0100
commitf70632f74f7b0feb9d78aff62eb9eebbb6a502ba (patch)
tree547d549c16f74fb377e9fd6c1dd06a14e929a1ef /doc/source/reference
parentf56411b4913f265fba1a50eba590124d5f7a6d27 (diff)
downloadnumpy-f70632f74f7b0feb9d78aff62eb9eebbb6a502ba.tar.gz
Added more mentions of the SuperTensor tests and corrected the number of typemaps and tests (currently 1427 unit tests passed with 'make test': 372+324+324+324+40+19+24)
Diffstat (limited to 'doc/source/reference')
-rw-r--r--doc/source/reference/swig.interface-file.rst4
-rw-r--r--doc/source/reference/swig.testing.rst14
2 files changed, 10 insertions, 8 deletions
diff --git a/doc/source/reference/swig.interface-file.rst b/doc/source/reference/swig.interface-file.rst
index 00f43b951..8ef6c80ab 100644
--- a/doc/source/reference/swig.interface-file.rst
+++ b/doc/source/reference/swig.interface-file.rst
@@ -1024,7 +1024,7 @@ between NumPy arrays and C arrays:
``unsigned int``, ``long``, ``unsigned long``, ``long long``,
``unsigned long long``, ``float`` and ``double``.
- * That support 70 different argument signatures for each data type,
+ * That support 74 different argument signatures for each data type,
including:
+ One-dimensional, two-dimensional, three-dimensional and
@@ -1043,7 +1043,7 @@ The ``numpy.i`` interface file also provides additional tools for
wrapper developers, including:
* A `SWIG`_ macro (``%numpy_typemaps``) with three arguments for
- implementing the 70 argument signatures for the user's choice of
+ implementing the 74 argument signatures for the user's choice of
(1) C data type, (2) NumPy data type (assuming they match), and
(3) dimension type.
diff --git a/doc/source/reference/swig.testing.rst b/doc/source/reference/swig.testing.rst
index 90bf5c887..8b19e4b28 100644
--- a/doc/source/reference/swig.testing.rst
+++ b/doc/source/reference/swig.testing.rst
@@ -6,11 +6,11 @@ Introduction
Writing tests for the ``numpy.i`` `SWIG <http://www.swig.org>`_
interface file is a combinatorial headache. At present, 12 different
-data types are supported, each with 70 different argument signatures,
-for a total of 840 typemaps supported "out of the box". Each of these
+data types are supported, each with 74 different argument signatures,
+for a total of 888 typemaps supported "out of the box". Each of these
typemaps, in turn, might require several unit tests in order to verify
expected behavior for both proper and improper inputs. Currently,
-this results in 1,102 individual unit tests that are performed when
+this results in 1,427 individual unit tests that are performed when
``make test`` is run in the ``numpy/docs/swig`` subdirectory.
To facilitate this many similar unit tests, some high-level
@@ -56,9 +56,11 @@ each data type supported.
Two-dimensional arrays are tested in exactly the same manner. The
above description applies, but with ``Matrix`` substituted for
``Vector``. For three-dimensional tests, substitute ``Tensor`` for
-``Vector``. For the descriptions that follow, we will reference the
-``Vector`` tests, but the same information applies to ``Matrix`` and
-``Tensor`` tests.
+``Vector``. For four-dimensional tests, substitute ``SuperTensor``
+for ``Vector``.
+For the descriptions that follow, we will reference the
+``Vector`` tests, but the same information applies to ``Matrix``,
+``Tensor`` and ``SuperTensor`` tests.
The command ``make test`` will ensure that all of the test software is
built and then run all three test scripts.