jps 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b28b7b851c5c0a8c437e28c05b21d4a5bc808a7
-  data.tar.gz: d032f82ba7aa9b9c8759754a63ce7036f7a61fd0
+  metadata.gz: ecf21875171d5aa914eb76e1d8ed2e5ffa3d7d85
+  data.tar.gz: be6079ef1db2857848bfa48ca937cc1abc5c082d
 SHA512:
-  metadata.gz: 73b594670ef6bb4bb5030287e12e98e9366a8e7c0c5cd5b253d7a4f8ec57a7cba76201f3ab24a2c29156cad09d7a12684797eb9519e143c0170c9b48ed696b7d
-  data.tar.gz: 6a33cdcdcb403f3efd60b7dabaa06efe6d59c557af1aa3effd21bec29c3a43aa3064dd48248ec93fa14dd18d921641adb9555f834af10ae5f3aeabd024055484
+  metadata.gz: 0aed6aa02665f99f2fba4ad677d9e3d743f558b4d91d6dc4a3a33a27f260f2f64fce7240752bfe9b06ca1e5123d04743ee827631fe37c965460f5a49bc7345d8
+  data.tar.gz: 6dbe99b14ff7dae534feada0e0a00acc5e2abef8fd2e741df9f1f78fe7f397c56929854989c29aa10990de8d551ea584c64e1b869d1cec41cb0bc8748a922373

data/ext/jps/map_jps.cpp

@@ -9,9 +9,12 @@
 
 using namespace std;
 
-Map *map = NULL;
-vector<JPS::Position> *path = NULL;
-// std::vector<std::string> out;
+Map *gmap = NULL;
+vector<JPS::Position> gpath;
+
+typedef std::vector<Map *> VEC_MAPS;
+typedef std::map<string, VEC_MAPS *> HASH_MAPS;
+HASH_MAPS *hsMaps = NULL;
 
 inline unsigned Map::operator()(unsigned x, unsigned y) const
 {
@@ -32,16 +35,30 @@ void Map::clear()
   delete[] this->data;
 }
 
+void Map::dispose()
+{
+  int i,j;
+  for(j = 0; j < this->h; ++j)
+  {
+    for(i = 0; i < this->w; ++i)
+    {
+      this->data[j][i] = 0;
+    }
+  }  
+}
+
+
 void Map::init(int width, int height)
 {
   this->w = width;
   this->h = height;
   this->data = new int*[height];
+  
   int i,j;
-  for(j = 0; j < height; ++j)
+  for(j = 0; j < this->h; ++j)
   {
-    this->data[j] = new int[width];
-    for(i = 0; i < width; ++i)
+    this->data[j] = new int[this->w];
+    for(i = 0; i < this->w; ++i)
     {
       this->data[j][i] = 0;
     }
@@ -50,42 +67,38 @@ void Map::init(int width, int height)
 
 void clearMap()
 {
-  if(!map){
-    delete map;
-    map = NULL;
+  if(gmap){
+    recycleMap(gmap);
+    gmap = NULL;
   }
 }
 
 void clearPath()
 {
-  if(!path)
-  {
-    delete path;
-    path = NULL;
-  }
+  gpath.clear();
 }
 
 vector<JPS::Position> * findPath(int startX, int startY, int stopX, int stopY)
 {
-  if(!map || !path){
+  if(!gmap){
     return NULL;
   }
 
-  path->clear();
+  gpath.clear();
 
   //开始和结束位置不能是障碍 不然找不到路径
   //这里先设置成非障碍，查询结束后重置回去
-  int oldStartFlag = map->data[startY][startX];
-  int oldStopFlag = map->data[stopY][stopX];
-  map->data[startY][startX] = 0;
-  map->data[stopY][stopX] = 0;
+  int oldStartFlag = gmap->data[startY][startX];
+  int oldStopFlag = gmap->data[stopY][stopX];
+  gmap->data[startY][startX] = 0;
+  gmap->data[stopY][stopX] = 0;
 
   JPS::PathVector waypoints;
   JPS::PathVector result;
   waypoints.push_back(JPS::Pos(JPS::PosType(startX), startY));
   waypoints.push_back(JPS::Pos(JPS::PosType(stopX), stopY));
 
-  JPS::Searcher<Map> search(*map);
+  JPS::Searcher<Map> search(*gmap);
   search.findPath(result, waypoints[0], waypoints[1], 1);
 
   int curX = startX;
@@ -104,18 +117,18 @@ vector<JPS::Position> * findPath(int startX, int startY, int stopX, int stopY)
     if(curX != x && curY != y)
     {
       JPS::Position pos1;
-      if(map->data[curY][x] == 0)
+      if(gmap->data[curY][x] == 0)
       {
         pos1.x = x;
         pos1.y = curY;
-        path->push_back(pos1);
+        gpath.push_back(pos1);
         curX = x;
       }
-      else if(map->data[y][curX] == 0)
+      else if(gmap->data[y][curX] == 0)
       {
         pos1.x = curX;
         pos1.y = y;
-        path->push_back(pos1);
+        gpath.push_back(pos1);
         curY = y;
       }
     }
@@ -123,28 +136,28 @@ vector<JPS::Position> * findPath(int startX, int startY, int stopX, int stopY)
     JPS::Position pos2;
     pos2.x = x;
     pos2.y = y;
-    path->push_back(pos2);
+    gpath.push_back(pos2);
     curX = x;
     curY = y; 
   }
 
   //查询结束后重置回去
-  map->data[startY][startX] = oldStartFlag;
-  map->data[stopY][stopX] = oldStopFlag;
-  return path;
+  gmap->data[startY][startX] = oldStartFlag;
+  gmap->data[stopY][stopX] = oldStopFlag;
+  return &gpath;
 }
 
 JPS::Position findDstPos(int startX,int startY, int endX, int endY,int step)
 {
   JPS::Position dstPos;
-  if(!map){
+  if(!gmap){
     return dstPos;
   }
 
-  int oldStartFlag = map->data[startY][startX];
-  int oldStopFlag = map->data[endY][endX];
-  map->data[startY][startX] = 0;
-  map->data[endY][endX] = 0;
+  int oldStartFlag = gmap->data[startY][startX];
+  int oldStopFlag = gmap->data[endY][endX];
+  gmap->data[startY][startX] = 0;
+  gmap->data[endY][endX] = 0;
 
   JPS::PathVector waypoints;
   
@@ -152,7 +165,7 @@ JPS::Position findDstPos(int startX,int startY, int endX, int endY,int step)
   waypoints.push_back(JPS::Pos(endX, endY));
   
   JPS::PathVector result;
-  JPS::Searcher<Map> search(*map);
+  JPS::Searcher<Map> search(*gmap);
   search.findPath(result, waypoints[0], waypoints[1], 1);
 
   int curStep = 0;
@@ -173,9 +186,9 @@ JPS::Position findDstPos(int startX,int startY, int endX, int endY,int step)
     if(curX != x && curY != y)
     {
       vector<int> v1;
-      if(map->data[curY][x] == 0)
+      if(gmap->data[curY][x] == 0)
         curX = x;
-      else if(map->data[y][curX] == 0)
+      else if(gmap->data[y][curX] == 0)
         curY = y;
       curStep++;
 
@@ -199,8 +212,8 @@ JPS::Position findDstPos(int startX,int startY, int endX, int endY,int step)
     }
 	}
 
-  map->data[startY][startX] = oldStartFlag;
-  map->data[endY][endX] = oldStopFlag;
+  gmap->data[startY][startX] = oldStartFlag;
+  gmap->data[endY][endX] = oldStopFlag;
 
   return dstPos;
   
@@ -208,23 +221,98 @@ JPS::Position findDstPos(int startX,int startY, int endX, int endY,int step)
 
 void initMap(int width,int height)
 {
-  if(map != NULL){
+  if(gmap != NULL)
     clearMap();
+
+  clearPath();
+    
+  gmap = borrowMap(width, height);
+}
+
+void setMapPos(int posX, int posY,int flag)
+{
+  if(!gmap){
+    return;
   }
-  if(path != NULL){
-    clearPath();
+  gmap->data[posY][posX] = flag;
+}
+
+int getMapPos(int posX, int posY)
+{
+  if(!gmap){
+    return 0;
   }
 
-  map = new Map();
-  map->init(width, height);
+  if(posX < 0 || posX >= gmap->w) return 1;
+  if(posY < 0 || posY >= gmap->h) return 1;
 
-  path = new vector<JPS::Position>();
+  return gmap->data[posY][posX];
 }
 
-void setMapPos(int posX, int posY,int flag)
+/**********************map pool**********************/
+string makeKey(int width, int height)
 {
-  if(!map){
-    return;
+  char buff[8] = {0};
+  sprintf(buff, "%d_%d", width, height);
+  std::string ret = buff;
+  return ret;
+}
+
+Map * borrowMap(int width, int height)
+{
+  assert(width > 0);
+  assert(height > 0);
+      
+  std::string key = makeKey(width, height);
+  if(hsMaps == NULL)
+    hsMaps = new HASH_MAPS();
+  
+  VEC_MAPS *pvecMaps = NULL;
+  HASH_MAPS::iterator it = hsMaps->find(key);
+  if(it != hsMaps->end()){
+    pvecMaps = it->second;
+  }else{
+    pvecMaps = new VEC_MAPS();
+    (*hsMaps)[key] = pvecMaps;
   }
-  map->data[posY][posX] = flag;
+
+  Map *ret = NULL;
+  if(pvecMaps->size() > 0){
+    ret = pvecMaps->back();
+    pvecMaps->pop_back();
+  }else{
+    ret = new Map();
+    ret->init(width, height);
+    pvecMaps->push_back(ret);
+  }
+
+  return ret;    
+}
+
+void recycleMap(Map * pmap)
+{
+  assert(pmap != NULL);
+  std::string key = makeKey(pmap->w, pmap->h);
+  HASH_MAPS::iterator it = hsMaps->find(key);
+  assert(it != hsMaps->end());
+  VEC_MAPS *pvecMaps = it->second;
+
+  pmap->dispose();
+  pvecMaps->push_back(pmap);
+}
+
+int getPooldMapKindSize()
+{
+  return hsMaps->size();
 }
+
+int getPooldMapSize(int width, int height)
+{
+  std::string key = makeKey(width, height);
+  HASH_MAPS::iterator it = hsMaps->find(key);
+  if(it == hsMaps->end()) return 0;
+  return it->second->size();
+}
+
+  
+

data/ext/jps/map_jps.h

@@ -2,11 +2,14 @@
 #define MAP_JPS_H_
 #include "jps.hh"
 #include <vector>
+#include <string>
+#include <map>
 #include <iostream>
 using namespace std;
   struct Map{
     void init(int width, int height);
     void clear();
+    void dispose();
     unsigned operator()(unsigned x, unsigned y) const;
     int w,h;
     int **data;
@@ -19,4 +22,10 @@ using namespace std;
   JPS::Position findDstPos(int startX,int startY, int endX, int endY,int step);
   void initMap(int width,int height);
   void setMapPos(int posX, int posY,int flag);
+  int getMapPos(int posX, int posY);
+
+  Map * borrowMap(int width, int height);
+  void recycleMap(Map * map);
+  int getPooldMapKindSize();
+  int getPooldMapSize(int width, int height);
 #endif

data/ext/jps/rjps.cpp

@@ -4,16 +4,14 @@
 #include "jps.hh"
 #include <vector>
 
-extern vector<JPS::Position> *path;
-extern Map *map;
+extern vector<JPS::Position> gpath;
+extern Map *gmap;
 
 
 VALUE find_path(VALUE self, VALUE start_x, VALUE start_y, VALUE stop_x, VALUE stop_y)
 {
-  if(map == NULL)
-    return rb_str_new2("Map is null, plz init map first!");
-  if(path == NULL)
-    return rb_str_new2("path is null, plz init map first!");
+  if(gmap == NULL)
+    return rb_str_new2("Map is null, plz init gmap first!");
 
   int startX = NUM2INT(start_x);
   int startY = NUM2INT(start_y);
@@ -28,7 +26,7 @@ VALUE find_path(VALUE self, VALUE start_x, VALUE start_y, VALUE stop_x, VALUE st
   for(i=0; i< p->size(); ++i)
   {  
     VALUE arr2 = rb_ary_new();
-    JPS::Position ret = (*path)[i];
+    JPS::Position ret = gpath[i];
     rb_ary_push(arr2, INT2NUM(ret.x));
     rb_ary_push(arr2, INT2NUM(ret.y));
     rb_ary_push(arr1, arr2); 
@@ -38,9 +36,9 @@ VALUE find_path(VALUE self, VALUE start_x, VALUE start_y, VALUE stop_x, VALUE st
   // return INT2FIX(p);
 }
 
-VALUE get_path_length(VALUE self)
+VALUE get_path_length(VALUE self, VALUE path)
 {
-  return INT2NUM(path->size());
+  return INT2NUM(RARRAY_LEN(path));
 }
 
 VALUE clear_map(VALUE self)
@@ -52,10 +50,8 @@ VALUE clear_map(VALUE self)
 
 VALUE find_dst_pos(VALUE self, VALUE start_x, VALUE start_y, VALUE end_x, VALUE end_y, VALUE step)
 {
-  if(map == NULL)
-    return rb_str_new2("Map is null, plz init map first!");
-  if(path == NULL)
-    return rb_str_new2("path is null, plz init map first!");
+  if(gmap == NULL)
+    return rb_str_new2("Map is null, plz init gmap first!");
 
   int startX = NUM2INT(start_x);
   int startY = NUM2INT(start_y);
@@ -63,13 +59,13 @@ VALUE find_dst_pos(VALUE self, VALUE start_x, VALUE start_y, VALUE end_x, VALUE
   int endY = NUM2INT(end_y);
   int sp = NUM2INT(step);
   
-  if(startX < 0 || startX >= map->w)
+  if(startX < 0 || startX >= gmap->w)
     return rb_str_new2("startX is overflow!");
-  if(startY < 0 || startY >= map->w)
+  if(startY < 0 || startY >= gmap->w)
     return rb_str_new2("startY is overflow!");
-  if(endX < 0 || endX >= map->w)
+  if(endX < 0 || endX >= gmap->w)
     return rb_str_new2("endX is overflow!");
-  if(endY < 0 || endY >= map->w)
+  if(endY < 0 || endY >= gmap->w)
     return rb_str_new2("endY is overflow!");
 
   JPS::Position ret = findDstPos(startX, startY, endX, endY, sp);
@@ -84,7 +80,7 @@ VALUE find_dst_pos(VALUE self, VALUE start_x, VALUE start_y, VALUE end_x, VALUE
 VALUE get_path_point(VALUE self, VALUE idx)
 {
   int index = NUM2INT(idx);
-  JPS::Position ret = (*path)[index];
+  JPS::Position ret = gpath[index];
   VALUE point = rb_ary_new();
   rb_ary_push(point, INT2NUM(ret.x));
   rb_ary_push(point, INT2NUM(ret.y));
@@ -93,8 +89,8 @@ VALUE get_path_point(VALUE self, VALUE idx)
 
 VALUE set_map_pos(VALUE self, VALUE posX, VALUE posY, VALUE flag)
 {
-  if(map == NULL)
-    return rb_str_new2("Map is null, plz init map first!");
+  if(gmap == NULL)
+    return rb_str_new2("Map is null, plz init gmap first!");
   int x = NUM2INT(posX);
   int y = NUM2INT(posY);
   int fg = NUM2INT(flag);
@@ -103,6 +99,18 @@ VALUE set_map_pos(VALUE self, VALUE posX, VALUE posY, VALUE flag)
   return INT2NUM(0);
 }
 
+VALUE get_map_pos(VALUE self, VALUE posX, VALUE posY)
+{
+  if(gmap == NULL)
+    return rb_str_new2("Map is null, plz init gmap first!");
+
+  int x = NUM2INT(posX);
+  int y = NUM2INT(posY);
+  int fg = getMapPos(x, y);
+
+  return INT2NUM(fg);
+}
+
 VALUE init_map(VALUE self, VALUE width, VALUE height)
 {
   int w = NUM2INT(width);
@@ -111,16 +119,32 @@ VALUE init_map(VALUE self, VALUE width, VALUE height)
   return INT2NUM(0);
 }
 
+VALUE get_pooled_map_kind_size(VALUE self)
+{
+  int si = getPooldMapKindSize();
+  return INT2NUM(si);
+}
+
+VALUE get_pooled_map_size(VALUE self, VALUE width, VALUE height)
+{
+  int w = NUM2INT(width);
+  int h = NUM2INT(height);
+  int si = getPooldMapSize(w, h);
+  return INT2NUM(si);
+}
 
 extern "C" void Init_rjps()
 {
   VALUE jps = rb_define_module("Jps");
   rb_define_module_function(jps, "find_path", RUBY_METHOD_FUNC(find_path), 4);
   rb_define_module_function(jps, "init_map", RUBY_METHOD_FUNC(init_map), 2);
-  rb_define_module_function(jps, "get_path_length", RUBY_METHOD_FUNC(get_path_length), 0);
+  rb_define_module_function(jps, "get_path_length", RUBY_METHOD_FUNC(get_path_length), 1);
   rb_define_module_function(jps, "get_path_point", RUBY_METHOD_FUNC(get_path_point), 1);
   rb_define_module_function(jps, "set_map_pos", RUBY_METHOD_FUNC(set_map_pos), 3);
+  rb_define_module_function(jps, "get_map_pos", RUBY_METHOD_FUNC(get_map_pos), 2);
   rb_define_module_function(jps, "clear_map", RUBY_METHOD_FUNC(clear_map), 0);
   rb_define_module_function(jps, "find_dst_pos", RUBY_METHOD_FUNC(find_dst_pos), 5);
+  rb_define_module_function(jps, "get_pooled_map_kind_size", RUBY_METHOD_FUNC(get_pooled_map_kind_size), 0);
+  rb_define_module_function(jps, "get_pooled_map_size", RUBY_METHOD_FUNC(get_pooled_map_size), 2);
 }
 

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: jps
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - ljf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-18 00:00:00.000000000 Z
+date: 2022-07-08 00:00:00.000000000 Z
 dependencies: []
 description: jps automated test application
-email: xxxxxxx@xxxnets.com
+email: duewnjie@gmail.com
 executables: []
 extensions:
 - ext/jps/extconf.rb
@@ -42,7 +42,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: jps