Commit 459f627e authored by cldancy's avatar cldancy
Browse files

Merge

parents e09b129d 54a7dd15
# Port settings for ACT-R server started at 06:20:25 9/21/2020
set actr_port 2653
set actr_address "192.168.198.161"
# Port settings for ACT-R server started at 10:29:21 10/08/2020
set actr_port 2651
set actr_address "192.168.1.118"
# Port settings for ACT-R server started at 21:23:52 10/07/2020
set actr_port 2663
set actr_address "192.168.1.118"
# Port settings for ACT-R server started at 21:23:52 10/07/2020
set actr_port 2660
set actr_address "192.168.1.118"
......@@ -336,9 +336,9 @@ t)
(model (concatenate 'string
"\"<root><model>" *HumModDir* "HumMod.DES</model><pipeid>"
pipeID "</pipeid></root>\""))
(hide-gui "\"True\"")
(non-gui-version "\"False\"")
(activity-timeout "60"))
(hide-gui " \"True\"")
(non-gui-version " \"False\"")
(activity-timeout " 60"))
(setf old-dir
#+:ccl (ccl::current-directory-name)
......@@ -1151,7 +1151,7 @@ t)
(timeSliceCount 0)
;;Used to communicate with HumMod Process
(pipeID (write-to-string (random(get-universal-time))))
(pipeID (write-to-string (random (get-universal-time))))
(init nil)
;;Holds our physiological variables (key) and place in value list (val; e.g., 1, 2, 3, etc.)
......@@ -1257,7 +1257,9 @@ t)
(:phys-ics-file
(setf (phys-module-ics-file phys) (cdr param)))
(:phys-ics-exp-file
(setf (phys-module-ics-exp-file phys) (cdr param))))
(setf (phys-module-ics-exp-file phys) (cdr param)))
(:phys-pipe-id
(setf (phys-module-pipeID phys) (cdr param))))
(case param
(:phys-delay
......@@ -1273,7 +1275,9 @@ t)
(:phys-ics-file
(phys-module-ics-file phys))
(:phys-ics-exp-file
(phys-module-ics-exp-file phys)))))
(phys-module-ics-exp-file phys))
(:phys-pipe-id
(phys-module-pipeID phys)))))
;;;Deprecated, keeping for now for records
......@@ -1380,6 +1384,13 @@ t)
:documentation "File used to load initial conditions for an experiment"
:default-value nil
:valid-test (lambda (x) (or (typep x 'string) (equal x nil)))
:owner t)
(define-parameter
:phys-pipe-id
:documentation "Used by HumMod to determine solver{input/output} file name for communication"
:default-value (write-to-string (random (get-universal-time)))
:valid-test (lambda (x) (or (typep x 'string) (equal x nil)))
:owner t))
:version "1.0"
:documentation
......
"<solverin><gofor><solutionint>30.0000000000</solutionint><displayint>30.0000000000</displayint></gofor></solverin>"
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment