Changeset 31587 in project

Timestamp:

10/05/14 05:49:16 (5 years ago)

Author:

Ivan Raikov

Message:

nemo: bug fixes in NEST templates

Location:

release/4/nemo/trunk

Files:

• nemo-nest.scm (modified) (3 diffs)
• nemo.scm (modified) (2 diffs)
• templates/NEST-accessors_modifiers.tmpl (modified) (3 diffs)
• templates/NEST-cvode-event.tmpl (modified) (1 diff)
• templates/NEST-emit-spike.tmpl (modified) (1 diff)
• templates/NEST-function.tmpl (modified) (2 diffs)
• templates/NEST-ida-event.tmpl (modified) (1 diff)
• templates/NEST-nodes.tmpl (modified) (3 diffs)
• templates/NEST-parameters.tmpl (modified) (1 diff)

release/4/nemo/trunk/nemo-nest.scm

@@ -307 +307 @@
 
 
-  (let-optionals rest ((dirname ".")  (method #f) (ss-method #f) (abstol #f) (reltol #f) (maxstep #f))
+  (let-optionals rest ((dirname ".")  
+                       (method #f) (ss-method #f) 
+                       (abstol #f) (reltol #f) (maxstep #f)
+                       (dump-template-env #f))
 
     (let ((method (or method 'gsl)))
@@ -705 +708 @@
                       (stateIndexMap     . ,(map (lambda (x) (cons (first x) (second x))) state-index-map))
                       (steadyStateIndexMap . ,(map (lambda (x) (cons (first x) (second x))) steady-state-index-map))
-                      (stateDefs           . ,(map first state-index-map))
+                      (stateDefs           . ,(map (lambda (def)
+                                                     (let* ((n      (first def)) 
+                                                            (nu     (lookup-def n c-units))
+                                                            (nscale (and nu (nemo:unit-scale nu))))
+                                                       `(
+                                                         (name  . ,(nest-name n))
+                                                         (scale . ,nscale)
+                                                         )
+                                                       ))
+                                                   state-index-map))
                       (defaultDefs         . ,(map first defaults))
 
@@ -972 +984 @@
                    event-external-eq-defs pscs))
 
+        (if dump-template-env
+            (for-each (lambda (entry)
+                        (fprintf (current-error-port)
+                                 "~A = ~A~%" (car entry) 
+                                 (ersatz:tvalue->pystr (cdr entry))))
+                      tmpl-env
+                      ))
+        
         (let ((cpp-output  (open-output-file (make-output-fname dirname prefix ".cpp")))
               (hpp-output  (open-output-file (make-output-fname dirname prefix ".h"))))

release/4/nemo/trunk/nemo.scm

@@ -421 +421 @@
                               (lookup-def 'abstol options) 
                               (lookup-def 'reltol options) 
-                              (lookup-def 'maxstep options) ))
+                              (lookup-def 'maxstep options)
+                              (lookup-def 'dump-template-env options) ))
       (lambda (options model) 
         (void))))
@@ -2566 +2567 @@
                           (reltol    . ,nest-reltol)
                           (maxstep   . ,nest-maxstep)
+                          (dump-template-env . ,(opt 'dump-template-env))
                           )
                         sys))

release/4/nemo/trunk/templates/NEST-accessors_modifiers.tmpl

@@ -12 +12 @@
     
 }
-
 
 void {{modelName}}::Parameters_::set (const DictionaryDatum &d)
@@ -54 +53 @@
     
 {% if hasattr(stateIndexMap,"v") %}
-   def<double_t>(d, names::V_m, y_[{{attr(stateIndexMap,name)}}]);
+   def<double_t>(d, names::V_m, y_[{{attr(stateIndexMap,"v")}}]);
 
 {% endif %}    
     
 }
-
     
 void {{modelName}}::State_::set (const DictionaryDatum &d, const Parameters_&)
@@ -79 +77 @@
     
 }
-

release/4/nemo/trunk/templates/NEST-cvode-event.tmpl

@@ -19 +19 @@
   state = &(node.S_);
 
-{% if (haskey(stateIndexMap,"v") and haskey(defaults,"V_t") %}      
+{% if ((haskey(stateIndexMap,"v") and ("V_t" in defaultDefs)) %}      
   v = Ith (y, {{attr(stateIndexMap,"v")}});
-  vt = params->{{attr(defaults,"V_t")}};
+  vt = params->V_t;
   g[0] = v - vt;
 {% else %}

release/4/nemo/trunk/templates/NEST-emit-spike.tmpl

@@ -13 +13 @@
    }
 
-{% elif ((ODEmethod == "gsl") and haskey(defaults,"V_t")) %}
+{% elif ((ODEmethod == "gsl") and ("V_t" in defaultDefs)) %}
 
          if ( S_.r_ > 0 )

release/4/nemo/trunk/templates/NEST-function.tmpl

@@ -20 +20 @@
   double {{functionDef.localVars | join(", ")}};
 {% endif %}
-
 {% if (!(functionDef.consts == [])) %}
   double {{functionDef.consts | join(", ")}};
@@ -29 +28 @@
 {% endfor %}
 {% endif %}
-
   {{functionDef.exprString}}
-
   return {{functionDef.returnVar}};
 }

release/4/nemo/trunk/templates/NEST-ida-event.tmpl

@@ -19 +19 @@
   state = &(node.S_);
 
-{% if (haskey(stateIndexMap,"v") and haskey(defaults,"V_t") %}      
+{% if (haskey(stateIndexMap,"v") and ("V_t" in defaultDefs)) %}      
   v = Ith (y, {{attr(stateIndexMap,"v")}});
-  vt = params->{{attr(defaults,"V_t")}};
+  vt = params->V_t;
   g[0] = v - vt;
 {% else %}

release/4/nemo/trunk/templates/NEST-nodes.tmpl

@@ -98 +98 @@
    if (check_flag(&status, "CVodeInit", 1)) throw CVodeSolverFailure (get_name(), status);
 
-{% if haskey(defaults,"V_t") %}
+{% if haskey("V_t" in defaultDefs) %}
 
    /* Spike event handler (detects zero-crossing of V-V_t) */
@@ -248 +248 @@
    if (check_flag(&status, "IDAInit", 1)) throw IDASolverFailure (get_name(), status);
 
-{% if haskey(defaults,"V_t") %}
+{% if ("V_t" in defaultDefs) %}
 
    /* Spike event handler (detects zero-crossing of V-V_t) */
@@ -391 +391 @@
 {
     B_.logger_.init();  
-    #{(if iv (sprintf "V_.U_old_ = S_.y_[~A];" iv) "")}
-    #{(if (lookup-def 't_ref defaults) 
-          "V_.RefractoryCounts_ = Time(Time::ms(P_.t_ref)).get_steps();" 
-          "V_.RefractoryCounts_ = 0;")}
-}
-
-
+    {% if haskey(stateIndexMap,"v") %}V_.U_old_ = S_.y_[{{attr(stateIndexMap,"v")}}];{% endif %}
+{% if ("t_ref" in defaultDefs) %}
+    V_.RefractoryCounts_ = Time(Time::ms(P_.t_ref)).get_steps();
+{% else %}
+    V_.RefractoryCounts_ = 0;
 {% endif %}
+}
+
+
+{% endif %}

release/4/nemo/trunk/templates/NEST-parameters.tmpl

@@ -6 +6 @@
 {% endif %}
 
-{% for eq in paramters.parameterEqDefs %}
+{% for eq in parameters.parameterEqDefs %}
 {% if (loop.last) %}
   {{eq}}