numeric_with_unit 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d291b9eeb33681e615cf968e9ebf04564dea470b
-  data.tar.gz: cfbd75a22e7f4ed618127772d481a18582461c13
+  metadata.gz: 757d20434e2556a232c44455278317111626a717
+  data.tar.gz: 29a86bf1e906c35b49104ede8013e07ff392aaba
 SHA512:
-  metadata.gz: 596b5e89d9161c75f00e49fb392cbaa8ec2d7ab272b174443671d28e5b3c961dc68dc8fd822b335a4adc4c62457cc370c235b6a4d4c587640617726bda0797b3
-  data.tar.gz: ca6f084096c236d63b2e327dc11795dc30d0043704ec8b752b7729ab4fcd80beab44db11d3a1d8c502b9535b56e9c4205926d36eaf8aee3da5d48ee55f195e8c
+  metadata.gz: 4ef1f289645e9fea40ec7674bc64c514355bef6705502214339b162d68f64153c230c768d1198315c6b0ff409d79835d8bb4751b4a82ff611cac119228eeee90
+  data.tar.gz: 70ea80a9ff0b464a69a1e64367e9365e80d532b9e4ab2a81b2cbcc5e6104101abf2da4195278bc75db106fea890cf7ad0b372dca71606376af1bd079c270901d

data/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 diaphragm
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -0,0 +1,162 @@
+ruby-numeric-with-unit
+======================
+単位付き数値を提供します。したいです。
+
+インストール
+======================
+
+	$ gem install numeric_with_unit
+
+使い方
+======================
+
+	require 'numeric_with_unit'
+
+	#例1
+	length = NumericWithUnit.new(10, 'm') #10[m]を表すオブジェクトです。
+	puts length #=> 10 m
+	puts length['cm'] #=> 1000 cm
+
+	time = 10.to_nwu('s') #Fixnum#to_nwuが追加されるので、これを用いてもOKです。10[s]を表すオブジェクトです。
+	puts time #=>  10 s
+	puts time['min'] #=> 0.16666666666666666 min
+
+	speed = length / time
+	puts speed #=> 1 m/(s)
+	puts speed['km/hr'] #=> 3.6 km/(hr)
+
+	require 'numeric_with_unit/util' #自然な表記で記述できるようにします。
+	puts (10['m'] / 10['s'] )['km/hr'] #=> 3.6 km/(hr)
+
+	#例2
+	puts (50['L/min'] + 3['m3/hr'] ) * 30['min'] #=> 3000 L
+
+
+* `require 'numeric_with_unit/util'`すると`Numeric#[]`と`Fixnum#[]`と`Bignum#[]`がオーバーライドされます。注意。
+
+
+class NumericWith::Unit
+======================
+"単位"を表すクラスです。
+
+Unit.new
+----------------------
+
+    km = NumericWith::Unit.new do |conf|
+      conf.symbol = 'km'
+      conf.dimension[:L] = 1
+      conf.from_si{|x| x/1000}
+      conf.to_si{|x| x*1000}
+    end
+
+`conf.from_si`と`conf.to_si`で、SI基本単位で表した場合の変換式を設定します。
+
+Unit#cast
+----------------------
+1 mi = 1.609344 km  
+のような関係の単位は、
+
+    mi = km.cast('mi', 1.609344)
+
+で生成できます。  
+ただし、n倍だけの関係に限ります。
+℃と℉のような関係の場合は`Unit.new`で新たに生成して下さい。
+
+Unit<<, Unit[], Unit[]=
+----------------------
+`Unit << unit`で、`unit`を基本単位として登録します。  
+基本単位として登録することで、`Unit[]`から組立単位が自動的に導出されます。
+
+    NumericWith::Unit << km
+    NumericWith::Unit << NumericWith::Unit.new do |conf|
+      conf.symbol = 'hr'
+      conf.dimension[:T] = 1
+      conf.from_si{|x| x/60/60}
+      conf.to_si{|x| x*60*60}
+    end
+     
+    puts NumericWith::Unit['km2'].symbol　#=> km2
+    puts NumericWith::Unit['km/hr'].symbol　#=> km/(hr)
+
+基本単位として登録されている単位は、`Unit.list`で得られます。
+
+また`Unit[]=`で単位の変換と基本単位として登録を同時に行えます。
+
+    NumericWith::Unit['kph'] = 'km/hr'
+    NumericWith::Unit['ua'] = 1.495978706916e8, 'm'
+
+----
+基本的な単位は以下のファイルで定義済みです。  
+適宜`require`してください。
+
+* 'numeric_with_unit/unit_definition/base' (SI単位、SI組立単位およびSI併用単位を定義。デフォルトで`require`されます。)
+* 'numeric_with_unit/unit_definition/common'  (独断と偏見によりcommonと認定された単位。デフォルトで`require`されます。)
+* 'numeric_with_unit/unit_definition/cgs' (未完成)
+* 'numeric_with_unit/unit_definition/imperial' (未完成)
+* 'numeric_with_unit/unit_definition/natural' (未完成)
+
+
+class NumericWithUnit
+======================
+単位の情報を持った数値を表すクラスです。  
+
+単位換算したり足したり引いたり掛けたり割ったり累乗したりできます。
+
+NumericWithUnit.new(value, unit)
+----------------------
+valueの数値とunitの単位を持つNumericWithUnitオブジェクトを返します。
+unitには単位を表す文字列またはUnitクラスのオブジェクトを渡します。
+
+Numeric#to_nwu(unit), Fixnum#to_nwu(unit), Bignum#to_nwu(unit)
+----------------------
+NumericWithUnit.new(self, unit)を返します。
+
+NumericWithUnit#value
+----------------------
+数値を返します。
+
+NumericWithUnit#unit
+----------------------
+Unitオブジェクトを返します。
+
+NumericWithUnit#\[\](new_unit), NumericWithUnit#to_nwu(new_unit)
+----------------------
+new_unitに変換したNumericWithUnitオブジェクトを返します。
+
+selfと次元の異なる単位を指定した場合は、NumericWithUnit::DimensionErrorが発生します。
+
+NumericWithUnit#+(other), NumericWithUnit#-(other)
+----------------------
+otherがNumericWithUnitクラスの場合、selfの単位に変換し数値を加減したNumericWithUnitオブジェクトを返します。  
+otherがNumericWithUnitクラスでない場合、otherを無次元のNumericWithUnitにした上で加減します。
+
+ohterとselfの次元が異なる場合は、NumericWithUnit#DimensionErrorが発生します。
+
+NumericWithUnit#*(ohter), NumerichWithUnit#/(other)
+----------------------
+otherがNumericWithUnitクラスの場合、selfとotherの組立単位を持つ、数値を乗除したNumericWithUnitオブジェクトを返します。  
+otherがNumericWithUnitクラスでない場合、otherを無次元のNumericWithUnitにした上で乗除します。
+
+NumericWithUnit#**(num)
+----------------------
+selfの単位をnum乗した組立単位を持つ、数値をnum乗したNumericWithUnitオブジェクトを返します。
+
+
+単位を表す文字列のフォーマット
+======================
+Unit[]や、NumericWithUnit#[]には、単位を表す文字列を渡すことができます。
+例を示します。
+
+- m
+- cm
+- m2
+- kW.hr
+- kg/cm2
+- m.s-1
+- J/kg/K
+- kcal/(hr.m2.℃)
+
+先頭に接頭辞、末尾に指数をつけた基本単位を、"."または"/"で繋いだ形で表記します。
+"()"で基本単位として括ることもできます。
+
+

data/lib/numeric_with_unit/core_ext.rb

@@ -0,0 +1,32 @@
+# coding: utf-8
+
+require 'numeric_with_unit'
+
+class Fixnum
+  def to_nwu(unit)
+    NumericWithUnit.new(self, unit)
+  end
+end
+
+class Bignum
+  def to_nwu(unit)
+    NumericWithUnit.new(self, unit)
+  end
+end
+
+class Numeric
+  def to_nwu(unit)
+    NumericWithUnit.new(self, unit)
+  end
+end
+
+class String
+  def to_nwu(mthd=:to_r)
+    # TODO: 適当なのでもう少しいい感じに。いい感じに
+    m = self.match /.*?(?=[\s\(\[])/
+    value = m.to_s
+    unit = m.post_match.strip.gsub(/^\[|\]$/, '')
+    NumericWithUnit.new(value.__send__(mthd), unit)
+  end
+end
+

data/lib/numeric_with_unit/unit.rb

@@ -106,10 +106,11 @@ class NumericWithUnit
     # class methods
 
     # create new unit from derivation _(for internal use)_ .
-    def self.derive
+    def self.derive #(block)
       derivation = Hash.new(0)
       yield(derivation)
       return Unit.new if derivation.empty?
+      
       derivation.delete_if{|k,v| k.symbol.nil?}
       
       # constructing symbol
@@ -117,7 +118,7 @@ class NumericWithUnit
       syms_pos = h.select{|u,v| v > 0}.map{|u,v| u.symbol + (v.abs>1 ? v.abs.to_s : '')}
       syms_neg = h.select{|u,v| v < 0}.map{|u,v| u.symbol + (v.abs>1 ? v.abs.to_s : '')}
       symbol = syms_pos.join('.')
-      symbol += '/' + (syms_neg.size==1 ? "#{syms_neg.first}" : "(#{syms_neg.join('.')})") unless syms_neg.empty?
+      symbol += '/' + (syms_neg.size>1 ? "(#{syms_neg.join('.')})" : "#{syms_neg.first}") unless syms_neg.empty?
       
       # constructing dimension
       dimension = Hash.new(0)
@@ -132,7 +133,7 @@ class NumericWithUnit
         prc = if v > 0
           ->(x){u.from_si(x)}
         else
-          ->(x){x.quo(u.from_si(1)-u.from_si(0))} # ℃とKの変換のような場合に、変換式の切片を消すため。変換式が線形じゃないケースは想定していない
+          ->(x){x.quo(u.from_si(1)-u.from_si(0))} #FIXME: ℃とKの変換のような場合に、変換式の切片を消すため。変換式が線形じゃないケースは想定していない
         end
         [prc, v.abs]
       }.map{|prc,v|
@@ -146,7 +147,7 @@ class NumericWithUnit
         prc = if v > 0
           ->(x){u.to_si(x)}
         else
-          ->(x){x.quo(u.to_si(1)-u.to_si(0))} # ℃とKの変換のような場合に、変換式の切片を消すため。変換式が線形じゃないケースは想定していない
+          ->(x){x.quo(u.to_si(1)-u.to_si(0))} #FIXME: ℃とKの変換のような場合に、変換式の切片を消すため。変換式が線形じゃないケースは想定していない
         end
         [prc, v.abs]
       }.map{|prc,v|
@@ -183,7 +184,7 @@ class NumericWithUnit
     
     # return base unit list.
     def self.list
-      @@list.map(&:symbol)
+      @@list
     end
     
     # add unit to base unit list.
@@ -307,7 +308,7 @@ class NumericWithUnit
           rec[x, derivation, order]
         end
       else
-        raise StandardError, "maybe bug"
+        raise StandardError, %(maybe bug in "numeric_with_unit" gem)
       end
       derivation
     end
@@ -326,7 +327,7 @@ class NumericWithUnit
     attr_reader :dimension, :derivation
     
     def initialize(derivation=nil)
-      # Unit::Configとinitializeの役割が分離できていないので見なおせ
+      # TODO: Unit::Configとinitializeの役割が分離できていないので見なおせ
       config = Config.new
       yield(config) if block_given?
       config.compile
@@ -358,12 +359,16 @@ class NumericWithUnit
       @symbol
     end
     
+    def inspect
+      "#<#{self.class}:[#{@symbol}] #{@dimension}>"
+    end
+    
     def to_si(value)
-      @to_si[value]
+      @to_si.call(value)
     end
     
     def from_si(value)
-      @from_si[value]
+      @from_si.call(value)
     end
     
     
@@ -405,6 +410,7 @@ class NumericWithUnit
         self.class.new
       else
         self.class.derive do |derivation|
+          # NOTE:
           # ここto_iでOKか？v*numが整数じゃなければraiseすべき？→すべき→NumericWithUnitでやるべき？
           # Unitでは整数じゃない次数の単位は許容すべきか否か→していい気がする
           @derivation.each{|k, v| derivation[k] = (v*num).to_i}
@@ -412,6 +418,17 @@ class NumericWithUnit
       end
     end
     
+    
+    def simplify
+      self.class.derive{|derivation|
+        @dimension.each do|d,o|
+          u = self.class.list.find{|u| u.dimension == {d => 1}} #TODO: find? ok?
+          raise NoUnitError, "No unit with #{{d=>1}} dimension is assined." unless u
+          derivation[u] = o
+        end
+      }
+    end
+    
   end
 
   class Unit

data/lib/numeric_with_unit/unit_definition/base.rb

@@ -48,7 +48,7 @@ class NumericWithUnit
   # Thermodynamic Temperature
   Unit << Unit.new do |conf|
     conf.symbol = 'K'
-    conf.dimension[:Θ] = 1
+    conf.dimension[:THETA] = 1
     conf.si = true
   end
 
@@ -120,16 +120,16 @@ class NumericWithUnit
   # Inductance
   Unit['H'] = 'V.s/A'
 
-  # Temperature
-  Unit << Unit.new do |conf|
-    k = Unit['K']
-    intercept = "273.15".to_r
-    
-    conf.symbol = '℃'
-    conf.dimension = k.dimension
-    conf.from_si{|x| k.from_si(x)-intercept}
-    conf.to_si{|x| k.to_si(x+intercept)}
-  end
+#  # Temperature
+#  Unit << Unit.new do |conf|
+#    k = Unit['K']
+#    intercept = "273.15".to_r
+#    
+#    conf.symbol = '℃'
+#    conf.dimension = k.dimension
+#    conf.from_si{|x| k.from_si(x)-intercept}
+#    conf.to_si{|x| k.to_si(x+intercept)}
+#  end
 
   # Luminouse flux
   Unit['lx'] = 'cd.sr'

data/lib/numeric_with_unit/unit_definition/common.rb

@@ -19,24 +19,24 @@ class NumericWithUnit
 
   # Mass
   Unit['ton'] = 1000, 'kg'
-  Unit['oz'] = "28.349523125".to_r, 'g'
-  Unit['lb'] = 16, 'oz'
+  Unit['lb'] = "0.45359237".to_r, 'kg' # 常用ポンド
+  Unit['oz'] = "1/16".to_r, 'lb' # 常用オンス
   
   # Electriccal Resistance
   Unit['ohm'] = 'Ω'
 
   # Temperature
-  Unit['degC'] = '℃'
+#  Unit['degC'] = '℃'
   Unit['degR'] = "5/9".to_r, 'K'
-  Unit << Unit.new do |conf|
-    degr = Unit['degR']
-    intercept = "459.67".to_r
-    
-    conf.symbol = 'degF'
-    conf.dimension = degr.dimension
-    conf.from_si{|x| degr.from_si(x)-intercept}
-    conf.to_si{|x| degr.to_si(x+intercept)}
-  end
+#  Unit << Unit.new do |conf|
+#    degr = Unit['degR']
+#    intercept = "459.67".to_r
+#    
+#    conf.symbol = 'degF'
+#    conf.dimension = degr.dimension
+#    conf.from_si{|x| degr.from_si(x)-intercept}
+#    conf.to_si{|x| degr.to_si(x+intercept)}
+#  end
 
   # Length
   Unit['Å'] = 10**-10, 'm'
@@ -48,7 +48,8 @@ class NumericWithUnit
 
   # Volume
   Unit['cc'] = 'cm3'
-  Unit['bbl'] = "0.158987294928".to_r, 'm3'
+  Unit['gal'] = 231, 'in3' # 米液量ガロン
+  Unit['bbl'] = 42, 'gal' # 石油要バレル
 
   # Force
   Unit['kgf'] = "9.80665".to_r, 'N'
@@ -66,24 +67,25 @@ class NumericWithUnit
   Unit['mHg'] = "1/1000".to_r, 'mmHg' # for compatible
   Unit['mH2O'] = "9806.65".to_r, 'Pa'
   Unit['mAq'] = 'mH2O'
-  Unit['psi'] = "6894.76".to_r, 'Pa'
-
-  # Guage圧の扱いどうしようか？
-  Unit << Unit.new do |conf|
-    pa = Unit['Pa']
-    atm = 101325
-
-    conf.symbol = 'PaG'
-    conf.dimension = pa.dimension
-    conf.from_si{|x| pa.from_si(x)-atm}
-    conf.to_si{|x| pa.to_si(x+atm)}
-  end
+  Unit['psi'] = 'lbf/in2'
+
+#  # Guage圧の扱いどうしようか？
+#  Unit << Unit.new do |conf|
+#    pa = Unit['Pa']
+#    atm = 101325
+#
+#    conf.symbol = 'PaG'
+#    conf.dimension = pa.dimension
+#    conf.from_si{|x| pa.from_si(x)-atm}
+#    conf.to_si{|x| pa.to_si(x+atm)}
+#  end
 
   # Speed
   Unit['kph'] = 'km/hr'
 
   # Flowrate
   Unit['lpm'] = 'L/min'
+  Unit['CMH'] = 'm3/hr'
 
   # Viscosity
   Unit['P'] = "1/10".to_r, 'Pa.s'

data/lib/numeric_with_unit/unit_definition/deprecated.rb

@@ -0,0 +1,44 @@
+# coding: utf-8
+
+#
+# 変換に対応しきれていない単位
+# 四則演算を交える場合に要注意
+#
+
+require 'numeric_with_unit/unit_definition/base'
+
+class NumericWithUnit
+  # Temperature
+  Unit << Unit.new do |conf|
+    k = Unit['K']
+    intercept = "273.15".to_r
+    
+    conf.symbol = '℃'
+    conf.dimension = k.dimension
+    conf.from_si{|x| k.from_si(x)-intercept}
+    conf.to_si{|x| k.to_si(x+intercept)}
+  end
+  
+  Unit['degC'] = '℃'
+  
+  Unit << Unit.new do |conf|
+    degr = Unit['degR']
+    intercept = "459.67".to_r
+    
+    conf.symbol = 'degF'
+    conf.dimension = degr.dimension
+    conf.from_si{|x| degr.from_si(x)-intercept}
+    conf.to_si{|x| degr.to_si(x+intercept)}
+  end
+  
+  # Pressure
+  Unit << Unit.new do |conf|
+    pa = Unit['Pa']
+    atm = 101325
+
+    conf.symbol = 'PaG'
+    conf.dimension = pa.dimension
+    conf.from_si{|x| pa.from_si(x)-atm}
+    conf.to_si{|x| pa.to_si(x+atm)}
+  end
+end

data/lib/numeric_with_unit/util.rb

@@ -8,7 +8,7 @@ require 'numeric_with_unit'
 class NumericWithUnit
   module NumUtil
     def [](unit)
-      NumericWithUnit.new(self.rationalize, unit) # ratoinalizeする？
+      NumericWithUnit.new(self, unit)
     end
   end
 end

data/lib/numeric_with_unit/util2.rb

@@ -1,6 +1,7 @@
 # coding: utf-8
 
 # 123.m2.K_W のように書けるようにします。
+# 123.cP.mPa.s のように単位の換算(cP -> mPa.s)も可能です。
 # method_missing をオーバーライドします。
 
 require 'numeric_with_unit'
@@ -9,7 +10,7 @@ class NumericWithUnit
   def method_missing(name, *args)
     if args.empty?
       unit_str = name.to_s.gsub('_', '/')
-      unit_chain_util(Unit[unit_str])
+      resolve_unit_chain(Unit[unit_str])
     else
       raise Unit::NoUnitError
     end
@@ -18,20 +19,21 @@ class NumericWithUnit
   end
   
   attr_writer :unit_chain
+  protected :unit_chain=
   
   private
-  def unit_chain_util(unit)
-    ucs = @unit_chain || []
-    ucs.map!{|nwu, u| [nwu, u * unit]}
-    ucs << [self, unit]
+  def resolve_unit_chain(unit)
+    unit_chain = @unit_chain || []
+    unit_chain.map!{|nwu, chained_unit| [nwu, chained_unit * unit]}
+    unit_chain << [self, unit]
     
-    if i = ucs.index{|nwu, u| nwu.unit.dimension_equal? u}
-      nwu, nu = *ucs[i]
-      nwu[nu]
+    if i = unit_chain.index{|nwu, chained_unit| nwu.unit.dimension_equal? chained_unit}
+      nwu, chained_unit = *unit_chain[i]
+      nwu.convert(chained_unit)
     else
-      nnwu = self.class.new(@value, @unit*unit)
-      nnwu.unit_chain = ucs
-      nnwu
+      newnwu = self.class.new(@value, @unit*unit)
+      newnwu.unit_chain = unit_chain
+      newnwu
     end
   end
 end
@@ -42,7 +44,7 @@ class NumericWithUnit
     def method_missing(name, *args)
       if args.empty?
         unit_str = name.to_s.gsub('_', '/')
-        self.rationalize.to_nwu(unit_str) # util2は利便性優先なのでratoinalizeしてしまいます
+        self.to_f.to_nwu(unit_str) # util2は利便性優先なのでto_fしてしまいます
       else
         raise Unit::NoUnitError
       end

data/lib/numeric_with_unit.rb

@@ -4,68 +4,84 @@ require 'numeric_with_unit/unit'
 
 class NumericWithUnit
   include Comparable
-  
+
   attr_reader :value, :unit
-  
+
   def initialize(value, unit)
     @value = value
     @unit = unit.is_a?(Unit) ? unit : Unit[unit]
   end
-  
+
   # Return String for inspect
   def inspect
-    "#{@value.inspect} [#{@unit.symbol}] #{unit.dimension.inspect}"
+    "#{@value.inspect} [#{@unit.symbol}] #{@unit.dimension.inspect}"
   end
-  
+
   # Return String with value and unit symbol
   def to_s
     "#{@value.to_s} #{@unit.symbol}"
   end
-  
+
   # If ohter is NumericWithUnit and same dimension, comparing value with converting to si.
   # Else return nil.
   def <=>(other)
     if other.is_a?(self.class) and @unit.dimension_equal? other.unit
-      @unit.to_si(@value) <=> other.unit.to_si(other.value)
+      value_si <=> other.value_si
     end
   end
-  
+
+  def ===(other)
+    self.<=>(other) == 0
+  end
+
   # Return succed value with same unit.
   def succ
     self.class.new(@value.succ, @unit)
   end
-  
+
   # Return value.to_i
   def to_i
     @value.to_i
   end
-  
+
   # Return value.to_f
   def to_f
     @value.to_f
   end
-  
-  # Return NumericWithUnit with given unit
-  def to_nwu(unit)
+
+  # Return value in si
+  def value_si
+    @unit.to_si(@value)
+  end
+
+  # Convert to given unit
+  def convert(unit)
     new_unit = unit.is_a?(Unit) ? unit : Unit[unit]
-    
+
     unless @unit.dimension_equal? new_unit
       raise DimensionError, "Dimensions are different between #{@unit.symbol}#{@unit.dimension} #{new_unit.symbol}#{new_unit.dimension}"
     end
-    
+
     new_value = new_unit.from_si(@unit.to_si(@value))
     self.class.new(new_value, new_unit)
   end
-  alias :[] :to_nwu
-  
+  alias :to_nwu :convert
+  alias :[] :convert
+
+  # Convert to simple unit
+  def simplify
+    convert(@unit.simplify)
+  end
+
+
   def +@
     self
   end
-  
+
   def -@
     self.class.new(-@value, @unit)
   end
-  
+
   def +(other)
     nwu = if other.is_a? self.class
       other
@@ -74,11 +90,11 @@ class NumericWithUnit
     end
     add_with_other_unit(nwu)
   end
-  
+
   def -(other)
     self + (-other)
   end
-  
+
   def *(other)
     case other
     when self.class
@@ -87,7 +103,7 @@ class NumericWithUnit
       self.class.new(@value*other, @unit)
     end
   end
-  
+
   def /(other)
     case other
     when self.class
@@ -96,7 +112,7 @@ class NumericWithUnit
       self.class.new(@value/other, @unit)
     end
   end
-  
+
   def coerce(other)
     if other.is_a?(self.class)
       [other, self]
@@ -104,25 +120,47 @@ class NumericWithUnit
       [self.class.new(other, Unit.new), self]
     end
   end
-  
+
   def **(num)
     # Dimension Check
-    @unit.derivation.each do |k,v|
-      res = v * num
-      raise DimensionError, "Dimension of #{k.symbol}(#{v}*#{num}) must be Integer" unless res.to_i == res # 判定方法見なおせ
-    end
-    
-    self.class.new(@value**num, @unit**num)
+    if @unit.derivation.all?{|k,v| o = v * num; o.to_i == o} # TODO: 整数かどうかの判定方法いいのこれで
+     self.class.new(@value**num, @unit**num)
+    else
+      nu = @unit.simplify
+      if nu.derivation.all?{|k,v| o = v * num; o.to_i == o}
+        nv = nu.from_si(@unit.to_si(@value))
+        self.class.new(nv ** num, nu**num)
+      else
+        raise DimensionError, "All derivating units order multiplied #{num} must be integer"
+      end
+   end
   end
-  
+
   def root(num)
     self**(Rational(1,num))
   end
   def sqrt; root(2) end # 平方根
   def cbrt; root(3) end # 立方根
-  
+
+  def ceil
+    self.class.new(@value.ceil, @unit)
+  end
+
+  def floor
+    self.class.new(@value.floor, @unit)
+  end
+
+  def round
+    self.class.new(@value.round, @unit)
+  end
+
+  def truncate
+    self.class.new(@value.truncate, @unit)
+  end
+
+
   private
-  
+
   def add_with_other_unit(other)
     if @unit.dimension_equal? other.unit
       v1 = @unit.to_si(@value)
@@ -133,12 +171,12 @@ class NumericWithUnit
       raise DimensionError, "Dimensions are different between #{@unit.dimension} #{other.unit.dimension}"
     end
   end
-  
+
   def multiply_with_other_unit(other)
     onwu = adjust_other_unit(other)
     self.class.new(@value * onwu.value, @unit * onwu.unit)
   end
-  
+
   def devide_with_other_unit(other)
     onwu = adjust_other_unit(other)
     self.class.new(@value / onwu.value, @unit / onwu.unit)
@@ -156,7 +194,7 @@ class NumericWithUnit
       other
     end
   end
-  
+
 end
 
 
@@ -167,37 +205,8 @@ end
 
 
 
-class Fixnum
-  def to_nwu(unit)
-    NumericWithUnit.new(self, unit)
-  end
-end
-
-class Bignum
-  def to_nwu(unit)
-    NumericWithUnit.new(self, unit)
-  end
-end
-
-class Numeric
-  def to_nwu(unit)
-    NumericWithUnit.new(self, unit)
-  end
-end
-
-class String
-  def to_nwu(mthd=:to_r)
-    # 適当
-    m = self.match /.*?(?=[\s\(\[])/
-    value = m.to_s
-    unit = m.post_match.strip.gsub(/^\[|\]$/, '')
-    NumericWithUnit.new(value.__send__(mthd), unit)
-  end
-end
-
-
+require 'numeric_with_unit/core_ext'
 
 # unit definition
 require 'numeric_with_unit/unit_definition/base'
 require 'numeric_with_unit/unit_definition/common'
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: numeric_with_unit
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - diaphragm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-04 00:00:00.000000000 Z
+date: 2016-02-11 00:00:00.000000000 Z
 dependencies: []
 description: This gem provide NumericWithUnit class to calculate numeric with unit
   of measurement.
@@ -17,11 +17,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
+- README.md
 - lib/numeric_with_unit.rb
+- lib/numeric_with_unit/core_ext.rb
 - lib/numeric_with_unit/unit.rb
 - lib/numeric_with_unit/unit_definition/base.rb
 - lib/numeric_with_unit/unit_definition/cgs.rb
 - lib/numeric_with_unit/unit_definition/common.rb
+- lib/numeric_with_unit/unit_definition/deprecated.rb
 - lib/numeric_with_unit/unit_definition/imperial.rb
 - lib/numeric_with_unit/unit_definition/natural.rb
 - lib/numeric_with_unit/util.rb
@@ -46,7 +50,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Numerical calculation with unit of measurement