engineer_calculator 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89eb7e5143f351c33f06395bf5750dc6cfd3e31977a39f5850d392c5e28974b3
-  data.tar.gz: c404924ca5aad4eafdb3b037330d7cb06716d34bb2628ce485be4ff7e6998b4a
+  metadata.gz: 15e4217a23509a5741c95e644292d685a013839cbb9b9d1c92447ec400847442
+  data.tar.gz: 388e18b284891ea7224f6adf41e982f1d35d5d814805d9727d8b34239c905e6c
 SHA512:
-  metadata.gz: 9415d88cd2b720adb1d6bce2e28c81341233e31b87fbeca770fc997e556f8ecc6f94593f4410ebbbe610979faa73738c777deae1d10eb3513fcd9b17e99fd562
-  data.tar.gz: df2bfad26a1c0f4bb66220ab05948b92aff9b77d4dd3405f912dec6902fc6208999b0218babae82b2045c266882b72a3fdb5baad2f81713549dcd8523dccf4da
+  metadata.gz: 0f7871a8a53daf3fcbe0ae829f8c6bb6163dbd2ead4dcc892ff1c0c6fbc4a47e24c23856cbd233efdc8045a70c48ac5274e52d77b2d8b3ab9be216fcca124f38
+  data.tar.gz: c806ad1826c9515e3698e718046b25c94f32cb93c17e203eca709252340445f0e557dd6db8607de9829e1610100800831ec5f3e1d7471819d86b1531da8fc1d3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    engineer_calculator (2.0.1)
+    engineer_calculator (2.0.2)
 
 GEM
   remote: https://rubygems.org/

data/lib/eng_calc.rb

@@ -13,13 +13,13 @@ module Eng
 
     attr_accessor :error, :alter
     def calc(formula)
-
+      
       return nil unless formula
 
       begin
         c = { value: "", unit: [], si_formula: "", error: [] }
 
-        split_value_unit(formula.gsub("⋅","*").gsub("÷","/")).map do |e_formula|
+        split_value_unit(formula.gsub("×","*").gsub("⋅","*").gsub("÷","/")).map do |e_formula|
           if e_formula[:unit].nil?
             c[:value] << e_formula[:value].to_f.to_s + "r"
             c[:si_formula] << e_formula[:value]

data/lib/eng_formula.rb

@@ -4,7 +4,7 @@ module Eng
       unit_array = []
       formula_pre = formula.to_s.delete(" ")
       formula_pre.scan(/(#{operator_reg(:tri)})|
-                      (?:(#{operator_reg(:num)}(?:#{operator_reg(:double)})*)([^#{operator_reg(:num)}#{operator_reg(:double)}#{operator_reg(:ari)}]+))|
+                      (?:(#{operator_reg(:num)}(?:#{operator_reg(:double)})*)([^#{operator_reg(:num)}#{operator_reg(:double)}#{operator_reg(:ari)}]+\w*))|
                       (?:(#{operator_reg(:num)}(?:#{operator_reg(:double)})*)((?:\/?\(?\/?[a-z]+\d*(?:\*[a-z])*(?:\W*[a-z]\d*\)*)*)(?:\d[^[a-z]])*\)?))|
                       (#{operator_reg(:ari)})|
                       ((?:#{operator_reg(:num)})*(?:#{operator_reg(:double)})?)/ix)
@@ -41,10 +41,10 @@ module Eng
     end
 
     def liner_function(formula)
-      formula_arr = formula.split(/(\*|\/|\+|-)/)
+      formula_arr = formula.split(/(#{operator_reg(:num)})|(value)|(\*)|(\/)|(\+)|(-)/).reject{|v| v == ""}
       input_num = formula_arr.index("value")
       mv_num = formula_arr.index{ |n| n =~ /\*|\// }
-      pm_num = formula_arr.index{ |n| n =~ /\+|-/ }
+      pm_num = formula_arr.index{ |n| n == "+" || n == "-" }
 
       if mv_num
         a_ari = formula_arr[mv_num]
@@ -75,55 +75,5 @@ module Eng
 
       "value" + a_ari + a.to_s + b_ari + b.to_s + a_ari + a.to_s
     end
-
-    def new_liner_function(formula)
-      fl_arr = formula.split(/(\*|\/|\+|-)/)
-      value_i = fl_arr.index("value")
-
-      a = []
-      b = []
-      pl = false
-      (value_i .. fl_arr.size - 1).each do |i|
-        if pl || fl_arr[i] == "+" || fl_arr[i] == "-"
-          b << reverse_operator(fl_arr[i])
-          pl = true
-        else
-          a << reverse_operator(fl_arr[i])
-        end
-      end
-
-      if value_i != 0
-        (0 .. value_i - 1).reverse_each do |i|
-          if fl_arr[i] == "+" || fl_arr[i] == "-" || i == 0
-            (i .. value_i - 1).reverse_each do |ii|
-              a.unshift(reverse_operator(fl_arr[ii]))
-            end
-
-            if i != 0
-              (0..i).each do |ii|
-                b.unshift(reverse_operator(fl_arr[ii], false))
-              end
-            end
-            break
-          end
-        end
-      end
-      a.join + "+(" + b.join + ")/value"
-    end
-
-    def reverse_operator(operator, opt = true)
-      case operator
-      when "+"
-        "-"
-      when "-"
-        "+"
-      when "*"
-        opt ? "/" : "*"
-      when "/"
-        opt ? "*" : "/"
-      else
-        operator
-      end
-    end
   end
 end

data/lib/engineer_calculator/version.rb

@@ -1,3 +1,3 @@
 module Engineer
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

data/lib/unit_calc/si_alter_unit.yml

@@ -89,14 +89,6 @@ Radiant Intensity:
 Spectral Intensity:
   - W/(sr*m)
   - watt per steradian metre
-Speed, Velocity:
-  - m/s
-Acceleration:
-  - m/s2
-Jerk, Jolt:
-  - m/s3
-Snap, Jounce:
-  - m/s4
 Angular Velocity:
   - rad/s
 Angular Acceleration:
@@ -209,3 +201,6 @@ Catalytic Activity:
   - kat
   - katal
   - mol/s
+
+Viscosity:
+  - Pa*s

data/lib/unit_calc/si_derived_unit.yml

@@ -54,10 +54,10 @@ Electrical Conductance: s3*A2/(kg*m2)
 Magnetic Flux: kg*m2/(s2*A)
 Magnetic Field Strength, Magnetic Flux Density: kg/(s2*A)
 Electrical Inductance: kg*m2/(s2*A2)
-Temperature: K
 Luminous Flux: cd
 Illuminance: cd/m2
 Radioactivity (Decays Per Unit Time): /s
 Absorbed Dose (Of Ionizing Radiation): m2/s2
 Equivalent Dose (Of Ionizing Radiation): m2/s2
 Catalytic Activity: mol/s
+Viscosity: (kg/m)*s

data/lib/unit_calc/variable_unit.yml

@@ -5,7 +5,7 @@ Length:
   feet, ft, ': value*0.304r
   yard, yd: value*0.9144r
   mile, mi: value*1609.344r
-  寸: value*1/33
+  寸: value/33r
   尺: value*0.30303r
   鯨尺: value*0.37879r
   丈: value*3.0303r
@@ -20,34 +20,34 @@ Length:
 Weight:
   g, gram: value/1000r
   ton: value/0.001r
-  grain, gr: value*15432.358352941r
-  dram, dr: value*564.38339119329r
-  ounce, oz: value*35.27396194958r
-  pound, lb: value*2.2046226218488r
-  stone, st: value/6.35029318r
-  quarter: value/12.70058636r
-  short-ton, sh-tn, s.t.: value/907.18474r
-  分: value*2666.6666666667r
-  匁: value*266.66666666667r
-  百目: value*2.6666666666667r
-  斤: value*1.6666666666667r
+  grain, gr: value/15432.358352941r
+  dram, dr: value/564.38339119329r
+  ounce, oz: value/35.27396194958r
+  pound, lb: value/2.2046226218488r
+  stone, st: value*6.35029318r
+  quarter: value*12.70058636r
+  short-ton, sh-tn, s.t.: value*907.18474r
+  分: value/2666.6666666667r
+  匁: value/266.66666666667r
+  百目: value/2.6666666666667r
+  斤: value/1.6666666666667r
 
 Time:
-  Planck time, tp: value*5.39121E-44.rationalize
-  au: value*4.1341373345192E+16.rationalize
+  Planck-time, tp: value*5.39116e-44.rationalize
+  au: value*4.1341373345192e+16.rationalize
   min: value*60r
   hour: value*3600r
   day: value*86400r
   week: value*604800r
-  month: value*2.628E+6
+  month: value*2.628e+6
   year: value*31535965.4396976r
   century: value*3153600000r
 
 Tempreture:
   K: value
-  °C, degree, Celsius: "value-273.15r"
-  °F, Fahrenheit: "value*1.8r-459.67r"
-  °R, Rankine scale: "value*1.8r"
+  °C, degree, Celsius: value+272.15r
+  °F, Fahrenheit: value*0.5555555555555556r+255.37222222222223r
+  °R, Rankine scale: value/1.8r
 
 Area:
   are, a: value*100r
@@ -68,17 +68,17 @@ Volume:
   cl: value/100000r
   dl: value/10000r
   l: value/1000r
-  小さじ: value*5.0E-6.rationalize
-  大さじ: value*1.5E-5.rationalize
-  cc: value*1.0E-6.rationalize
-  cu-in, in3: value*1.6387064E-5.rationalize
+  小さじ: value*5.0e-6.rationalize
+  大さじ: value*1.5e-5.rationalize
+  cc: value*1.0e-6.rationalize
+  cu-in, in3: value*1.6387064e-5.rationalize
   cu-ft, ft3: value*0.028316846592r
   ac-ft: value*1233.4818375475r
   U.S.fluid-gallon, gallon, gal, U.S.gal, USG: value*0.003785411784r
   Imperial-gallon, imp.gal: value*0.00454609r
   Winchester-bushel, bushel, bsh., bu: value*0.03523907016688r
-  us-fluid-once, fl-oz: value*2.84130625E-5.rationalize
-  uk-fluid-ounce: value*2.95735295625E-5.rationalize
+  us-fluid-once, fl-oz: value*2.84130625e-5.rationalize
+  uk-fluid-ounce: value*2.95735295625e-5.rationalize
   us-gill, gi: value*0.00011829411825r
   uk-gill, uk-gi: value*0.0001420653125r
   us-pint, pt: value*0.000473176473r
@@ -87,25 +87,25 @@ Volume:
   uk-quart, uk-qt: value*0.0011365225r
   us-barrel, bbl: value*0.119240471196r
   uk-barrel, uk-bbl: value*0.16365924r
-  勺: value*1.8039068369647E-5.rationalize
+  勺: value*1.8039068369647e-5.rationalize
   合: value*0.00018039068369647r
   升: value*0.0018039068369647r
   斗: value*0.018039068369647r
   石: value*0.18039068369647r
 
 Power:
-  dyn: value*100000r
+  dyn: value/100000r
   N: value
-  kgf: value*0.10197162129779r
-  lbf: value*0.22480894309971r
-  pdl: value*7.2330138512099r
+  kgf: value/0.10197162129779r
+  lbf: value/0.22480894309971r
+  pdl: value/7.2330138512099r
 
 Pressure, Stress:
-  N/mm2: value*1E-06.rationalize
+  N/mm2: value*1e-06.rationalize
   bar: value*100000r
   atm: value*101325r
   at: value*98066.5r
-  kgf/cm2: value/1.0197162129779E-05.rationalize
+  kgf/cm2: value/1.0197162129779e-05.rationalize
   mmH2O: value*9.80665r
   cmH2O: value*98.0665r
   mmH2O(3.98°C): value*9.80638r
@@ -130,13 +130,13 @@ Electric power:
 
 Energy, Work, Heat:
   erg: value/10000000r
-  kWh: value/2.7777777777778E-07
+  kWh: value/2.7777777777778e-07
   calth: value/0.23900573613767r
-  kcalth: value/2.3900573613767E-04.rationalize
+  kcalth: value/2.3900573613767e-04.rationalize
   calIT: value/0.2388458966275r
-  kcalIT: value/2.388458966275E-04.rationalize
-  eV: value/6.2415094796077E+18.rationalize
-  BTU: value/9.4781712031332E-04.rationalize
+  kcalIT: value/2.388458966275e-04.rationalize
+  eV: value/6.2415094796077e+18.rationalize
+  BTU: value/9.4781712031332e-04.rationalize
   ftlbf: value/0.73756214945755r
   ftpdl: value/23.730360457056r
   atm: value/0.0098692326671601r
@@ -157,7 +157,7 @@ Acceleration:
   fps2: value/3.2808398950131r
   fpm/s: value/196.85039370079r
   fph/s: value/11811.023622047r
-  mps2: value/6.2137119223733E-04.rationalize
+  mps2: value/6.2137119223733e-04.rationalize
   mpm/s: value/0.03728227153424r
   mph/s: value/2.2369362920544r
   kn/s: value/1.9438444924406r
@@ -172,3 +172,9 @@ Angle:
   mil: value/17.777777777778r
   /%: value/1.7455064928218r
   ‰: value/17.455064928218r
+
+Viscosity:
+  poise: value*10
+  cpoise: value*1000
+  (kg/m)*h: value*3600
+  (lb/ft)*s: value*0.671969

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: engineer_calculator
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Azeroyear
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-10 00:00:00.000000000 Z
+date: 2019-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler