Changeset 25511 in project

Timestamp:

11/16/11 15:28:28 (10 years ago)

Author:

Ivan Raikov

Message:

signal-diagram and flsim: additions to lsode integration

Location:

release/4

Files:

• flsim/trunk/flsim.scm (modified) (3 diffs)
• flsim/trunk/flsim.setup (modified) (2 diffs)
• flsim/trunk/octave-lib (added)
• flsim/trunk/octave-lib/ode15s.m (added)
• signal-diagram/trunk/examples/Izhikevich03.scm (modified) (1 diff)
• signal-diagram/trunk/signal-diagram.scm (modified) (2 diffs)

release/4/flsim/trunk/flsim.scm

@@ -470 +470 @@
 
   
-(define (prelude/Octave #!key (solver 'rk4b))
+(define (prelude/Octave #!key (solver 'lsode))
 `(
 #<<EOF
@@ -556 +556 @@
 )
        ("global " ,solver #\; ,nl)
-       (,solver = #\@ ,(case solver ((rk3) 'ode23) ((rk4b rk4a) 'ode45) ((rkf45) 'ode54) (else 'lsode)) #\; ,nl)
-
-       ,(if (member solver '(rk3 rk4b rk4a rkf45))
-`(
+       (,solver = #\@ ,(case solver
+                         ((rk3) 'ode23) ((rk4b rk4a) 'ode45) ((rkf45) 'ode54) 
+                         (else 'lsode)) #\; ,nl)
+
+       ,(cond
+
+         ((member solver '(rk3 rk4b rk4a rkf45))
+
+               `(
 #<<EOF
 global reltol abstol dt;
@@ -574 +579 @@
        "  [t,y] = " ,solver "(f,[x,x+h],y,P); " ,nl 
        "  res = y(2);" ,nl end ,nl
-)
-
-`(
+       ))
+              (else
+
+               `(
 #<<EOF
 lsode_options("relative tolerance",1e-1);
 lsode_options("absolute tolerance",1e-2);
-lsode_options("initial step size",1e-3);
+
 
 EOF
-       "function res = integrate1d (f,x,y,h)" ,nl 
+       "function res = integrate1d (f,x,y0,h)" ,nl 
        "  global " ,solver ";" ,nl
-       "  y = " ,solver "(@(t,yvec)(f(yvec,t)),y,[x,x+h]); " ,nl 
+       "  y = " ,solver "(@(yvec,t) f(t,yvec),y0,[x,x+h]); " ,nl 
        "  res = y(2);" ,nl end ,nl
-)
-   )
+       )
+   ))
  ))
 ))
 
-
          
 

release/4/flsim/trunk/flsim.setup

@@ -4 +4 @@
   (make-pathname #f fn ##sys#load-dynamic-extension))   
 
-(define version 2.0)
+(define version 2.1)
 
 (make (
@@ -77 +77 @@
 (copy-file-to-flsim-dir "sml-lib/rk/rk.mlb")
 
+(copy-file-to-flsim-dir "octave-lib/ode15s.m")
 
+
+

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

@@ -172 +172 @@
                  (name  (car name.model))
                  (model (cdr name.model)))
-            (codegen name model language: 'octave pre: pre solver: #f)
+            (codegen name model language: 'octave pre: pre solver: 'lsode)
             (recur (cdr models) #f)
             )))

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

@@ -1182 +1182 @@
 (define (codegen/Octave name f #!key (initial #f) (pre #t) (solver #f))
 
-  (if (and solver (not (member solver '(rkfe rk3 rk4a rk4b rkhe rkbs rkf45))))
+  (if (and solver (not (member solver '(lsode rkfe rk3 rk4a rk4b rkhe rkbs rkf45))))
       (error 'codegen/Octave "unknown solver" solver))
   
@@ -1261 +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 ode15s))))
+  (if (and solver (not (member solver '(lsode rkfe rk3 rk4a rk4b rkhe rkbs rkf45))))
       (error 'codegen/scheme "unknown solver" solver))