hpsqrt 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05dcb3de244a72c5d31cc3a6cb9591aedebe865b23a0622f36938efeb432b484
-  data.tar.gz: 6062e3d23c3ed35228b19caf4ab8e84d53e06365609e3499acf6f82536c78712
+  metadata.gz: 437b5349ed19ac1c435e0dca0128a7ed7cb832d95dcc95762ed6b97b93cbd7f1
+  data.tar.gz: 99cc3c0e50c6085a7c228bb19ac99b5dde007fdb62163592cfaa11850ce753aa
 SHA512:
-  metadata.gz: 06e28c7a14e200465bfb6f578ce1d252a58e67fe0f786907ce98bd95c0b5b70292f80790113bbc8c3bca61bf0f0fb8b74e159b7fc25a3eb794f349a83427d5c5
-  data.tar.gz: 2537b6dee6cd313f3be6520c3a069a09a6ee3d170f1de6822efd1b80ebf3769c50d977ea798fd8a2ec350fe96cb2a4d0517883a0edd9f936e8477925ecc6bf59
+  metadata.gz: fcf2f4b2f23c3fc084090aeaff489bc9866a0264eb50464145097efffd304f942f2efe12b7faf77d84135ac9ef9bbe16395c1bcded28ef75b15fc9881ced7732
+  data.tar.gz: 1334f295b5201649b02a6f67bcdc1c811e6131bb5e224f7434dfdc80f18ae685eb57de7cab024ff51c626b5ad41403085747dd01be6c36d730470c2bc8e1828d

data/README.md

@@ -65,6 +65,10 @@ p Sqrt(5).to_i
 p Sqrt(4).to_r
 #  => (2/1)
 
+# to Complex (involving Rational)
+p (Sqrt(2)**2).to_rc
+#  => ((2/1)+(0/1)*i)
+
 # to Complex
 p Sqrt(-1i).to_c
 #  => (0.7071067811865476-0.7071067811865476i) 
@@ -78,7 +82,7 @@ p Sqrt(1i).imag
 #  => -0.7071067811865476
 
 p (Sqrt(5) + Sqrt(7)).expr
-#  => "√5 + √7" 
+#  => "√5 + √7"
 ```
 
 Type check:
@@ -86,17 +90,23 @@ Type check:
 ```ruby
 require 'hpsqrt/core_ext'
 
-# integer? return true if after the real decimal point is 0 and imaginary number is 0
+# integer? returns true if after the real decimal point is 0 and imaginary number is 0
 p Sqrt(2).integer?
 #  => false
 p Sqrt(4).integer?
 #  => true
 
-# float? return true if after the real decimal point is not 0 and imaginary number is 0
+# float? returns 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
+
+# complex? returns true if imaginary number is not 0
+p Sqrt(1).complex?
+#  => false
+p Sqrt(-1).complex?
+#  => true
 ```
 
 ## Contributing

data/lib/hpsqrt.rb

@@ -73,7 +73,7 @@ class HpSqrt < Numeric
 
   def /(other)
     other = self.class.create(other)
-    other_inv = Term.new(number: Rational(1, other.to_c))
+    other_inv = Term.new(number: Rational(1, other.to_rc))
 
     terms = {}
     @terms.each {|t, c|
@@ -101,7 +101,7 @@ class HpSqrt < Numeric
       end
       result
     else
-      self.class.number(self.to_c ** other.to_c)
+      self.class.number(self.to_rc ** other.to_rc)
     end
   end
 
@@ -111,9 +111,9 @@ class HpSqrt < Numeric
 
   def ==(other)
     if self.class==other
-      self.to_c==other.to_c
+      self.to_rc==other.to_rc
     elsif Numeric===other
-      self.to_c==other
+      self.to_rc==other
     else
       super.==(other)
     end
@@ -161,29 +161,37 @@ class HpSqrt < Numeric
   alias_method :imaginary, :imag
 
   def to_i
-    c = to_c
-    if c.imag.zero?
-      c.real.to_i
+    if imag.zero?
+      real.to_i
     else
-      raise RangeError, "can't convert %s into Integer" % c
+      raise RangeError, "can't convert %s into Integer" % to_c
     end
   end
 
   def to_f
-    c = to_c
-    if c.imag.zero?
-      c.real.to_f
+    if imag.zero?
+      real.to_f
     else
-      raise RangeError, "can't convert %s into Float" % c
+      raise RangeError, "can't convert %s into Float" % to_c
     end
   end
 
+  def to_rc
+    @cache[:to_rc] ||= @terms.map {|t, c|
+      nc = Complex(t.number.real.to_r, t.number.imag.to_r)
+
+      sc = Math.sqrt(Complex(t.sqrt))
+      sc = Complex(sc.real.to_r, sc.imag.to_r)
+
+      nc * sc * c
+    }.sum.nonzero? || Complex(0.to_r, 0.to_r)
+  end
+
   def to_r
-    c = to_c
-    if c.imag.zero?
-      Rational(c.real, 1)
+    if to_rc.imag.zero?
+      to_rc.real
     else
-      raise RangeError, "can't convert %s into Rational" % c
+      raise RangeError, "can't convert %s into Rational" % to_rc
     end
   end
 
@@ -247,14 +255,16 @@ class HpSqrt < Numeric
     false
   end
 
+  def complex?
+    !imag.zero?
+  end
+
   def integer?
-    c = to_c
-    c.imag.zero? && c.real==c.real.to_i
+    imag.zero? && real==real.to_i
   end
 
   def float?
-    c = to_c
-    c.imag.zero? && Float===c.real && c.real!=c.real.to_i
+    imag.zero? && Float===real && real!=real.to_i
   end
 
   def self.create(v)

data/lib/hpsqrt/version.rb

@@ -1,3 +1,3 @@
 class HpSqrt < Numeric
-  VERSION = "1.8.0"
+  VERSION = "1.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hpsqrt
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Yoshida Tetsuya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-17 00:00:00.000000000 Z
+date: 2019-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler