Changeset 29979 in project


Ignore:
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:
5 edited

Legend:

Unmodified
Added
Removed
  • release/4/9ML-toolkit/trunk/network.scm

    r29971 r29979  
    437437  (call-with-input-string str
    438438      (lambda (in)
    439         (ssax:xml->sxml in `((nml . ,nineml-xmlns))))
     439        (ssax:xml->sxml in `((nml . ,(string-append nineml-xmlns-base "0.2"))
     440                             (nml . ,(string-append nineml-xmlns-base "0.3"))
     441                             (nml . ,(string-append nineml-xmlns-base "1.0"))
     442                             )))
    440443      ))
    441444
     
    10131016 
    10141017
    1015 (define (make-projection-tenv name source target rule response properties)
     1018(define (make-projection-tenv name type source target rule response properties)
    10161019  (alist->tenv
    10171020   `((name       . ,name)
     
    12941297
    12951298               (exec-path (group-path sim-path mlb-path makefile-path)
    1296                           (run (,make)))
     1299                          (run (make -f ,makefile-path)))
    12971300
    12981301               )
     
    13511354
    13521355               (d "ul-properties = ~A~%" ul-properties)
     1356               (d "ul-groups = ~A~%" ul-groups)
    13531357
    13541358               (for-each
  • release/4/9ML-toolkit/trunk/parse.scm

    r29974 r29979  
    2828
    2929        (parse parse-sexpr-macro parse-string-expr parse-sym-expr make-signal-expr
    30          nineml-xmlns parse-al-sxml-component parse-al-sxml)
     30         nineml-xmlns-base parse-al-sxml-component parse-al-sxml)
    3131
    3232        (import scheme chicken)
     
    642642
    643643
    644 (define nineml-xmlns "http://nineml.org/9ML/1.0")
     644(define nineml-xmlns-base "http://nineml.incf.org/9ML/")
    645645
    646646(define (parse-al-sxml-dynamics sxml)
  • release/4/9ML-toolkit/trunk/templates/Makefile.tmpl

    r29963 r29979  
    11all: Sim{{group.name}}
    22Sim{{group.name}}: Sim{{group.name}}.mlb Sim{{group.name}}.sml {{group.name}}.sml
    3         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
     3        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
    44
  • release/4/9ML-toolkit/trunk/templates/Network.sml.tmpl

    r29944 r29979  
    379379               S
    380380{% endif %}
    381               ], E)
     381              ])
    382382             end)
    383383
  • release/4/9ML-toolkit/trunk/templates/Sim.sml.tmpl

    r29944 r29979  
    5353exception Index
    5454
    55 fun start (tmax, N, S, D, E, Pn, initial_vector, psr_initial_vector, frun, fresponse, ftime, fspikes, finfo, out) =
     55fun start (tmax, N, S, D, Pn, initial_vector, psr_initial_vector, frun, fresponse, ftime, fspikes, finfo, out) =
    5656
    5757let
     
    129129        (let
    130130            val     _ = putStrLn TextIO.stdOut ("starting fprojection...")
    131             val ((S,E),t) = timing fevent_projection
     131            val (S,t) = timing fprojection
    132132            val     _ = putStrLn TextIO.stdOut ("fprojection took " ^ (Time.toString t) ^ " s")
    133133            val out   = TextIO.openOut (label ^ ".dat")
     
    142142            let
    143143                val _     = putStrLn TextIO.stdOut ("starting simulation...")
    144                 val (_,t) = timing (fn () => start (1200.0, N, S, E, D, Pn, initial, psr_initial, frun, fresponse, ftime, fspikes, finfo, out))
     144                val (_,t) = timing (fn () => start (1200.0, N, S, D, Pn, initial, psr_initial, frun, fresponse, ftime, fspikes, finfo, out))
    145145            in
    146146                putStrLn TextIO.stdOut ("simulation took " ^ (Time.toString t) ^ " s")
Note: See TracChangeset for help on using the changeset viewer.