diff --git a/analyze-cycle.py b/analyze-cycle.py index 6e91900b58439a5232b3a7cd1f00230e6263aa1d..ba36ebf0fad9647aee28a5052e0279bc7dca8ce6 100644 --- a/analyze-cycle.py +++ b/analyze-cycle.py @@ -1,4 +1,4 @@ -from graph_tools.definitions import * +from graph_tools.base import * from graph_tools.parameters import * from sage.all import * from collections import namedtuple diff --git a/graph_tools/__main__.py b/graph_tools/__main__.py index 7bc5bb15fee0ecd021e057facbb85df499e19725..d2d94eb17568550dd42660bae229a8abca715f9d 100644 --- a/graph_tools/__main__.py +++ b/graph_tools/__main__.py @@ -4,7 +4,7 @@ from sys import argv to_test = [ "utils", - "definitions", + "base", "sequences", "parameters", "misc", diff --git a/graph_tools/all.py b/graph_tools/all.py index 321f392ee185f7277fe3cd89ef85aa6d4dfc9188..cc664bb7cf641d5fc5f0d53e01f1b3836b88faa4 100644 --- a/graph_tools/all.py +++ b/graph_tools/all.py @@ -1,4 +1,4 @@ -from .definitions import * +from .base import * from .sequences import * from .parameters import * from .misc import * diff --git a/graph_tools/definitions.py b/graph_tools/base.py similarity index 100% rename from graph_tools/definitions.py rename to graph_tools/base.py diff --git a/graph_tools/misc.py b/graph_tools/misc.py index 4631d819baf622b382e6b9a76420de901fc161d3..6a03d12889adcab1afa8ef2a108fd45c5b43b5e5 100644 --- a/graph_tools/misc.py +++ b/graph_tools/misc.py @@ -1,7 +1,7 @@ def _init_(): global sun, count_cdc_naive, graph_to_gadget - from .definitions import Gadget, CUBIC_VERTEX + from .base import Gadget, CUBIC_VERTEX from .parameters import CircuitDoubleCover diff --git a/graph_tools/parameters.py b/graph_tools/parameters.py index a45d7ed4d3651b8c08698258f7c9381966b0d1d3..7ba070f3dde60b0896f2896dab4184cebba4854b 100644 --- a/graph_tools/parameters.py +++ b/graph_tools/parameters.py @@ -12,7 +12,7 @@ def _init_(): split_on_none, prod, select, powerset, \ UnionFind - from .definitions import \ + from .base import \ Boundary, \ SimpleParameterBase, GraphParameterBase @@ -230,7 +230,7 @@ def _init_(): def join_edges(self, b, e1, e2): """ - >>> from .definitions import Boundary as B + >>> from .base import Boundary as B >>> def test(*args): return list(CircuitDoubleCover.join_edges(*args)) >>> test(B(((1,2), (2,3), (1,3), None), 1), 1, 2) [] diff --git a/graph_tools/sequences.py b/graph_tools/sequences.py index e63a15fb3d5cba33c78b0970528c645f3d22a467..c8531322f56c3b7ac5ddcc40defefeeb3bf40b39 100644 --- a/graph_tools/sequences.py +++ b/graph_tools/sequences.py @@ -4,7 +4,7 @@ def _init_(): Necklace, Flower, \ GeneralizedPetersen, Petersen - from .definitions import \ + from .base import \ Boundary, \ Gadget, FakeGadget, CUBIC_VERTEX, FREE_EDGE, \ GraphSequence, ParametrizedGraphSequence diff --git a/test_cycle.py b/test_cycle.py index 636207187dd6d5154b18ec90e5fab0376d7669c4..9b927ea05d7fe0ff94b20a502bdeebf523e33eaf 100644 --- a/test_cycle.py +++ b/test_cycle.py @@ -1,4 +1,4 @@ -from graph_tools.definitions import * +from graph_tools.base import * from graph_tools.parameters import CircuitDoubleCover, VertexCount from graph_tools.misc import sun