Changeset 35

Timestamp:

05/23/07 13:24:31 (2 years ago)

Author:

emuller

Message:

Added HocVector?.fromarray, calls return HocVectors? conditionally
defined PyHocX_Check[Exact] to check for HocObjects?, HocVectors?

HocVector? is now dervied from HocObject

setattro now tries PyObject?_GenericSetAttr as a last resort.

Files:

• branches/pygetsetcall/src/nrnpython/nrnpy_hoc.cpp (modified) (11 diffs)

branches/pygetsetcall/src/nrnpython/nrnpy_hoc.cpp

@@ -68 +68 @@
-static PyTypeObject* hocvector_type;
-
+  // Type checks
+#define PyHocObject_Check(op) PyObject_TypeCheck(op, hocobject_type)
+#define PyHocObject_CheckExact(op) ((op)->ob_type == hocobject_type)
+#define PyHocVector_Check(op) PyObject_TypeCheck(op, hocvector_type)
+#define PyHocVector_CheckExact(op) ((op)->ob_type == hocvector_type)
+
+
-static PyObject* nrnexec(PyObject* self, PyObject* args) {
-        const char* cmd;
@@ -261 +268 @@
-        case OBJECTVAR:
-        case OBJECTTMP:
-
-
+
+
+
+
+
+
+
+
+
-                ((PyHocObject*)result)->ho_ = *d;
-                ((PyHocObject*)result)->type_ = 1;
@@ -295 +309 @@
-        case OBJECTVAR:
-                PyHocObject* pho;
-
+
+
-                        Object** pobj = hoc_objpop();
-                        if (pho->sym_) {
@@ -359 +374 @@
-                }
-        }else{
-
+
+
+
-        }
-}
@@ -463 +480 @@
-
-        if (self->type_ == 1 && !self->ho_) {
-
-
-
-
+
+
+
+
+
+
-        }
-        Symbol* sym = getsym(n, self->ho_, 0);
@@ -590 +609 @@
-
-        if (self->type_ == 1 && !self->ho_) {
-
+
+
-        }
-        Py_INCREF(name);
-        char* n = PyString_AsString(name);
-//printf("hocobj_setattro %s\n", n);
-1
+0
-        Py_DECREF(name);
-        if (!sym) {
-
+
+
-        }
-        if (self->ho_) { // use the component fork.
@@ -861 +882 @@
-  }
-  else {
-
+ for self
-    return NULL;
-  }
@@ -876 +897 @@
-
-}
+
+
+static PyObject* hocvec_fromnumpy(PyObject* self, PyObject* args) {
+  
+ 
+
+#ifdef WITH_NUMPY
+
+  PyHocObject * ho = (PyHocObject*)self;
+  PyArrayObject *pa = NULL;
+
+  int size;
+
+  if (!PyArg_ParseTuple(args, "O!",&PyArray_Type,&pa)) {
+    return NULL;
+  }
+
+ // check the array arg has the correct type and dimensions
+
+  if (pa->nd != 1 || pa->descr->type_num != PyArray_DOUBLE) {
+    PyErr_SetString(PyExc_TypeError,"array arg 'a' not of correct type: (1D,PyArray_DOUBLE)");
+    return false;
+  }
+
+
+  if (is_obj_type(ho->ho_,"Vector")) {
+    // we can deal with vectors
+
+    size = pa->dimensions[0];
+
+    Vect* v = (Vect*)ho->ho_->u.this_pointer;
+    v->resize(size);
+    int i;
+
+    for (i=0;i<size;i++) {
+      (*v)[i] = *(double*)(pa->data + i*pa->strides[0]);
+    }
+
+    return Py_BuildValue("");
+
+  }
+  else {
+    PyErr_SetString(PyExc_TypeError, "expected HocVector for self.");
+    return NULL;
+  }
+
+
+#else
+
+ PyErr_SetString(PyExc_RuntimeError, "numpy support was not enabled at build time.");
+ return NULL;
+
+
+#endif //WITH_NUMPY
+
+
+}
+
+
-
-
@@ -1073 +1153 @@
-static PyMethodDef hocvec_methods[] = {
-  {"toarray",hocvec_tonumpy,METH_VARARGS,"toarray(self) returns a numpy array of self."},
+  {"fromarray",hocvec_fromnumpy,METH_VARARGS,"fromarray(self,a) sets vector contents using array (sizes must match)."},
-  {NULL, NULL, 0, NULL}
-};
@@ -1155 +1236 @@
-    0,//hocobj_members,             /* tp_members */
-    0,                         /* tp_getset */
-0,                  
+&nrnpy_HocObjectType,
-    0,                         /* tp_dict */
-    0,                         /* tp_descr_get */
@@ -1169 +1250 @@
-
-
+
+
-myPyMODINIT_FUNC nrnpy_hoc() {
-        PyObject* m;