alonso 0.0.1__py3-none-any.whl → 0.0.2__py3-none-any.whl

alonso/algorithm.py

@@ -5,6 +5,7 @@ import itertools
 from . import utils
 
 import networkx as nx
+import mendive.algorithm as algo
 from . import partition
 from . import stable
 from . import merge
@@ -41,34 +42,52 @@ def find_vertex_cover(graph):
     if working_graph.number_of_nodes() == 0:
         return set()
     
-    # Partition edges into two subsets (E1, E2) using the Burr-Erdős-Lovász (1976) algorithm
-    # This step divides the graph into two claw-free subgraphs
-    # Complexity: O(m * (m * Δ * C + C^2)), where m is edges, Δ is maximum degree, C is number of claws
-    E1, E2 = partition.partition_edges_claw_free(working_graph)
-    
-    # Compute minimum vertex cover for E1 using the Faenza, Oriolo & Stauffer (2011) algorithm
-    # This finds the maximum weighted stable set in the claw-free graph E1, whose complement is the vertex cover
-    # Complexity: O(n^3), where n is the number of nodes in the subgraph induced by E1
-    vertex_cover_1 = stable.minimum_vertex_cover_claw_free(E1)
-    
-    # Compute minimum vertex cover for E2 using the same Faenza, Oriolo & Stauffer (2011) algorithm
-    # Complexity: O(n^3) for the subgraph induced by E2
-    vertex_cover_2 = stable.minimum_vertex_cover_claw_free(E2)
-
-    # Merge the two vertex covers from E1 and E2 to approximate the minimum vertex cover of the original graph
-    approximate_vertex_cover = merge.merge_vertex_covers(E1, E2, vertex_cover_1, vertex_cover_2)
-    
-    # Create a residual graph containing edges not covered by the current vertex cover
-    residual_graph = nx.Graph()
-    for u, v in working_graph.edges():
-        if u not in approximate_vertex_cover and v not in approximate_vertex_cover:
-            residual_graph.add_edge(u, v)  # Add edge if neither endpoint is in the cover
-    
-    # Recursively find vertex cover for the residual graph to handle uncovered edges
-    residual_vertex_cover = find_vertex_cover(residual_graph)
-    
-    # Combine the approximate vertex cover with the residual cover to ensure all edges are covered
-    return approximate_vertex_cover.union(residual_vertex_cover)
+    # Structural analysis: detect presence of claw subgraphs (K_{1,3})
+    # This determines which algorithmic approach to use
+    claw = algo.find_claw_coordinates(working_graph, first_claw=True)
+   
+    if claw is None:
+        # CASE 1: Claw-free graph - use polynomial-time exact algorithm
+        # Apply Faenza-Oriolo-Stauffer algorithm for weighted stable set on claw-free graphs
+        # The maximum weighted stable set's complement gives us the minimum vertex cover
+        E = working_graph.edges()
+        approximate_vertex_cover = stable.minimum_vertex_cover_claw_free(E)
+        
+    else:
+        # CASE 2: Graph contains claws - use divide-and-conquer approach
+        
+        # Step 1: Edge partitioning using enhanced Burr-Erdős-Lovász technique
+        # Partition edges E = E1 ∪ E2 such that both induced subgraphs G[E1] and G[E2] are claw-free
+        # Complexity: O(m * (m * Δ * C + C^2)), where m is edges, Δ is maximum degree, C is number of claws
+        E1, E2 = partition.partition_edges_claw_free(working_graph)
+       
+        # Step 2: Solve subproblems optimally on claw-free partitions
+        # Each partition can be solved exactly using polynomial-time algorithms
+        vertex_cover_1 = stable.minimum_vertex_cover_claw_free(E1)  # O(n^3) for subgraph G[E1]
+        vertex_cover_2 = stable.minimum_vertex_cover_claw_free(E2)  # O(n^3) for subgraph G[E2]
+        
+        # Step 3: Intelligent merging with 1.42-approximation guarantee
+        # Time complexity: O(|V| × log |V|)
+        approximate_vertex_cover = merge.merge_vertex_covers(
+            working_graph, vertex_cover_1, vertex_cover_2
+        )
+       
+        # Step 4: Handle residual uncovered edges through recursion
+        # Construct residual graph containing edges missed by current vertex cover
+        residual_graph = nx.Graph()
+        for u, v in working_graph.edges():
+            # Edge (u,v) is uncovered if neither endpoint is in our current cover
+            if u not in approximate_vertex_cover and v not in approximate_vertex_cover:
+                residual_graph.add_edge(u, v)
+       
+        # Recursive call to handle remaining uncovered structure
+        # This ensures completeness: every edge in the original graph is covered
+        residual_vertex_cover = find_vertex_cover(residual_graph)
+        
+        # Combine solutions: union of main cover and residual cover
+        approximate_vertex_cover = approximate_vertex_cover.union(residual_vertex_cover)
+   
+    return approximate_vertex_cover
 
 def find_vertex_cover_brute_force(graph):
     """

alonso/app.py

@@ -82,7 +82,7 @@ def main():
     helper.add_argument('-c', '--count', action='store_true', help='calculate the size of the vertex cover')
     helper.add_argument('-v', '--verbose', action='store_true', help='anable verbose output')
     helper.add_argument('-l', '--log', action='store_true', help='enable file logging')
-    helper.add_argument('--version', action='version', version='%(prog)s 0.0.1')
+    helper.add_argument('--version', action='version', version='%(prog)s 0.0.2')
     
     # Initialize the parameters
     args = helper.parse_args()

alonso/batch.py

@@ -36,7 +36,7 @@ def main():
     helper.add_argument('-c', '--count', action='store_true', help='calculate the size of the vertex cover')
     helper.add_argument('-v', '--verbose', action='store_true', help='anable verbose output')
     helper.add_argument('-l', '--log', action='store_true', help='enable file logging')
-    helper.add_argument('--version', action='version', version='%(prog)s 0.0.1')
+    helper.add_argument('--version', action='version', version='%(prog)s 0.0.2')
 
     
     # Initialize the parameters

alonso/merge.py

@@ -1,10 +1,9 @@
-def merge_vertex_covers(E1, E2, vertex_cover_1, vertex_cover_2):
+def merge_vertex_covers(G, vertex_cover_1, vertex_cover_2):
     """
     Merge two vertex covers from edge partitions to get minimum vertex cover of G.
     
     Args:
         G: Graph represented as adjacency list/set of edges
-        E1, E2: Two partitions of edges E
         vertex_cover_1: Vertex cover for subgraph induced by E1
         vertex_cover_2: Vertex cover for subgraph induced by E2
     
@@ -12,15 +11,15 @@ def merge_vertex_covers(E1, E2, vertex_cover_1, vertex_cover_2):
         Merged vertex cover for the entire graph G
     """
     # All edges in the graph
-    all_edges = E1.union(E2)
+    all_edges = G.edges()
     
     # Initialize merge process
     merged_cover = set()
     covered_edges = set()
     
     # Convert vertex covers to lists for merge-sort-like processing
-    candidates_1 = list(vertex_cover_1)
-    candidates_2 = list(vertex_cover_2)
+    candidates_1 = sorted(list(vertex_cover_1), key=lambda x: G.degree(x), reverse=True)
+    candidates_2 = sorted(list(vertex_cover_2), key=lambda x: G.degree(x), reverse=True)
     
     i, j = 0, 0
     

alonso/partition.py

@@ -2,7 +2,7 @@ import networkx as nx
 from typing import Tuple, Set, List
 from collections import defaultdict
 import itertools
-import mendive.algorithm as claws
+import mendive.algorithm as algo
 
 class BurrErdosLovaszPartitioner:
     """
@@ -64,7 +64,7 @@ class BurrErdosLovaszPartitioner:
         G = nx.Graph()
         G.add_edges_from(edge_set)
         
-        claw = claws.find_claw_coordinates(G, first_claw=True)
+        claw = algo.find_claw_coordinates(G, first_claw=True)
         if claw is None:
             return True
         else:
@@ -83,7 +83,7 @@ class BurrErdosLovaszPartitioner:
         k_star_count = 0
         
         if self.k == 3:
-          all_claws = claws.find_claw_coordinates(G, first_claw=False)
+          all_claws = algo.find_claw_coordinates(G, first_claw=False)
           if all_claws is not None:
             k_star_count = len(all_claws)
         else:
@@ -161,7 +161,7 @@ class BurrErdosLovaszPartitioner:
         k_stars = []
         
         if self.k == 3:
-          all_claws = claws.find_claw_coordinates(G, first_claw=False)
+          all_claws = algo.find_claw_coordinates(G, first_claw=False)
           if all_claws is not None:
             for subset in all_claws:
                 subgraph = G.subgraph(subset)

alonso/test.py

@@ -34,7 +34,7 @@ def main():
     helper.add_argument('-w', '--write', action='store_true', help='write the generated random matrix to a file in the current directory')
     helper.add_argument('-v', '--verbose', action='store_true', help='anable verbose output')
     helper.add_argument('-l', '--log', action='store_true', help='enable file logging')
-    helper.add_argument('--version', action='version', version='%(prog)s 0.0.1')
+    helper.add_argument('--version', action='version', version='%(prog)s 0.0.2')
     
     # Initialize the parameters
     args = helper.parse_args()

{alonso-0.0.1.dist-info → alonso-0.0.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: alonso
-Version: 0.0.1
+Version: 0.0.2
 Summary: Compute an Approximate Vertex Cover for undirected graph encoded in DIMACS format.
 Home-page: https://github.com/frankvegadelgado/alonso
 Author: Frank Vega

alonso-0.0.2.dist-info/RECORD

@@ -0,0 +1,17 @@
+alonso/__init__.py,sha256=vbC0ysStExEptYRA3SZVoBGFT7ysEDRPnZ9k9NqGMXI,188
+alonso/algorithm.py,sha256=hJDruQQJxxlvmjJU_pue3A4R2ZEMC4rOXz45O0w3pM4,5534
+alonso/app.py,sha256=NxYA4Lfh1xw37XpUunwKYoa5ECQTrHcpKjsMMwA_UG8,4320
+alonso/applogger.py,sha256=fQBo51-TboX1DBqfSxX2P2eKJ5CcyiCq_IVlJTHjxAE,2624
+alonso/batch.py,sha256=iqtaxKH2ARcLZsV_i6CpwvxPGYHY3vk0dBJiafuMEkU,2305
+alonso/merge.py,sha256=dWhF9t_2bFp4HT1NCzjhrSlhm8CkJQ4pwBHOhHSkezQ,4257
+alonso/parser.py,sha256=Ib4TnWdkQb6A6FA3HHEjZDBb7uD0v9Gabwewqfu4XpQ,2549
+alonso/partition.py,sha256=a4JHiFsZ9MgFWWFLCvmh-k6EbDrMfJbXR_3Tb_IaPrQ,8511
+alonso/stable.py,sha256=IwINwjd3F7dfoISXlWsNWRkVJzItEojgMyNwzMM7nYc,6577
+alonso/test.py,sha256=UpeegxqezBU2-3zEMpwWTN9K27uBLroXyJpgeqfGBlo,5472
+alonso/utils.py,sha256=RmctLB8oDtjf0wKcKFaRvXiRgmtegqfbB1HFFzlpsvE,7674
+alonso-0.0.2.dist-info/licenses/LICENSE,sha256=nUDh1nfa7rfEv1HocpoqPu0JaFnZKpIVh9eM0MgozpM,1067
+alonso-0.0.2.dist-info/METADATA,sha256=UxqElz-fH1bKVbUu4tRbQl4lv02Pkw1_2CqaEsr1p1E,9396
+alonso-0.0.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+alonso-0.0.2.dist-info/entry_points.txt,sha256=JSod2CWtklhiaOFW3masqrgqhXIpVRsbIiprSmS1P7g,98
+alonso-0.0.2.dist-info/top_level.txt,sha256=rOo7SlpYGdic6g55rHDus2d5N2t74H9qamX4yi6z5vw,7
+alonso-0.0.2.dist-info/RECORD,,

alonso-0.0.1.dist-info/RECORD

@@ -1,17 +0,0 @@
-alonso/__init__.py,sha256=vbC0ysStExEptYRA3SZVoBGFT7ysEDRPnZ9k9NqGMXI,188
-alonso/algorithm.py,sha256=cVsyRQfEPOn-tHdxsTshBro6SjrJ3U0gxUIDROjlTEE,4748
-alonso/app.py,sha256=0j1-pJgQfyoBwBz3AvwRa4iEW9PjTCD28QyX1rIvlKI,4320
-alonso/applogger.py,sha256=fQBo51-TboX1DBqfSxX2P2eKJ5CcyiCq_IVlJTHjxAE,2624
-alonso/batch.py,sha256=BlA4cs_OtmPXh1gmX4fI7Ye10Qtg9pbVgmv1CXW6nFQ,2305
-alonso/merge.py,sha256=ObWIFqVhXycsjFk7pBqgxw55GrbgCysaGjjo1X58Yds,4209
-alonso/parser.py,sha256=Ib4TnWdkQb6A6FA3HHEjZDBb7uD0v9Gabwewqfu4XpQ,2549
-alonso/partition.py,sha256=7RgBCh6daLACnLuVYwvnIwtYARxTByUe_lIjdoDxpII,8515
-alonso/stable.py,sha256=IwINwjd3F7dfoISXlWsNWRkVJzItEojgMyNwzMM7nYc,6577
-alonso/test.py,sha256=8-860bd7cJCpx82T0FDbjesmzHxusi-YbhzOHK8mUyA,5472
-alonso/utils.py,sha256=RmctLB8oDtjf0wKcKFaRvXiRgmtegqfbB1HFFzlpsvE,7674
-alonso-0.0.1.dist-info/licenses/LICENSE,sha256=nUDh1nfa7rfEv1HocpoqPu0JaFnZKpIVh9eM0MgozpM,1067
-alonso-0.0.1.dist-info/METADATA,sha256=cikJZVGVFrn2eIQWom1LEoOzx9Clzv1gGIiq_JSByjg,9396
-alonso-0.0.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-alonso-0.0.1.dist-info/entry_points.txt,sha256=JSod2CWtklhiaOFW3masqrgqhXIpVRsbIiprSmS1P7g,98
-alonso-0.0.1.dist-info/top_level.txt,sha256=rOo7SlpYGdic6g55rHDus2d5N2t74H9qamX4yi6z5vw,7
-alonso-0.0.1.dist-info/RECORD,,