standard_deviation 1.0.2 → 1.0.3

data/ext/standard_deviation/standard_deviation.c

@@ -1,27 +1,27 @@
 #include <ruby.h>
 #include <math.h>
 
-static double sum(double array[], long size) {
-  int i;
-  double total = 0;
-
-  for (i = 0; i < size; i++) {
-    total += array[i];
-  }
-
-  return total;
-}
-
 static double distance_from_mean(VALUE *array, long size) {
   int i;
-  double mean, distance;
+  double mean, distance, total;
   double values[size];
 
-  for (i = 0; i < size; i++) {
-    values[i] = NUM2DBL(array[i]);
+  for (i = 0, total = 0; i < size; i++) {
+    double value;
+
+    switch (TYPE(array[i])) {
+      case T_FIXNUM:
+        value = FIX2LONG(array[i]);
+      default:
+        value = NUM2DBL(array[i]);
+        break;
+    }
+
+    values[i] = value;
+    total += value;
   }
 
-  mean = sum(values, size) / size;
+  mean = total / size;
 
   for (i = 0, distance = 0; i < size; i++) {
     distance += pow(values[i] - mean, 2);
@@ -79,11 +79,15 @@ static VALUE stdevp(VALUE self) {
 }
 
 void Init_standard_deviation() {
-  rb_define_method(rb_cArray, "stdev", stdev, 0);
-  rb_define_alias(rb_cArray, "standard_deviation", "stdev");
-  rb_define_method(rb_cArray, "stdevp", stdevp, 0);
+  VALUE mStandardDeviation = rb_define_module("StandardDeviation");
+
+  rb_define_method(mStandardDeviation, "stdev", stdev, 0);
+  rb_define_alias(mStandardDeviation,  "standard_deviation", "stdev");
+  rb_define_method(mStandardDeviation, "stdevp", stdevp, 0);
+
+  rb_define_method(mStandardDeviation, "sample_variance", sample_variance, 0);
+  rb_define_alias(mStandardDeviation,  "variance", "sample_variance");
+  rb_define_method(mStandardDeviation, "population_variance", population_variance, 0);
 
-  rb_define_method(rb_cArray, "sample_variance", sample_variance, 0);
-  rb_define_alias(rb_cArray, "variance", "sample_variance");
-  rb_define_method(rb_cArray, "population_variance", population_variance, 0);
+  rb_include_module(rb_cArray, mStandardDeviation);
 }

data/lib/standard_deviation.rb

@@ -1,5 +1,2 @@
 require "standard_deviation/version"
 require "standard_deviation/standard_deviation"
-
-module StandardDeviation
-end

data/lib/standard_deviation/version.rb

@@ -1,3 +1,3 @@
 module StandardDeviation
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: standard_deviation
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-17 00:00:00.000000000Z
+date: 2012-04-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &2153819300 !ruby/object:Gem::Requirement
+  requirement: &2156775860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153819300
+  version_requirements: *2156775860
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153818820 !ruby/object:Gem::Requirement
+  requirement: &2156775260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153818820
+  version_requirements: *2156775260
 description: ! "An implementation of the standard deviation calculation in C,\n                         with
   much better performance (50x-100x) than using pure ruby."
 email:
@@ -73,7 +73,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1911497483402748616
+      hash: 3904352237865759400
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -82,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1911497483402748616
+      hash: 3904352237865759400
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10