X-Git-Url: https://git.njae.me.uk/?a=blobdiff_plain;f=norms.py;h=4fdf1e3d85bb347c501bcb88c6caec7a8c969035;hb=26d9d2228e47a6ff8b8696d37c0a8d6d6b906c67;hp=744cbe4d9d4336f574d7b0885fed973189acd7d9;hpb=26f5de0a23dd94ded412f6f507910ac5e26ea2b6;p=cipher-tools.git

diff --git a/norms.py b/norms.py
index 744cbe4..4fdf1e3 100644
--- a/norms.py
+++ b/norms.py
@@ -96,6 +96,27 @@ def l3(frequencies1, frequencies2):
         total += abs(frequencies1[k] - frequencies2[k]) ** 3
     return total ** (1/3)
 
+def geometric_mean(frequencies1, frequencies2):
+    """Finds the distances between two frequency profiles, expressed as dictionaries.
+    Assumes every key in frequencies1 is also in frequencies2
+
+    """
+    total = 0
+    for k in frequencies1.keys():
+        total *= abs(frequencies1[k] - frequencies2[k])
+    return total
+
+def harmonic_mean(frequencies1, frequencies2):
+    """Finds the distances between two frequency profiles, expressed as dictionaries.
+    Assumes every key in frequencies1 is also in frequencies2
+
+    """
+    total = 0
+    for k in frequencies1.keys():
+        total += 1 / abs(frequencies1[k] - frequencies2[k])
+    return 1 / total
+
+
 def cosine_distance(frequencies1, frequencies2):
     """Finds the distances between two frequency profiles, expressed as dictionaries.
     Assumes every key in frequencies1 is also in frequencies2