compileprofile-spacetests 0.1.0 → 0.2.0

package/dist/cjs/emotions.d.ts

@@ -0,0 +1,10 @@
+interface EmotionResults {
+    n: number;
+    avg_rt: number;
+    avg_acc: number;
+    performance: number;
+}
+declare const emotion_calculate_results: (obj: any[]) => EmotionResults;
+declare const emotion_results: (obj: any[]) => EmotionResults;
+declare const emotion_extract_trials: (obj: any[]) => any[];
+export { emotion_calculate_results, emotion_extract_trials, emotion_results };

package/dist/cjs/emotions.js

@@ -0,0 +1,54 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.emotion_results = exports.emotion_extract_trials = exports.emotion_calculate_results = void 0;
+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);
+};
+exports.emotion_calculate_results = emotion_calculate_results;
+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;
+};
+exports.emotion_results = emotion_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; });
+    trials.forEach(function (o) {
+        var match = o.emotion.match(/\/([^/]+)_([0-9]+)\.png/);
+        if (match) {
+            o.stimulus = match[0];
+            o.emotion = match[1];
+            o.image_number = match[2];
+            //this is <emotion>_<number>.png
+            o.image = "".concat(match[1], "_").concat(match[2], ".png");
+        }
+    });
+    trials.forEach(function (o) {
+        o.emotion_response = emotionMap[o.response] || "unknown";
+        o.correct = o.emotion === o.emotion_response;
+        // in the older ones there were 15 trials per rotation
+    });
+    return trials;
+};
+exports.emotion_extract_trials = emotion_extract_trials;

package/dist/cjs/gonogo.d.ts

@@ -1,3 +1,10 @@
-declare const gonogo_calculate_results: (data: any) => void;
-declare const gonogo_extract_trials: (data: any) => void;
-declare const gonogo_results: (data: any) => void;
+interface GonogoResults {
+    n: number;
+    avg_rt: number;
+    avg_acc: number;
+    performance: number;
+}
+declare const gonogo_calculate_results: (data: any[]) => GonogoResults;
+declare const gonogo_extract_trials: (obj: any[]) => any[];
+declare const gonogo_results: (data: any[]) => GonogoResults;
+export { gonogo_calculate_results, gonogo_extract_trials, gonogo_results };

package/dist/cjs/gonogo.js

@@ -1,30 +1,71 @@
 "use strict";
-// gonogo_create_trial_table <- function(txt) {
-//   arr <- fromJSON(txt)
-//   df <- as.data.frame(fromJSON(arr[[1]]))
-//   GONOGO_IMAGE_PATH <- "https://unyavwofnmwihnpvkjji.supabase.co/storage/v1/object/public/test-stimuli/gonogo/"
-//   df <- filter(df, !is.na(image))
-//   df <- select(df, trial_index, time_elapsed, rt,
-//                response, block_number, image)
-//   df$image <- gsub(GONOGO_IMAGE_PATH, "", df$image)
-//   df$image <- gsub(".png", "", df$image)
-//   df <- df %>%
-//     mutate(
-//       should_go = case_when(
-//         block_number == 1 & grepl("astronaut_trans_1", image) ~ TRUE,
-//         block_number == 2 & grepl("alien_trans_1", image) ~ TRUE,
-//         block_number == 3 & grepl("rocket_trans_1", image) ~ TRUE,
-//         block_number == 4 & !grepl("rocket_trans_1", image) ~ TRUE,
-//         TRUE ~ FALSE),
-//       did_go = !is.na(response),
-//       correct = should_go == did_go
-//     )
-//   return(df)
-// }
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.gonogo_results = exports.gonogo_extract_trials = exports.gonogo_calculate_results = void 0;
 var gonogo_calculate_results = function (data) {
+    var trials = gonogo_extract_trials(data);
+    var results = gonogo_results(trials);
+    return results;
 };
-var gonogo_extract_trials = function (data) {
+exports.gonogo_calculate_results = gonogo_calculate_results;
+var gonogo_extract_trials = function (obj) {
     // GONOGO_IMAGE_PATH <- "https://unyavwofnmwihnpvkjji.supabase.co/storage/v1/object/public/test-stimuli/gonogo/"
+    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];
+            o.stimulustype = match[1];
+            o.image_number = match[2];
+        }
+        else {
+            console.warn('Image format did not match expected pattern:', o.image);
+            return;
+        }
+        o.should_go = false;
+        o.did_go = o.response !== null;
+        switch (o.block_number) {
+            case 1:
+                o.should_go = o.stimulus == "astronaut_trans_1.png";
+                break;
+            case 2:
+                o.should_go = o.stimulus == "alien_trans_1.png";
+                break;
+            case 3:
+                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:
+                o.should_go = false;
+                break;
+        }
+        o.correct = o.should_go == o.did_go;
+    });
+    return trials;
 };
+exports.gonogo_extract_trials = gonogo_extract_trials;
 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 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;
 };
+exports.gonogo_results = gonogo_results;

package/dist/cjs/spatial-cognition.js

@@ -23,13 +23,9 @@ var spatial_results = function (obj) {
     var best_score = 1000;
     var worst_score = 10000;
     // results.avg_acc to the power of 5
-    var performance = results.avg_rt / (Math.pow(results.avg_acc, 5) + 0.001);
-    if (performance < best_score) {
-        performance = best_score;
-    }
-    if (performance > worst_score) {
-        performance = worst_score;
-    }
+    //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;

package/dist/esm/emotions.d.ts

@@ -0,0 +1,10 @@
+interface EmotionResults {
+    n: number;
+    avg_rt: number;
+    avg_acc: number;
+    performance: number;
+}
+declare const emotion_calculate_results: (obj: any[]) => EmotionResults;
+declare const emotion_results: (obj: any[]) => EmotionResults;
+declare const emotion_extract_trials: (obj: any[]) => any[];
+export { emotion_calculate_results, emotion_extract_trials, emotion_results };

package/dist/esm/emotions.js

@@ -0,0 +1,49 @@
+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; });
+    trials.forEach(function (o) {
+        var match = o.emotion.match(/\/([^/]+)_([0-9]+)\.png/);
+        if (match) {
+            o.stimulus = match[0];
+            o.emotion = match[1];
+            o.image_number = match[2];
+            //this is <emotion>_<number>.png
+            o.image = "".concat(match[1], "_").concat(match[2], ".png");
+        }
+    });
+    trials.forEach(function (o) {
+        o.emotion_response = emotionMap[o.response] || "unknown";
+        o.correct = o.emotion === o.emotion_response;
+        // in the older ones there were 15 trials per rotation
+    });
+    return trials;
+};
+export { emotion_calculate_results, emotion_extract_trials, emotion_results };

package/dist/esm/gonogo.d.ts

@@ -1,3 +1,10 @@
-declare const gonogo_calculate_results: (data: any) => void;
-declare const gonogo_extract_trials: (data: any) => void;
-declare const gonogo_results: (data: any) => void;
+interface GonogoResults {
+    n: number;
+    avg_rt: number;
+    avg_acc: number;
+    performance: number;
+}
+declare const gonogo_calculate_results: (data: any[]) => GonogoResults;
+declare const gonogo_extract_trials: (obj: any[]) => any[];
+declare const gonogo_results: (data: any[]) => GonogoResults;
+export { gonogo_calculate_results, gonogo_extract_trials, gonogo_results };

package/dist/esm/gonogo.js

@@ -1,30 +1,66 @@
-"use strict";
-// gonogo_create_trial_table <- function(txt) {
-//   arr <- fromJSON(txt)
-//   df <- as.data.frame(fromJSON(arr[[1]]))
-//   GONOGO_IMAGE_PATH <- "https://unyavwofnmwihnpvkjji.supabase.co/storage/v1/object/public/test-stimuli/gonogo/"
-//   df <- filter(df, !is.na(image))
-//   df <- select(df, trial_index, time_elapsed, rt,
-//                response, block_number, image)
-//   df$image <- gsub(GONOGO_IMAGE_PATH, "", df$image)
-//   df$image <- gsub(".png", "", df$image)
-//   df <- df %>%
-//     mutate(
-//       should_go = case_when(
-//         block_number == 1 & grepl("astronaut_trans_1", image) ~ TRUE,
-//         block_number == 2 & grepl("alien_trans_1", image) ~ TRUE,
-//         block_number == 3 & grepl("rocket_trans_1", image) ~ TRUE,
-//         block_number == 4 & !grepl("rocket_trans_1", image) ~ TRUE,
-//         TRUE ~ FALSE),
-//       did_go = !is.na(response),
-//       correct = should_go == did_go
-//     )
-//   return(df)
-// }
 var gonogo_calculate_results = function (data) {
+    var trials = gonogo_extract_trials(data);
+    var results = gonogo_results(trials);
+    return results;
 };
-var gonogo_extract_trials = function (data) {
+var gonogo_extract_trials = function (obj) {
     // GONOGO_IMAGE_PATH <- "https://unyavwofnmwihnpvkjji.supabase.co/storage/v1/object/public/test-stimuli/gonogo/"
+    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];
+            o.stimulustype = match[1];
+            o.image_number = match[2];
+        }
+        else {
+            console.warn('Image format did not match expected pattern:', o.image);
+            return;
+        }
+        o.should_go = false;
+        o.did_go = o.response !== null;
+        switch (o.block_number) {
+            case 1:
+                o.should_go = o.stimulus == "astronaut_trans_1.png";
+                break;
+            case 2:
+                o.should_go = o.stimulus == "alien_trans_1.png";
+                break;
+            case 3:
+                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:
+                o.should_go = false;
+                break;
+        }
+        o.correct = o.should_go == o.did_go;
+    });
+    return trials;
 };
 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 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/spatial-cognition.js

@@ -18,13 +18,9 @@ var spatial_results = function (obj) {
     var best_score = 1000;
     var worst_score = 10000;
     // results.avg_acc to the power of 5
-    var performance = results.avg_rt / (Math.pow(results.avg_acc, 5) + 0.001);
-    if (performance < best_score) {
-        performance = best_score;
-    }
-    if (performance > worst_score) {
-        performance = worst_score;
-    }
+    //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;

package/example-data/spatial-cognition.json

@@ -460,4 +460,4 @@
     "time_elapsed": 189520,
     "attempted": false
   }
-]{aa{aasdasaadasdasd}}
+]

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "compileprofile-spacetests",
-  "version": "0.1.0",
-  "description": "A package for evaluating cognitive test results",
+  "version": "0.2.0",
+  "description": "A package for evaluating cognitive test results from Vzhuru do vesmiru",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "types": "dist/cjs/index.d.ts",

package/src/__tests__/integration/emotions.test.ts

@@ -0,0 +1,65 @@
+import { emotion_extract_trials, emotion_results, 
+  emotion_calculate_results } from '../../emotions';
+import { loadTestData } from '../test-utils/testData';
+
+describe('Emotions test module', () => {
+  const emotionsData = loadTestData('emotions').emotions;
+
+  describe('emotion_extract_trials', () => {
+    it('should extract trials from raw data', () => {
+      const trials = emotion_extract_trials(emotionsData);
+      expect(trials.length).toBeLessThan(emotionsData.length);
+      trials.forEach(trial => {
+        expect(trial).toHaveProperty('rt');
+        expect(trial).toHaveProperty('emotion');
+        expect(trial).toHaveProperty('emotion_response');
+        expect(trial).toHaveProperty('correct');
+        expect(trial).toHaveProperty('image_number');
+        expect(typeof trial.emotion).toBe('string');
+      });      
+    });
+
+    it('should handle empty data array', () => {
+      const trials = emotion_extract_trials([]);
+      expect(trials).toEqual([]);
+    });
+  });
+
+  describe('emotion_results', () => {
+    it('should calculate correct averages', () => {
+      // Create sample trial data
+      const sampleTrials = [
+        { rt: 600, correct: true, emotion: 'happy', emotion_response: 'happy' },
+        { rt: 1000, correct: true, emotion: 'sad', emotion_response: 'sad' },
+        { rt: 800, correct: false, emotion: 'angry', emotion_response: 'happy' },
+      ];
+      
+      const results = emotion_results(sampleTrials);
+      
+      expect(results.n).toBe(3);
+      expect(results.avg_rt).toBe(800); // (1000 + 1500 + 2000) / 3
+      expect(results.avg_acc).toBe(2/3); // (1 + 1 + 0) / 3
+      expect(results.performance).toBeGreaterThan(0);
+      expect(results.performance).toBeLessThanOrEqual(100);
+    });
+
+    it('should handle empty trials array', () => {
+      // When given an empty array, it should handle it gracefully
+      expect(() => emotion_results([])).toThrow();
+    });
+  });
+
+  describe('emotion_calculate_results', () => {
+    it('should process raw data and return valid results', () => {
+      const results = emotion_calculate_results(emotionsData);
+      console.log(results);
+      expect(results).toHaveProperty('n');
+      expect(results).toHaveProperty('avg_rt');
+      expect(results).toHaveProperty('avg_acc');
+      expect(results).toHaveProperty('performance');
+      
+      expect(results.performance).toBeGreaterThan(0);
+      expect(results.performance).toBeLessThanOrEqual(100);
+    });
+  });
+});

package/src/__tests__/integration/gonogo.test.ts

@@ -0,0 +1,81 @@
+import { gonogo_extract_trials, gonogo_results, gonogo_calculate_results } from '../../gonogo';
+import { loadTestData } from '../test-utils/testData';
+
+describe('Gonogo test module', () => {
+  // If gonogo data is available in your test data, load it
+  // const gonogoData = loadTestData('gonogo').gonogo;
+  
+  const gonogoData = loadTestData('gonogo').gonogo;
+
+  const mockTrials = [
+    {
+      image: "https://unyavwofnmwihnpvkjji.supabase.co/storage/v1/object/public/test-stimuli/gonogo/aliens/astronaut_trans_1.png",
+      rt: 846,
+      response: 0,
+      block_number:1
+    },
+    {
+      image: "https://unyavwofnmwihnpvkjji.supabase.co/storage/v1/object/public/test-stimuli/gonogo/aliens/alien_trans_1.png",
+      rt: null,
+      response: null,
+      block_number: 1
+    },
+  ];
+
+  describe('gonogo_extract_trials', () => {
+    it('should extract trials from raw data', () => {
+      const trials = gonogo_extract_trials(gonogoData);
+      // consolo log trials which have block number 3
+      expect(trials.length).toBeLessThan(gonogoData.length);
+      
+      trials.forEach(trial => {
+        expect(trial).toHaveProperty('stimulus');
+        expect(trial).toHaveProperty('stimulustype');
+        expect(trial).toHaveProperty('should_go');
+        expect(trial).toHaveProperty('did_go');
+        expect(trial).toHaveProperty('correct');
+      });
+    });
+
+    it('should handle empty data array', () => {
+      const trials = gonogo_extract_trials([]);
+      expect(trials).toEqual([]);
+    });
+  });
+
+  describe('gonogo_results', () => {
+    it('should calculate correct averages', () => {
+      const sampleTrials = [
+        { rt: 500, correct: true, should_go: true, did_go: true },
+        { rt: 600, correct: true, should_go: false, did_go: false },
+        { rt: 700, correct: false, should_go: true, did_go: false },
+      ];
+      
+      const results = gonogo_results(sampleTrials);
+      console.log(results)
+      expect(results.n).toBe(3);
+      expect(results.avg_rt).toBe(600); // (500 + 600 + 700) / 3
+      expect(results.avg_acc).toBe(2/3); // (1 + 1 + 0) / 3
+      expect(results.performance).toBeGreaterThan(0);
+      expect(results.performance).toBeLessThanOrEqual(100);
+    });
+
+    it('should handle empty trials array', () => {
+      expect(() => gonogo_results([])).toThrow();
+    });
+  });
+
+  describe('gonogo_calculate_results', () => {
+    it('should process raw data and return valid results', () => {
+      const results = gonogo_calculate_results(gonogoData);
+      console.log(results);
+      expect(results).toHaveProperty('n');
+      expect(results).toHaveProperty('avg_rt');
+      expect(results).toHaveProperty('avg_acc');
+      expect(results).toHaveProperty('performance');
+      
+      expect(results.performance).toBeGreaterThan(0);
+      expect(results.performance).toBeLessThanOrEqual(100);
+    });
+  });
+});

package/src/__tests__/integration/spatial-cognition.test.ts

@@ -1,5 +1,6 @@
 // test out the spatial_extract_image_info function
-import { spatial_extract_image_info, spatial_results } from '../../spatial-cognition';
+import { spatial_extract_image_info, spatial_calculate_results,
+  spatial_results } from '../../spatial-cognition';
 import { loadTestData } from '../test-utils/testData';
 
 const ImageInfoTestData = [
@@ -55,5 +56,11 @@ describe('spatial_results test data', () => {
     console.log(resultsTestData);
     expect(resultsTestData).toBeDefined();
   });
+  test('processes real data correctly', () => {
+    const testData = loadTestData('spatialCognition').spatialCognition;
+    const resultData = spatial_calculate_results(testData);
+    console.log(resultData);
+    expect(resultData).toBeDefined();
+  });
 });
 

package/src/emotions.ts

@@ -0,0 +1,59 @@
+interface EmotionResults {
+  n: number;
+  avg_rt: number;
+  avg_acc: number;
+  performance: number;
+}
+
+const emotion_calculate_results = (obj: any[]): EmotionResults => {
+  const trials = emotion_extract_trials(obj);
+  // throw if trials is empty
+  if (trials.length === 0) {
+    throw new Error("No trials found");
+  }
+  return emotion_results(trials);
+};
+
+const emotion_results = (obj: any[]): EmotionResults => {
+  // throw error if obj is empty
+  if (obj.length === 0) {
+    throw new Error("No trials found");
+  }
+  let results = {
+    n: obj.length,
+    avg_rt: obj.reduce((a, b) => a + b.rt, 0) / obj.length,
+    avg_acc: obj.reduce((a, b) => a + b.correct, 0) / obj.length,
+    performance: NaN
+  };
+  const best_score = 1000;
+  const worst_score = 10000;
+  let 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;
+}
+
+const emotion_extract_trials = (obj: any[]) => {
+  const emotionMap = ["neutral", "sad", "happy", "surprised", "angry"];
+  // filter trials where response and rt are defined and not null
+  let trials = obj.filter((o: any) => 'response' in o && 'rt' in o && 'emotion' in o);
+  trials = trials.filter((o: any) => o.response !== null && o.rt !== null);
+  trials.forEach((o: any) => {
+    const match = o.emotion.match(/\/([^/]+)_([0-9]+)\.png/);
+    if (match) {
+      o.stimulus = match[0];
+      o.emotion = match[1];
+      o.image_number = match[2];
+      //this is <emotion>_<number>.png
+      o.image = `${match[1]}_${match[2]}.png`;
+    }
+  })
+  trials.forEach((o: any) => {
+    o.emotion_response = emotionMap[o.response] || "unknown";
+    o.correct = o.emotion === o.emotion_response;
+    // in the older ones there were 15 trials per rotation
+  });
+  return trials;  
+}
+
+export { emotion_calculate_results, emotion_extract_trials, emotion_results };

package/src/gonogo.ts

@@ -1,37 +1,76 @@
-// gonogo_create_trial_table <- function(txt) {
-//   arr <- fromJSON(txt)
-//   df <- as.data.frame(fromJSON(arr[[1]]))
-//   GONOGO_IMAGE_PATH <- "https://unyavwofnmwihnpvkjji.supabase.co/storage/v1/object/public/test-stimuli/gonogo/"
-//   df <- filter(df, !is.na(image))
-//   df <- select(df, trial_index, time_elapsed, rt,
-//                response, block_number, image)
-//   df$image <- gsub(GONOGO_IMAGE_PATH, "", df$image)
-//   df$image <- gsub(".png", "", df$image)
-//   df <- df %>%
-//     mutate(
-//       should_go = case_when(
-//         block_number == 1 & grepl("astronaut_trans_1", image) ~ TRUE,
-//         block_number == 2 & grepl("alien_trans_1", image) ~ TRUE,
-//         block_number == 3 & grepl("rocket_trans_1", image) ~ TRUE,
-//         block_number == 4 & !grepl("rocket_trans_1", image) ~ TRUE,
-//         TRUE ~ FALSE),
-//       did_go = !is.na(response),
-//       correct = should_go == did_go
-//     )
-//   return(df)
-// }
-
-const gonogo_calculate_results = (data: any) => {
-
+interface GonogoResults {
+  n: number;
+  avg_rt: number;
+  avg_acc: number;
+  performance: number;
 }
 
-const gonogo_extract_trials = (data: any) => {
+const gonogo_calculate_results = (data: any[]): GonogoResults => {
+  const trials = gonogo_extract_trials(data);
+  const results = gonogo_results(trials);
+  return results;
+} 
 
-// GONOGO_IMAGE_PATH <- "https://unyavwofnmwihnpvkjji.supabase.co/storage/v1/object/public/test-stimuli/gonogo/"
+const gonogo_extract_trials = (obj: any[]): any[] => {
+  // GONOGO_IMAGE_PATH <- "https://unyavwofnmwihnpvkjji.supabase.co/storage/v1/object/public/test-stimuli/gonogo/"
+  let trials = obj.filter((o: any) => 'image' in o && o.image !== undefined);
+  trials.forEach((o: any) => {
+    // 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
+    const match = o.image.match(/([^/]+)_(\d+)\.png$/);
+    if (match) {
+      o.stimulus = match[0];
+      o.stimulustype = match[1];
+      o.image_number = match[2];
+    } else {
+      console.warn('Image format did not match expected pattern:', o.image);
+      return;
+    }
+    o.should_go = false;
+    o.did_go = o.response !== null;
+    switch (o.block_number) {
+      case 1:
+        o.should_go = o.stimulus == "astronaut_trans_1.png";
+        break;
+      case 2:
+        o.should_go = o.stimulus == "alien_trans_1.png";
+        break;
+      case 3:
+        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:
+        o.should_go = false;
+        break;
+    }
+    o.correct = o.should_go == o.did_go;
+  })
+  return trials;
 }
 
-
-const gonogo_results = (data: any) => {
-
+const gonogo_results = (data: any[]): GonogoResults => {
+  // throw error if obj is empty
+  if (data.length === 0) {
+    throw new Error("No trials found");
+  }
+  let results = {
+    n: data.length,
+    avg_rt: data.reduce((a, b) => a + b.rt, 0) / data.length,
+    avg_acc: data.reduce((a, b) => a + b.correct, 0) / data.length,
+    performance: NaN
+  };
+  const best_score = 300;
+  const worst_score = 5000;
+  let 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/src/spatial-cognition.ts

@@ -27,13 +27,9 @@ const spatial_results = (obj: any[]): SpatialResults => {
   const best_score = 1000;
   const worst_score = 10000;
   // results.avg_acc to the power of 5
-  let performance = results.avg_rt / (Math.pow(results.avg_acc, 5) + 0.001);
-  if (performance < best_score) {
-    performance = best_score;
-  }
-  if (performance > worst_score) {
-    performance = worst_score;
-  }
+  //let performance = results.avg_rt / (Math.pow(results.avg_acc, 5) + 0.001);
+  let 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;