Changeset 40

Timestamp:

02/04/08 14:05:05 (1 year ago)

Author:

apdavison

Message:

Minor improvements to nrnpython/neuron/init.py

Files:

• trunk/src/nrnpython/neuron/__init__.py (modified) (5 diffs)

trunk/src/nrnpython/neuron/__init__.py

@@ -14 +14 @@
-import nrn
-h  = hoc.HocObject()
-
-h('obfunc new_IClamp() { return new IClamp($1) }')
-h('obfunc newlist() { return new List() }')
-h('obfunc newvec() { return new Vector($1) }')
-h('obfunc new_NetConO() { return new NetCon($o1, $o2, $3, $4, $5) }')
-h('obfunc new_NetConP() { return new NetCon("&v($1)", $2, $3, $4, $5) }')
-h('obfunc new_File() { return new File() }')
-
-# ------------------------------------------------------------------------------
@@ -106 +99 @@
-    h('tstop = %g' % tstop)
-    h('while (t < tstop) { fadvance() }')
-
+
-# ------------------------------------------------------------------------------
-# Python wrappers around Hoc objects
+# For most objects we use a generic wrapper, created using the factory functions
+#   `new_point_process()` or `new_hoc_class()`.
+# Where we wish to modify the methods of the Hoc class, or add new methods,
+#   we write an explicit Python class.
-# ------------------------------------------------------------------------------
-
-ExpSyn = new_point_process('ExpSyn')
+Exp2Syn = new_point_process('Exp2Syn')
+VClamp = new_point_process('VClamp')
+SEClamp = new_point_process('SEClamp')
+APCount = new_point_process('APCount')
+
-ParallelContext = new_hoc_class('ParallelContext')
-NetStim = new_hoc_class('NetStim')
+Random = new_hoc_class('Random')
+CVode = new_hoc_class('CVode')
+
+h('obfunc new_IClamp() { return new IClamp($1) }')
+h('obfunc newlist() { return new List() }')
+h('obfunc newvec() { return new Vector($1) }')
+h('obfunc new_NetConO() { return new NetCon($o1, $o2, $3, $4, $5) }')
+h('obfunc new_NetConP() { return new NetCon(&v($1), $o2, $3, $4, $5) }')
+h('objref nil')
+h('obfunc new_NetConO_nil() { return new NetCon($o1, nil) }')
+h('obfunc new_NetConP_nil() { return new NetCon(&v($1), nil) }')
+h('obfunc new_File() { return new File() }')
-
-class List(Wrapper):
@@ -180 +194 @@
-        h.pop_section()                      
-
-
-class IClamp(object):
-      
@@ -212 +225 @@
-    
-    def __init__(self, source, target, threshold=10, delay=1, weight=0, section=None, position=0.5):
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        self.section = section
-
@@ -232 +257 @@
-    def write(self, s):
-        pass
-
-
+