Changeset 3594

Timestamp:

03/24/07 15:34:05 (2 years ago)

Author:

wfspotz@sandia.gov

Message:

Added typemaps for signatures (TYPE IN_ARRAY1[ANY]) and (TYPE IN_ARRAY2[ANY][ANY])

Files:

• trunk/numpy/doc/swig/Series.i (modified) (1 diff)
• trunk/numpy/doc/swig/numpy.i (modified) (7 diffs)
• trunk/numpy/doc/swig/numpy_swig.html (modified) (3 diffs)
• trunk/numpy/doc/swig/numpy_swig.pdf (modified) (45 diffs)
• trunk/numpy/doc/swig/numpy_swig.txt (modified) (2 diffs)
• trunk/numpy/doc/swig/series.cxx (modified) (5 diffs)
• trunk/numpy/doc/swig/series.h (modified) (2 diffs)
• trunk/numpy/doc/swig/testSeries.py (modified) (60 diffs)

trunk/numpy/doc/swig/Series.i

@@ -16 +16 @@
-%define %apply_numpy_typemaps(TYPE)
-
+%apply (TYPE IN_ARRAY1[ANY]) {(TYPE vector[ANY])};
-%apply (TYPE* IN_ARRAY1, int DIM1) {(TYPE* series, int size)};
+%apply (int DIM1, TYPE* IN_ARRAY1) {(int size, TYPE* series)};
+%apply (TYPE IN_ARRAY2[ANY][ANY]) {(TYPE matrix[ANY][ANY])};
-%apply (TYPE* IN_ARRAY2, int DIM1, int DIM2) {(TYPE* matrix, int rows, int cols)};
+%apply (int DIM1, int DIM2, TYPE* IN_ARRAY2) {(int rows, int cols, TYPE* matrix)};
-%apply (TYPE* INPLACE_ARRAY1, int DIM1) {(TYPE* array, int size)};
+%apply (int DIM1, TYPE* INPLACE_ARRAY1) {(int size, TYPE* array)};
-%apply (TYPE* INPLACE_ARRAY2, int DIM1, int DIM2) {(TYPE* array, int rows, int cols)};
-%apply (int DIM1, TYPE* IN_ARRAY1) {(int size, TYPE* series)};
-%apply (int DIM1, int DIM2, TYPE* IN_ARRAY2) {(int rows, int cols, TYPE* matrix)};
-%apply (int DIM1, TYPE* INPLACE_ARRAY1) {(int size, TYPE* array)};
-%apply (int DIM1, int DIM2, TYPE* INPLACE_ARRAY2) {(int rows, int cols, TYPE* array)};
-

trunk/numpy/doc/swig/numpy.i

@@ -303 +303 @@
- * arguments of the form
- *
+ *     (DATA_TYPE IN_ARRAY1[ANY])
+ *
- *     (DATA_TYPE* IN_ARRAY1, DIM_TYPE DIM1)
+ *     (DIM_TYPE DIM1, DATA_TYPE* IN_ARRAY1)
+ *
+ *     (DATA_TYPE IN_ARRAY2[ANY][ANY])
+ *
- *     (DATA_TYPE* IN_ARRAY2, DIM_TYPE DIM1, DIM_TYPE DIM2)
+ *     (DIM_TYPE DIM1, DIM_TYPE DIM2, DATA_TYPE* IN_ARRAY2)
+ *
- *     (DATA_TYPE* INPLACE_ARRAY1, DIM_TYPE DIM1)
+ *     (DIM_TYPE DIM1, DATA_TYPE* INPLACE_ARRAY1)
+ *
- *     (DATA_TYPE* INPLACE_ARRAY2, DIM_TYPE DIM1, DIM_TYPE DIM2)
-
-
-
-
-
-
-
+
+
+
+
+
- *
- * where "DATA_TYPE" is any type supported by the NumPy module.  In python,
@@ -325 +333 @@
- * %apply directive:
- *
+ *     %apply (double IN_ARRAY1[ANY]) {(double vector[ANY])};
+ *     double length(double vector[3]);
+ *
- *     %apply (double* IN_ARRAY1, int DIM1) {(double* series, int length)};
- *     double prod(double* series, int length);
- *
-
-
+
+
+
+
+
+
+
+
+
+
+
- *
- *     %apply (double* INPLACE_ARRAY1, int DIM1) {(double* series, int length)};
- *     void ones(double* series, int length);
- *
- *     %apply (double* INPLACE_ARRAY2, int DIM1, int DIM2) {(double* mx, int rows, int cols)};
- *     void floor(double* mx, int rows, int cols);
- *
- *     %apply (double* ARGOUT_ARRAY1[ANY] {(double series, int length)};
- *     void negate(double* series, int length);
- *
- *     %apply (double* ARGOUT_ARRAY2[ANY][ANY]) {(double* mx, int rows, int cols)};
- *     void normalize(double* mx, int rows, int cols);
- *
- *     %apply (int DIM1, double* IN_ARRAY1) {(int length, double* series)}
- *     double sum(int length, double* series)
- *
- *     %apply (int DIM1, int DIM2, double* IN_ARRAY2) {(int rows, int cols, double* matrix)}
- *     double min(int length, double* series)
- *
- *     %apply (int DIM1, double* INPLACE_ARRAY1) {(int length, double* series)}
- *     double zeros(int length, double* series)
- *
+ *     %apply (double* INPLACE_ARRAY2, int DIM1, int DIM2) {(double* matrix, int rows, int cols)};
+ *     void floor(double* matrix, int rows, int cols);
+ *
+ *     %apply (int DIM1, int DIM2, double* INPLACE_ARRAY2) {(int rows, int cols, double* matrix)};
+ *     void ceil(int rows, int cols, double* matrix);
+ *
+ *     %apply (double ARGOUT_ARRAY1[ANY] {(double series[int length])};
+ *     void negate(double* series, int length);
+ *
+ *     %apply (double ARGOUT_ARRAY2[ANY][ANY]) {(double matrix[int rows][int cols])};
+ *     void normalize(double* matrix, int rows, int cols);
+ *
- * or directly with
- *
+ *     double length(double IN_ARRAY[ANY]);
+ *
- *     double prod(double* IN_ARRAY1, int DIM1);
+ *     double sum( int DIM1, double* IN_ARRAY1)
+ *
+ *     double det(double IN_ARRAY2[ANY][ANY]);
+ *
- *     double max(double* IN_ARRAY2, int DIM1, int DIM2);
- *     void ones(double* INPLACE_ARRAY1, int DIM1);
- *     void floor(double* INPLACE_ARRAY2, int DIM1, int DIM2);
- *     void negate(double* ARGOUT_ARRAY1[ANY]);
- *     void normalize(double* ARGOUT_ARRAY2[ANY][ANY]);
- *
- *     double sum(int DIM1, double* IN_ARRAY1)
- *     double min(int DIM1, int DIM2, double* IN_ARRAY2)
+ *
+ *     void ones( double* INPLACE_ARRAY1, int DIM1);
- *     void zeros(int DIM1, double* INPLACE_ARRAY1)
+ *
+ *     void floor(double* INPLACE_ARRAY2, int DIM1, int DIM2, double floor);
+ *     void ceil( int DIM1, int DIM2, double* INPLACE_ARRAY2, double ceil );
+ *
+ *     void negate(double ARGOUT_ARRAY1[ANY]);
+ *
+ *     void normalize(double ARGOUT_ARRAY2[ANY][ANY]);
- */
-
-%define %numpy_typemaps(DATA_TYPE, DATA_TYPECODE, DIM_TYPE)
-
+/* Typemap suite for (DATA_TYPE IN_ARRAY1[ANY])
+ */
+%typemap(in)
+  (DATA_TYPE IN_ARRAY1[ANY])
+  (PyArrayObject* array=NULL, int is_new_object=0)
+{
+  array = obj_to_array_contiguous_allow_conversion($input, DATA_TYPECODE, &is_new_object);
+  npy_intp size[1] = { $1_dim0 };
+  if (!array || !require_dimensions(array, 1) || !require_size(array, size, 1)) SWIG_fail;
+  $1 = ($1_ltype) array->data;
+}
+%typemap(freearg)
+  (DATA_TYPE IN_ARRAY1[ANY])
+{
+  if (is_new_object$argnum && array$argnum) Py_DECREF(array$argnum);
+}
+
-/* Typemap suite for (DATA_TYPE* IN_ARRAY1, DIM_TYPE DIM1)
- */
-%typemap(in)
-  (DATA_TYPE* IN_ARRAY1, DIM_TYPE DIM1)
+  (PyArrayObject* array=NULL, int is_new_object=0)
+{
+  array = obj_to_array_contiguous_allow_conversion($input, DATA_TYPECODE, &is_new_object);
+  npy_intp size[1] = { -1 };
+  if (!array || !require_dimensions(array, 1) || !require_size(array, size, 1)) SWIG_fail;
+  $1 = (DATA_TYPE*) array->data;
+  $2 = (DIM_TYPE) array->dimensions[0];
+}
+%typemap(freearg)
+  (DATA_TYPE* IN_ARRAY1, DIM_TYPE DIM1)
+{
+  if (is_new_object$argnum && array$argnum) Py_DECREF(array$argnum);
+}
+
+/* Typemap suite for (DIM_TYPE DIM1, DATA_TYPE* IN_ARRAY1)
+ */
+%typemap(in)
+  (DIM_TYPE DIM1, DATA_TYPE* IN_ARRAY1)
-  (PyArrayObject* array=NULL, int is_new_object=0)
-{
@@ -377 +438 @@
-  npy_intp size[1] = {-1};
-  if (!array || !require_dimensions(array, 1) || !require_size(array, size, 1)) SWIG_fail;
-ATA_TYPE*) array->data
-IM_TYPE) array->dimensions[0]
+IM_TYPE) array->dimensions[0]
+ATA_TYPE*) array->data
-}
-%typemap(freearg)
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-{
-  if (is_new_object$argnum && array$argnum) Py_DECREF(array$argnum);
@@ -405 +483 @@
-}
-
+/* Typemap suite for (DIM_TYPE DIM1, DIM_TYPE DIM2, DATA_TYPE* IN_ARRAY2)
+ */
+%typemap(in)
+  (DIM_TYPE DIM1, DIM_TYPE DIM2, DATA_TYPE* IN_ARRAY2)
+  (PyArrayObject* array=NULL, int is_new_object=0)
+{
+  array = obj_to_array_contiguous_allow_conversion($input, DATA_TYPECODE, &is_new_object);
+  npy_intp size[2] = {-1,-1};
+  if (!array || !require_dimensions(array, 2) || !require_size(array, size, 1)) SWIG_fail;
+  $1 = (DIM_TYPE) array->dimensions[0];
+  $2 = (DIM_TYPE) array->dimensions[1];
+  $3 = (DATA_TYPE*) array->data;
+}
+%typemap(freearg)
+  (DIM_TYPE DIM1, DIM_TYPE DIM2, DATA_TYPE* IN_ARRAY2)
+{
+  if (is_new_object$argnum && array$argnum) Py_DECREF(array$argnum);
+}
+
-/* Typemap suite for (DATA_TYPE* INPLACE_ARRAY1, DIM_TYPE DIM1)
- */
@@ -423 +520 @@
-}
-
+/* Typemap suite for (DIM_TYPE DIM1, DATA_TYPE* INPLACE_ARRAY1)
+ */
+%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY)
+  (DIM_TYPE DIM1, DATA_TYPE* INPLACE_ARRAY1)
+{
+  $1 = is_array($input) && PyArray_EquivTypenums(array_type($input),DATA_TYPECODE);
+}
+%typemap(in)
+  (DIM_TYPE DIM1, DATA_TYPE* INPLACE_ARRAY1)
+  (PyArrayObject* temp=NULL)
+{
+  temp = obj_to_array_no_conversion($input, DATA_TYPECODE);
+  if (!temp  || !require_contiguous(temp)) SWIG_fail;
+  $1 = 1;
+  for (int i=0; i<temp->nd; ++i) $1 *= temp->dimensions[i];
+  $2 = (DATA_TYPE*) temp->data;
+}
+
-/* Typemap suite for (DATA_TYPE* INPLACE_ARRAY2, DIM_TYPE DIM1, DIM_TYPE DIM2)
- */
@@ -439 +554 @@
-  $2 = (DIM_TYPE) temp->dimensions[0];
-  $3 = (DIM_TYPE) temp->dimensions[1];
+}
+
+/* Typemap suite for (DIM_TYPE DIM1, DIM_TYPE DIM2, DATA_TYPE* INPLACE_ARRAY2)
+ */
+%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY)
+  (DIM_TYPE DIM1, DIM_TYPE DIM2, DATA_TYPE* INPLACE_ARRAY2)
+{
+  $1 = is_array($input) && PyArray_EquivTypenums(array_type($input),DATA_TYPECODE);
+}
+%typemap(in)
+  (DIM_TYPE DIM1, DIM_TYPE DIM2, DATA_TYPE* INPLACE_ARRAY2)
+  (PyArrayObject* temp=NULL)
+{
+  temp = obj_to_array_no_conversion($input, DATA_TYPECODE);
+  if (!temp || !require_contiguous(temp)) SWIG_fail;
+  $1 = (DIM_TYPE) temp->dimensions[0];
+  $2 = (DIM_TYPE) temp->dimensions[1];
+  $3 = (DATA_TYPE*) temp->data;
-}
-
@@ -495 +628 @@
-    $result = PySequence_Concat($result, obj);
-  }
-}
-
-/* Typemap suite for (DIM_TYPE DIM1, DATA_TYPE* IN_ARRAY1)
- */
-%typemap(in)
-  (DIM_TYPE DIM1, DATA_TYPE* IN_ARRAY1)
-  (PyArrayObject* array=NULL, int is_new_object=0)
-{
-  array = obj_to_array_contiguous_allow_conversion($input, DATA_TYPECODE, &is_new_object);
-  npy_intp size[1] = {-1};
-  if (!array || !require_dimensions(array, 1) || !require_size(array, size, 1)) SWIG_fail;
-  $1 = (DIM_TYPE) array->dimensions[0];
-  $2 = (DATA_TYPE*) array->data;
-}
-%typemap(freearg)
-  (DIM_TYPE DIM1, DATA_TYPE* IN_ARRAY1)
-{
-  if (is_new_object$argnum && array$argnum) Py_DECREF(array$argnum);
-}
-
-/* Typemap suite for (DIM_TYPE DIM1, DIM_TYPE DIM2, DATA_TYPE* IN_ARRAY2)
- */
-%typemap(in)
-  (DIM_TYPE DIM1, DIM_TYPE DIM2, DATA_TYPE* IN_ARRAY2)
-  (PyArrayObject* array=NULL, int is_new_object=0)
-{
-  array = obj_to_array_contiguous_allow_conversion($input, DATA_TYPECODE, &is_new_object);
-  npy_intp size[2] = {-1,-1};
-  if (!array || !require_dimensions(array, 2) || !require_size(array, size, 1)) SWIG_fail;
-  $1 = (DIM_TYPE) array->dimensions[0];
-  $2 = (DIM_TYPE) array->dimensions[1];
-  $3 = (DATA_TYPE*) array->data;
-}
-%typemap(freearg)
-  (DIM_TYPE DIM1, DIM_TYPE DIM2, DATA_TYPE* IN_ARRAY2)
-{
-  if (is_new_object$argnum && array$argnum) Py_DECREF(array$argnum);
-}
-
-/* Typemap suite for (DIM_TYPE DIM1, DATA_TYPE* INPLACE_ARRAY1)
- */
-%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY)
-  (DIM_TYPE DIM1, DATA_TYPE* INPLACE_ARRAY1)
-{
-  $1 = is_array($input) && PyArray_EquivTypenums(array_type($input),DATA_TYPECODE);
-}
-%typemap(in)
-  (DIM_TYPE DIM1, DATA_TYPE* INPLACE_ARRAY1)
-  (PyArrayObject* temp=NULL)
-{
-  temp = obj_to_array_no_conversion($input, DATA_TYPECODE);
-  if (!temp  || !require_contiguous(temp)) SWIG_fail;
-  $1 = 1;
-  for (int i=0; i<temp->nd; ++i) $1 *= temp->dimensions[i];
-  $2 = (DATA_TYPE*) temp->data;
-}
-
-/* Typemap suite for (DIM_TYPE DIM1, DIM_TYPE DIM2, DATA_TYPE* INPLACE_ARRAY2)
- */
-%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY)
-  (DIM_TYPE DIM1, DIM_TYPE DIM2, DATA_TYPE* INPLACE_ARRAY2)
-{
-  $1 = is_array($input) && PyArray_EquivTypenums(array_type($input),DATA_TYPECODE);
-}
-%typemap(in)
-  (DIM_TYPE DIM1, DIM_TYPE DIM2, DATA_TYPE* INPLACE_ARRAY2)
-  (PyArrayObject* temp=NULL)
-{
-  temp = obj_to_array_no_conversion($input, DATA_TYPECODE);
-  if (!temp || !require_contiguous(temp)) SWIG_fail;
-  $1 = (DIM_TYPE) temp->dimensions[0];
-  $2 = (DIM_TYPE) temp->dimensions[1];
-  $3 = (DATA_TYPE*) temp->data;
-}
-

trunk/numpy/doc/swig/numpy_swig.html

@@ -486 +486 @@
-<blockquote>
-<ul class="simple">
+<li><tt class="docutils literal"><span class="pre">(DATA_TYPE</span> <span class="pre">IN_ARRAY[ANY])</span></tt></li>
-<li><tt class="docutils literal"><span class="pre">(DATA_TYPE*</span> <span class="pre">IN_ARRAY1,</span> <span class="pre">int</span> <span class="pre">DIM1)</span></tt></li>
+<li><tt class="docutils literal"><span class="pre">(int</span> <span class="pre">DIM1,</span> <span class="pre">DATA_TYPE*</span> <span class="pre">IN_ARRAY1)</span></tt></li>
+<li><tt class="docutils literal"><span class="pre">(DATA_TYPE</span> <span class="pre">IN_ARRAY[ANY])</span></tt></li>
-<li><tt class="docutils literal"><span class="pre">(DATA_TYPE*</span> <span class="pre">IN_ARRAY2,</span> <span class="pre">int</span> <span class="pre">DIM1,</span> <span class="pre">int</span> <span class="pre">DIM2)</span></tt></li>
-<li><tt class="docutils literal"><span class="pre">(int</span> <span class="pre">DIM1,</span> <span class="pre">DATA_TYPE*</span> <span class="pre">IN_ARRAY1)</span></tt></li>
-<li><tt class="docutils literal"><span class="pre">(int</span> <span class="pre">DIM1,</span> <span class="pre">int</span> <span class="pre">DIM2,</span> <span class="pre">DATA_TYPE*</span> <span class="pre">IN_ARRAY2)</span></tt></li>
-</ul>
@@ -503 +505 @@
-<ul class="simple">
-<li><tt class="docutils literal"><span class="pre">(DATA_TYPE*</span> <span class="pre">INPLACE_ARRAY1,</span> <span class="pre">int</span> <span class="pre">DIM1)</span></tt></li>
+<li><tt class="docutils literal"><span class="pre">(int</span> <span class="pre">DIM1,</span> <span class="pre">DATA_TYPE*</span> <span class="pre">INPLACE_ARRAY1)</span></tt></li>
-<li><tt class="docutils literal"><span class="pre">(DATA_TYPE*</span> <span class="pre">INPLACE_ARRAY2,</span> <span class="pre">int</span> <span class="pre">DIM1,</span> <span class="pre">int</span> <span class="pre">DIM2)</span></tt></li>
-<li><tt class="docutils literal"><span class="pre">(int</span> <span class="pre">DIM1,</span> <span class="pre">DATA_TYPE*</span> <span class="pre">INPLACE_ARRAY1)</span></tt></li>
-<li><tt class="docutils literal"><span class="pre">(int</span> <span class="pre">DIM1,</span> <span class="pre">int</span> <span class="pre">DIM2,</span> <span class="pre">DATA_TYPE*</span> <span class="pre">INPLACE_ARRAY2)</span></tt></li>
-</ul>
@@ -709 +711 @@
-<div class="footer">
-<hr class="footer" />
-3 12:04
+4 20:29
-Generated by <a class="reference" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
-

trunk/numpy/doc/swig/numpy_swig.pdf

@@ -648 +648 @@
->> endobj
-154 0 obj <<
-02
+67
-/Filter /FlateDecode
->>
-stream
-
-
-
-š{8 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-þœ±‘oŒÖoA›³lô`ÌÎføÙá$>™ƒ1Ä¡’P
-
-
-
-
-
-
-
-
-
-
-
-eyËMD°jœ1úÞoQXp‹šR"ӂ{oŽ÷èJ逆 
-
-Ê`(„xŠF &_HÒ
-žþ|j³µD vßçèõÑÝsšNàHvt5¯ 
-
-
-
-
-
-
-b|¯ÂD²)4¹pbXóŠüŽu72љ.ˆpËÏC,‹     Ûý(žö±Ìœ8ú”IŒŸ|Û§‹ôNû=ÌLˆ+CxË'öŽy«kªÌTkX­Â>Àô2‰ÇWñ€á"ŀì¹%PªÉ* Tž|¥Ä£ÊRxhw0)ü®º[ ¡ªnkÓwÖ}W 
-
-
-
-
-M{=dµFqù1^‘(xœG}^¯ÿ`/° 
-
-
-
-
-
-
+
+
+pN×öð¿6XÊ¬ÛÓ)èžr:©vczÔçÿØAœ‚ž(åõÄcâ-‹êÃõk 
+—binŒÅÚG¹µ®~@§Xsú›Ò 
+
+ÒdW–yæ.^aº¥þu
+
+þµ‘ 
+
+
+
+
+
+[ötMmâéRsœÎÓ>y>\þ€ñšzZ@ÊšXðt‚ªy:À–=]S›xºÔ;ãé\ïÿµF0Ñ*Cé‚?T͟
+ªEQËÁšèLbQ( EŠô     5dÁgŸÒ€‘(ùnŒYSÎW 
+
+
+bà        Fîov1rc8 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ÙûH\RÛñQ’ÏŽr€JE*29ÓÉ 
+
+
+
+
+
+
+
+Ûdõ9åL~‡ ™×÷8¿œc,É1oÇJà50y<2E!rÆÐ<E­ü‹ð 
+
+
+
+
+
+
+
+
+
+
+BÛNk‘X€MU͂”i¹.ÌÊʘä֐\=ÿÃ_H?HAW·åüßñ¶£y€7#ŒjöHèðÍ閱͑G8Ôn=KVU‡FPÝ2¥Z%¥Î,;8ú&¬š‚Ý 
+
+
-endobj
-153 0 obj <<
@@ -728 +749 @@
-/Type /Annot
-/Border[0 0 0]/H/I/C[0 1 1]
-82.627 476.7701 593.4662
+50.7466 476.7701 561.5858
-/Subtype/Link/A<</Type/Action/S/URI/URI(http://www.python.org)>>
->> endobj
@@ -734 +755 @@
-/Type /Annot
-/Border[0 0 0]/H/I/C[0 1 1]
-70.6718 197.0281 581.5111
+38.7914 197.0281 549.6306
-/Subtype/Link/A<</Type/Action/S/URI/URI(http://numpy.scipy.org)>>
->> endobj
@@ -740 +761 @@
-/Type /Annot
-/Border[0 0 0]/H/I/C[0 1 1]
-424.7942 227.0456 435.6335
+392.9138 227.0456 403.753
-/Subtype/Link/A<</Type/Action/S/URI/URI(http://www.python.org)>>
->> endobj
@@ -746 +767 @@
-/Type /Annot
-/Border[0 0 0]/H/I/C[0 1 1]
-400.8839 500.7011 411.7231
+369.0034 500.7011 379.8427
-/Subtype/Link/A<</Type/Action/S/URI/URI(http://www.python.org)>>
->> endobj
@@ -752 +773 @@
-/Type /Annot
-/Border[0 0 0]/H/I/C[1 0 0]
-98.8419 423.3722 309.6811
+66.9614 423.3722 277.8007
-/Subtype /Link
-/A << /S /GoTo /D (available-typemaps) >>
@@ -759 +780 @@
-/Type /Annot
-/Border[0 0 0]/H/I/C[1 0 0]
-95.2304 313.0848 206.0697
+63.35 313.0848 174.1892
-/Subtype /Link
-/A << /S /GoTo /D (input-arrays) >>
@@ -766 +787 @@
-/Type /Annot
-/Border[0 0 0]/H/I/C[1 0 0]
-95.2304 474.368 206.0697
+63.35 474.368 174.1892
-/Subtype /Link
-/A << /S /GoTo /D (in-place-arrays) >>
@@ -777 +798 @@
->> endobj
-114 0 obj <<
-42.3876
+10.5072
->> endobj
-26 0 obj <<
-42.3876
+10.5072
->> endobj
-159 0 obj <<
-607.1471
+575.2667
->> endobj
-115 0 obj <<
-96.51
+64.6296
->> endobj
-30 0 obj <<
-96.51
+64.6296
->> endobj
-162 0 obj <<
-61.2695
+29.3891
->> endobj
-116 0 obj <<
-47.0757
+15.1952
->> endobj
-34 0 obj <<
-47.0757
+15.1952
->> endobj
-165 0 obj <<
-311.4069
+279.5264
->> endobj
-117 0 obj <<
-84.2715
+52.3911
->> endobj
-38 0 obj <<
-84.2715
+52.3911
->> endobj
-152 0 obj <<
@@ -1166 +1187 @@
->> endobj
-199 0 obj <<
-2
+1
-/Filter /FlateDecode
->>
@@ -1202 +1223 @@
-^dõQ%ây×zê˜.J
-#-÷NŠ!aXŏ¥n/Œe
-
-
-
-
-{º-s§‹æßCö2¢%«÷çê¥.€ƒ d•Ã6i®k”åd¥_’Œcðš7ÝY$™r ”w5 
-
+
+
+
+
+
+
+
+
-endobj
-198 0 obj <<
@@ -1288 +1311 @@
->> endobj
-210 0 obj <<
-213
-702
+197
+595
-/Length3 532
-473
+361
-/Filter /FlateDecode
->>
-stream
-äâÁeb’CB¬\¡žŒ•+DdÜl  (Ÿˆš€.@áä 
-
-
-
-:Ò 
-
-
-Bÿ 
-,(“¬”E0ó€!6žÜT/ÊÉÿ†©Š+ºÁ`VŽ¿äQ3úoY+G(Ìë?óG'7W ŽCð–BþeM 
-6V0È_q 
-
-
-
-
-øP8â   €x¢ürsÁ®š[š‘ølHÜ_›É/à¶ór²ƒÀÅÿp;¡6      þ 
-7ù›xÜ® 
-
-8yQûäá     ðøþ—B        »þõð£Îù¿ÙŠz* Owz
-ºæç 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-_ÜàSRÒÃó˜       ؞F&ów„ù=f}žív³¿Ú$åÅõ¢‰«ŸIþõz(štIKâ±%wç§ÇÊà!üè–^ž£¬G·C|!ܞ&c—ºÙ•w«2¯Cg%8Ü@¬¬;x^ß‘èôÍv(˜îéæ‰Öc߀©eìƒwhžþ<X%©“W0iFEotÅÅ£A3^Ì­Û×Ï!nj7;€‚ÆÜ?(Àá,<·ùñÈ/äv”³©§Œ!zد¬EørĢ 
-
-
-
-Þúþ,¿Äw9$¬Pךæ=iª€4%~ÊÙõžšÏë4ãžÔŽÆè)#²m3ÿù‹ØéÛø
-4û 
-
-&äYããœMJ3ÆØ»#i͹'S„     ¡kzt‡xTý       hŽÚEFD¢ä*ОÞçÁË¡<ßmr°ÛŸîÂ6æO:Ò7Oç¬ ëÛð)%Ã+„Åïù[ØÖ-9—”HÕ  óx§ÐœÆÃ\æ™ïùp_ãnÿIfÎSÉiU®29¹&¡5êRû[ 
-
-
-
-
-
-
-
-
-
-Å—~_®Ÿ~ⓢPš!cÈɋ©Ÿè 
-
-
-
-
-
-ÏÄID 
-
-
-7'Ϛ(R.q€•;^¥œ© ›ÿvraÖÒø!f™ÂVtí–C-îüNû 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-?®ŠeÞ<ÍïË'ÉFB»ËWo_†Œ–W¹žŽõµá^Î{¯#s&l‹Áe.íùoúÓšGšu$Èçƒv}9OÐLk    Õ\Yqr¿›ú[–<Ëù™ÌH 
-
-
-
-
-
-
-
-
-š xƔ#UnI8–û=¥Ñ‚ämñÁ@Vo.¯ZëCnñšJƒ^0ðŽÂã`õÃÄä€Â“Ž¶ùÎY     ŽlvÊR³òš–ÏI^
-
-Å»G#8‰zä‡-T_æ×M<®öl†nÞQÉ¥Œ~wå/;"¯Ý&;æTu 
-
-
-
-ÐÄ.C^ 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-uLsÌ@÷m˜\žÍn¡)”Ž¹éœÚ áòwÅ¥:²QF{ΡU%/Ÿ?ð’¡båµÛ'ÙӎÅ7XyìnvŽö@Þ§²ºv`‚FÌ_ 
-
-
-
-
-
-
+
+
+
+ØØä]¡7®qƒŠÁ`A ,Ê($‰ƒÅEÁ6 <ÂÙËfgïä”çúµH(ëu 
+
+
+
+Šý+lƒrþwÊ 
+
+
+
+
+
+
+
+
+
+ä÷†º"þˆ 
+ùÝ<þ`AÛ»B¡¿#B@~[ÊõwS                uÿ£(FÕáˆø 
+
+
+
+
+
+
+
+
+
+
+
+
+ׯŸ5Å~~Ъ"-®z·Û2ûE3ùЂ`Ze”¡‡3}Á 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+/P"ëŒW¯ý'±]-³ãΊëšðh.–Ï|”8iç؃‡(Œo “îxYLñИœµ÷ڑvû¶ÕcÃÖµ?Ÿbƒ%ÊLy²!Ic$ßz{ 
+
+
+
+
+
+
+
+
+
+
+
+væMxžH6âÜÈۙûr¥yhç<ãû‹ù„‰Õ4ÄcvÈ5¹V2Á}f#5ÕMÊN+Å÷W“ùo€™Ž©ÀUÜÂVþú²i¶ü4™fÇ5Þ±«g‹>4h 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ÖÒôRÁ™àitÊöJ²;‰Š\©¡çx;íSéY©{*=ÙþâN)t$øíbš}He 
+
+
+
+
+¹Ú£&NU    âÐcþªïrꂻožéi$ŒlÉZžv~zEàûC`×ð³{šlØ9P#ëÎ-ŠX%æÑw8'ªÎ    ÃiUUAޒi©‰ž÷·‘P9zá׎6²,,Ÿ 
+
+
+³W¿fÖ§Š 
+
+
+
+
+˜Ìzšþ«Ôª6qÛ+~JÓIîužD(:>è‘EëŠJgŸ<Ø-Ä¡bÛ 
+
+
+}Ôד\ª×üt˜.œWéTl^†’5×uŸ2H9ߋ ç¯VǃëŽà 
+
+
+\(9N{xrýŠÆÔ 
+
+
+
+
+
+
+
+
+
+
+ùû£‚šmÐüÙ÷’yGSYô¢ãbÀ¬ã+ÿÖYÞj^uÖ}σ ±Ÿ#€Nª@:­.ñÀ‡AàjކÜ:[±V·’][iœBUG     Mu«×ô‰Yõ!«eâípjkt|ßH 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+üSå¬%endstream 
-endobj
-211 0 obj <<
@@ -1427 +1464 @@
-/LastChar 121
-/Widths 216 0 R
-CDNIOK
+SLULBN
-/FontDescriptor 209 0 R
->> endobj
@@ -1434 +1471 @@
-/CapHeight 683
-/Descent -194
-CDNIOK
+SLULBN
-/ItalicAngle 0
-/StemV 74