lib/statistics2/no_ext.rb @@ -7,6 +7,7 @@ examples/show.rb ext/extconf.rb ext/statistics2.c lib/statistics2.rb +lib/statistics2/no_ext.rb lib/statistics2/version.rb statistics2.gemspec test/sample_tbl.rb Manifest.txt @@ -1,29 +1,30 @@ -= Statistics2 -- Statistical Distributions for Ruby += Statistics2: Statistical Distributions for Ruby Authors: Shin-ichiro HARA(sinara@blade.nagaokaut.ac.jp), Brendan Ribera (brendan.ribera@gmail.com) == REQUIREMENTS: - * ruby-1.8 + * ruby-1.8 or higher + == INSTALL: - * TODO - -=== Installation of extension module (if you need): - -This package also contains the C extension module which has the same functions in `statistics2.rb'. Enter ext/ directory of the package. Then type: - $ ruby extconf.rb - $ make - $ make test - $ make install + * Get the gem from Github! + $ gem sources -a http://gems.github.com (you only have to do this once) + $ sudo gem install abscondment-statistics2 + == USAGE: * Example: require "statistics2" puts Statistics2.normaldist(0.27) #=> 0.606419873198039 +* If you don't want to use the C extension: + require "statistics2/no_ext" + puts Statistics2.normaldist(0.27) #=> 0.606419873198039 + + == LICENSE: Ruby's (see http://www.ruby-lang.org/en/LICENSE.txt) README.rdoc @@ -1,11 +1,2 @@ require "mkmf" create_makefile("statistics2") -open("Makefile", "a") do |f| - f << "test:\n\truby -I./lib:. c_tests.rb\n" - f << "\n" - f << "uninstall:\n" - f << "\t@echo rm $(RUBYLIBDIR)/statistics2.rb\n" - f << "\t@$(RM) $(RUBYLIBDIR)/statistics2.rb\n" - f << "\t@echo rm $(RUBYARCHDIR)/statistics2.{o,so}\n" - f << "\t@$(RM) $(RUBYARCHDIR)/statistics2.{o,so}\n" -end ext/extconf.rb @@ -13,6 +13,23 @@ require 'statistics2/version' module Statistics2 SQ2PI = Math.sqrt(2 * Math::PI) + # Easy access to our singleton + def self.metaclass; class << self; self; end; end + + # Remove existing methods. + ["normaldist", "normalxXX_", "normal__X_", "normal___x", "normalx__x", + "pnormaldist", "pnormalxXX_", "pnormal__X_", "pnormal___x", "pnormalx__x", + "chi2dist", "chi2X_", "chi2_x", "pchi2dist", "pchi2X_", "pchi2_x", + "tdist", "txXX_", "t__X_", "t___x", "tx__x", "ptdist", "ptxXX_", "pt__X_", "pt___x", "ptx__x", + "fdist", "fX_", "f_x", "pfdist", "pfX_", "pf_x", + "bindens", "bindist", "binX_", "bin_x", + "poissondens", "poissondist", "poissonX_", "poisson_x"].each do |m| + undef_method(m) if self.private_method_defined?(m) + self.metaclass.instance_eval do + undef_method(m) if self.method_defined?(m) + end + end + # Newton approximation def newton_a(y, ini, epsilon = 1.0e-6, limit = 30) x = ini @@ -519,6 +536,10 @@ module Statistics2 module_function :poissondens, :poissondist, :poissonX_, :poisson_x end +if !defined?(Statistics2::NO_EXT) || Statistics2::NO_EXT != true + puts 'loading extension...' + require 'statistics2.so' +end if $0 == __FILE__ if ARGV.empty? lib/statistics2.rb @@ -6,12 +6,12 @@ Gem::Specification.new do |s| s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Brendan Ribera", "Shin-ichiro Hara"] - s.date = %q{2009-06-08} + s.date = %q{2009-06-10} s.description = %q{} s.email = ["brendan.ribera@gmail.com", "sinara@blade.nagaokaut.ac.jp"] s.extensions = ["ext/extconf.rb"] s.extra_rdoc_files = ["Manifest.txt"] - s.files = ["History.rdoc", "Manifest.txt", "README.rdoc", "Rakefile", "examples/mklist.rb", "examples/show.rb", "ext/extconf.rb", "ext/statistics2.c", "lib/statistics2.rb", "lib/statistics2/version.rb", "statistics2.gemspec", "test/sample_tbl.rb", "test/test_ext.rb", "test/test_inv.rb"] + s.files = ["History.rdoc", "Manifest.txt", "README.rdoc", "Rakefile", "examples/mklist.rb", "examples/show.rb", "ext/extconf.rb", "ext/statistics2.c", "lib/statistics2.rb", "lib/statistics2/no_ext.rb", "lib/statistics2/version.rb", "statistics2.gemspec", "test/sample_tbl.rb", "test/test_ext.rb", "test/test_inv.rb"] s.homepage = %q{http://github.com/abscondment/statistics2} s.rdoc_options = ["--main", "README.rdoc"] s.require_paths = ["lib", "ext"] statistics2.gemspec @@ -4,7 +4,6 @@ $:.unshift File.join(File.dirname(__FILE__), '..', 'ext') $test = true require 'test/unit' unless defined?(Hoe) -require 'benchmark' require 'sample_tbl' require 'statistics2.so' test/test_ext.rb 93830d56ce2a3ee3bda61a4e12ed9c90c1df5f48 Brendan Ribera brendan.ribera@gmail.com http://github.com/abscondment/statistics2/commit/f1b6cd9fae70f6f945810bde5725d6436f5111f5 f1b6cd9fae70f6f945810bde5725d6436f5111f5 2009-06-10T17:18:47-07:00 2009-06-10T17:18:47-07:00 Changing a few extension-related things: * Since the library doesn't require the C extension, one can load a ruby-only version by using 'require "statistics2/no_ext"'. * Various tweaks related to extension and testing. 02a32180152effa9b704815d79c3cc8ee030a4bf Brendan Ribera brendan.ribera@gmail.com