hpsqrt 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2a73083839c9b2fce6ed374ef8616680f69bdbe2b715e783d59bc8005f794af
-  data.tar.gz: d8d8af76ec6a07094b63320e84db270805fb7dcc1aa7d5c4cc13f52b4ffdaf97
+  metadata.gz: f80e0b8ac735fd3a75e12ec4de06a63b99fb497e0eb75a246376f43ec101d4e3
+  data.tar.gz: 2e35e71c15dd11d7573e1798ab71dbff83c0719f2b44c245e7d33c226a69e7f2
 SHA512:
-  metadata.gz: 532ed7783b5ccde7f167b029d23f81c1d38c76cdef0f8ae85e92c2d97eb096b051bceec9c65426f2c0101b074d4b512a75bd6a4f56ddbaa7c053ca8f583af30a
-  data.tar.gz: 8c78512a2df7e272b0ac9b1face766732c240fc40127503dfb661e52f85908766dba744c711221c2f484a619e7e9ce40832b55ba005e137c1a24c5bf5418d92a
+  metadata.gz: cd88c719dc477c9371103b9071849da9378ff998b40fe88c974bcf79f86cf940498b493f89ee322ec094d18a98ab4ba8ccbe8309d63e609bc75a72a73c68d2d7
+  data.tar.gz: 53323b844461f1638ea8df0bbbc39b1f73e9dde397727e97bdf1fde432ee8a1531518169670fd7dc086e461b5f96c443669ee084ddb3f088ea07cd2d490cf952

data/README.md

@@ -20,6 +20,8 @@ Or install it yourself as:
 
 ## Usage
 
+Calculation:
+
     require 'hpsqrt/core_ext'
     
     p Sqrt(2)
@@ -37,6 +39,65 @@ Or install it yourself as:
     p (Sqrt(7) + Sqrt(11)) * (Sqrt(7) - Sqrt(11))
     #  => -4.0+0.0i
 
+Type casting:
+
+    require 'hpsqrt/core_ext'
+    
+    # to Float
+    p Sqrt(5).to_f
+    #  => 2.23606797749979
+    
+    # to Integer
+    p Sqrt(5).to_i
+    #  => 2
+    
+    # to Rational
+    p Sqrt(4).to_r
+    #  => (2/1)
+    
+    # to Complex
+    p Sqrt(-1i).to_c
+    #  => (0.7071067811865476-0.7071067811865476i) 
+    
+    # to Complex real number
+    p Sqrt(-1i).real
+    #  => 0.7071067811865476
+    
+    # to Complex imaginary number
+    p Sqrt(1i).imag
+    #  => -0.7071067811865476
+    
+    p (Sqrt(5) + Sqrt(7)).expr
+    #  => "√5 + √7" 
+
+Type check:
+
+    require 'hpsqrt/core_ext'
+    
+    # real? returns true if imaginary number is 0
+    p Sqrt(5).real?
+    #  => true
+    p Sqrt(1i).real?
+    #  => false
+
+    # imag? returns true if imaginary number is not 0
+    p Sqrt(5).imag?
+    #  => false
+    p Sqrt(1i).imag?
+    #  => true
+    
+    # int? return true if after the real decimal point is 0 and imaginary number is 0
+    p Sqrt(2).int?
+    #  => false
+    p Sqrt(4).int?
+    #  => true
+    
+    # float? return true if after the real decimal point is not 0 and imaginary number is 0
+    p Sqrt(2).float?
+    #  => true
+    p Sqrt(4).float?
+    #  => false
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/yoshida-eth0/ruby-sqrt.

data/bin/console

@@ -2,6 +2,7 @@
 
 require "bundler/setup"
 require "hpsqrt"
+require "hpsqrt/core_ext"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.

data/lib/hpsqrt/{value.rb → term.rb}

@@ -1,6 +1,6 @@
 class HpSqrt < Numeric
 
-  class Value
+  class Term
     attr_reader :number
     attr_reader :sqrt
 

data/lib/hpsqrt/version.rb

@@ -1,3 +1,3 @@
 class HpSqrt < Numeric
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/lib/hpsqrt.rb

@@ -1,5 +1,5 @@
 require 'hpsqrt/inspect_mode'
-require 'hpsqrt/value'
+require 'hpsqrt/term'
 require 'hpsqrt/version'
 
 
@@ -16,73 +16,73 @@ class HpSqrt < Numeric
   end
 
 
-  attr_reader :values
+  attr_reader :terms
 
-  def initialize(values)
-    @values = values.freeze
+  def initialize(terms)
+    @terms = terms.freeze
     freeze
   end
 
   def -@
-    values = self.values.map{|v,c| [v, -c]}.to_h
-    self.class.new(values)
+    terms = @terms.map{|t,c| [t, -c]}.to_h
+    self.class.new(terms)
   end
 
   def +(other)
     other = self.class.create(other)
 
-    values = @values.merge(other.values) {|v, c1, c2|
+    terms = @terms.merge(other.terms) {|t, c1, c2|
       c1 + c2
     }
-    values.delete_if {|v,c| c==0}
+    terms.delete_if {|t,c| c==0}
 
-    self.class.new(values)
+    self.class.new(terms)
   end
 
   def -(other)
     other = self.class.create(other)
 
-    other_values = other.values.map{|v,c| [v, -c]}.to_h
-    values = @values.merge(other_values) {|v, c1, c2|
+    other_terms = other.terms.map{|t,c| [t, -c]}.to_h
+    terms = @terms.merge(other_terms) {|t, c1, c2|
       c1 + c2
     }
-    values.delete_if {|v,c| v==0}
+    terms.delete_if {|t,c| c==0}
 
-    self.class.new(values)
+    self.class.new(terms)
   end
 
   def *(other)
     other = self.class.create(other)
 
-    values = {}
-    @values.each {|v1, c1|
-      other.values.each {|v2, c2|
-        v = v1 * v2
+    terms = {}
+    @terms.each {|t1, c1|
+      other.terms.each {|t2, c2|
+        t = t1 * t2
         c = c1 * c2
 
-        values[v] ||= 0
-        values[v] += c
+        terms[t] ||= 0
+        terms[t] += c
       }
     }
-    values.delete_if {|v,c| c==0}
+    terms.delete_if {|t,c| c==0}
 
-    self.class.new(values)
+    self.class.new(terms)
   end
 
   def /(other)
     other = self.class.create(other)
-    other_inv = Value.new(number: Rational(1, other.value))
+    other_inv = Term.new(number: Rational(1, other.to_c))
 
-    values = {}
-    @values.each {|v, c|
-      v *= other_inv
+    terms = {}
+    @terms.each {|t, c|
+      t *= other_inv
 
-      values[v] ||= 0
-      values[v] += c
+      terms[t] ||= 0
+      terms[t] += c
     }
-    values.delete_if {|v,c| c==0}
+    terms.delete_if {|t,c| c==0}
 
-    self.class.new(values)
+    self.class.new(terms)
   end
 
   def **(other)
@@ -99,7 +99,7 @@ class HpSqrt < Numeric
       end
       result
     else
-      self.class.number(self.value ** other.value)
+      self.class.number(self.to_c ** other.to_c)
     end
   end
 
@@ -109,26 +109,26 @@ class HpSqrt < Numeric
 
   def ==(other)
     if self.class==other
-      self.value==other.value
+      self.to_c==other.to_c
     elsif Numeric===other
-      self.value==other
+      self.to_c==other
     else
       super.==(other)
     end
   end
 
-  def value
-    @values.map {|v, c|
-      v.number * Math.sqrt(Complex(v.sqrt)) * c
-    }.sum
+  def to_c
+    @terms.map {|t, c|
+      t.number * Math.sqrt(Complex(t.sqrt)) * c
+    }.sum.to_c
   end
 
   def real
-    value.real
+    to_c.real
   end
 
   def imag
-    Complex(value).imag
+    to_c.imag
   end
 
   def to_i
@@ -149,19 +149,21 @@ class HpSqrt < Numeric
     end
   end
 
-  def to_c
-    value.to_c
-  end
-
   def to_r
-    value.to_r
+    c = to_c
+    if c.imag.zero?
+      Rational(c.real, 1)
+    else
+      raise RangeError, "can't convert %s into Rational" % c
+    end
   end
 
   def expr
     value_to_s = -> (v) {
       if Complex===v && v.imag.zero?
         v = v.real
-      elsif Rational===v
+      end
+      if Rational===v
         v = v.to_s.sub(/\/1$/, "")
       end
       v = v.to_s
@@ -171,9 +173,9 @@ class HpSqrt < Numeric
       v
     }
 
-    result = @values.map {|v, c|
-      n = v.number * c
-      s = v.sqrt
+    result = @terms.map {|t, c|
+      n = t.number * c
+      s = t.sqrt
 
       if s!=1
         if n==1
@@ -204,11 +206,11 @@ class HpSqrt < Numeric
   def to_s
     case @@inspect_mode
     when INSPECT_MODE::VALUE
-      value.to_s
+      to_c.to_s
     when INSPECT_MODE::EXPR
       expr
     else
-      "#<%s:0x%016x value=(%s) expr=(%s)>" % [self.class.name, self.object_id, value, expr]
+      "#<%s:0x%016x value=(%s) expr=(%s)>" % [self.class.name, self.object_id, to_c, expr]
     end
   end
 
@@ -221,15 +223,13 @@ class HpSqrt < Numeric
   end
 
   def int?
-    v = value
-    is_imag = Complex===v && !v.imag.zero?
-    !is_imag && v.real==v.real.to_i
+    c = to_c
+    c.imag.zero? && c.real==c.real.to_i
   end
 
   def float?
-    v = value
-    is_imag = Complex===v && !v.imag.zero?
-    !is_imag && Float===v.real && v.real!=v.real.to_i
+    c = to_c
+    c.imag.zero? && Float===c.real && c.real!=c.real.to_i
   end
 
   def self.create(v)
@@ -241,10 +241,25 @@ class HpSqrt < Numeric
   end
 
   def self.number(v)
-    new({Value.new(number: v) => 1})
+    if v!=0
+      new({Term.new(number: v) => 1})
+    else
+      zero
+    end
   end
 
   def self.sqrt(v)
-    new({Value.new(sqrt: v) => 1})
+    if self===v
+      v = v.to_c
+    end
+    if v!=0
+      new({Term.new(sqrt: v) => 1})
+    else
+      zero
+    end
+  end
+
+  def self.zero
+    new({})
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hpsqrt
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Yoshida Tetsuya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-11 00:00:00.000000000 Z
+date: 2019-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -71,7 +71,7 @@ files:
 - lib/hpsqrt.rb
 - lib/hpsqrt/core_ext.rb
 - lib/hpsqrt/inspect_mode.rb
-- lib/hpsqrt/value.rb
+- lib/hpsqrt/term.rb
 - lib/hpsqrt/version.rb
 homepage: https://github.com/yoshida-eth0/ruby-sqrt
 licenses: