author Simon Chabot Mon, 29 Oct 2012 09:52:16 +0100 changeset 56 afa74864fe6c parent 55 abb7cb198f25 child 57 2741988383ae
[distances] The planet radius for the geographical distance can be given
 distances.py file | annotate | diff | comparison | revisions
```--- a/distances.py	Mon Oct 29 09:46:26 2012 +0100
+++ b/distances.py	Mon Oct 29 09:52:16 2012 +0100
@@ -164,8 +164,8 @@
seta = set(stra)
setb = set(strb)

-    jab = 1.0 * len(seta.intersection(setb)) / len(seta.union(setb))
-    return 1.0 - jab
+    jacc = 1.0 * len(seta.intersection(setb)) / len(seta.union(setb))
+    return 1.0 - jacc

def temporal(stra, strb, granularity = u'days', language = u'french',
dayfirst = True, yearfirst = False):
@@ -218,19 +218,23 @@
except TypeError:
return abs(float(a) - float(b))

-def geographical(pointa, pointb, inRadians = True):
""" Return the geographical distance between two points.

Both points must be tuples (latitude, longitude)
+
+        - inRadians is True, if latitude and longitude are in radians, false
+          otherwise
+        - planetRadius is the planet's radius in meters. By default, it's the
+          Earth'one.
"""
difflat = pointa[0] - pointb[0]
difflong = pointa[1] - pointb[1]
meanlat = (pointa[0] + pointb[0])/2.0
-    earthradius = 6371009 #in meters