pytave: python_to_octave.cc annotate

annotate python_to_octave.cc @ 321:3afd890fff6d

Rewrite pyobject.cell, always return a cell array of the right size * @pyobject/cell.m: Rewrite, ensuring return value is always a cell array of the correct size. Add more %!tests.

author	Mike Miller <mtmiller@octave.org>
date	Thu, 11 Aug 2016 22:35:19 -0700
parents	2ecae5c6eeb6
children	fd5881d48238

rev	line source
0 4da14cce0890 First launchpad.net check in. David Grundberg <c04dgg@cs.umu.se> parents: diff changeset	1 /*
139 b12908ffa6df maint: Use Octave style for file copyright block, delete editor footer Mike Miller <mtmiller@octave.org> parents: 132 diff changeset	2
150 a3dc9d24ae38 maint: Add myself to copyright notices Mike Miller <mtmiller@octave.org> parents: 146 diff changeset	3 Copyright (C) 2015-2016 Mike Miller
139 b12908ffa6df maint: Use Octave style for file copyright block, delete editor footer Mike Miller <mtmiller@octave.org> parents: 132 diff changeset	4 Copyright (C) 2008 David Grundberg, Håkan Fors Nilsson
b12908ffa6df maint: Use Octave style for file copyright block, delete editor footer Mike Miller <mtmiller@octave.org> parents: 132 diff changeset	5 Copyright (C) 2009 VZLU Prague
b12908ffa6df maint: Use Octave style for file copyright block, delete editor footer Mike Miller <mtmiller@octave.org> parents: 132 diff changeset	6
b12908ffa6df maint: Use Octave style for file copyright block, delete editor footer Mike Miller <mtmiller@octave.org> parents: 132 diff changeset	7 This file is part of Pytave.
b12908ffa6df maint: Use Octave style for file copyright block, delete editor footer Mike Miller <mtmiller@octave.org> parents: 132 diff changeset	8
b12908ffa6df maint: Use Octave style for file copyright block, delete editor footer Mike Miller <mtmiller@octave.org> parents: 132 diff changeset	9 Pytave is free software: you can redistribute it and/or modify it
b12908ffa6df maint: Use Octave style for file copyright block, delete editor footer Mike Miller <mtmiller@octave.org> parents: 132 diff changeset	10 under the terms of the GNU General Public License as published by the
b12908ffa6df maint: Use Octave style for file copyright block, delete editor footer Mike Miller <mtmiller@octave.org> parents: 132 diff changeset	11 Free Software Foundation, either version 3 of the License, or (at your
b12908ffa6df maint: Use Octave style for file copyright block, delete editor footer Mike Miller <mtmiller@octave.org> parents: 132 diff changeset	12 option) any later version.
b12908ffa6df maint: Use Octave style for file copyright block, delete editor footer Mike Miller <mtmiller@octave.org> parents: 132 diff changeset	13
b12908ffa6df maint: Use Octave style for file copyright block, delete editor footer Mike Miller <mtmiller@octave.org> parents: 132 diff changeset	14 Pytave is distributed in the hope that it will be useful, but WITHOUT
b12908ffa6df maint: Use Octave style for file copyright block, delete editor footer Mike Miller <mtmiller@octave.org> parents: 132 diff changeset	15 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
b12908ffa6df maint: Use Octave style for file copyright block, delete editor footer Mike Miller <mtmiller@octave.org> parents: 132 diff changeset	16 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
b12908ffa6df maint: Use Octave style for file copyright block, delete editor footer Mike Miller <mtmiller@octave.org> parents: 132 diff changeset	17 for more details.
b12908ffa6df maint: Use Octave style for file copyright block, delete editor footer Mike Miller <mtmiller@octave.org> parents: 132 diff changeset	18
b12908ffa6df maint: Use Octave style for file copyright block, delete editor footer Mike Miller <mtmiller@octave.org> parents: 132 diff changeset	19 You should have received a copy of the GNU General Public License
b12908ffa6df maint: Use Octave style for file copyright block, delete editor footer Mike Miller <mtmiller@octave.org> parents: 132 diff changeset	20 along with Pytave; see the file COPYING. If not, see
b12908ffa6df maint: Use Octave style for file copyright block, delete editor footer Mike Miller <mtmiller@octave.org> parents: 132 diff changeset	21 <http://www.gnu.org/licenses/>.
b12908ffa6df maint: Use Octave style for file copyright block, delete editor footer Mike Miller <mtmiller@octave.org> parents: 132 diff changeset	22
b12908ffa6df maint: Use Octave style for file copyright block, delete editor footer Mike Miller <mtmiller@octave.org> parents: 132 diff changeset	23 */
0 4da14cce0890 First launchpad.net check in. David Grundberg <c04dgg@cs.umu.se> parents: diff changeset	24
132 386772f4e12d Clean up includes thanks to Octave header changes Mike Miller <mtmiller@octave.org> parents: 108 diff changeset	25 #if defined (HAVE_CONFIG_H)
386772f4e12d Clean up includes thanks to Octave header changes Mike Miller <mtmiller@octave.org> parents: 108 diff changeset	26 # include <config.h>
386772f4e12d Clean up includes thanks to Octave header changes Mike Miller <mtmiller@octave.org> parents: 108 diff changeset	27 #endif
386772f4e12d Clean up includes thanks to Octave header changes Mike Miller <mtmiller@octave.org> parents: 108 diff changeset	28
0 4da14cce0890 First launchpad.net check in. David Grundberg <c04dgg@cs.umu.se> parents: diff changeset	29 #include <iostream>
4da14cce0890 First launchpad.net check in. David Grundberg <c04dgg@cs.umu.se> parents: diff changeset	30 #include <boost/python.hpp>
4da14cce0890 First launchpad.net check in. David Grundberg <c04dgg@cs.umu.se> parents: diff changeset	31 #include <boost/python/numeric.hpp>
46 095e26d93935 support complex numbers Jaroslav Hajek <highegg@gmail.com> parents: 43 diff changeset	32 #include <boost/type_traits/integral_constant.hpp>
100 ff70627aa203 Undef HAVE_STAT and HAVE_FSTAT consistently through-out all files David Grundberg <individ@acc.umu.se> parents: 81 diff changeset	33
0 4da14cce0890 First launchpad.net check in. David Grundberg <c04dgg@cs.umu.se> parents: diff changeset	34 #include <octave/oct.h>
9 9a773d71a973 celler & structar ^_^ Håkan Fors nilsson <c04hfn@cs.umu.se> parents: 6 diff changeset	35 #include <octave/oct-map.h>
9a773d71a973 celler & structar ^_^ Håkan Fors nilsson <c04hfn@cs.umu.se> parents: 6 diff changeset	36 #include <octave/Cell.h>
0 4da14cce0890 First launchpad.net check in. David Grundberg <c04dgg@cs.umu.se> parents: diff changeset	37 #include <octave/ov.h>
106 896fdc369789 Use latest Octave library API Mike Miller <mtmiller@octave.org> parents: 102 diff changeset	38 #include <octave/Array.h>
278 9278a272b1c8 Drop conversion of lists, dicts and tuples (fixes issues #27, #26) Abhinav Tripathi <genuinelucifer@gmail.com> parents: 225 diff changeset	39 #include <octave/parse.h>
0 4da14cce0890 First launchpad.net check in. David Grundberg <c04dgg@cs.umu.se> parents: diff changeset	40
75 b0991511a16d a few fixes to numpy support Jaroslav Hajek <highegg@gmail.com> parents: 70 diff changeset	41 #include "arrayobjectdefs.h"
0 4da14cce0890 First launchpad.net check in. David Grundberg <c04dgg@cs.umu.se> parents: diff changeset	42 #include "exceptions.h"
142 dc2876fdbfaf * python_to_octave.cc: Include missing header file python_to_octave.h. Mike Miller <mtmiller@octave.org> parents: 139 diff changeset	43 #include "python_to_octave.h"
306 2ecae5c6eeb6 Refactor code, have common functions in pytave_utils Abhinav Tripathi <genuinelucifer@gmail.com> parents: 282 diff changeset	44 #include "pytave_utils.h"
0 4da14cce0890 First launchpad.net check in. David Grundberg <c04dgg@cs.umu.se> parents: diff changeset	45
4da14cce0890 First launchpad.net check in. David Grundberg <c04dgg@cs.umu.se> parents: diff changeset	46 using namespace boost::python;
4da14cce0890 First launchpad.net check in. David Grundberg <c04dgg@cs.umu.se> parents: diff changeset	47
146 8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	48 namespace pytave
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	49 {
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	50 template <class PythonPrimitive, class OctaveBase>
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	51 static void
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	52 copy_pyarrobj_to_octarray (OctaveBase& matrix, PyArrayObject *pyarr,
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	53 const int unsigned matindex,
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	54 const unsigned int matstride,
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	55 const int dimension, const unsigned int offset)
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	56 {
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	57 unsigned char ptr = (unsigned char) PyArray_DATA (pyarr);
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	58 if (dimension == PyArray_NDIM (pyarr) - 1)
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	59 {
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	60 // Last dimension, base case
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	61 for (int i = 0; i < PyArray_DIM (pyarr, dimension); i++)
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	62 {
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	63 matrix.elem (matindex + i*matstride)
0 4da14cce0890 First launchpad.net check in. David Grundberg <c04dgg@cs.umu.se> parents: diff changeset	64 = (PythonPrimitive)
108 74f17b2a5d45 Use the latest NumPy API Mike Miller <mtmiller@octave.org> parents: 107 diff changeset	65 &ptr[offset + i*PyArray_STRIDE (pyarr, dimension)];
146 8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	66 }
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	67 }
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	68 else if (PyArray_NDIM (pyarr) == 0)
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	69 {
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	70 matrix.elem (0) = (PythonPrimitive) ptr;
0 4da14cce0890 First launchpad.net check in. David Grundberg <c04dgg@cs.umu.se> parents: diff changeset	71 }
146 8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	72 else
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	73 {
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	74 for (int i = 0; i < PyArray_DIM (pyarr, dimension); i++)
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	75 {
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	76 copy_pyarrobj_to_octarray<PythonPrimitive, OctaveBase> (
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	77 matrix,
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	78 pyarr,
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	79 matindex + i*matstride,
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	80 matstride * PyArray_DIM (pyarr, dimension),
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	81 dimension + 1,
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	82 offset + i*PyArray_STRIDE (pyarr, dimension));
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	83 }
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	84 }
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	85 }
0 4da14cce0890 First launchpad.net check in. David Grundberg <c04dgg@cs.umu.se> parents: diff changeset	86
146 8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	87 template <>
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	88 void
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	89 copy_pyarrobj_to_octarray<PyObject *, Cell> (Cell& matrix,
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	90 PyArrayObject *pyarr,
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	91 const int unsigned matindex,
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	92 const unsigned int matstride,
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	93 const int dimension,
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	94 const unsigned int offset)
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	95 {
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	96 unsigned char ptr = (unsigned char) PyArray_DATA (pyarr);
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	97 if (dimension == PyArray_NDIM (pyarr) - 1)
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	98 {
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	99 // Last dimension, base case
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	100 for (int i = 0; i < PyArray_DIM (pyarr, dimension); i++)
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	101 {
51 b001edc0f81a implement Python->Octave conversions of Character and PyObject arrays Jaroslav Hajek <highegg@gmail.com> parents: 50 diff changeset	102 PyObject pobj = (PyObject **)
108 74f17b2a5d45 Use the latest NumPy API Mike Miller <mtmiller@octave.org> parents: 107 diff changeset	103 &ptr[offset + i*PyArray_STRIDE (pyarr, dimension)];
146 8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	104 pyobj_to_octvalue (matrix.elem (matindex + i*matstride),
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	105 object (handle<PyObject> (borrowed (pobj))));
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	106 }
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	107 }
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	108 else if (PyArray_NDIM (pyarr) == 0)
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	109 {
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	110 PyObject pobj = (PyObject **) ptr;
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	111 pyobj_to_octvalue (matrix.elem (0),
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	112 object (handle<PyObject> (borrowed (pobj))));
51 b001edc0f81a implement Python->Octave conversions of Character and PyObject arrays Jaroslav Hajek <highegg@gmail.com> parents: 50 diff changeset	113 }
146 8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	114 else
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	115 {
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	116 for (int i = 0; i < PyArray_DIM (pyarr, dimension); i++)
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	117 {
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	118 copy_pyarrobj_to_octarray<PyObject *, Cell> (
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	119 matrix,
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	120 pyarr,
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	121 matindex + i*matstride,
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	122 matstride * PyArray_DIM (pyarr, dimension),
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	123 dimension + 1,
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	124 offset + i*PyArray_STRIDE (pyarr, dimension));
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	125 }
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	126 }
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	127 }
51 b001edc0f81a implement Python->Octave conversions of Character and PyObject arrays Jaroslav Hajek <highegg@gmail.com> parents: 50 diff changeset	128
146 8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	129 template <class PythonPrimitive, class OctaveBase>
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	130 static void
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	131 copy_pyarrobj_to_octarray_dispatch (OctaveBase& matrix,
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	132 PyArrayObject *pyarr,
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	133 const boost::true_type&)
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	134 {
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	135 copy_pyarrobj_to_octarray<PythonPrimitive, OctaveBase> (matrix, pyarr, 0, 1, 0, 0);
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	136 }
46 095e26d93935 support complex numbers Jaroslav Hajek <highegg@gmail.com> parents: 43 diff changeset	137
146 8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	138 template <class PythonPrimitive, class OctaveBase>
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	139 static void
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	140 copy_pyarrobj_to_octarray_dispatch (OctaveBase& matrix,
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	141 PyArrayObject *pyarr,
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	142 const boost::false_type&)
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	143 {
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	144 assert (0);
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	145 }
46 095e26d93935 support complex numbers Jaroslav Hajek <highegg@gmail.com> parents: 43 diff changeset	146
146 8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	147 template <class X, class Y> class matching_type : public boost::false_type { };
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	148 template <class X> class matching_type<X, X> : public boost::true_type { };
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	149 template <class X> class matching_type<X, octave_int<X> > : public boost::true_type { };
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	150 template <> class matching_type<float, double> : public boost::true_type { };
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	151 template <> class matching_type<FloatComplex, Complex> : public boost::true_type { };
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	152 template <> class matching_type<PyObject *, octave_value> : public boost::true_type { };
46 095e26d93935 support complex numbers Jaroslav Hajek <highegg@gmail.com> parents: 43 diff changeset	153
146 8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	154 template <class PythonPrimitive, class OctaveBase>
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	155 static void
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	156 copy_pyarrobj_to_octarray_dispatch (OctaveBase& matrix,
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	157 PyArrayObject *pyarr)
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	158 {
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	159 matching_type<PythonPrimitive, typename OctaveBase::element_type> inst;
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	160 copy_pyarrobj_to_octarray_dispatch<PythonPrimitive, OctaveBase> (matrix, pyarr, inst);
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	161 }
46 095e26d93935 support complex numbers Jaroslav Hajek <highegg@gmail.com> parents: 43 diff changeset	162
146 8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	163 template <class OctaveBase>
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	164 static void
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	165 copy_pyarrobj_to_octarray_boot (OctaveBase& matrix, PyArrayObject *pyarr)
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	166 {
0 4da14cce0890 First launchpad.net check in. David Grundberg <c04dgg@cs.umu.se> parents: diff changeset	167
4da14cce0890 First launchpad.net check in. David Grundberg <c04dgg@cs.umu.se> parents: diff changeset	168 #define ARRAYCASE(AC_pyarrtype, AC_primitive) case AC_pyarrtype: \
146 8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	169 copy_pyarrobj_to_octarray_dispatch<AC_primitive, OctaveBase> \
46 095e26d93935 support complex numbers Jaroslav Hajek <highegg@gmail.com> parents: 43 diff changeset	170 (matrix, pyarr); \
0 4da14cce0890 First launchpad.net check in. David Grundberg <c04dgg@cs.umu.se> parents: diff changeset	171 break; \
4da14cce0890 First launchpad.net check in. David Grundberg <c04dgg@cs.umu.se> parents: diff changeset	172
146 8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	173 // Coerce NumPy's long type into one of two possible sized integer types
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	174 int type_num = PyArray_TYPE (pyarr);
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	175 switch (type_num)
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	176 {
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	177 case NPY_LONG:
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	178 if (sizeof (npy_long) == sizeof (int64_t))
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	179 type_num = NPY_INT64;
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	180 else if (sizeof (npy_long) == sizeof (int32_t))
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	181 type_num = NPY_INT32;
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	182 break;
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	183 case NPY_LONGLONG:
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	184 if (sizeof (npy_longlong) == sizeof (int64_t))
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	185 type_num = NPY_INT64;
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	186 else if (sizeof (npy_longlong) == sizeof (int32_t))
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	187 type_num = NPY_INT32;
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	188 break;
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	189 case NPY_ULONG:
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	190 if (sizeof (npy_ulong) == sizeof (uint64_t))
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	191 type_num = NPY_UINT64;
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	192 else if (sizeof (npy_ulong) == sizeof (uint32_t))
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	193 type_num = NPY_UINT32;
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	194 break;
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	195 case NPY_ULONGLONG:
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	196 if (sizeof (npy_ulonglong) == sizeof (uint64_t))
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	197 type_num = NPY_UINT64;
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	198 else if (sizeof (npy_ulonglong) == sizeof (uint32_t))
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	199 type_num = NPY_UINT32;
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	200 break;
47 c83754e57d26 Fix compilation on 32-bit x86. David Grundberg <individ@acc.umu.se> parents: 46 diff changeset	201 }
c83754e57d26 Fix compilation on 32-bit x86. David Grundberg <individ@acc.umu.se> parents: 46 diff changeset	202
146 8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	203 switch (type_num)
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	204 {
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	205 ARRAYCASE (NPY_INT8, int8_t)
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	206 ARRAYCASE (NPY_INT16, int16_t)
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	207 ARRAYCASE (NPY_INT32, int32_t)
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	208 ARRAYCASE (NPY_INT64, int64_t)
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	209 ARRAYCASE (NPY_UINT8, uint8_t)
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	210 ARRAYCASE (NPY_UINT16, uint16_t)
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	211 ARRAYCASE (NPY_UINT32, uint32_t)
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	212 ARRAYCASE (NPY_UINT64, uint64_t)
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	213 ARRAYCASE (NPY_FLOAT, float)
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	214 ARRAYCASE (NPY_DOUBLE, double)
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	215 ARRAYCASE (NPY_CFLOAT, FloatComplex)
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	216 ARRAYCASE (NPY_CDOUBLE, Complex)
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	217 ARRAYCASE (NPY_BOOL, bool)
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	218 ARRAYCASE (NPY_CHAR, char)
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	219 ARRAYCASE (NPY_STRING, char)
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	220 ARRAYCASE (NPY_OBJECT, PyObject *)
51 b001edc0f81a implement Python->Octave conversions of Character and PyObject arrays Jaroslav Hajek <highegg@gmail.com> parents: 50 diff changeset	221
146 8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	222 default:
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	223 throw object_convert_exception (
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	224 PyEval_GetFuncName ((PyObject*)pyarr)
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	225 + (PyEval_GetFuncDesc ((PyObject*)pyarr)
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	226 + std::string (": Unsupported Python array type")));
0 4da14cce0890 First launchpad.net check in. David Grundberg <c04dgg@cs.umu.se> parents: diff changeset	227 }
146 8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	228 }
0 4da14cce0890 First launchpad.net check in. David Grundberg <c04dgg@cs.umu.se> parents: diff changeset	229
146 8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	230 template <class OctaveBase>
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	231 static void
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	232 pyarrobj_to_octvalueNd (octave_value& octvalue, PyArrayObject *pyarr,
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	233 const dim_vector& dims)
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	234 {
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	235 OctaveBase array (dims);
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	236 copy_pyarrobj_to_octarray_boot<OctaveBase> (array, pyarr);
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	237 octvalue = array;
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	238 }
0 4da14cce0890 First launchpad.net check in. David Grundberg <c04dgg@cs.umu.se> parents: diff changeset	239
146 8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	240 static void
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	241 pyarr_to_octvalue (octave_value& octvalue, PyArrayObject *pyarr)
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	242 {
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	243 dim_vector dims;
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	244 switch (PyArray_NDIM (pyarr))
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	245 {
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	246 case 0:
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	247 dims = dim_vector (1, 1);
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	248 break;
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	249 case 1:
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	250 // Always make PyArray vectors row vectors.
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	251 dims = dim_vector (1, PyArray_DIM (pyarr, 0));
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	252 break;
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	253 default:
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	254 dims.resize (PyArray_NDIM (pyarr));
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	255 for (int d = 0; d < PyArray_NDIM (pyarr); d++)
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	256 dims(d) = PyArray_DIM (pyarr, d);
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	257 break;
0 4da14cce0890 First launchpad.net check in. David Grundberg <c04dgg@cs.umu.se> parents: diff changeset	258 }
4da14cce0890 First launchpad.net check in. David Grundberg <c04dgg@cs.umu.se> parents: diff changeset	259
146 8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	260 switch (PyArray_TYPE (pyarr))
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	261 {
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	262 case NPY_BYTE:
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	263 case NPY_SHORT:
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	264 case NPY_INT:
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	265 case NPY_LONG:
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	266 case NPY_LONGLONG:
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	267 switch (PyArray_ITEMSIZE (pyarr))
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	268 {
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	269 case 1:
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	270 pyarrobj_to_octvalueNd<int8NDArray> (octvalue, pyarr, dims);
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	271 break;
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	272 case 2:
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	273 pyarrobj_to_octvalueNd<int16NDArray> (octvalue, pyarr, dims);
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	274 break;
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	275 case 4:
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	276 pyarrobj_to_octvalueNd<int32NDArray> (octvalue, pyarr, dims);
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	277 break;
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	278 case 8:
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	279 pyarrobj_to_octvalueNd<int64NDArray> (octvalue, pyarr, dims);
0 4da14cce0890 First launchpad.net check in. David Grundberg <c04dgg@cs.umu.se> parents: diff changeset	280 break;
146 8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	281 default:
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	282 throw object_convert_exception ("Unknown integer.");
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	283 }
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	284 break;
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	285 case NPY_UBYTE:
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	286 case NPY_USHORT:
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	287 case NPY_UINT:
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	288 case NPY_ULONG:
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	289 case NPY_ULONGLONG:
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	290 switch (PyArray_ITEMSIZE (pyarr))
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	291 {
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	292 case 1:
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	293 pyarrobj_to_octvalueNd<uint8NDArray> (octvalue, pyarr, dims);
143 fe783134c61c Fix conversion of integer types by using strictly sized integers Mike Miller <mtmiller@octave.org> parents: 142 diff changeset	294 break;
146 8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	295 case 2:
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	296 pyarrobj_to_octvalueNd<uint16NDArray> (octvalue, pyarr, dims);
0 4da14cce0890 First launchpad.net check in. David Grundberg <c04dgg@cs.umu.se> parents: diff changeset	297 break;
146 8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	298 case 4:
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	299 pyarrobj_to_octvalueNd<uint32NDArray> (octvalue, pyarr, dims);
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	300 break;
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	301 case 8:
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	302 pyarrobj_to_octvalueNd<uint64NDArray> (octvalue, pyarr, dims);
0 4da14cce0890 First launchpad.net check in. David Grundberg <c04dgg@cs.umu.se> parents: diff changeset	303 break;
146 8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	304 default:
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	305 throw object_convert_exception ("Unknown unsigned integer.");
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	306 }
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	307 break;
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	308 case NPY_FLOAT:
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	309 pyarrobj_to_octvalueNd<FloatNDArray> (octvalue, pyarr, dims);
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	310 break;
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	311 case NPY_DOUBLE:
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	312 pyarrobj_to_octvalueNd<NDArray> (octvalue, pyarr, dims);
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	313 break;
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	314 case NPY_CFLOAT:
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	315 pyarrobj_to_octvalueNd<FloatComplexNDArray> (octvalue, pyarr, dims);
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	316 break;
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	317 case NPY_CDOUBLE:
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	318 pyarrobj_to_octvalueNd<ComplexNDArray> (octvalue, pyarr, dims);
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	319 break;
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	320 case NPY_BOOL:
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	321 pyarrobj_to_octvalueNd<boolNDArray> (octvalue, pyarr, dims);
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	322 break;
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	323 case NPY_CHAR:
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	324 case_NPY_CHAR:
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	325 pyarrobj_to_octvalueNd<charNDArray> (octvalue, pyarr, dims);
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	326 // FIXME: is the following needed?
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	327 octvalue = octvalue.convert_to_str (true, true, '"');
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	328 break;
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	329 case NPY_STRING:
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	330 {
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	331 if (PyArray_ITEMSIZE (pyarr) == 1)
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	332 goto case_NPY_CHAR;
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	333 else
81 2e8b52a5e1b1 support NumPy string arrays Jaroslav Hajek <highegg@gmail.com> parents: 79 diff changeset	334 {
146 8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	335 // Create a new descriptor of the data.
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	336 PyArray_Descr *view_descr = PyArray_DescrFromType (NPY_CHAR);
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	337 // Create a new view of the NumPy array.
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	338 PyArrayObject view = (PyArrayObject )PyArray_View (pyarr, view_descr, 0);
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	339 // Store in a handle to ensure proper destruction.
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	340 handle<PyObject> view_handle (allow_null ((PyObject *)view));
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	341 // Call recursively.
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	342 pyarr_to_octvalue (octvalue, view);
81 2e8b52a5e1b1 support NumPy string arrays Jaroslav Hajek <highegg@gmail.com> parents: 79 diff changeset	343 }
146 8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	344 }
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	345 break;
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	346 case NPY_OBJECT:
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	347 pyarrobj_to_octvalueNd<Cell> (octvalue, pyarr, dims);
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	348 break;
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	349 default:
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	350 throw object_convert_exception (
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	351 PyEval_GetFuncDesc ((PyObject*)(pyarr)) + std::string (" ")
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	352 + PyEval_GetFuncName ((PyObject*)(pyarr))
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	353 + ": Encountered unsupported Python array");
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	354 break;
0 4da14cce0890 First launchpad.net check in. David Grundberg <c04dgg@cs.umu.se> parents: diff changeset	355 }
146 8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	356 }
25 113428ba033c Whitespace fixes David Grundberg <individ@acc.umu.se> parents: 9 diff changeset	357
146 8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	358 static void
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	359 pylist_to_cellarray (octave_value& oct_value, const boost::python::list& list)
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	360 {
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	361 octave_idx_type length = boost::python::extract<octave_idx_type> (list.attr ("__len__") ());
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	362 octave_value_list values;
9 9a773d71a973 celler & structar ^_^ Håkan Fors nilsson <c04hfn@cs.umu.se> parents: 6 diff changeset	363
146 8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	364 for (octave_idx_type i = 0; i < length; i++)
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	365 {
25 113428ba033c Whitespace fixes David Grundberg <individ@acc.umu.se> parents: 9 diff changeset	366 octave_value val;
9 9a773d71a973 celler & structar ^_^ Håkan Fors nilsson <c04hfn@cs.umu.se> parents: 6 diff changeset	367
146 8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	368 pyobj_to_octvalue (val, list[i]);
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	369 values.append (val);
9 9a773d71a973 celler & structar ^_^ Håkan Fors nilsson <c04hfn@cs.umu.se> parents: 6 diff changeset	370
9a773d71a973 celler & structar ^_^ Håkan Fors nilsson <c04hfn@cs.umu.se> parents: 6 diff changeset	371 }
25 113428ba033c Whitespace fixes David Grundberg <individ@acc.umu.se> parents: 9 diff changeset	372
146 8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	373 oct_value = Cell (values);
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	374 }
9 9a773d71a973 celler & structar ^_^ Håkan Fors nilsson <c04hfn@cs.umu.se> parents: 6 diff changeset	375
146 8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	376 static void
179 c05ff3e85fec Add conversion of python tuples to octave cell arrays. Abhinav Tripathi <genuinelucifer@gmail.com> parents: 177 diff changeset	377 pytuple_to_cellarray (octave_value& oct_value, const boost::python::tuple& tuple)
c05ff3e85fec Add conversion of python tuples to octave cell arrays. Abhinav Tripathi <genuinelucifer@gmail.com> parents: 177 diff changeset	378 {
c05ff3e85fec Add conversion of python tuples to octave cell arrays. Abhinav Tripathi <genuinelucifer@gmail.com> parents: 177 diff changeset	379 octave_idx_type length = boost::python::extract<octave_idx_type> (tuple.attr ("__len__") ());
c05ff3e85fec Add conversion of python tuples to octave cell arrays. Abhinav Tripathi <genuinelucifer@gmail.com> parents: 177 diff changeset	380 octave_value_list values;
c05ff3e85fec Add conversion of python tuples to octave cell arrays. Abhinav Tripathi <genuinelucifer@gmail.com> parents: 177 diff changeset	381
c05ff3e85fec Add conversion of python tuples to octave cell arrays. Abhinav Tripathi <genuinelucifer@gmail.com> parents: 177 diff changeset	382 for (octave_idx_type i = 0; i < length; i++)
c05ff3e85fec Add conversion of python tuples to octave cell arrays. Abhinav Tripathi <genuinelucifer@gmail.com> parents: 177 diff changeset	383 {
c05ff3e85fec Add conversion of python tuples to octave cell arrays. Abhinav Tripathi <genuinelucifer@gmail.com> parents: 177 diff changeset	384 octave_value val;
c05ff3e85fec Add conversion of python tuples to octave cell arrays. Abhinav Tripathi <genuinelucifer@gmail.com> parents: 177 diff changeset	385
c05ff3e85fec Add conversion of python tuples to octave cell arrays. Abhinav Tripathi <genuinelucifer@gmail.com> parents: 177 diff changeset	386 pyobj_to_octvalue (val, tuple[i]);
c05ff3e85fec Add conversion of python tuples to octave cell arrays. Abhinav Tripathi <genuinelucifer@gmail.com> parents: 177 diff changeset	387 values.append (val);
c05ff3e85fec Add conversion of python tuples to octave cell arrays. Abhinav Tripathi <genuinelucifer@gmail.com> parents: 177 diff changeset	388
c05ff3e85fec Add conversion of python tuples to octave cell arrays. Abhinav Tripathi <genuinelucifer@gmail.com> parents: 177 diff changeset	389 }
c05ff3e85fec Add conversion of python tuples to octave cell arrays. Abhinav Tripathi <genuinelucifer@gmail.com> parents: 177 diff changeset	390
c05ff3e85fec Add conversion of python tuples to octave cell arrays. Abhinav Tripathi <genuinelucifer@gmail.com> parents: 177 diff changeset	391 oct_value = Cell (values);
c05ff3e85fec Add conversion of python tuples to octave cell arrays. Abhinav Tripathi <genuinelucifer@gmail.com> parents: 177 diff changeset	392 }
c05ff3e85fec Add conversion of python tuples to octave cell arrays. Abhinav Tripathi <genuinelucifer@gmail.com> parents: 177 diff changeset	393
c05ff3e85fec Add conversion of python tuples to octave cell arrays. Abhinav Tripathi <genuinelucifer@gmail.com> parents: 177 diff changeset	394 static void
146 8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	395 pydict_to_octmap (octave_value& oct_value, const boost::python::dict& dict)
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	396 {
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	397 boost::python::list list = dict.items ();
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	398 octave_idx_type length = boost::python::extract<octave_idx_type> (list.attr ("__len__") ());
9 9a773d71a973 celler & structar ^_^ Håkan Fors nilsson <c04hfn@cs.umu.se> parents: 6 diff changeset	399
146 8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	400 dim_vector dims = dim_vector (1, 1);
9 9a773d71a973 celler & structar ^_^ Håkan Fors nilsson <c04hfn@cs.umu.se> parents: 6 diff changeset	401
146 8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	402 octave_value_list vals (length);
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	403 string_vector keys (length);
43 31df83060183 avoid duplicate conversions in python dict->octave map Jaroslav Hajek <highegg@gmail.com> parents: 31 diff changeset	404
146 8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	405 // Extract all keys and convert values. Remember whether dimensions
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	406 // match.
107 691ef5c6b9e2 maint: Clean up std namespace pollution Mike Miller <mtmiller@octave.org> parents: 106 diff changeset	407
146 8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	408 for (octave_idx_type i = 0; i < length; i++)
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	409 {
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	410 std::string& key = keys[i];
43 31df83060183 avoid duplicate conversions in python dict->octave map Jaroslav Hajek <highegg@gmail.com> parents: 31 diff changeset	411
146 8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	412 boost::python::tuple tuple =
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	413 boost::python::extract<boost::python::tuple> (list[i]) ();
9 9a773d71a973 celler & structar ^_^ Håkan Fors nilsson <c04hfn@cs.umu.se> parents: 6 diff changeset	414
146 8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	415 boost::python::extract<std::string> str (tuple[0]);
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	416 if (! str.check ())
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	417 throw object_convert_exception (
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	418 std::string ("Can not convert key of type ")
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	419 + PyEval_GetFuncName (boost::python::object (tuple[0]).ptr ())
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	420 + PyEval_GetFuncDesc (boost::python::object (tuple[0]).ptr ())
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	421 + " to a structure field name. Field names must be strings.");
43 31df83060183 avoid duplicate conversions in python dict->octave map Jaroslav Hajek <highegg@gmail.com> parents: 31 diff changeset	422
146 8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	423 key = str ();
43 31df83060183 avoid duplicate conversions in python dict->octave map Jaroslav Hajek <highegg@gmail.com> parents: 31 diff changeset	424
146 8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	425 if (! valid_identifier (key))
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	426 throw object_convert_exception (
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	427 std::string ("Can not convert key `") + key + "' to a structure "
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	428 "field name. Field names must be valid Octave identifiers.");
43 31df83060183 avoid duplicate conversions in python dict->octave map Jaroslav Hajek <highegg@gmail.com> parents: 31 diff changeset	429
146 8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	430 octave_value& val = vals(i);
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	431
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	432 pyobj_to_octvalue (val, tuple[1]);
43 31df83060183 avoid duplicate conversions in python dict->octave map Jaroslav Hajek <highegg@gmail.com> parents: 31 diff changeset	433
146 8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	434 if (val.is_cell ())
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	435 {
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	436 if (i == 0)
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	437 dims = val.dims ();
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	438 else if (val.numel () != 1 && val.dims () != dims)
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	439 throw object_convert_exception (
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	440 "Dimensions of the struct fields do not match");
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	441 }
9 9a773d71a973 celler & structar ^_^ Håkan Fors nilsson <c04hfn@cs.umu.se> parents: 6 diff changeset	442 }
9a773d71a973 celler & structar ^_^ Håkan Fors nilsson <c04hfn@cs.umu.se> parents: 6 diff changeset	443
146 8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	444 octave_map map = octave_map (dims);
9 9a773d71a973 celler & structar ^_^ Håkan Fors nilsson <c04hfn@cs.umu.se> parents: 6 diff changeset	445
146 8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	446 for (octave_idx_type i = 0; i < length; i++)
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	447 {
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	448 std::string& key = keys[i];
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	449 octave_value val = vals(i);
9 9a773d71a973 celler & structar ^_^ Håkan Fors nilsson <c04hfn@cs.umu.se> parents: 6 diff changeset	450
146 8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	451 if (val.is_cell ())
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	452 {
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	453 const Cell c = val.cell_value ();
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	454 if (c.numel () == 1)
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	455 {
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	456 map.assign (key, Cell (dims, c(0)));
68 2f4d6286fb36 make Octave->Python conversions uniformly arrays Jaroslav Hajek <highegg@gmail.com> parents: 56 diff changeset	457 }
146 8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	458 else
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	459 {
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	460 map.assign (key, c);
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	461 }
9 9a773d71a973 celler & structar ^_^ Håkan Fors nilsson <c04hfn@cs.umu.se> parents: 6 diff changeset	462 }
146 8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	463 else
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	464 map.assign (key, Cell (dims, val));
9 9a773d71a973 celler & structar ^_^ Håkan Fors nilsson <c04hfn@cs.umu.se> parents: 6 diff changeset	465 }
146 8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	466 oct_value = map;
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	467 }
9 9a773d71a973 celler & structar ^_^ Håkan Fors nilsson <c04hfn@cs.umu.se> parents: 6 diff changeset	468
177 c956f7a932e7 Convert Python unicode strings into UTF-8 char arrays (fixes issue #5) Mike Miller <mtmiller@octave.org> parents: 150 diff changeset	469 static std::string
c956f7a932e7 Convert Python unicode strings into UTF-8 char arrays (fixes issue #5) Mike Miller <mtmiller@octave.org> parents: 150 diff changeset	470 pyunicode_to_utf8 (PyObject *unicode)
c956f7a932e7 Convert Python unicode strings into UTF-8 char arrays (fixes issue #5) Mike Miller <mtmiller@octave.org> parents: 150 diff changeset	471 {
c956f7a932e7 Convert Python unicode strings into UTF-8 char arrays (fixes issue #5) Mike Miller <mtmiller@octave.org> parents: 150 diff changeset	472 std::string str;
c956f7a932e7 Convert Python unicode strings into UTF-8 char arrays (fixes issue #5) Mike Miller <mtmiller@octave.org> parents: 150 diff changeset	473 PyObject *utf8 = PyUnicode_AsUTF8String (unicode);
c956f7a932e7 Convert Python unicode strings into UTF-8 char arrays (fixes issue #5) Mike Miller <mtmiller@octave.org> parents: 150 diff changeset	474 str.assign (PyBytes_AsString (utf8), PyBytes_Size (utf8));
c956f7a932e7 Convert Python unicode strings into UTF-8 char arrays (fixes issue #5) Mike Miller <mtmiller@octave.org> parents: 150 diff changeset	475 Py_DECREF (utf8);
c956f7a932e7 Convert Python unicode strings into UTF-8 char arrays (fixes issue #5) Mike Miller <mtmiller@octave.org> parents: 150 diff changeset	476 return str;
c956f7a932e7 Convert Python unicode strings into UTF-8 char arrays (fixes issue #5) Mike Miller <mtmiller@octave.org> parents: 150 diff changeset	477 }
c956f7a932e7 Convert Python unicode strings into UTF-8 char arrays (fixes issue #5) Mike Miller <mtmiller@octave.org> parents: 150 diff changeset	478
278 9278a272b1c8 Drop conversion of lists, dicts and tuples (fixes issues #27, #26) Abhinav Tripathi <genuinelucifer@gmail.com> parents: 225 diff changeset	479 static void
9278a272b1c8 Drop conversion of lists, dicts and tuples (fixes issues #27, #26) Abhinav Tripathi <genuinelucifer@gmail.com> parents: 225 diff changeset	480 pyobj_to_oct_pyobject (octave_value& oct_value,
9278a272b1c8 Drop conversion of lists, dicts and tuples (fixes issues #27, #26) Abhinav Tripathi <genuinelucifer@gmail.com> parents: 225 diff changeset	481 const boost::python::object& py_object)
9278a272b1c8 Drop conversion of lists, dicts and tuples (fixes issues #27, #26) Abhinav Tripathi <genuinelucifer@gmail.com> parents: 225 diff changeset	482 {
9278a272b1c8 Drop conversion of lists, dicts and tuples (fixes issues #27, #26) Abhinav Tripathi <genuinelucifer@gmail.com> parents: 225 diff changeset	483 object main_module = import ("__main__");
9278a272b1c8 Drop conversion of lists, dicts and tuples (fixes issues #27, #26) Abhinav Tripathi <genuinelucifer@gmail.com> parents: 225 diff changeset	484 object main_namespace = main_module.attr ("__dict__");
306 2ecae5c6eeb6 Refactor code, have common functions in pytave_utils Abhinav Tripathi <genuinelucifer@gmail.com> parents: 282 diff changeset	485 object builtins_module;
2ecae5c6eeb6 Refactor code, have common functions in pytave_utils Abhinav Tripathi <genuinelucifer@gmail.com> parents: 282 diff changeset	486 pytave::get_builtins_module (builtins_module);
278 9278a272b1c8 Drop conversion of lists, dicts and tuples (fixes issues #27, #26) Abhinav Tripathi <genuinelucifer@gmail.com> parents: 225 diff changeset	487 object hex_function = builtins_module.attr ("hex");
9278a272b1c8 Drop conversion of lists, dicts and tuples (fixes issues #27, #26) Abhinav Tripathi <genuinelucifer@gmail.com> parents: 225 diff changeset	488 object id_function = builtins_module.attr ("id");
9278a272b1c8 Drop conversion of lists, dicts and tuples (fixes issues #27, #26) Abhinav Tripathi <genuinelucifer@gmail.com> parents: 225 diff changeset	489 object idtmp = hex_function (id_function (py_object));
9278a272b1c8 Drop conversion of lists, dicts and tuples (fixes issues #27, #26) Abhinav Tripathi <genuinelucifer@gmail.com> parents: 225 diff changeset	490 std::string id = extract<std::string> (idtmp);
9278a272b1c8 Drop conversion of lists, dicts and tuples (fixes issues #27, #26) Abhinav Tripathi <genuinelucifer@gmail.com> parents: 225 diff changeset	491
9278a272b1c8 Drop conversion of lists, dicts and tuples (fixes issues #27, #26) Abhinav Tripathi <genuinelucifer@gmail.com> parents: 225 diff changeset	492 // Ensure we have a __InOct__ dict, and then put `res` into it
9278a272b1c8 Drop conversion of lists, dicts and tuples (fixes issues #27, #26) Abhinav Tripathi <genuinelucifer@gmail.com> parents: 225 diff changeset	493 exec ("if not (\"__InOct__\" in vars() or \"__InOct__\" in globals()):\n"
9278a272b1c8 Drop conversion of lists, dicts and tuples (fixes issues #27, #26) Abhinav Tripathi <genuinelucifer@gmail.com> parents: 225 diff changeset	494 " __InOct__ = dict()\n"
9278a272b1c8 Drop conversion of lists, dicts and tuples (fixes issues #27, #26) Abhinav Tripathi <genuinelucifer@gmail.com> parents: 225 diff changeset	495 " # FIXME: make it accessible elsewhere?\n"
9278a272b1c8 Drop conversion of lists, dicts and tuples (fixes issues #27, #26) Abhinav Tripathi <genuinelucifer@gmail.com> parents: 225 diff changeset	496 " import __main__\n"
9278a272b1c8 Drop conversion of lists, dicts and tuples (fixes issues #27, #26) Abhinav Tripathi <genuinelucifer@gmail.com> parents: 225 diff changeset	497 " __main__.__InOct__ = __InOct__\n",
9278a272b1c8 Drop conversion of lists, dicts and tuples (fixes issues #27, #26) Abhinav Tripathi <genuinelucifer@gmail.com> parents: 225 diff changeset	498 main_namespace, main_namespace);
9278a272b1c8 Drop conversion of lists, dicts and tuples (fixes issues #27, #26) Abhinav Tripathi <genuinelucifer@gmail.com> parents: 225 diff changeset	499 main_namespace["__InOct__"][id] = py_object;
9278a272b1c8 Drop conversion of lists, dicts and tuples (fixes issues #27, #26) Abhinav Tripathi <genuinelucifer@gmail.com> parents: 225 diff changeset	500 // Create @pyobject
282 4c4747646e12 Make pyobject callable by users (to convert input) Colin Macdonald <cbm@m.fsf.org> parents: 279 diff changeset	501 oct_value = feval ("pyobject", ovl (0, id), 2);
278 9278a272b1c8 Drop conversion of lists, dicts and tuples (fixes issues #27, #26) Abhinav Tripathi <genuinelucifer@gmail.com> parents: 225 diff changeset	502 }
9278a272b1c8 Drop conversion of lists, dicts and tuples (fixes issues #27, #26) Abhinav Tripathi <genuinelucifer@gmail.com> parents: 225 diff changeset	503
146 8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	504 void pyobj_to_octvalue (octave_value& oct_value,
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	505 const boost::python::object& py_object)
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	506 {
271 0a4f620da178 Convert numeric value to long instead of int to avoid overflow (fixes issue #40) Abhinav Tripathi <genuinelucifer@gmail.com> parents: 225 diff changeset	507 extract<long> longx (py_object);
183 2b03585d4ddd Add proper conversion of booleans between octave and python. (fixes issue #6) Abhinav Tripathi <genuinelucifer@gmail.com> parents: 179 diff changeset	508 extract<bool> boolx (py_object);
146 8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	509 extract<double> doublex (py_object);
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	510 extract<Complex> complexx (py_object);
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	511 extract<std::string> stringx (py_object);
177 c956f7a932e7 Convert Python unicode strings into UTF-8 char arrays (fixes issue #5) Mike Miller <mtmiller@octave.org> parents: 150 diff changeset	512 extract<std::wstring> wstringx (py_object);
146 8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	513 extract<numeric::array> arrayx (py_object);
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	514 extract<boost::python::list> listx (py_object);
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	515 extract<boost::python::dict> dictx (py_object);
179 c05ff3e85fec Add conversion of python tuples to octave cell arrays. Abhinav Tripathi <genuinelucifer@gmail.com> parents: 177 diff changeset	516 extract<boost::python::tuple> tuplex (py_object);
146 8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	517
184 8b97647e48f1 maint: whitespace fixes for cset 2b03585d4ddd Mike Miller <mtmiller@octave.org> parents: 183 diff changeset	518 if (boolx.check () && PyBool_Check ((PyArrayObject*)py_object.ptr ()))
183 2b03585d4ddd Add proper conversion of booleans between octave and python. (fixes issue #6) Abhinav Tripathi <genuinelucifer@gmail.com> parents: 179 diff changeset	519 oct_value = boolx ();
271 0a4f620da178 Convert numeric value to long instead of int to avoid overflow (fixes issue #40) Abhinav Tripathi <genuinelucifer@gmail.com> parents: 225 diff changeset	520 else if (longx.check ())
0a4f620da178 Convert numeric value to long instead of int to avoid overflow (fixes issue #40) Abhinav Tripathi <genuinelucifer@gmail.com> parents: 225 diff changeset	521 oct_value = longx ();
146 8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	522 else if (doublex.check ())
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	523 oct_value = doublex ();
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	524 else if (complexx.check ())
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	525 oct_value = complexx ();
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	526 else if (arrayx.check ())
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	527 pyarr_to_octvalue (oct_value, (PyArrayObject*)py_object.ptr ());
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	528 else if (stringx.check ())
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	529 oct_value = stringx ();
177 c956f7a932e7 Convert Python unicode strings into UTF-8 char arrays (fixes issue #5) Mike Miller <mtmiller@octave.org> parents: 150 diff changeset	530 else if (wstringx.check ())
c956f7a932e7 Convert Python unicode strings into UTF-8 char arrays (fixes issue #5) Mike Miller <mtmiller@octave.org> parents: 150 diff changeset	531 oct_value = pyunicode_to_utf8 (py_object.ptr ());
146 8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	532 else
278 9278a272b1c8 Drop conversion of lists, dicts and tuples (fixes issues #27, #26) Abhinav Tripathi <genuinelucifer@gmail.com> parents: 225 diff changeset	533 pyobj_to_oct_pyobject (oct_value, py_object);
146 8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	534 }
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	535
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	536 void pytuple_to_octlist (octave_value_list& octave_list,
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	537 const boost::python::tuple& python_tuple)
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	538 {
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	539 int length = extract<int> (python_tuple.attr ("__len__") ());
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	540
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	541 for (int i = 0; i < length; i++)
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	542 {
8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	543 pyobj_to_octvalue (octave_list(i), python_tuple[i]);
0 4da14cce0890 First launchpad.net check in. David Grundberg <c04dgg@cs.umu.se> parents: diff changeset	544 }
146 8e3d06f2f5cf Use Octave coding style for C++ sources, PEP8 style for Python sources Mike Miller <mtmiller@octave.org> parents: 143 diff changeset	545 }
0 4da14cce0890 First launchpad.net check in. David Grundberg <c04dgg@cs.umu.se> parents: diff changeset	546 }

Mercurial > pytave

annotate python_to_octave.cc @ 321:3afd890fff6d