Refine verification of cycle finder

Author: gjbex

source-code/design-patters/strategy_design_pattern.ipynb

@@ -786,7 +786,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 31,
+   "execution_count": 56,
    "id": "e7368cf0",
    "metadata": {},
    "outputs": [],
@@ -796,17 +796,17 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 32,
+   "execution_count": 57,
    "id": "91426fd9-654b-48e7-a77d-0c78ff248c9e",
    "metadata": {},
    "outputs": [
     {
      "data": {
       "text/plain": [
-       "[0, 0, 1, 0, 0, 1, 1, 0, 1, 1]"
+       "[1, 0, 1, 0, 1, 0, 1, 0, 1, 1]"
       ]
      },
-     "execution_count": 32,
+     "execution_count": 57,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -817,7 +817,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 33,
+   "execution_count": 58,
    "id": "acd88973-5f07-4565-a4fd-ca4fc732b425",
    "metadata": {},
    "outputs": [],
@@ -827,7 +827,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 34,
+   "execution_count": 59,
    "id": "8be1959e-e0fb-4daa-8ccc-0ab5d083e8a3",
    "metadata": {},
    "outputs": [],
@@ -837,7 +837,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 35,
+   "execution_count": 60,
    "id": "3d62e21f-e93c-4870-9c56-6610cfaeb5b9",
    "metadata": {},
    "outputs": [],
@@ -847,7 +847,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 36,
+   "execution_count": 61,
    "id": "128a85b0-2626-431a-adde-137f3738eb8f",
    "metadata": {},
    "outputs": [
@@ -857,7 +857,7 @@
        "(1, 10)"
       ]
      },
-     "execution_count": 36,
+     "execution_count": 61,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -868,28 +868,28 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 37,
+   "execution_count": 62,
    "id": "92d7262c-88b3-46c9-87b9-813144df30da",
    "metadata": {},
    "outputs": [
     {
      "data": {
       "text/plain": [
-       "[[0, 0, 1, 0, 0, 1, 1, 0, 1, 1],\n",
-       " [0, 1, 1, 0, 1, 1, 0, 1, 1, 0],\n",
-       " [1, 1, 0, 1, 1, 0, 1, 1, 0, 0],\n",
-       " [1, 0, 1, 1, 0, 1, 1, 0, 0, 1],\n",
-       " [0, 1, 1, 0, 1, 1, 0, 0, 1, 1],\n",
-       " [1, 1, 0, 1, 1, 0, 0, 1, 1, 0],\n",
-       " [1, 0, 1, 1, 0, 0, 1, 1, 0, 1],\n",
-       " [0, 1, 1, 0, 0, 1, 1, 0, 1, 1],\n",
-       " [1, 1, 0, 0, 1, 1, 0, 1, 1, 0],\n",
-       " [1, 0, 0, 1, 1, 0, 1, 1, 0, 1],\n",
-       " [0, 0, 1, 1, 0, 1, 1, 0, 1, 1],\n",
-       " [0, 1, 1, 0, 1, 1, 0, 1, 1, 0]]"
+       "[[1, 0, 1, 0, 1, 0, 1, 0, 1, 1],\n",
+       " [0, 1, 1, 1, 1, 1, 1, 1, 1, 0],\n",
+       " [1, 1, 0, 0, 0, 0, 0, 0, 0, 0],\n",
+       " [1, 0, 0, 1, 1, 1, 1, 1, 1, 1],\n",
+       " [0, 0, 1, 1, 0, 0, 0, 0, 0, 0],\n",
+       " [1, 1, 1, 0, 0, 1, 1, 1, 1, 1],\n",
+       " [0, 0, 0, 0, 1, 1, 0, 0, 0, 0],\n",
+       " [1, 1, 1, 1, 1, 0, 0, 1, 1, 1],\n",
+       " [0, 0, 0, 0, 0, 0, 1, 1, 0, 0],\n",
+       " [1, 1, 1, 1, 1, 1, 1, 0, 0, 1],\n",
+       " [0, 0, 0, 0, 0, 0, 0, 0, 1, 1],\n",
+       " [0, 1, 1, 1, 1, 1, 1, 1, 1, 0]]"
       ]
      },
-     "execution_count": 37,
+     "execution_count": 62,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -903,26 +903,28 @@
    "id": "3da8dbca-2170-47c6-8de1-aadf6ad6a857",
    "metadata": {},
    "source": [
-    "Just to make sure we define a function that verifies the result.  The generations prior to the start index should not occur in the history, the one at the start index should be equal to the last generation in the history."
+    "Just to make sure we define a function that verifies the result.  The generations prior to the start index should not occur in the history, the one at the start index should be equal to the last generation in the history.  Finally, none of the other generations should occur more than once."
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 38,
+   "execution_count": 65,
    "id": "7a60eae7-3ee5-4c2f-a334-a7629fd5b5dd",
    "metadata": {},
    "outputs": [],
    "source": [
     "def verify_cycle_strategy(strategy, result):\n",
     "    start_idx, cycle_length = result\n",
-    "    for idx in range(start_idx):\n",
-    "        assert strategy._history[idx] not in strategy._history[start_idx:]\n",
-    "    assert strategy._history[start_idx] == strategy._history[-1]"
+    "    for idx, automaton in enumerate(strategy._history[:-1]):\n",
+    "        if idx == start_idx:\n",
+    "            assert automaton == strategy._history[-1]\n",
+    "        else:\n",
+    "            assert automaton not in strategy._history[idx + 1:]    "
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 39,
+   "execution_count": 66,
    "id": "72297084-e9a7-494e-81c7-3b936b60471b",
    "metadata": {},
    "outputs": [],
@@ -940,17 +942,17 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 40,
+   "execution_count": 67,
    "id": "f46f2070-1a3a-40b9-a718-22ee084cff44",
    "metadata": {},
    "outputs": [
     {
      "data": {
       "text/plain": [
-       "[<matplotlib.lines.Line2D at 0x7f6fd6a90400>]"
+       "[<matplotlib.lines.Line2D at 0x7f6fe42ee800>]"
       ]
      },
-     "execution_count": 40,
+     "execution_count": 67,
      "metadata": {},
      "output_type": "execute_result"
     },