mathai 0.4.4__py3-none-any.whl → 0.4.5__py3-none-any.whl

mathai/trig.py

@@ -82,7 +82,7 @@ def trig0(eq):
         if any(isneg(item) for item in lst):
             return -(eq.children[0]*-1).fx("sin")
         out=single_pi(lst)
-        if out is not None:
+        if out is not None and tuple(out) in trig_sin_table.keys():
             return trig_sin_table[tuple(out)]
     
     if eq.name == "f_cos":
@@ -211,35 +211,38 @@ def trig4(eq, numer=True):
     return TreeNode(eq.name, [trig4(child, False) if not numer or (eq.name == "f_pow" and frac(eq.children[1]) is not None and frac(eq.children[1]) < 0) else trig4(child, True) for child in eq.children])
 
 def trig2(eq):
-    if eq.name == "f_add":
-        for item in itertools.combinations(range(len(eq.children)), 2):
-            child1, child2 = eq.children[item[0]], eq.children[item[1]]
+    # Base case: if not an addition, recurse into children
+    if eq.name != "f_add":
+        return TreeNode(eq.name, [trig2(child) for child in eq.children])
+
+    # Try all pairs in the addition
+    for i, j in itertools.combinations(range(len(eq.children)), 2):
+        c1, c2 = eq.children[i], eq.children[j]
+
+        # Combine only sin/sin or cos/cos
+        if c1.name in ["f_sin", "f_cos"] and c2.name in ["f_sin", "f_cos"]:
+            A, B = c1.children[0], c2.children[0]
+            rest = [eq.children[k] for k in range(len(eq.children)) if k not in (i, j)]
+            rest_tree = summation(rest) if rest else tree_form("d_0")
 
-            # Check if both are sin or cos
-            if child1.name in ["f_sin", "f_cos"] and child2.name in ["f_sin", "f_cos"]:
-                a, b = child1.children[0], child2.children[0]
-                
-                # Compute the rest of the sum
-                rest = [eq.children[i] for i in range(len(eq.children)) if i not in item]
-                if len(rest) == 0:
-                    rest_tree = tree_form("d_0")
-                else:
-                    rest_tree = summation(rest)
+            two = tree_form("d_2")
 
-                # Now handle the sin/cos combination formula
-                if child1.name == "f_sin" and child2.name == "f_sin":
-                    # sin A + sin B = 2 sin((A+B)/2) cos((A-B)/2)
-                    two = tree_form("d_2")
-                    combined = two * ((a + b) / two).fx("sin") * ((a - b) / two).fx("cos")
-                elif child1.name == "f_cos" and child2.name == "f_cos":
-                    # cos A + cos B = 2 cos((A+B)/2) cos((A-B)/2)
-                    two = tree_form("d_2")
-                    combined = two * ((a + b) / two).fx("cos") * ((a - b) / two).fx("cos")
-                else:
-                    # sin A + cos B = sin A + cos B (leave unchanged, or implement formula if desired)
-                    continue  # skip for now, keep original
+            # sinA + sinB
+            if c1.name == "f_sin" and c2.name == "f_sin":
+                combined = two * ((A + B) / two).fx("sin") * ((A - B) / two).fx("cos")
 
-                return rest_tree + combined
+            # cosA + cosB
+            elif c1.name == "f_cos" and c2.name == "f_cos":
+                combined = two * ((A + B) / two).fx("cos") * ((A - B) / two).fx("cos")
 
-    # Recurse for other nodes
+            # sinA + cosB (leave unchanged)
+            else:
+                continue
+
+            new_expr = rest_tree + combined
+            # Re-run trig2 in case there are more sin/cos sums to simplify
+            return trig2(new_expr)
+
+    # If no sin/cos pairs found, just recurse on children
     return TreeNode(eq.name, [trig2(child) for child in eq.children])
+

{mathai-0.4.4.dist-info → mathai-0.4.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mathai
-Version: 0.4.4
+Version: 0.4.5
 Summary: Mathematics solving Ai tailored to NCERT
 Home-page: https://github.com/infinity390/mathai4
 Author: educated indians are having a low iq and are good for nothing

{mathai-0.4.4.dist-info → mathai-0.4.5.dist-info}/RECORD

@@ -16,9 +16,9 @@ mathai/printeq.py,sha256=gIes-pstFOa6FcnpVIVvkjVKuWdsVdo11LlEnmHhakU,1303
 mathai/simplify.py,sha256=aEvpkhaDowgyQWPSxHKshcVIMngZ4NBVc2yuiCYqOYI,16229
 mathai/structure.py,sha256=4Ww2IAx62RcQSO7_17TZES-DjMWBpcFQtL939FBIHwY,4103
 mathai/tool.py,sha256=UyccamiJy_CkFPakfufyPzdhtlEO6v2D7qwbXQ9V7Rg,2000
-mathai/trig.py,sha256=VYpn3_uuFrr9xOXBSOSGlwdlGHAAlGEzjA1ez-HsZxQ,10712
+mathai/trig.py,sha256=1VLEo5QvBbfoQHPdtzJ_65c1BHklesk9H0bAlvNyT7A,10543
 mathai/univariate_inequality.py,sha256=_r-kkiS4Hr-jRN7f-EL_E4svAMFWJP1Ea50HJKKbjfk,14778
-mathai-0.4.4.dist-info/METADATA,sha256=LeMmNLbtXxWcr6eME07Yd9HS-bDS4jLPeQe1wa-dZds,7021
-mathai-0.4.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mathai-0.4.4.dist-info/top_level.txt,sha256=ROP4l3OhGYw3ihkQGASr18xM9GsK4z3_6whV5AyXLwE,7
-mathai-0.4.4.dist-info/RECORD,,
+mathai-0.4.5.dist-info/METADATA,sha256=oryIRWZw-NGvmk5Uu-F_5zAxp0RonwuxZ-HxExh1_hc,7021
+mathai-0.4.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mathai-0.4.5.dist-info/top_level.txt,sha256=ROP4l3OhGYw3ihkQGASr18xM9GsK4z3_6whV5AyXLwE,7
+mathai-0.4.5.dist-info/RECORD,,