Commit 459af77f authored by Vishwajeet404's avatar Vishwajeet404

Conflict resolved

parents 9630df26 142ea1f3
...@@ -13,6 +13,9 @@ class ComplexNumber: ...@@ -13,6 +13,9 @@ class ComplexNumber:
else: else:
return "%s+i%s" % (self.real,self.img) return "%s+i%s" % (self.real,self.img)
def __repr__(self):
return "ComplexNumber(real=%s,img=%s)" %(self.real,self.img)
def __radd__(self,other): def __radd__(self,other):
return ComplexNumber(self.real + other,self.img) return ComplexNumber(self.real + other,self.img)
...@@ -59,8 +62,7 @@ class ComplexNumber: ...@@ -59,8 +62,7 @@ class ComplexNumber:
y = self**(other-1) y = self**(other-1)
z = self*y z = self*y
return z return z
def mysquare(variable): def mysquare(variable):
return variable*variable return variable*variable
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment