From 1266a2331b160605e0a6156150c3b58aef46c799 Mon Sep 17 00:00:00 2001 From: Bertrand Benjamin Date: Mon, 1 Oct 2018 16:13:13 +0200 Subject: [PATCH] Fix(compute): clean typing multiply --- mapytex/calculus/core/typing/multiply.py | 46 ------------------------ 1 file changed, 46 deletions(-) diff --git a/mapytex/calculus/core/typing/multiply.py b/mapytex/calculus/core/typing/multiply.py index 6867150..64c1b99 100644 --- a/mapytex/calculus/core/typing/multiply.py +++ b/mapytex/calculus/core/typing/multiply.py @@ -15,8 +15,6 @@ from ..tree import Tree from ..MO.mo import MO, MOnumber, MOstr from ..MO.fraction import MOFraction from ..MO.monomial import MOstrPower, MOMonomial -from .exceptions import MultiplyError -from .filters import special_case multiply_doc = """ Multiply MOs @@ -28,48 +26,7 @@ multiply_doc = """ Multiply MOs multiply = Dispatcher("multiply", doc=multiply_doc) -def multiply_filter(left, right): - """ Automatic multiply on MO - - :param left: MO - :param right: MO - :returns: MO if it is a special case, nothing other wise - - >>> a = MOnumber(1) - >>> b = MOFraction(1, 2) - >>> multiply(a, b) - - >>> multiply(b, a) - - >>> a = MOnumber(0) - >>> b = MOFraction(1, 2) - >>> multiply(a, b) - - """ - try: - if left == 0: - return left - except TypeError: - pass - try: - if right == 0: - return right - except TypeError: - pass - - try: - if left == 1: - return right - except TypeError: - pass - try: - if right == 1: - return left - except TypeError: - pass - @multiply.register((MOnumber, MOFraction), MOstr) -@special_case(multiply_filter) def moscalar_mostr(left, right): """ Multiply a scalar with a letter to create a MOMonomial @@ -84,7 +41,6 @@ def moscalar_mostr(left, right): return MOMonomial(left, right) @multiply.register(MOstr, (MOnumber, MOFraction)) -@special_case(multiply_filter) def mostr_moscalar(left, right): """ Multiply a scalar with a letter to create a MOMonomial @@ -99,7 +55,6 @@ def mostr_moscalar(left, right): return MOMonomial(right, left) @multiply.register((MOnumber, MOFraction), MOstrPower) -@special_case(multiply_filter) def moscalar_mostrpower(left, right): """ Multiply a scalar with a MOstrPower @@ -116,7 +71,6 @@ def moscalar_mostrpower(left, right): return MOMonomial(left, right) @multiply.register(MOstrPower, (MOnumber, MOFraction)) -@special_case(multiply_filter) def mostrpower_moscalar(left, right): """ Multiply a MOstrPower with a scalar