compileprofile-spacetests 0.2.1 → 0.3.0

package/dist/cjs/nback.js

@@ -15,25 +15,39 @@ exports.nback_extract_trials = nback_extract_trials;
 var nback_results = function (trials) {
     var target_trials = trials.filter(function (o) { return o.is_target; });
     var non_target_trials = trials.filter(function (o) { return !o.is_target; });
-    var results = {
-        total_trials: {
-            n: trials.length,
-            avg_rt: trials.reduce(function (a, b) { return a + b.rt; }, 0) / trials.length,
-            avg_acc: trials.reduce(function (a, b) { return a + b.correct; }, 0) / trials.length,
-        },
+    var correct_trials = trials.filter(function (o) { return o.correct === true; });
+    var incorrect_trials = trials.filter(function (o) { return o.correct === false; });
+    var total_rt = trials.reduce(function (a, b) { return a + (b.rt || 0); }, 0);
+    var correct_rt = correct_trials.reduce(function (a, b) { return a + (b.rt || 0); }, 0);
+    var incorrect_rt = incorrect_trials.reduce(function (a, b) { return a + (b.rt || 0); }, 0);
+    var responded_trials = trials.filter(function (o) { return o.response !== null; });
+    var correct_responded_trials = responded_trials.filter(function (o) { return o.correct === true; });
+    var incorrect_responded_trials = responded_trials.filter(function (o) { return o.correct === false; });
+    var common = {
+        n_trials: trials.length,
+        n_correct_trials: correct_trials.length,
+        n_incorrect_trials: incorrect_trials.length,
+        avg_rt_total: trials.length > 0 ? total_rt / responded_trials.length : 0,
+        avg_rt_correct: correct_trials.length > 0 ? correct_rt / correct_responded_trials.length : 0,
+        avg_rt_incorrect: incorrect_trials.length > 0 ? incorrect_rt / incorrect_responded_trials.length : 0,
+        performance_score: trials.length > 0 ? correct_trials.length * 100 / trials.length : 0
+    };
+    var special = {
         target_trials: {
             n: target_trials.length,
-            avg_rt: target_trials.reduce(function (a, b) { return a + b.rt; }, 0) / target_trials.length,
-            avg_acc: target_trials.reduce(function (a, b) { return a + b.correct; }, 0) / target_trials.length,
+            avg_rt: target_trials.length > 0 ? target_trials.reduce(function (a, b) { return a + (b.rt || 0); }, 0) / target_trials.length : 0,
+            avg_acc: target_trials.length > 0 ? target_trials.reduce(function (a, b) { return a + (b.correct ? 1 : 0); }, 0) * 100 / target_trials.length : 0,
         },
         non_target_trials: {
             n: non_target_trials.length,
-            avg_rt: non_target_trials.reduce(function (a, b) { return a + b.rt; }, 0) / non_target_trials.length,
-            avg_acc: non_target_trials.reduce(function (a, b) { return a + b.correct; }, 0) / non_target_trials.length,
-        },
-        performance: NaN
+            avg_rt: non_target_trials.length > 0 ? non_target_trials.reduce(function (a, b) { return a + (b.rt || 0); }, 0) / non_target_trials.length : 0,
+            avg_acc: non_target_trials.length > 0 ? non_target_trials.reduce(function (a, b) { return a + (b.correct ? 1 : 0); }, 0) * 100 / non_target_trials.length : 0,
+        }
+    };
+    var results = {
+        common: common,
+        special: special
     };
-    results.performance = results.total_trials.avg_acc;
     console.log(results);
     return results;
 };

package/dist/cjs/spatial-cognition.d.ts

@@ -1,9 +1,4 @@
-interface SpatialResultsStructure {
-    n: number;
-    avg_rt: number;
-    avg_acc: number;
-    performance: number;
-}
+import { SpatialResultsStructure } from './common-interfaces';
 declare const spatial_calculate_results: (obj: any[]) => SpatialResultsStructure;
 declare const spatial_extract_trials: (obj: any[]) => any[];
 declare const spatial_results: (obj: any[]) => SpatialResultsStructure;

package/dist/cjs/spatial-cognition.js

@@ -1,11 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.spatial_calculate_results = exports.spatial_results = exports.spatial_extract_trials = exports.spatial_extract_image_info = void 0;
+var BEST_SCORE = 1000;
+var WORST_SCORE = 10000;
 var spatial_calculate_results = function (obj) {
     var trials = spatial_extract_trials(obj);
     return spatial_results(trials);
 };
 exports.spatial_calculate_results = spatial_calculate_results;
+var calculate_performance_score = function (avg_rt, avg_acc) {
+    var performance = avg_rt / (avg_acc + 0.001);
+    performance = Math.min(Math.max(performance, BEST_SCORE), WORST_SCORE);
+    var performance_score = (1 - ((performance - BEST_SCORE) / (WORST_SCORE - BEST_SCORE))) * 100;
+    return performance_score;
+};
 var spatial_extract_trials = function (obj) {
     var trials = obj.filter(function (o) { return 'stimulus' in o &&
         o.stimulus.startsWith("<img src="); });
@@ -14,21 +22,68 @@ var spatial_extract_trials = function (obj) {
 };
 exports.spatial_extract_trials = spatial_extract_trials;
 var spatial_results = function (obj) {
-    var results = {
-        n: obj.length,
-        avg_rt: obj.reduce(function (a, b) { return a + b.rt; }, 0) / obj.length,
-        avg_acc: obj.reduce(function (a, b) { return a + b.correct; }, 0) / obj.length,
-        performance: NaN
+    var correct_trials = obj.filter(function (o) { return o.correct === 1 || o.correct === true; });
+    var incorrect_trials = obj.filter(function (o) { return o.correct === 0 || o.correct === false; });
+    var missing_trials = obj.filter(function (o) { return o.response === null || o.response === undefined; });
+    var total_rt = obj.reduce(function (a, b) { return a + (b.rt || 0); }, 0);
+    var correct_rt = correct_trials.reduce(function (a, b) { return a + (b.rt || 0); }, 0);
+    var incorrect_rt = incorrect_trials.reduce(function (a, b) { return a + (b.rt || 0); }, 0);
+    var missing_rt = missing_trials.reduce(function (a, b) { return a + (b.rt || 0); }, 0);
+    var avg_rt = obj.length > 0 ? total_rt / obj.length : 0;
+    var avg_acc = obj.length > 0 ? correct_trials.length / obj.length : 0;
+    var performance_score = calculate_performance_score(avg_rt, avg_acc);
+    var common = {
+        n_trials: obj.length,
+        n_correct_trials: correct_trials.length,
+        n_incorrect_trials: incorrect_trials.length,
+        avg_rt_total: avg_rt,
+        avg_rt_correct: correct_trials.length > 0 ? correct_rt / correct_trials.length : 0,
+        avg_rt_incorrect: incorrect_trials.length > 0 ? incorrect_rt / incorrect_trials.length : 0,
+        performance_score: performance_score
+    };
+    // Group by distance, angle, and rotation for special results
+    var by_distance = Object.values(obj.reduce(function (acc, trial) {
+        var key = trial.distance || 'unknown';
+        if (!acc[key])
+            acc[key] = { distance: key, trials: [], avg_rt: 0, avg_acc: 0 };
+        acc[key].trials.push(trial);
+        return acc;
+    }, {})).map(function (group) {
+        group.avg_rt = group.trials.reduce(function (a, b) { return a + (b.rt || 0); }, 0) / group.trials.length;
+        group.avg_acc = group.trials.reduce(function (a, b) { return a + (b.correct ? 1 : 0); }, 0) / group.trials.length;
+        return group;
+    });
+    var by_angle = Object.values(obj.reduce(function (acc, trial) {
+        var key = trial.angle || 'unknown';
+        if (!acc[key])
+            acc[key] = { angle: key, trials: [], avg_rt: 0, avg_acc: 0 };
+        acc[key].trials.push(trial);
+        return acc;
+    }, {})).map(function (group) {
+        group.avg_rt = group.trials.reduce(function (a, b) { return a + (b.rt || 0); }, 0) / group.trials.length;
+        group.avg_acc = group.trials.reduce(function (a, b) { return a + (b.correct ? 1 : 0); }, 0) / group.trials.length;
+        return group;
+    });
+    var by_rotation = Object.values(obj.reduce(function (acc, trial) {
+        var key = trial.rotation || 'unknown';
+        if (!acc[key])
+            acc[key] = { rotation: key, trials: [], avg_rt: 0, avg_acc: 0 };
+        acc[key].trials.push(trial);
+        return acc;
+    }, {})).map(function (group) {
+        group.avg_rt = group.trials.reduce(function (a, b) { return a + (b.rt || 0); }, 0) / group.trials.length;
+        group.avg_acc = group.trials.reduce(function (a, b) { return a + (b.correct ? 1 : 0); }, 0) / group.trials.length;
+        return group;
+    });
+    var special = {
+        by_distance: by_distance,
+        by_angle: by_angle,
+        by_rotation: by_rotation
+    };
+    return {
+        common: common,
+        special: special
     };
-    var best_score = 1000;
-    var worst_score = 10000;
-    // results.avg_acc to the power of 5
-    //let performance = results.avg_rt / (Math.pow(results.avg_acc, 5) + 0.001);
-    var performance = results.avg_rt / (results.avg_acc + 0.001);
-    performance = Math.min(Math.max(performance, best_score), worst_score);
-    // convert to 0-100 where 100 is the best (200)
-    results.performance = (1 - ((performance - best_score) / (worst_score - best_score))) * 100;
-    return results;
 };
 exports.spatial_results = spatial_results;
 var spatial_extract_image_info = function (obj) {

package/dist/esm/common-interfaces.d.ts

@@ -0,0 +1,60 @@
+interface CommonResults {
+    n_trials: number;
+    n_correct_trials: number;
+    n_incorrect_trials: number;
+    avg_rt_total: number;
+    avg_rt_correct: number;
+    avg_rt_incorrect: number;
+    performance_score: number;
+}
+interface NbackSpecialResults {
+    target_trials: {
+        n: number;
+        avg_rt: number;
+        avg_acc: number;
+    };
+    non_target_trials: {
+        n: number;
+        avg_rt: number;
+        avg_acc: number;
+    };
+}
+interface SpatialSpecialResults {
+    by_distance: any[];
+    by_angle: any[];
+    by_rotation: any[];
+}
+interface GonogoSpecialResults {
+    by_block: any[];
+    go_trials: {
+        n: number;
+        avg_rt: number;
+        avg_acc: number;
+    };
+    nogo_trials: {
+        n: number;
+        avg_rt: number;
+        avg_acc: number;
+    };
+}
+interface EmotionSpecialResults {
+    by_emotion: any[];
+    confusion_matrix: any;
+}
+interface NbackResultsStructure {
+    common: CommonResults;
+    special: NbackSpecialResults;
+}
+interface SpatialResultsStructure {
+    common: CommonResults;
+    special: SpatialSpecialResults;
+}
+interface GonogoResultsStructure {
+    common: CommonResults;
+    special: GonogoSpecialResults;
+}
+interface EmotionResultsStructure {
+    common: CommonResults;
+    special: EmotionSpecialResults;
+}
+export { CommonResults, NbackResultsStructure, SpatialResultsStructure, GonogoResultsStructure, EmotionResultsStructure, NbackSpecialResults, SpatialSpecialResults, GonogoSpecialResults, EmotionSpecialResults };

package/dist/esm/common-interfaces.js

@@ -0,0 +1 @@
+export {};

package/dist/esm/emotions.d.ts

@@ -1,10 +1,5 @@
-interface EmotionResultsStructure {
-    n: number;
-    avg_rt: number;
-    avg_acc: number;
-    performance: number;
-}
+import { EmotionResultsStructure } from './common-interfaces';
 declare const emotion_calculate_results: (obj: any[]) => EmotionResultsStructure;
-declare const emotion_results: (obj: any[]) => EmotionResultsStructure;
 declare const emotion_extract_trials: (obj: any[]) => any[];
+declare const emotion_results: (obj: any[]) => EmotionResultsStructure;
 export { EmotionResultsStructure, emotion_calculate_results, emotion_extract_trials, emotion_results };

package/dist/esm/emotions.js

@@ -1,31 +1,12 @@
+var EMOTION_MAP = ["neutral", "sad", "happy", "surprised", "angry"];
 var emotion_calculate_results = function (obj) {
     var trials = emotion_extract_trials(obj);
-    // throw if trials is empty
     if (trials.length === 0) {
         throw new Error("No trials found");
     }
     return emotion_results(trials);
 };
-var emotion_results = function (obj) {
-    // throw error if obj is empty
-    if (obj.length === 0) {
-        throw new Error("No trials found");
-    }
-    var results = {
-        n: obj.length,
-        avg_rt: obj.reduce(function (a, b) { return a + b.rt; }, 0) / obj.length,
-        avg_acc: obj.reduce(function (a, b) { return a + b.correct; }, 0) / obj.length,
-        performance: NaN
-    };
-    var best_score = 1000;
-    var worst_score = 10000;
-    var performance = results.avg_rt / (Math.pow(results.avg_acc, 5) + 0.001);
-    performance = Math.min(Math.max(performance, best_score), worst_score);
-    results.performance = (1 - ((performance - best_score) / (worst_score - best_score))) * 100;
-    return results;
-};
 var emotion_extract_trials = function (obj) {
-    var emotionMap = ["neutral", "sad", "happy", "surprised", "angry"];
     // filter trials where response and rt are defined and not null
     var trials = obj.filter(function (o) { return 'response' in o && 'rt' in o && 'emotion' in o; });
     trials = trials.filter(function (o) { return o.response !== null && o.rt !== null; });
@@ -40,10 +21,63 @@ var emotion_extract_trials = function (obj) {
         }
     });
     trials.forEach(function (o) {
-        o.emotion_response = emotionMap[o.response] || "unknown";
+        o.emotion_response = EMOTION_MAP[o.response] || "unknown";
         o.correct = o.emotion === o.emotion_response;
         // in the older ones there were 15 trials per rotation
     });
     return trials;
 };
+var emotion_results = function (obj) {
+    if (obj.length === 0) {
+        throw new Error("No trials found");
+    }
+    var correct_trials = obj.filter(function (o) { return o.correct === true; });
+    var incorrect_trials = obj.filter(function (o) { return o.correct === false; });
+    var total_rt = obj.reduce(function (a, b) { return a + (b.rt || 0); }, 0);
+    var correct_rt = correct_trials.reduce(function (a, b) { return a + (b.rt || 0); }, 0);
+    var incorrect_rt = incorrect_trials.reduce(function (a, b) { return a + (b.rt || 0); }, 0);
+    var avg_rt = total_rt / obj.length;
+    var avg_acc = correct_trials.length / obj.length;
+    // Calculate performance score using the existing formula
+    var best_score = 1000;
+    var worst_score = 10000;
+    var performance = avg_rt / (Math.pow(avg_acc, 5) + 0.001);
+    performance = Math.min(Math.max(performance, best_score), worst_score);
+    var performance_score = (1 - ((performance - best_score) / (worst_score - best_score))) * 100;
+    var common = {
+        n_trials: obj.length,
+        n_correct_trials: correct_trials.length,
+        n_incorrect_trials: incorrect_trials.length,
+        avg_rt_total: avg_rt,
+        avg_rt_correct: correct_trials.length > 0 ? correct_rt / correct_trials.length : 0,
+        avg_rt_incorrect: incorrect_trials.length > 0 ? incorrect_rt / incorrect_trials.length : 0,
+        performance_score: performance_score
+    };
+    // Group by emotion for special results
+    var by_emotion = EMOTION_MAP.map(function (emotion) {
+        var emotion_trials = obj.filter(function (o) { return o.emotion === emotion; });
+        return {
+            emotion: emotion,
+            n: emotion_trials.length,
+            avg_rt: emotion_trials.length > 0 ? emotion_trials.reduce(function (a, b) { return a + (b.rt || 0); }, 0) / emotion_trials.length : 0,
+            avg_acc: emotion_trials.length > 0 ? emotion_trials.reduce(function (a, b) { return a + (b.correct ? 1 : 0); }, 0) / emotion_trials.length : 0,
+        };
+    });
+    // Create confusion matrix
+    var confusion_matrix = EMOTION_MAP.reduce(function (matrix, actual) {
+        matrix[actual] = EMOTION_MAP.reduce(function (row, predicted) {
+            row[predicted] = obj.filter(function (o) { return o.emotion === actual && o.emotion_response === predicted; }).length;
+            return row;
+        }, {});
+        return matrix;
+    }, {});
+    var special = {
+        by_emotion: by_emotion,
+        confusion_matrix: confusion_matrix
+    };
+    return {
+        common: common,
+        special: special
+    };
+};
 export { emotion_calculate_results, emotion_extract_trials, emotion_results };

package/dist/esm/gonogo.d.ts

@@ -1,9 +1,4 @@
-interface GonogoResultsStructure {
-    n: number;
-    avg_rt: number;
-    avg_acc: number;
-    performance: number;
-}
+import { GonogoResultsStructure } from './common-interfaces';
 declare const gonogo_calculate_results: (data: any[]) => GonogoResultsStructure;
 declare const gonogo_extract_trials: (obj: any[]) => any[];
 declare const gonogo_results: (data: any[]) => GonogoResultsStructure;

package/dist/esm/gonogo.js

@@ -1,3 +1,5 @@
+var BEST_SCORE = 300;
+var WORST_SCORE = 5000;
 var gonogo_calculate_results = function (data) {
     var trials = gonogo_extract_trials(data);
     var results = gonogo_results(trials);
@@ -8,9 +10,7 @@ var gonogo_extract_trials = function (obj) {
     var trials = obj.filter(function (o) { return 'image' in o && o.image !== undefined; });
     trials.forEach(function (o) {
         // image is in format <stimulus>_trans_<number>.png
-        // extract the stimulus and number
         // "image": "https://unyavwofnmwihnpvkjji.supabase.co/storage/v1/object/public/test-stimuli/gonogo/aliens/astronaut_trans_1.png",
-        // i need to extract the iamge name from the url
         var match = o.image.match(/([^/]+)_(\d+)\.png$/);
         if (match) {
             o.stimulus = match[0];
@@ -34,7 +34,6 @@ var gonogo_extract_trials = function (obj) {
                 o.should_go = o.stimulus == "rocket_trans_1.png";
                 break;
             case 4:
-                // should go in all cases where the goal is NOT the rocket
                 o.should_go = !(o.stimulus == "rocket_trans_1.png");
                 break;
             default:
@@ -45,22 +44,70 @@ var gonogo_extract_trials = function (obj) {
     });
     return trials;
 };
+// TODO this
+var calculate_performance_score = function (avg_rt, avg_acc) {
+    var performance = avg_rt / (Math.pow(avg_acc, 5) + 0.001);
+    performance = Math.min(Math.max(performance, BEST_SCORE), WORST_SCORE);
+    var performance_score = (1 - ((performance - BEST_SCORE) / (WORST_SCORE - BEST_SCORE))) * 100;
+    return performance_score;
+};
 var gonogo_results = function (data) {
     // throw error if obj is empty
     if (data.length === 0) {
         throw new Error("No trials found");
     }
-    var results = {
-        n: data.length,
-        avg_rt: data.reduce(function (a, b) { return a + b.rt; }, 0) / data.length,
-        avg_acc: data.reduce(function (a, b) { return a + b.correct; }, 0) / data.length,
-        performance: NaN
+    var correct_trials = data.filter(function (o) { return o.correct === true; });
+    var incorrect_trials = data.filter(function (o) { return o.correct === false; });
+    var missing_trials = []; // technically not possible in GNG, as no response is just incorrect
+    var go_trials = data.filter(function (o) { return o.should_go === true; });
+    var nogo_trials = data.filter(function (o) { return o.should_go === false; });
+    var total_rt = data.reduce(function (a, b) { return a + (b.rt || 0); }, 0);
+    var correct_rt = correct_trials.reduce(function (a, b) { return a + (b.rt || 0); }, 0);
+    var incorrect_rt = incorrect_trials.reduce(function (a, b) { return a + (b.rt || 0); }, 0);
+    var responded_trials = data.filter(function (o) { return o.response !== null; });
+    var correct_responded_trials = responded_trials.filter(function (o) { return o.correct === true; });
+    var incorrect_responded_trials = responded_trials.filter(function (o) { return o.correct === false; });
+    var avg_rt = responded_trials.length > 0 ? total_rt / responded_trials.length : 0;
+    var avg_acc = correct_trials.length / data.length;
+    // Calculate performance score using the existing formula
+    var performance_score = calculate_performance_score(avg_rt, avg_acc);
+    var common = {
+        n_trials: data.length,
+        n_correct_trials: correct_trials.length,
+        n_incorrect_trials: incorrect_trials.length,
+        avg_rt_total: avg_rt,
+        avg_rt_correct: correct_trials.length > 0 ? correct_rt / correct_responded_trials.length : 0,
+        avg_rt_incorrect: incorrect_trials.length > 0 ? incorrect_rt / incorrect_responded_trials.length : 0,
+        performance_score: performance_score
+    };
+    // Group by block for special results
+    var by_block = Object.values(data.reduce(function (acc, trial) {
+        var key = trial.block_number || 'unknown';
+        if (!acc[key])
+            acc[key] = { block: key, trials: [], avg_rt: 0, avg_acc: 0 };
+        acc[key].trials.push(trial);
+        return acc;
+    }, {})).map(function (group) {
+        group.avg_rt = group.trials.reduce(function (a, b) { return a + (b.rt || 0); }, 0) / group.trials.length;
+        group.avg_acc = group.trials.reduce(function (a, b) { return a + (b.correct ? 1 : 0); }, 0) / group.trials.length;
+        return group;
+    });
+    var special = {
+        by_block: by_block,
+        go_trials: {
+            n: go_trials.length,
+            avg_rt: go_trials.length > 0 ? go_trials.reduce(function (a, b) { return a + (b.rt || 0); }, 0) / go_trials.length : 0,
+            avg_acc: go_trials.length > 0 ? go_trials.reduce(function (a, b) { return a + (b.correct ? 1 : 0); }, 0) / go_trials.length : 0,
+        },
+        nogo_trials: {
+            n: nogo_trials.length,
+            avg_rt: nogo_trials.length > 0 ? nogo_trials.reduce(function (a, b) { return a + (b.rt || 0); }, 0) / nogo_trials.length : 0,
+            avg_acc: nogo_trials.length > 0 ? nogo_trials.reduce(function (a, b) { return a + (b.correct ? 1 : 0); }, 0) / nogo_trials.length : 0,
+        }
+    };
+    return {
+        common: common,
+        special: special
     };
-    var best_score = 300;
-    var worst_score = 5000;
-    var performance = results.avg_rt / (Math.pow(results.avg_acc, 5) + 0.001);
-    performance = Math.min(Math.max(performance, best_score), worst_score);
-    results.performance = (1 - ((performance - best_score) / (worst_score - best_score))) * 100;
-    return results;
 };
 export { gonogo_calculate_results, gonogo_extract_trials, gonogo_results };

package/dist/esm/index.d.ts

@@ -1,9 +1,6 @@
-import { NbackResultsStructure } from './nback';
-import { SpatialResultsStructure } from './spatial-cognition';
-import { GonogoResultsStructure } from './gonogo';
-import { EmotionResultsStructure } from './emotions';
+import { NbackResultsStructure, SpatialResultsStructure, GonogoResultsStructure, EmotionResultsStructure, CommonResults } from './common-interfaces';
 declare const NbackResults: (obj: any[]) => NbackResultsStructure;
 declare const SpatialCognitionResults: (obj: any[]) => SpatialResultsStructure;
 declare const GonogoResults: (obj: any[]) => GonogoResultsStructure;
 declare const EmotionResults: (obj: any[]) => EmotionResultsStructure;
-export { NbackResults, SpatialCognitionResults, EmotionResults, GonogoResults };
+export { NbackResults, SpatialCognitionResults, EmotionResults, GonogoResults, NbackResultsStructure, SpatialResultsStructure, GonogoResultsStructure, EmotionResultsStructure, CommonResults };

package/dist/esm/nback.d.ts

@@ -1,15 +1,5 @@
+import { NbackResultsStructure } from './common-interfaces';
 declare const nback_calculate_results: (obj: any[]) => NbackResultsStructure;
 declare const nback_extract_trials: (obj: any[]) => any[];
-interface NbackTrialResultsStructure {
-    n: number;
-    avg_rt: number;
-    avg_acc: number;
-}
-interface NbackResultsStructure {
-    total_trials: NbackTrialResultsStructure;
-    target_trials: NbackTrialResultsStructure;
-    non_target_trials: NbackTrialResultsStructure;
-    performance: number;
-}
 declare const nback_results: (trials: any[]) => NbackResultsStructure;
 export { nback_extract_trials, nback_results, nback_calculate_results, NbackResultsStructure };

package/dist/esm/nback.js

@@ -10,25 +10,39 @@ var nback_extract_trials = function (obj) {
 var nback_results = function (trials) {
     var target_trials = trials.filter(function (o) { return o.is_target; });
     var non_target_trials = trials.filter(function (o) { return !o.is_target; });
-    var results = {
-        total_trials: {
-            n: trials.length,
-            avg_rt: trials.reduce(function (a, b) { return a + b.rt; }, 0) / trials.length,
-            avg_acc: trials.reduce(function (a, b) { return a + b.correct; }, 0) / trials.length,
-        },
+    var correct_trials = trials.filter(function (o) { return o.correct === true; });
+    var incorrect_trials = trials.filter(function (o) { return o.correct === false; });
+    var total_rt = trials.reduce(function (a, b) { return a + (b.rt || 0); }, 0);
+    var correct_rt = correct_trials.reduce(function (a, b) { return a + (b.rt || 0); }, 0);
+    var incorrect_rt = incorrect_trials.reduce(function (a, b) { return a + (b.rt || 0); }, 0);
+    var responded_trials = trials.filter(function (o) { return o.response !== null; });
+    var correct_responded_trials = responded_trials.filter(function (o) { return o.correct === true; });
+    var incorrect_responded_trials = responded_trials.filter(function (o) { return o.correct === false; });
+    var common = {
+        n_trials: trials.length,
+        n_correct_trials: correct_trials.length,
+        n_incorrect_trials: incorrect_trials.length,
+        avg_rt_total: trials.length > 0 ? total_rt / responded_trials.length : 0,
+        avg_rt_correct: correct_trials.length > 0 ? correct_rt / correct_responded_trials.length : 0,
+        avg_rt_incorrect: incorrect_trials.length > 0 ? incorrect_rt / incorrect_responded_trials.length : 0,
+        performance_score: trials.length > 0 ? correct_trials.length * 100 / trials.length : 0
+    };
+    var special = {
         target_trials: {
             n: target_trials.length,
-            avg_rt: target_trials.reduce(function (a, b) { return a + b.rt; }, 0) / target_trials.length,
-            avg_acc: target_trials.reduce(function (a, b) { return a + b.correct; }, 0) / target_trials.length,
+            avg_rt: target_trials.length > 0 ? target_trials.reduce(function (a, b) { return a + (b.rt || 0); }, 0) / target_trials.length : 0,
+            avg_acc: target_trials.length > 0 ? target_trials.reduce(function (a, b) { return a + (b.correct ? 1 : 0); }, 0) * 100 / target_trials.length : 0,
         },
         non_target_trials: {
             n: non_target_trials.length,
-            avg_rt: non_target_trials.reduce(function (a, b) { return a + b.rt; }, 0) / non_target_trials.length,
-            avg_acc: non_target_trials.reduce(function (a, b) { return a + b.correct; }, 0) / non_target_trials.length,
-        },
-        performance: NaN
+            avg_rt: non_target_trials.length > 0 ? non_target_trials.reduce(function (a, b) { return a + (b.rt || 0); }, 0) / non_target_trials.length : 0,
+            avg_acc: non_target_trials.length > 0 ? non_target_trials.reduce(function (a, b) { return a + (b.correct ? 1 : 0); }, 0) * 100 / non_target_trials.length : 0,
+        }
+    };
+    var results = {
+        common: common,
+        special: special
     };
-    results.performance = results.total_trials.avg_acc;
     console.log(results);
     return results;
 };

package/dist/esm/spatial-cognition.d.ts

@@ -1,9 +1,4 @@
-interface SpatialResultsStructure {
-    n: number;
-    avg_rt: number;
-    avg_acc: number;
-    performance: number;
-}
+import { SpatialResultsStructure } from './common-interfaces';
 declare const spatial_calculate_results: (obj: any[]) => SpatialResultsStructure;
 declare const spatial_extract_trials: (obj: any[]) => any[];
 declare const spatial_results: (obj: any[]) => SpatialResultsStructure;

package/dist/esm/spatial-cognition.js

@@ -1,7 +1,15 @@
+var BEST_SCORE = 1000;
+var WORST_SCORE = 10000;
 var spatial_calculate_results = function (obj) {
     var trials = spatial_extract_trials(obj);
     return spatial_results(trials);
 };
+var calculate_performance_score = function (avg_rt, avg_acc) {
+    var performance = avg_rt / (avg_acc + 0.001);
+    performance = Math.min(Math.max(performance, BEST_SCORE), WORST_SCORE);
+    var performance_score = (1 - ((performance - BEST_SCORE) / (WORST_SCORE - BEST_SCORE))) * 100;
+    return performance_score;
+};
 var spatial_extract_trials = function (obj) {
     var trials = obj.filter(function (o) { return 'stimulus' in o &&
         o.stimulus.startsWith("<img src="); });
@@ -9,21 +17,68 @@ var spatial_extract_trials = function (obj) {
     return trials;
 };
 var spatial_results = function (obj) {
-    var results = {
-        n: obj.length,
-        avg_rt: obj.reduce(function (a, b) { return a + b.rt; }, 0) / obj.length,
-        avg_acc: obj.reduce(function (a, b) { return a + b.correct; }, 0) / obj.length,
-        performance: NaN
+    var correct_trials = obj.filter(function (o) { return o.correct === 1 || o.correct === true; });
+    var incorrect_trials = obj.filter(function (o) { return o.correct === 0 || o.correct === false; });
+    var missing_trials = obj.filter(function (o) { return o.response === null || o.response === undefined; });
+    var total_rt = obj.reduce(function (a, b) { return a + (b.rt || 0); }, 0);
+    var correct_rt = correct_trials.reduce(function (a, b) { return a + (b.rt || 0); }, 0);
+    var incorrect_rt = incorrect_trials.reduce(function (a, b) { return a + (b.rt || 0); }, 0);
+    var missing_rt = missing_trials.reduce(function (a, b) { return a + (b.rt || 0); }, 0);
+    var avg_rt = obj.length > 0 ? total_rt / obj.length : 0;
+    var avg_acc = obj.length > 0 ? correct_trials.length / obj.length : 0;
+    var performance_score = calculate_performance_score(avg_rt, avg_acc);
+    var common = {
+        n_trials: obj.length,
+        n_correct_trials: correct_trials.length,
+        n_incorrect_trials: incorrect_trials.length,
+        avg_rt_total: avg_rt,
+        avg_rt_correct: correct_trials.length > 0 ? correct_rt / correct_trials.length : 0,
+        avg_rt_incorrect: incorrect_trials.length > 0 ? incorrect_rt / incorrect_trials.length : 0,
+        performance_score: performance_score
+    };
+    // Group by distance, angle, and rotation for special results
+    var by_distance = Object.values(obj.reduce(function (acc, trial) {
+        var key = trial.distance || 'unknown';
+        if (!acc[key])
+            acc[key] = { distance: key, trials: [], avg_rt: 0, avg_acc: 0 };
+        acc[key].trials.push(trial);
+        return acc;
+    }, {})).map(function (group) {
+        group.avg_rt = group.trials.reduce(function (a, b) { return a + (b.rt || 0); }, 0) / group.trials.length;
+        group.avg_acc = group.trials.reduce(function (a, b) { return a + (b.correct ? 1 : 0); }, 0) / group.trials.length;
+        return group;
+    });
+    var by_angle = Object.values(obj.reduce(function (acc, trial) {
+        var key = trial.angle || 'unknown';
+        if (!acc[key])
+            acc[key] = { angle: key, trials: [], avg_rt: 0, avg_acc: 0 };
+        acc[key].trials.push(trial);
+        return acc;
+    }, {})).map(function (group) {
+        group.avg_rt = group.trials.reduce(function (a, b) { return a + (b.rt || 0); }, 0) / group.trials.length;
+        group.avg_acc = group.trials.reduce(function (a, b) { return a + (b.correct ? 1 : 0); }, 0) / group.trials.length;
+        return group;
+    });
+    var by_rotation = Object.values(obj.reduce(function (acc, trial) {
+        var key = trial.rotation || 'unknown';
+        if (!acc[key])
+            acc[key] = { rotation: key, trials: [], avg_rt: 0, avg_acc: 0 };
+        acc[key].trials.push(trial);
+        return acc;
+    }, {})).map(function (group) {
+        group.avg_rt = group.trials.reduce(function (a, b) { return a + (b.rt || 0); }, 0) / group.trials.length;
+        group.avg_acc = group.trials.reduce(function (a, b) { return a + (b.correct ? 1 : 0); }, 0) / group.trials.length;
+        return group;
+    });
+    var special = {
+        by_distance: by_distance,
+        by_angle: by_angle,
+        by_rotation: by_rotation
+    };
+    return {
+        common: common,
+        special: special
     };
-    var best_score = 1000;
-    var worst_score = 10000;
-    // results.avg_acc to the power of 5
-    //let performance = results.avg_rt / (Math.pow(results.avg_acc, 5) + 0.001);
-    var performance = results.avg_rt / (results.avg_acc + 0.001);
-    performance = Math.min(Math.max(performance, best_score), worst_score);
-    // convert to 0-100 where 100 is the best (200)
-    results.performance = (1 - ((performance - best_score) / (worst_score - best_score))) * 100;
-    return results;
 };
 var spatial_extract_image_info = function (obj) {
     // from the following field, extract the final image name (map_left_1_90.png), and rotation from the class attribute (rotate_0)