chingu-pathfinding 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e40cf76e8b0907e849089d8e76da75a54e25843
-  data.tar.gz: 616929d9dcf559c235cc0b7c9f7efa57a3dcf015
+  metadata.gz: 8858650c171257bdd67fb05a33dd949d39571085
+  data.tar.gz: d4752cef76413e77f5eed22aa64826688c90b222
 SHA512:
-  metadata.gz: a2d9d6bb0c64c695809d717ecdb7b7a525a88da92506650379dd6102058ae39b2723beaf9d31d8c13034a8316d1bde981253e2db997bf65492a39e7a67d701e4
-  data.tar.gz: 96c63f137ddfb6327da4dee754dd7b04a59f1aa79e55373f2b27303cbebb70f0d7f713c48a72a7a526294a97b07cba05751bfe59d80e6c7e7d98706df6bdb20c
+  metadata.gz: ec0100d0ac4eb14e8e76121b3c2949310971a6bf9ce825580c0e6d12300c667a29f3c20750436d97212b71342b918db2f22e5689283c2e8da061320cabbb2856
+  data.tar.gz: 16617428a3c769015618d6b89579a525f15dc65db5ad0a73a10b64257489807ed0e6b80a3aa896058ca4539fd96b32856244775a694d2cbe356993c0a337be8b

data/ext/chingu_pathfinding/chingu_pathfinding.cpp

@@ -9,6 +9,7 @@
 #include <functional>
 #include <stdexcept>
 #include <sstream>
+#include <limits>
 
 static void Init_pathfinding();
 
@@ -37,16 +38,16 @@ struct point_t {
 };
 typedef std::pair<long int, long int> location_t;
 
-long int dist(const location_t& a, const location_t& b) {
-  long int dx = a.first-b.first;
-  long int dy = a.second-b.second;
-  return std::abs(dx) + std::abs(dy);
+float dist(const location_t& a, const location_t& b) {
+  float dx = a.first-b.first;
+  float dy = a.second-b.second;
+  return std::sqrt(dx*dx + dy*dy);
 }
 
 class path_t {
   std::map< location_t, point_t >* map_p;
   std::multimap< location_t, location_t >* connectivity_p;
-  long int cost_paid;
+  float cost_paid;
 
   public:
   std::vector<location_t> path;
@@ -55,7 +56,7 @@ class path_t {
   path_t(std::map< location_t, point_t >* mm,
       std::multimap< location_t, location_t >* cc) 
     : map_p(mm), connectivity_p(cc), cost_paid(0), path() { }
-  long int get_cost_paid() const { return cost_paid; }
+  float get_cost_paid() const { return cost_paid; }
   void add_loc(location_t l, const location_t& goal) {
     if (!path.empty()) {
       location_t last = *path.crbegin();
@@ -63,7 +64,7 @@ class path_t {
     }
     path.push_back(l);
   }
-  long int dist_to(const location_t& goal) const {
+  float dist_to(const location_t& goal) const {
     return dist(*path.crbegin(), goal);
   }
 
@@ -98,6 +99,7 @@ class pathfinder_t {
   }
 
   bool line_blocked(const long int x1, const long int y1, const long int x2, const long int y2) {
+    if (block_size == 1) return false;
     long int dx = dir(x1, x2);
     long int dy = dir(y1, y2);
     long int runner_x = x1;
@@ -169,14 +171,20 @@ class pathfinder_t {
     init_path.add_loc(start, goal);
     // Cut out the part of the path already visited
     bool drop = true;
+    float last_dist = std::numeric_limits<float>::max();
     for (location_t l : current) {
-      if (dist(l, start) < block_size) {
+      float d = dist(l, start);
+      if (d > last_dist) {
         drop = false;
       }
       if (!drop && start != l) {
         init_path.add_loc(l, goal);
         queue.push(init_path);
       }
+      last_dist = d;
+    }
+    if (queue.empty()) {
+      queue.push(init_path);
     }
     // Add every prefix of current to initial guess and converge to new location.
     return find_path_internal(queue, goal);

data/lib/chingu_pathfinding.rb

@@ -1,5 +1,5 @@
 class Pathfinding
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
   def find_path(x1, y1, x2, y2)
     throw "Require points to be numeric, got #{[x1, y1, x2, y2]}." unless [x1,y1,x2,y2].all? {|x| x.kind_of?(Numeric)}
     _find_path(x1, y1, x2, y2)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chingu-pathfinding
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - zombiecalypse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-08 00:00:00.000000000 Z
+date: 2014-06-11 00:00:00.000000000 Z
 dependencies: []
 description: Find paths C supported on a static map with the A* algorithm.
 email: maergil@gmail.com