]> rtime.felk.cvut.cz Git - hubacji1/iamcar.git/commitdiff
Find nn if not goal found else nn is goal
authorJiri Hubacek <hubacji1@fel.cvut.cz>
Fri, 5 Oct 2018 14:32:02 +0000 (16:32 +0200)
committerJiri Hubacek <hubacji1@fel.cvut.cz>
Fri, 5 Oct 2018 14:32:02 +0000 (16:32 +0200)
base/main.cc

index ad73d6bbcf37780e55f2d0bfa96c2f7618efbaf1..95080a7c7e03afb37ecc7a820f025fd46119d99a 100644 (file)
@@ -127,12 +127,17 @@ int main()
                         p.next();
                         p.tend();
                 }
+                if (!p.goal_found()) {
 #if NNVERSION > 1
-                nn = p.nn(p.iy_, p.goal(), p.cost);
+                        nn = p.nn(p.iy_, p.goal(), p.cost);
 #else
-                nn = p.nn(p.nodes(), p.goal(), p.cost);
+                        nn = p.nn(p.nodes(), p.goal(), p.cost);
 #endif
-                tr = p.findt(nn);
+                        tr = p.findt(nn);
+                } else {
+                        nn = p.goal();
+                        tr = p.findt();
+                }
                 p.tlog(tr);
 #if JSONLOGEDGES > 0
                 p.logr(p.root());