Ticket #5793: cliquer-4-rebased-sage.4.1.patch

sage/graphs/cliquer.pxd

@@ -23 +23 @@
 
 cdef extern from "cliquer/graph.h":
      cdef graph_t * graph_new(int n)
+     cdef void graph_print(graph_t *g)
 

sage/graphs/cliquer.pyx

@@ -7 +7 @@
     
     EXAMPLES::
     
-    sage: C=graphs.PetersenGraph()
-    sage: max_clique(C)
-    [7, 9]
+          sage: C=graphs.PetersenGraph()
+          sage: max_clique(C)
+          [7, 9]
     """
+    graph,d = graph.relabel(inplace=False, return_map=True)
+    d_inv = {}
+    for v in d:
+        d_inv[d[v]] = v
+
     cdef graph_t *g
     g=graph_new(graph.order())
     buf="p edges %d %d" %(graph.order(),graph.size())
@@ -28 +33 @@
     cdef int i
     for i in range(size):
         b.append(list[i])
-    return b
+    return list_composition(b,d_inv)
 
 
 # computes all the maximum clique of a graph and return its list
@@ -42 +47 @@
     
     EXAMPLES::
     
-    sage: C=graphs.PetersenGraph()
-    sage: all_max_clique(C)
-    [[2, 7], [7, 9], [6, 8], [6, 9], [0, 4], [4, 9], [5, 7], [0, 5], [5, 8], [3, 4], [2, 3], [3, 8], [1, 6], [0, 1], [1, 2]]
+          sage: C=graphs.PetersenGraph()
+          sage: all_max_clique(C)
+          [[2, 7], [7, 9], [6, 8], [6, 9], [0, 4], [4, 9], [5, 7], [0, 5], [5, 8], [3, 4], [2, 3], [3, 8], [1, 6], [0, 1], [1, 2]]
     """
+
+    graph,d = graph.relabel(inplace=False, return_map=True)
+    d_inv = {}
+    for v in d:
+        d_inv[d[v]] = v
+
     cdef graph_t *g
     g=graph_new(graph.order())
     buf="p edges %d %d" %(graph.order(),graph.size())
@@ -66 +77 @@
         if(list[i]!=-1):
                 c.append(list[i])
         else:
-                b.append(c)
+                b.append(list_composition(c,d_inv))
                 c=[]
     return b
 
@@ -91 +102 @@
     sage: clique_number(G)
     3
     """
+    graph=graph.relabel(inplace=False)
     cdef graph_t *g
     g=graph_new(graph.order())
     buf="p edges %d %d" %(graph.order(),graph.size())
@@ -103 +115 @@
     return sage_clique_number(g)
 
 
+def list_composition(a,b):
+    value=[]
+    for i in a:
+        value.append(b[i])
+    return value
+    
 
-

sage/graphs/graph.py

@@ -9848 +9848 @@
         ( algorithm="cliquer" ) but you can also chose the networkx
         algorithm instead ( algorithm="networkx" )
 
-        The parameter 'cliques' is an optional list of cliques that can be input if already computed.
-        ONLY USED BY NetworkX !!!
+        INPUT :
+
+        - ``cliques'' : This parameter is an optional list of cliques that can be input if already computed.         
+                        ONLY USED BY NetworkX !!!
         
         Currently only implemented for undirected graphs. Use
         to_undirected to convert a digraph to an undirected graph.
@@ -9885 +9887 @@
         
         sage: C=graphs.PetersenGraph()
         sage: C.maximum_clique()
-        [6, 8]
+        [7, 9]
         """
         from sage.graphs.cliquer import max_clique
         return max_clique(self)
@@ -9918 +9920 @@
         
         sage: C=graphs.PetersenGraph()
         sage: C.maximum_cliques()
-        [[1, 6], [6, 8], [5, 7], [5, 8], [3, 8], [4, 6], [4, 7], [2, 3], [1, 2], [2, 7], [0, 5], [0, 1]]
+        [[2, 7], [7, 9], [6, 8], [6, 9], [0, 4], [4, 9], [5, 7], [0, 5], [5, 8], [3, 4], [2, 3], [3, 8], [1, 6], [0, 1], [1, 2]]
         """
 
         from sage.graphs.cliquer import all_max_clique
         return all_max_clique(self)
 
-    def cliques_vertex_clique_number(self, vertices=None, with_labels=False, cliques=None):
+    def cliques_vertex_clique_number(self, algorithm="cliquer",vertices=None, with_labels=False, cliques=None):
         r"""
         Returns a list of sizes of the largest maximal cliques containing
         each vertex. (Returns a single value if only one input vertex).
@@ -9934 +9936 @@
         
         INPUT:
         
-        
+        -  ``algorithm'' - "cliquer" or "networkx"
+
         -  ``vertices`` - the vertices to inspect (default is
            entire graph)
+                        ONLY USED BY NetworkX !!!           
         
         -  ``with_labels`` - (boolean) default False returns
            list as above True returns a dictionary keyed by vertex labels
+                        ONLY USED BY NetworkX !!!
         
         -  ``cliques`` - list of cliques (if already
            computed)
-        
+                        ONLY USED BY NetworkX !!!        
         
         EXAMPLES::
         
@@ -9953 +9958 @@
             sage: E = C.cliques()
             sage: E
             [[4, 1, 2, 3], [4, 0]]
-            sage: C.cliques_vertex_clique_number(cliques=E)
+            sage: C.cliques_vertex_clique_number(cliques=E,algorithm="networkx")
             [2, 4, 4, 4, 4]
             sage: F = graphs.Grid2dGraph(2,3)
-            sage: X = F.cliques_vertex_clique_number(with_labels=True)
+            sage: X = F.cliques_vertex_clique_number(with_labels=True,algorithm="networkx")
             sage: for v in sorted(X.iterkeys()):
             ...    print v, X[v]
             (0, 0) 2
@@ -9972 +9977 @@
             sage: G.cliques_vertex_clique_number()
             [3, 3, 3, 3]
         """
-        import networkx.cliques
-        return networkx.cliques.node_clique_number(self.networkx_graph(copy=False), vertices, with_labels, cliques)
+
+        if algorithm=="cliquer":
+            from sage.graphs.cliquer import clique_number
+            if vertices==None:
+                vertices=self
+            value=[]
+            for v in vertices:
+                value.append(1+clique_number(self.subgraph(self.neighbors(v))))
+                self.subgraph(self.neighbors(v)).plot()
+            return value
+        elif algorithm=="networkx":
+            import networkx.cliques
+            return networkx.cliques.node_clique_number(self.networkx_graph(copy=False), vertices, with_labels, cliques)
+        else:
+            raise NotImplementedError("Only 'networkx' and 'cliquer' are supported.")
+
         
     def cliques_number_of(self, vertices=None, cliques=None, with_labels=False):
         """