Merge pull request #770 from apdavison/fix-describe

fix some issues with the `describe()` method - see #768 and #769

Author: apdavison

pyNN/descriptions/__init__.py

@@ -22,6 +22,7 @@
 :license: CeCILL, see LICENSE for details.
 """
 
+from collections.abc import Mapping
 import string
 import os.path
 
@@ -108,6 +109,11 @@ def render(cls, template, context):
         context should be a dict.
         """
         template = cls.get_template(template)
+        for key, value in context.copy().items():
+            # expand one level of any dicts contained in the context
+            if isinstance(value, Mapping):
+                for subkey, subvalue in value.items():
+                    context[f"{key}_{subkey}"] = subvalue
         return template.safe_substitute(context)
 
 

pyNN/descriptions/templates/cheetah/population_old.txt

@@ -0,0 +1,4 @@
+Structure '$name' with the following parameters:
+#for $key,$value in $parameters.items()
+    $key: $value
+    #end for

pyNN/descriptions/templates/cheetah/structure_default.txt

@@ -2,4 +2,3 @@ PopulationView "{{label}}"
     parent : "{{parent}}"
     size   : {{size}}
     mask   : {{mask}}
-    

pyNN/descriptions/templates/jinja2/population_old.txt

@@ -18,4 +18,3 @@ Projection "{{label}}" from "{{pre.label}}" ({{pre.size}} cells) to "{{post.labe
             Dendritic delay fraction : {{plasticity.slow.dendritic_delay_fraction}}{% endif %}{% else %}None{% endif %}
     Total connections : {{size}}
     Local connections : {{size_local}}
-

pyNN/descriptions/templates/jinja2/populationview_default.txt

@@ -0,0 +1,3 @@
+Structure '{{name}}' with the following parameters:
+{%- for key,value in parameters.items() %}
+    {{key}} : {{value}}{% endfor %}

pyNN/descriptions/templates/jinja2/projection_default.txt

@@ -1,7 +1,7 @@
 Population "$label"
-    Structure   : $structure
+    Structure   : $structure_name
     Local cells : $size_local
-    Cell type   : $celltype.name
+    Cell type   : $celltype_name
     ID range    : $first_id-$last_id
     First cell on this node:
       ID: $local_first_id

pyNN/descriptions/templates/jinja2/structure_default.txt

@@ -0,0 +1 @@
+Structure '$name' with the following parameters: $parameters