Ticket #5793: cliquer-2.patch

new file sage/ext/cliquer.pxd

@@ +1 @@
+cdef extern from "cliquer/graph.h":
+    struct graph_t:
+       pass
+
+cdef extern from "cliquer/cliquer.h":
+    struct clique_options:
+       pass
+
+
+cdef extern from "cliquer/reorder.h":
+     cdef int *reorder_by_greedy_coloring(graph_t *g, bool weighted)
+     cdef int *reorder_by_degree(graph_t *g, bool weighted)
+
+cdef extern from "cliquer/cliquer.h":
+     bool clique_print_time(intlevel, int i, int n, int max, double cputime, double realtime, clique_options *opts)
+
+
+cdef extern from "cliquer/cl.h":
+     cdef int sage_clique_max(graph_t *g, int ** list)
+     cdef int sage_all_clique_max(graph_t *g, int ** list)
+     cdef int sage_clique_number(graph_t *g)
+     cdef void parse_input(char *str,graph_t *g)
+
+cdef extern from "cliquer/graph.h":
+     cdef graph_t * graph_new(int n)
+

deleted file sage/ext/cliquer.pxi

@@ -1 @@
-cdef extern from "cliquer/graph.h":
-    struct graph_t:
-       pass
-
-cdef extern from "cliquer/cliquer.h":
-    struct clique_options:
-       pass
-
-
-cdef extern from "cliquer/reorder.h":
-     cdef int *reorder_by_greedy_coloring(graph_t *g, bool weighted)
-     cdef int *reorder_by_degree(graph_t *g, bool weighted)
-
-cdef extern from "cliquer/cliquer.h":
-     bool clique_print_time(intlevel, int i, int n, int max, double cputime, double realtime, clique_options *opts)
-
-
-cdef extern from "cliquer/cl.h":
-     cdef int sage_clique_max(graph_t *g, int ** list)
-     cdef int sage_all_clique_max(graph_t *g, int ** list)
-     cdef int sage_clique_number(graph_t *g)
-     cdef void parse_input(char *str,graph_t *g)
-
-cdef extern from "cliquer/graph.h":
-     cdef graph_t * graph_new(int n)
-

sage/graphs/cliquer.pyx

@@ -1 @@
-include '../ext/cliquer.pxi'
+include '../ext/cliquer.pxd'
 
 # computes the maximum clique of a graph and return the list of its members
 

sage/graphs/graph.py

@@ -9242 +9242 @@
         """
         Returns the size of the largest clique of the graph (clique
         number). By default, the Cliquer algorithm is used 
-        ( algorithm="Cliquer" ) but you can also chose the networkx
+        ( algorithm="cliquer" ) but you can also chose the networkx
         algorithm instead ( algorithm="networkx" )
         
         Currently only implemented for undirected graphs. Use
@@ -9258 +9258 @@
             sage: G.clique_number()
             3
         """
-        if algorithm=="networkx":
+        if algorithm=="cliquer":
+            from sage.graphs.cliquer import clique_number
+            return clique_number(self)        
+        elif algorithm=="networkx":
             import networkx.cliques
-            return networkx.cliques.graph_clique_number(self.networkx_graph(copy=False), cliques)
-        
-        from sage.graphs.cliquer import clique_number
-        return clique_number(self)
+            return networkx.cliques.graph_clique_number(self.networkx_graph(copy=False))
+        else:
+            raise NotImplementedError("Only 'networkx' and 'cliquer' are supported.")
 
     def maximum_clique(self):
         """
@@ -9302 +9304 @@
 
     def maximum_cliques(self):
         """
-        Returns the vertex set of *ALL* the maximum complete subgraphs.
+        Returns the vertex sets of *ALL* the maximum complete subgraphs.
         
         Currently only implemented for undirected graphs. Use
         to_undirected to convert a digraph to an undirected graph.