Changeset 641d00

Timestamp:

03/02/11 17:19:16 (2 years ago)

Author:

Tiago de Paula Peixoto <tiago@…>

Branches:

master, python3

Children:

ceabe6

Parents:

011d7b

git-author:

Tiago de Paula Peixoto <tiago@…> (03/02/11 17:19:16)

git-committer:

Tiago de Paula Peixoto <tiago@…> (03/02/11 17:19:16)

Message:

Fix removal of 'core' submodule

This fixes a leftover bug from the removal of the 'core' submodule.

Location:

src/graph_tool

Files:

• centrality/__init__.py (modified) (1 diff)
• clustering/__init__.py (modified) (2 diffs)
• community/__init__.py (modified) (1 diff)
• correlations/__init__.py (modified) (1 diff)
• draw/__init__.py (modified) (1 diff)
• flow/__init__.py (modified) (1 diff)
• generation/__init__.py (modified) (1 diff)
• run_action/inline.py (modified) (6 diffs)
• search/__init__.py (modified) (6 diffs)
• spectral/__init__.py (modified) (1 diff)
• stats/__init__.py (modified) (1 diff)
• topology/__init__.py (modified) (1 diff)
• util/__init__.py (modified) (1 diff)

src/graph_tool/centrality/__init__.py

@@ -44 +44 @@
 dl_import("import libgraph_tool_centrality")
 
-from .. core import _prop, ungroup_vector_property
+from .. import _prop, ungroup_vector_property
 import sys
 import numpy

src/graph_tool/clustering/__init__.py

@@ -45 +45 @@
 dl_import("import libgraph_tool_clustering as _gt")
 
-from .. core import _degree, _prop, Graph
+from .. import _degree, _prop, Graph
 from .. topology import isomorphism
 from .. generation import random_rewire
@@ -464 +464 @@
     shuffle_strategy : string (optional, default: "uncorrelated")
         Shuffle strategy to use. Can be either "correlated" or "uncorrelated".
-        See random_rewire() for details.
+        See :func:`~graph_tool.generation.random_rewire` for details.
 
     Returns

src/graph_tool/community/__init__.py

@@ -43 +43 @@
 dl_import("import libgraph_tool_community")
 
-from .. core import _degree, _prop, Graph, libcore
+from .. import _degree, _prop, Graph, libcore
 import random
 import sys

src/graph_tool/correlations/__init__.py

@@ -44 +44 @@
 dl_import("import libgraph_tool_correlations")
 
-from .. core import _degree, _prop
+from .. import _degree, _prop
 from numpy import *
 

src/graph_tool/draw/__init__.py

@@ -38 +38 @@
 
 import sys, os, os.path, time, warnings, tempfile
-from .. core import _degree, _prop, PropertyMap, _check_prop_vector,\
+from .. import _degree, _prop, PropertyMap, _check_prop_vector,\
      _check_prop_scalar, _check_prop_writable, group_vector_property,\
      ungroup_vector_property

src/graph_tool/flow/__init__.py

@@ -74 +74 @@
 dl_import("import libgraph_tool_flow")
 
-from .. core import _prop, _check_prop_scalar, _check_prop_writable
+from .. import _prop, _check_prop_scalar, _check_prop_writable
 __all__ = ["edmonds_karp_max_flow", "push_relabel_max_flow",
            "boykov_kolmogorov_max_flow", "max_cardinality_matching"]

src/graph_tool/generation/__init__.py

@@ -46 +46 @@
 dl_import("import libgraph_tool_generation")
 
-from .. core import Graph, _check_prop_scalar, _prop, _limit_args
+from .. import Graph, _check_prop_scalar, _prop, _limit_args
 from .. stats import label_parallel_edges, label_self_loops
 import sys, numpy, numpy.random

src/graph_tool/run_action/inline.py

@@ -19 +19 @@
 
 import sys, string, hashlib, os.path, re, glob
-from .. import core
+from .. import *
 from .. import libgraph_tool_core
 import numpy
@@ -67 +67 @@
 
 for d in ["vertex", "edge", "graph"]:
-    for t in core.value_types():
+    for t in value_types():
         props += "typedef %s_prop_t::as<%s >::type %sprop_%s_t;\n" % \
                  (d, t.replace("bool", "uint8_t"), d[0], clean_prop_type(t))
@@ -159 +159 @@
         else:
             arg_val = global_dict[arg]
-        if issubclass(type(arg_val), core.Graph):
+        if issubclass(type(arg_val), Graph):
             alias = "__gt__" + arg
             gi = "__gt__" + arg + "__gi"
@@ -171 +171 @@
             arg_alias.append(alias)
             alias_dict[alias] = gi_val
-        elif type(arg_val) == core.PropertyMap:
+        elif type(arg_val) == PropertyMap:
             alias = "__gt__" + arg
             if arg_val == arg_val.get_graph().vertex_index:
@@ -223 +223 @@
             arg_val = global_dict[arg]
         if arg not in mask_ret and \
-               type(arg_val) not in [numpy.ndarray, core.PropertyMap] and \
-               not issubclass(type(arg_val), core.Graph):
+               type(arg_val) not in [numpy.ndarray, PropertyMap] and \
+               not issubclass(type(arg_val), Graph):
             return_vals += 'return_vals["%s"] = %s;\n' % (arg, arg)
 
@@ -242 +242 @@
                                         extra_objects + \
                                         extra_link_args) + \
-                               headers_hash + core.__version__).hexdigest()
+                               headers_hash + __version__).hexdigest()
     code += "\n// support code hash: " + support_hash
     inline_code = string.Template(globals()["code_template"]).\

src/graph_tool/search/__init__.py

@@ -79 +79 @@
 dl_import("import libgraph_tool_search")
 
-from .. core import _prop
+from .. import _prop
 from .. decorators import _wraps
 import sys
@@ -192 +192 @@
             ["initialize_vertex"])
 def bfs_search(g, source, visitor=BFSVisitor()):
-    r"""This function performs a breadth-first traversal of the vertices in a
-    directed or undirected graph.
+    r"""Breadth-first traversal of a directed or undirected graph.
 
     Parameters
@@ -402 +401 @@
              "start_vertex"], ["initialize_vertex"])
 def dfs_search(g, source, visitor=DFSVisitor()):
-    r"""This function performs a depth-first traversal of the vertices in a
-    directed or undirected graph.
+    r"""Depth-first traversal of a directed or undirected graph.
 
     Parameters
@@ -632 +630 @@
                     pred_map=None, combine=lambda a, b: a + b,
                     compare=lambda a, b: a < b, zero=0, infinity=float('inf')):
-    r"""This function performs a Dijsktra traversal of the vertices in a directed or undirected graph, with non-negative weights.
+    r"""Dijsktra traversal of a directed or undirected graph, with non-negative weights.
 
     Parameters
@@ -899 +897 @@
                         compare=lambda a, b: a < b, zero=0,
                         infinity=float('inf')):
-    r"""This function performs a Bellman-Ford traversal of the vertices in a directed or undirected graph, with negative weights.
+    r"""Bellman-Ford traversal of a directed or undirected graph, with negative weights.
 
     Parameters
@@ -1172 +1170 @@
                  infinity=float('inf'), implicit=False):
     r"""
-    This algorithm implements a heuristic :math:`A^*` search on a weighted, directed or undirected graph for the case where all edge weights are non-negative.
+    Heuristic :math:`A^*` search on a weighted, directed or undirected graph for the case where all edge weights are non-negative.
 
     Parameters

src/graph_tool/spectral/__init__.py

@@ -37 +37 @@
 """
 
-from .. core import _degree, _prop, Graph, _limit_args
+from .. import _degree, _prop, Graph, _limit_args
 from numpy import *
 import scipy.sparse

src/graph_tool/stats/__init__.py

@@ -48 +48 @@
 dl_import("import libgraph_tool_stats")
 
-from .. core import _degree, _prop
+from .. import _degree, _prop
 from numpy import *
 import numpy

src/graph_tool/topology/__init__.py

@@ -50 +50 @@
 dl_import("import libgraph_tool_topology")
 
-from .. core import _prop, Vector_int32_t, _check_prop_writable, \
+from .. import _prop, Vector_int32_t, _check_prop_writable, \
      _check_prop_scalar,  _check_prop_vector, Graph, PropertyMap
 import random, sys, numpy, weakref

src/graph_tool/util/__init__.py

@@ -42 +42 @@
 dl_import("import libgraph_tool_util")
 
-from .. core import _degree, _prop
+from .. import _degree, _prop
 import weakref