Merge branch 'numpy-swig' into gh-3451

* numpy-swig:
  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)
  Added mention of the SuperTensor tests in the README file
  Removed 'static' keyword from pyfragments.swg altoghether. I've had the following errors In function ‘SWIG_AsVal_long’: error: initialiser element is not constant In function ‘SWIG_AsVal_unsigned_SS_long’: error: initialiser element is not constant, BOTH in Windows/MinGW and Linux when compiling with gcc
  Added tests for 4D tensors. Now using a consistant cubes,slices,rows,columns index order everywhere.
  cleaned-up loop indexes in Tensor.cxx
  cosmetic changes to numpy.i
  Fixed the capsule / cobject memory destructor. Added types to deal with lists of arrays and lists of tensors as input and inplace types.
  removed the note about testResize1 failing in testArray.py
  fixed the testResize1 test in testArray.py -- Changed order of the resize arguments in Array2.h and replaced len(XXXnumpyarray) with XXXnumpyarray.size
  Minor adjustments to numpy.i
  Updated numpy.i testing documentation
  Updated the numpy.i documentation
  Initialize all DATA_TYPE* data_temp variables to NULL
  Added Egor's ARGOUTVIEWM_ARRAY3 typemaps
  Re-instated a Python 3 fix
  Removed doc from list of sub-directories
  Upgrade numpy.i
  Got rid of a unit test

Conflicts:
	doc/sphinxext
	doc/swig/test/testFortran.py

1 files changed, 8 insertions, 8 deletions

diff --git a/doc/swig/test/Tensor.h b/doc/swig/test/Tensor.h
index d60eb2d2e..1f483b328 100644
--- a/doc/swig/test/Tensor.h
+++ b/doc/swig/test/Tensor.h
@@ -5,11 +5,11 @@
 // functions that work with 3D arrays with the forms
 //
 //     TYPE SNAMENorm(   TYPE tensor[2][2][2]);
-//     TYPE SNAMEMax(    TYPE * tensor, int rows, int cols, int num);
-//     TYPE SNAMEMin(    int rows, int cols, int num, TYPE * tensor);
+//     TYPE SNAMEMax(    TYPE * tensor, int slices, int rows, int cols);
+//     TYPE SNAMEMin(    int slices, int rows, int cols, TYPE * tensor);
 //     void SNAMEScale(  TYPE array[3][3][3]);
-//     void SNAMEFloor(  TYPE * array,  int rows, int cols, int num, TYPE floor);
-//     void SNAMECeil(   int rows, int cols, int num, TYPE * array,  TYPE ceil );
+//     void SNAMEFloor(  TYPE * array,  int slices, int rows, int cols, TYPE floor);
+//     void SNAMECeil(   int slices, int rows, int cols, TYPE * array,  TYPE ceil );
 //     void SNAMELUSplit(TYPE in[3][3][3], TYPE lower[3][3][3], TYPE upper[3][3][3]);
 //
 // for any specified type TYPE (for example: short, unsigned int, long
@@ -29,11 +29,11 @@
 #define TEST_FUNC_PROTOS(TYPE, SNAME) \
 \
 TYPE SNAME ## Norm(   TYPE tensor[2][2][2]); \
-TYPE SNAME ## Max(    TYPE * tensor, int rows, int cols, int num); \
-TYPE SNAME ## Min(    int rows, int cols, int num, TYPE * tensor); \
+TYPE SNAME ## Max(    TYPE * tensor, int slices, int rows, int cols); \
+TYPE SNAME ## Min(    int slices, int rows, int cols, TYPE * tensor); \
 void SNAME ## Scale(  TYPE array[3][3][3], TYPE val); \
-void SNAME ## Floor(  TYPE * array, int rows, int cols, int num, TYPE floor); \
-void SNAME ## Ceil(   int rows, int cols, int num, TYPE * array, TYPE ceil ); \
+void SNAME ## Floor(  TYPE * array, int slices, int rows, int cols, TYPE floor); \
+void SNAME ## Ceil(   int slices, int rows, int cols, TYPE * array, TYPE ceil ); \
 void SNAME ## LUSplit(TYPE tensor[2][2][2], TYPE lower[2][2][2], TYPE upper[2][2][2]);
 
 TEST_FUNC_PROTOS(signed char       , schar    )