diff --git a/configure.ac b/configure.ac index a0914f4c9f2ff3c2bb60c61f8e12ee2bc9bc6d47..d36cd2cbbc2844b03ba7e8dbe1581a9aea4926ca 100644 --- a/configure.ac +++ b/configure.ac @@ -291,7 +291,7 @@ src/graph/centrality/Makefile src/graph/clustering/Makefile src/graph/community/Makefile src/graph/util/Makefile -src/graph/misc/Makefile +src/graph/topology/Makefile src/graph_tool/Makefile ]) diff --git a/doc/graph_tool.rst b/doc/graph_tool.rst index f2a8751a1432774dbb0cc34ea5bc75dd70e6f054..f006646f17a1eb0186c9f96f4cbd5b86236ddc86 100644 --- a/doc/graph_tool.rst +++ b/doc/graph_tool.rst @@ -12,7 +12,7 @@ Available subpackages correlations draw generation - misc + topology run_action stats util \ No newline at end of file diff --git a/doc/misc.rst b/doc/misc.rst deleted file mode 100644 index 2255965bd800eea8f6e14df301d7040e13a609dc..0000000000000000000000000000000000000000 --- a/doc/misc.rst +++ /dev/null @@ -1,3 +0,0 @@ -.. automodule:: graph_tool.misc - :members: - :undoc-members: diff --git a/doc/topology.rst b/doc/topology.rst new file mode 100644 index 0000000000000000000000000000000000000000..ae2a62e01b56d135e8cb05828fd2a28ebe52d838 --- /dev/null +++ b/doc/topology.rst @@ -0,0 +1,3 @@ +.. automodule:: graph_tool.topology + :members: + :undoc-members: diff --git a/src/graph/Makefile.am b/src/graph/Makefile.am index a7d4d0768889d3f05b1414d004cfdc85233e9eee..1b5d47371480bb0f87dd4cf73a706524d2882ab0 100644 --- a/src/graph/Makefile.am +++ b/src/graph/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = generation stats clustering community util misc centrality correlations +SUBDIRS = generation stats clustering community util topology centrality correlations AM_CPPFLAGS =\ -I$(srcdir)/.. \ diff --git a/src/graph/misc/Makefile.am b/src/graph/misc/Makefile.am deleted file mode 100644 index 7eebc13fee2246a036ad34c85c9fdaba717f146d..0000000000000000000000000000000000000000 --- a/src/graph/misc/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -## Process this file with automake to produce Makefile.in - -AM_CPPFLAGS = $(MOD_CPPFLAGS) - -AM_CFLAGS=$(AM_CXXFLAGS) - -libgraph_tool_miscdir = $(MOD_DIR)/misc - -libgraph_tool_misc_LTLIBRARIES = libgraph_tool_misc.la - -libgraph_tool_misc_la_includedir = $(MOD_DIR)/include - -libgraph_tool_misc_la_LIBADD = $(MOD_LIBADD) - -libgraph_tool_misc_la_LDFLAGS = $(MOD_LDFLAGS) - -libgraph_tool_misc_la_SOURCES = \ - graph_misc.cc \ - graph_isomorphism.cc - -libgraph_tool_misc_la_include_HEADERS = diff --git a/src/graph/topology/Makefile.am b/src/graph/topology/Makefile.am new file mode 100644 index 0000000000000000000000000000000000000000..c4336e2f2b24bdefe70624de65028eb7981a6d56 --- /dev/null +++ b/src/graph/topology/Makefile.am @@ -0,0 +1,21 @@ +## Process this file with automake to produce Makefile.in + +AM_CPPFLAGS = $(MOD_CPPFLAGS) + +AM_CFLAGS=$(AM_CXXFLAGS) + +libgraph_tool_topologydir = $(MOD_DIR)/topology + +libgraph_tool_topology_LTLIBRARIES = libgraph_tool_topology.la + +libgraph_tool_topology_la_includedir = $(MOD_DIR)/include + +libgraph_tool_topology_la_LIBADD = $(MOD_LIBADD) + +libgraph_tool_topology_la_LDFLAGS = $(MOD_LDFLAGS) + +libgraph_tool_topology_la_SOURCES = \ + graph_topology.cc \ + graph_isomorphism.cc + +libgraph_tool_topology_la_include_HEADERS = diff --git a/src/graph/misc/graph_isomorphism.cc b/src/graph/topology/graph_isomorphism.cc similarity index 100% rename from src/graph/misc/graph_isomorphism.cc rename to src/graph/topology/graph_isomorphism.cc diff --git a/src/graph/misc/graph_line_graph.cc b/src/graph/topology/graph_line_graph.cc similarity index 100% rename from src/graph/misc/graph_line_graph.cc rename to src/graph/topology/graph_line_graph.cc diff --git a/src/graph/misc/graph_minimum_spanning_tree.cc b/src/graph/topology/graph_minimum_spanning_tree.cc similarity index 100% rename from src/graph/misc/graph_minimum_spanning_tree.cc rename to src/graph/topology/graph_minimum_spanning_tree.cc diff --git a/src/graph/misc/graph_reciprocity.cc b/src/graph/topology/graph_reciprocity.cc similarity index 100% rename from src/graph/misc/graph_reciprocity.cc rename to src/graph/topology/graph_reciprocity.cc diff --git a/src/graph/misc/graph_misc.cc b/src/graph/topology/graph_topology.cc similarity index 96% rename from src/graph/misc/graph_misc.cc rename to src/graph/topology/graph_topology.cc index 79adaf3f7fa8272000d3b7cbbcd6822728581904..3a37626895f480b67737890336780acc117af658 100644 --- a/src/graph/misc/graph_misc.cc +++ b/src/graph/topology/graph_topology.cc @@ -25,7 +25,7 @@ using namespace graph_tool; bool check_isomorphism(GraphInterface& gi1, GraphInterface& gi2, boost::any iso_map); -BOOST_PYTHON_MODULE(libgraph_tool_misc) +BOOST_PYTHON_MODULE(libgraph_tool_topology) { def("check_isomorphism", &check_isomorphism); } diff --git a/src/graph_tool/Makefile.am b/src/graph_tool/Makefile.am index a074c5cb2fcaca8212bf899132440bece4417275..5dfb239f72c5516d11834fe350a4ffa346a2c9f6 100644 --- a/src/graph_tool/Makefile.am +++ b/src/graph_tool/Makefile.am @@ -50,6 +50,6 @@ graph_tool_util_PYTHON = \ util/__init__.py graph_tool_utildir = $(MOD_DIR)/util -graph_tool_misc_PYTHON = \ - misc/__init__.py -graph_tool_miscdir = $(MOD_DIR)/misc +graph_tool_topology_PYTHON = \ + topology/__init__.py +graph_tool_topologydir = $(MOD_DIR)/topology diff --git a/src/graph_tool/all.py b/src/graph_tool/all.py index 38a3fe857a56ad822639d52ac9904318c25372e7..42daf6aba12b126139e13569aa4e74ab5ec6f614 100644 --- a/src/graph_tool/all.py +++ b/src/graph_tool/all.py @@ -45,7 +45,7 @@ from graph_tool.community import * import graph_tool.community from graph_tool.run_action import * graph_tool.run_action -from graph_tool.misc import * -import graph_tool.misc +from graph_tool.topology import * +import graph_tool.topology from graph_tool.util import * import graph_tool.util diff --git a/src/graph_tool/misc/__init__.py b/src/graph_tool/topology/__init__.py similarity index 85% rename from src/graph_tool/misc/__init__.py rename to src/graph_tool/topology/__init__.py index f137344ea1e289f19f69ed6e3b42608a70000207..7813f3341de110fd1bc4ab05104d8c8b860a3c7f 100644 --- a/src/graph_tool/misc/__init__.py +++ b/src/graph_tool/topology/__init__.py @@ -17,12 +17,12 @@ # along with this program. If not, see . """ -``graph_tool.misc`` - Miscellaneous functions ---------------------------------------------- +``graph_tool.topology`` - Topology related functions +---------------------------------------------------- """ from .. dl_import import dl_import -dl_import("import libgraph_tool_misc") +dl_import("import libgraph_tool_topology") from .. core import _prop import random, sys @@ -31,6 +31,6 @@ __all__ = ["isomorphism"] def isomorphism(g1, g2, isomap=None): if isomap == None: isomap = g1.new_vertex_property("int32_t") - return libgraph_tool_misc.\ + return libgraph_tool_topology.\ check_isomorphism(g1._Graph__graph,g2._Graph__graph, _prop("v", g1, isomap))