Fixing some bugs

Make sure that other is an instance from Complex class for all operations

Author: omdxp

cmpx.py

@@ -13,16 +13,24 @@ def __init__(self, re=0, im=0):
         self.im = im
     # Operator overloading 1 : +
     def __add__(self, other):
+        if not isinstance(other, Complex):
+            other = Complex(other)
         return Complex(self.re + other.re, self.im + other.im)
     # Operator overloading 2 : -
     def __sub__(self, other):
+        if not isinstance(other, Complex):
+            other = Complex(other)
         return Complex(self.re - other.re, self.im - other.im)
     # Operator overloading 3 : *
     def __mul__(self, other):
+        if not isinstance(other, Complex):
+            other = Complex(other)
         return Complex(self.re * other.re - self.im * other.im, self.re * other.im + self.im * other.re)
     # Operator overloading 4 : /
     def __truediv__(self, other):
         try:
+            if not isinstance(other, Complex):
+                other = Complex(other)
             den = other * other.con()
             num = self * other.con()
             return Complex(num.re / den.re, num.im / den.re)
@@ -31,56 +39,85 @@ def __truediv__(self, other):
     # Operator overloading 5 : //
     def __floordiv__(self, other):
         try:
+            if not isinstance(other, Complex):
+                other = Complex(other)
             den = other * other.con()
             num = self * other.con()
             return Complex(num.re // den.re, num.im // den.re)
         except ZeroDivisionError as err:
             print('Error: {}'.format(err))
     def __gt__(self, other):
+        if not isinstance(other, Complex):
+            other = Complex(other)
         return self.mod() > other.mod()
     # Operator overloading 7 : >=
     def __ge__(self, other):
+        if not isinstance(other, Complex):
+            other = Complex(other)
         return self.mod() >= other.mod()
     # Operator overloading 8: <
     def __lt__(self, other):
+        if not isinstance(other, Complex):
+            other = Complex(other)
         return not self >= other
     # Operator overloading 9: <=
     def __le__(self, other):
+        if not isinstance(other, Complex):
+            other = Complex(other)
         return not self > other
     # Operator overloading 10: ==
     def __eq__(self, other):
+        if not isinstance(other, Complex):
+            other = Complex(other)
         return (self.re == other.re) and (self.im == other.im)
     # Operator overloading 11: !=
     def __ne__(self, other):
+        if not isinstance(other, Complex):
+            other = Complex(other)
         return not self == other
     # Operator overloading 12: +=
     def __iadd__(self, other):
+        if not isinstance(other, Complex):
+            other = Complex(other)
         self.re += other.re
         self.im += other.im
+        return Complex(self.re, self.im)
     # Operator overloading 13: -=
     def __isub__(self, other):
+        if not isinstance(other, Complex):
+            other = Complex(other)
         self.re -= other.re
         self.im -= other.im
+        return Complex(self.re, self.im)
     # Operator overloading 14: *=
     def __imul__(self, other):
+        if not isinstance(other, Complex):
+            other = Complex(other)
         self.re = self.re * other.re - self.im * other.im
         self.im = self.re * other.im + self.im * other.re
+        return Complex(self.re, self.im)
     # Operator overloading 15: /=
     def __idiv__(self, other):
         try:
+            if not isinstance(other, Complex):
+                other = Complex(other)
             den = other * Complex(other.re, - other.im)
             num = self * Complex(other.re, - other.im)
             self.re = num.re / den.re
             self.im = num.im / den.re
+            return Complex(self.re, self.im)
         except ZeroDivisionError as err:
             print('Error: {}'.format(err))
     # Operator overloading 16: //=
     def __ifloordiv__(self, other):
         try:
+            if not isinstance(other, Complex):
+                other = Complex(other)
             den = other * Complex(other.re, - other.im)
             num = self * Complex(other.re, - other.im)
             self.re = num.re // den.re
             self.im = num.im // den.re
+            return Complex(self.re, self.im)
         except ZeroDivisionError as err:
             print('Error: {}'.format(err))
     ## Helper functions
@@ -94,7 +131,4 @@ def con(self):
     def __str__(self):
         output = str(self.re) + ' + ' + str(self.im) + 'j' if(self.im != 0) else str(self.re)
         output = str(self.re) + ' - ' + str(-self.im) + 'j' if (self.im < 0) else output
-        return output
-    # Callable module
-    def __call__(self):
-        return self
+        return output

main.py

@@ -14,10 +14,10 @@ def main():
     number = Complex(42) # --> Real = 42, Imaginary = 0
     print(number)
     # Instanciation 3
-    number = Complex(12, -3.2) # --> Real = 12, Imaginary = -1
+    number = Complex(12, -3.2) # --> Real = 12, Imaginary = -3.2
     print(number)
     # Instanciation 4
-    number = Complex(im=13.2, re=5)
+    number = Complex(im=13.2, re=5) # --> Real = 5, Imaginary = 13.2
     print(number)
 
     # Basic operations
@@ -33,10 +33,31 @@ def main():
     print('({}) / ({}) = {}'.format(num1, num2, num1 / num2))
     # Floor division
     print('({}) // ({}) = {}'.format(num1, num2, num1 // num2))
+    ## Affecting the result directly on the number
+    # Summation
+    print('({}) += ({})'.format(num1, 2), end=' --> ')
+    num1 += 2
+    print(num1)
+    # Substraction
+    print('({}) -= ({})'.format(num1, num2), end=' --> ')
+    num1 -= num2
+    print(num1)
+    # Multiplication
+    print('({}) *= ({})'.format(num1, 2), end=' --> ')
+    num1 *= 2
+    print(num1)
+    # Division
+    print('({}) /= ({})'.format(num1, num2), end=' --> ')
+    num1 /= num2
+    print(num1)
+    # Floor division
+    print('({}) //= ({})'.format(num1, 2), end=' --> ')
+    num1 /= 2
+    print(num1)
     # Congugated of a complex number
-    print('con({}) = {}'.format(num1, num1.con()))
+    print('con({}) = {}'.format(num2, num2.con()))
     # Module of a complex number
-    print('mod({}) = {}'.format(num1, num1.mod()))
+    print('mod({}) = {}'.format(num2, num2.mod()))
 
     # Basic comparisons
     num1 = Complex(im=3.1, re=-5)