Changeset 14:3634a208da61

Timestamp:

12/19/10 16:04:29 (5 years ago)

Author:

Olga Zolotareva <olya_zol@òÀæ>

Branch:

default

Children:

15:43f5b82f3491, 16:c71c27b09bc7

Message:

modules changed

File:

• vector.py (modified) (4 diffs)

vector.py

@@ -1 +ˆà @@
-from math import *
+import math
 
 class Vector(object):   
@@ -8 +8 @@
         
         def __add__(self, other):
-                result = Vector()
+                result = Vector(0,0)
                 result.x = self.x + other.x
                 result.y = self.y + other.y
@@ -29 +29 @@
 
         def is_null(self):
-                if abs(self)     == 0 :
+                if abs(self) == 0 :
                         return 1
                 else :
@@ -38 +38 @@
 
         def set_rho(self, new_rho):
-                self.x , self.y = self.x*(new_rho/abs(self)) , self.y*(new_rho/abs(self))
+                if self.is_null() == 1:
+                        self.x , self.y = new_rho*math.cos(self.phi) , new_rho*math.sin(self.phi)
+                else :
+                        self.x , self.y = self.x*(new_rho/abs(self)) , self.y*(new_rho/abs(self))
 
         rho = property(get_rho, set_rho) 
 
         def get_phi(self):
-                cos = self.dot_product(Vector(1,0))/(abs(self)*1)
-                if self.y < 0 : 
-                        phi = -acos(cos)
-                else :
-                        phi = acos(cos)
-                return phi
+                phi = math.pi/2 - math.atan2(self.x, self.y)
+                if self.is_null == 1:
+                        phi = 0
+                return  phi
 
         def set_phi(self, new_phi):
-                self.x , self.y = abs(self)*cos(new_phi) , abs(self)*sin(new_phi)
+                rho = abs(self)
+                self.x , self.y = rho*math.cos(new_phi) , rho*math.sin(new_phi)
 
         phi = property(get_phi, set_phi)