mathai 2.1.8__tar.gz → 2.2.0__tar.gz

{mathai-2.1.8 → mathai-2.2.0}/PKG-INFO

@@ -1,11 +1,12 @@
 Metadata-Version: 2.4
 Name: mathai
-Version: 2.1.8
+Version: 2.2.0
 Summary: Mathematics solving Ai tailored to NCERT
 Home-page: https://github.com/infinity390/mathai
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 Requires-Dist: more_itertools
+Requires-Dist: schemdraw
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
@@ -424,8 +425,8 @@ from mathai import *
 load_formula_from_file()
 wire_1 = Edge((0,1))
 ohm_10 = Edge((1,2), "resistor", TreeNode("d_10"))
-ohm_5 = Edge((1,3), "resistor", TreeNode("d_5"))
-ohm_6 = Edge((1,4), "resistor", TreeNode("d_6"))
+ohm_5 = Edge((2,3), "resistor", TreeNode("d_5"))
+ohm_6 = Edge((2,4), "resistor", TreeNode("d_6"))
 ohm_7 = Edge((4,5), "resistor", TreeNode("d_7"))
 ohm_8 = Edge((4,6), "resistor", TreeNode("d_8"))
 ohm_20 = Edge((6,7), "resistor", TreeNode("d_20"))
@@ -435,6 +436,7 @@ wire_4 = Edge((3,8))
 edge_list = [wire_1, wire_2, wire_3, wire_4, ohm_5, ohm_6, ohm_7, ohm_8, ohm_10, ohm_20]
 graph = CircuitGraph(9,edge_list,{})
 print(compute(find_resistance(graph, 0,8)))
+draw_circuit(graph)
 
 wire_1 = Edge((0,1))
 ohm_5 = Edge((1,2), "resistor", TreeNode("d_5"))
@@ -451,6 +453,7 @@ wire_4 = Edge((4,9))
 edge_list = [wire_1, wire_2, wire_3, wire_4, ohm_5, ohm_6, ohm_7, ohm_8, ohm_8_2, ohm_10, ohm_11, ohm_20]
 graph = CircuitGraph(10,edge_list,{})
 print(compute(find_resistance(graph, 0, 9)))
+draw_circuit(graph)
 ```
 
 #### Output
@@ -459,7 +462,7 @@ print(compute(find_resistance(graph, 0, 9)))
 loading formulas from file...
 done
 
-3.493975903614458
+13.493975903614459
 8.66474543707973
 ```
 

{mathai-2.1.8 → mathai-2.2.0}/README.md

@@ -409,8 +409,8 @@ from mathai import *
 load_formula_from_file()
 wire_1 = Edge((0,1))
 ohm_10 = Edge((1,2), "resistor", TreeNode("d_10"))
-ohm_5 = Edge((1,3), "resistor", TreeNode("d_5"))
-ohm_6 = Edge((1,4), "resistor", TreeNode("d_6"))
+ohm_5 = Edge((2,3), "resistor", TreeNode("d_5"))
+ohm_6 = Edge((2,4), "resistor", TreeNode("d_6"))
 ohm_7 = Edge((4,5), "resistor", TreeNode("d_7"))
 ohm_8 = Edge((4,6), "resistor", TreeNode("d_8"))
 ohm_20 = Edge((6,7), "resistor", TreeNode("d_20"))
@@ -420,6 +420,7 @@ wire_4 = Edge((3,8))
 edge_list = [wire_1, wire_2, wire_3, wire_4, ohm_5, ohm_6, ohm_7, ohm_8, ohm_10, ohm_20]
 graph = CircuitGraph(9,edge_list,{})
 print(compute(find_resistance(graph, 0,8)))
+draw_circuit(graph)
 
 wire_1 = Edge((0,1))
 ohm_5 = Edge((1,2), "resistor", TreeNode("d_5"))
@@ -436,6 +437,7 @@ wire_4 = Edge((4,9))
 edge_list = [wire_1, wire_2, wire_3, wire_4, ohm_5, ohm_6, ohm_7, ohm_8, ohm_8_2, ohm_10, ohm_11, ohm_20]
 graph = CircuitGraph(10,edge_list,{})
 print(compute(find_resistance(graph, 0, 9)))
+draw_circuit(graph)
 ```
 
 #### Output
@@ -444,7 +446,7 @@ print(compute(find_resistance(graph, 0, 9)))
 loading formulas from file...
 done
 
-3.493975903614458
+13.493975903614459
 8.66474543707973
 ```
 

{mathai-2.1.8 → mathai-2.2.0}/mathai/__init__.py

@@ -7,7 +7,7 @@ from .qm import hydrogen_gse, helium_gse, power_rule
 
 from .lambda_calculus import lambda_expand, lambda_compress, lambda_reduce
 
-from .electronic import Edge, CircuitGraph, find_resistance
+from .electronic import Edge, CircuitGraph, find_resistance, draw_circuit
 
 from .linear import linear_solve
 

{mathai-2.1.8 → mathai-2.2.0}/mathai/electronic.py

@@ -1,3 +1,5 @@
+import schemdraw
+import schemdraw.elements as elm
 import copy
 from .base import *
 from .simplify import simplify
@@ -218,3 +220,196 @@ def find_resistance(circuit, start, end):
     if current == TreeNode("d_0"):
         return None
     return simplify(TreeNode("d_1") / current)
+def draw_circuit(graph):
+    size = 80
+    margin = 35
+    spacing = 6
+    positions = []
+    n = graph.node_count
+    side_counts = [n // 4] * 4
+    for i in range(n % 4):
+        side_counts[i] += 1
+    top, right, bottom, left = side_counts
+    for i in range(top):
+        positions.append((margin, margin + i * spacing))
+    for i in range(right):
+        positions.append(
+            (margin + i * spacing, size - margin - 1)
+        )
+    for i in range(bottom):
+        positions.append(
+            (size - margin - 1, size - margin - 1 - i * spacing)
+        )
+    for i in range(left):
+        positions.append(
+            (size - margin - 1 - i * spacing, margin)
+        )
+    if len(positions) != n:
+        print("No circuit layout found.")
+        return
+    edges = []
+    for edge in graph.edge_list:
+        if not edge.edge:
+            continue
+        u, v = edge.edge
+        if u == v:
+            continue
+        edges.append((u, v))
+    def orientation(a, b, c):
+        value = (
+            (b[1] - a[1]) * (c[0] - b[0])
+            - (b[0] - a[0]) * (c[1] - b[1])
+        )
+        if value == 0:
+            return 0
+        return 1 if value > 0 else 2
+    def on_segment(a, b, c):
+        return (
+            min(a[0], c[0]) <= b[0] <= max(a[0], c[0])
+            and
+            min(a[1], c[1]) <= b[1] <= max(a[1], c[1])
+        )
+    def intersects(a, b, c, d):
+        o1 = orientation(a, b, c)
+        o2 = orientation(a, b, d)
+        o3 = orientation(c, d, a)
+        o4 = orientation(c, d, b)
+        if o1 != o2 and o3 != o4:
+            return True
+        if o1 == 0 and on_segment(a, c, b):
+            return True
+        if o2 == 0 and on_segment(a, d, b):
+            return True
+        if o3 == 0 and on_segment(c, a, d):
+            return True
+        if o4 == 0 and on_segment(c, b, d):
+            return True
+        return False
+    def edge_intersects_node(a, b, node):
+        if node == a or node == b:
+            return False
+        x1, y1 = a
+        x2, y2 = b
+        x, y = node
+        cross = (
+            (x - x1) * (y2 - y1)
+            - (y - y1) * (x2 - x1)
+        )
+        if cross != 0:
+            return False
+        return (
+            min(x1, x2) <= x <= max(x1, x2)
+            and
+            min(y1, y2) <= y <= max(y1, y2)
+        )
+    def valid_edge(a, b, drawn_edges, node_positions):
+        for node in node_positions.values():
+            if edge_intersects_node(a, b, node):
+                return False
+        for c, d in drawn_edges:
+            if (
+                a == c or
+                a == d or
+                b == c or
+                b == d
+            ):
+                continue
+            if intersects(a, b, c, d):
+                return False
+        return True
+    node_order = list(range(n))
+    def try_permutation(order):
+        node_positions = {
+            node: positions[i]
+            for i, node in enumerate(order)
+        }
+        drawn_edges = []
+        ordered_edges = sorted(
+            edges,
+            key=lambda edge: (
+                abs(
+                    node_positions[edge[0]][0]
+                    - node_positions[edge[1]][0]
+                )
+                +
+                abs(
+                    node_positions[edge[0]][1]
+                    - node_positions[edge[1]][1]
+                )
+            ),
+            reverse=True
+        )
+        for u, v in ordered_edges:
+            a = node_positions[u]
+            b = node_positions[v]
+            if not valid_edge(
+                a,
+                b,
+                drawn_edges,
+                node_positions
+            ):
+                return None
+            drawn_edges.append((a, b))
+        return node_positions, drawn_edges
+    def permutations(items):
+        if len(items) <= 1:
+            yield items
+            return
+        for i in range(len(items)):
+            first = items[i]
+            rest = items[:i] + items[i + 1:]
+            for result in permutations(rest):
+                yield [first] + result
+    result = None
+    for order in permutations(node_order):
+        result = try_permutation(order)
+        if result is not None:
+            break
+    if result is None:
+        print("No circuit layout found.")
+        return
+    node_positions, drawn_edges = result
+    d = schemdraw.Drawing()
+    for edge in graph.edge_list:
+        if not edge.edge:
+            continue
+        u, v = edge.edge
+        if u == v:
+            continue
+        start = node_positions[u]
+        end = node_positions[v]
+        if edge.edge_type == "resistor":
+            element = (
+                elm.Resistor()
+                .at(start)
+                .to(end)
+            )
+            if edge.value is not None:
+                element.label(str(edge.value))
+        elif edge.edge_type == "cell":
+            element = (
+                elm.Cell()
+                .at(start)
+                .to(end)
+            )
+        else:
+            element = (
+                elm.Line()
+                .at(start)
+                .to(end)
+            )
+        d.add(element)
+    for node, position in node_positions.items():
+        d.add(
+            elm.Dot()
+            .at(position)
+            .label(chr(ord("A") + node))
+        )
+    d.draw()
+    d.save("circuit.png")
+    try:
+        from IPython.display import Image, display
+        display(Image("circuit.png"))
+    except:
+        pass
+    return node_positions

{mathai-2.1.8 → mathai-2.2.0}/mathai.egg-info/PKG-INFO

@@ -1,11 +1,12 @@
 Metadata-Version: 2.4
 Name: mathai
-Version: 2.1.8
+Version: 2.2.0
 Summary: Mathematics solving Ai tailored to NCERT
 Home-page: https://github.com/infinity390/mathai
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 Requires-Dist: more_itertools
+Requires-Dist: schemdraw
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
@@ -424,8 +425,8 @@ from mathai import *
 load_formula_from_file()
 wire_1 = Edge((0,1))
 ohm_10 = Edge((1,2), "resistor", TreeNode("d_10"))
-ohm_5 = Edge((1,3), "resistor", TreeNode("d_5"))
-ohm_6 = Edge((1,4), "resistor", TreeNode("d_6"))
+ohm_5 = Edge((2,3), "resistor", TreeNode("d_5"))
+ohm_6 = Edge((2,4), "resistor", TreeNode("d_6"))
 ohm_7 = Edge((4,5), "resistor", TreeNode("d_7"))
 ohm_8 = Edge((4,6), "resistor", TreeNode("d_8"))
 ohm_20 = Edge((6,7), "resistor", TreeNode("d_20"))
@@ -435,6 +436,7 @@ wire_4 = Edge((3,8))
 edge_list = [wire_1, wire_2, wire_3, wire_4, ohm_5, ohm_6, ohm_7, ohm_8, ohm_10, ohm_20]
 graph = CircuitGraph(9,edge_list,{})
 print(compute(find_resistance(graph, 0,8)))
+draw_circuit(graph)
 
 wire_1 = Edge((0,1))
 ohm_5 = Edge((1,2), "resistor", TreeNode("d_5"))
@@ -451,6 +453,7 @@ wire_4 = Edge((4,9))
 edge_list = [wire_1, wire_2, wire_3, wire_4, ohm_5, ohm_6, ohm_7, ohm_8, ohm_8_2, ohm_10, ohm_11, ohm_20]
 graph = CircuitGraph(10,edge_list,{})
 print(compute(find_resistance(graph, 0, 9)))
+draw_circuit(graph)
 ```
 
 #### Output
@@ -459,7 +462,7 @@ print(compute(find_resistance(graph, 0, 9)))
 loading formulas from file...
 done
 
-3.493975903614458
+13.493975903614459
 8.66474543707973
 ```
 

{mathai-2.1.8 → mathai-2.2.0}/mathai.egg-info/requires.txt

@@ -1 +1,2 @@
 more_itertools
+schemdraw

{mathai-2.1.8 → mathai-2.2.0}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 from pathlib import Path
 setup(
     name="mathai",
-    version="2.1.8",
+    version="2.2.0",
     description="Mathematics solving Ai tailored to NCERT",
     long_description=Path("README.md").read_text(encoding="utf-8"),
     long_description_content_type="text/markdown",
@@ -13,6 +13,7 @@ setup(
     },
     python_requires=">=3.7",
     install_requires=[
-        "more_itertools"
+        "more_itertools",
+	"schemdraw"
     ],
 )