frac 0.9.5 → 0.9.6

data/.gitignore

@@ -0,0 +1,49 @@
+# Gemstuff
+Gemfile.lock
+
+# compiled
+lib/frac_ext.so
+tmp
+
+# rcov generated
+coverage
+
+# rdoc generated
+rdoc
+
+# yard generated
+doc
+.yardoc
+
+# bundler
+.bundle
+
+# jeweler generated
+pkg
+
+# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore:
+#
+# * Create a file at ~/.gitignore
+# * Include files you want ignored
+# * Run: git config --global core.excludesfile ~/.gitignore
+#
+# After doing this, these files will be ignored in all your git projects,
+# saving you from having to 'pollute' every project you touch with them
+#
+# Not sure what to needs to be ignored for particular editors/OSes? Here's some ideas to get you started. (Remember, remove the leading # of the line)
+
+# For MacOS:
+
+.DS_Store
+
+# For TextMate
+*.tmproj
+tmtags
+
+# For emacs:
+*~
+\#*
+.\#*
+
+# For vim:
+*.swp

data/CHANGELOG.md

@@ -0,0 +1,18 @@
+0.9.6
+============
+* Added JRuby support - [@dblock](https://github.com/dblock).
+
+0.9.5 (June 18, 2011)
+=====================
+* Added bundler support - [@dblock](https://github.com/dblock).
+* Added `Math::Fraction` with string parsing support - [@dblock](https://github.com/dblock).
+* Improved negative number precision - [@dblock](https://github.com/dblock).
+
+0.9.3 (May 25, 2010)
+=====================
+* Added JavaScript implementation - [@valodzka](https://github.com/valodzka).
+
+0.9.0 (May 24, 2010)
+=====================
+
+* Initial public release - [@valodzka](https://github.com/valodzka).

data/Gemfile

@@ -0,0 +1,5 @@
+source :rubygems
+
+gemspec
+
+

data/Rakefile

@@ -0,0 +1,53 @@
+require 'rubygems'
+require 'bundler'
+
+begin
+  Bundler.setup(:default, :development)
+  rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
+
+require 'rake'
+
+if RUBY_PLATFORM =~ /java/
+  require 'rake/javaextensiontask'
+  Rake::JavaExtensionTask.new do |ext|
+    ext.name = 'frac_ext'
+  end
+else
+  require 'rake/extensiontask'
+  Rake::ExtensionTask.new do |ext|
+    ext.ext_dir = 'ext'
+    ext.lib_dir = 'lib'
+    ext.name = 'frac_ext'
+  end
+end
+
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/*.rb'
+  test.verbose = true
+end
+
+require 'rcov/rcovtask'
+Rcov::RcovTask.new do |test|
+  test.libs << 'test'
+  test.pattern = 'test/**/*.rb'
+  test.verbose = true
+end
+
+task :default => [ :compile, :test ]
+
+require 'rdoc/task'
+Rake::RDocTask.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "frac #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+

data/VERSION

@@ -1,2 +1,2 @@
-0.9.5
+0.9.6
 

data/ext/frac_ext.c

@@ -37,9 +37,8 @@
 #  define N2R LONG2NUM
 #endif
 
-static VALUE find_fracs(VALUE mod, VALUE rv, VALUE dv) 
+static VALUE find_fracs(VALUE mod, VALUE rv, VALUE dv)
 {
-  VALUE ret;
   N_TYPE m[2][2], ai, maxden = R2N(rb_Integer(dv));
   double startx, x = RFLOAT_VALUE(rb_Float(rv));
   int sign = 1;
@@ -70,7 +69,7 @@ static VALUE find_fracs(VALUE mod, VALUE rv, VALUE dv)
     if(x==(double)ai) break;     // AF: division by zero
     x = 1/(x - (double) ai);
     if(x>(double)0x7FFFFFFF) break;  // AF: representation failure
-  } 
+  }
 
   {
     /* now remaining x is between 0 and 1/ai */
@@ -95,7 +94,7 @@ static VALUE find_fracs(VALUE mod, VALUE rv, VALUE dv)
   }
 }
 
-void Init_frac_ext() 
+void Init_frac_ext()
 {
   rb_define_module_function(rb_mMath, "find_fracs", find_fracs, 2);
 }

data/ext/frac_ext.java

@@ -0,0 +1,73 @@
+package com.github.valodzka.frac;
+
+import java.io.IOException;
+import java.lang.IllegalArgumentException;
+
+import org.jruby.Ruby;
+import org.jruby.anno.JRubyMethod;
+
+public class frac_ext {
+
+  @JRubyMethod
+  public static double[] find_fracs(double rv, long dv)
+  {
+    long m[][] = new long[2][2];
+    long ai;
+    long maxden = dv;
+    double startx = rv;
+    double x = rv;
+
+    int sign = 1;
+
+    if (maxden <= 0) {
+      throw new IllegalArgumentException("maximum denominator should be > 0");
+    }
+
+    if (x < 0) {
+      sign = -1;
+      x = -x;
+    }
+
+    startx = x;
+
+    /* initialize matrix */
+    m[0][0] = m[1][1] = 1;
+    m[0][1] = m[1][0] = 0;
+
+    /* loop finding terms until denom gets too big */
+    while (m[1][0] *  ( ai = (long) x ) + m[1][1] <= maxden) {
+      long t;
+      t = m[0][0] * ai + m[0][1];
+      m[0][1] = m[0][0];
+      m[0][0] = t;
+      t = m[1][0] * ai + m[1][1];
+      m[1][1] = m[1][0];
+      m[1][0] = t;
+      if(x == (long) ai) break;     // AF: division by zero
+      x = 1/(x - ai);
+      if(x > (double) 0x7FFFFFFF) break;  // AF: representation failure
+    }
+
+    {
+      /* now remaining x is between 0 and 1/ai */
+      /* approx as either 0 or 1/m where m is max that will fit in maxden */
+      /* first try zero */
+      double num1 = sign*m[0][0];
+      double den1 = m[1][0];
+      double err1 = startx - (m[0][0] / m[1][0]);
+
+      /* now try other possibility */
+      ai = (maxden - m[1][1]) / m[1][0];
+      m[0][0] = m[0][0] * ai + m[0][1];
+      m[1][0] = m[1][0] * ai + m[1][1];
+
+      double num2 = sign*m[0][0];
+      double den2 = m[1][0];
+      double err2 = startx - (m[0][0] / m[1][0]);
+
+      return new double[]{ num1, den1, err1, num2, den2, err2 };
+    }
+
+  }
+
+};

data/frac.gemspec

@@ -1,53 +1,45 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
-  s.name = %q{frac}
-  s.version = "0.9.5"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Pavel Valodzka"]
-  s.date = %q{2011-06-19}
-  s.email = %q{pavel@valodzka.name}
-  s.extensions = ["ext/extconf.rb"]
-  s.extra_rdoc_files = [
-    "README.rdoc"
-  ]
-  s.files = [
-    "README.rdoc",
-    "VERSION",
-    "ext/extconf.rb",
-    "ext/frac_ext.c",
-    "frac.gemspec",
-    "lib/frac.js",
-    "lib/frac.rb",
-    "test/frac_test.html",
-    "test/frac_test.rb"
-  ]
-  s.homepage = %q{https://github.com/valodzka/frac}
-  s.licenses = ["MIT license"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Find rational approximation to given real number.  Based on the theory of continued fractions  if x = a1 + 1/(a2 + 1/(a3 + 1/(a4 + ...)))  then best approximation is found by truncating this series (with some adjustments in the last term). Note the fraction can be recovered as the first column of the matrix  ( a1 1 ) ( a2 1 ) ( a3 1 ) ... ( 1  0 ) ( 1  0 ) ( 1  0 )  Instead of keeping the sequence of continued fraction terms, we just keep the last partial product of these matrices.}
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-    else
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<rcov>, [">= 0"])
-    end
+  s.name = "frac"
+  s.version = "0.9.6"
+
+  s.authors = [ "Pavel Valodzka" ]
+  s.email = "pavel@valodzka.name"
+  s.homepage = "https://github.com/valodzka/frac"
+
+  s.files = `git ls-files`.split("\n")
+  if RUBY_PLATFORM =~ /java/
+    s.platform = "java"
+    s.files << "lib/frac_ext.jar"
   else
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<rcov>, [">= 0"])
+    s.extensions = [ "ext/extconf.rb" ]
   end
-end
 
+  s.licenses = [ "MIT" ]
+  s.require_paths = [ "lib" ]
+  s.rubygems_version = "1.6.2"
+  s.summary = <<-SUMMARY
+Find rational approximation to given real number.
+
+Based on the theory of continued fractions
+
+  if x = a1 + 1/(a2 + 1/(a3 + 1/(a4 + ...)))
+
+then best approximation is found by truncating this series
+(with some adjustments in the last term).
+Note the fraction can be recovered as the first column of the matrix
+
+  ( a1 1 ) ( a2 1 ) ( a3 1 ) ...
+  ( 1  0 ) ( 1  0 ) ( 1  0 )
+
+Instead of keeping the sequence of continued fraction terms,
+we just keep the last partial product of these matrices.
+  SUMMARY
+
+  s.add_development_dependency("rake", "~> 10.0")
+  s.add_development_dependency("rake-compiler")
+  s.add_development_dependency("rcov", "~> 0.9")
+  s.add_development_dependency("rdoc")
+end

data/lib/frac.rb

@@ -5,14 +5,28 @@ require File.join(File.dirname(__FILE__), %w{.. lib frac_ext})
 module Math
 
   class << self
-    private :find_fracs
-    
+
     def frac(float, maxden)
       arr = find_fracs(float, maxden)
       arr[2].abs > arr[5].abs ? Rational(arr[3], arr[4]) : Rational(arr[0], arr[1])
     end
+
+    if RUBY_PLATFORM =~ /java/
+      require 'jruby'
+      private
+        def find_fracs(float, maxden)
+          begin
+            com.github.valodzka.frac.frac_ext.find_fracs Float(float), Integer(maxden)
+          rescue Java::JavaLang::IllegalArgumentException => e
+            raise ArgumentError, e.message
+          end
+        end
+    else
+      private :find_fracs
+    end
+
   end
-  
+
   class Fraction
 
     def initialize(float, maxden = 0x100)
@@ -31,13 +45,13 @@ module Math
         @r = Math.frac(float, maxden)
       end
     end
-    
+
     def to_a
       i = @r.to_i
       sign = i >= 0 ? 1 : -1
       [ i, (@r.numerator - i * @r.denominator) * sign, @r.denominator ]
     end
-    
+
     def to_r
       @r
     end
@@ -45,7 +59,7 @@ module Math
     def to_f
       @r.to_f
     end
-    
+
     def to_s
       n = to_a
       if n[1] == 0
@@ -54,9 +68,9 @@ module Math
         "#{n[1]}/#{n[2]}"
       else
         "#{n[0]} #{n[1]}/#{n[2]}"
-      end    
-    end  
-    
+      end
+    end
+
   end
 end
 

metadata

@@ -1,116 +1,130 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: frac
-version: !ruby/object:Gem::Version 
-  hash: 49
-  prerelease: false
-  segments: 
-  - 0
-  - 9
-  - 5
-  version: 0.9.5
+version: !ruby/object:Gem::Version
+  version: 0.9.6
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Pavel Valodzka
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-19 00:00:00 +03:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-01-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10.0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: jeweler
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !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: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rcov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !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: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: pavel@valodzka.name
 executables: []
-
-extensions: 
+extensions:
 - ext/extconf.rb
-extra_rdoc_files: 
-- README.rdoc
-files: 
+extra_rdoc_files: []
+files:
+- .gitignore
+- CHANGELOG.md
+- Gemfile
 - README.rdoc
+- Rakefile
 - VERSION
 - ext/extconf.rb
 - ext/frac_ext.c
+- ext/frac_ext.java
 - frac.gemspec
 - lib/frac.js
 - lib/frac.rb
+- lib/frac_ext.jar
 - test/frac_test.html
 - test/frac_test.rb
-has_rdoc: true
 homepage: https://github.com/valodzka/frac
-licenses: 
-- MIT license
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
-
-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: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: Find rational approximation to given real number.  Based on the theory of continued fractions  if x = a1 + 1/(a2 + 1/(a3 + 1/(a4 + ...)))  then best approximation is found by truncating this series (with some adjustments in the last term). Note the fraction can be recovered as the first column of the matrix  ( a1 1 ) ( a2 1 ) ( a3 1 ) ... ( 1  0 ) ( 1  0 ) ( 1  0 )  Instead of keeping the sequence of continued fraction terms, we just keep the last partial product of these matrices.
+summary: Find rational approximation to given real number.  Based on the theory of
+  continued fractions  if x = a1 + 1/(a2 + 1/(a3 + 1/(a4 + ...)))  then best approximation
+  is found by truncating this series (with some adjustments in the last term). Note
+  the fraction can be recovered as the first column of the matrix  ( a1 1 ) ( a2 1
+  ) ( a3 1 ) ... ( 1  0 ) ( 1  0 ) ( 1  0 )  Instead of keeping the sequence of continued
+  fraction terms, we just keep the last partial product of these matrices.
 test_files: []
-