GroupsMath 0.7.1__tar.gz → 0.7.2__tar.gz

{groupsmath-0.7.1 → groupsmath-0.7.2}/GroupsMath.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GroupsMath
-Version: 0.7.1
+Version: 0.7.2
 Summary: The educational Python library for Group Theory
 Author-email: Mario Sultan Romero <mariosultan.uem@gmail.com>
 License: PolyForm Strict License 1.0.0.
@@ -20,13 +20,13 @@ Requires-Dist: matplotlib>=3.0.0
 Requires-Dist: numpy>=1.20.0
 Dynamic: license-file
 
-# GroupsMath – v0.7.1 – release candidate for v1.0.0
+# GroupsMath – v0.7.2 – release candidate for v1.0.0
 
 [![PyPI Downloads](https://img.shields.io/pypi/dm/groupsmath)](https://pypistats.org/packages/groupsmath)
 [![PyPI Version](https://img.shields.io/pypi/v/groupsmath?color=2A646E)](https://pypi.org/project/groupsmath/)
 [![Python Versions](https://img.shields.io/pypi/pyversions/groupsmath?color=2A646E)](https://pypi.org/project/groupsmath/)
 ![Last Commit](https://img.shields.io/github/last-commit/MarioSultan/groupsmath?color=2A646E)
-![coverage](https://img.shields.io/badge/road%20to%20v1.0.0-95%25-yellowgreen?color=2A646E)
+![coverage](https://img.shields.io/badge/road%20to%20v1.0.0-97%25-yellowgreen?color=2A646E)
 <!-- ![GitHub Stars](https://img.shields.io/github/stars/MarioSultan/groupsmath?style=social) -->
 
 
@@ -39,18 +39,18 @@ The project aims to provide a **simple** and **intuitive** interface for working
 
 ![Examples](https://raw.githubusercontent.com/MarioSultan/GroupsMath/main/imgs/examples.png)
 
-[![Launch Binder](https://raw.githubusercontent.com/MarioSultan/GroupsMath/main/imgs/here.png)](https://mybinder.org/v2/gh/MarioSultan/GroupsMath/main?labpath=GroupsMath_demo.ipynb)
-
 > Visit here the [GroupsMath official documentation](https://groupsmath.readthedocs.io/en/latest/).
 
-> **⚠️ Notice:** Version v1.0.0 is nearing its official release.
 
+---
+
+[![Launch Binder](https://raw.githubusercontent.com/MarioSultan/GroupsMath/main/imgs/here.png)](https://mybinder.org/v2/gh/MarioSultan/GroupsMath/main?labpath=GroupsMath_demo.ipynb)
 
 ---
 
 ## Installation
 
-GroupsMath is currently distributed through [PyPI](https://pypi.org/project/GroupsMath/) and [Github](https://github.com/MarioSultan/GroupsMath). To install the latest released version from PyPI, run:
+GroupsMath is currently distributed through [PyPI](https://pypi.org/project/GroupsMath/) and [Github](https://github.com/MarioSultan/GroupsMath). To install the latest released version from PyPI, run the following in your preferred terminal (VS code, Jupyter, ...).
 
 ```bash
 pip install groupsmath
@@ -129,6 +129,7 @@ GroupsMath is designed to provide tools for working with finite (and infinite) g
 * Quotient groups $Q=G/H$.
 * Conmutator and derived subgroups $G'$.
 * Abelianization $G/G'$
+* Hasse diagrams. (*experimental feature*)
 
 **AUTOMORPHISMS:**
 * Class `Automorphism` and automorphism functions.

{groupsmath-0.7.1 → groupsmath-0.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GroupsMath
-Version: 0.7.1
+Version: 0.7.2
 Summary: The educational Python library for Group Theory
 Author-email: Mario Sultan Romero <mariosultan.uem@gmail.com>
 License: PolyForm Strict License 1.0.0.
@@ -20,13 +20,13 @@ Requires-Dist: matplotlib>=3.0.0
 Requires-Dist: numpy>=1.20.0
 Dynamic: license-file
 
-# GroupsMath – v0.7.1 – release candidate for v1.0.0
+# GroupsMath – v0.7.2 – release candidate for v1.0.0
 
 [![PyPI Downloads](https://img.shields.io/pypi/dm/groupsmath)](https://pypistats.org/packages/groupsmath)
 [![PyPI Version](https://img.shields.io/pypi/v/groupsmath?color=2A646E)](https://pypi.org/project/groupsmath/)
 [![Python Versions](https://img.shields.io/pypi/pyversions/groupsmath?color=2A646E)](https://pypi.org/project/groupsmath/)
 ![Last Commit](https://img.shields.io/github/last-commit/MarioSultan/groupsmath?color=2A646E)
-![coverage](https://img.shields.io/badge/road%20to%20v1.0.0-95%25-yellowgreen?color=2A646E)
+![coverage](https://img.shields.io/badge/road%20to%20v1.0.0-97%25-yellowgreen?color=2A646E)
 <!-- ![GitHub Stars](https://img.shields.io/github/stars/MarioSultan/groupsmath?style=social) -->
 
 
@@ -39,18 +39,18 @@ The project aims to provide a **simple** and **intuitive** interface for working
 
 ![Examples](https://raw.githubusercontent.com/MarioSultan/GroupsMath/main/imgs/examples.png)
 
-[![Launch Binder](https://raw.githubusercontent.com/MarioSultan/GroupsMath/main/imgs/here.png)](https://mybinder.org/v2/gh/MarioSultan/GroupsMath/main?labpath=GroupsMath_demo.ipynb)
-
 > Visit here the [GroupsMath official documentation](https://groupsmath.readthedocs.io/en/latest/).
 
-> **⚠️ Notice:** Version v1.0.0 is nearing its official release.
 
+---
+
+[![Launch Binder](https://raw.githubusercontent.com/MarioSultan/GroupsMath/main/imgs/here.png)](https://mybinder.org/v2/gh/MarioSultan/GroupsMath/main?labpath=GroupsMath_demo.ipynb)
 
 ---
 
 ## Installation
 
-GroupsMath is currently distributed through [PyPI](https://pypi.org/project/GroupsMath/) and [Github](https://github.com/MarioSultan/GroupsMath). To install the latest released version from PyPI, run:
+GroupsMath is currently distributed through [PyPI](https://pypi.org/project/GroupsMath/) and [Github](https://github.com/MarioSultan/GroupsMath). To install the latest released version from PyPI, run the following in your preferred terminal (VS code, Jupyter, ...).
 
 ```bash
 pip install groupsmath
@@ -129,6 +129,7 @@ GroupsMath is designed to provide tools for working with finite (and infinite) g
 * Quotient groups $Q=G/H$.
 * Conmutator and derived subgroups $G'$.
 * Abelianization $G/G'$
+* Hasse diagrams. (*experimental feature*)
 
 **AUTOMORPHISMS:**
 * Class `Automorphism` and automorphism functions.

{groupsmath-0.7.1 → groupsmath-0.7.2}/README.md

@@ -1,10 +1,10 @@
-# GroupsMath – v0.7.1 – release candidate for v1.0.0
+# GroupsMath – v0.7.2 – release candidate for v1.0.0
 
 [![PyPI Downloads](https://img.shields.io/pypi/dm/groupsmath)](https://pypistats.org/packages/groupsmath)
 [![PyPI Version](https://img.shields.io/pypi/v/groupsmath?color=2A646E)](https://pypi.org/project/groupsmath/)
 [![Python Versions](https://img.shields.io/pypi/pyversions/groupsmath?color=2A646E)](https://pypi.org/project/groupsmath/)
 ![Last Commit](https://img.shields.io/github/last-commit/MarioSultan/groupsmath?color=2A646E)
-![coverage](https://img.shields.io/badge/road%20to%20v1.0.0-95%25-yellowgreen?color=2A646E)
+![coverage](https://img.shields.io/badge/road%20to%20v1.0.0-97%25-yellowgreen?color=2A646E)
 <!-- ![GitHub Stars](https://img.shields.io/github/stars/MarioSultan/groupsmath?style=social) -->
 
 
@@ -17,18 +17,18 @@ The project aims to provide a **simple** and **intuitive** interface for working
 
 ![Examples](https://raw.githubusercontent.com/MarioSultan/GroupsMath/main/imgs/examples.png)
 
-[![Launch Binder](https://raw.githubusercontent.com/MarioSultan/GroupsMath/main/imgs/here.png)](https://mybinder.org/v2/gh/MarioSultan/GroupsMath/main?labpath=GroupsMath_demo.ipynb)
-
 > Visit here the [GroupsMath official documentation](https://groupsmath.readthedocs.io/en/latest/).
 
-> **⚠️ Notice:** Version v1.0.0 is nearing its official release.
 
+---
+
+[![Launch Binder](https://raw.githubusercontent.com/MarioSultan/GroupsMath/main/imgs/here.png)](https://mybinder.org/v2/gh/MarioSultan/GroupsMath/main?labpath=GroupsMath_demo.ipynb)
 
 ---
 
 ## Installation
 
-GroupsMath is currently distributed through [PyPI](https://pypi.org/project/GroupsMath/) and [Github](https://github.com/MarioSultan/GroupsMath). To install the latest released version from PyPI, run:
+GroupsMath is currently distributed through [PyPI](https://pypi.org/project/GroupsMath/) and [Github](https://github.com/MarioSultan/GroupsMath). To install the latest released version from PyPI, run the following in your preferred terminal (VS code, Jupyter, ...).
 
 ```bash
 pip install groupsmath
@@ -107,6 +107,7 @@ GroupsMath is designed to provide tools for working with finite (and infinite) g
 * Quotient groups $Q=G/H$.
 * Conmutator and derived subgroups $G'$.
 * Abelianization $G/G'$
+* Hasse diagrams. (*experimental feature*)
 
 **AUTOMORPHISMS:**
 * Class `Automorphism` and automorphism functions.

{groupsmath-0.7.1 → groupsmath-0.7.2}/groupsmath/core.py

@@ -21,7 +21,7 @@ from    math                import  gcd
 
 #################### DEFINITIONS ####################
 
-__version__ = "0.7.1"
+__version__ = "0.7.2"
 __errorcolor__ = "\033[31m"
 
 tgl_color = "#2A646E"
@@ -30,6 +30,8 @@ tgl = mcolors.LinearSegmentedColormap.from_list("tgl", ["white", tgl_color])
 rainbow = mcolors.LinearSegmentedColormap.from_list("rainbow", ["#FF0000","#FF9100","#F2DA00","#2CDB00","#00DAE9","#1869FF"])#,"#7648FF","#D12BFF"])
 rainbow8 = mcolors.LinearSegmentedColormap.from_list("rainbow8", ["#FF0000","#FF9100","#F2DA00","#2CDB00","#00DAE9","#1869FF","#7648FF","#FF1FF4"])
 
+standard = ["#FF0000", "#1869FF", "#2CDB00", "#F2DA00", "#7648FF", "#FF9100", "#00DAE9", "#FF1FF4", "#000000", "#888888"]
+
 def groupsmath_info():
     print("———————————————————————————————————————————————————————————————————————————")
     print("                                                                           ")
@@ -45,7 +47,7 @@ def groupsmath_info():
     print("· GitHub \033[36mhttps://github.com/MarioSultan/GroupsMath \033[0m                        ")
     print("                                                                           ")
     print("The documentation of this library is in the following link:                ")
-    print("· Documentation \033[36mhttps://github.com/MarioSultan/GroupsMath/tree/main/docs \033[0m  ")
+    print("· Documentation \033[36mhttps://groupsmath.readthedocs.io/en/latest/ \033[0m  ")
     print("                                                                           ")
     print("———————————————————————————————————————————————————————————————————————————")
 
@@ -184,6 +186,9 @@ class ExplicitGroup(Group):
     def cayley_table(self, title="", colormap=rainbow, names=None, math_mode=True):
         return self.toCayleyGroup().cayley_table(title=title, colormap=colormap, names=names, math_mode=math_mode)
 
+    def cayley_graph(self, generators=None, title="", colormap=standard, names=None, edgenames=None, math_mode=True, node_size=1000):
+        return self.toCayleyGroup.cayley_graph(generators=generators, title=title, colormap=colormap, names=names, edgenames=edgenames, math_mode=math_mode, node_size=node_size)
+
     #–> SUBGROUPS 
 
     def proper_subgroups(self):
@@ -561,6 +566,62 @@ class CayleyGroup(Group):
     def delete_names(self):
         self.elements = [i for i in range(len(self.elements))]
 
+    def cayley_graph(self, generators=None, title="", colormap=standard, names=None, edgenames=None, math_mode=True, node_size=1000):
+
+        import networkx as nx
+
+        if generators==None:
+            generators = self.generators()
+        else:
+            if not self.generates(generators):
+                raise ValueError(__errorcolor__+"The set provided does not generate the group.")
+
+        if names==None:
+            if len(self)<=20:
+                names=True
+            else:
+                names=False
+
+        if edgenames==None:
+            if len(self)<=20:
+                edgenames=True
+            else:
+                edgenames=False       
+
+        gr = nx.DiGraph()
+
+        if math_mode:
+            for i in self.elements:
+                gr.add_node("$"+str(i)+"$")
+            for i in self.elements:
+                for j in range(len(generators)):
+                    gr.add_edge("$"+str(i)+"$","$"+str(self.operation(i,generators[j]))+"$",label=generators[j], color=colormap[j])
+        else:
+            for i in self.elements:
+                gr.add_node(str(i))
+            for i in self.elements:
+                for j in range(len(generators)):
+                    gr.add_edge(str(i),str(self.operation(i,generators[j])),label=generators[j], color=colormap[j])
+
+
+        colors = [gr.edges[u, v]["color"]for u, v in gr.edges]
+
+        if edgenames:
+            edge_labels = nx.get_edge_attributes(gr, "label")
+        else:
+            edge_labels = []
+
+        pos = nx.spring_layout(gr)
+        
+        if names:
+            nx.draw(gr,pos,with_labels=True, node_color="white", edgecolors="black", edge_color=colors, width=3, node_size=node_size)
+            nx.draw_networkx_edge_labels(gr, pos, edge_labels=edge_labels)
+        else:
+            nx.draw(gr,pos,with_labels=False, node_color="black", edge_color=colors, width=3, node_size=250)
+
+        plt.title(title)
+        plt.show()
+
     #–> SUBGROUPS 
 
     def proper_subgroups(self):
@@ -706,6 +767,128 @@ class CayleyGroup(Group):
     def is_solvable(self):
         return len(self.derived_series()[-1]) == 1
 
+    def hasse_diagram(self):
+
+        import networkx as nx
+        from groupsmath.structure import structure_description
+
+        S = self.subgroups()
+        N = []      # name
+        R = []      # ratio
+        for i in S:
+            N.append(structure_description(i.subgroup))
+            R.append(int(len(self)/len(i)))
+
+        o = []
+        i = 0
+        while i<len(R):
+            if R[i] not in o:
+                o.append(R[i])
+            i+=1
+
+        O = {o[i]:i for i in range(len(o))}
+
+        H = []
+        for i in range(len(o)):
+            H.append([])
+
+        for i in range(len(S)):
+            H[O[R[i]]].append(S[i])
+
+        #print(f"N = {N}",f"R = {R}",f"o = {o}",f"O = {O}",f"H = {H}",sep="\n")
+
+        ########## Nodos y aristas ##########
+
+        gr = nx.DiGraph()
+
+        for i in range(len(S)):
+            gr.add_node(i,label=structure_description(S[i].subgroup))
+
+        for i in range(len(S)):
+            for j in range(i,len(S)):
+                if S[i]._is_covered(S[j]):
+                    gr.add_edge(i,j)
+
+            ########## Posiciones ##########
+
+        pos = {}
+
+        dx = 2
+        dy = 2
+        min_distance = dx
+
+        # 1. Posiciones iniciales, distribuidas uniformemente
+        for level, subgroups in enumerate(H):
+
+            n = len(subgroups)
+            offset = -(n - 1) * dx / 2
+
+            for k, subgroup in enumerate(subgroups):
+
+                node = S.index(subgroup)
+
+                pos[node] = (
+                    offset + k * dx,
+                    level * dy
+                )
+
+
+        # 2. Ajustar cada nodo según sus predecesores
+        for level in range(1, len(H)):
+
+            for subgroup in H[level]:
+
+                node = S.index(subgroup)
+
+                predecessors = list(gr.predecessors(node))
+
+                if not predecessors:
+                    continue
+
+                # Posición ideal: media de los predecesores
+                ideal_x = np.mean([
+                    pos[p][0]
+                    for p in predecessors
+                ])
+
+                y = level * dy
+
+                # --------------------------------------------------
+                # Buscar una posición libre alrededor de ideal_x
+                # --------------------------------------------------
+
+                x = ideal_x
+
+                occupied = [
+                    p[0]
+                    for n, p in pos.items()
+                    if p[1] == y
+                ]
+
+                # Si está demasiado cerca de otro nodo,
+                # desplazamos alternativamente izquierda/derecha.
+                k = 0
+
+                while any(abs(x - ox) < min_distance for ox in occupied):
+
+                    k += 1
+
+                    if k % 2 == 1:
+                        x = ideal_x + ((k + 1) // 2) * dx
+                    else:
+                        x = ideal_x - (k // 2) * dx
+
+                pos[node] = (x, y)
+
+        labels = nx.get_node_attributes(gr, "label")
+        nx.draw(gr, pos, with_labels=True, labels=labels, node_shape="s", node_color="white", edgecolors="black", node_size=1000, arrows=False)
+        #nx.draw_networkx_edges(gr,pos,arrows=False)
+        plt.show()
+
+
+
+
+
     #–> AUTOMORPHISMS 
 
     def is_automorphism(self, phi):
@@ -1063,6 +1246,29 @@ class CayleySubgroup(CayleyGroup, Subgroup):
     def __lt__(self, group):
         return group==self.group and self.subgroup.order()<self.group.order()
 
+    def _isin(self, subgroup):
+        if not isinstance(subgroup, CayleySubgroup):
+            return False
+
+        return set(self._indices).issubset(set(subgroup._indices))
+
+    def _is_covered(self, other):
+        if not self._isin(other):
+            return False
+
+        if set(self._indices) == set(other._indices):
+            return False
+
+        for intermediate in other.group.subgroups():
+            # Comprobamos que no sea idéntico en contenido a self ni a other
+            if set(intermediate._indices) == set(self._indices) or set(intermediate._indices) == set(other._indices):
+                continue
+                
+            if self._isin(intermediate) and intermediate._isin(other):
+                return False
+
+        return True
+
     #–> QUOTIENTS 
 
     def coset(self, element, side="left", return_names=True):
@@ -1187,6 +1393,9 @@ class Element:
         inv = self.group.inverse(self.element)
         return Element(inv, self.group)
 
+    def order(self):
+        return self.group.element_orders()[self.index]
+
 class Automorphism:
 
     def __init__(self,phi:tuple,group:CayleyGroup):

{groupsmath-0.7.1 → groupsmath-0.7.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "GroupsMath"            # Nombre en PyPI 
-version = "0.7.1"
+version = "0.7.2"
 description = "The educational Python library for Group Theory"
 readme = "README.md"                  # Esta será la documentación visible en la portada de PyPI
 requires-python = ">=3.8"