numeric_with_unit 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48d05ab9f9aa01a815b412324ef7a04b198041db
-  data.tar.gz: 5b55204a0a0b340dfe941ea141e29f6977197a34
+  metadata.gz: f33f4241debd10d0f422dffd58afaa2ea4ff81bb
+  data.tar.gz: d75d05e2524f9f840a9019ed7cb17b2f0acd7071
 SHA512:
-  metadata.gz: d52e9021767bdbfee29dde88feaa8a64790475db07c0cee5df91c79f546e88604d08097f95a4730088df620336760d74d68f7f1f8ac9bf583f87ab7505b71a18
-  data.tar.gz: e3d277dee997ad68c2b38c8a4c06d6404b60bc1fb8d0328661055b5f75904afc834a8a6513d07c0d0e56688ae0577f6c35352c3fc1020080a92f8d8e0fea20ff
+  metadata.gz: 7edf5db65fff4bcd7dffbc9e035da919f60a079ca2583a95fd6acb47019ec3f7b11738ad728ff6117d33ca451b9d97971f2e246ba6772625bcc89274bb66d97e
+  data.tar.gz: f23d463f342e2d2ed4b1d0dc8b674b3e71030041e3500ff7740299ea0458856d6baec99a9a9d3fa5a2cee44549eed882f14a56aa862baa24e69220748b3e1a85

data/lib/numeric_with_unit/unit.rb

@@ -5,14 +5,13 @@ class NumericWithUnit
   class Unit
     class Config
       attr_reader :symbol, :dimension, :derivation
-      attr_reader :si, :proportional
+      attr_reader :si
       
       def initialize(parent=nil)
         @symbol = nil
         @dimension = Hash.new(0)
         @from_si = nil
         @to_si = nil
-        @derivation = Hash.new(0)
         @si = false
         
         @parent = parent
@@ -20,52 +19,12 @@ class NumericWithUnit
       
       def compile
         @dimension.delete_if{|k,v| v.zero?}
-        @derivation.delete_if{|k,v| v.zero?}
-        @derivation.delete_if{|k,v| k.symbol.nil?}
         
-        if @derivation.empty?
-          @from_si ||= ->(x){x}
-          @to_si ||= ->(x){x}
-          @derivation[@parent] += 1 unless @parent.nil?
-        else # configにderivationが与えられた時は、derivationをもとに@dimension,@symbol,@to_si,@from_siを設定
-          h = @derivation.sort_by{|u,v| u.symbol}.sort_by{|u,v| v} # ←どうしよう
-          
-          s1 = h.select{|u,v| v > 0}.map{|u,v| u.symbol + ((v.abs>1) ? v.abs.to_s : '')}.join('.')
-          s2 = h.select{|u,v| v < 0}.map{|u,v| u.symbol + ((v.abs>1) ? v.abs.to_s : '')}.join('.')
-          @symbol = s1 + (s2.empty? ? '' : "/(#{s2})")
-          
-          @derivation.each do |u,v|
-            u.dimension.each do |d,i|
-              @dimension[d] += i*v
-            end
-          end
-          
-          @from_si = @derivation.map{|u,v|
-            prc = if v > 0
-              ->(x){u.from_si(x)}
-            else
-              ->(x){x.quo(u.from_si(1)-u.from_si(0))} # ℃とKの変換のような場合に、変換式の切片を消すため。変換式が線形じゃないケースは想定していない
-            end
-            [prc, v.abs]
-          }.map{|prc,v|
-            ->(x){ v.times{x = prc[x]}; x }
-          }.reduce{|memo, prc|
-            ->(x){memo[prc[x]]}
-          }
-          
-          @to_si = @derivation.map{|u,v|
-            prc = if v > 0
-              ->(x){u.to_si(x)}
-            else
-              ->(x){x.quo(u.to_si(1)-u.to_si(0))} # ℃とKの変換のような場合に、変換式の切片を消すため。変換式が線形じゃないケースは想定していない
-            end
-            [prc, v.abs]
-          }.map{|prc,v|
-            ->(x){ v.times{x = prc[x]}; x }
-          }.reduce{|memo, prc|
-            ->(x){memo[prc[x]]}
-          }
-        end
+        @from_si ||= ->(x){x}
+        @to_si ||= ->(x){x}
+
+        @derivation = Hash.new(0)
+        @derivation[@parent] += 1 unless @parent.nil?
         
         self
       end
@@ -109,11 +68,6 @@ class NumericWithUnit
         raise unless [TrueClass, FalseClass].any?{|klass|arg.is_a?(klass)}
         @si = arg
       end
-      
-      def derivation=(arg)
-        raise unless arg.is_a?(Hash)
-        @derivation = arg
-      end
     end
   end
 end
@@ -156,11 +110,68 @@ class NumericWithUnit
     }
     
     # class methods
+
+    # create new unit from derivation _(for internal use)_ .
+    def self.derive
+      derivation = Hash.new(0)
+      yield(derivation)
+
+      return Unit.new if derivation.empty?
+
+      dimension = Hash.new(0)
+
+      h = derivation.sort_by{|u,v| u.symbol}.sort_by{|u,v| v} # ←どうしよう
+      
+      s1 = h.select{|u,v| v > 0}.map{|u,v| u.symbol + ((v.abs>1) ? v.abs.to_s : '')}.join('.')
+      s2 = h.select{|u,v| v < 0}.map{|u,v| u.symbol + ((v.abs>1) ? v.abs.to_s : '')}.join('.')
+      symbol = s1 + (s2.empty? ? '' : "/(#{s2})")
+      
+      derivation.each do |u,v|
+        u.dimension.each do |d,i|
+          dimension[d] += i*v
+        end
+      end
+
+      from_si = derivation.map{|u,v|
+        prc = if v > 0
+          ->(x){u.from_si(x)}
+        else
+          ->(x){x.quo(u.from_si(1)-u.from_si(0))} # ℃とKの変換のような場合に、変換式の切片を消すため。変換式が線形じゃないケースは想定していない
+        end
+        [prc, v.abs]
+      }.map{|prc,v|
+        ->(x){ v.times{x = prc[x]}; x }
+      }.reduce{|memo, prc|
+        ->(x){memo[prc[x]]}
+      }
+      
+      to_si = derivation.map{|u,v|
+        prc = if v > 0
+          ->(x){u.to_si(x)}
+        else
+          ->(x){x.quo(u.to_si(1)-u.to_si(0))} # ℃とKの変換のような場合に、変換式の切片を消すため。変換式が線形じゃないケースは想定していない
+        end
+        [prc, v.abs]
+      }.map{|prc,v|
+        ->(x){ v.times{x = prc[x]}; x }
+      }.reduce{|memo, prc|
+        ->(x){memo[prc[x]]}
+      }
+
+      self.new{|conf|
+        conf.symbol = symbol
+        conf.dimension = dimension
+        conf.from_si = from_si
+        conf.to_si = to_si
+      }
+    end
     
+    # apply to_s to arg and return parsed unit.
     def self.[](arg)
       self.parse(arg.to_s)
     end
     
+    # cast unit and add unit to base unit list at the same time.
     def self.[]=(key, arg)
       if arg.is_a?(Array) and arg.size == 2
         a = [key, arg.first]
@@ -172,10 +183,12 @@ class NumericWithUnit
       @@list << (u.is_a?(self) ? u : self[u]).cast(*a)
     end
     
+    # return base unit list.
     def self.list
       @@list.map(&:symbol)
     end
     
+    # add unit to base unit list.
     def self.<<(arg)
       if arg.is_a?(self)
         @@list << arg
@@ -184,75 +197,125 @@ class NumericWithUnit
       end
     end
     
+    # remove unit from base unit list.
     def self.delete(unit_symbol)
       @@list.delete_if{|unit| unit.symbol == unit_symbol}
     end
     
+    # create new unit and add unit to base unit list at the same time.
     def self.assign
       @@list << self.new{|config| yield(config)}
     end
-    
+
+
+    # parsing unit_str (ex. "kg", km/hr", "cm2") to (derived) unit.
     def self.parse(unit_str)
-      a = parse_1st(unit_str)
-      parse_2nd([a])
+      rec = ->(arg){__send__(__method__, arg)}
+
+      dervation_str = parse_3rd(parse_2nd(parse_1st(unit_str)))
+      derive{|derivation|
+        dervation_str.each do |unit_str, order|
+          if i = @@list.rindex{|unit| unit.symbol == unit_str}
+            derivation[@@list[i]] += order
+          elsif m = unit_str.match(/^(?<prefix>#{@@prefix.keys.join('|')})(?<unit>#{list.join('|')})$/) and m[:unit].empty?.!
+            u = rec[m[:unit]].cast(unit_str, @@prefix[m[:prefix]])
+            derivation[u] += order
+          else
+            raise NoUnitError, "[#{unit_str}] is not defined!"
+          end
+        end
+      }
     end
-    
 
-    # 文字列を配列にパース
-    # ex. 'J/(kg.K)' -> [#<Unit:J>, ['/', #<Unit:kg>, '.', #<Unit:K>]]
-    # とても手続き的な書き方で禿げる
-    def self.parse_1st(unit_str) 
-      i = @@list.rindex{|u| u.symbol == unit_str}
-      return @@list[i] if i
-      
-      return unit_str if unit_str =~ /^[\.\/]$/
-      
-      # 再帰で呼び出す用
+    def self.parse_1st(unit_str) #:nodoc:
+      return [unit_str] if @@list.rindex{|u| u.symbol == unit_str}
+
       rec = ->(arg){__send__(__method__, arg)}
       
-      a = unit_str.scan(/(?<=\().*(?=\))|[\.\/]|[^\(\)\.\/]+/)
-      return a.map{|elem| rec[elem]} if a.size > 1
-      
-      m = unit_str.match(/-?\d+$/)
-      return m.to_s if m and m.pre_match.empty?
-      return [rec[m.pre_match], m.to_s] if m
-      
-      m = unit_str.match(/^(?<prefix>#{@@prefix.keys.join('|')})(?<unit>#{list.join('|')})$/)
-      return rec[m[:unit]].cast(unit_str, @@prefix[m[:prefix]]) if m
-      
-      raise NoUnitError, "\"#{unit_str}\" is not assigned"
+      a = []
+      tmp = ''
+      nest = 0
+      unit_str.each_char do |char|
+        nest -= 1 if char == ')'
+        
+        if nest == 0
+          case char
+          when '(', ')'
+            a << rec[tmp] unless tmp.empty?
+            tmp = ''
+          when '.', '/'
+            a << tmp unless tmp.empty?
+            a << char
+            tmp = ''
+          else
+            tmp += char
+          end
+        else
+          tmp += char
+        end
+        
+        nest += 1 if char == '('
+        raise StandardError, "parse error" if nest < 0
+      end
+      a << tmp unless tmp.empty?
+      a
     end
-    private_class_method :parse_1st
 
-    # 配列を組立単位に変換
-    # derivationにそのまま突っ込んだほうがすっきりする気がする
-    def self.parse_2nd(unit_array)
-      # 再帰で呼び出す用
+
+    def self.parse_2nd(unit_array) #:nodoc:
       rec = ->(arg){__send__(__method__, arg)}
-      
-      buff_ary = []
-      buff_unit = ''
-      buff_sign = 1
-      
-      unit_array.each do |elem|
-        case elem
-        when self
-          buff_ary << elem ** buff_sign
+
+      a = []
+      sign = 1
+      order = 1
+      tmp = nil
+      unit_array.each do |unit_x|
+        if tmp and not( unit_x.is_a?(String) and unit_x =~ /^\d+$/ )
+          a << {unit: tmp, order: sign*order} if tmp
+          sign = 1
+          order = 1
+          tmp = nil
+        end
+
+        case unit_x
         when '.'
-          buff_sign = 1
+          sign = 1
         when '/'
-          buff_sign = -1
-        when Array
-          buff_ary << rec[elem] ** buff_sign
-        when /^-?\d+$/
-          buff_ary[-1] **= elem.to_i
+          sign = -1
+        when /^(-?\d+)$/
+          order = $1.to_i
+        when /^(.+?)(-?\d+)$/
+          order = $2.to_i
+          tmp = $1
+        else
+          tmp = unit_x.is_a?(Array) ? rec[unit_x] : unit_x
         end
       end
-      
-      buff_ary.reduce(:*)
+      a << {unit: tmp, order: sign*order} if tmp
+      a
     end
-    private_class_method :parse_2nd
-    
+
+    def self.parse_3rd(unit_x, derivation=Hash.new(0), order=1) #:nodoc:
+      rec = ->(*arg){__send__(__method__, *arg)}
+
+      if unit_x.is_a?(Hash)
+        if unit_x[:unit].is_a?(Array)
+          rec[unit_x[:unit], derivation, order * unit_x[:order]]
+        else
+          derivation[unit_x[:unit]] += (order * unit_x[:order])
+        end
+      elsif unit_x.is_a?(Array)
+        unit_x.each do |x|
+          rec[x, derivation, order]
+        end
+      else
+        raise StandardError, "maybe bug"
+      end
+      derivation
+    end
+
+    private_class_method :parse_1st, :parse_2nd, :parse_3rd
+
   end
 
 
@@ -261,12 +324,10 @@ class NumericWithUnit
     
     # Instance Methods
     
-  #  attr_accessor :symbol
     attr_reader :symbol
     attr_reader :dimension, :derivation
     
     def initialize
-      
       # Unit::Configとinitializeの役割が分離できていないので見なおせ
       config = Config.new(self)
       yield(config) if block_given?
@@ -280,6 +341,8 @@ class NumericWithUnit
       @derivation = config.derivation
     end
     
+    # create new unit with new symbol and factor from self.
+    # use for converting [in] = 25.4[mm] .
     def cast(new_symbol, factor = 1)
       self.class.new do |conf|
         conf.symbol = new_symbol
@@ -306,6 +369,7 @@ class NumericWithUnit
       @dimension.all?{|k,v| v.zero?}
     end
     
+    # return true if self and other_unit have the same dimension.
     def dimension_equal?(other_unit)
       (@dimension.keys | other_unit.dimension.keys).all?{|k|
         @dimension[k] == other_unit.dimension[k]
@@ -321,16 +385,16 @@ class NumericWithUnit
     end
     
     def *(other_unit)
-      self.class.new do |conf|
-        @derivation.each{|k, v| conf.derivation[k] += v}
-        other_unit.derivation.each{|k, v| conf.derivation[k] += v}
+      self.class.derive do |derivation|
+        @derivation.each{|k, v| derivation[k] += v}
+        other_unit.derivation.each{|k, v| derivation[k] += v}
       end
     end
     
     def /(other_unit)
-      self.class.new do |conf|
-        @derivation.each{|k, v| conf.derivation[k] += v}
-        other_unit.derivation.each{|k, v| conf.derivation[k] -= v}
+      self.class.derive do |derivation|
+        @derivation.each{|k, v| derivation[k] += v}
+        other_unit.derivation.each{|k, v| derivation[k] -= v}
       end
     end
     
@@ -338,10 +402,10 @@ class NumericWithUnit
       if num.zero?
         self.class.new
       else
-        self.class.new do |conf|
+        self.class.derive do |derivation|
           # ここto_iでOKか？v*numが整数じゃなければraiseすべき？→すべき→NumericWithUnitでやるべき？
           # Unitでは整数じゃない次数の単位は許容すべきか否か→していい気がする
-          @derivation.each{|k, v| conf.derivation[k] = (v*num).to_i}
+          @derivation.each{|k, v| derivation[k] = (v*num).to_i}
         end
       end
     end

data/lib/numeric_with_unit/{base_unit.rb → unit_definition/base.rb}

@@ -107,7 +107,6 @@ class NumericWithUnit
 
   # Electriccal Resistance
   Unit['Ω'] = 'V/A'
-  Unit['ohm'] = 'Ω'
 
   # Electriccal Conductance
   Unit['S'] = 'A/V'
@@ -131,7 +130,6 @@ class NumericWithUnit
     conf.from_si{|x| k.from_si(x)-intercept}
     conf.to_si{|x| k.to_si(x+intercept)}
   end
-  Unit['degC'] = '℃'
 
   # Luminouse flux
   Unit['lx'] = 'cd.sr'

data/lib/numeric_with_unit/{cgs_unit.rb → unit_definition/cgs.rb}

@@ -1,6 +1,6 @@
 # coding: utf-8
 
-require 'numeric_with_unit/base_unit'
+require 'numeric_with_unit/unit_definition/base'
 
 Unit['cal'] = "4.184".to_r, 'J'
 

data/lib/numeric_with_unit/{common_unit.rb → unit_definition/common.rb}

@@ -4,8 +4,7 @@
 # 独断と偏見による一般的な単位
 # 
 
-require 'numeric_with_unit/unit'
-require 'numeric_with_unit/base_unit'
+require 'numeric_with_unit/unit_definition/base'
 
 class NumericWithUnit
   # Dimensionless
@@ -22,6 +21,9 @@ class NumericWithUnit
   Unit['ton'] = 1000, 'kg'
   Unit['oz'] = "28.349523125".to_r, 'g'
   Unit['lb'] = 16, 'oz'
+  
+  # Electriccal Resistance
+  Unit['ohm'] = 'Ω'
 
   # Temperature
   Unit['degC'] = '℃'
@@ -42,6 +44,7 @@ class NumericWithUnit
   Unit['ft'] = "1/3".to_r, 'yd'
   Unit['in'] = "1/12".to_r, 'ft'
   Unit['mi'] = 5280, 'ft'
+  Unit['100m'] = 100, 'm' # [kPa/100m]とか
 
   # Volume
   Unit['cc'] = 'cm3'

data/lib/numeric_with_unit/{imperial_unit.rb → unit_definition/imperial.rb}

@@ -1,6 +1,6 @@
 # coding: utf-8
 
-require 'numeric_with_unit/base_unit'
+require 'numeric_with_unit/unit_definition/base'
 
 Unit['yd'] =  "0.9144".to_r , 'm'
 Unit['ft'] = "1/3".to_r, 'yd'

data/lib/numeric_with_unit/{natural_unit.rb → unit_definition/natural.rb}

@@ -1,6 +1,6 @@
 # coding: utf-8
 
-require 'numeric_with_unit/base_unit'
+require 'numeric_with_unit/unit_definition/base'
 
 # Naural Units
 # Speed

data/lib/numeric_with_unit/util2.rb

@@ -6,9 +6,9 @@
 require 'numeric_with_unit'
 
 class NumericWithUnit
-  def method_missing(*args)
-    if args.size == 1
-      unit_str = args.first.to_s.gsub('_', '/')
+  def method_missing(name, *args)
+    if args.empty?
+      unit_str = name.to_s.gsub('_', '/')
       unit_chain_util(Unit[unit_str])
     else
       raise Unit::NoUnitError
@@ -39,9 +39,9 @@ end
 
 class NumericWithUnit
   module NumUtil
-    def method_missing(*args)
-      if args.size == 1
-        unit_str = args.first.to_s.gsub('_', '/')
+    def method_missing(name, *args)
+      if args.empty?
+        unit_str = name.to_s.gsub('_', '/')
         self.rationalize.to_nwu(unit_str) # util2は利便性優先なのでratoinalizeしてしまいます
       else
         raise Unit::NoUnitError

data/lib/numeric_with_unit.rb

@@ -12,33 +12,40 @@ class NumericWithUnit
     @unit = unit.is_a?(Unit) ? unit : Unit[unit]
   end
   
+  # Return String for inspect
   def 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
   
-  # otherがNumericWithUnitで次元が同じだったらsi単位に変換して比較、そうでなければ比較できない(nil)
+  # 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)
     end
   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)
     new_unit = unit.is_a?(Unit) ? unit : Unit[unit]
     
@@ -181,13 +188,13 @@ end
 class String
   def to_nwu(mthd=:to_r)
     m = self.match /(?<value>.+) (?<unit>.+)/ # 適当
-    NumericWithUnit[m[:value].__send__(mthd), m[:unit]]
+    NumericWithUnit.new(m[:value].__send__(mthd), m[:unit])
   end
 end
 
 
 
 # unit definition
-require 'numeric_with_unit/base_unit'
-require 'numeric_with_unit/common_unit'
+require 'numeric_with_unit/unit_definition/base'
+require 'numeric_with_unit/unit_definition/common'
 

metadata

@@ -1,28 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: numeric_with_unit
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - diaphragm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-18 00:00:00.000000000 Z
+date: 2015-01-31 00:00:00.000000000 Z
 dependencies: []
-description: calclation numeric with unit!!!!
+description: This gem provide NumericWithUnit class to calculate numeric with unit
+  of measurement.
 email: 
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - lib/numeric_with_unit.rb
-- lib/numeric_with_unit/base_unit.rb
-- lib/numeric_with_unit/cgs_unit.rb
-- lib/numeric_with_unit/common_unit.rb
-- lib/numeric_with_unit/imperial_unit.rb
-- lib/numeric_with_unit/natural_unit.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/imperial.rb
+- lib/numeric_with_unit/unit_definition/natural.rb
 - lib/numeric_with_unit/util.rb
 - lib/numeric_with_unit/util2.rb
 homepage: https://github.com/diaphragm/ruby-numeric-with-unit
@@ -37,7 +38,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -45,8 +46,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: calclation numeric with unit
+summary: Numerical calculation with unit of measurement
 test_files: []