hpsqrt 1.9.0 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 437b5349ed19ac1c435e0dca0128a7ed7cb832d95dcc95762ed6b97b93cbd7f1
-  data.tar.gz: 99cc3c0e50c6085a7c228bb19ac99b5dde007fdb62163592cfaa11850ce753aa
+  metadata.gz: bdf439f0e309a02b4f3356ae7e8ca8de9488fab3b46a167b0c8cfc0c84db4b55
+  data.tar.gz: 2f5e1f9badf7dad530ab0b37b5c138d24a067c665ecd646ebc744c015e650ee9
 SHA512:
-  metadata.gz: fcf2f4b2f23c3fc084090aeaff489bc9866a0264eb50464145097efffd304f942f2efe12b7faf77d84135ac9ef9bbe16395c1bcded28ef75b15fc9881ced7732
-  data.tar.gz: 1334f295b5201649b02a6f67bcdc1c811e6131bb5e224f7434dfdc80f18ae685eb57de7cab024ff51c626b5ad41403085747dd01be6c36d730470c2bc8e1828d
+  metadata.gz: 2e4c2b6a8b6e83a73d7b01a34bbb04500f4067d25b2bc335ae318632187544e0e75061f5adf1b75bb922770570937aebdde5a4d4418ab61398e3c13c1a1e0418
+  data.tar.gz: 0f588870311f93645d491b4b71da5ea1e7780527bb7a365258ed7aba3b6e7bdfef419b306fc7aeef1db949ce321f5af2fb4ba7e0b49dd3208eda54872b841427

data/README.md

@@ -69,7 +69,7 @@ p Sqrt(4).to_r
 p (Sqrt(2)**2).to_rc
 #  => ((2/1)+(0/1)*i)
 
-# to Complex
+# to Complex (involving Float)
 p Sqrt(-1i).to_c
 #  => (0.7071067811865476-0.7071067811865476i) 
 
@@ -81,6 +81,7 @@ p Sqrt(-1i).real
 p Sqrt(1i).imag
 #  => -0.7071067811865476
 
+# to expression string
 p (Sqrt(5) + Sqrt(7)).expr
 #  => "√5 + √7"
 ```

data/lib/hpsqrt.rb

@@ -145,10 +145,19 @@ class HpSqrt < Numeric
   alias_method :angle, :arg
   alias_method :phase, :arg
 
+  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(Complex(0.to_r, 0.to_r))
+  end
+
   def to_c
-    @cache[:to_c] ||= @terms.map {|t, c|
-      t.number * Math.sqrt(Complex(t.sqrt)) * c
-    }.sum.to_c
+    @cache[:to_c] ||= Complex(to_rc.real.to_f, to_rc.imag.to_f)
   end
 
   def real
@@ -176,17 +185,6 @@ class HpSqrt < Numeric
     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
     if to_rc.imag.zero?
       to_rc.real
@@ -196,43 +194,45 @@ class HpSqrt < Numeric
   end
 
   def expr
-    value_to_s = -> (v) {
-      if Complex===v && v.imag.zero?
-        v = v.real
-      end
-      if Rational===v && v.denominator==1
-        v = v.numerator
-      end
-      v = v.to_s
-      if v !~ /^[\d\.]+$/
-        v = "(%s)" % v
-      end
-      v
-    }
+    @cache[:expr] ||= begin
+      value_to_s = -> (v) {
+        if Complex===v && v.imag.zero?
+          v = v.real
+        end
+        if Rational===v && v.denominator==1
+          v = v.numerator
+        end
+        v = v.to_s
+        if v !~ /^[\d\.]+$/
+          v = "(%s)" % v
+        end
+        v
+      }
 
-    result = @terms.map {|t, c|
-      n = t.number * c
-      s = t.sqrt
-
-      if s!=1
-        if n==1
-          "\u221A%s" % value_to_s[s]
-        elsif 0<n.real
-          "%s\u221A%s" % [value_to_s[n], value_to_s[s]]
-        elsif n==-1
-          "(-\u221A%s)" % value_to_s[s]
+      result = @terms.map {|t, c|
+        n = t.number * c
+        s = t.sqrt
+
+        if s!=1
+          if n==1
+            "\u221A%s" % value_to_s[s]
+          elsif 0<n.real
+            "%s\u221A%s" % [value_to_s[n], value_to_s[s]]
+          elsif n==-1
+            "(-\u221A%s)" % value_to_s[s]
+          else
+            "(%s\u221A%s)" % [value_to_s[n], value_to_s[s]]
+          end
         else
-          "(%s\u221A%s)" % [value_to_s[n], value_to_s[s]]
+          value_to_s[n]
         end
+      }
+
+      if 0<result.length
+        result.join(" + ")
       else
-        value_to_s[n]
+        "0"
       end
-    }
-
-    if 0<result.length
-      result.join(" + ")
-    else
-      "0"
     end
   end
 
@@ -256,15 +256,15 @@ class HpSqrt < Numeric
   end
 
   def complex?
-    !imag.zero?
+    !to_rc.imag.zero?
   end
 
   def integer?
-    imag.zero? && real==real.to_i
+    to_rc.imag.zero? && to_rc.real.denominator==1
   end
 
   def float?
-    imag.zero? && Float===real && real!=real.to_i
+    to_rc.imag.zero? && to_rc.real.denominator!=1
   end
 
   def self.create(v)
@@ -285,7 +285,7 @@ class HpSqrt < Numeric
 
   def self.sqrt(v)
     if self===v
-      v = v.to_c
+      v = v.to_rc
     end
     if v!=0
       new({Term.new(sqrt: v) => 1})

data/lib/hpsqrt/version.rb

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

metadata

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