Changeset 32

Timestamp:

05/22/07 20:14:56 (2 years ago)

Author:

emuller

Message:

Added HocVector? type with toarray member

Files:

• branches/pygetsetcall/src/nrnpython/Makefile.am (modified) (1 diff)
• branches/pygetsetcall/src/nrnpython/nrnpy_hoc.cpp (modified) (9 diffs)

branches/pygetsetcall/src/nrnpython/Makefile.am

@@ -5 +5 @@
-NRNPYTHON_INCLUDES = @NRNPYTHON_INCLUDES@
-IV_INCLUDES = @IV_INCLUDE@ $(X_CFLAGS)
-
+-I$(nsrc)/gnu 
-AM_CPPFLAGS = -DOOP=1 -DCABLE=1 -DUSECVODE=1 -DUSEMATRIX=1 -DUSEBBS=1
-

branches/pygetsetcall/src/nrnpython/nrnpy_hoc.cpp

@@ -4 +4 @@
-#include <nrnoc2iv.h>
-#include <ivoc.h>
+#include <ivocvect.h>
-#include <ocjump.h>
-
@@ -40 +41 @@
-extern PyObject* nrnpy_cas(PyObject*, PyObject*);
-extern int section_object_seen;
-
+  //
-/*
-Because python types have so many methods, attempt to do all set and get
@@ -63 +64 @@
-} PyHocObject;
-
+
-static PyTypeObject* hocobject_type;
+static PyTypeObject* hocvector_type;
-
-static PyObject* nrnexec(PyObject* self, PyObject* args) {
@@ -523 +526 @@
-        case OBJECTVAR: // Object*
-                if (!ISARRAY(sym)) {
+                        Object *ho;
+                        
-                        fc.sym = sym;
-                        pcsav = save_pc(&fc);
-                        hoc_objectvar();
-                        hoc_pc = pcsav;
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }else{
-                        result = (PyObject*)intermediate(self, sym, -1);
@@ -672 +687 @@
-        // at least check the vector
-        if (po->sym_ == sym_vec_x) {
-
+(Vect*)
-        }else if (po->sym_ == sym_mat_x) {
-                if (ix >= 0) return 0;
@@ -816 +831 @@
-};
-
+
+
+
+static PyObject* hocvec_tonumpy(PyObject* self, PyObject* args) {
+  
+ 
+
+#ifdef WITH_NUMPY
+
+  PyHocObject * ho = (PyHocObject*)self;
+
+  if (!PyArg_ParseTuple(args, "")) {
+    return NULL;
+  }
+
+  if (is_obj_type(ho->ho_,"Vector")) {
+    // we can deal with vectors
+    Vect* v = (Vect*)ho->ho_->u.this_pointer;
+    PyArrayObject*array = NULL;
+    int i,n = v->capacity();
+
+    array = (PyArrayObject*)PyArray_FromDims(1,&n,PyArray_DOUBLE);
+    for (i=0;i<n;i++) {
+      *(double*)(array->data + i*array->strides[0]) = (*v)[i];
+    }
+
+    return Py_BuildValue("N",(PyObject*)array);
+
+  }
+  else {
+    PyErr_SetString(PyExc_TypeError, "expected HocVector.");
+    return NULL;
+  }
+
+
+#else
+
+ PyErr_SetString(PyExc_RuntimeError, "numpy support was not enabled at build time.");
+ return NULL;
+
+
+#endif //WITH_NUMPY
+
+
+}
+
+
-  /*
+
-#ifdef WITH_NUMPY
-
@@ -1006 +1069 @@
-
-  */
+
+
+static PyMethodDef hocvec_methods[] = {
+  {"toarray",hocvec_tonumpy,METH_VARARGS,"toarray(self) returns a numpy array of self."},
+  {NULL, NULL, 0, NULL}
+};
+
-
-static PyMemberDef hocobj_members[] = {
@@ -1053 +1123 @@
-};
-
+static PyTypeObject nrnpy_HocVectorType = {
+    PyObject_HEAD_INIT(NULL)
+    0,                         /*ob_size*/
+    "hoc.HocVector",         /*tp_name*/
+    sizeof(PyHocObject), /*tp_basicsize*/
+    0,                         /*tp_itemsize*/
+    (destructor)hocobj_dealloc,                        /*tp_dealloc*/
+    (printfunc)hocobj_print,                         /*tp_print*/
+    0,                         /*tp_getattr*/
+    0,                         /*tp_setattr*/
+    0,                         /*tp_compare*/
+    0,                         /*tp_repr*/
+    0,                         /*tp_as_number*/
+    &hocobj_seqmeth,                         /*tp_as_sequence*/
+    0,                         /*tp_as_mapping*/
+    0,                         /*tp_hash */
+    (ternaryfunc)hocobj_call,                         /*tp_call*/
+    0,                         /*tp_str*/
+    (getattrofunc)hocobj_getattro,                         /*tp_getattro*/
+    (setattrofunc)hocobj_setattro,                         /*tp_setattro*/
+    0,                         /*tp_as_buffer*/
+    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,        /*tp_flags*/
+    "Hoc Vector wrapper",         /* tp_doc */
+    0,                         /* tp_traverse */
+    0,                         /* tp_clear */
+    0,                         /* tp_richcompare */
+    0,                         /* tp_weaklistoffset */
+    0,                         /* tp_iter */
+    0,                         /* tp_iternext */
+    hocvec_methods,             /* tp_methods */
+    0,//hocobj_members,             /* tp_members */
+    0,                         /* tp_getset */
+    0,                         /* tp_base */
+    0,                         /* tp_dict */
+    0,                         /* tp_descr_get */
+    0,                         /* tp_descr_set */
+    0,                         /* tp_dictoffset */
+    (initproc)hocobj_init,      /* tp_init */
+    0,                         /* tp_alloc */
+    hocobj_new,                 /* tp_new */
+};
+
+
+
+
+
-myPyMODINIT_FUNC nrnpy_hoc() {
-        PyObject* m;
@@ -1065 +1181 @@
-        PyModule_AddObject(m, "HocObject", (PyObject*)hocobject_type);
-
+        //nrnpy_HocVectorType.tp_new = PyType_GenericNew;
+        hocvector_type = &nrnpy_HocVectorType;
+        if (PyType_Ready(&nrnpy_HocVectorType) < 0)
+                return;
+
+
+
-        Symbol* s;
-        s = hoc_lookup("Vector"); assert(s);