Skip to content

Commit 0667663

Browse files
henrymjhenrymj
committed
update circleci, n_back practice
1 parent 2cb620b commit 0667663

File tree

2 files changed

+96
-4
lines changed

2 files changed

+96
-4
lines changed

‎circle.yml

+9-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ jobs:
138138
python -c "from expfactory.tests import circle_ci_test; circle_ci_test('cue_control_smoking','web','.');"
139139
python -c "from expfactory.tests import circle_ci_test; circle_ci_test('cue_control_smoking_practice','web','.');"
140140
python -c "from expfactory.tests import circle_ci_test; circle_ci_test('cue_control_smoking_pre_rating','web','.');"
141-
python -c "from expfactory.tests import circle_ci_test; circle_ci_test('stop_signal_with_go_no_go','web','.');"
141+
python -c "from expfactory.tests import circle_ci_test; circle_ci_test('stop_signal_with_go_nogo','web','.');"
142142
python -c "from expfactory.tests import circle_ci_test; circle_ci_test('stop_signal_with_n_back','web','.');"
143143
python -c "from expfactory.tests import circle_ci_test; circle_ci_test('stop_signal_with_directed_forgetting','web','.');"
144144
python -c "from expfactory.tests import circle_ci_test; circle_ci_test('stop_signal_with_flanker','web','.');"
@@ -161,13 +161,21 @@ jobs:
161161
python -c "from expfactory.tests import circle_ci_test; circle_ci_test('flanker_with_predictable_task_switching','web','.');"
162162
python -c "from expfactory.tests import circle_ci_test; circle_ci_test('shape_matching_with_predictable_task_switching','web','.');"
163163
python -c "from expfactory.tests import circle_ci_test; circle_ci_test('n_back_single_task_network','web','.');"
164+
python -c "from expfactory.tests import circle_ci_test; circle_ci_test('n_back_single_task_network__fmri','web','.');"
165+
python -c "from expfactory.tests import circle_ci_test; circle_ci_test('n_back_single_task_network__practice','web','.');"
164166
python -c "from expfactory.tests import circle_ci_test; circle_ci_test('directed_forgetting_single_task_network','web','.');"
165167
python -c "from expfactory.tests import circle_ci_test; circle_ci_test('stop_signal_single_task_network','web','.');"
168+
python -c "from expfactory.tests import circle_ci_test; circle_ci_test('stop_signal_single_task_network__fmri','web','.');"
169+
python -c "from expfactory.tests import circle_ci_test; circle_ci_test('stop_signal_single_task_network__practice','web','.');"
166170
python -c "from expfactory.tests import circle_ci_test; circle_ci_test('go_nogo_single_task_network','web','.');"
167171
python -c "from expfactory.tests import circle_ci_test; circle_ci_test('flanker_single_task_network','web','.');"
168172
python -c "from expfactory.tests import circle_ci_test; circle_ci_test('shape_matching_single_task_network','web','.');"
173+
python -c "from expfactory.tests import circle_ci_test; circle_ci_test('shape_matching_single_task_network__fmri','web','.');"
174+
python -c "from expfactory.tests import circle_ci_test; circle_ci_test('shape_matching_single_task_network__practice','web','.');"
169175
python -c "from expfactory.tests import circle_ci_test; circle_ci_test('predictable_task_switching_single_task_network','web','.');"
170176
python -c "from expfactory.tests import circle_ci_test; circle_ci_test('cued_task_switching_single_task_network','web','.');"
177+
python -c "from expfactory.tests import circle_ci_test; circle_ci_test('cued_task_switching_single_task_network__fmri','web','.');"
178+
python -c "from expfactory.tests import circle_ci_test; circle_ci_test('cued_task_switching_single_task_network__practice','web','.');"
171179
python -c "from expfactory.tests import circle_ci_test; circle_ci_test('stop_signal_with_cued_task_switching','web','.');"
172180
python -c "from expfactory.tests import circle_ci_test; circle_ci_test('go_nogo_with_cued_task_switching','web','.');"
173181
python -c "from expfactory.tests import circle_ci_test; circle_ci_test('shape_matching_with_cued_task_switching','web','.');"

‎n_back_single_task_network__practice/experiment.js

+87-3
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,91 @@ for (i = 0; i < practice_len + 2; i++) { //was changed from + 3 as delays went f
521521
}
522522

523523
var practiceCount = 0
524-
var practiceNode = {
524+
var practiceNode1 = {
525+
timeline: practiceTrials,
526+
loop_function: function(data) {
527+
practiceCount += 1
528+
stims = createTrialTypes(practice_len, delay)
529+
current_trial = 0
530+
531+
var sum_rt = 0
532+
var sum_responses = 0
533+
var correct = 0
534+
var total_trials = 0
535+
var mismatch_press = 0
536+
537+
for (var i = 0; i < data.length; i++){
538+
if (data[i].trial_id == "practice_trial"){
539+
total_trials+=1
540+
if (data[i].rt != -1){
541+
sum_rt += data[i].rt
542+
sum_responses += 1
543+
if (data[i].key_press == data[i].correct_response){
544+
correct += 1
545+
546+
}
547+
}
548+
549+
if (data[i].key_press == possible_responses[1][1]){
550+
mismatch_press += 1
551+
}
552+
553+
}
554+
555+
}
556+
557+
var accuracy = correct / total_trials
558+
var missed_responses = (total_trials - sum_responses) / total_trials
559+
var ave_rt = sum_rt / sum_responses
560+
var mismatch_press_percentage = mismatch_press / total_trials
561+
562+
practice_feedback_text = "<br>Please take this time to read your feedback and to take a short break." // Press enter to continue"
563+
564+
if (accuracy > accuracy_thresh){
565+
delay = 2
566+
stims = createTrialTypes(practice_len, delay)
567+
practice_feedback_text = "Your delay for this block is "+delay+". Please match the current letter to the letter that appeared "+delay+" trial(s) ago."
568+
return false
569+
570+
} else if (accuracy < accuracy_thresh){
571+
if (missed_responses > missed_thresh){
572+
practice_feedback_text +=
573+
'</p><p class = block-text>You have not been responding to some trials. Please respond on every trial that requires a response.'
574+
}
575+
576+
if (ave_rt > rt_thresh){
577+
practice_feedback_text +=
578+
'</p><p class = block-text>You have been responding too slowly.'
579+
}
580+
581+
if (mismatch_press_percentage >= 0.90){
582+
practice_feedback_text +=
583+
'</p><p class = block-text>Please do not simply press your "'+possible_responses[1][0]+'" to every stimulus. Please try to identify the matches and press your "'+possible_responses[0][0]+'" when they occur.'
584+
}
585+
586+
if (practiceCount == practice_thresh){
587+
// practice_feedback_text +=
588+
// '</p><p class = block-text>Done with this practice. The test session will begin shortly.'
589+
delay = 2
590+
stims = createTrialTypes(practice_len, delay)
591+
practice_feedback_text = "Your delay for this block is "+delay+". Please match the current letter to the letter that appeared "+delay+" trial(s) ago."
592+
return false
593+
}
594+
595+
practice_feedback_text +=
596+
'</p><p class = block-text>We are going to try practice again to see if you can achieve higher accuracy. Remember: <br>' + prompt_text_list +
597+
'</p><p class = block-text>When you are ready to continue, please press the spacebar.</p>'
598+
599+
600+
return true
601+
602+
}
603+
604+
}
605+
}
606+
607+
var practiceCount = 0
608+
var practiceNode2 = {
525609
timeline: practiceTrials,
526610
loop_function: function(data) {
527611
practiceCount += 1
@@ -606,7 +690,6 @@ var practiceNode = {
606690
}
607691
}
608692

609-
610693
/* ************************************ */
611694
/* Set up Experiment */
612695
/* ************************************ */
@@ -616,7 +699,8 @@ var n_back_single_task_network__practice_experiment = []
616699

617700
//out of scanner practice
618701
n_back_single_task_network__practice_experiment.push(intro_block);
619-
n_back_single_task_network__practice_experiment.push(practiceNode);
702+
n_back_single_task_network__practice_experiment.push(practiceNode1);
703+
n_back_single_task_network__practice_experiment.push(practiceNode2);
620704
n_back_single_task_network__practice_experiment.push(practice_feedback_block);
621705
n_back_single_task_network__practice_experiment.push(practice_end_block);
622706

0 commit comments

Comments
 (0)