Commit d34568d0 authored by Tiago Peixoto's avatar Tiago Peixoto

Rename "misc" module as "topology"

parent 2f7a47ca
......@@ -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
])
......
......@@ -12,7 +12,7 @@ Available subpackages
correlations
draw
generation
misc
topology
run_action
stats
util
\ No newline at end of file
.. automodule:: graph_tool.misc
.. automodule:: graph_tool.topology
:members:
:undoc-members:
## 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)/.. \
......
## 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 =
## 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 =
......@@ -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);
}
......@@ -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
......@@ -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
......@@ -17,12 +17,12 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
"""
``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))
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment