Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Number pair metacognition task #54

Open
wants to merge 29 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 26 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
e677a16
Move docker files to root for developing. Remember to revert when mer…
htwangtw Nov 23, 2022
e559e56
ADD test version of the rehersal and recall screen
htwangtw Jan 26, 2023
639dd8f
Merge branch 'courtois-neuromod:main' into metacognition-dev
htwangtw Jan 26, 2023
5c6fe6f
ADD design file for demo
htwangtw Jan 27, 2023
e8dd6ce
TMP/FIX lock numpy version to prevent the numpy 1.24 error
htwangtw Feb 7, 2023
55f67e0
FIX grid behaviour
htwangtw Feb 20, 2023
5ba8d85
complete the trial types
htwangtw Feb 20, 2023
5071cc4
remove files commited by accident
htwangtw Feb 20, 2023
058a33e
ADD VAS for time selection
htwangtw Feb 20, 2023
82dd0a5
WIP MATLAB -> Python
htwangtw Feb 24, 2023
2cf61cd
add notes about things to change and implement
htwangtw Feb 24, 2023
133fac6
Python version of trial genration
htwangtw Mar 27, 2023
2902da8
FIX characters no repetition
htwangtw Mar 28, 2023
62b5dc5
A fully functional task
htwangtw Mar 29, 2023
2d6ff41
remove useless files
htwangtw Mar 29, 2023
05b1b10
Update key mapping
htwangtw Apr 18, 2023
f4d632c
remove files I used for development from this branch
htwangtw Apr 18, 2023
dbadd53
Merge remote-tracking branch 'upstream/main' into metacognition-dev
htwangtw Apr 18, 2023
1c24fff
i missed the docker file
htwangtw Apr 18, 2023
1a5c8a2
i missed the docker file
htwangtw Apr 18, 2023
4667754
Split event: 4 grid per run
htwangtw Apr 22, 2023
72ba367
formatting display text
htwangtw Apr 22, 2023
d08298b
Apply suggestions from code review
htwangtw Aug 18, 2023
1f0390c
use pandas to load conditions into list of dict
htwangtw Aug 18, 2023
8f45dfa
use pandas to load conditions into list of dict
htwangtw Aug 18, 2023
b533897
Revert "use pandas to load conditions into list of dict"
htwangtw Aug 18, 2023
c92f08c
Apply suggestions from code review
htwangtw Aug 18, 2023
0b170b4
Add fixation dot; stole code from emotion task
htwangtw Aug 18, 2023
29aacd9
Add fixation dot; stole code from emotion task
htwangtw Aug 18, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Loading