phys-units 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 562362594d0457c4492bc6a2467e2ee271c81dab
-  data.tar.gz: 86d22f70ec1f1962631fde49b63fcf72e408650b
+  metadata.gz: c123870463b0713958805751bbcef484dc35d1dc
+  data.tar.gz: 8a7bd323be840936ea2b3535b8a5bf6e312f5b4d
 SHA512:
-  metadata.gz: 1124141150ac160dcd3568ba3507e0cf86d1521ba80e49a7c6307b7130710943fa1e7452b3f0df54fe2bc885f67cd690f3f433ecdd7f28605897d3736cd37060
-  data.tar.gz: d92bfe06366359ff027c0eb599d2bd8c78c7795a8c4743789c017bdb23b6d9725e0c2a1d46ca30815f0f854f817c012e6ed546db680b4bc7fa75ed97c136ca4f
+  metadata.gz: efbbc5b61cb7a9eebf65f0e2420073365750321f502b24aeecc45afa9cc42f01b6a895f126383e4a3cf49e3cf8178a230602c3fed460a6d7ebcda678e756083a
+  data.tar.gz: f1657606f20fadf5ff43744261b334322538ede36f93d89921f9afd7cbc68af5de040a67b2ccb0d56fda09e5a08afce03c9250fdcd27bc76052bbe4a46002bcf

data/README.md

@@ -1,6 +1,6 @@
 # Phys-Units
 
-GNU Units-compatible library for Ruby. 
+GNU Units-compatible library for Ruby.
 Former name is [Quanty](http://narray.rubyforge.org/quanty/quanty-en.html),
 the first Ruby units library released in 2001.
 
@@ -8,15 +8,16 @@ the first Ruby units library released in 2001.
 is the primary class of Phys-Units library, to be manipulated by users.
 It contains:
 
-* *Value* :
-  +value+ must be a class instance having arithmetic methods,
+* *Value*
+  must be a class instance having arithmetic methods,
   but it is not necessary to be a Numeric.
-  This is a duck typing way. 
-* *Unit* :
-  +unit+ is a instance of Phys::Unit class
-  obtained by parsing a +expr+ string.
+  This is a duck typing way.
+* *Unit*
+  is an instance of Phys::Unit class
+  obtained by parsing *expr* string.
 
-See Documentation at [Rubygems Site](https://rubygems.org/gems/phys-units)
+See [Phys::Quantity Documentation](http://rubydoc.info/gems/phys-units/frames/Phys/Quantity)
+for more details.
 
 ## Installation
 
@@ -47,15 +48,16 @@ by the following features:
 
 * Compatible with GNU Units except nonlinear units.
 * Provides 2331 units, 85 prefixes, including UTF-8 unit names.
-* All units are defined in a unit data file from GNU Units
-  and not defined as a Ruby codes, except temperature definitions.
-* No addition or modification to Ruby standard classes by default,
+* Defines Units by reading GNU Units text data,
+  unlike other libraries which define Units in Ruby code.
+* No addition or modification to Ruby standard classes,
   avoiding conflict with other libraries.
 * Calculation of values is through Ruby Numeric arithmetic methods.
-  None of the Phys-Units lib's buisiness.
-* Conversion factors are held in Rational even defined
-  in the decimal form such as `1.0e10'.
+  Phys-Units does not care it.
+* Conversion factors are internally held in Rational form even
+  defined as the decimal form such as `1.0e10'.
 * PI number has a dimension.
+* Japanese Units are available by require 'phys/units/jp'.
 
 ## Platforms tested
 

data/lib/phys/units/errors.rb

@@ -1,10 +1,5 @@
 module Phys
+  # Error in Unit handling
   class UnitError < StandardError
   end
-  class UnitParseError < UnitError
-  end
-  class UnitConversionError < UnitError
-  end
-  class UnitOperationError < UnitError
-  end
 end

data/lib/phys/units/jp.rb

@@ -0,0 +1,169 @@
+# -*- coding: utf-8 -*-
+require "phys/units"
+
+Phys::Unit.import_units <<EOL
+!utf8
+# Japanese Number units
+一-		1
+二-		2
+三-		3
+四-		4
+五-		5
+六-		6
+七-		7
+八-		8
+九-		9
+十-		10
+百-		10^2
+千-		10^3
+万-		10^4
+億-		10^8
+兆-		10^12
+京-		10^16
+垓-		10^20
+秭-		10^24
+秭-		10^24
+穰-		10^28
+溝-		10^32
+澗-		10^36
+正-		10^40
+載-		10^44
+極-		10^48
+恒河沙-		10^52
+阿僧祇-		10^56
+那由他-		10^60
+不可思議-	10^64
+無量大数-	10^68
+#
+一		1
+二		2
+三		3
+四		4
+五		5
+六		6
+七		7
+八		8
+九		9
+十		10
+百		10^2
+千		10^3
+万		10^4
+億		10^8
+兆		10^12
+京		10^16
+垓		10^20
+秭		10^24
+秭		10^24
+穰		10^28
+溝		10^32
+澗		10^36
+正		10^40
+載		10^44
+極		10^48
+恒河沙		10^52
+阿僧祇		10^56
+那由他		10^60
+不可思議		10^64
+無量大数		10^68
+#
+割-		1|10
+分-		1|100
+厘-		1|1000
+釐-		1|1000
+毛-		1|10^4
+毫-		1|10^4
+糸-		1|10^4
+絲-		1|10^4
+忽-		1|10^5
+微-		1|10^6
+繊-		1|10^7
+沙-		1|10^8
+塵-		1|10^9
+埃-		1|10^10
+渺-		1|10^11
+漠-		1|10^12
+模糊-		1|10^13
+逡巡-		1|10^14
+須臾-		1|10^15
+瞬息-		1|10^16
+弾指-		1|10^17
+刹那-		1|10^18
+六徳-		1|10^19
+虚空-		1|10^20
+清浄-		1|10^21
+阿頼耶-		1|10^22
+阿摩羅-		1|10^23
+涅槃寂静-	1|10^24
+#
+割		1|10
+分		1|100
+厘		1|1000
+釐		1|1000
+毛		1|10^4
+毫		1|10^4
+糸		1|10^4
+絲		1|10^4
+忽		1|10^5
+微		1|10^6
+繊		1|10^7
+沙		1|10^8
+塵		1|10^9
+埃		1|10^10
+渺		1|10^11
+漠		1|10^12
+模糊		1|10^13
+逡巡		1|10^14
+須臾		1|10^15
+瞬息		1|10^16
+弾指		1|10^17
+刹那		1|10^18
+六徳		1|10^19
+虚空		1|10^20
+清浄		1|10^21
+阿頼耶		1|10^22
+阿摩羅		1|10^23
+涅槃寂静		1|10^24
+#
+# Traditional Japanese units (shakkanhou)
+#
+# Japanese Length Measures
+尺		shaku		# = 10/33 m ≒ 0.3030303 m
+寸		1|10 尺
+里		36 町		# ≒ 3927.272727 m
+町		60 間		# ≒ 109.090909 m
+間		6 尺		# ≒ 1.818182 m
+丈		10 尺		# ≒ 3.030303 m
+曲尺		尺
+鯨尺		kujirajaku	# 10|8 shaku
+#
+# Japanese Area Measures
+坪		tsubo		# = 400/121 m^2 ≒ 3.305785 m^2
+畝		30 坪		# ≒ 99.173554 m^2
+反		10 畝		# ≒ 991.7355 m^2
+段		反
+#歩		 坪
+#町		 10 反		# ≒ 9917.355 m^2
+#合		 1|10 坪	# ≒ 0.3305785 m^2
+#勺		 1|100 坪
+#
+# Japanese architecture is based on a "standard" size of tatami mat.
+江戸間		edoma		# (5.8*2.9) shaku^2
+京間		kyouma		# (6.3*3.15) shaku^2
+中京間		chuukyouma	# (6*3) shaku^2
+畳		tatami
+#
+# Japanese Volume Measures
+升		shou		# 10合 = 2401/1331 l ≒ 1.803906837 l
+斗		10 升		# ≒ 18.039068 l
+石		10 斗		# ≒ 180.390684 l
+合		1|10 升		# 10 勺 ≒ 0.180390684 l
+勺		1|10 合
+#
+# Japanese Weight Measures
+貫		1000 匁		# = 100両 = 3.75 kg
+斤		160 匁		# = 600 g
+両		10 匁		# = 37.5 g
+匁		momme		# = 3.75 g
+#
+!endutf8
+EOL

data/lib/phys/units/load_units.rb

@@ -4526,7 +4526,7 @@ pfund                   500 g
 #
 # If you would like to help expand this section and understand
 # cyrillic transliteration, let me know.  These measures are meant to
-# reflect common usage, e.g. in translated literature.  
+# reflect common usage, e.g. in translated literature.
 #
 
 dessiatine              2400 sazhen^2    # Land measure
@@ -5294,10 +5294,9 @@ EOL
 
 module Phys
   # define pi
-  Unit.define("pi","!dimensionless",Math::PI)
+  BaseUnit.define("pi","!dimensionless",Math::PI)
 
   # define tempC and tempK
-  #Phys::OffsetUnit.import_temperature
   zero_degc = Unit["stdtemp"].conversion_factor
   OffsetUnit.define( "tempC", Unit["K"], zero_degc )
   OffsetUnit.define( "tempF", Unit["K"]*Rational(5,9), zero_degc-32*Rational(5,9) )

data/lib/phys/units/mixin.rb

@@ -1,5 +1,11 @@
 require "phys/units"
 
+# ActiveSupport-like mix-in to Numeric.
+# This is activated by:
+#     require 'phys/units/mixin'
+#
+# However, this kind of global change will cause unexpected problems.
+
 class Numeric
   alias method_missing_orig method_missing
   def method_missing(method, *args, &block)

data/lib/phys/units/parse.rb

@@ -450,13 +450,13 @@ end
 ###### racc/parser.rb end
 
 
-# -*- coding: utf-8 -*-
 # parse.y, parse.rb
 #
 #   by Masahiro Tanaka <masa16.tanaka@gmail.com>
 #
 module Phys
 class Unit
+# @visibility private
 class Parse < Racc::Parser
 
 module_eval(<<'...end parse.y/module_eval...', 'parse.y', 63)
@@ -480,10 +480,10 @@ module_eval(<<'...end parse.y/module_eval...', 'parse.y', 63)
   end
 
   def parse( str )
-    return Unit.new(str) if str.empty?
+    return Unit.new(1) if str.empty?
     @q = []
 
-    c = Unit.unit_chars
+    c = Unit.unit_exclude_chars
 
     while str.size > 0 do
       case str
@@ -677,7 +677,7 @@ Racc_debug_parser = false
 
 module_eval(<<'.,.,', 'parse.y', 23)
   def _reduce_2(val, _values, result)
-     result = Unit.inv(val[1]) 
+     result = Unit.inverse(val[1]) 
     result
   end
 .,.,

data/lib/phys/units/parse.y

@@ -21,7 +21,7 @@ class Parse
 rule
 
  target:  expr
-       |  DIV list { result = Unit.inv(val[1]) }
+       |  DIV list { result = Unit.inverse(val[1]) }
        ;
 
  expr: list
@@ -30,10 +30,10 @@ rule
      | expr '-' expr    { result = val[0] - val[2] }
      | expr '*' expr    { result = val[0] * val[2] }
      | expr DIV expr    { result = val[0] / val[2] }
-     ; 
+     ;
 
  numexpr: NUMBER
-        | numexpr '|' numexpr { result = Unit.rdiv(val[0],val[2]) } 
+        | numexpr '|' numexpr { result = Unit.rdiv(val[0],val[2]) }
         ;
 
  pexpr: '(' expr ')'          { result = val[1] }
@@ -52,13 +52,13 @@ end
 
 ---- header ----
 
-# -*- coding: utf-8 -*-
 # parse.y, parse.rb
 #
 #   by Masahiro Tanaka <masa16.tanaka@gmail.com>
 #
 module Phys
 class Unit
+# @visibility private
 ---- inner ----
 
   def build_num(ov,ud,pw)
@@ -80,10 +80,10 @@ class Unit
   end
 
   def parse( str )
-    return Unit.new(str) if str.empty?
+    return Unit.new(1) if str.empty?
     @q = []
 
-    c = Unit.unit_chars
+    c = Unit.unit_exclude_chars
 
     while str.size > 0 do
       case str

data/lib/phys/units/quantity.rb

@@ -10,9 +10,9 @@
 module Phys
 
   # alias to Phys::Quantity.new
-  def Quantity(*a)
-    Quantity.new(*a)
-  end
+  #def Quantity(*a)
+  #  Quantity.new(*a)
+  #end
 
   # Phys::Quantity is a class to represent physical quantities
   # with unit of measure.
@@ -20,7 +20,7 @@ module Phys
   # * *Value* of the quantity.
   #   +value+ must be a class instance having arithmetic methods,
   #   but it is not necessary to be a Numeric.
-  #   This is a duck typing way. 
+  #   This is a duck typing way.
   # * *Unit* of the quantity.
   #   +unit+ is a instance of Phys::Unit class
   #   obtained by parsing a +expr+ string.
@@ -43,7 +43,7 @@ module Phys
       # @param  [String] expr  a string of unit expression.
       #         If +expr+ is not supplied, it becomes dimeinsionless.
       # @return [Phys::Quantity]
-      # @raise  [Phys::UnitConversionError] if unit conversion is failed.
+      # @raise  [Phys::UnitError] if unit conversion is failed.
       def [](value,expr=nil)
         self.new(value,expr)
       end
@@ -55,10 +55,10 @@ module Phys
     # @param  [String] expr  a string of unit expression.
     #         If +expr+ is not supplied, it becomes dimeinsionless.
     # @param  [Phys::Unit] unit  (optional)
-    # @raise  [Phys::UnitConversionError] if unit conversion is failed.
+    # @raise  [Phys::UnitError] if unit conversion is failed.
     #
     def initialize(value,expr=nil,unit=nil)
-      @val = value
+      @value = value
       expr = expr.to_s if Symbol===expr
       @expr = (expr=='') ? nil : expr
       @unit = unit
@@ -69,20 +69,24 @@ module Phys
       end
     end
 
-    # @return [Object] value of the quantity
-    attr_reader :val
-    alias value val
+    # Value of the quantity.
+    # Instance of classes with same arithmetic methods as Numric.
+    # @return [Object]
+    attr_reader :value
+    alias val value
 
-    # @return [String] unit expression
+    # Unit expression. Given as the second parameter of the Quantity constructor.
+    # @return [String]
     attr_reader :expr
 
-    # @return [Phys::Unit] unit
+    # Unit of the quantity. Instance of Phys::Unit class.
+    # @return [Phys::Unit]
     attr_reader :unit
 
     # Conversion to a quantity in another unit.
     # @param  [String] expr unit expression.
     # @return [Phys::Quantity] quantity in the unit of +expr+.
-    # @raise  [Phys::UnitConversionError] if unit conversion is failed.
+    # @raise  [Phys::UnitError] if unit conversion is failed.
     #
     def want(expr)
       unit = Unit.parse(expr)
@@ -99,10 +103,10 @@ module Phys
     #   both params must be dimensionless.
     # @param  [Object] other
     # @return [Phys::Quantity] a quantity in the unit of +self+.
-    # @raise  [Phys::UnitConversionError] if unit conversion is failed.
+    # @raise  [Phys::UnitError] if unit conversion is failed.
     #
     def +(other)
-      val = @val + @unit.convert_scale(other)
+      val = @value + @unit.convert_scale(other)
       self.class.new( val, @expr, @unit )
     end
 
@@ -114,125 +118,145 @@ module Phys
     #   both params must be dimensionless.
     # @param  [Object] other
     # @return [Phys::Quantity] a quantity in the unit of +self+.
-    # @raise  [Phys::UnitConversionError] if unit conversion is failed.
+    # @raise  [Phys::UnitError] if unit conversion is failed.
     #
     def -(other)
-      val = @val - @unit.convert_scale(other)
+      val = @value - @unit.convert_scale(other)
       self.class.new( val, @expr, @unit )
     end
 
-    # @return [Phys::Quantity] Abs. in the unit of +self+.
+    # Absolute. Returns a quantity in the same unit of +self+.
+    # @return [Phys::Quantity]
     def abs
-      self.class.new( @val.abs, @expr, @unit )
+      self.class.new( @value.abs, @expr, @unit )
     end
 
-    # @return [Phys::Quantity] Abs2. in the squared unit of +self+.
+    # Square. Returns a quantity in squared unit of +self+.
+    # @return [Phys::Quantity]
     def abs2
       self**2
     end
 
-    # @return [Phys::Quantity] Ceil. in the unit of +self+.
+    # Ceil. Returns a quantity with the smallest Integer value greater
+    # than or equal to +self+ value, in the same unit of +self+.
+    # @return [Phys::Quantity]
     def ceil
-      self.class.new( @val.ceil, @expr, @unit )
+      self.class.new( @value.ceil, @expr, @unit )
     end
 
-    # @return [Phys::Quantity] Round. in the unit of +self+.
-    def round
-      self.class.new( @val.round, @expr, @unit )
+    # Round. Rounds +self+ value to a given precision in decimal digits
+    # (default 0 digits).
+    # Returns a quantity with the rounded value in the same unit of +self+.
+    # @return [Phys::Quantity]
+    def round(ndigits=nil)
+      val = ndigits ? @value.round(ndigits) : @value.round
+      self.class.new( val, @expr, @unit )
     end
 
-    # @return [Phys::Quantity] Floor. in the unit of +self+.
+    # Floor. Returns a quantity with the largest integer value
+    # less than or equal to +self+ value, in the same unit of +self+.
+    # @return [Phys::Quantity]
     def floor
-      self.class.new( @val.floor, @expr, @unit )
+      self.class.new( @value.floor, @expr, @unit )
     end
 
-    # @return [Phys::Quantity] Truncate. in the unit of +self+.
+    # Truncate. Returns a quantity with the value truncated to an integer,
+    # in the same unit of +self+.
+    # @return [Phys::Quantity]
     def truncate
-      self.class.new( @val.truncate, @expr, @unit )
+      self.class.new( @value.truncate, @expr, @unit )
     end
 
-    # Unary Plus.
-    # @return [Phys::Quantity] +self+.
+    # Unary Plus. Returns +self+.
+    # @return [Phys::Quantity]
     def +@
-      self.class.new(  @val, @expr, @unit )
+      self.class.new(  @value, @expr, @unit )
     end
 
-    # Unary Minus.
-    # @return [Phys::Quantity] in the unit of +self+.
+    # Unary Minus. Returns a quantity with negative value
+    # in the same unit of +self+.
+    # @return [Phys::Quantity]
     def -@
-      self.class.new( -@val, @expr, @unit )
+      self.class.new( -@value, @expr, @unit )
     end
 
     # Comparison of quantities.
     # Before the comparison, it converts +other+ to the unit of +self+.
     # @param  [Phys::Quantity] other
     # @return [Integer]
-    # @raise  [Phys::UnitConversionError] if unit conversion is failed.
+    # @raise  [Phys::UnitError] if unit conversion is failed.
     def <=> (other)
-      @val <=> @unit.convert(other)
+      @value <=> @unit.convert(other)
     end
 
-    # Comparison. Returns +true+ if +self+ has the same value as +other+. 
+    # Equality. Returns +true+ if +self+ has the same value as +other+.
     # Before the comparison, it converts +other+ to the unit of +self+.
     # @param  [Phys::Quantity] other
     # @return [Boolean]
-    # @raise  [Phys::UnitConversionError] if unit conversion is failed.
-    def  == (other)
-      @val  == @unit.convert(other)
+    def == (other)
+      if Quantity===other
+        @unit.conformable?(other.unit) &&
+          @value == @unit.convert(other)
+      elsif @unit.dimensionless?
+        @unit.convert_value_to_base_unit(@value) == other
+      else
+        false
+      end
     end
 
     # Comparison. Returns +true+ if +self+ is greather-than or equal-to +other+.
     # Before the comparison, it converts +other+ to the unit of +self+.
     # @param  [Phys::Quantity] other
     # @return [Boolean]
-    # @raise  [Phys::UnitConversionError] if unit conversion is failed.
-    def  >= (other)
-      @val  >= @unit.convert(other)
+    # @raise  [Phys::UnitError] if unit conversion is failed.
+    def >= (other)
+      @value >= @unit.convert(other)
     end
 
     # Comparison. Returns +true+ if +self+ is less-than or equal-to +other+.
     # Before the comparison, it converts +other+ to the unit of +self+.
     # @param  [Phys::Quantity] other
     # @return [Boolean]
-    # @raise  [Phys::UnitConversionError] if unit conversion is failed.
-    def  <= (other)
-      @val  <= @unit.convert(other)
+    # @raise  [Phys::UnitError] if unit conversion is failed.
+    def <= (other)
+      @value <= @unit.convert(other)
     end
 
     # Comparison. Returns +true+ if +self+ is less than +other+.
     # Before the comparison, it converts +other+ to the unit of +self+.
     # @param  [Phys::Quantity] other
     # @return [Boolean]
-    # @raise  [Phys::UnitConversionError] if unit conversion is failed.
-    def  <  (other)
-      @val  <  @unit.convert(other)
+    # @raise  [Phys::UnitError] if unit conversion is failed.
+    def < (other)
+      @value < @unit.convert(other)
     end
 
     # Comparison. Returns +true+ if +self+ is greater than +other+.
     # Before the comparison, it converts +other+ to the unit of +self+.
     # @param  [Phys::Quantity] other
     # @return [Boolean]
-    # @raise  [Phys::UnitConversionError] if unit conversion is failed.
-    def  >  (other)
-      @val  >  @unit.convert(other)
+    # @raise  [Phys::UnitError] if unit conversion is failed.
+    def > (other)
+      @value > @unit.convert(other)
     end
 
-    # Closeness. Returns +true+ if +self+ and +other+ is close to each other
-    # within +epsilon+ relative to the absolute values.
+    # Closeness. Returns +true+ if difference between +self+ and +other+ is
+    # smaller than +epsilon+ times sum of their absolute values.
     # Before the comparison, it converts +other+ to the unit of +self+.
     # @param  [Phys::Quantity] other
     # @param  [Numeric] epsilon
     # @return [Boolean]
-    # @raise  [Phys::UnitConversionError] if unit conversion is failed.
+    # @raise  [Phys::UnitError] if unit conversion is failed.
     def close_to(other,epsilon=Float::EPSILON)
       other_value = @unit.convert(other)
-      (@val-other_value).abs/(@val.abs+other_value.abs) <= epsilon
+      abs_sum = @value.abs+other_value.abs
+      abs_sum==0 || (@value-other_value).abs/abs_sum <= epsilon
     end
 
-    # Power of a quantity.
+    # Exponentiation.
     # @param  [Numeric] n
     # @return [Phys::Quantity] a quantity in the +n+ -powered unit of +self+.
-    # @raise  [Phys::UnitConversionError] if unit conversion is failed.
+    # @raise  [Phys::UnitError] if unit conversion is failed.
     def **(n)
       if @expr.nil?
         expr = nil
@@ -241,11 +265,11 @@ module Phys
       else
         expr = '('+@expr+')^'+n.to_s+''
       end
-      self.class.new( @val**n, expr, @unit**n )
+      self.class.new( @value**n, expr, @unit**n )
     end
 
     # (internally used method)
-    # @private
+    # @visibility private
     # @return [String]
     def enclose_expr     #:nodoc: used internally
       return nil if @expr.nil?
@@ -255,9 +279,9 @@ module Phys
         @expr
       end
     end
-    
+
     # (internally used method)
-    # @private
+    # @visibility private
     # @return [String]
     def enclose_expr_div    #:nodoc: used internally
       return nil if @expr.nil?
@@ -271,54 +295,54 @@ module Phys
     # Multiplication.
     # If the +other+ param is *not* Phys::Quantity,
     # +other+ is regarded as a dimensionless value.
+    # The values and units are multiplied respectively.
     # @param  [Object] other
     # @return [Phys::Quantity] a quantity
-    # both the values and units are multiplied respectively.
-    # @raise  [Phys::UnitOperationError] if unit is not operable.
+    # @raise  [Phys::UnitError] if unit is not operable.
     #
     def *(other)
       if Quantity===other
         a = [self.enclose_expr, other.enclose_expr]
         a.delete(nil)
-        self.class.new( @val*other.val, a.join(' '), @unit*other.unit )
+        self.class.new( @value*other.value, a.join(' '), @unit*other.unit )
       else
-        self.class.new( @val*other, @expr, @unit )
+        self.class.new( @value*other, @expr, @unit )
       end
     end
 
     # Division.
     # If the +other+ param is *not* Phys::Quantity,
     # +other+ is regarded as a dimensionless value.
+    # The values and units are divided respectively.
     # @param  [Object] other
     # @return [Phys::Quantity] a quantity
-    # both the values and units are divided respectively.
-    # @raise  [Phys::UnitOperationError] if unit is not operable.
+    # @raise  [Phys::UnitError] if unit is not operable.
     #
     def /(other)
       if Quantity===other
         a = [self.enclose_expr, other.enclose_expr_div]
         a.delete(nil)
-        self.class.new( @val/other.val, a.join, @unit/other.unit )
+        self.class.new( @value/other.value, a.join, @unit/other.unit )
       else
-        self.class.new( @val/other, @expr, @unit )
+        self.class.new( @value/other, @expr, @unit )
       end
     end
 
     # Division more correctly.
     # If the +other+ param is *not* Phys::Quantity,
     # +other+ is regarded as a dimensionless value.
+    # The values and units are divided respectively.
     # @param  [Object] other
     # @return [Phys::Quantity] a quantity
-    # both the values and units are divided respectively.
-    # @raise  [Phys::UnitOperationError] if unit is not operable.
+    # @raise  [Phys::UnitError] if unit is not operable.
     #
     def quo(other)
       if Quantity===other
         a = [self.enclose_expr, other.enclose_expr_div]
         a.delete(nil)
-        self.class.new( @val.quo(other.val), a.join, @unit/other.unit )
+        self.class.new( @value.quo(other.value), a.join, @unit/other.unit )
       else
-        self.class.new( @val.quo(other), @expr, @unit )
+        self.class.new( @value.quo(other), @expr, @unit )
       end
     end
     alias fdiv quo
@@ -332,13 +356,13 @@ module Phys
     #   and returns +div+ of Phys::Quantity.
     # @param  [Object] other
     # @return [Object] div
-    # @raise  [Phys::UnitConversionError] if unit conversion is failed.
+    # @raise  [Phys::UnitError] if unit conversion is failed.
     #
     def div(other)
       if Quantity===other
-        @val.div( @unit.convert(other) )
+        @value.div( @unit.convert(other) )
       else
-        self.class.new( @val.div(other), @expr, @unit )
+        self.class.new( @value.div(other), @expr, @unit )
       end
     end
 
@@ -351,13 +375,13 @@ module Phys
     #   and returns +remainder+ of Phys::Quantity.
     # @param  [Object] other
     # @return [Object] remainder
-    # @raise  [Phys::UnitConversionError] if unit conversion is failed.
+    # @raise  [Phys::UnitError] if unit conversion is failed.
     #
     def remainder(other)  #:nodoc: used internally
       if Quantity===other
-        @val.remainder( @unit.convert(other) )
+        @value.remainder( @unit.convert(other) )
       else
-        self.class.new( @val.remainder(other), @expr, @unit )
+        self.class.new( @value.remainder(other), @expr, @unit )
       end
     end
 
@@ -370,13 +394,13 @@ module Phys
     #   and returns +modulo+ of Phys::Quantity.
     # @param  [Object] other
     # @return [Object] modulo
-    # @raise  [Phys::UnitConversionError] if unit conversion is failed.
+    # @raise  [Phys::UnitError] if unit conversion is failed.
     #
     def %(other)
       if Quantity===other
-        @val % @unit.convert(other)
+        @value % @unit.convert(other)
       else
-        self.class.new( @val % other, @expr, @unit )
+        self.class.new( @value % other, @expr, @unit )
       end
     end
     alias modulo %
@@ -390,13 +414,13 @@ module Phys
     #   and returns +divmod+ of Phys::Quantity.
     # @param  [Object] other
     # @return [Array] result of +divmod+, an array of [quotient, modulo].
-    # @raise  [Phys::UnitConversionError] if unit conversion is failed.
+    # @raise  [Phys::UnitError] if unit conversion is failed.
     #
     def divmod(other)
       if Quantity===other
-        @val.divmod( @unit.convert(other) )
+        @value.divmod( @unit.convert(other) )
       else
-        d,m = @val.divmod(other)
+        d,m = @value.divmod(other)
         [ self.class.new( d, @expr, @unit ),
           self.class.new( m, @expr, @unit ) ]
       end
@@ -410,7 +434,7 @@ module Phys
     # Conversion to base unit.
     # Returns the quantity converted to a base unit.
     # @return [Phys::Quantity] a quantity in the base unit.
-    # @raise  [Phys::UnitConversionError] if unit conversion is failed.
+    # @raise  [Phys::UnitError] if unit conversion is failed.
     def to_base_unit
       unit = @unit.base_unit
       val  = unit.convert(self)
@@ -422,15 +446,15 @@ module Phys
 
     # Conversion to Numeric.
     # @return [Numeric]
-    # @raise  [Phys::UnitConversionError] if the unit is non-dminensionless.
+    # @raise  [Phys::UnitError] if the unit is *not* dimensionless.
     def to_numeric
-      @unit.convert_to_numeric(@val)
+      @unit.to_numeric * @value
     end
     alias to_num to_numeric
 
     # Conversion to Float.
     # @return [Float]
-    # @raise  [Phys::UnitConversionError] if the unit is non-dminensionless.
+    # @raise  [Phys::UnitError] if the unit is *not* dimensionless.
     def to_f
       to_numeric.to_f
     end
@@ -438,7 +462,7 @@ module Phys
 
     # Conversion to Integer.
     # @return [Integer]
-    # @raise  [Phys::UnitConversionError] if the unit is non-dminensionless.
+    # @raise  [Phys::UnitError] if the unit is *not* dimensionless.
     def to_i
       to_numeric.to_i
     end
@@ -447,7 +471,7 @@ module Phys
 
     # Conversion to Rational.
     # @return [Rational]
-    # @raise  [Phys::UnitConversionError] if the unit is non-dminensionless.
+    # @raise  [Phys::UnitError] if the unit is *not* dimensionless.
     def to_r
       to_numeric.to_r
     end
@@ -461,7 +485,7 @@ module Phys
       else
         expr = ""
       end
-      self.class.to_s+"["+Unit::Utils.num_inspect(@val)+expr+"]"
+      self.class.to_s+"["+Unit::Utils.num_inspect(@value)+expr+"]"
     end
 
     # Inspect String.
@@ -472,7 +496,7 @@ module Phys
       else
         expr = ""
       end
-      "#<"+self.class.to_s+" "+Unit::Utils.num_inspect(@val)+expr+", "+@unit.inspect+">"
+      self.class.to_s+"["+Unit::Utils.num_inspect(@value)+expr+"] "+@unit.inspect
     end
   end
 end