chingu-gesture 1.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0428ff45bf1eeea2d942b7a8a86570200a9f4e8b
-  data.tar.gz: 3f5f4c00de0cd93992c09e5de697004e8443961a
+  metadata.gz: 617ecd8b10cff68b33eb2c25b9f6b3f8d533afbd
+  data.tar.gz: 994164f4f20be6efbf51cad9feae017858aa77e5
 SHA512:
-  metadata.gz: ebfc053add28334e4a62ea718dfe6c72be40bbf70eb3daff8f3400a030c710e27059898d0adfe4cb3207f988092bb9abf8364ae48867be4fc9c060ca14b7636c
-  data.tar.gz: b06c919f66cbb53a280a99dbc264359f5c4e01559024529913f736527ffb5db93b6b6aef1d26d824d5c50994c45d0df48f05c16aeb14c2b44cbeab8a3523a5e2
+  metadata.gz: 8829456745022d217a349a168eb1b5577cbd74233d576a11fa97d218775e7bb85f0a2592d00933e20183fc5eba2fba90906b286c6af43bcba714453b4c52a360
+  data.tar.gz: ba7131efb16ca401b2c45a219c89044eacad6024f2f79b299a168782f113f216933f425d0b626f18de52b8f3aa15c36d8ea28f4254d44d2ada331bb006c8675b

data/ext/chingu_gesture/chingu_gesture.c

@@ -6,6 +6,18 @@
 const size_t INIT_BUFFER_SIZE = 255;
 const size_t INIT_GESTURE_SIZE = 15;
 
+// helpers
+
+inline float max(float a, float b) {
+  return a > b ? a : b;
+}
+
+inline float min(float a, float b) {
+  return a < b ? a : b;
+}
+
+// types
+
 typedef struct {
   unsigned int x, y;
 } point_t;
@@ -16,6 +28,15 @@ typedef struct {
   size_t n_skeleton;
 } gesture_t;
 
+point_t make_point(int x, int y) {
+  point_t p;
+  p.x = x;
+  p.y = y;
+  return p;
+}
+
+/* class handler */
+
 typedef struct {
   point_t* begin;
   point_t* current;
@@ -25,13 +46,6 @@ typedef struct {
   size_t max_gesture;
 } handler_t;
 
-point_t make_point(int x, int y) {
-  point_t p;
-  p.x = x;
-  p.y = y;
-  return p;
-}
-
 void reset_handler(handler_t* handler) {
   handler->begin = NULL;
   handler->size = 0;
@@ -51,6 +65,16 @@ static void chingu_gesture_free(void* p) {
   reset_handler(handler);
 }
 
+static void double_size(handler_t* handler) {
+  size_t c = handler->current - handler->begin;
+  point_t* new_points = calloc(2*handler->size, sizeof(point_t));
+  memcpy(new_points, handler->begin, handler->size*sizeof(point_t));
+  free(handler->begin);
+  handler->begin = new_points;
+  handler->size = 2*handler->size;
+  handler->current = new_points + c;
+}
+
 static VALUE chingu_gesture_alloc(VALUE klass) {
   handler_t* ptr;
   VALUE obj = Data_Make_Struct(klass, handler_t, NULL, chingu_gesture_free, ptr);
@@ -74,24 +98,6 @@ static VALUE chingu_gesture_init(VALUE self) {
   return self;
 }
 
-static void double_size(handler_t* handler) {
-  size_t c = handler->current - handler->begin;
-  point_t* new_points = calloc(2*handler->size, sizeof(point_t));
-  memcpy(new_points, handler->begin, handler->size*sizeof(point_t));
-  free(handler->begin);
-  handler->begin = new_points;
-  handler->size = 2*handler->size;
-  handler->current = new_points + c;
-}
-
-static void double_size_gesture(handler_t* handler) {
-  gesture_t* new_gestures = calloc(2*handler->max_gesture, sizeof(gesture_t));
-  memcpy(new_gestures, handler->gestures, handler->max_gesture*sizeof(gesture_t));
-  free(handler->gestures);
-  handler->gestures = new_gestures;
-  handler->max_gesture = 2*handler->max_gesture;
-}
-
 static VALUE chingu_gesture_add_point(VALUE self, VALUE x, VALUE y) {
   handler_t* handler;
   Data_Get_Struct(self, handler_t, handler);
@@ -140,6 +146,17 @@ static VALUE chingu_gesture_get_y(VALUE self, VALUE i) {
   return UINT2NUM(handler->begin[ii].y);
 }
 
+
+// gesture
+
+static void double_size_gesture(handler_t* handler) {
+  gesture_t* new_gestures = calloc(2*handler->max_gesture, sizeof(gesture_t));
+  memcpy(new_gestures, handler->gestures, handler->max_gesture*sizeof(gesture_t));
+  free(handler->gestures);
+  handler->gestures = new_gestures;
+  handler->max_gesture = 2*handler->max_gesture;
+}
+
 static VALUE chingu_gesture_add_gesture(VALUE self, VALUE list) {
   handler_t* handler;
   gesture_t g;
@@ -164,14 +181,6 @@ static VALUE chingu_gesture_add_gesture(VALUE self, VALUE list) {
   return UINT2NUM(g.name);
 }
 
-inline float max(float a, float b) {
-  return a > b ? a : b;
-}
-
-inline float min(float a, float b) {
-  return a < b ? a : b;
-}
-
 static void min_and_range(point_t* first, size_t n_first, float* min_first_x, float* min_first_y, float* first_range) {
   unsigned int i;
   float max_first_x = FLT_MIN, max_first_y = FLT_MIN;
@@ -240,7 +249,6 @@ float sequence_dist(point_t* first, size_t n_first, point_t* second, size_t n_se
     }
   }
 
-  
   d = table[index2d(n_first-1, n_second-1, n_first, n_second)];
 
   free(table);
@@ -267,9 +275,10 @@ static VALUE chingu_gesture_recognize(VALUE self) {
       min_name = i;
     }
   }
-  return rb_ary_new3(2, UINT2NUM(min_name), UINT2NUM(min_dist));
+  return rb_ary_new3(2, UINT2NUM(min_name), DBL2NUM(min_dist));
 }
 
+// ruby interface
 void Init_chingu_gesture(void) {
   VALUE klass;
   klass = rb_const_get(rb_cObject, rb_intern("ChinguGesture"));

data/lib/chingu_gesture.rb

@@ -1,5 +1,5 @@
 class ChinguGesture
-  VERSION = "1.0"
+  VERSION = "1.0.1"
   # Get all points for debugging, etc
   def to_a
     (0...size).collect do |i|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chingu-gesture
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: 1.0.1
 platform: ruby
 authors:
 - zombiecalypse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-03 00:00:00.000000000 Z
+date: 2015-02-09 00:00:00.000000000 Z
 dependencies: []
 description: Recognition for 2d gestures from a stream of points using dynamic time
   warping
@@ -21,7 +21,7 @@ files:
 - ext/chingu_gesture/chingu_gesture.c
 - ext/chingu_gesture/extconf.rb
 - lib/chingu_gesture.rb
-homepage: 
+homepage: https://github.com/zombiecalypse/chingu-gesture
 licenses:
 - MIT
 metadata: {}
@@ -41,7 +41,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Recognize gestures fast