finished ILS

hmp-anthony · hmp-anthony · commit ec662d67e46a · 2024-09-06T14:43:16.000+01:00
diff --git a/iterative_lengthening_search.ipynb b/iterative_lengthening_search.ipynb
@@ -2,7 +2,7 @@
  "cells": [
   {
    "cell_type": "code",
-   "execution_count": 51,
+   "execution_count": 127,
    "id": "ef35fc56-180a-4d1a-9099-bed021f6e0ee",
    "metadata": {},
    "outputs": [],
@@ -24,33 +24,28 @@
     "            s = child.state\n",
     "            # if the path_cost is larger than cost_limit, we need to ignore this child.\n",
     "            if child.path_cost > cost_limit:\n",
-    "                print(child.state, child.path_cost) \n",
     "                if lowest_path_cost == None or child.path_cost < lowest_path_cost:\n",
     "                    lowest_path_cost = child.path_cost\n",
-    "                    result = Node('cost_limit_reached', path_cost = lowest_path_cost)\n",
+    "                    result = Node('cost_limit_reached',\n",
+    "                                  path_cost = lowest_path_cost)\n",
     "            elif s not in reached or child.path_cost < reached[s].path_cost:\n",
     "                reached[s] = child\n",
     "                frontier.add(child)\n",
     "    return result\n",
     "\n",
     "def iterative_lengthening_search(problem):\n",
-    "    print(\"first iteration\")\n",
     "    n = best_first_limited_cost_search(problem, g, 0)\n",
-    "    print('\\t', n.path_cost)\n",
-    "    \n",
-    "    print(\"second iteration\")\n",
-    "    n = best_first_limited_cost_search(problem, g, n.path_cost)\n",
-    "    print('\\t', n.path_cost)\n",
-    "    \n",
-    "    print(\"third iteration\")\n",
-    "    n = best_first_limited_cost_search(problem, g, 1000)\n",
-    "    print('\\t', n.path_cost)\n",
+    "    iteration = 0\n",
+    "    while(n.state == 'cost_limit_reached'):\n",
+    "        n = best_first_limited_cost_search(problem, g, n.path_cost)\n",
+    "        iteration = iteration + 1\n",
+    "    print(iteration)\n",
     "    return n"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 52,
+   "execution_count": 134,
    "id": "99015fa1-471a-4149-bfe1-4bd7f12671fd",
    "metadata": {},
    "outputs": [],
@@ -76,72 +71,35 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 53,
+   "execution_count": 135,
    "id": "9e580734-b4f8-4d48-82d2-adcac10f8714",
    "metadata": {},
    "outputs": [
     {
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "first iteration\n",
-      "Z 75\n",
-      "S 140\n",
-      "T 118\n",
-      "\t 75\n",
-      "second iteration\n",
-      "S 140\n",
-      "T 118\n",
-      "O 146\n",
-      "A 150\n",
-      "\t 118\n",
-      "third iteration\n",
-      "\t 418\n"
+      "23\n",
+      "35\n",
+      "37\n"
      ]
     },
     {
      "data": {
       "text/plain": [
-       "['A', 'S', 'R', 'P', 'B']"
+       "['E', 'H', 'U', 'B', 'P', 'R', 'S', 'A', 'T']"
       ]
      },
-     "execution_count": 53,
+     "execution_count": 135,
      "metadata": {},
      "output_type": "execute_result"
     }
    ],
    "source": [
-    "path_states(iterative_lengthening_search(r1))"
+    "path_states(iterative_lengthening_search(r1))\n",
+    "path_states(iterative_lengthening_search(r2))\n",
+    "path_states(iterative_lengthening_search(r3))"
    ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 54,
-   "id": "8b501fbc-64e9-48c4-81d1-03af28b8c8c6",
-   "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "['A', 'S', 'R', 'P', 'B']\n",
-      "418\n"
-     ]
-    }
-   ],
-   "source": [
-    "n = uniform_cost_search(r1)\n",
-    "print(path_states(n))\n",
-    "print(n.path_cost)"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "09f683d4-d27e-4b9b-b279-bb7c46673870",
-   "metadata": {},
-   "outputs": [],
-   "source": []
   }
  ],
  "metadata": {
