mathai 2.2.3__tar.gz → 2.2.5__tar.gz

{mathai-2.2.3 → mathai-2.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mathai
-Version: 2.2.3
+Version: 2.2.5
 Summary: Mathematics solving Ai tailored to NCERT
 Home-page: https://github.com/infinity390/mathai
 Requires-Python: >=3.7
@@ -455,7 +455,19 @@ done
 from mathai import *
 # (z,y) is dash, a'b' is front view
 # (z,-x) is no dash, ab is top view
+
+# A line AB 60 mm long has its end A 20 mm above HP and 30 mm infront of VP. The line is inclined at 40 degrees to HP and is parallel to VP. Draw the projection
 solve_graphics_string("30 20 0 None None None None None None 0 40*pi/180 None None 60")
+print()
+
+# Engineering Graphics for DEGREE P.I. Varghese
+solve_graphics_string("20 25 0 None None None None None None 30*pi/180 0 60 None None") # 11.14
+print()
+solve_graphics_string("15 25 0 None None None None None None 30*pi/180 0 50 None None") # 11.15
+print()
+solve_graphics_string("0 -25 0 None None None None None None None 0 55 None 75") # 11.17
+print()
+solve_graphics_string("25 50 0 -30 None None None None None None 0 None None 80") # 11.19
 ```
 
 #### Output
@@ -465,15 +477,75 @@ Ay : 20
 Az : 0
 Bx : 30
 By : 20+(60*sin(((2*pi)/9)))
-Bz : 60*abs(cos(((2*pi)/9)))
+Bz : 60*sqrt((1-(sin(((2*pi)/9))^2)))
 Bx-Ax : 0
 By-Ay : 60*sin(((2*pi)/9))
-Bz-Az : 60*abs(cos(((2*pi)/9)))
+Bz-Az : 60*sqrt((1-(sin(((2*pi)/9))^2)))
 inclination_with_VP : 0
 inclination_with_HP : (2*pi)/9
 front_view_length : 60
-top_view_length : 60*abs(cos(((2*pi)/9)))
+top_view_length : sqrt((3600-(3600*(sin(((2*pi)/9))^2))))
 line_length : 60
+
+Ax : 20
+Ay : 25
+Az : 0
+Bx : 20+(60/(3^-(-1/2)))
+By : 25
+Bz : 60
+Bx-Ax : 60/(3^-(-1/2))
+By-Ay : 0
+Bz-Az : 60
+inclination_with_VP : pi/6
+inclination_with_HP : 0
+front_view_length : 60
+top_view_length : sqrt(4800)
+line_length : 120/(3^-(-1/2))
+
+Ax : 15
+Ay : 25
+Az : 0
+Bx : 15+(50/(3^-(-1/2)))
+By : 25
+Bz : 50
+Bx-Ax : 50/(3^-(-1/2))
+By-Ay : 0
+Bz-Az : 50
+inclination_with_VP : pi/6
+inclination_with_HP : 0
+front_view_length : 50
+top_view_length : 100/(3^-(-1/2))
+line_length : 100/(3^-(-1/2))
+
+Ax : 0
+Ay : -25
+Az : 0
+Bx : 5*sqrt(104)
+By : -25
+Bz : 55
+Bx-Ax : 5*sqrt(104)
+By-Ay : 0
+Bz-Az : 55
+inclination_with_VP : arcsin((sqrt(104)/15))
+inclination_with_HP : 0
+front_view_length : 55
+top_view_length : 75
+line_length : 75
+
+Ax : 25
+Ay : 50
+Az : 0
+Bx : -30
+By : 50
+Bz : 5*sqrt(135)
+Bx-Ax : -55
+By-Ay : 0
+Bz-Az : 5*sqrt(135)
+inclination_with_VP : arcsin((-11/16))
+inclination_with_HP : 0
+front_view_length : sqrt(3375)
+top_view_length : 80
+line_length : 80
 ```
 
 ### Questions solved using god() function

{mathai-2.2.3 → mathai-2.2.5}/README.md

@@ -439,7 +439,19 @@ done
 from mathai import *
 # (z,y) is dash, a'b' is front view
 # (z,-x) is no dash, ab is top view
+
+# A line AB 60 mm long has its end A 20 mm above HP and 30 mm infront of VP. The line is inclined at 40 degrees to HP and is parallel to VP. Draw the projection
 solve_graphics_string("30 20 0 None None None None None None 0 40*pi/180 None None 60")
+print()
+
+# Engineering Graphics for DEGREE P.I. Varghese
+solve_graphics_string("20 25 0 None None None None None None 30*pi/180 0 60 None None") # 11.14
+print()
+solve_graphics_string("15 25 0 None None None None None None 30*pi/180 0 50 None None") # 11.15
+print()
+solve_graphics_string("0 -25 0 None None None None None None None 0 55 None 75") # 11.17
+print()
+solve_graphics_string("25 50 0 -30 None None None None None None 0 None None 80") # 11.19
 ```
 
 #### Output
@@ -449,15 +461,75 @@ Ay : 20
 Az : 0
 Bx : 30
 By : 20+(60*sin(((2*pi)/9)))
-Bz : 60*abs(cos(((2*pi)/9)))
+Bz : 60*sqrt((1-(sin(((2*pi)/9))^2)))
 Bx-Ax : 0
 By-Ay : 60*sin(((2*pi)/9))
-Bz-Az : 60*abs(cos(((2*pi)/9)))
+Bz-Az : 60*sqrt((1-(sin(((2*pi)/9))^2)))
 inclination_with_VP : 0
 inclination_with_HP : (2*pi)/9
 front_view_length : 60
-top_view_length : 60*abs(cos(((2*pi)/9)))
+top_view_length : sqrt((3600-(3600*(sin(((2*pi)/9))^2))))
 line_length : 60
+
+Ax : 20
+Ay : 25
+Az : 0
+Bx : 20+(60/(3^-(-1/2)))
+By : 25
+Bz : 60
+Bx-Ax : 60/(3^-(-1/2))
+By-Ay : 0
+Bz-Az : 60
+inclination_with_VP : pi/6
+inclination_with_HP : 0
+front_view_length : 60
+top_view_length : sqrt(4800)
+line_length : 120/(3^-(-1/2))
+
+Ax : 15
+Ay : 25
+Az : 0
+Bx : 15+(50/(3^-(-1/2)))
+By : 25
+Bz : 50
+Bx-Ax : 50/(3^-(-1/2))
+By-Ay : 0
+Bz-Az : 50
+inclination_with_VP : pi/6
+inclination_with_HP : 0
+front_view_length : 50
+top_view_length : 100/(3^-(-1/2))
+line_length : 100/(3^-(-1/2))
+
+Ax : 0
+Ay : -25
+Az : 0
+Bx : 5*sqrt(104)
+By : -25
+Bz : 55
+Bx-Ax : 5*sqrt(104)
+By-Ay : 0
+Bz-Az : 55
+inclination_with_VP : arcsin((sqrt(104)/15))
+inclination_with_HP : 0
+front_view_length : 55
+top_view_length : 75
+line_length : 75
+
+Ax : 25
+Ay : 50
+Az : 0
+Bx : -30
+By : 50
+Bz : 5*sqrt(135)
+Bx-Ax : -55
+By-Ay : 0
+Bz-Az : 5*sqrt(135)
+inclination_with_VP : arcsin((-11/16))
+inclination_with_HP : 0
+front_view_length : sqrt(3375)
+top_view_length : 80
+line_length : 80
 ```
 
 ### Questions solved using god() function

{mathai-2.2.3 → mathai-2.2.5}/mathai/graphics.py

@@ -4,31 +4,26 @@ from .simplify import simplify
 from .trig import trig0
 import itertools
 from .inverse import inverse
-from .formula_data import compile_formula
 from .expand import expand
 from .parser import parse
 def solve_graphics(Ax, Ay, Az, Bx, By, Bz, BAx, BAy, BAz, phi, theta, fvl, tvl, length):
-    eq1 = TreeNode("f_eq", [TreeNode("v_6"), TreeNode("v_3")-TreeNode("v_0")])
-    eq2 = TreeNode("f_eq", [TreeNode("v_7"), TreeNode("v_4")-TreeNode("v_1")])
-    eq3 = TreeNode("f_eq", [TreeNode("v_8"), TreeNode("v_5")-TreeNode("v_2")])
-    eq4 = TreeNode("f_eq", [TreeNode("v_6"), TreeNode("v_9").fx("sin")*TreeNode("v_13")])
-    eq5 = TreeNode("f_eq", [TreeNode("v_7"), TreeNode("v_10").fx("sin")*TreeNode("v_13")])
-    eq6 = TreeNode("f_eq", [TreeNode("v_8"), (TreeNode("d_1") - TreeNode("v_9").fx("sin")**2 - TreeNode("v_10").fx("sin")**2).fx("sqrt")*TreeNode("v_13")])
-    eq7 = TreeNode("f_eq", [TreeNode("v_12")**2, (TreeNode("v_3")-TreeNode("v_0"))**2+(TreeNode("v_5")-TreeNode("v_2"))**2])
-    eq8 = TreeNode("f_eq", [TreeNode("v_11")**2, (TreeNode("v_4")-TreeNode("v_1"))**2+(TreeNode("v_5")-TreeNode("v_2"))**2])
+    eq1 = TreeNode("f_eq", [TreeNode("v_6"), TreeNode("v_3") - TreeNode("v_0")])
+    eq2 = TreeNode("f_eq", [TreeNode("v_7"), TreeNode("v_4") - TreeNode("v_1")])
+    eq3 = TreeNode("f_eq", [TreeNode("v_8"), TreeNode("v_5") - TreeNode("v_2")])
+    eq4 = TreeNode("f_eq", [TreeNode("v_6"), TreeNode("v_9").fx("sin") * TreeNode("v_13")])
+    eq5 = TreeNode("f_eq", [TreeNode("v_7"), TreeNode("v_10").fx("sin") * TreeNode("v_13")])
+    eq6 = TreeNode("f_eq", [TreeNode("v_8"), (TreeNode("d_1") - TreeNode("v_9").fx("sin")**2 - TreeNode("v_10").fx("sin")**2).fx("sqrt") * TreeNode("v_13")])
+    eq7 = TreeNode("f_eq", [TreeNode("v_12")**2, (TreeNode("v_3") - TreeNode("v_0"))**2 + (TreeNode("v_5") - TreeNode("v_2"))**2])
+    eq8 = TreeNode("f_eq", [TreeNode("v_11")**2, (TreeNode("v_4") - TreeNode("v_1"))**2 + (TreeNode("v_5") - TreeNode("v_2"))**2])
     q = operation("f_and", [eq1, eq2, eq3, eq4, eq5, eq6, eq7, eq8])
     lst = [Ax, Ay, Az, Bx, By, Bz, BAx, BAy, BAz, phi, theta, fvl, tvl, length]
     name = "Ax Ay Az Bx By Bz Bx-Ax By-Ay Bz-Az inclination_with_VP inclination_with_HP front_view_length top_view_length line_length".split(" ")
-    lst_map = {}
-    for index, item in enumerate(lst):
-        lst_map[index] = item
     solution = {}
-    for i in range(len(lst_map.keys())):
-        if lst_map[i] is not None:
-            solution[f"v_{i}"] = lst_map[i]
-    done = True
-    fx = compile_formula("sin(x)^2 1-cos(x)^2 _ _ _ _ _ _ _ 2")
+    for index, item in enumerate(lst):
+        if item is not None:
+            solution[f"v_{index}"] = item
     q = simplify(q)
+    done = True
     while done:
         done = False
         for i in range(len(q.children)):
@@ -37,19 +32,19 @@ def solve_graphics(Ax, Ay, Az, Bx, By, Bz, BAx, BAy, BAz, phi, theta, fvl, tvl,
                 item = replace(item, TreeNode(key), item2)
             item = fraction(expand(trig0(simplify(item))))
             q.children[i] = item
-            if len(vlist(item)) == 1:
-                solution[vlist(item)[0]] = inverse(
-                    item.children[0], vlist(item)[0]
-                )
+            vars_in_item = vlist(item)
+            if len(vars_in_item) == 1:
+                target_var = vars_in_item[0]
+                solution[target_var] = inverse(item.children[0], target_var)
                 done = True
                 break
-        if done:
-            continue
-    for i in range(len(name)):
-        solution[name[i]] = simplify(expand(fx(solution[f"v_{i}"])))
-        del solution[f"v_{i}"]
-    return solution
+    final_solution = {}
+    for i, param_name in enumerate(name):
+        var_key = f"v_{i}"
+        if var_key in solution:
+            final_solution[param_name] = simplify(expand(solution[var_key]))
+    return final_solution
 def solve_graphics_string(s):
-    s = [None if item == "None" else parse(item) for item in s.split(" ")]
-    for key, item in solve_graphics(*s).items():
-        print(key, ":", item)
+    s_parsed = [None if item == "None" else parse(item) for item in s.split()]
+    for key, item in solve_graphics(*s_parsed).items():
+        print(f"{key} : {item}")

{mathai-2.2.3 → mathai-2.2.5}/mathai/inverse.py

@@ -1,23 +1,25 @@
 from .base import *
 from .simplify import simplify
 from .expand import expand
-def inverse(rhs,term, sign=None):
+import copy
+def inverse(rhs, term, sign=None):
     term = tree_form(term)
     lhs = tree_form("d_0")
+    rhs = copy.deepcopy(rhs)
     count = 15
-    while not rhs==term:
+    while not rhs == term:
         if rhs.name == "f_add":
-            if all(term in factor_generation(child) for child in rhs.children):
-                newrhs = simplify(expand(rhs*term**-1))
+            if rhs.children and all(term in factor_generation(child) for child in rhs.children):
+                newrhs = simplify(expand(rhs * term**-1))
                 if not contain(newrhs, term):
                     rhs = term * newrhs
             else:
-                for i in range(len(rhs.children)-1,-1,-1):
+                for i in range(len(rhs.children) - 1, -1, -1):
                     if not contain(rhs.children[i], term):
                         lhs = lhs - rhs.children[i]
                         rhs.children.pop(i)
         elif rhs.name == "f_mul":
-            for i in range(len(rhs.children)-1,-1,-1):
+            for i in range(len(rhs.children) - 1, -1, -1):
                 if not contain(rhs.children[i], term):
                     lhs = lhs * rhs.children[i]**-1
                     if sign is not None:
@@ -26,11 +28,17 @@ def inverse(rhs,term, sign=None):
                         if compute(rhs.children[i]**-1) < 0:
                             sign = not sign
                     rhs.children.pop(i)
-        elif rhs.name == "f_pow" and contain(rhs.children[0], term):
-            lhs = lhs ** (tree_form("d_1")/rhs.children[1])
+        elif rhs.name == "f_pow" and contain(rhs.children[0], term) and not contain(rhs.children[1], term):
+            lhs = lhs ** (tree_form("d_1") / rhs.children[1])
+            if sign is not None:
+                if compute(rhs.children[1]) < 0:
+                    sign = not sign
             rhs = copy.deepcopy(rhs.children[0])
+        elif rhs.name == "f_pow" and rhs.children[0].name == "s_e" and contain(rhs.children[1], term):
+            lhs = lhs.fx("log")
+            rhs = copy.deepcopy(rhs.children[1])
         elif rhs.name == "f_pow" and contain(rhs.children[1], term) and not contain(rhs.children[0], term):
-            lhs = lhs.fx("log")/rhs.children[0].fx("log")
+            lhs = lhs.fx("log") / rhs.children[0].fx("log")
             rhs = copy.deepcopy(rhs.children[1])
         elif rhs.name == "f_sin" and contain(rhs.children[0], term):
             lhs = lhs.fx("arcsin")
@@ -40,27 +48,30 @@ def inverse(rhs,term, sign=None):
             rhs = copy.deepcopy(rhs.children[0])
         elif rhs.name == "f_arccos" and contain(rhs.children[0], term):
             lhs = lhs.fx("cos")
+            if sign is not None:
+                sign = not sign
             rhs = copy.deepcopy(rhs.children[0])
         elif rhs.name == "f_cos" and contain(rhs.children[0], term):
             lhs = lhs.fx("arccos")
+            if sign is not None:
+                sign = not sign
             rhs = copy.deepcopy(rhs.children[0])
         elif rhs.name == "f_log" and contain(rhs.children[0], term):
             lhs = tree_form("s_e")**lhs
             rhs = copy.deepcopy(rhs.children[0])
-        elif rhs.name == "f_pow" and rhs.children[0].name == "s_e" and contain(rhs.children[1], term):
-            lhs = lhs.fx("log")
-            rhs = copy.deepcopy(rhs.children[1].fx("log"))
         elif rhs.name == "f_tan" and contain(rhs.children[0], term):
             lhs = lhs.fx("arctan")
             rhs = copy.deepcopy(rhs.children[0])
         elif rhs.name == "f_arctan" and contain(rhs.children[0], term):
             lhs = lhs.fx("tan")
             rhs = copy.deepcopy(rhs.children[0])
-        if len(rhs.children) == 1:
+        if rhs.name in ["f_add", "f_mul"] and len(rhs.children) == 1:
             rhs = rhs.children[0]
         count -= 1
         if count == 0:
             return None
+    if contain(lhs, term):
+        return None
     if sign is None:
         return simplify(lhs)
     return simplify(lhs), sign

{mathai-2.2.3 → mathai-2.2.5}/mathai.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mathai
-Version: 2.2.3
+Version: 2.2.5
 Summary: Mathematics solving Ai tailored to NCERT
 Home-page: https://github.com/infinity390/mathai
 Requires-Python: >=3.7
@@ -455,7 +455,19 @@ done
 from mathai import *
 # (z,y) is dash, a'b' is front view
 # (z,-x) is no dash, ab is top view
+
+# A line AB 60 mm long has its end A 20 mm above HP and 30 mm infront of VP. The line is inclined at 40 degrees to HP and is parallel to VP. Draw the projection
 solve_graphics_string("30 20 0 None None None None None None 0 40*pi/180 None None 60")
+print()
+
+# Engineering Graphics for DEGREE P.I. Varghese
+solve_graphics_string("20 25 0 None None None None None None 30*pi/180 0 60 None None") # 11.14
+print()
+solve_graphics_string("15 25 0 None None None None None None 30*pi/180 0 50 None None") # 11.15
+print()
+solve_graphics_string("0 -25 0 None None None None None None None 0 55 None 75") # 11.17
+print()
+solve_graphics_string("25 50 0 -30 None None None None None None 0 None None 80") # 11.19
 ```
 
 #### Output
@@ -465,15 +477,75 @@ Ay : 20
 Az : 0
 Bx : 30
 By : 20+(60*sin(((2*pi)/9)))
-Bz : 60*abs(cos(((2*pi)/9)))
+Bz : 60*sqrt((1-(sin(((2*pi)/9))^2)))
 Bx-Ax : 0
 By-Ay : 60*sin(((2*pi)/9))
-Bz-Az : 60*abs(cos(((2*pi)/9)))
+Bz-Az : 60*sqrt((1-(sin(((2*pi)/9))^2)))
 inclination_with_VP : 0
 inclination_with_HP : (2*pi)/9
 front_view_length : 60
-top_view_length : 60*abs(cos(((2*pi)/9)))
+top_view_length : sqrt((3600-(3600*(sin(((2*pi)/9))^2))))
 line_length : 60
+
+Ax : 20
+Ay : 25
+Az : 0
+Bx : 20+(60/(3^-(-1/2)))
+By : 25
+Bz : 60
+Bx-Ax : 60/(3^-(-1/2))
+By-Ay : 0
+Bz-Az : 60
+inclination_with_VP : pi/6
+inclination_with_HP : 0
+front_view_length : 60
+top_view_length : sqrt(4800)
+line_length : 120/(3^-(-1/2))
+
+Ax : 15
+Ay : 25
+Az : 0
+Bx : 15+(50/(3^-(-1/2)))
+By : 25
+Bz : 50
+Bx-Ax : 50/(3^-(-1/2))
+By-Ay : 0
+Bz-Az : 50
+inclination_with_VP : pi/6
+inclination_with_HP : 0
+front_view_length : 50
+top_view_length : 100/(3^-(-1/2))
+line_length : 100/(3^-(-1/2))
+
+Ax : 0
+Ay : -25
+Az : 0
+Bx : 5*sqrt(104)
+By : -25
+Bz : 55
+Bx-Ax : 5*sqrt(104)
+By-Ay : 0
+Bz-Az : 55
+inclination_with_VP : arcsin((sqrt(104)/15))
+inclination_with_HP : 0
+front_view_length : 55
+top_view_length : 75
+line_length : 75
+
+Ax : 25
+Ay : 50
+Az : 0
+Bx : -30
+By : 50
+Bz : 5*sqrt(135)
+Bx-Ax : -55
+By-Ay : 0
+Bz-Az : 5*sqrt(135)
+inclination_with_VP : arcsin((-11/16))
+inclination_with_HP : 0
+front_view_length : sqrt(3375)
+top_view_length : 80
+line_length : 80
 ```
 
 ### Questions solved using god() function

{mathai-2.2.3 → mathai-2.2.5}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 from pathlib import Path
 setup(
     name="mathai",
-    version="2.2.3",
+    version="2.2.5",
     description="Mathematics solving Ai tailored to NCERT",
     long_description=Path("README.md").read_text(encoding="utf-8"),
     long_description_content_type="text/markdown",