fix: update rewire() for C API changes

Author: szhorvat

src/_igraph/convert.c

@@ -766,19 +766,6 @@ int igraphmodule_PyObject_to_reciprocity_t(PyObject *o, igraph_reciprocity_t *re
   TRANSLATE_ENUM_WITH(reciprocity_tt);
 }
 
-/**
- * \brief Converts a Python object to an igraph \c igraph_rewiring_t
- */
-int igraphmodule_PyObject_to_rewiring_t(PyObject *o, igraph_rewiring_t *result) {
-  static igraphmodule_enum_translation_table_entry_t rewiring_tt[] = {
-    {"simple", IGRAPH_REWIRING_SIMPLE},
-    {"simple_loops", IGRAPH_REWIRING_SIMPLE_LOOPS},
-    {"loops", IGRAPH_REWIRING_SIMPLE_LOOPS},
-    {0,0}
-  };
-  TRANSLATE_ENUM_WITH(rewiring_tt);
-}
-
 /**
  * \brief Converts a Python object to an igraph \c igraphmodule_shortest_path_algorithm_t
  */

src/_igraph/convert.h

@@ -86,7 +86,6 @@ int igraphmodule_PyObject_to_realize_degseq_t(PyObject *o, igraph_realize_degseq
 int igraphmodule_PyObject_to_random_tree_t(PyObject *o, igraph_random_tree_t *result);
 int igraphmodule_PyObject_to_random_walk_stuck_t(PyObject *o, igraph_random_walk_stuck_t *result);
 int igraphmodule_PyObject_to_reciprocity_t(PyObject *o, igraph_reciprocity_t *result);
-int igraphmodule_PyObject_to_rewiring_t(PyObject *o, igraph_rewiring_t *result);
 int igraphmodule_PyObject_to_shortest_path_algorithm_t(PyObject *o, igraphmodule_shortest_path_algorithm_t *result);
 int igraphmodule_PyObject_to_spinglass_implementation_t(PyObject *o, igraph_spinglass_implementation_t *result);
 int igraphmodule_PyObject_to_spincomm_update_t(PyObject *o, igraph_spincomm_update_t *result);

src/_igraph/graphobject.c

@@ -6512,12 +6512,12 @@ PyObject *igraphmodule_Graph_permute_vertices(igraphmodule_GraphObject *self,
 PyObject *igraphmodule_Graph_rewire(igraphmodule_GraphObject * self,
                                     PyObject * args, PyObject * kwds)
 {
-  static char *kwlist[] = { "n", "mode", NULL };
-  PyObject *n_o = Py_None, *mode_o = Py_None;
+  static char *kwlist[] = { "n", "allowed_edge_types", NULL };
+  PyObject *n_o = Py_None, *allowed_edge_types_o = Py_None;
   igraph_integer_t n = 10 * igraph_ecount(&self->g); /* TODO overflow check */
-  igraph_rewiring_t mode = IGRAPH_REWIRING_SIMPLE;
+  igraph_edge_type_sw_t allowed_edge_types = IGRAPH_SIMPLE_SW;
 
-  if (!PyArg_ParseTupleAndKeywords(args, kwds, "|OO", kwlist, &n_o, &mode_o)) {
+  if (!PyArg_ParseTupleAndKeywords(args, kwds, "|OO", kwlist, &n_o, &allowed_edge_types_o)) {
     return NULL;
   }
 
@@ -6527,11 +6527,11 @@ PyObject *igraphmodule_Graph_rewire(igraphmodule_GraphObject * self,
     }
   }
 
-  if (igraphmodule_PyObject_to_rewiring_t(mode_o, &mode)) {
+  if (igraphmodule_PyObject_to_edge_type_sw_t(allowed_edge_types_o, &allowed_edge_types)) {
     return NULL;
   }
 
-  if (igraph_rewire(&self->g, n, mode)) {
+  if (igraph_rewire(&self->g, n, allowed_edge_types)) {
     igraphmodule_handle_igraph_error();
     return NULL;
   }
@@ -16281,7 +16281,7 @@ struct PyMethodDef igraphmodule_Graph_methods[] = {
   /* interface to igraph_rewire */
   {"rewire", (PyCFunction) igraphmodule_Graph_rewire,
    METH_VARARGS | METH_KEYWORDS,
-   "rewire(n=None, mode=\"simple\")\n--\n\n"
+   "rewire(n=None, allowed_edge_types=\"simple\")\n--\n\n"
    "Randomly rewires the graph while preserving the degree distribution.\n\n"
    "The rewiring is done \"in-place\", so the original graph will be modified.\n"
    "If you want to preserve the original graph, use the L{copy} method before\n"

src/_igraph/igraphmodule.c

@@ -1158,9 +1158,6 @@ PyObject* PyInit__igraph(void)
   PyModule_AddIntConstant(m, "GET_ADJACENCY_LOWER", IGRAPH_GET_ADJACENCY_LOWER);
   PyModule_AddIntConstant(m, "GET_ADJACENCY_BOTH", IGRAPH_GET_ADJACENCY_BOTH);
 
-  PyModule_AddIntConstant(m, "REWIRING_SIMPLE", IGRAPH_REWIRING_SIMPLE);
-  PyModule_AddIntConstant(m, "REWIRING_SIMPLE_LOOPS", IGRAPH_REWIRING_SIMPLE_LOOPS);
-
   PyModule_AddIntConstant(m, "ADJ_DIRECTED", IGRAPH_ADJ_DIRECTED);
   PyModule_AddIntConstant(m, "ADJ_UNDIRECTED", IGRAPH_ADJ_UNDIRECTED);
   PyModule_AddIntConstant(m, "ADJ_MAX", IGRAPH_ADJ_MAX);

src/igraph/__init__.py

@@ -47,8 +47,6 @@
     IN,
     InternalError,
     OUT,
-    REWIRING_SIMPLE,
-    REWIRING_SIMPLE_LOOPS,
     STAR_IN,
     STAR_MUTUAL,
     STAR_OUT,

tests/test_games.py

@@ -163,15 +163,15 @@ def testRewire(self):
         self.assertTrue(g.is_simple())
 
         # Rewiring with loops (1)
-        g.rewire(10000, mode="loops")
+        g.rewire(10000, allowed_edge_types="loops")
         self.assertEqual(degrees, g.degree())
         self.assertFalse(any(g.is_multiple()))
 
         # Rewiring with loops (2)
         g = Graph.Full(4)
         g[1, 3] = 0
         degrees = g.degree()
-        g.rewire(100, mode="loops")
+        g.rewire(100, allowed_edge_types="loops")
         self.assertEqual(degrees, g.degree())
         self.assertFalse(any(g.is_multiple()))
 
@@ -185,7 +185,7 @@ def testRewire(self):
         self.assertTrue(g.is_simple())
 
         # Directed graph with loops
-        g.rewire(10000, mode="loops")
+        g.rewire(10000, allowed_edge_types="loops")
         self.assertEqual(indeg, g.indegree())
         self.assertEqual(outdeg, g.outdegree())
         self.assertFalse(any(g.is_multiple()))