Reorganized project structure

Author: dosart

Makefile

@@ -5,10 +5,10 @@ test:
 	poetry run pytest tests/
 
 test-coverage:
-	poetry run pytest --cov=algorithms --cov-report xml tests
+	poetry run pytest --cov=graph_algorithms --cov-report xml tests
 
 lint:
-	poetry run flake8 algorithms
+	poetry run flake8 graph_algorithms
 
 selfcheck:
 	poetry check

graph_algorithms/algorithms/__init__.py

@@ -0,0 +1,3 @@
+# -*- coding:utf-8 -*-
+
+"""Dijkstra's algorithm."""

graph_algorithms/paths_in_graph/bellman_ford/__init__.py renamed to graph_algorithms/algorithms/bellman_ford/__init__.py

@@ -1,9 +1,9 @@
 """Implementation Bellman-Ford’s algorithm."""
 
-from graph_algorithms.paths_in_graph.relax import relax
+from graph_algorithms.algorithms.relax import relax
 
-from graph_algorithms.paths_in_graph.distance import make_distances
-from graph_algorithms.paths_in_graph.distance import set_distance
+from graph_algorithms.data_structure.distance import make_distances
+from graph_algorithms.data_structure.distance import set_distance
 
 from graph_algorithms.exception.graph_exception import NotContainsVertexException
 from graph_algorithms.exception.messages import not_contains_vertex_message

graph_algorithms/paths_in_graph/bellman_ford/bellman_ford.py renamed to graph_algorithms/algorithms/bellman_ford/bellman_ford.py

@@ -8,8 +8,8 @@
 from graph_algorithms.exception.graph_exception import NotContainsVertexException
 from graph_algorithms.exception.messages import not_contains_vertex_message
 
-from graph_algorithms.paths_in_graph.bfs.queue import make_queue, enqueue, dequeue, is_empty
-from graph_algorithms.paths_in_graph.distance import get_distance, make_distances, not_visited, set_distance
+from graph_algorithms.algorithms.bfs.queue import make_queue, enqueue, dequeue, is_empty
+from graph_algorithms.data_structure.distance import get_distance, make_distances, not_visited, set_distance
 
 
 def bfs(graph, start_vertex):

graph_algorithms/paths_in_graph/bfs/__init__.py renamed to graph_algorithms/algorithms/bfs/__init__.py

@@ -2,7 +2,7 @@
 
 """Implementation of the algorithm for calculating the components of graph connectivity."""
 
-from graph_algorithms.dfs.explore import explore
+from graph_algorithms.algorithms.dfs.explore import explore
 
 
 class _ConnectedComponents(object):

graph_algorithms/paths_in_graph/bfs/bfs.py renamed to graph_algorithms/algorithms/bfs/bfs.py

@@ -2,7 +2,7 @@
 
 """Implementation recursion depth-first search."""
 
-from graph_algorithms.dfs.explore import explore
+from graph_algorithms.algorithms.dfs.explore import explore
 
 
 def dfs_recursion(graph, pre_visit, post_visit):

graph_algorithms/paths_in_graph/bfs/queue.py renamed to graph_algorithms/algorithms/bfs/queue.py

@@ -3,8 +3,8 @@
 """Implementation topological sort using recursive algorithm DFS."""
 
 
-from graph_algorithms.dfs.dfs_recursion import dfs_recursion
-from graph_algorithms.dfs.contains_circle import contains_circle
+from graph_algorithms.algorithms.dfs.dfs_recursion import dfs_recursion
+from graph_algorithms.algorithms.dfs.contains_circle import contains_circle
 
 from graph_algorithms.exception.graph_exception import GraphContainsCircleException
 from graph_algorithms.exception.messages import sorting_not_possible_message

graph_algorithms/dfs/__init__.py renamed to graph_algorithms/algorithms/dfs/__init__.py

@@ -2,16 +2,16 @@
 
 """Implementation Dijkstra’s algorithm."""
 
-from graph_algorithms.paths_in_graph.priority_queue.priority_queue import make_priority_queue
-from graph_algorithms.paths_in_graph.priority_queue.priority_queue import extract_min
-from graph_algorithms.paths_in_graph.priority_queue.priority_queue import set_priority
-from graph_algorithms.paths_in_graph.priority_queue.priority_queue import decrease_priority
-from graph_algorithms.paths_in_graph.priority_queue.priority_queue import is_empty
-
-from graph_algorithms.paths_in_graph.distance import make_distances
-from graph_algorithms.paths_in_graph.distance import set_distance
-from graph_algorithms.paths_in_graph.relax import relax
-from graph_algorithms.paths_in_graph.relax import edge_weight
+from graph_algorithms.data_structure.priority_queue.priority_queue import make_priority_queue
+from graph_algorithms.data_structure.priority_queue.priority_queue import extract_min
+from graph_algorithms.data_structure.priority_queue.priority_queue import set_priority
+from graph_algorithms.data_structure.priority_queue.priority_queue import decrease_priority
+from graph_algorithms.data_structure.priority_queue.priority_queue import is_empty
+
+from graph_algorithms.data_structure.distance import make_distances
+from graph_algorithms.data_structure.distance import set_distance
+from graph_algorithms.algorithms.relax import relax
+from graph_algorithms.algorithms.relax import edge_weight
 
 from graph_algorithms.exception.graph_exception import NotContainsVertexException
 from graph_algorithms.exception.messages import not_contains_vertex_message

graph_algorithms/dfs/connected_components.py renamed to graph_algorithms/algorithms/dfs/connected_components.py

@@ -3,9 +3,9 @@
 The function gets the edge (u, v) of the graph and and tries to improve the distance to v
 """
 
-from graph_algorithms.paths_in_graph.distance import get_distance
-from graph_algorithms.paths_in_graph.distance import set_distance
-from graph_algorithms.paths_in_graph.distance import number
+from graph_algorithms.data_structure.distance import get_distance
+from graph_algorithms.data_structure.distance import set_distance
+from graph_algorithms.data_structure.distance import number
 
 
 def relax(first_vertex, second_vertex, distance):

graph_algorithms/dfs/contains_circle.py renamed to graph_algorithms/algorithms/dfs/contains_circle.py

@@ -4,7 +4,7 @@
 
 from collections import deque
 
-from graph_algorithms.dfs.contains_circle import contains_circle
+from graph_algorithms.algorithms.dfs.contains_circle import contains_circle
 from graph_algorithms.exception.graph_exception import GraphContainsCircleException
 from graph_algorithms.exception.messages import sorting_not_possible_message
 

graph_algorithms/dfs/dfs_iterative.py renamed to graph_algorithms/algorithms/dfs/dfs_iterative.py

@@ -4,7 +4,7 @@
 
 The collection stores items:
     - key: vertex-identifier
-    - value: disatance
+    - value: distance
 
 Doesn't check if a key is contained in a collection.
 """
@@ -19,7 +19,7 @@ def make_distances(graph):
         graph: graph for construct collection
 
     Returns:
-        distance: collection (key:vertex-identifier, value:disatance)
+        distance: collection (key:vertex-identifier, value:distance)
     """
     return {vertex.identifier: None for vertex in graph}
 
@@ -57,7 +57,7 @@ def number(distance):
         distance: distance for convert
 
     Returns:
-        disatance: if disatance == None then return sys.maxsize else distance
+        distance: if distance == None then return sys.maxsize else distance
     """
     if distance is None:
         return sys.maxsize

graph_algorithms/dfs/dfs_recursion.py renamed to graph_algorithms/algorithms/dfs/dfs_recursion.py

@@ -1,15 +1,15 @@
 # -*- coding:utf-8 -*-
 """Graph data structure implementation."""
 
-from graph_algorithms.graph.vertex import Vertex
+from graph_algorithms.data_structure.graph.vertex import Vertex
+from graph_algorithms.data_structure.graph.edge import Edge
 
 from graph_algorithms.exception.graph_exception import GraphContainsVertexExemption
 from graph_algorithms.exception.graph_exception import NotContainsVertexException
 from graph_algorithms.exception.graph_exception import GraphIsEmptyException
 from graph_algorithms.exception.messages import graph_is_empty_message
 from graph_algorithms.exception.messages import not_contains_vertex_message
 from graph_algorithms.exception.messages import graph_contains_vertex_message
-from graph_algorithms.graph.edge import Edge
 
 
 class Graph(object):

graph_algorithms/dfs/explore.py renamed to graph_algorithms/algorithms/dfs/explore.py

@@ -5,7 +5,7 @@
 Private data structure. Only for search algorithms.
 """
 
-from graph_algorithms.paths_in_graph.priority_queue.heapdict.heapdict import heapdict
+from graph_algorithms.data_structure.priority_queue.heapdict.heapdict import heapdict
 
 import sys
 

graph_algorithms/dfs/topological_sort.py renamed to graph_algorithms/algorithms/dfs/topological_sort.py

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "graph algorithms"
-version = "0.5.1"
+version = "0.6.2"
 description = "graph algorithms implementation"
 authors = ["Denis <Dysprosium92@ya.ru>"]
 license = "MIT"

graph_algorithms/paths_in_graph/dijkstra/__init__.py renamed to graph_algorithms/algorithms/dijkstra/__init__.py

@@ -6,18 +6,18 @@ max-line-length = 100
 doctests = True
 enable-extensions = G
 isort-show-traceback = True
-exclude = algorithms/paths_in_graph/priority_queue/heapdict
+exclude = graph_algorithms/data_structure/priority_queue/heapdict
 
 ignore = I005, I004, I003, I001, WPS214, WPS420, D208, E501
 
 per-file-ignores =
- algorithms/dfs/dfs_iterative.py: WPS440, WPS441, WPS507
- algorithms/paths_in_graph/distance.py: WPS502
- algorithms/paths_in_graph/bfs/queue.py: WPS507
- algorithms/exception/messages.py: DAR101
- algorithms/paths_in_graph/dijkstra/dijkstra.py: WPS347, WPS507, WPS201
- algorithms/paths_in_graph/priority_queue/priority_queue.py: WPS507
- algorithms/paths_in_graph/bellman_ford/bellman_ford.py: WPS518
+ graph_algorithms/algorithms/dfs/dfs_iterative.py: WPS440, WPS441, WPS507
+ graph_algorithms/data_structure/distance.py: WPS502
+ graph_algorithms/algorithms/bfs/queue.py: WPS507
+ graph_algorithms/exception/messages.py: DAR101
+ graph_algorithms/algorithms/dijkstra/dijkstra.py: WPS347, WPS507, WPS201
+ graph_algorithms/data_structure/priority_queue/priority_queue.py: WPS507
+ graph_algorithms/algorithms/bellman_ford/bellman_ford.py: WPS518
 
 [isort]
 # See https://github.com/timothycrosley/isort#multi-line-output-modes

graph_algorithms/paths_in_graph/dijkstra/dijkstra.py renamed to graph_algorithms/algorithms/dijkstra/dijkstra.py

@@ -4,8 +4,8 @@
 
 import pytest
 
-from algorithms.graph.graph import Graph
-from algorithms.dfs.connected_components import connected_components
+from graph_algorithms.data_structure.graph.graph import Graph
+from graph_algorithms.algorithms.dfs.connected_components import connected_components
 
 
 def test_one_component():

graph_algorithms/paths_in_graph/relax.py renamed to graph_algorithms/algorithms/relax.py

@@ -4,9 +4,9 @@
 
 import pytest
 
-from algorithms.graph.graph import Graph
-from algorithms.dfs.dfs_recursion import dfs_recursion
-from algorithms.dfs.dfs_iterative import dfs_iterative
+from graph_algorithms.data_structure.graph.graph import Graph
+from graph_algorithms.algorithms.dfs.dfs_recursion import dfs_recursion
+from graph_algorithms.algorithms.dfs.dfs_iterative import dfs_iterative
 
 
 def test_all_vertex_visited_dfs_iterative1():

graph_algorithms/topological_sort.py renamed to graph_algorithms/algorithms/topological_sort.py

@@ -4,9 +4,9 @@
 
 import pytest
 
-from algorithms.dfs.topological_sort import topological_sort as dfs_topological_sort
-from algorithms.topological_sort import topological_sort
-from algorithms.graph.graph import Graph
+from graph_algorithms.algorithms.dfs.topological_sort import topological_sort as dfs_topological_sort
+from graph_algorithms.algorithms.topological_sort import topological_sort
+from graph_algorithms.data_structure.graph.graph import Graph
 
 
 def test_topological_sort1():

graph_algorithms/paths_in_graph/__init__.py renamed to graph_algorithms/data_structure/__init__.py

@@ -2,15 +2,15 @@
 
 import pytest
 
-from algorithms.paths_in_graph.bfs.bfs import bfs
-from algorithms.graph.graph import Graph
-from algorithms.graph.vertex import Vertex
+from graph_algorithms.algorithms.bfs.bfs import bfs
+from graph_algorithms.data_structure.graph.graph import Graph
+from graph_algorithms.data_structure.graph.graph import Vertex
 
-from algorithms.exception.graph_exception import NotContainsVertexException
-from algorithms.exception.messages import not_contains_vertex_message
+from graph_algorithms.exception.graph_exception import NotContainsVertexException
+from graph_algorithms.exception.messages import not_contains_vertex_message
 
-from algorithms.exception.graph_exception import GraphIsEmptyException
-from algorithms.exception.messages import graph_is_empty_message
+from graph_algorithms.exception.graph_exception import GraphIsEmptyException
+from graph_algorithms.exception.messages import graph_is_empty_message
 
 
 def test_bfs_positive1():

graph_algorithms/paths_in_graph/distance.py renamed to graph_algorithms/data_structure/distance.py

@@ -2,19 +2,19 @@
 
 import pytest
 
-from algorithms.graph.graph import Graph
-from algorithms.graph.vertex import Vertex
+from graph_algorithms.data_structure.graph.graph import Graph
+from graph_algorithms.data_structure.graph.vertex import Vertex
 
-from algorithms.paths_in_graph.dijkstra.dijkstra import dijkstra
-from algorithms.paths_in_graph.bellman_ford.bellman_ford import bellman_ford
+from graph_algorithms.algorithms.dijkstra.dijkstra import dijkstra
+from graph_algorithms.algorithms.bellman_ford.bellman_ford import bellman_ford
 
-from algorithms.paths_in_graph.distance import get_distance
+from graph_algorithms.data_structure.distance import get_distance
 
-from algorithms.exception.graph_exception import NotContainsVertexException
-from algorithms.exception.messages import not_contains_vertex_message
+from graph_algorithms.exception.graph_exception import NotContainsVertexException
+from graph_algorithms.exception.messages import not_contains_vertex_message
 
-from algorithms.exception.graph_exception import GraphIsEmptyException
-from algorithms.exception.messages import graph_is_empty_message
+from graph_algorithms.exception.graph_exception import GraphIsEmptyException
+from graph_algorithms.exception.messages import graph_is_empty_message
 
 
 @pytest.mark.parametrize("f", [dijkstra, bellman_ford])

graph_algorithms/graph/__init__.py renamed to graph_algorithms/data_structure/graph/__init__.py

@@ -4,16 +4,16 @@
 
 import pytest
 
-from algorithms.graph.graph import Graph
+from graph_algorithms.data_structure.graph.graph import Graph
+from graph_algorithms.data_structure.graph.vertex import Vertex
 
-from algorithms.exception.graph_exception import GraphContainsVertexExemption
-from algorithms.exception.graph_exception import GraphIsEmptyException
-from algorithms.exception.graph_exception import NotContainsVertexException
+from graph_algorithms.exception.graph_exception import GraphContainsVertexExemption
+from graph_algorithms.exception.graph_exception import GraphIsEmptyException
+from graph_algorithms.exception.graph_exception import NotContainsVertexException
 
-from algorithms.exception.messages import graph_contains_vertex_message
-from algorithms.exception.messages import graph_is_empty_message
-from algorithms.exception.messages import not_contains_vertex_message
-from algorithms.graph.vertex import Vertex
+from graph_algorithms.exception.messages import graph_contains_vertex_message
+from graph_algorithms.exception.messages import graph_is_empty_message
+from graph_algorithms.exception.messages import not_contains_vertex_message
 
 
 def test_make_graph():