Changeset 41686e

Timestamp:

08/04/09 13:59:56 (4 years ago)

Author:

Tiago de Paula Peixoto <tiago@…>

Children:

4186e2

Parents:

7b1146

git-author:

Tiago de Paula Peixoto <tiago@…> (08/04/09 13:59:56)

git-committer:

Tiago de Paula Peixoto <tiago@…> (08/04/09 13:59:56)

Message:

Move random_rewire() to 'generation' module

Location:

src

Files:

• graph/generation/Makefile.am (modified) (1 diff)
• graph/generation/graph_generation.cc (modified) (1 diff)
• graph/generation/graph_rewiring.cc (moved) (moved from src/graph/misc/graph_rewiring.cc)
• graph/generation/graph_rewiring.hh (moved) (moved from src/graph/misc/graph_rewiring.hh)
• graph/misc/Makefile.am (modified) (1 diff)
• graph/misc/graph_misc.cc (modified) (2 diffs)
• graph_tool/generation/__init__.py (modified) (2 diffs)
• graph_tool/misc/__init__.py (modified) (1 diff)

src/graph/generation/Makefile.am

@@ -16 +16 @@
 
 libgraph_tool_generation_la_SOURCES = \
-    graph_generation.cc
+    graph_generation.cc \
+    graph_rewiring.cc
 
 libgraph_tool_generation_la_include_HEADERS = \
-    graph_generation.hh
+    graph_generation.hh \
+    graph_rewiring.hh

src/graph/generation/graph_generation.cc

@@ -95 +95 @@
 }
 
+void random_rewire(GraphInterface& gi, string strat, bool self_loops,
+                   bool parallel_edges, size_t seed);
+
+using namespace boost::python;
+
 BOOST_PYTHON_MODULE(libgraph_tool_generation)
 {
     def("gen_random_graph", &generate_random_graph);
+    def("random_rewire", &random_rewire);
 }

src/graph/misc/Makefile.am

@@ -16 +16 @@
 
 libgraph_tool_misc_la_SOURCES = \
-    graph_rewiring.cc \
     graph_misc.cc \
     graph_isomorphism.cc
 
-libgraph_tool_misc_la_include_HEADERS = \
-    graph_rewiring.hh
+libgraph_tool_misc_la_include_HEADERS =

src/graph/misc/graph_misc.cc

@@ -23 +23 @@
 using namespace graph_tool;
 
-void random_rewire(GraphInterface& gi, string strat, bool self_loops,
-                   bool parallel_edges, size_t seed);
 bool check_isomorphism(GraphInterface& gi1, GraphInterface& gi2,
                        boost::any iso_map);
@@ -30 +28 @@
 BOOST_PYTHON_MODULE(libgraph_tool_misc)
 {
-    def("random_rewire", &random_rewire);
     def("check_isomorphism", &check_isomorphism);
 }

src/graph_tool/generation/__init__.py

@@ -28 +28 @@
 import sys, numpy
 
-__all__ = ["random_graph"]
+__all__ = ["random_graph", "random_rewire"]
 
 def _corr_wrap(i, j, corr):
@@ -218 +218 @@
     g.set_directed(directed)
     return g
+
+def random_rewire(g, strat="uncorrelated", self_loops = False,
+                  parallel_edges = False, seed = 0):
+    if seed != 0:
+        seed = random.randint(0, sys.maxint)
+    if g.is_reversed():
+        was_reversed = True
+    else:
+        was_reversed = False
+    g.set_reversed(False)
+    libgraph_tool_generation.random_rewire(g._Graph__graph, strat, self_loops,
+                                           parallel_edges, seed)
+    if was_reversed:
+        g.set_reversed(True)
+

src/graph_tool/misc/__init__.py

@@ -27 +27 @@
 from .. core import _prop
 import random, sys
-__all__ = ["random_rewire", "isomorphism"]
-
-def random_rewire(g, strat="uncorrelated", self_loops = False,
-                  parallel_edges = False, seed = 0):
-    if seed != 0:
-        seed = random.randint(0, sys.maxint)
-    if g.is_reversed():
-        was_reversed = True
-    else:
-        was_reversed = False
-    g.set_reversed(False)
-    libgraph_tool_misc.random_rewire(g._Graph__graph, strat, self_loops,
-                                     parallel_edges, seed)
-    if was_reversed:
-        g.set_reversed(True)
+__all__ = ["isomorphism"]
 
 def isomorphism(g1, g2, isomap=None):