]> rtime.felk.cvut.cz Git - hubacji1/iamcar.git/commitdiff
Fix NNVERSION if directive
authorJiri Hubacek <hubacji1@fel.cvut.cz>
Thu, 20 Sep 2018 18:22:44 +0000 (20:22 +0200)
committerJiri Hubacek <hubacji1@fel.cvut.cz>
Thu, 20 Sep 2018 18:22:44 +0000 (20:22 +0200)
base/main.cc
base/rrtbase.cc

index 8d2153711e1edef72adc4b4a9f711424cd75492f..02e10d541e118438fb23ae198e6a9f65a1108d76 100644 (file)
@@ -73,7 +73,7 @@ int main()
                         p.next();
                         p.tend();
                 }
-#if NNVERSION>0
+#if NNVERSION > 1
                 nn = p.nn(p.iy_, p.goal(), p.cost);
 #else
                 nn = p.nn(p.nodes(), p.goal(), p.cost);
index 1e56ed30fbb774b9be7424855a8cd82ef75b69b3..a51b4536d0503ef876efed0b7a923e0770f09bdd 100644 (file)
@@ -367,7 +367,7 @@ bool RRTBase::rebase(RRTNode *nr)
                 }
                 if (to_del < this->nodes_.size())
                         this->nodes_.erase(this->nodes_.begin() + to_del);
-#if NNVERSION > 0
+#if NNVERSION > 1
                 iy = IYI(tmp->y());
                 to_del = this->iy_[iy].size();
                 #pragma omp parallel  for reduction(min: to_del)