Changeset 25492 in project

Timestamp:

11/11/11 09:18:02 (9 years ago)

Author:

Ivan Raikov

Message:

signal-diagram: initial support for event function in Octave

Location:

release/4/signal-diagram/trunk

Files:

• examples/Izhikevich03.scm (modified) (1 diff)
• signal-diagram.scm (modified) (3 diffs)
• signal-diagram.setup (modified) (1 diff)

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: 'rkbs)
+            (codegen name model language: 'octave pre: pre solver: #f)
             (recur (cdr models) #f)
             )))

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

@@ -1180 +1180 @@
 
 
-(define (codegen/Octave name f #!key (initial #f) (pre #t) (solver 'rk4b))
+(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))))
@@ -1193 +1193 @@
            (fcodegen ((sfarrow-codegen f) input fenv dfe ))
            (relations-expr (relations-codegen f input))
+           (events   (let recur ((f f) (ax '()))
+                       (let ((sig (sfarrow-sig f)))
+                         (case (car sig)
+                           ((RTRANSITION)
+                            (let ((ef (fourth sig)) (eg (fifth sig)))
+                              (let* ((ax1 (cons ef ax))
+                                     (ax2 (if (symbol? eg)  (cons eg ax1) ax1)))
+                                (fold recur ax2 (cdr (sfarrow-children f)))
+                                )))
+                           ((TRANSIENT)
+                            (let ((e (fourth sig)))
+                              (let* ((ax1 (cons e ax)))
+                                (fold recur ax1 (cdr (sfarrow-children f)))
+                                )))
+                           (else ax)
+                           ))
+                       ))
            (globals   (filter-map
                        (lambda (x) 
@@ -1217 +1234 @@
         "end" nl))
 
+      (if (pair? events)
+        (let ((event-vector (map (lambda (x) (value->Octave (V:Op '- (list (V:Sel x (V:Var 'input)) (V:C 1.))))) events)))
+          (print-fragments
+           (list
+            "function " (name/Octave "retval") " = " (name/Octave (string-append (->string name) "_event")) " (input)" nl
+            "retval = [" (intersperse event-vector ",") "];" nl
+            "end" nl))))
+          
+      
       (if initial
           (print-fragments

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

@@ -6 +6 @@
 (required-extension-version 'flsim 1.7)
 
-(define version 2.0)
+(define version 2.1)
 
 (make (