Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Tiago Peixoto
graph-tool
Commits
d34568d0
Commit
d34568d0
authored
Aug 16, 2009
by
Tiago Peixoto
Browse files
Rename "misc" module as "topology"
parent
2f7a47ca
Changes
14
Hide whitespace changes
Inline
Side-by-side
configure.ac
View file @
d34568d0
...
...
@@ -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
])
...
...
doc/graph_tool.rst
View file @
d34568d0
...
...
@@ -12,7 +12,7 @@ Available subpackages
correlations
draw
generation
misc
topology
run_action
stats
util
\ No newline at end of file
doc/
misc
.rst
→
doc/
topology
.rst
View file @
d34568d0
.. automodule:: graph_tool.
misc
.. automodule:: graph_tool.
topology
:members:
:undoc-members:
src/graph/Makefile.am
View file @
d34568d0
## 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)
/..
\
...
...
src/graph/misc/Makefile.am
deleted
100644 → 0
View file @
2f7a47ca
## 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
=
src/graph/topology/Makefile.am
0 → 100644
View file @
d34568d0
## 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
=
src/graph/
misc
/graph_isomorphism.cc
→
src/graph/
topology
/graph_isomorphism.cc
View file @
d34568d0
File moved
src/graph/
misc
/graph_line_graph.cc
→
src/graph/
topology
/graph_line_graph.cc
View file @
d34568d0
File moved
src/graph/
misc
/graph_minimum_spanning_tree.cc
→
src/graph/
topology
/graph_minimum_spanning_tree.cc
View file @
d34568d0
File moved
src/graph/
misc
/graph_reciprocity.cc
→
src/graph/
topology
/graph_reciprocity.cc
View file @
d34568d0
File moved
src/graph/
misc/graph_misc
.cc
→
src/graph/
topology/graph_topology
.cc
View file @
d34568d0
...
...
@@ -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
);
}
src/graph_tool/Makefile.am
View file @
d34568d0
...
...
@@ -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_
misc
dir
=
$(MOD_DIR)
/
misc
graph_tool_
topology
_PYTHON
=
\
topology
/__init__.py
graph_tool_
topology
dir
=
$(MOD_DIR)
/
topology
src/graph_tool/all.py
View file @
d34568d0
...
...
@@ -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
src/graph_tool/
misc
/__init__.py
→
src/graph_tool/
topology
/__init__.py
View file @
d34568d0
...
...
@@ -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
))
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment