Changeset 8

Timestamp:

04/13/07 15:41:32 (2 years ago)

Author:

emuller

Message:

Added hoc.set support numpy arrays for objref as Vectors

Files:

• trunk/src/nrnpython/nrnpy_hoc.cpp (modified) (4 diffs)

trunk/src/nrnpython/nrnpy_hoc.cpp

@@ -6 +6 @@
-#include <parse.h>
-
+
-#define PY_ARRAY_UNIQUE_SYMBOL _NEURON_arrayu
-//#define NO_IMPORT_ARRAY
@@ -20 +21 @@
-Symlist *hoc_built_in_symlist, *hoc_top_level_symlist;
-int hoc_total_array(Symbol *s); /* total number of elements in array pointer */
+  void hoc_pushs(Symbol *s);
+  void hoc_arayinstal();
+  void hoc_pushx(double);
-
-  //Symbol *hoc_table_lookup(const char *s, Symlist *tab);
@@ -133 +137 @@
-  else if (PyArray_Check(pObj)) {
-    // it's a numpy array!
+
+    PyArrayObject *array = (PyArrayObject*) pObj;
+
+
+    // is it 1-D
+
+    if (array->nd==1) {
+
+      int i,size = array->dimensions[0];
+      double *p;
+
+      Symbol* s = hoc_decl_name(name);
+      if (s->type == UNDEF) {
+        // type==UNDEF means the VAR was just newly defined
+        // make it a VAR
+        hoc_obvar_declare(s, VAR, 0);
+
+        // it is not an array
+        s->arayinfo = (Arrayinfo *)0;
+
+        // get hoc to allocate array for data
+        // sub[0]
+        hoc_pushx(size);
+        // symbol
+        hoc_pushs(s);
+        // nsub
+        hoc_pushx(1.0);
+        hoc_arayinstal();
+
+      // set VALs (memory already allocated)
+
+        p = OPVAL(s);
+        
+        for (i=0;i<size;i++) {
+          p[i] = *(double*)(array->data+i*array->strides[0]);
+        }
+
+
+      }else if (s->type == VAR) {
+        // this below should work for previous array or non-array
+        // sub[0]
+        hoc_pushx(size);
+        // symbol
+        hoc_pushs(s);
+        // nsub
+        hoc_pushx(1.0);
+        hoc_arayinstal();
+
+      // set VALs (memory already allocated)
-    
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-  }
@@ -310 +428 @@
-          else {
-            // return single object
-*OPOBJ(sym)
+OPOBJ(sym)[0]
-          }
-