ruby-numtheory 0.0.8.1 → 0.0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62440c109267fe60df37f71029cc783cd89d19c6
-  data.tar.gz: d2c8f0e70eaa6829be286dc0fada901b15587304
+  metadata.gz: 5664624f001011ac200885754788be11cf9d987e
+  data.tar.gz: 677ca9f6744e113bbf8fee3e651adb55dabd37ff
 SHA512:
-  metadata.gz: b09f5e85f78eb7059ac2940c0b316bcf10019463c30583f6ea2af662e3649f3e6ae85a85ee1766ae68b4bb229ff047a560b0e1e8c19afde7c6f2ec96eda4276b
-  data.tar.gz: 416e6551a17fae866e69b44477baf2627f0220c56cdfd32e01b32469b58de1d7d5ce266bda8eaf0c2e22d407bd9a0a4e012de6922f1426de5edf2e612b72a048
+  metadata.gz: 039d5fb674c11e4b2f43f55801b1c0922ab542a4a4a3b8454488a7f536ec4f64264f0190a3cfb329ff19e171b17b5db84a460ae1134f714bb6c220f621c0bf83
+  data.tar.gz: 52d719becb03e7531fe445206e47681a0dead1e26a8f084a9f317a9526658cdbb09c8a9fbfbe742190915d3e36aa461feee7be722f5391cf1e3aca238b787701

data/.travis.yml

@@ -1,4 +1,6 @@
 language: ruby
 rvm:
-  - 1.9.3 
+  # - 1.9.3 - prime? test fails for unknown reason; 
   - 2.0.0
+  - 2.1.0
+  - 2.2.0

data/ext/numtheory/bignum.h

@@ -0,0 +1,96 @@
+#ifndef NUMTHEORY_BIGNUM_H
+#define NUMTHEORY_BIGNUM_H
+
+#ifndef BDIGIT
+# if SIZEOF_INT*2 <= SIZEOF_LONG_LONG
+# define BDIGIT unsigned int
+# define SIZEOF_BDIGIT SIZEOF_INT
+# define BDIGIT_DBL unsigned LONG_LONG
+# define BDIGIT_DBL_SIGNED LONG_LONG
+# define PRI_BDIGIT_PREFIX ""
+# define PRI_BDIGIT_DBL_PREFIX PRI_LL_PREFIX
+# elif SIZEOF_INT*2 <= SIZEOF_LONG
+# define BDIGIT unsigned int
+# define SIZEOF_BDIGIT SIZEOF_INT
+# define BDIGIT_DBL unsigned long
+# define BDIGIT_DBL_SIGNED long
+# define PRI_BDIGIT_PREFIX ""
+# define PRI_BDIGIT_DBL_PREFIX "l"
+# elif SIZEOF_SHORT*2 <= SIZEOF_LONG
+# define BDIGIT unsigned short
+# define SIZEOF_BDIGIT SIZEOF_SHORT
+# define BDIGIT_DBL unsigned long
+# define BDIGIT_DBL_SIGNED long
+# define PRI_BDIGIT_PREFIX "h"
+# define PRI_BDIGIT_DBL_PREFIX "l"
+# else
+# define BDIGIT unsigned short
+# define SIZEOF_BDIGIT (SIZEOF_LONG/2)
+# define SIZEOF_ACTUAL_BDIGIT SIZEOF_LONG
+# define BDIGIT_DBL unsigned long
+# define BDIGIT_DBL_SIGNED long
+# define PRI_BDIGIT_PREFIX "h"
+# define PRI_BDIGIT_DBL_PREFIX "l"
+# endif
+#endif
+#ifndef SIZEOF_ACTUAL_BDIGIT
+# define SIZEOF_ACTUAL_BDIGIT SIZEOF_BDIGIT
+#endif
+#ifdef PRI_BDIGIT_PREFIX
+# define PRIdBDIGIT PRI_BDIGIT_PREFIX"d"
+# define PRIiBDIGIT PRI_BDIGIT_PREFIX"i"
+# define PRIoBDIGIT PRI_BDIGIT_PREFIX"o"
+# define PRIuBDIGIT PRI_BDIGIT_PREFIX"u"
+# define PRIxBDIGIT PRI_BDIGIT_PREFIX"x"
+# define PRIXBDIGIT PRI_BDIGIT_PREFIX"X"
+#endif
+#ifdef PRI_BDIGIT_DBL_PREFIX
+# define PRIdBDIGIT_DBL PRI_BDIGIT_DBL_PREFIX"d"
+# define PRIiBDIGIT_DBL PRI_BDIGIT_DBL_PREFIX"i"
+# define PRIoBDIGIT_DBL PRI_BDIGIT_DBL_PREFIX"o"
+# define PRIuBDIGIT_DBL PRI_BDIGIT_DBL_PREFIX"u"
+# define PRIxBDIGIT_DBL PRI_BDIGIT_DBL_PREFIX"x"
+# define PRIXBDIGIT_DBL PRI_BDIGIT_DBL_PREFIX"X"
+#endif
+#define BIGNUM_EMBED_LEN_NUMBITS 3
+#ifndef BIGNUM_EMBED_LEN_MAX
+# if (SIZEOF_VALUE*3/SIZEOF_ACTUAL_BDIGIT) < (1 << BIGNUM_EMBED_LEN_NUMBITS)-1
+# define BIGNUM_EMBED_LEN_MAX (SIZEOF_VALUE*3/SIZEOF_ACTUAL_BDIGIT)
+# else
+# define BIGNUM_EMBED_LEN_MAX ((1 << BIGNUM_EMBED_LEN_NUMBITS)-1)
+# endif
+#endif
+
+#define SIZEOF_BDIGITS SIZEOF_BDIGIT
+
+struct RBignum {
+  struct RBasic basic;
+  union {
+    struct {
+      size_t len;
+      BDIGIT *digits;
+    } heap;
+    BDIGIT ary[BIGNUM_EMBED_LEN_MAX];
+  } as;
+};
+
+#define RBIGNUM(obj) (R_CAST(RBignum)(obj))
+#define BIGNUM_SIGN_BIT FL_USER1
+#define RBIGNUM_SET_SIGN(b,sign) \
+  ((sign) ? (RBASIC(b)->flags |= BIGNUM_SIGN_BIT) \
+   : (RBASIC(b)->flags &= ~BIGNUM_SIGN_BIT))
+#define RBIGNUM_EMBED_FLAG FL_USER2
+#define RBIGNUM_EMBED_LEN_MASK (FL_USER5|FL_USER4|FL_USER3)
+#define RBIGNUM_EMBED_LEN_SHIFT (FL_USHIFT+BIGNUM_EMBED_LEN_NUMBITS)
+#define RBIGNUM_LEN(b) \
+  ((RBASIC(b)->flags & RBIGNUM_EMBED_FLAG) ? \
+   (long)((RBASIC(b)->flags >> RBIGNUM_EMBED_LEN_SHIFT) & \
+     (RBIGNUM_EMBED_LEN_MASK >> RBIGNUM_EMBED_LEN_SHIFT)) : \
+   RBIGNUM(b)->as.heap.len)
+/* LSB:BIGNUM_DIGITS(b)[0], MSB:BIGNUM_DIGITS(b)[BIGNUM_LEN(b)-1] */
+#define RBIGNUM_DIGITS(b) \
+  ((RBASIC(b)->flags & RBIGNUM_EMBED_FLAG) ? \
+   RBIGNUM(b)->as.ary : \
+   RBIGNUM(b)->as.heap.digits)
+
+#endif

data/ext/numtheory/numtheory.c

@@ -69,6 +69,8 @@ Init_numtheory()
             numtheory_fibonacci, -1);
     rb_define_module_function(rb_mNumTheory, "precompute_primes_upto",
             numtheory_precompute_primes_upto, 1);
+    rb_define_module_function(rb_mNumTheory, "primes_precomputed",
+            numtheory_primes_precomputed, 0);
     rb_define_module_function(rb_mNumTheory, "prime",
             numtheory_prime, 1);
     rb_define_module_function(rb_mNumTheory, "primepi",
@@ -121,10 +123,12 @@ Init_numtheory()
             numtheory_perfect_square_p, 0);
 
     NUM_OF_PRIMES = init_sieve(PRIMES_UPPER_LIMIT);
-    /* PRECOMPUTED_PRIMES: the number of precomputed primes. */
-    rb_define_const(rb_mNumTheory, "PRECOMPUTED_PRIMES", 
-            INT2NUM(NUM_OF_PRIMES));
-    
+}
+
+VALUE
+numtheory_primes_precomputed(VALUE obj)
+{
+    return INT2FIX(NUM_OF_PRIMES);
 }
 
 /*
@@ -152,8 +156,6 @@ numtheory_precompute_primes_upto(VALUE obj, VALUE n)
         free(numtheory_primes);
 
         NUM_OF_PRIMES = init_sieve(PRIMES_UPPER_LIMIT);
-        rb_const_set(mNumTheory, rb_intern("PRECOMPUTED_PRIMES"),
-                INT2NUM(NUM_OF_PRIMES));
     }
     else
     {

data/ext/numtheory/numtheory.h

@@ -10,10 +10,16 @@
 #include <ruby/version.h>
 #endif
 
+#if RUBY_VERSION_MAJOR == 1
 #if RUBY_VERSION_MINOR == 8
 #include <intern.h>
 #include <defines.h>
 #endif
+#elif RUBY_API_VERSION_MAJOR == 2
+#if RUBY_API_VERSION_MINOR >= 2
+#include "bignum.h"
+#endif
+#endif
 
 #ifdef DEBUG
 #include <stdio.h>
@@ -32,6 +38,7 @@ VALUE numtheory_powermod(int argc, VALUE *argv);
 VALUE numtheory_miller_rabin_pseudoprime_p(VALUE n);
 VALUE numtheory_nextprime(VALUE n);
 VALUE numtheory_precompute_primes_upto(VALUE obj, VALUE n);
+VALUE numtheory_primes_precomputed(VALUE obj);
 VALUE numtheory_prime(VALUE obj, VALUE i);
 VALUE numtheory_primepi(VALUE obj, VALUE n);
 VALUE numtheory_fibonacci(int argc, VALUE *argv);

data/ruby-numtheory.gemspec

@@ -3,7 +3,7 @@ Gem::Specification.new do |gem|
   gem.homepage = "http://github.com/lomereiter/ruby-numtheory"
   gem.license = "MIT"
   gem.summary = "Ruby number theory library"
-  gem.version = "0.0.8.1"
+  gem.version = "0.0.9.1"
   gem.platform = Gem::Platform::RUBY
 
   gem.description = <<-EOF

data/spec/numtheory/primality_tests_spec.rb

@@ -1,5 +1,11 @@
 require 'numtheory'
 
+RSpec.configure do |config|
+  config.expect_with :rspec do |c|
+    c.syntax = [:should]
+  end
+end
+
 describe "primality tests" do
   
   describe "prime? method" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-numtheory
 version: !ruby/object:Gem::Version
-  version: 0.0.8.1
+  version: 0.0.9.1
 platform: ruby
 authors:
 - Artem Tarasov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-24 00:00:00.000000000 Z
+date: 2015-09-26 00:00:00.000000000 Z
 dependencies: []
 description: |2
       The library is written as C extension and aims to provide
@@ -22,11 +22,12 @@ extra_rdoc_files:
 - ext/numtheory/numtheory.c
 - LICENSE.txt
 files:
-- .travis.yml
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- ext/numtheory/bignum.h
 - ext/numtheory/constants.h
 - ext/numtheory/extconf.rb
 - ext/numtheory/numtheory.c
@@ -53,17 +54,17 @@ require_paths:
 - ext
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Ruby number theory library