Changeset 25514 in project

Timestamp:

11/17/11 08:16:20 (10 years ago)

Author:

Ivan Raikov

Message:

9ML-toolkit: support for lsode solver in octave

Location:

release/4/9ML-toolkit/trunk

Files:

• 9ML-toolkit.meta (modified) (1 diff)
• 9ML-toolkit.setup (modified) (6 diffs)
• ivp-octave.scm (added)
• ivp.scm (modified) (2 diffs)

release/4/9ML-toolkit/trunk/9ML-toolkit.meta

@@ -26 +26 @@
  (needs matchable datatype static-modules (miniML 1.4) (getopt-long  1.8)
         uri-generic ssax sxml-transforms sxpath object-graph format-graph
-        mathh silex lalr setup-helper (signal-diagram 1.5) )
+        mathh silex lalr setup-helper (signal-diagram 2.1) )
 
  (author "Ivan Raikov")

release/4/9ML-toolkit/trunk/9ML-toolkit.setup

@@ -6 +6 @@
 (required-extension-version 'getopt-long 1.9)
 (required-extension-version 'miniML 1.7)
-(required-extension-version 'signal-diagram 1.5)
-
-(define version 1.7)
+(required-extension-version 'signal-diagram 2.1)
+
+(define version 1.8)
 
 (make (
@@ -33 +33 @@
         (compile  -s 9ML-repr.import.scm))
 
+       ((dynld-name "9ML-ivp-octave") ("ivp-octave.scm" )
+        (compile -O -d2 -S -s ivp-octave.scm -o ,(dynld-name "9ML-ivp-octave") -j 9ML-ivp-octave))
+
+       ((dynld-name "9ML-ivp-octave.import") ( "9ML-ivp-octave.import.scm" )
+        (compile  -s 9ML-ivp-octave.import.scm))
+
        ((dynld-name "9ML-ivp-chicken") ("ivp-chicken.scm" )
         (compile -O -d2 -S -s ivp-chicken.scm -o ,(dynld-name "9ML-ivp-chicken") -j 9ML-ivp-chicken))
@@ -39 +45 @@
         (compile  -s 9ML-ivp-chicken.import.scm))
 
-       ((dynld-name "9ML-ivp-mlton") ( "9ML-ivp-chicken.import.scm" )
+       ((dynld-name "9ML-ivp-mlton") ( "ivp-mlton.scm" )
         (compile -O -d2 -S -s ivp-mlton.scm -o ,(dynld-name "9ML-ivp-mlton") -j 9ML-ivp-mlton))
 
@@ -45 +51 @@
         (compile  -s 9ML-ivp-mlton.import.scm))
 
-       ((dynld-name "9ML-ivp-octave-mlton") ( "ivp-octave-mlton.scm" (dynld-name "9ML-ivp-mlton") )
+       ((dynld-name "9ML-ivp-octave-mlton") ( "ivp-octave-mlton.scm" )
         (compile -O -d2 -S -s ivp-octave-mlton.scm -o ,(dynld-name "9ML-ivp-octave-mlton") -j 9ML-ivp-octave-mlton))
 
@@ -83 +89 @@
         (dynld-name "9ML-repr") (dynld-name "9ML-repr.import") 
         (dynld-name "9ML-parse") (dynld-name "9ML-parse.import") 
+        (dynld-name "9ML-ivp-octave") (dynld-name "9ML-ivp-octave.import") 
         (dynld-name "9ML-ivp-chicken") (dynld-name "9ML-ivp-chicken.import") 
         (dynld-name "9ML-ivp-mlton") (dynld-name "9ML-ivp-mlton.import") 
@@ -90 +97 @@
   )
 
+
+(install-extension
+
+  ; Name of your extension:
+  '9ML-ivp-octave
+
+  ; Files to install for your extension:
+  `(,(dynld-name "9ML-ivp-octave") ,(dynld-name "9ML-ivp-octave.import") )
+
+  ; Assoc list with properties for your extension:
+  `((version ,version)
+    ))
 
 (install-extension

release/4/9ML-toolkit/trunk/ivp.scm

@@ -23 +23 @@
 (require-extension getopt-long ssax sxml-transforms sxpath sxpath-lolevel object-graph signal-diagram)
 (require-extension 9ML-parse 9ML-repr )
-(require-extension 9ML-ivp-chicken 9ML-ivp-mlton 9ML-ivp-octave-mlton )
+(require-extension 9ML-ivp-octave 9ML-ivp-chicken 9ML-ivp-mlton 9ML-ivp-octave-mlton )
         
 
@@ -246 +246 @@
                                               (lset-intersection eq? (alist-ref 'in dfe) (alist-ref 'out dfe))
                                               (list ivar)))
-                      (pvars (lset-difference eq? (alist-ref 'in dfe) (cons ivar dvars))))
+                      (pvars (lset-difference eq? (alist-ref 'in dfe) (cons ivar dvars)))
+                      (events (events sd))
+                      )
 
 
                  (case platform
                    
+                   ((octave)
+                    (ivp-octave prefix ivp-id hvar ivar dvars pvars events start end ic sd)
+                    (list ivp-id ivar dvars) )
+
                    ((octave/mlton octave-mlton)
                     (ivp-octave-mlton prefix ivp-id hvar ivar dvars pvars start end ic sd)
                     (list ivp-id ivar dvars) )
-
                    
                    ((mlton)
                     (ivp-mlton  prefix ivp-id ivar dvars pvars start end ic sd)
                     (list ivp-id ivar dvars) )
-
 
                    ((chicken)