statsample-optimization 2.1.0 → 2.1.1

data/History.txt

@@ -1,3 +1,6 @@
+=== 2.1.1 / 2011-12-28
+* Updated statsample version
+
 === 2.1.0 / 2010-12-22
 * Added tetrachoric correlation support using fortran to c version of AS116
 * Added native compilation support

data/Manifest.txt

@@ -6,4 +6,5 @@ ext/statsamplert/as116.c
 ext/statsamplert/as116.h
 ext/statsamplert/extconf.rb
 ext/statsamplert/statsamplert.c
+ext/statsamplert/statsamplert.h
 test/test_statsample_optimization.rb

data/README.txt

@@ -8,8 +8,10 @@ Install gsl, statistics2 and provides a C extension to optimize the following me
 
 * Vector#frecuencies
 * Vector#set_valid_data
+* Vector#check_type
 * Dataset#case_as_hash
 * Dataset#case_as_array
+* Bivariate::Tetrachoric
 
 
 

data/Rakefile

@@ -8,11 +8,11 @@ Hoe.plugin :git
 
 task "test" => ["lib/statsamplert.so"]
 spec=Hoe.spec 'statsample-optimization' do
-  self.version="2.1.0"
+  self.version="2.1.1"
   self.spec_extras[:extensions] = ["ext/statsamplert/extconf.rb"]
   self.rubyforge_name = 'ruby-statsample'
   self.developer('Claudio Bustos', 'clbustos_at_gmail.com')
-  self.extra_deps << ["statsample","~>0.17"] << ["statistics2", "~>0.54"] << ["gsl", "~>1.14"]
+  self.extra_deps << ["statsample","~>1.2"] << ["statistics2", "~>0.54"] << ["gsl", "~>1.14"]
   self.extra_deps  << ["rake-compiler"]
 
 end

data/ext/statsamplert/statsamplert.c

@@ -1,14 +1,18 @@
 #include <ruby.h>
+#include "statsamplert.h"
 #include "as116.h"
 /**
 * :stopdoc:
 */
 
+#define GET_SYM(sym) ID2SYM(rb_intern(sym))
+
 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);
+VALUE statsample_check_type(VALUE self, VALUE v, VALUE type);
 VALUE statsample_tetrachoric(VALUE self, VALUE a, VALUE b, VALUE c, VALUE d);
 
 void Init_statsamplert()
@@ -33,6 +37,7 @@ void Init_statsamplert()
      
      rb_define_const(mStatsample, "OPTIMIZED",Qtrue);
     rb_define_module_function(mSTATSAMPLE__,"frequencies",statsample_frequencies,1);
+    rb_define_module_function(mSTATSAMPLE__,"check_type",statsample_check_type,2);
     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);
@@ -77,7 +82,7 @@ VALUE statsample_set_valid_data_intern(VALUE self, VALUE vector) {
     return Qnil;
 }
 /**
-* Retuns frequencies for an array as a hash, with 
+* Returns frequencies for an array as a hash, with 
 * keys as items and values as number of items
 */
 VALUE statsample_frequencies(VALUE self, VALUE data) {
@@ -133,6 +138,23 @@ VALUE statsample_case_as_array(VALUE self, VALUE ds, VALUE index) {
     return ar;
 }
 
+//raise NoMethodError if (t==:scale and @type!=:scale) or (t==:ordinal and @type==:nominal) or (t==:date) or (@type==:date)
+
+VALUE statsample_check_type(VALUE self, VALUE vector, VALUE type) {
+    VALUE vector_type=rb_iv_get(vector,"@type");
+    VALUE scale=GET_SYM("scale");
+    VALUE ordinal=GET_SYM("ordinal");
+    VALUE nominal=GET_SYM("nominal");
+    VALUE date=GET_SYM("date");
+    
+    if ((type==scale   && vector_type!=scale) ||
+        (type==ordinal && vector_type==nominal) ||
+        (type==date) ||
+        (vector_type==date)) {
+            rb_raise(rb_eNoMethodError,"Method not available");
+        }
+    return Qnil;
+}
 
 
 VALUE statsample_tetrachoric(VALUE self, VALUE a, VALUE b, VALUE c, VALUE d) {
@@ -157,14 +179,12 @@ VALUE statsample_tetrachoric(VALUE self, VALUE a, VALUE b, VALUE c, VALUE d) {
     
     result= tetra(&pa,&pb, &pc, &pd, &r,
 	 &sdr, &sdzero, &t_x,&t_y, &itype, &ifault);
-    rb_hash_aset(h, rb_str_new_cstr("r"), DBL2NUM(r));
-    rb_hash_aset(h, rb_str_new_cstr("sdr"), DBL2NUM(sdr));
-    rb_hash_aset(h, rb_str_new_cstr("sdzero"), DBL2NUM(sdzero));
-    rb_hash_aset(h, rb_str_new_cstr("threshold_x"), DBL2NUM(t_x));
-    rb_hash_aset(h, rb_str_new_cstr("threshold_y"), DBL2NUM(t_y));
-    rb_hash_aset(h, rb_str_new_cstr("itype"), INT2NUM(itype));
-    rb_hash_aset(h, rb_str_new_cstr("ifault"), INT2NUM(ifault));
-    
+    rb_hash_aset(h, GET_SYM("r"), DBL2NUM(r));
+    rb_hash_aset(h, GET_SYM("sdr"), DBL2NUM(sdr));
+    rb_hash_aset(h, GET_SYM("sdzero"), DBL2NUM(sdzero));
+    rb_hash_aset(h, GET_SYM("threshold_x"), DBL2NUM(t_x));
+    rb_hash_aset(h, GET_SYM("threshold_y"), DBL2NUM(t_y));
+    rb_hash_aset(h, GET_SYM("itype"), INT2NUM(itype));
+    rb_hash_aset(h, GET_SYM("ifault"), INT2NUM(ifault));
     return h;
-    
 }

data/ext/statsamplert/statsamplert.h

@@ -0,0 +1,10 @@
+#ifndef STATSAMPLERT_H
+#define STATSAMPLERT_H
+
+#ifndef DBL2NUM
+#define DBL2NUM(dbl)  rb_float_new(dbl)
+#endif
+
+
+#endif
+

data/test/test_statsample_optimization.rb

@@ -43,10 +43,38 @@ class TestRubyStatsampleOpt < Test::Unit::TestCase
     assert(Statsample::STATSAMPLE__.respond_to?(:tetrachoric))
     a,b,c,d = 30,40,70,20
     result=Statsample::STATSAMPLE__.tetrachoric(a,b,c,d)
-    assert_in_delta(-0.53980, result['r'], 0.0001)
-    assert_in_delta(0.09940, result['sdr'], 0.0001)
-    assert_in_delta(-0.15731, result['threshold_x'], 0.0001)
-    assert_in_delta(0.31864, result['threshold_y'], 0.0001)
+    assert_in_delta(-0.53980, result[:r], 0.0001)
+    assert_in_delta(0.09940, result[:sdr], 0.0001)
+    assert_in_delta(-0.15731, result[:threshold_x], 0.0001)
+    assert_in_delta(0.31864, result[:threshold_y], 0.0001)
+  end
+  def test_check_type
+    assert(Statsample::STATSAMPLE__.respond_to?(:check_type))
+    
+    v=Statsample::Vector.new
+    v.type=:nominal
+    assert_raise(NoMethodError) { Statsample::STATSAMPLE__.check_type(v,:scale)}
+    assert_raise(NoMethodError) { Statsample::STATSAMPLE__.check_type(v, :ordinal)}
+    assert(Statsample::STATSAMPLE__.check_type(v, :nominal).nil?)
+    
+    v.type=:ordinal
+    
+    assert_raise(NoMethodError) { Statsample::STATSAMPLE__.check_type(v,:scale)}
+    
+    assert(Statsample::STATSAMPLE__.check_type(v,:ordinal).nil?)
+    assert(Statsample::STATSAMPLE__.check_type(v,:nominal).nil?)
+    
+
+    v.type=:scale
+    assert(Statsample::STATSAMPLE__.check_type(v,:scale).nil?)
+    assert(Statsample::STATSAMPLE__.check_type(v,:ordinal).nil?)
+    assert(Statsample::STATSAMPLE__.check_type(v,:nominal).nil?)
+
+    v.type=:date
+    assert_raise(NoMethodError) { Statsample::STATSAMPLE__.check_type(v,:scale)}
+    assert_raise(NoMethodError) { Statsample::STATSAMPLE__.check_type(v,:ordinal)}
+    assert_raise(NoMethodError) { Statsample::STATSAMPLE__.check_type(v,:nominal)}
+        
     
   end
 

metadata

@@ -1,137 +1,134 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: statsample-optimization
-version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: false
-  segments: 
-  - 2
-  - 1
-  - 0
-  version: 2.1.0
+version: !ruby/object:Gem::Version
+  version: 2.1.1
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Claudio Bustos
 autorequire: 
 bindir: bin
-cert_chain: 
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDMjCCAhqgAwIBAgIBADANBgkqhkiG9w0BAQUFADA/MREwDwYDVQQDDAhjbGJ1
-  c3RvczEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYKCZImiZPyLGQBGRYDY29t
-  MB4XDTEwMDMyOTIxMzg1NVoXDTExMDMyOTIxMzg1NVowPzERMA8GA1UEAwwIY2xi
-  dXN0b3MxFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT8ixkARkWA2Nv
-  bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf8JVMGqE7m5kYb+PNN
-  neZv2pcXV5fQCi6xkyG8bi2/SIFy/LyxuvLzEeOxBeaz1Be93bayIUquOIqw3dyw
-  /KXWa31FxuNuvAm6CN8fyeRYX/ou4cw3OIUUnIvB7RMNIu4wbgeM6htV/QEsNLrv
-  at1/mh9JpqawPrcjIOVMj4BIp67vmzJCaUf+S/H2uYtSO09F+YQE3tv85TPeRmqU
-  yjyXyTc/oJiw1cXskUL8UtMWZmrwNLHXuZWWIMzkjiz3UNdhJr/t5ROk8S2WPznl
-  0bMy/PMIlAbqWolRn1zl2VFJ3TaXScbqImY8Wf4g62b/1ZSUlGrtnLNsCYXrWiso
-  UPUCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFGu9
-  rrJ1H64qRmNNu3Jj/Qjvh0u5MA0GCSqGSIb3DQEBBQUAA4IBAQCV0Unka5isrhZk
-  GjqSDqY/6hF+G2pbFcbWUpjmC8NWtAxeC+7NGV3ljd0e1SLfoyBj4gnFtFmY8qX4
-  K02tgSZM0eDV8TpgFpWXzK6LzHvoanuahHLZEtk/+Z885lFene+nHadkem1n9iAB
-  cs96JO9/JfFyuXM27wFAwmfHCmJfPF09R4VvGHRAvb8MGzSVgk2i06OJTqkBTwvv
-  JHJdoyw3+8bw9RJ+jLaNoQ+xu+1pQdS2bb3m7xjZpufml/m8zFCtjYM/7qgkKR8z
-  /ZZt8lCiKfFArppRrZayE2FVsps4X6WwBdrKTMZ0CKSXTRctbEj1BAZ67eoTvBBt
-  rpP0jjs0
-  -----END CERTIFICATE-----
-
-date: 2010-12-22 00:00:00 -03:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+cert_chain:
+- !binary |-
+  LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURNakNDQWhxZ0F3SUJB
+  Z0lCQURBTkJna3Foa2lHOXcwQkFRVUZBREEvTVJFd0R3WURWUVFEREFoamJH
+  SjEKYzNSdmN6RVZNQk1HQ2dtU0pvbVQ4aXhrQVJrV0JXZHRZV2xzTVJNd0VR
+  WUtDWkltaVpQeUxHUUJHUllEWTI5dApNQjRYRFRFd01ETXlPVEl4TXpnMU5W
+  b1hEVEV4TURNeU9USXhNemcxTlZvd1B6RVJNQThHQTFVRUF3d0lZMnhpCmRY
+  TjBiM014RlRBVEJnb0praWFKay9Jc1pBRVpGZ1ZuYldGcGJERVRNQkVHQ2dt
+  U0pvbVQ4aXhrQVJrV0EyTnYKYlRDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFB
+  RGdnRVBBRENDQVFvQ2dnRUJBTGY4SlZNR3FFN201a1liK1BOTgpuZVp2MnBj
+  WFY1ZlFDaTZ4a3lHOGJpMi9TSUZ5L0x5eHV2THpFZU94QmVhejFCZTkzYmF5
+  SVVxdU9JcXczZHl3Ci9LWFdhMzFGeHVOdXZBbTZDTjhmeWVSWVgvb3U0Y3cz
+  T0lVVW5JdkI3Uk1OSXU0d2JnZU02aHRWL1FFc05McnYKYXQxL21oOUpwcWF3
+  UHJjaklPVk1qNEJJcDY3dm16SkNhVWYrUy9IMnVZdFNPMDlGK1lRRTN0djg1
+  VFBlUm1xVQp5anlYeVRjL29KaXcxY1hza1VMOFV0TVdabXJ3TkxIWHVaV1dJ
+  TXpraml6M1VOZGhKci90NVJPazhTMldQem5sCjBiTXkvUE1JbEFicVdvbFJu
+  MXpsMlZGSjNUYVhTY2JxSW1ZOFdmNGc2MmIvMVpTVWxHcnRuTE5zQ1lYcldp
+  c28KVVBVQ0F3RUFBYU01TURjd0NRWURWUjBUQkFJd0FEQUxCZ05WSFE4RUJB
+  TUNCTEF3SFFZRFZSME9CQllFRkd1OQpyckoxSDY0cVJtTk51M0pqL1Fqdmgw
+  dTVNQTBHQ1NxR1NJYjNEUUVCQlFVQUE0SUJBUUNWMFVua2E1aXNyaFprCkdq
+  cVNEcVkvNmhGK0cycGJGY2JXVXBqbUM4Tld0QXhlQys3TkdWM2xqZDBlMVNM
+  Zm95Qmo0Z25GdEZtWThxWDQKSzAydGdTWk0wZURWOFRwZ0ZwV1h6SzZMekh2
+  b2FudWFoSExaRXRrLytaODg1bEZlbmUrbkhhZGtlbTFuOWlBQgpjczk2Sk85
+  L0pmRnl1WE0yN3dGQXdtZkhDbUpmUEYwOVI0VnZHSFJBdmI4TUd6U1ZnazJp
+  MDZPSlRxa0JUd3Z2CkpISmRveXczKzhidzlSSitqTGFOb1EreHUrMXBRZFMy
+  YmIzbTd4alpwdWZtbC9tOHpGQ3RqWU0vN3Fna0tSOHoKL1padDhsQ2lLZkZB
+  cnBwUnJaYXlFMkZWc3BzNFg2V3dCZHJLVE1aMENLU1hUUmN0YkVqMUJBWjY3
+  ZW9UdkJCdApycFAwampzMAotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
+date: 2011-12-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: statsample
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &23461100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 41
-        segments: 
-        - 0
-        - 17
-        version: "0.17"
+      - !ruby/object:Gem::Version
+        version: '1.2'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: statistics2
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *23461100
+- !ruby/object:Gem::Dependency
+  name: statistics2
+  requirement: &23460640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 103
-        segments: 
-        - 0
-        - 54
-        version: "0.54"
+      - !ruby/object:Gem::Version
+        version: '0.54'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: gsl
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *23460640
+- !ruby/object:Gem::Dependency
+  name: gsl
+  requirement: &23460140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 14
-        version: "1.14"
+      - !ruby/object:Gem::Version
+        version: '1.14'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rake-compiler
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *23460140
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: &23459740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *23459740
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &23459240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 47
-        segments: 
-        - 2
-        - 8
-        - 0
-        version: 2.8.0
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.10'
   type: :development
-  version_requirements: *id005
-description: |-
-  Install gsl, statistics2 and provides a C extension to optimize the following methods
-  
+  prerelease: false
+  version_requirements: *23459240
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: &23458660 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.12'
+  type: :development
+  prerelease: false
+  version_requirements: *23458660
+description: ! 'Install gsl, statistics2 and provides a C extension to optimize the
+  following methods
+
+
   * Vector#frecuencies
+
   * Vector#set_valid_data
+
+  * Vector#check_type
+
   * Dataset#case_as_hash
+
   * Dataset#case_as_array
-email: 
+
+  * Bivariate::Tetrachoric'
+email:
 - clbustos_at_gmail.com
 executables: []
-
-extensions: 
+extensions:
 - ext/statsamplert/extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - History.txt
 - Manifest.txt
 - README.txt
-files: 
+files:
 - History.txt
 - Manifest.txt
 - README.txt
@@ -140,41 +137,36 @@ files:
 - ext/statsamplert/as116.h
 - ext/statsamplert/extconf.rb
 - ext/statsamplert/statsamplert.c
+- ext/statsamplert/statsamplert.h
 - test/test_statsample_optimization.rb
-has_rdoc: true
+- .gemtest
 homepage: http://rubyforge.org/projects/ruby-statsample/
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.txt
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: ruby-statsample
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Install gsl, statistics2 and provides a C extension to optimize the following methods  * Vector#frecuencies * Vector#set_valid_data * Dataset#case_as_hash * Dataset#case_as_array
-test_files: 
+summary: Install gsl, statistics2 and provides a C extension to optimize the following
+  methods  * Vector#frecuencies * Vector#set_valid_data * Vector#check_type * Dataset#case_as_hash
+  * Dataset#case_as_array * Bivariate::Tetrachoric
+test_files:
 - test/test_statsample_optimization.rb