algorithms 0.4.0 → 0.5.0

data/CHANGELOG.markdown

@@ -1,3 +1,9 @@
+=== April 15, 2012
+
+    * Use long instead of int for string methods
+    * Use VALUE instead of int for comparison vars
+    * Now compiles without warnings (OS X 10.7)
+
 === April 19, 2012
 
     * Pulled in fix for ruby 1.9 compilation error (sorry!!)

data/Rakefile

@@ -6,7 +6,7 @@ Echoe.new('algorithms') do |p|
   p.email                = 'kanwei@gmail.com'
   p.summary              = 'A library of algorithms and data structures (containers).'
   p.url                  = 'https://rubygems.org/gems/algorithms'
-  p.version              = "0.4.0"
+  p.version              = "0.5.0"
   p.retain_gemspec       = true
   p.runtime_dependencies = []
   p.development_dependencies = ["rspec", "echoe"]

data/algorithms.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "algorithms"
-  s.version = "0.4.0"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kanwei Li"]
-  s.date = "2012-04-19"
+  s.date = "2012-04-25"
   s.description = "A library of algorithms and data structures (containers)."
   s.email = "kanwei@gmail.com"
   s.extensions = ["ext/algorithms/string/extconf.rb", "ext/containers/bst/extconf.rb", "ext/containers/deque/extconf.rb", "ext/containers/rbtree_map/extconf.rb", "ext/containers/splaytree_map/extconf.rb"]

data/ext/algorithms/string/string.c

@@ -1,7 +1,7 @@
 #include "ruby.h"
 
-int min(int a, int b, int c) {
-	int min = a;
+long min_three(long a, long b, long c) {
+	long min = a;
 	if (b < min)
 		min = b;
 	if( c < min)
@@ -9,11 +9,11 @@ int min(int a, int b, int c) {
 	return min;
 }
 
-int levenshtein_distance(VALUE str1, VALUE str2) {
-	int i, j, s1_len, s2_len, *d;
+long levenshtein_distance(VALUE str1, VALUE str2) {
+	long i, j, s1_len, s2_len, *d;
 	char * s = RSTRING_PTR(str1);
 	char * t = RSTRING_PTR(str2);
-	s1_len = RSTRING_LEN(str1); 
+	s1_len = RSTRING_LEN(str1);
 	s2_len = RSTRING_LEN(str2);
 	
 	if (s1_len == 0) {
@@ -26,7 +26,7 @@ int levenshtein_distance(VALUE str1, VALUE str2) {
 	s1_len++;
 	s2_len++;
 	
-	d = malloc(sizeof(int) * (s1_len) * (s2_len));
+	d = malloc(sizeof(typeof(d)) * (s1_len) * (s2_len));
 	
 	for (i = 0; i < s1_len; i++) {
 		d[i] = i; // d[i, 0] = i
@@ -40,11 +40,11 @@ int levenshtein_distance(VALUE str1, VALUE str2) {
 			if (s[i-1] == t[j-1]) {
 				d[j * s1_len + i] = d[(j-1) * s1_len + (i-1)];
 			} else {
-				d[j * s1_len + i] = min(
+				d[j * s1_len + i] = 1 + min_three(
 					d[j * s1_len + (i-1)],
 					d[(j-1) * s1_len + i],
 					d[(j-1) * s1_len + (i-1)]
-				) + 1;
+				);
 			}
 		}
 	}
@@ -54,7 +54,7 @@ int levenshtein_distance(VALUE str1, VALUE str2) {
 }
 
 static VALUE lev_dist(VALUE self, VALUE str1, VALUE str2) {
-	return INT2FIX(levenshtein_distance( str1, str2 ));
+	return LONG2FIX(levenshtein_distance( str1, str2 ));
 }
 
 static VALUE mAlgorithms;

data/ext/containers/bst/bst.c

@@ -44,7 +44,7 @@ static bst* bst_each(bst *tree, void (*each)(bst *tree, bst_node *node, void *ar
 	return tree;
 }
 
-static int id_compare_operator;
+static VALUE id_compare_operator;
 
 static int bst_compare_function(VALUE a, VALUE b) {
 	if (a == b) return 0;

data/ext/containers/deque/deque.c

@@ -200,7 +200,7 @@ static VALUE deque_each_backward(VALUE self) {
 
 static VALUE deque_init(int argc, VALUE *argv, VALUE self)
 {
-	int len, i;
+	long len, i;
 	VALUE ary;
 	
 	if(argc == 0) {

data/ext/containers/rbtree_map/rbtree.c

@@ -287,7 +287,7 @@ static rbtree* rbt_each(rbtree *tree, void (*each)(rbtree *tree, rbtree_node *no
 
 // Methods to be called in Ruby
 
-static int id_compare_operator;
+static VALUE id_compare_operator;
 
 static int rbtree_compare_function(VALUE a, VALUE b) {
 	if (a == b) return 0;

data/ext/containers/splaytree_map/splaytree.c

@@ -230,7 +230,7 @@ static splaytree* splay_each(splaytree *tree, void (*each)(splaytree *tree, spla
 
 // Methods to be called in Ruby
 
-static int id_compare_operator;
+static VALUE id_compare_operator;
 
 static int splaytree_compare_function(VALUE a, VALUE b) {
 	if (a == b) return 0;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: algorithms
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-19 00:00:00.000000000Z
+date: 2012-04-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70335276597400 !ruby/object:Gem::Requirement
+  requirement: &70163289605640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70335276597400
+  version_requirements: *70163289605640
 - !ruby/object:Gem::Dependency
   name: echoe
-  requirement: &70335276596820 !ruby/object:Gem::Requirement
+  requirement: &70163289605060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70335276596820
+  version_requirements: *70163289605060
 description: A library of algorithms and data structures (containers).
 email: kanwei@gmail.com
 executables: []