Changeset 25510 in project

Timestamp:

11/16/11 15:08:39 (9 years ago)

Author:

Ivan Raikov

Message:

signal-diagram: integration with built-in Octave solver

Location:

release/4/signal-diagram/trunk

Files:

• examples/Izhikevich03_run.m (modified) (2 diffs)
• signal-diagram.scm (modified) (3 diffs)

release/4/signal-diagram/trunk/examples/Izhikevich03_run.m

@@ -6 +6 @@
 
 autoload ("RS", Izhikevich03_defs );
+autoload ("RS_event", Izhikevich03_defs );
 autoload ("RS_initial", Izhikevich03_defs );
 autoload ("IB", Izhikevich03_defs );
@@ -19 +20 @@
 
 t0 = 0.0;
-t1 = 150.0;
+t1 = 500.0;
 
-RS_state = RS_initial;
-RS_ys = [[RS_state.t,RS_state.V]];
+global RS_state
+RS_state = RS_initial
+RS_ys = [[RS_state.t,RS_state.U,RS_state.V,RS_state.spike]];
+
+tic;
 while (RS_state.t < t1)
-  y = RS(RS_state);
-  y.t
-  RS_state.t = y.t;
-  RS_state.U = y.U;
-  RS_state.V = y.V;
-  RS_state.spike = y.spike;
-  RS_state.tspike = y.tspike;
-  RS_ys = [RS_ys; [y.t,y.V]];
+   y = RS(RS_state);
+
+   if (y.spike)
+     RS_state.h = 1e-3;
+     y = RS(RS_state);
+   else
+     if (RS_state.h < 0.25)
+       RS_state.h = RS_state.h+1e-1;
+     endif
+   endif
+
+   RS_state.t = y.t;
+   RS_state.U = y.U;
+   RS_state.V = y.V;
+   RS_state.spike = y.spike;
+   RS_state.tspike = y.tspike;
+   RS_ys = [RS_ys; [y.t,y.U,y.V,RS_state.spike]];
 endwhile
+toc;
 
 # IB_state = IB_initial;

release/4/signal-diagram/trunk/signal-diagram.scm

@@ -1230 +1230 @@
         "function " (name/Octave (codegen-rv fcodegen)) " = " (name/Octave name) " (input)" nl
         (list "global " (intersperse globals " ") ";" nl)
-        (map (lambda (x) (list (name/Octave x) " = " (value->Octave (V:Sel x (V:Var 'input))) "; " nl)) input)   nl
+        (map (lambda (x) (list (name/Octave x) " = " (value->Octave (V:Sel x (V:Var 'input))) "; " nl)) input)
+        nl
         (map expr->Octave (append relations-expr (codegen-expr fcodegen))) nl 
-        "end" nl))
+        "endfunction" nl))
 
       (if (pair? events)
@@ -1240 +1241 @@
             "function " (name/Octave "retval") " = " (name/Octave (string-append (->string name) "_event")) " (input)" nl
             "retval = [" (intersperse event-vector ",") "];" nl
-            "end" nl))))
+            "endfunction" nl))))
           
       
       (if initial
-          (print-fragments
-           (list (name/Octave name) "_initial = " 
-                 (value->Octave
-                  (V:Rec (map (lambda (x) (let ((n (car x)) (v (cadr x)))
-                                            (let ((v (cond ((and (or (number? v) (symbol? v))) v)
-                                                           ((boolean? v) (if v 'true 'false))
-                                                           (else v))))
-                                              (list n (V:C v)))))
-                              initial))) nl)))
+              (print-fragments
+               (list (name/Octave name) "_initial = " 
+                     (value->Octave
+                      (V:Rec (map (lambda (x) (let ((n (car x)) (v (cadr x)))
+                                                (let ((v (cond ((and (or (number? v) (symbol? v))) v)
+                                                               ((boolean? v) (if v 'true 'false))
+                                                               (else v))))
+                                                  (list n (V:C v)))))
+                                  initial))) nl))
+              )
 
 
@@ -1259 +1261 @@
 (define (codegen/scheme name f #!key (initial #f) (pre #t) (solver 'rk4b))
 
-  (if (and solver (not (member solver '(rkfe rk3 rk4a rk4b rkhe rkbs rkf45))))
+  (if (and solver (not (member solver '(rkfe rk3 rk4a rk4b rkhe rkbs rkf45 ode15s))))
       (error 'codegen/scheme "unknown solver" solver))