sweet_pi 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 675a8427d17ef04feffd80568eac2e735ea959f2bb3d33c16bbdf3a1db2936c4
-  data.tar.gz: ba468b25f2f9fb524a4e1c5f77ab579d10e6e46d8a931963e097e9e1e0d40330
+  metadata.gz: 887f34ad314738bb6eaa5323069ccaf742d0662aab5c27925229af8a4a223cdb
+  data.tar.gz: 25519ab4f25156cb958e4808ec4c43744cfc3283107b3826ba2a783ee812fe6a
 SHA512:
-  metadata.gz: cb7b26f3fb6ce3faf21843515d61138cdfd8af210e4543ba9d90edb7625f4626e1a6c26ba87953491795d908fa4bb6e70685743a4d8862659392c974598f0e40
-  data.tar.gz: d6b86a65c9d24614d465bb57ebc365cf23a9c3d5916b2377523e5d4daa21bd48f955dbd57faa2589da09e768cd38c6cb026741d65a7312da2d25e14a000696c8
+  metadata.gz: b30e4539df9936bdd4f136dd8eacaedfaa3762a91d9062cb26dcf0c34c1ffd866f10fa8327c23ce362a3a9cb3a4019a943a2eb914457fd355f9a6b34219f77fa
+  data.tar.gz: 01435ee4b2825c913bb796f9576614b60ccf720739d054236f75afe8f88d6f83efb9b4462dcc8a38d878087c276f1fe98e8dbb0f0ad7fb23cd5b1e0fc344f713

data/.github/workflows/gempush.yml

@@ -0,0 +1,44 @@
+name: Ruby Gem
+
+on:
+  pull_request:
+    branches:
+      - master
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    name: Build + Publish
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@master
+    - name: Set up Ruby 2.7
+      uses: actions/setup-ruby@v1
+      with:
+        version: 2.7.x
+
+    - name: Publish to GPR
+      run: |
+        mkdir -p $HOME/.gem
+        touch $HOME/.gem/credentials
+        chmod 0600 $HOME/.gem/credentials
+        printf -- "---\n:github: Bearer ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+        gem build *.gemspec
+        gem push --KEY github --host https://rubygems.pkg.github.com/${OWNER} *.gem
+      env:
+        GEM_HOST_API_KEY: ${{secrets.GPR_AUTH_TOKEN}}
+        OWNER: username
+
+    - name: Publish to RubyGems
+      run: |
+        mkdir -p $HOME/.gem
+        touch $HOME/.gem/credentials
+        chmod 0600 $HOME/.gem/credentials
+        printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+        gem build *.gemspec
+        gem push *.gem
+      env:
+        GEM_HOST_API_KEY: ${{secrets.RUBYGEMS_AUTH_TOKEN}}

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sweet_pi (0.1.3)
+    sweet_pi (0.2.0)
       thor (~> 0.20.3)
 
 GEM

data/lib/sweet_pi.rb

@@ -2,47 +2,18 @@
 require 'sweet_pi/version'
 require 'sweet_pi/runner'
 require 'sweet_pi/pi'
+require 'sweet_pi/generator'
 
 require 'bigdecimal'
 require 'bigdecimal/util'
 
 
 module SweetPi
-  class Generator
+  class << self
 
-    def initialize(process_size = 1)
-      raise ArgumentError unless process_size.is_a?(Integer) and 1 <= process_size
-      @pi = SweetPi::PI.new(process_size)
-
-      @from = 0
-      @to = 2
-    end
-
-    def range(from = 0, to)
-      @from = from
-      @to = to
-      self
-    end
-
-    def calc
-      @value = @pi.calc(@to)
-      self
+    def generator(process_size)
+      SweetPi::Generator.new(process_size)
     end
 
-    def each_char
-      self.calc.to_s.each_char do |c|
-        yield c
-      end
-
-      self
-    end
-
-    def to_s
-      from = @from + 1 if 1 <= @from
-      to = @to + 2
-
-      @value ||= Math::PI.to_d
-      @value.to_s('f')[from..to]
-    end
   end
 end

data/lib/sweet_pi/generator.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+require 'sweet_pi/pi'
+
+require 'bigdecimal'
+require 'bigdecimal/util'
+
+
+module SweetPi
+  class Generator
+
+    def initialize(process_count = 1)
+      @pi = SweetPi::PI.new
+      @pi.process_count = process_count
+
+      @from = 0
+      @to = 2
+    end
+
+    def process_count=(count)
+      @pi.process_count = count
+    end
+
+    def range(from = 0, to)
+      @from = from
+      @to = to
+      self
+    end
+
+    def calc
+      @value = @pi.calc(@to)
+      self
+    end
+
+    def each_char
+      self.calc.to_s.each_char do |c|
+        yield c
+      end
+
+      self
+    end
+
+    def to_s
+      from = @from + 1 if 1 <= @from
+      to = @to + 2
+
+      @value ||= Math::PI.to_d
+      @value.to_s('f')[from..to]
+    end
+  end
+end

data/lib/sweet_pi/pi.rb

@@ -16,19 +16,23 @@ module SweetPi
 
     using SweetPi::Math::Factorial
 
-    def initialize(process_size = 1)
-      raise ArgumentError unless process_size.is_a?(Integer) and 1 <= process_size
-      @process_size = process_size
+    def initialize()
+      @process_count = 1
+    end
+
+    def process_count=(count)
+      raise ArgumentError unless count.is_a?(Integer) and 1 <= count
+      @process_count = count
     end
 
     def calc(digit)
       raise ArgumentError unless digit.is_a?(Integer) and 1 <= digit
       accuracy = calc_accuracy(digit)
 
-      result = if @process_size == 1
+      result = if @process_count == 1
         single_process(accuracy)
       else
-        multi_process(accuracy, @process_size)
+        multi_process(accuracy, @process_count)
       end
 
       @prev_acc = accuracy
@@ -59,16 +63,16 @@ module SweetPi
 
     def single_process(prev_acc = 0, accuracy)
       sum = SweetPi::Math.sum(prev_acc, accuracy) do |k|
-        Rational(numerator(k), denominator(k))
+        chudnovsky(k)
       end
 
       12 * sum
     end
 
-    def multi_process(accuracy, process_size)
+    def multi_process(accuracy, process_count)
       processes = []
-      process_size.times do |p_n|
-        processes << SweetPi::Fork.new(accuracy, process_size, p_n) do |a, p_s, p_n|
+      process_count.times do |p_n|
+        processes << SweetPi::Fork.new(accuracy, process_count, p_n) do |a, p_s, p_n|
           each_process(a, p_s, p_n)
         end
       end
@@ -76,10 +80,10 @@ module SweetPi
       processes.map(&:value).reduce(:+)
     end
 
-    def each_process(accuracy, process_size, process_num)
+    def each_process(accuracy, process_count, process_num)
       f = Proc.new do |x|
-        base = process_size * x
-        a = (process_size - 1) * (x % 2)
+        base = process_count * x
+        a = (process_count - 1) * (x % 2)
         b = process_num * (1 - (x % 2) * 2)
         base + a + b
       end
@@ -88,7 +92,7 @@ module SweetPi
       x = 0
       k = f.call(x)
       while k <= accuracy do
-        sum += Rational(numerator(k), denominator(k))
+        sum += chudnovsky(k)
         x += 1
         k = f.call(x)
       end
@@ -99,12 +103,11 @@ module SweetPi
       (digit / DIGIT_PER_ACCURACY).ceil.to_i
     end
 
-    def numerator(k)
-      (-1)**k * (6 * k).! * (A + B * k)
-    end
+    def chudnovsky(k)
+      numerator = (-1)**k * (6 * k).! * (A + B * k)
+      denominator = k.!**3 * (3 * k).! * C**(3 * k + '1.5'.to_d)
 
-    def denominator(k)
-      k.!**3 * (3 * k).! * C**(3 * k + '1.5'.to_d)
+      Rational(numerator, denominator)
     end
 
     def fix(digit, pi)

data/lib/sweet_pi/version.rb

@@ -1,3 +1,3 @@
 module SweetPi
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sweet_pi
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Toshiki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-13 00:00:00.000000000 Z
+date: 2020-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -88,6 +88,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/gempush.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -103,6 +104,7 @@ files:
 - exe/sweet_pi
 - lib/sweet_pi.rb
 - lib/sweet_pi/fork.rb
+- lib/sweet_pi/generator.rb
 - lib/sweet_pi/math.rb
 - lib/sweet_pi/pi.rb
 - lib/sweet_pi/runner.rb