Start our first tests

Author: rocky

.pre-commit-config.yaml

@@ -9,13 +9,18 @@ repos:
       stages: [commit]
     - id: end-of-file-fixer
       stages: [commit]
-    - id: trailing-whitespace
+# -   repo: https://github.com/pycqa/isort
+#     rev: 5.10.1
+#     hooks:
+#       - id: isort
+#         stages: [commit]
 -   repo: https://github.com/psf/black
     rev: 22.3.0
     hooks:
     - id: black
       language_version: python3
       exclude: 'pymathics/graph/version.py'
+      stages: [commit]
 -   repo: https://github.com/pycqa/flake8
     rev: 3.9.2
     hooks:

Makefile

@@ -5,8 +5,8 @@
 # remake --tasks to shows the targets and the comments
 
 GIT2CL ?= admin-tools/git2cl
-PYTHON ?= python3
-PIP ?= pip3
+PYTHON ?= python
+PIP ?= $(PYTHON) -m pip
 RM  ?= rm
 
 .PHONY: all build \
@@ -40,7 +40,7 @@ install: pypi-setup
 	$(PYTHON) setup.py install
 
 # Run tests
-check: pytest doctest
+test check: pytest
 
 #: Remove derived files
 clean: clean-pyc
@@ -51,7 +51,7 @@ clean-pyc:
 
 #: Run py.test tests. Use environment variable "o" for pytest options
 pytest:
-	py.test test $o
+	$(PYTHON) -m pytest test $o
 
 
 # #: Create data that is used to in Django docs and to build TeX PDF

pymathics/graph/algorithms.py

@@ -5,8 +5,11 @@
 networkx does all the heavy lifting.
 """
 
+from typing import Optional
+
 from mathics.core.convert.expression import to_mathics_list
 from mathics.core.convert.python import from_python
+from mathics.core.evaluation import Evaluation
 from mathics.core.expression import Expression
 from mathics.core.list import ListExpression
 from mathics.core.symbols import SymbolFalse
@@ -25,7 +28,7 @@
 class ConnectedComponents(_NetworkXBuiltin):
     """
     ## >> g = Graph[{1 -> 2, 2 -> 3, 3 <-> 4}]; ConnectedComponents[g]
-    ##  = {{4, 3}, {2}, {1}}
+    ##  = {{3, 4}, {2}, {1}}
 
     ## >> g = Graph[{1 -> 2, 2 -> 3, 3 -> 1}]; ConnectedComponents[g]
     ## = {{1, 2, 3}}
@@ -34,7 +37,9 @@ class ConnectedComponents(_NetworkXBuiltin):
     ##  = {{4, 5}, {1, 2, 3}}
     """
 
-    def eval(self, graph, expression, evaluation, options):
+    def eval(
+        self, graph, expression, evaluation: Evaluation, options: dict
+    ) -> Optional[ListExpression]:
         "ConnectedComponents[graph_, OptionsPattern[%(name)s]]"
         graph = self._build_graph(graph, evaluation, options, expression)
         if graph:
@@ -54,10 +59,10 @@ def eval(self, graph, expression, evaluation, options):
 #       <dd>returns a Hamiltonian path in the given tournament graph.
 #       </dl>
 #     """
-#     def eval_(self, graph, expression, evaluation, options):
-#         "%(name)s[graph_, OptionsPattern[%(name)s]]"
+#     def eval_(self, graph, expression, evaluation: Evaluation, options):
+#         "FindHamiltonianPath[graph_, OptionsPattern[FindHamiltonPath]]"
 
-#         graph = self._build_graph(graph, evaluation, options, expression)
+#         graph = self._build_graph(graph, evaluation: Evaluation, options, expression)
 #         if graph:
 #             # FIXME: for this to work we need to fill in all O(n^2) edges as an adjacency matrix?
 #             path = nx.algorithms.tournament.hamiltonian_path(graph.G)
@@ -106,17 +111,19 @@ class GraphDistance(_NetworkXBuiltin):
      = GraphDistance[{1 -> 2}, 3, 4]
     """
 
-    def eval_s(self, graph, s, expression, evaluation, options):
-        "%(name)s[graph_, s_, OptionsPattern[%(name)s]]"
+    def eval_s(
+        self, graph, s, expression, evaluation: Evaluation, options: dict
+    ) -> Optional[ListExpression]:
+        "GraphDistance[graph_, s_, OptionsPattern[GraphDistance]]"
         graph = self._build_graph(graph, evaluation, options, expression)
         if graph:
             weight = graph.update_weights(evaluation)
             d = nx.shortest_path_length(graph.G, source=s, weight=weight)
             inf = Expression(SymbolDirectedInfinity, 1)
             return to_mathics_list(*[d.get(v, inf) for v in graph.vertices])
 
-    def eval_s_t(self, graph, s, t, expression, evaluation, options):
-        "%(name)s[graph_, s_, t_, OptionsPattern[%(name)s]]"
+    def eval_s_t(self, graph, s, t, expression, evaluation: Evaluation, options: dict):
+        "GraphDistance[graph_, s_, t_, OptionsPattern[GraphDistance]]"
         graph = self._build_graph(graph, evaluation, options, expression)
         if not graph:
             return
@@ -147,7 +154,7 @@ class FindSpanningTree(_NetworkXBuiltin):
 
     options = DEFAULT_GRAPH_OPTIONS
 
-    def eval(self, graph, expression, evaluation, options):
+    def eval(self, graph, expression, evaluation: Evaluation, options: dict):
         "%(name)s[graph_, OptionsPattern[%(name)s]]"
         graph = self._build_graph(graph, evaluation, options, expression)
         if graph:
@@ -182,8 +189,8 @@ class PlanarGraphQ(_NetworkXBuiltin):
 
     options = DEFAULT_GRAPH_OPTIONS
 
-    def eval(self, graph, expression, evaluation, options):
-        "%(name)s[graph_, OptionsPattern[%(name)s]]"
+    def eval(self, graph, expression, evaluation: Evaluation, options: dict):
+        "PlanarGraphQ[graph_, OptionsPattern[PlanarGraphQ]]"
         graph = self._build_graph(graph, evaluation, options, expression)
         if not graph:
             return SymbolFalse
@@ -203,8 +210,8 @@ class WeaklyConnectedComponents(_NetworkXBuiltin):
      = {{1, 2, 3, 4, 5}, {6, 7, 8}}
     """
 
-    def eval(self, graph, expression, evaluation, options):
-        "WeaklyConnectedComponents[graph_, OptionsPattern[%(name)s]]"
+    def eval(self, graph, expression, evaluation: Evaluation, options):
+        "WeaklyConnectedComponents[graph_, OptionsPattern[WeaklyConnectedComponents]]"
         graph = self._build_graph(graph, evaluation, options, expression)
         if graph:
             components = nx.connected_components(graph.G.to_undirected())

test/test_algorithms.py

@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+"""
+Unit tests for mathics.builtins.numbers.algebra
+"""
+from test.helper import check_evaluation, evaluate, evaluate_value
+
+
+def setup_module(module):
+    """Load pymathics.graph"""
+    assert evaluate_value('LoadModule["pymathics.graph"]') == "pymathics.graph"
+    evaluate("SortList[list_] := Sort[Map[Sort, list]]")
+
+
+def test_connected_components():
+    for str_expr, str_expected in [
+        ("g = Graph[{1 -> 2, 2 -> 3, 3 <-> 4}];", "Null"),
+        ("SortList[ConnectedComponents[g]]", "{{1}, {2}, {3, 4}}"),
+        ("g = Graph[{1 -> 2, 2 -> 3, 3 -> 1}];", "Null"),
+        ("SortList[ConnectedComponents[g]]", "{{1, 2, 3}}"),
+    ]:
+        check_evaluation(str_expr, str_expected)
+
+
+def test_graph_distance():
+    for str_expr, str_expected in [
+        ("GraphDistance[{1 <-> 2, 2 <-> 3, 3 <-> 4, 2 <-> 4, 4 -> 5}, 1, 5]", "3"),
+        ("GraphDistance[{1 <-> 2, 2 <-> 3, 3 <-> 4, 4 -> 2, 4 -> 5}, 1, 5]", "4"),
+        # ("GraphDistance[{1 <-> 2, 2 <-> 3, 4 -> 3, 4 -> 2, 4 -> 5}, 1, 5]", "Infinity"),
+        (
+            "Sort[GraphDistance[{1 <-> 2, 2 <-> 3, 3 <-> 4, 2 <-> 4, 4 -> 5}, 3]]",
+            "{0, 1, 1, 2, 2}",
+        ),
+    ]:
+        check_evaluation(str_expr, str_expected)