From b10587932eb39d2e233022495cffed4796b39f07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Radek=20Hu=C5=A1ek?= <husek@iuuk.mff.cuni.cz> Date: Wed, 3 Jun 2020 11:07:27 +0200 Subject: [PATCH] graph_tools.definitions -> graph_tools.base --- analyze-cycle.py | 2 +- graph_tools/__main__.py | 2 +- graph_tools/all.py | 2 +- graph_tools/{definitions.py => base.py} | 0 graph_tools/misc.py | 2 +- graph_tools/parameters.py | 4 ++-- graph_tools/sequences.py | 2 +- test_cycle.py | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) rename graph_tools/{definitions.py => base.py} (100%) diff --git a/analyze-cycle.py b/analyze-cycle.py index 6e91900..ba36ebf 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 7bc5bb1..d2d94eb 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 321f392..cc664bb 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 4631d81..6a03d12 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 a45d7ed..7ba070f 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 e63a15f..c853132 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 6362071..9b927ea 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 -- GitLab