particle swarm optimization

[imago.git] / geometry.py

diff --git a/geometry.py b/geometry.py
index 09b0199..b8aea09 100644 (file)
--- a/geometry.py
+++ b/geometry.py
@@ -1,5 +1,7 @@
 """Imago geometry module"""
 
+from manual import line, intersection
+
 class V(object):
     def __init__(self, x, y):
         self.x = x
@@ -15,7 +17,7 @@ class V(object):
         return V(other * self.x, other * self.y)
 
     def __len__(self):
-        return 2;
+        return 2
 
     def __getitem__(self, key):
         if key == 0:
@@ -35,5 +37,5 @@ class V(object):
     def normal(self):
         return V(-self.y, self.x)
 
-def projection(point, line, vector):
-    return V(*intersection(g_line(point, point + vector.normal), g_line(*line)))
+def projection(p, l, v):
+    return V(*intersection(line(p, p + v.normal), line(*l)))