Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
AI-CogSci-Group
ACT-R_Phi
Commits
fbf8ff29
Commit
fbf8ff29
authored
Nov 24, 2020
by
CD
Browse files
Fixed small bug introduced after outputting cognitive params in function
parent
ac156fa3
Changes
1
Hide whitespace changes
Inline
Side-by-side
user-loads/Affective-Associations.lisp
View file @
fbf8ff29
...
...
@@ -263,7 +263,7 @@
(
+
(
*
(
AA-epi-arous-ratio
aa
)
(
compute-epi-arousal
))
(
*
(
AA-crh-arous-ratio
aa
)
(
compute-crh-arousal
))))
(
sgp
:ans
)
(
sgp
:egs
)
(
sgp
:ut
)))
(
car
(
sgp
:ans
)
)
(
car
(
sgp
:egs
)
)
(
car
(
sgp
:ut
)))
)
(
with-open-file
(
msgStream
(
concatenate
'string
"Phys-data/CEC-Arous"
(
phys-module-pipeID
phys
)
".txt"
)
:direction
:output
:if-exists
:overwrite
:if-does-not-exist
:create
)
...
...
@@ -305,9 +305,8 @@
(
timeSinceAsleep
(
-
(
read-from-string
currT
)
(
read-from-string
LA
))))
(
if
(
and
LA
currT
(
>
timeSinceAsleep
0
))
(
let
((
homArousal
(
/
(
-
(
*
maxDays
1440
)
timeSinceAsleep
)
(
*
maxDays
1440
))))
(
if
(
>
homArousal
0
)
(
progn
(
setf
ret-arousal
(
/
1
(
+
1
(
expt
(
/
(
expt
homArousal
r
)
(
-
1
(
expt
homArousal
r
)))
(
*
-1
beta
))))))))
(
when
(
>
homArousal
0
)
(
setf
ret-arousal
(
/
1
(
+
1
(
expt
(
/
(
expt
homArousal
r
)
(
-
1
(
expt
homArousal
r
)))
(
*
-1
beta
)))))))
(
setf
ret-arousal
1
))
(
if
test
(
with-open-file
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment