Changeset 968 for trunk

Timestamp:

05/27/11 13:15:38 (12 months ago)

Author:

apdavison

Message:

NineMLCellType subclasses now have sorted synapse_types

Location:

trunk

Files:

• examples/nineml_neuron.py (modified) (1 diff)
• src/neuron/nineml.py (modified) (1 diff)
• src/nineml/cells.py (modified) (2 diffs)

trunk/examples/nineml_neuron.py

@@ -22 +22 @@
 celltype_cls = nineml_cell_type("if_cond_exp",
                                 leaky_iaf.c1,
-                                excitatory=coba_synapse.c1,
-                                inhibitory=deepcopy(coba_synapse.c1),
+                                inhibitory=coba_synapse.c1,
+                                excitatory=deepcopy(coba_synapse.c1),
                                 port_map={
                                     'excitatory': [('V', 'V'), ('Isyn', 'Isyn')],

trunk/src/neuron/nineml.py

@@ -95 +95 @@
     logger.debug("Writing NineML component to %s" % xml_file)
     nineml_component.write(xml_file)
-
-    # TODO: This way of importing is a cludge.
-    # To fix it, where should general nmodl code-generation live? Under nineml.code_generation ?
-    from os.path import abspath, realpath, join
-    import nineml, sys
-    root = abspath(join(realpath(nineml.__path__[0]), "../../.."))
-    sys.path.append(join(root, "code_generation/nmodl"))                
-    nineml2nmodl = __import__("9ml2nmodl")
-
-    nineml2nmodl.write_nmodl(xml_file, weight_variables) # weight variables should really come from xml file
+    
+    from nineml2nmodl import write_nmodl
+    write_nmodl(xml_file, weight_variables) # weight variables should really come from xml file
     p = subprocess.check_call(["nrnivmodl"])
     os.chdir(cwd)

trunk/src/nineml/cells.py

@@ -224 +224 @@
         dct["default_initial_values"] = dict((name, 0.0)
                                           for name in combined_model.state_variables)
-        dct["synapse_types"] = dct["synapse_models"].keys() #really need an ordered dict
+        dct["synapse_types"] = sorted(dct["synapse_models"]) # using alphabetical order may make things easier code generators
         dct["injectable"] = True # need to determine this. How??
         dct["recordable"] = [port.name for port in combined_model.analog_ports] + ['spikes', 'regime']
@@ -231 +231 @@
         dct["model_name"] = name
         logger.debug("Creating class '%s' with bases %s and dictionary %s" % (name, bases, dct))
-        # generate and compile NMODL code, then load the mechanism into NEUORN
+        # generate and compile code, then load the mechanism into the simulator
         dct["builder"](combined_model, dct["weight_variables"]) # weight variables should really be stored within combined_model
         return type.__new__(cls, name, bases, dct)