es02 ex03 final

kainoj · Apr 11, 2018 · b28d3be · b28d3be
1 parent 2c0e0c3
commit b28d3be
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 115 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 __pycache__/
 data/
 *.gz
-*.txt
+*.txt
+es*/.vscode/
diff --git a/es02/.vscode/.ropeproject/config.py b/es02/.vscode/.ropeproject/config.py
diff --git a/es02/ex3.py b/es02/ex3.py
@@ -2,14 +2,25 @@
 import heapq
 import queue
 import sys
+from math import sqrt
 
 class Sokoban(ex2.Sokoban):
 
+    def dist(self, a, b):
+        return abs(a[0] - b[0]) + abs(a[1] - b[1])
+
+    def dist2(self, a, b):
+        x = a[0] - b[0]
+        y = a[1] - b[1]
+        return sqrt(x**2 + y**2)
+
     def computeH(self, state):
         """
         Computes heuristic function and retruns modified (soko) state
+        state.h = state.depth <=> BFS
         """
-        state.h = state.depth
+        d = [min([self.dist(b, g) for g in self.goals])  for b in state.boxes]
+        state.h = sum(d)/len(d)
         return state
 
     def bestFirstSearch(self):
@@ -71,5 +82,4 @@ def bestFirstSearch(self):
     ans = soko.bestFirstSearch()
     fout = open(foutput,"w")
     print(ans, file=fout)
-    print(ans)