RubyGems - statsample-optimization - Versions diffs - 1.0.0 → 2.0.0 - Mend

statsample-optimization 1.0.0 → 2.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

data/Manifest.txt +2 -2
data/Rakefile +9 -9
data/ext/{statsample/extconf.rb → extconf.rb} +1 -1
data/ext/{statsample/optimization.c → statsamplert.c} +40 -29
data/test/test_statsample_optimization.rb +30 -3
metadata +8 -8

data/Manifest.txt CHANGED Viewed

@@ -2,6 +2,6 @@ History.txt
 Manifest.txt
 README.txt
 Rakefile
-ext/statsample/extconf.rb
-ext/statsample/optimization.c
+ext/extconf.rb
+ext/statsamplert.c
 test/test_statsample_optimization.rb

data/Rakefile CHANGED Viewed

@@ -4,19 +4,19 @@
 require 'rubygems'
 require 'hoe'
-EXT = "ext/statsample/optimization.#{Config::CONFIG['DLEXT']}"
+EXT = "ext/statsamplert.#{Config::CONFIG['DLEXT']}"
 task :test => [EXT]
-file "ext/statsample/Makefile" => ["ext/statsample/extconf.rb"] do |t|
-    Dir.chdir "ext/statsample" do
+file "ext/Makefile" => ["ext/extconf.rb"] do |t|
+    Dir.chdir "ext/" do
      system %(ruby extconf.rb)
     end
 end
-file EXT => ["ext/statsample/Makefile", "ext/statsample/optimization.c"] do
+file EXT => ["ext/Makefile", "ext/statsamplert.c"] do
 	puts "Compiling"
-  Dir.chdir "ext/statsample" do
+  Dir.chdir "ext" do
     system %(make)
     end
 end
@@ -24,13 +24,13 @@ end
 Hoe.spec 'statsample-optimization' do |p|
-  p.version="1.0.0"
+  p.version="2.0.0"
   p.rubyforge_name = 'ruby-statsample'
   p.developer('Claudio Bustos', 'clbustos_at_gmail.com')
-  p.spec_extras[:extensions] = ["ext/statsample/extconf.rb"]
-  p.extra_deps << "statsample"
+  p.spec_extras[:extensions] = ["ext/extconf.rb"]
+  p.extra_deps << ["statsample","=0.3.4"]
   p.clean_globs << EXT
-  p.clean_globs << EXT << "ext/statsample/*.o" << "ext/statsample/*.so" << "ext/statsample/Makefile"
+  p.clean_globs << EXT << "ext/*.o" << "ext/*.so" << "ext/Makefile"
 end
 # vim: syntax=ruby

data/ext/{statsample/extconf.rb → extconf.rb} RENAMED Viewed

@@ -1,3 +1,3 @@
 require "mkmf"
 $CFLAGS+=" -Wall "
-create_makefile("optimization")
+create_makefile("statsamplert")

data/ext/{statsample/optimization.c → statsamplert.c} RENAMED Viewed

@@ -2,29 +2,40 @@
 /**
 * :stopdoc:
 */
-void Init_optimization();
-VALUE nominal_frequencies(VALUE self);
-VALUE rubyss_frequencies(VALUE self, VALUE data);
-VALUE rubyss_set_valid_data(VALUE self, VALUE vector);
-VALUE dataset_case_as_hash(VALUE self, VALUE index);
-VALUE dataset_case_as_array(VALUE self, VALUE index);
-void Init_optimization()
+void Init_statsamplert();
+VALUE statsample_frequencies(VALUE self, VALUE data);
+VALUE statsample_set_valid_data_intern(VALUE self, VALUE vector);
+VALUE statsample_case_as_hash(VALUE self, VALUE ds, VALUE index);
+VALUE statsample_case_as_array(VALUE self, VALUE ds, VALUE index);
+void Init_statsamplert()
 {
-    VALUE mRubySS = rb_define_module("Statsample");
+	VALUE mStatsample;
+    VALUE mSTATSAMPLE__;
+	ID id_statsample;
+	ID id_STATSAMPLE__;
+    id_statsample   = rb_intern("Statsample");
+    id_STATSAMPLE__ = rb_intern("STATSAMPLE__");
-    VALUE cNominal = rb_define_class_under(mRubySS,"Nominal",rb_cObject);
-    VALUE cDataset = rb_define_class_under(mRubySS,"Dataset",rb_cObject);
-    rb_define_const(mRubySS,"OPTIMIZED",Qtrue);
-    rb_define_module_function(mRubySS,"_frequencies",rubyss_frequencies,1);
-    rb_define_module_function(mRubySS,"_set_valid_data",rubyss_set_valid_data,1);
-    rb_define_method(cNominal,"frequencies",nominal_frequencies,0);
-    rb_define_method(cDataset,"case_as_hash",dataset_case_as_hash,1);
-    rb_define_method(cDataset,"case_as_array",dataset_case_as_array,1);
+    if(rb_const_defined(rb_cObject, id_statsample)) {
+		mStatsample = rb_const_get(rb_cObject, id_statsample);
+	 } else {
+		mStatsample = rb_define_module("Statsample");
+	 }
+    if(rb_const_defined(mStatsample, id_STATSAMPLE__)) {
+		mSTATSAMPLE__ = rb_const_get(mStatsample, id_STATSAMPLE__);
+	 } else {
+		mSTATSAMPLE__ = rb_define_module_under(mStatsample, "STATSAMPLE__");
+	 }
+     rb_define_const(mStatsample, "OPTIMIZED",Qtrue);
+    rb_define_module_function(mSTATSAMPLE__,"frequencies",statsample_frequencies,1);
+    rb_define_module_function(mSTATSAMPLE__,"set_valid_data_intern", statsample_set_valid_data_intern, 1);
+    rb_define_module_function(mSTATSAMPLE__,"case_as_hash",statsample_case_as_hash,2);
+    rb_define_module_function(mSTATSAMPLE__,"case_as_array",statsample_case_as_array,2);
 }
-VALUE rubyss_set_valid_data(VALUE self, VALUE vector) {
+VALUE statsample_set_valid_data_intern(VALUE self, VALUE vector) {
 /** Emulate
 @data.each do |n|
@@ -60,7 +71,11 @@ VALUE rubyss_set_valid_data(VALUE self, VALUE vector) {
     rb_iv_set(vector,"@has_missing_data",(RARRAY_LEN(missing_data)>0) ? Qtrue : Qfalse);
     return Qnil;
 }
-VALUE rubyss_frequencies(VALUE self, VALUE data) {
+/**
+* Retuns frequencies for an array as a hash, with
+* keys as items and values as number of items
+*/
+VALUE statsample_frequencies(VALUE self, VALUE data) {
     VALUE h;
     VALUE val;
      long len;
@@ -82,14 +97,10 @@ VALUE rubyss_frequencies(VALUE self, VALUE data) {
     return h;
 }
-VALUE nominal_frequencies(VALUE self) {
-    VALUE data=rb_iv_get(self,"@data");
-    return rubyss_frequencies(self,data);
-}
-VALUE dataset_case_as_hash(VALUE self, VALUE index) {
+VALUE statsample_case_as_hash(VALUE self, VALUE ds,VALUE index) {
     VALUE vector,data,key;
-    VALUE fields=rb_iv_get(self,"@fields");
-    VALUE vectors=rb_iv_get(self,"@vectors");
+    VALUE fields=rb_iv_get(ds,"@fields");
+    VALUE vectors=rb_iv_get(ds,"@vectors");
     VALUE h=rb_hash_new();
     long len=RARRAY_LEN(fields);
     long i;
@@ -101,10 +112,10 @@ VALUE dataset_case_as_hash(VALUE self, VALUE index) {
     }
     return h;
 }
-VALUE dataset_case_as_array(VALUE self, VALUE index) {
+VALUE statsample_case_as_array(VALUE self, VALUE ds, VALUE index) {
     VALUE vector,data,key;
-    VALUE fields=rb_iv_get(self,"@fields");
-    VALUE vectors=rb_iv_get(self,"@vectors");
+    VALUE fields=rb_iv_get(ds,"@fields");
+    VALUE vectors=rb_iv_get(ds,"@vectors");
     VALUE ar=rb_ary_new();
     long len=RARRAY_LEN(fields);
     long i;

data/test/test_statsample_optimization.rb CHANGED Viewed

@@ -1,16 +1,43 @@
 $:.unshift(File.dirname(__FILE__)+"/ext")
 require "test/unit"
 require "statsample"
-require "statsample/optimization"
+require "statsamplert"
 class TestRubyStatsampleOpt < Test::Unit::TestCase
     def test_base
         assert(Statsample::OPTIMIZED,true)
     end
     def test_frequencies
-        assert(Statsample.respond_to?(:_frequencies))
+        assert(Statsample::STATSAMPLE__.respond_to?(:frequencies))
         v=[1,1,2].to_vector
         exp={1=>2,2=>1}
-        assert_equal(exp,Statsample._frequencies(v.data))
+        assert_equal(exp,Statsample::STATSAMPLE__.frequencies(v.data))
+        assert_equal(v._frequencies, v.frequencies)
     end
+    def test_set_valid_data
+        assert(Statsample::STATSAMPLE__.respond_to?(:set_valid_data_intern))
+        v=[2,3,4].to_vector
+        v.add(5)
+        assert_equal([2,3,4,5], v.valid_data)
+        v.add(nil,false)
+        assert_equal([2,3,4,5], v.valid_data)
+        assert_equal([2,3,4,5,nil], v.data)
+    end
+    def test_case_as_array
+        assert(Statsample::STATSAMPLE__.respond_to?(:case_as_array))
+        a=[1,2,3].to_vector(:scale)
+        b=[4,5,6].to_vector(:scale)
+        ds={"a"=>a,"b"=>b}.to_dataset
+        assert_equal([1,4],Statsample::STATSAMPLE__.case_as_array(ds,0))
+        assert_equal([2,5],Statsample::STATSAMPLE__.case_as_array(ds,1))
+        assert_equal([3,6],Statsample::STATSAMPLE__.case_as_array(ds,2))
+    end
+        def test_case_as_hash
+        assert(Statsample::STATSAMPLE__.respond_to?(:case_as_hash))
+        a=[1,2,3].to_vector(:scale)
+        b=[4,5,6].to_vector(:scale)
+        ds={"a"=>a,"b"=>b}.to_dataset
+        assert_equal({"a"=>1,"b"=>4},Statsample::STATSAMPLE__.case_as_hash(ds,0))
+    end
 end

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: statsample-optimization
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Claudio Bustos
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2009-08-03 00:00:00 -04:00
+date: 2009-08-21 00:00:00 -04:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -18,9 +18,9 @@ dependencies:
   version_requirement:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version
-        version: "0"
+        version: 0.3.4
     version:
 - !ruby/object:Gem::Dependency
   name: hoe
@@ -30,7 +30,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.2
+        version: 2.3.3
     version:
 description: |-
   Extension for statsample, that speed some methods.
@@ -45,7 +45,7 @@ email:
 executables: []
 extensions:
-- ext/statsample/extconf.rb
+- ext/extconf.rb
 extra_rdoc_files:
 - History.txt
 - Manifest.txt
@@ -55,8 +55,8 @@ files:
 - Manifest.txt
 - README.txt
 - Rakefile
-- ext/statsample/extconf.rb
-- ext/statsample/optimization.c
+- ext/extconf.rb
+- ext/statsamplert.c
 - test/test_statsample_optimization.rb
 has_rdoc: true
 homepage: http://rubyforge.org/projects/ruby-statsample/