Changeset 29979 in project
- Timestamp:
- 11/01/13 05:37:47 (6 years ago)
- Location:
- release/4/9ML-toolkit/trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
release/4/9ML-toolkit/trunk/network.scm
r29971 r29979 437 437 (call-with-input-string str 438 438 (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 ))) 440 443 )) 441 444 … … 1013 1016 1014 1017 1015 (define (make-projection-tenv name source target rule response properties)1018 (define (make-projection-tenv name type source target rule response properties) 1016 1019 (alist->tenv 1017 1020 `((name . ,name) … … 1294 1297 1295 1298 (exec-path (group-path sim-path mlb-path makefile-path) 1296 (run ( ,make)))1299 (run (make -f ,makefile-path))) 1297 1300 1298 1301 ) … … 1351 1354 1352 1355 (d "ul-properties = ~A~%" ul-properties) 1356 (d "ul-groups = ~A~%" ul-groups) 1353 1357 1354 1358 (for-each -
release/4/9ML-toolkit/trunk/parse.scm
r29974 r29979 28 28 29 29 (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) 31 31 32 32 (import scheme chicken) … … 642 642 643 643 644 (define nineml-xmlns "http://nineml.org/9ML/1.0")644 (define nineml-xmlns-base "http://nineml.incf.org/9ML/") 645 645 646 646 (define (parse-al-sxml-dynamics sxml) -
release/4/9ML-toolkit/trunk/templates/Makefile.tmpl
r29963 r29979 1 1 all: Sim{{group.name}} 2 2 Sim{{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.c3 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 4 4 -
release/4/9ML-toolkit/trunk/templates/Network.sml.tmpl
r29944 r29979 379 379 S 380 380 {% endif %} 381 ] , E)381 ]) 382 382 end) 383 383 -
release/4/9ML-toolkit/trunk/templates/Sim.sml.tmpl
r29944 r29979 53 53 exception Index 54 54 55 fun start (tmax, N, S, D, E,Pn, initial_vector, psr_initial_vector, frun, fresponse, ftime, fspikes, finfo, out) =55 fun start (tmax, N, S, D, Pn, initial_vector, psr_initial_vector, frun, fresponse, ftime, fspikes, finfo, out) = 56 56 57 57 let … … 129 129 (let 130 130 val _ = putStrLn TextIO.stdOut ("starting fprojection...") 131 val ( (S,E),t) = timing fevent_projection131 val (S,t) = timing fprojection 132 132 val _ = putStrLn TextIO.stdOut ("fprojection took " ^ (Time.toString t) ^ " s") 133 133 val out = TextIO.openOut (label ^ ".dat") … … 142 142 let 143 143 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)) 145 145 in 146 146 putStrLn TextIO.stdOut ("simulation took " ^ (Time.toString t) ^ " s")
Note: See TracChangeset
for help on using the changeset viewer.