Myosotis-Researches 0.1.35__py3-none-any.whl → 0.1.37__py3-none-any.whl

myosotis_researches/CcGAN/utils/similarity.py

@@ -59,19 +59,25 @@ def PSNR(images):
             PSNR_sum += _PSNR(images[i], images[j])
     return PSNR_sum / (n * (n - 1) / 2)
 
+
 # Cross-correlation
 
+
 def _cross_correlation(image_1, image_2):
-    array_1 = np.array(image_1)
-    array_2 = np.array(image_2)
-    channels_1 = cv2.split(array_1)
-    channels_2 = cv2.split(array_2)
-    scores = []
-    for c1, c2 in zip(channels_1, channels_2):
-        result = cv2.matchTemplate(c1, c2, method=cv2.TM_CCOEFF_NORMED)
-        _, max_val, _, _ = cv2.minMaxLoc(result)
-        scores.append(max_val)
-    return sum(scores) / len(scores)
+    array_1 = np.array(image_1).astype(np.float32) / 255
+    array_2 = np.array(image_2).astype(np.float32) / 255
+    correlations = []
+    for c in range(3):
+        channel1 = array_1[..., c]
+        channel2 = array_2[..., c]
+        channel1 -= channel1.mean()
+        channel2 -= channel2.mean()
+        numerator = np.sum(channel1 * channel2)
+        denominator = np.sqrt(np.sum(channel1**2) * np.sum(channel2**2))
+        corr = numerator / denominator if denominator != 0 else 0
+        correlations.append(corr)
+    return np.mean(correlations)
+
 
 def cross_correlation(images):
     cross_correlation_sum = 0
@@ -81,8 +87,43 @@ def cross_correlation(images):
             cross_correlation_sum += _cross_correlation(images[i], images[j])
     return cross_correlation_sum / (n * (n - 1) / 2)
 
+
+# Histogram intersection
+def _rgb_histogram(image, bins=32):
+    """
+    image: numpy array of shape (H, W, 3), RGB format
+    returns: concatenated histogram for R, G, B channels
+    """
+    hist_r, _ = np.histogram(image[:, :, 0], bins=bins, range=(0, 255), density=True)
+    hist_g, _ = np.histogram(image[:, :, 1], bins=bins, range=(0, 255), density=True)
+    hist_b, _ = np.histogram(image[:, :, 2], bins=bins, range=(0, 255), density=True)
+    hist = np.concatenate([hist_r, hist_g, hist_b])
+    return hist
+
+
+def _histogram_intersection(image_1, image_2):
+    hist_1 = _rgb_histogram(image_1)
+    hist_2 = _rgb_histogram(image_2)
+    return np.sum(np.minimum(hist_1, hist_2))
+
+
+def histogram_intersection(images):
+    histogram_intersection_sum = 0
+    n = len(images)
+    for i in range(n):
+        for j in range(i + 1, n):
+            histogram_intersection_sum += _histogram_intersection(images[i], images[j])
+    return histogram_intersection_sum / (n * (n - 1) / 2)
+
+
 # Similarity
-_method_dict = {"MSE": MSE, "SSIM": SSIM, "PSNR": PSNR, "cross-correlation": cross_correlation}
+_method_dict = {
+    "MSE": MSE,
+    "SSIM": SSIM,
+    "PSNR": PSNR,
+    "cross-correlation": cross_correlation,
+    "histogram-intersection": histogram_intersection,
+}
 
 
 def similarity(images, method):

{myosotis_researches-0.1.35.dist-info → myosotis_researches-0.1.37.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Myosotis-Researches
-Version: 0.1.35
+Version: 0.1.37
 Summary: A repository for storing my progress of researches.
 Home-page: https://github.com/Zeyu-Xie/Myosotis-Researches
 Author: Zeyu Xie

{myosotis_researches-0.1.35.dist-info → myosotis_researches-0.1.37.dist-info}/RECORD

@@ -29,13 +29,13 @@ myosotis_researches/CcGAN/train/train_net_for_label_embed.py,sha256=4j6r4_o4rXgA
 myosotis_researches/CcGAN/utils/__init__.py,sha256=yH4I2QzSoBsjcdjvOH0YKLTeEji_oWrzBGm5EkVZpoI,146
 myosotis_researches/CcGAN/utils/concat_image.py,sha256=BIGKz52Inn9S7M5fBFKye2V9bLJ0DqEQILoOVWAXUiE,2165
 myosotis_researches/CcGAN/utils/dataset.py,sha256=TXJSLMpwI1h0xb6lXpq5iUjjurheKPZnPbR2KIU-Py4,4216
-myosotis_researches/CcGAN/utils/similarity.py,sha256=N_ziWpwkaAxkfiMiCoWjhsH9PwXBHeKIYS-1egPhmD4,2233
+myosotis_researches/CcGAN/utils/similarity.py,sha256=piqT2XipooFcpSrT7femKUr3RPu0P7zGYaL355i9okk,3458
 myosotis_researches/CcGAN/utils/src/style.css,sha256=bNp3_nlpg0W5qA7Rx8MM5ayeprEbYH3_6AIDRTN8UhM,566
 myosotis_researches/CcGAN/utils/src/style.css.map,sha256=GTGPet_xXnKQnsz-E2CMUWtrgu3D5t0g4J_A_amFdvw,246
 myosotis_researches/CcGAN/utils/src/style.scss,sha256=_Wa7VPmFzCkEHtrzdG35tj89QNwPd-fpiT-YL4ohcMs,526
 myosotis_researches/CcGAN/utils/src/template.html,sha256=S35ak_uJ0Zd3_PhX-YoCRBP2TMKxdFPMMaBdpARdKcU,3890
-myosotis_researches-0.1.35.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-myosotis_researches-0.1.35.dist-info/METADATA,sha256=H_vkKcQPKbAGIFtTJWwEbmS1BU6ovRpPjSTgU1OsTHY,3484
-myosotis_researches-0.1.35.dist-info/WHEEL,sha256=wXxTzcEDnjrTwFYjLPcsW_7_XihufBwmpiBeiXNBGEA,91
-myosotis_researches-0.1.35.dist-info/top_level.txt,sha256=zxAiMn5eyZNJM28MewTAkgi_RZJMbfWbzVR-KF0LdZE,20
-myosotis_researches-0.1.35.dist-info/RECORD,,
+myosotis_researches-0.1.37.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+myosotis_researches-0.1.37.dist-info/METADATA,sha256=7gCdoiiquizLVqgF88yubO5qIkv088uXb07m9ecrKJY,3484
+myosotis_researches-0.1.37.dist-info/WHEEL,sha256=wXxTzcEDnjrTwFYjLPcsW_7_XihufBwmpiBeiXNBGEA,91
+myosotis_researches-0.1.37.dist-info/top_level.txt,sha256=zxAiMn5eyZNJM28MewTAkgi_RZJMbfWbzVR-KF0LdZE,20
+myosotis_researches-0.1.37.dist-info/RECORD,,