Changeset 25516 in project

Timestamp:

11/17/11 08:18:49 (9 years ago)

Author:

Ivan Raikov

Message:

signal-diagram: created auxiliary procedure events to identify the names of discrete event variables in a signal diagram

File:

• release/4/signal-diagram/trunk/signal-diagram.scm (modified) (4 diffs)

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

@@ -42 +42 @@
          symbolic-constants enum-freevars
 
-         construct dataflow codegen/Octave codegen/scheme codegen/ML
+         construct dataflow events codegen/Octave codegen/scheme codegen/ML
          )
 
@@ -1180 +1180 @@
 
 
+(define (events f)
+  (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)
+        ))
+    ))
+
+
 (define (codegen/Octave name f #!key (initial #f) (pre #t) (solver #f))
 
@@ -1193 +1213 @@
            (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) 
@@ -1235 +1238 @@
         "endfunction" 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
-            "endfunction" nl))))
-          
       
       (if initial