Merge: new `with` statement

[nit.git] / lib / ai / search.nit

diff --git a/lib/ai/search.nit b/lib/ai/search.nit
index 248ab7c..f406949 100644 (file)
--- a/lib/ai/search.nit
+++ b/lib/ai/search.nit
@@ -99,7 +99,7 @@ interface SearchProblem[S: Object, A]
        # An heuristic of the estimated `cost` going from `state` to a goal state.
        #
        # Is is expected that the heuristic is *admissible*, it means its is an
-       # optimistic estimation that never an over-estimate, thus is cannot be#
+       # optimistic estimation and never an over-estimate, thus is cannot be
        # higher than the lowest possible remaining cost.
        # See `SearchSolver::do_revisit` for details.
        #
@@ -159,8 +159,6 @@ interface SearchProblem[S: Object, A]
        # `steps` is the maximum number of steps a giver configuration can run.
        fun run_configs(steps: Int)
        do
-               var s
-
                var c = 0
                loop
                        if astar.run_config(steps, c, "A*") then break
@@ -199,7 +197,7 @@ end
 # 2. Apply the method `run`, that will search and return a solution.
 # 3. Retrieve information from the solution.
 #
-# ~~~~
+# ~~~~nitish
 # var p: SearchProblem = new MyProblem
 # var res = p.astar.run
 # if res != null then print "Found plan with {res.depth} actions, that cost {res.cost}: {res.plan.join(", ")}"
@@ -597,7 +595,7 @@ class SearchSolver[S: Object, A]
                print msg
 
                var t = new Clock
-               var res = run_steps(steps)
+               run_steps(steps)
                print "\t{self}"
                var l = t.lapse
                print "\ttime={l}"
@@ -608,7 +606,8 @@ end
 # Used to compare nodes with their score.
 # Smaller is score, smaller is the node.
 private class NodeComparator[S: Object, A]
-       super Comparator[SearchNode[S, A]]
+       super Comparator
+       redef type COMPARED: SearchNode[S, A]
        redef fun compare(a,b) do return a.score <=> b.score
 end
 
@@ -732,7 +731,7 @@ class SearchNode[S: Object, A]
                print "result:{state}"
                for n in path do
                        var a = n.action
-                       if a != null then print "    + {a or else ""}"
+                       if a != null then print "    + {a}"
                        print "  {n.steps}: {n.state} ({n.cost}$)"
                end
        end