Grafiken erweitert

vector.py

@@ -24,15 +24,15 @@ class Vector(object):
 	def __eq__(self, v):
 		return self.coordinates == v.coordinates
 		
-	#def plus(self,v):
-	#     new_coordinates = [x+y for x,y in zip(self.coordinates, v.coordinates)]
-	#     return Vector(new_coordinates)
-	
 	def plus(self,v):
-		new_coordinates =[]
-		n = len(self.coordinates)
-		for i in range(n):
-			new_coordinates.append(self.coordinates[i] + v.coordinates[i])
+	    new_coordinates = [x+y for x,y in zip(self.coordinates, v.coordinates)]
+	    return Vector(new_coordinates)
+	
+	#def plus(self,v):
+	#	new_coordinates =[]
+	#	n = len(self.coordinates)
+	#	for i in range(n):
+	#		new_coordinates.append(self.coordinates[i] + v.coordinates[i])
 			
 	def minus(self,v):
 		new_coordinates = [x-y for x,y in zip(self.coordinates, v.coordinates)]
@@ -57,22 +57,11 @@ class Vector(object):
 			
 # Tests
 
-vektor_1 = Vector([1,2,3])
-print (vektor_1)
 
-vektor_2 = Vector([1,2,3])
-vektor_3 = Vector([-1,2,3])
+veka1 = Vector([0,5])
+veka2 = Vector([2,2])
 
-print (vektor_1 == vektor_2)
-print (vektor_2 == vektor_3)
+print (veka1.plus(veka2))
 
-print (vektor_1.plus(vektor_2))
 
-print (vektor_2.minus(vektor_3))
-
-print (vektor_3.times_scalar(3))
-
-print ("Magnitude -- L<>nge ", vektor_3.magnitude())
-
-print ("Normalisieren ", vektor_2.normalized())