mathai 2.2.2__tar.gz → 2.2.3__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mathai
-Version: 2.2.2
+Version: 2.2.3
 Summary: Mathematics solving Ai tailored to NCERT
 Home-page: https://github.com/infinity390/mathai
 Requires-Python: >=3.7
@@ -453,14 +453,27 @@ done
 #### Example Demonstration 11 (engineering graphics)
 ```python
 from mathai import *
-s = "0 -25 0 None None None None None None 0 None 55 75"
-s = [None if item == "None" else parse(item) for item in s.split(" ")]
-print(solve_graphics(*s))
+# (z,y) is dash, a'b' is front view
+# (z,-x) is no dash, ab is top view
+solve_graphics_string("30 20 0 None None None None None None 0 40*pi/180 None None 60")
 ```
 
 #### Output
 ```
-{'v_0': 0, 'v_1': -25, 'v_2': 0, 'v_9': 0, 'v_11': 55, 'v_12': 75, 'v_7': sqrt(2600), 'v_10': arcsin((sqrt(2600)/75)), 'v_8': 75*sqrt((1-((sqrt(2600)/75)^2))), 'v_6': 0, 'v_3': 0, 'v_4': -25+sqrt(2600), 'v_5': 75*sqrt((1-((sqrt(2600)/75)^2)))}
+Ax : 30
+Ay : 20
+Az : 0
+Bx : 30
+By : 20+(60*sin(((2*pi)/9)))
+Bz : 60*abs(cos(((2*pi)/9)))
+Bx-Ax : 0
+By-Ay : 60*sin(((2*pi)/9))
+Bz-Az : 60*abs(cos(((2*pi)/9)))
+inclination_with_VP : 0
+inclination_with_HP : (2*pi)/9
+front_view_length : 60
+top_view_length : 60*abs(cos(((2*pi)/9)))
+line_length : 60
 ```
 
 ### Questions solved using god() function

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

@@ -437,14 +437,27 @@ done
 #### Example Demonstration 11 (engineering graphics)
 ```python
 from mathai import *
-s = "0 -25 0 None None None None None None 0 None 55 75"
-s = [None if item == "None" else parse(item) for item in s.split(" ")]
-print(solve_graphics(*s))
+# (z,y) is dash, a'b' is front view
+# (z,-x) is no dash, ab is top view
+solve_graphics_string("30 20 0 None None None None None None 0 40*pi/180 None None 60")
 ```
 
 #### Output
 ```
-{'v_0': 0, 'v_1': -25, 'v_2': 0, 'v_9': 0, 'v_11': 55, 'v_12': 75, 'v_7': sqrt(2600), 'v_10': arcsin((sqrt(2600)/75)), 'v_8': 75*sqrt((1-((sqrt(2600)/75)^2))), 'v_6': 0, 'v_3': 0, 'v_4': -25+sqrt(2600), 'v_5': 75*sqrt((1-((sqrt(2600)/75)^2)))}
+Ax : 30
+Ay : 20
+Az : 0
+Bx : 30
+By : 20+(60*sin(((2*pi)/9)))
+Bz : 60*abs(cos(((2*pi)/9)))
+Bx-Ax : 0
+By-Ay : 60*sin(((2*pi)/9))
+Bz-Az : 60*abs(cos(((2*pi)/9)))
+inclination_with_VP : 0
+inclination_with_HP : (2*pi)/9
+front_view_length : 60
+top_view_length : 60*abs(cos(((2*pi)/9)))
+line_length : 60
 ```
 
 ### Questions solved using god() function

{mathai-2.2.2 → mathai-2.2.3}/mathai/__init__.py

@@ -15,7 +15,7 @@ from .test import test
 
 from .decision import god, trig7
 
-from .graphics import solve_graphics
+from .graphics import solve_graphics, solve_graphics_string
 
 from .expand import expand
 

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

@@ -4,16 +4,21 @@ from .simplify import simplify
 from .trig import trig0
 import itertools
 from .inverse import inverse
-def solve_graphics(Ax, Ay, Az, Bx, By, Bz, BAx, BAy, BAz, phi, theta, fvl, length):
+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_12")])
-    eq5 = TreeNode("f_eq", [TreeNode("v_7"), TreeNode("v_10").fx("sin")*TreeNode("v_12")])
-    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_12")])
-    eq7 = TreeNode("f_eq", [TreeNode("v_7"), (TreeNode("v_12")**2 - TreeNode("v_11")**2).fx("sqrt")])
-    q = operation("f_and", [eq1, eq2, eq3, eq4, eq5, eq6, eq7])
-    lst = [Ax, Ay, Az, Bx, By, Bz, BAx, BAy, BAz, phi, theta, fvl, length]
+    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
@@ -22,6 +27,7 @@ def solve_graphics(Ax, Ay, Az, Bx, By, Bz, BAx, BAy, BAz, phi, theta, fvl, lengt
         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")
     q = simplify(q)
     while done:
         done = False
@@ -29,7 +35,7 @@ def solve_graphics(Ax, Ay, Az, Bx, By, Bz, BAx, BAy, BAz, phi, theta, fvl, lengt
             item = q.children[i]
             for key, item2 in solution.items():
                 item = replace(item, TreeNode(key), item2)
-            item = fraction(trig0(simplify(item)))
+            item = fraction(expand(trig0(simplify(item))))
             q.children[i] = item
             if len(vlist(item)) == 1:
                 solution[vlist(item)[0]] = inverse(
@@ -39,4 +45,11 @@ def solve_graphics(Ax, Ay, Az, Bx, By, Bz, BAx, BAy, BAz, phi, theta, fvl, lengt
                 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
+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)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mathai
-Version: 2.2.2
+Version: 2.2.3
 Summary: Mathematics solving Ai tailored to NCERT
 Home-page: https://github.com/infinity390/mathai
 Requires-Python: >=3.7
@@ -453,14 +453,27 @@ done
 #### Example Demonstration 11 (engineering graphics)
 ```python
 from mathai import *
-s = "0 -25 0 None None None None None None 0 None 55 75"
-s = [None if item == "None" else parse(item) for item in s.split(" ")]
-print(solve_graphics(*s))
+# (z,y) is dash, a'b' is front view
+# (z,-x) is no dash, ab is top view
+solve_graphics_string("30 20 0 None None None None None None 0 40*pi/180 None None 60")
 ```
 
 #### Output
 ```
-{'v_0': 0, 'v_1': -25, 'v_2': 0, 'v_9': 0, 'v_11': 55, 'v_12': 75, 'v_7': sqrt(2600), 'v_10': arcsin((sqrt(2600)/75)), 'v_8': 75*sqrt((1-((sqrt(2600)/75)^2))), 'v_6': 0, 'v_3': 0, 'v_4': -25+sqrt(2600), 'v_5': 75*sqrt((1-((sqrt(2600)/75)^2)))}
+Ax : 30
+Ay : 20
+Az : 0
+Bx : 30
+By : 20+(60*sin(((2*pi)/9)))
+Bz : 60*abs(cos(((2*pi)/9)))
+Bx-Ax : 0
+By-Ay : 60*sin(((2*pi)/9))
+Bz-Az : 60*abs(cos(((2*pi)/9)))
+inclination_with_VP : 0
+inclination_with_HP : (2*pi)/9
+front_view_length : 60
+top_view_length : 60*abs(cos(((2*pi)/9)))
+line_length : 60
 ```
 
 ### Questions solved using god() function

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

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