Skip to content

P
PM N-Back
Commit 47738958 authored by Wakefield Morys-Carter's avatar Wakefield Morys-Carter
Browse files
Options

random.randint = randint

parent ea722138
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 12 deletions
pm nback-legacy-browsers.js
View file @ 47738958
......@@ -177,10 +177,10 @@ async function experimentInit() {
ntrials = 100;
target_gap = 10;
target_jitter = 5;
put_target = (target_gap + random.randint(0, target_jitter));
put_target = (target_gap + util.randint(0, target_jitter));
nback_gap = 4;
nback_jitter = 2;
put_nback = (nback_gap + random.randint(0, nback_jitter));
put_nback = (nback_gap + util.randint(0, nback_jitter));
// Initialize components for Routine "trial"
trialClock = new util.Clock();
......@@ -671,7 +671,7 @@ function load_itemsRoutineBegin(snapshot) {
if (((n_items >= put_nback) && (n_items !== notarget))) {
item.push(item[(n_items - nback)]);
type.push("Filler");
put_nback = ((put_nback + nback_gap) + random.randint(0, nback_jitter));
put_nback = ((put_nback + nback_gap) + util.randint(0, nback_jitter));
answer.push("s");
trial_type.push("N");
} else {
......@@ -681,7 +681,7 @@ function load_itemsRoutineBegin(snapshot) {
target_num = (target_num + 1);
notarget = (n_items + nback);
if ((target_num < n_targets)) {
put_target = ((put_target + target_gap) + random.randint(0, target_jitter));
put_target = ((put_target + target_gap) + util.randint(0, target_jitter));
} else {
put_target = 1000;
}
......
pm nback.js
View file @ 47738958
......@@ -185,10 +185,10 @@ async function experimentInit() {
ntrials = 100;
target_gap = 10;
target_jitter = 5;
put_target = (target_gap + random.randint(0, target_jitter));
put_target = (target_gap + util.randint(0, target_jitter));
nback_gap = 4;
nback_jitter = 2;
put_nback = (nback_gap + random.randint(0, nback_jitter));
put_nback = (nback_gap + util.randint(0, nback_jitter));
// Initialize components for Routine "trial"
trialClock = new util.Clock();
......@@ -673,7 +673,7 @@ function load_itemsRoutineBegin(snapshot) {
if (((n_items >= put_nback) && (n_items !== notarget))) {
item.push(item[(n_items - nback)]);
type.push("Filler");
put_nback = ((put_nback + nback_gap) + random.randint(0, nback_jitter));
put_nback = ((put_nback + nback_gap) + util.randint(0, nback_jitter));
answer.push("s");
trial_type.push("N");
} else {
......@@ -683,7 +683,7 @@ function load_itemsRoutineBegin(snapshot) {
target_num = (target_num + 1);
notarget = (n_items + nback);
if ((target_num < n_targets)) {
put_target = ((put_target + target_gap) + random.randint(0, target_jitter));
put_target = ((put_target + target_gap) + util.randint(0, target_jitter));
} else {
put_target = 1000;
}
......
pm nback.psyexp
View file @ 47738958
......@@ -389,10 +389,10 @@
<CodeComponent name="code_3">
<Param name="Before Experiment" updates="constant" val="" valType="extendedCode"/>
<Param name="Before JS Experiment" updates="constant" val="" valType="extendedCode"/>
<Param name="Begin Experiment" updates="constant" val="item = []&amp;#10;answer = []&amp;#10;trial_type = []&amp;#10;type = []&amp;#10;&amp;#10;target_num = 0&amp;#10;notarget = 0&amp;#10;n_targets = 6&amp;#10;ntrials = 100&amp;#10;target_gap = 10&amp;#10;target_jitter = 5&amp;#10;put_target = target_gap + random.randint(0,target_jitter)&amp;#10;nback_gap = 4&amp;#10;nback_jitter = 2&amp;#10;put_nback = nback_gap + random.randint(0,nback_jitter)" valType="extendedCode"/>
<Param name="Begin JS Experiment" updates="constant" val="item = [];&amp;#10;answer = [];&amp;#10;trial_type = [];&amp;#10;type = [];&amp;#10;target_num = 0;&amp;#10;notarget = 0;&amp;#10;n_targets = 6;&amp;#10;ntrials = 100;&amp;#10;target_gap = 10;&amp;#10;target_jitter = 5;&amp;#10;put_target = (target_gap + random.randint(0, target_jitter));&amp;#10;nback_gap = 4;&amp;#10;nback_jitter = 2;&amp;#10;put_nback = (nback_gap + random.randint(0, nback_jitter));&amp;#10;" valType="extendedCode"/>
<Param name="Begin JS Routine" updates="constant" val="item.push(Items);&amp;#10;answer.push(&quot;d&quot;);&amp;#10;type.push(&quot;Filler&quot;);&amp;#10;trial_type.push(&quot;F&quot;);&amp;#10;n_items = item.length;&amp;#10;if (((n_items &gt;= put_nback) &amp;&amp; (n_items !== notarget))) {&amp;#10; item.push(item[(n_items - nback)]);&amp;#10; type.push(&quot;Filler&quot;);&amp;#10; put_nback = ((put_nback + nback_gap) + random.randint(0, nback_jitter));&amp;#10; answer.push(&quot;s&quot;);&amp;#10; trial_type.push(&quot;N&quot;);&amp;#10;} else {&amp;#10; if ((n_items &gt;= put_target)) {&amp;#10; item.push(pm_item[target_num]);&amp;#10; type.push(pm_type[target_num]);&amp;#10; target_num = (target_num + 1);&amp;#10; notarget = (n_items + nback);&amp;#10; if ((target_num &lt; n_targets)) {&amp;#10; put_target = ((put_target + target_gap) + random.randint(0, target_jitter));&amp;#10; } else {&amp;#10; put_target = 1000;&amp;#10; }&amp;#10; answer.push(&quot;space&quot;);&amp;#10; trial_type.push(&quot;PM&quot;);&amp;#10; }&amp;#10;}&amp;#10;" valType="extendedCode"/>
<Param name="Begin Routine" updates="constant" val="item.append(Items)&amp;#10;answer.append('d')&amp;#10;type.append('Filler')&amp;#10;trial_type.append('F')&amp;#10;&amp;#10;n_items = len(item)&amp;#10;&amp;#10;&amp;#10;if n_items &gt;= put_nback and n_items != notarget:&amp;#10; item.append(item[n_items-nback])&amp;#10; type.append('Filler')&amp;#10; put_nback = put_nback+nback_gap + random.randint(0,nback_jitter)&amp;#10; answer.append('s')&amp;#10; trial_type.append('N')&amp;#10;elif n_items &gt;= put_target:&amp;#10; item.append(pm_item[target_num])&amp;#10; type.append(pm_type[target_num])&amp;#10; target_num = target_num + 1&amp;#10; notarget = n_items+nback&amp;#10; if target_num &lt; n_targets:&amp;#10; put_target = put_target+target_gap + random.randint(0,target_jitter)&amp;#10; else:&amp;#10; put_target = 1000&amp;#10; answer.append('space')&amp;#10; trial_type.append('PM')" valType="extendedCode"/>
<Param name="Begin Experiment" updates="constant" val="item = []&amp;#10;answer = []&amp;#10;trial_type = []&amp;#10;type = []&amp;#10;&amp;#10;target_num = 0&amp;#10;notarget = 0&amp;#10;n_targets = 6&amp;#10;ntrials = 100&amp;#10;target_gap = 10&amp;#10;target_jitter = 5&amp;#10;put_target = target_gap + randint(0,target_jitter)&amp;#10;nback_gap = 4&amp;#10;nback_jitter = 2&amp;#10;put_nback = nback_gap + randint(0,nback_jitter)" valType="extendedCode"/>
<Param name="Begin JS Experiment" updates="constant" val="item = [];&amp;#10;answer = [];&amp;#10;trial_type = [];&amp;#10;type = [];&amp;#10;target_num = 0;&amp;#10;notarget = 0;&amp;#10;n_targets = 6;&amp;#10;ntrials = 100;&amp;#10;target_gap = 10;&amp;#10;target_jitter = 5;&amp;#10;put_target = (target_gap + util.randint(0, target_jitter));&amp;#10;nback_gap = 4;&amp;#10;nback_jitter = 2;&amp;#10;put_nback = (nback_gap + util.randint(0, nback_jitter));&amp;#10;" valType="extendedCode"/>
<Param name="Begin JS Routine" updates="constant" val="item.push(Items);&amp;#10;answer.push(&quot;d&quot;);&amp;#10;type.push(&quot;Filler&quot;);&amp;#10;trial_type.push(&quot;F&quot;);&amp;#10;n_items = item.length;&amp;#10;if (((n_items &gt;= put_nback) &amp;&amp; (n_items !== notarget))) {&amp;#10; item.push(item[(n_items - nback)]);&amp;#10; type.push(&quot;Filler&quot;);&amp;#10; put_nback = ((put_nback + nback_gap) + util.randint(0, nback_jitter));&amp;#10; answer.push(&quot;s&quot;);&amp;#10; trial_type.push(&quot;N&quot;);&amp;#10;} else {&amp;#10; if ((n_items &gt;= put_target)) {&amp;#10; item.push(pm_item[target_num]);&amp;#10; type.push(pm_type[target_num]);&amp;#10; target_num = (target_num + 1);&amp;#10; notarget = (n_items + nback);&amp;#10; if ((target_num &lt; n_targets)) {&amp;#10; put_target = ((put_target + target_gap) + util.randint(0, target_jitter));&amp;#10; } else {&amp;#10; put_target = 1000;&amp;#10; }&amp;#10; answer.push(&quot;space&quot;);&amp;#10; trial_type.push(&quot;PM&quot;);&amp;#10; }&amp;#10;}&amp;#10;" valType="extendedCode"/>
<Param name="Begin Routine" updates="constant" val="item.append(Items)&amp;#10;answer.append('d')&amp;#10;type.append('Filler')&amp;#10;trial_type.append('F')&amp;#10;&amp;#10;n_items = len(item)&amp;#10;&amp;#10;&amp;#10;if n_items &gt;= put_nback and n_items != notarget:&amp;#10; item.append(item[n_items-nback])&amp;#10; type.append('Filler')&amp;#10; put_nback = put_nback+nback_gap + randint(0,nback_jitter)&amp;#10; answer.append('s')&amp;#10; trial_type.append('N')&amp;#10;elif n_items &gt;= put_target:&amp;#10; item.append(pm_item[target_num])&amp;#10; type.append(pm_type[target_num])&amp;#10; target_num = target_num + 1&amp;#10; notarget = n_items+nback&amp;#10; if target_num &lt; n_targets:&amp;#10; put_target = put_target+target_gap + randint(0,target_jitter)&amp;#10; else:&amp;#10; put_target = 1000&amp;#10; answer.append('space')&amp;#10; trial_type.append('PM')" valType="extendedCode"/>
<Param name="Code Type" updates="None" val="Auto-&gt;JS" valType="str"/>
<Param name="Each Frame" updates="constant" val="" valType="extendedCode"/>
<Param name="Each JS Frame" updates="constant" val="" valType="extendedCode"/>
......
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