Changeset 29979 in project

Timestamp:

11/01/13 05:37:47 (6 years ago)

Author:

Ivan Raikov

Message:

9ML-toolkit: updates to support proper NineML schema

Location:

release/4/9ML-toolkit/trunk

Files:

• network.scm (modified) (4 diffs)
• parse.scm (modified) (2 diffs)
• templates/Makefile.tmpl (modified) (1 diff)
• templates/Network.sml.tmpl (modified) (1 diff)
• templates/Sim.sml.tmpl (modified) (3 diffs)

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

@@ -437 +437 @@
   (call-with-input-string str
       (lambda (in)
-        (ssax:xml->sxml in `((nml . ,nineml-xmlns))))
+        (ssax:xml->sxml in `((nml . ,(string-append nineml-xmlns-base "0.2"))
+                             (nml . ,(string-append nineml-xmlns-base "0.3"))
+                             (nml . ,(string-append nineml-xmlns-base "1.0"))
+                             )))
       ))
 
@@ -1013 +1016 @@
   
 
-(define (make-projection-tenv name source target rule response properties)
+(define (make-projection-tenv name type source target rule response properties)
   (alist->tenv
    `((name       . ,name)
@@ -1294 +1297 @@
 
                (exec-path (group-path sim-path mlb-path makefile-path)
-                          (run (,make)))
+                          (run (make -f ,makefile-path)))
 
                )
@@ -1351 +1354 @@
 
                (d "ul-properties = ~A~%" ul-properties)
+               (d "ul-groups = ~A~%" ul-groups)
 
                (for-each

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

@@ -28 +28 @@
 
         (parse parse-sexpr-macro parse-string-expr parse-sym-expr make-signal-expr
-         nineml-xmlns parse-al-sxml-component parse-al-sxml)
+         nineml-xmlns-base parse-al-sxml-component parse-al-sxml)
 
         (import scheme chicken)
@@ -642 +642 @@
 
 
-(define nineml-xmlns "http://nineml.org/9ML/1.0")
+(define nineml-xmlns-base "http://nineml.incf.org/9ML/")
 
 (define (parse-al-sxml-dynamics sxml)

release/4/9ML-toolkit/trunk/templates/Makefile.tmpl

@@ -1 +1 @@
 all: Sim{{group.name}}
 Sim{{group.name}}: Sim{{group.name}}.mlb Sim{{group.name}}.sml {{group.name}}.sml 
-        mlton -cc-opt "-O3" -mlb-path-var "RK_LIB {{sml_lib_home}}/rk" -mlb-path-var "RANDMTZIG_LIB {{sml_lib_home}}/randmtzig" -mlb-path-var "TENSOR_LIB RANDMTZIG_LIB {{sml_lib_home}}/randmtzig"  $< {{sml_lib_home}}/randmtzig/randmtziglib.c
+        mlton -cc-opt "-O3" -mlb-path-var "RK_LIB {{sml_lib_home}}/rk" -mlb-path-var "RANDMTZIG_LIB {{sml_lib_home}}/randmtzig" -mlb-path-var "TENSOR_LIB {{sml_lib_home}}/tensor"  $< {{sml_lib_home}}/randmtzig/randmtziglib.c
 

release/4/9ML-toolkit/trunk/templates/Network.sml.tmpl

@@ -379 +379 @@
                S
 {% endif %}
-              ], E)
+              ])
              end)
 

release/4/9ML-toolkit/trunk/templates/Sim.sml.tmpl

@@ -53 +53 @@
 exception Index
 
-fun start (tmax, N, S, D, E, Pn, initial_vector, psr_initial_vector, frun, fresponse, ftime, fspikes, finfo, out) =
+fun start (tmax, N, S, D, Pn, initial_vector, psr_initial_vector, frun, fresponse, ftime, fspikes, finfo, out) =
 
 let
@@ -129 +129 @@
         (let
             val     _ = putStrLn TextIO.stdOut ("starting fprojection...")
-            val ((S,E),t) = timing fevent_projection
+            val (S,t) = timing fprojection
             val     _ = putStrLn TextIO.stdOut ("fprojection took " ^ (Time.toString t) ^ " s")
             val out   = TextIO.openOut (label ^ ".dat")
@@ -142 +142 @@
             let
                 val _     = putStrLn TextIO.stdOut ("starting simulation...")
-                val (_,t) = timing (fn () => start (1200.0, N, S, E, D, Pn, initial, psr_initial, frun, fresponse, ftime, fspikes, finfo, out))
+                val (_,t) = timing (fn () => start (1200.0, N, S, D, Pn, initial, psr_initial, frun, fresponse, ftime, fspikes, finfo, out))
             in
                 putStrLn TextIO.stdOut ("simulation took " ^ (Time.toString t) ^ " s")