Add print_res+Bug fix in solve+Updating version to 0.8.1

print_res is a function that is called whenever a restore occured

Author: omdxp

cmpx/__init__.py

@@ -1,11 +1,11 @@
 from .number import Complex
-from .error import print_err
+from .error import print_err, print_res
 
 __title__      = 'PythonComplex'
 __author__     = 'Omar Belghaouti'
 __maintainer__ = 'Omar Belghaouti'
 __email__      = 'bel_omar18@yahoo.com'
-__version__    = '0.7.8'
+__version__    = '0.8.1'
 __license__    = 'MIT'
 __all__ = [
     'Complex'

cmpx/equations/solve.py

@@ -8,22 +8,23 @@
 """
 def solve(a, b, c=0):
     try:
-        if a and b == 0:
+        if a == 0 and b == 0:
             raise ValueError('At least give a number to the first two coefficents')
-        if a and b != 0:
-            if a == 0:
-                return (Complex(-c/b))
-            if b == 0:
-                return (Complex(sqrt(-c/a))) if -c/a >= 0 else (Complex(0, sqrt(c/a)))
+        if a != 0 and b != 0:
             delta = b**2 - 4 * a * c
             if(delta < 0):
                 solution = (Complex(-b/2*a, -sqrt(-delta)/2*a),
                             Complex(-b/2*a, sqrt(-delta)/2*a))
-            elif(delta == 0):
+            elif delta == 0:
                 solution = (Complex(-b/2*a))
             else:
                 solution = (Complex((-b - sqrt(delta))/2*a),
                             Complex((-b + sqrt(delta))/2*a))
             return solution
+        else:
+            if a == 0:
+                return (Complex(-c/b))
+            if b == 0:
+                return (Complex(sqrt(-c/a))) if -c/a >= 0 else (Complex(0, sqrt(c/a)))
     except (ZeroDivisionError, ValueError) as err:
         print_err(err)

cmpx/error.py

@@ -16,4 +16,10 @@
 # function to print the error message
 def print_err(err):
     print(Fore.RED + '{}: {}'.format(err.__class__.__name__, err))
+    print(Style.RESET_ALL, end='')
+    
+# function to print whenever restore is true
+def print_res():
+    print(Fore.RED + 'Float division by zero')
+    print(Fore.GREEN + 'Restoring last number')
     print(Style.RESET_ALL, end='')

cmpx/number.py

@@ -4,8 +4,7 @@
 
 @author: Omar Belghaouti
 """
-from colorama import Fore, Style
-from .error import print_err
+from .error import print_err, print_res
 from math import sqrt
 
 # Complex class for complex number manipulations
@@ -79,9 +78,7 @@ def __truediv__(self, other):
             den = other * other.con()
             num = self * other.con()
             if den.re == 0 and self.restore:
-                print(Fore.RED + 'Float division by zero')
-                print(Fore.GREEN + 'Restoring last number')
-                print(Style.RESET_ALL, end='')
+                print_res()
                 return Complex(self.re, self.im, self.restore)
             return Complex(num.re / den.re, num.im / den.re, self.restore)
         except (ZeroDivisionError, ValueError) as err:
@@ -96,9 +93,7 @@ def __floordiv__(self, other):
             den = other * other.con()
             num = self * other.con()
             if den.re == 0 and self.restore:
-                print(Fore.RED + 'Float division by zero')
-                print(Fore.GREEN + 'Restoring last number')
-                print(Style.RESET_ALL, end='')
+                print_res()
                 return Complex(self.re, self.im, self.restore)
             return Complex(num.re // den.re, num.im // den.re, self.restore)
         except (ZeroDivisionError, ValueError) as err:
@@ -208,9 +203,7 @@ def __idiv__(self, other):
             den = other * other.con()
             num = self * other.con()
             if den.re == 0 and self.restore:
-                print(Fore.RED + 'Float division by zero')
-                print(Fore.GREEN + 'Restoring last number')
-                print(Style.RESET_ALL, end='')
+                print_res()
                 return Complex(self.re, self.im, self.restore)
             self.re = num.re / den.re
             self.im = num.im / den.re
@@ -227,9 +220,7 @@ def __ifloordiv__(self, other):
             den = other * other.con()
             num = self * other.con()
             if den.re == 0 and self.restore:
-                print(Fore.RED + 'Float division by zero')
-                print(Fore.GREEN + 'Restoring last number')
-                print(Style.RESET_ALL, end='')
+                print_res()
                 return Complex(self.re, self.im, self.restore)
             self.re = num.re // den.re
             self.im = num.im // den.re

setup.py

@@ -5,7 +5,7 @@
 
 setup_args = dict(
     name='cmpx',
-    version='0.7.8',
+    version='0.8.1',
     description='A package for different operations on complex numbers',
     long_description_content_type='text/markdown',
     long_description=README,

tests/main.py

@@ -1,10 +1,9 @@
-from cmpx import Complex
+from cmpx import print_err
 
 def main():
-    a = 4 + 3 - 5j
-    print(a.real)
-    print(a.imag)
-    cmplx = Complex(a, 1)
-    print(cmplx)
+    try:
+        raise ValueError('Just for testing purposes')
+    except ValueError as err:
+        print_err(err)
 
 if __name__ == '__main__': main()