distance_measures 0.0.2 → 0.0.3

data/.gitignore

@@ -21,3 +21,4 @@ tmp/*
 benchmarks/*
 
 ## PROJECT::SPECIFIC
+*.bundle

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/distance_measures.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{distance_measures}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["reddavis"]
-  s.date = %q{2010-07-31}
+  s.date = %q{2010-08-15}
   s.description = %q{A bundle of distance measures with C extensions for the slow bits}
   s.email = %q{reddavis@gmail.com}
   s.extensions = ["ext/core/extconf.rb", "ext/euclidean_distance/extconf.rb"]
@@ -25,14 +25,13 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "distance_measures.gemspec",
+     "ext/19_fix/19_fix.c",
      "ext/core/core.c",
      "ext/core/extconf.rb",
      "ext/euclidean_distance/euclidean_distance.c",
      "ext/euclidean_distance/extconf.rb",
      "lib/distance_measures.rb",
-     "lib/distance_measures/core.bundle",
      "lib/distance_measures/cosine_similarity.rb",
-     "lib/distance_measures/euclidean_distance.bundle",
      "lib/distance_measures/jaccard.rb",
      "lib/distance_measures/tanimoto_coefficient.rb",
      "spec/distance_measures_spec.rb",

data/ext/19_fix/19_fix.c

@@ -0,0 +1,8 @@
+#ifndef RUBY_19
+#ifndef RARRAY_LEN
+#define RARRAY_LEN(v) (RARRAY(v)->len)
+#endif
+#ifndef RARRAY_PTR
+#define RARRAY_PTR(v) (RARRAY(v)->ptr)
+#endif
+#endif

data/ext/core/core.c

@@ -1,5 +1,6 @@
 #include <ruby.h>
 #include <math.h>
+#include "../19_fix/19_fix.c"
 
 // Prototypes
 long c_array_size(VALUE array);
@@ -27,8 +28,8 @@ static VALUE rb_dot_product(VALUE self, VALUE other_array) {
   for(index = 0; index <= array_size; index++) {
     double x, y;
 
-    x = NUM2DBL(RARRAY(self)->ptr[index]);
-    y = NUM2DBL(RARRAY(other_array)->ptr[index]);
+    x = NUM2DBL(RARRAY_PTR(self)[index]);
+    y = NUM2DBL(RARRAY_PTR(other_array)[index]);
 
     sum += x * y;
   }
@@ -51,7 +52,7 @@ static VALUE rb_sum_of_squares(VALUE self) {
   for(index = 0; index <= array_size; index++) {
     double x;
 
-    x = NUM2DBL(RARRAY(self)->ptr[index]);
+    x = NUM2DBL(RARRAY_PTR(self)[index]);
 
     sum += pow(x, 2);
   }
@@ -79,7 +80,7 @@ static VALUE rb_euclidean_normalize(VALUE self) {
   for(index = 0; index <= array_size; index++) {
     double x;
 
-    x = NUM2DBL(RARRAY(self)->ptr[index]);
+    x = NUM2DBL(RARRAY_PTR(self)[index]);
 
     sum += pow(x, 2);
   }
@@ -110,8 +111,8 @@ static VALUE rb_binary_union_with(VALUE self, VALUE other_array) {
   VALUE results = rb_ary_new();
 
   for(index = 0; index <= array_size; index++) {
-    int self_attribute = NUM2INT(RARRAY(self)->ptr[index]);
-    int other_array_attribute = NUM2INT(RARRAY(other_array)->ptr[index]);
+    int self_attribute = NUM2INT(RARRAY_PTR(self)[index]);
+    int other_array_attribute = NUM2INT(RARRAY_PTR(other_array)[index]);
 
     if(self_attribute == 1 || other_array_attribute == 1) {
       rb_ary_push(results, rb_int_new(1));
@@ -146,8 +147,8 @@ static VALUE rb_binary_intersection_with(VALUE self, VALUE other_array) {
   VALUE results = rb_ary_new();
 
   for(index = 0; index <= array_size; index++) {
-    int self_attribute = NUM2INT(RARRAY(self)->ptr[index]);
-    int other_array_attribute = NUM2INT(RARRAY(other_array)->ptr[index]);
+    int self_attribute = NUM2INT(RARRAY_PTR(self)[index]);
+    int other_array_attribute = NUM2INT(RARRAY_PTR(other_array)[index]);
 
     if(self_attribute == 1 && other_array_attribute == 1) {
       rb_ary_push(results, rb_int_new(1));
@@ -161,7 +162,7 @@ static VALUE rb_binary_intersection_with(VALUE self, VALUE other_array) {
 
 // return the size of a Ruby array - 1
 long c_array_size(VALUE array) {
-  return (RARRAY(array)->len - 1);
+  return (RARRAY_LEN(array) - 1);
 }
 
 void Init_core() {

data/ext/euclidean_distance/euclidean_distance.c

@@ -1,5 +1,6 @@
 #include <ruby.h>
 #include <math.h>
+#include "../19_fix/19_fix.c"
 
 /*
 
@@ -16,14 +17,14 @@ static VALUE rb_euclidean_distance(VALUE self, VALUE other_array) {
   double value = 0.0;
 
   //TODO: check they're the same size
-  long vector_length = (RARRAY(self)->len - 1);
+  long vector_length = (RARRAY_LEN(self) - 1);
   int index;
 
   for(index = 0; index <= vector_length; index++) {
     double x, y;
 
-    x = NUM2DBL(RARRAY(self)->ptr[index]);
-    y = NUM2DBL(RARRAY(other_array)->ptr[index]);
+    x = NUM2DBL(RARRAY_PTR(self)[index]);
+    y = NUM2DBL(RARRAY_PTR(other_array)[index]);
 
     value += pow(x - y, 2);
   }

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - reddavis
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-31 00:00:00 +01:00
+date: 2010-08-15 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,14 +49,13 @@ files:
 - Rakefile
 - VERSION
 - distance_measures.gemspec
+- ext/19_fix/19_fix.c
 - ext/core/core.c
 - ext/core/extconf.rb
 - ext/euclidean_distance/euclidean_distance.c
 - ext/euclidean_distance/extconf.rb
 - lib/distance_measures.rb
-- lib/distance_measures/core.bundle
 - lib/distance_measures/cosine_similarity.rb
-- lib/distance_measures/euclidean_distance.bundle
 - lib/distance_measures/jaccard.rb
 - lib/distance_measures/tanimoto_coefficient.rb
 - spec/distance_measures_spec.rb