solved local merge conflict (my mistake)

computational-psychology · Jul 25, 2022 · d2aba4f · d2aba4f
2 parents 3f19a7c + cd1ee08
commit d2aba4f
Show file tree

Hide file tree

Showing 5 changed files with 238 additions and 107 deletions.
diff --git a/stimuli/papers/murray2020.py b/stimuli/papers/murray2020.py
@@ -128,10 +128,11 @@ def argyle(ppd=PPD, normalize=normalize):
         repeats=int(ppd / PPD), axis=1
     )
 
-    if normalize:
-        img = img - img.min()
-        img = img / img.max()
-    return {"img": img, "mask": mask}
+    # Normalize intensity values to [0, 1]
+    original_range = (img.min(), img.max())
+    normed_img = (img - img.min()) / (img.max() - img.min())
+
+    return {"img": normed_img, "mask": mask, "original_range": original_range}
 
 
 def argyle_control(ppd=PPD, normalize=normalize):
@@ -159,10 +160,11 @@ def argyle_control(ppd=PPD, normalize=normalize):
         repeats=int(ppd / PPD), axis=1
     )
 
-    if normalize:
-        img = img - img.min()
-        img = img / img.max()
-    return {"img": img, "mask": mask}
+    # Normalize intensity values to [0, 1]
+    original_range = (img.min(), img.max())
+    normed_img = (img - img.min()) / (img.max() - img.min())
+
+    return {"img": normed_img, "mask": mask, "original_range": original_range}
 
 
 def argyle_long(ppd=PPD, normalize=normalize):
@@ -190,10 +192,11 @@ def argyle_long(ppd=PPD, normalize=normalize):
         repeats=int(ppd / PPD), axis=1
     )
 
-    if normalize:
-        img = img - img.min()
-        img = img / img.max()
-    return {"img": img, "mask": mask}
+    # Normalize intensity values to [0, 1]
+    original_range = (img.min(), img.max())
+    normed_img = (img - img.min()) / (img.max() - img.min())
+
+    return {"img": normed_img, "mask": mask, "original_range": original_range}
 
 
 def snake(ppd=PPD, normalize=normalize):
@@ -221,10 +224,11 @@ def snake(ppd=PPD, normalize=normalize):
         repeats=int(ppd / PPD), axis=1
     )
 
-    if normalize:
-        img = img - img.min()
-        img = img / img.max()
-    return {"img": img, "mask": mask}
+    # Normalize intensity values to [0, 1]
+    original_range = (img.min(), img.max())
+    normed_img = (img - img.min()) / (img.max() - img.min())
+
+    return {"img": normed_img, "mask": mask, "original_range": original_range}
 
 
 def snake_control(ppd=PPD, normalize=normalize):
@@ -252,10 +256,11 @@ def snake_control(ppd=PPD, normalize=normalize):
         repeats=int(ppd / PPD), axis=1
     )
 
-    if normalize:
-        img = img - img.min()
-        img = img / img.max()
-    return {"img": img, "mask": mask}
+    # Normalize intensity values to [0, 1]
+    original_range = (img.min(), img.max())
+    normed_img = (img - img.min()) / (img.max() - img.min())
+
+    return {"img": normed_img, "mask": mask, "original_range": original_range}
 
 
 def koffka_adelson(ppd=PPD, normalize=normalize):
@@ -283,10 +288,11 @@ def koffka_adelson(ppd=PPD, normalize=normalize):
         repeats=int(ppd / PPD), axis=1
     )
 
-    if normalize:
-        img = img - img.min()
-        img = img / img.max()
-    return {"img": img, "mask": mask}
+    # Normalize intensity values to [0, 1]
+    original_range = (img.min(), img.max())
+    normed_img = (img - img.min()) / (img.max() - img.min())
+
+    return {"img": normed_img, "mask": mask, "original_range": original_range}
 
 
 def koffka_broken(ppd=PPD, normalize=normalize):
@@ -314,10 +320,11 @@ def koffka_broken(ppd=PPD, normalize=normalize):
         repeats=int(ppd / PPD), axis=1
     )
 
-    if normalize:
-        img = img - img.min()
-        img = img / img.max()
-    return {"img": img, "mask": mask}
+    # Normalize intensity values to [0, 1]
+    original_range = (img.min(), img.max())
+    normed_img = (img - img.min()) / (img.max() - img.min())
+
+    return {"img": normed_img, "mask": mask, "original_range": original_range}
 
 
 def koffka_connected(ppd=PPD, normalize=normalize):
@@ -345,10 +352,11 @@ def koffka_connected(ppd=PPD, normalize=normalize):
         repeats=int(ppd / PPD), axis=1
     )
 
-    if normalize:
-        img = img - img.min()
-        img = img / img.max()
-    return {"img": img, "mask": mask}
+    # Normalize intensity values to [0, 1]
+    original_range = (img.min(), img.max())
+    normed_img = (img - img.min()) / (img.max() - img.min())
+
+    return {"img": normed_img, "mask": mask, "original_range": original_range}
 
 
 def checkassim(ppd=PPD, normalize=normalize):
@@ -376,10 +384,11 @@ def checkassim(ppd=PPD, normalize=normalize):
         repeats=int(ppd / PPD), axis=1
     )
 
-    if normalize:
-        img = img - img.min()
-        img = img / img.max()
-    return {"img": img, "mask": mask}
+    # Normalize intensity values to [0, 1]
+    original_range = (img.min(), img.max())
+    normed_img = (img - img.min()) / (img.max() - img.min())
+
+    return {"img": normed_img, "mask": mask, "original_range": original_range}
 
 
 def simcon(ppd=PPD, normalize=normalize):
@@ -407,10 +416,11 @@ def simcon(ppd=PPD, normalize=normalize):
         repeats=int(ppd / PPD), axis=1
     )
 
-    if normalize:
-        img = img - img.min()
-        img = img / img.max()
-    return {"img": img, "mask": mask}
+    # Normalize intensity values to [0, 1]
+    original_range = (img.min(), img.max())
+    normed_img = (img - img.min()) / (img.max() - img.min())
+
+    return {"img": normed_img, "mask": mask, "original_range": original_range}
 
 
 def simcon_articulated(ppd=PPD, normalize=normalize):
@@ -438,10 +448,11 @@ def simcon_articulated(ppd=PPD, normalize=normalize):
         repeats=int(ppd / PPD), axis=1
     )
 
-    if normalize:
-        img = img - img.min()
-        img = img / img.max()
-    return {"img": img, "mask": mask}
+    # Normalize intensity values to [0, 1]
+    original_range = (img.min(), img.max())
+    normed_img = (img - img.min()) / (img.max() - img.min())
+
+    return {"img": normed_img, "mask": mask, "original_range": original_range}
 
 
 def white(ppd=PPD, normalize=normalize):
@@ -469,10 +480,11 @@ def white(ppd=PPD, normalize=normalize):
         repeats=int(ppd / PPD), axis=1
     )
 
-    if normalize:
-        img = img - img.min()
-        img = img / img.max()
-    return {"img": img, "mask": mask}
+    # Normalize intensity values to [0, 1]
+    original_range = (img.min(), img.max())
+    normed_img = (img - img.min()) / (img.max() - img.min())
+
+    return {"img": normed_img, "mask": mask, "original_range": original_range}
 
 
 if __name__ == "__main__":

diff --git a/tests/papers/RHS2007.json b/tests/papers/RHS2007.json
@@ -20,8 +20,8 @@
         "mask": "4f6c94d2041e950d11e9ad593044d8d6"
     },
     "WE_zigzag": {
-        "img": "9c11af9ccdfab0580db629dff6fda752",
-        "mask": "0461ef6bb3a975dfc417290bb2fe955b"
+        "img": "dd572c472d0f2efd33d9e6a69384035b",
+        "mask": "b8e04105d00d5d4db2ab424a1ca0b511"
     },
     "WE_radial_thick_small": {
         "img": "b92d533177eed4a009625d6d2cb0da59",
@@ -76,8 +76,8 @@
         "mask": "6f0277e6ea561b0849319b43f76fdeed"
     },
     "checkerboard_016": {
-        "img": "cffb926181df5cea95608b95bbc163f1",
-        "mask": "1eb12e597ac5c454830dc2873730ccc1"
+        "img": "2480266193d1a643ecaffa9bcf267498",
+        "mask": "f3b0267fe670647bd46e295f75d551b3"
     },
     "checkerboard_0938": {
         "img": "ffe0d07c218fa56eecce2a9386908ff5",

diff --git a/tests/papers/domijan2015.json b/tests/papers/domijan2015.json
@@ -1,62 +1,122 @@
 {
     "dungeon": {
-        "img": "23859250c9f5a895de48c20e7095f4e9",
-        "mask": "1954462ad5eeb864935b349630f918f9"
+        "img": "2fcc7108d4e60b783ec45d63ca0d0948",
+        "mask": "1954462ad5eeb864935b349630f918f9",
+        "original_range": [
+            1,
+            9
+        ]
     },
     "cube": {
-        "img": "59ac0095ba9c17a2cdd98ffff6613447",
-        "mask": "3a6543daa69e82047d0b84b76a446312"
+        "img": "ae4d6af3fdd4a2d8850ba0e35019313f",
+        "mask": "3a6543daa69e82047d0b84b76a446312",
+        "original_range": [
+            1,
+            9
+        ]
     },
     "grating": {
-        "img": "44286e04ca4f44fe98930722c0d45b1a",
-        "mask": "cb796a47e9ca6c8426a2585c9b604989"
+        "img": "367e338b2995083a84e73727411e6fda",
+        "mask": "cb796a47e9ca6c8426a2585c9b604989",
+        "original_range": [
+            1,
+            9
+        ]
     },
     "rings": {
-        "img": "38a7bc014428864fffcee590d0953465",
-        "mask": "3c5c395de3b4cae5b6956314624ea012"
+        "img": "c18eb113ec23ce6ab336d6ea4007f5b7",
+        "mask": "3c5c395de3b4cae5b6956314624ea012",
+        "original_range": [
+            1,
+            9
+        ]
     },
     "bullseye": {
-        "img": "e30fb79cf7897dfed4ce04983b36ba28",
-        "mask": "721937af54e313931f38a22b7a6ce885"
+        "img": "c62daec28726ac4a3a80078a579732e8",
+        "mask": "721937af54e313931f38a22b7a6ce885",
+        "original_range": [
+            1,
+            9
+        ]
     },
     "simultaneous_brightness_contrast": {
-        "img": "a0e0353cd1fb9a829241ddecc51fbc64",
-        "mask": "c46a87aa52c48192ce96c90fbe10c062"
+        "img": "b38138c73e964a2cd1f8191b52782caa",
+        "mask": "c46a87aa52c48192ce96c90fbe10c062",
+        "original_range": [
+            1,
+            9
+        ]
     },
     "white": {
-        "img": "377a2903002d526da2ba1d052eb193d2",
-        "mask": "306423f9e89e6d3bd21a946881ef684a"
+        "img": "6cea872dcf0c04350a02bd22a56208ac",
+        "mask": "306423f9e89e6d3bd21a946881ef684a",
+        "original_range": [
+            1,
+            9
+        ]
     },
     "benary": {
-        "img": "4c3f2278ac91effebf1db9f580a24db6",
-        "mask": "c790aa14edddb57f8054a4f330c7ddc6"
+        "img": "6d80c64a4631498a45727f7af729b7cf",
+        "mask": "c790aa14edddb57f8054a4f330c7ddc6",
+        "original_range": [
+            1,
+            9
+        ]
     },
     "todorovic": {
-        "img": "1b9d5b09475aace9b97f599c5731177b",
-        "mask": "2eeeeb428daf6be031c64ef841e7c897"
+        "img": "0892f38cdfa5207d469d79da419b733c",
+        "mask": "2eeeeb428daf6be031c64ef841e7c897",
+        "original_range": [
+            1,
+            9
+        ]
     },
     "checkerboard_contrast_contrast": {
-        "img": "246c282926e1a0b390eb4bca6bd00b16",
-        "mask": "487c5cbe9dfd08719ead98ea9a7e901c"
+        "img": "feffa677eb2e788920524d1609c4bdc3",
+        "mask": "487c5cbe9dfd08719ead98ea9a7e901c",
+        "original_range": [
+            1,
+            9
+        ]
     },
     "checkerboard": {
-        "img": "6891d301caf87043b99c199f13fdf607",
-        "mask": "70844521cd62275df0cab9a7c1184d9d"
+        "img": "78d696821728153333c497589f03a9d3",
+        "mask": "70844521cd62275df0cab9a7c1184d9d",
+        "original_range": [
+            1,
+            9
+        ]
     },
     "checkerboard_extended": {
-        "img": "570e9597fa49a33a6e96687a007ad3e0",
-        "mask": "f6ee08aeab807602449271ee7367cc44"
+        "img": "16196805dd15f399620ee763324c4c52",
+        "mask": "f6ee08aeab807602449271ee7367cc44",
+        "original_range": [
+            1,
+            9
+        ]
     },
     "white_anderson": {
-        "img": "c7778db45fd1d7804dc2b5eea0a78637",
-        "mask": "4f444ddd9e75de8357dbf61d25130416"
+        "img": "e88fe28810daf69833589464179f1f13",
+        "mask": "4f444ddd9e75de8357dbf61d25130416",
+        "original_range": [
+            1,
+            9
+        ]
     },
     "white_howe": {
-        "img": "e32554b8707058acb6f84afa87ee68cb",
-        "mask": "dad7e6f46a83cfde26d224711e0afb0f"
+        "img": "07f8a1a4840a6e1c38628d1041a04b17",
+        "mask": "dad7e6f46a83cfde26d224711e0afb0f",
+        "original_range": [
+            1,
+            9
+        ]
     },
     "white_yazdanbakhsh": {
-        "img": "58f2c90531832a502e8dcd1745347405",
-        "mask": "3c2739936e5cd883520089605537e1d6"
+        "img": "981075866bd20d1c3993a1df3f42ee47",
+        "mask": "3c2739936e5cd883520089605537e1d6",
+        "original_range": [
+            1,
+            9
+        ]
     }
 }