merged elec.

complexno.py

@@ -8,14 +8,15 @@ class ComplexNumber:
 
 	def __str__(comp):
 		if comp.y<0 :
-			return "({0},{1})".format(comp.x,comp.y)
+			return "({0},{1})".format(comp.x,abs(comp.y))
 		else:
 			return "({0},{1})".format(comp.x,comp.y)
 
-
 	def __repr__(comp):
 		return ('str(comp.x)'" + i"'str(comp.y)')
 	
+
+
 	def __add__(comp,other):
 		if (type(other) is ComplexNumber):
 			return ComplexNumber(comp.x+other.x,comp.y+other.y)
@@ -106,6 +107,7 @@ def mysquare(comp):
 	return comp**2
 
 
+
 def mag(comp):
 	return (comp.x**2+comp.y**2)**(0.5)