sy 2.0.17 → 2.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0cdb5e7240e7affdf2b08f083324fa67ad9e8a7
-  data.tar.gz: bfe8fdb86bfe504b2b49e0104e5f8ee60d37d549
+  metadata.gz: d8f9f7390d20ebd9be2e00dea57e39a1c36de4df
+  data.tar.gz: 91e9d5e9b85fc8789742ec150c2e7760f79f1f8d
 SHA512:
-  metadata.gz: 4d6c7473e4bc14e0567ab14026e292356fc2e7b83d729c8580aaa53208f6881f7eaf666eee790e4f92406748eaaee8bbdd00a652da68940aa0a726695df14ce5
-  data.tar.gz: 7039bc22bf98e02d491073becf7ffee9be34e91307c832c46f2c88a1e757aa127eba07210a05d3766fa1bbc40fa70ea1f7fe6b463990f8b63b2453b8153f4805
+  metadata.gz: 92a5a1360619fe9473357eb3a350baa2839b6c8084c4011ccda4152f975249e60c7f7d7f02d71a3dfcbb53e9e799ba24cef8a92be9273a877fc4f6472c361f53
+  data.tar.gz: bf86c5bbeac6c81f5f6c32552e17532c1761cb8dbeee256dcd532d1dbbe57472ad079f7bd324feb098217bfa9c7a26625107cd2dd7e9fe4c5f338834930050b4

data/lib/sy/composition.rb

@@ -1,4 +1,5 @@
-# -*- coding: utf-8 -*-
+# encoding: utf-8
+
 # Composition of quantities.
 # 
 class SY::Composition < Hash
@@ -7,11 +8,13 @@ class SY::Composition < Hash
   SR = SIMPLIFICATION_RULES = []
 
   # SY::Amount and SY::Amount.relative are disposable:
+  # 
   SR << -> ꜧ {
     ꜧ.reject! { |qnt, _| qnt == SY::Amount || qnt == SY::Amount.relative }
   }
 
   # Relative quantities of the composition are absolutized:
+  # 
   SR << -> ꜧ {
     ꜧ.select { |qnt, _| qnt.relative? }.each { |qnt, exp|
       ꜧ.delete qnt
@@ -20,12 +23,13 @@ class SY::Composition < Hash
   }
 
   # Any quantities with exponent zero can be deleted:
+  # 
   SR << -> ꜧ {
     ꜧ.reject! { |_, exp| exp == 0 }
   }
 
-  # TODO: This undocumented simplification rule simplifies MoleAmount and
-  # LitreVolume into Molarity.
+  # FIXME: This quick fix simplification rule simplifies MoleAmount and
+  # LitreVolume into Molarity. This solution is insufficiently systematic.
   # 
   SR << -> ꜧ {
     begin
@@ -57,6 +61,25 @@ class SY::Composition < Hash
     return ꜧ
   }
 
+  # FIXME: This quick fix simplification rule simplifies LitreVolume times
+  # Molarity into MoleAmount. This solution is insufficiently systematic.
+  # 
+  SR << -> ꜧ {
+    begin
+      q1, q2, q3 = SY::MoleAmount, SY::LitreVolume, SY::Molarity
+    rescue NameError; return ꜧ end
+    e2 = ꜧ.delete q2
+    e3 = ꜧ.delete q3
+    if e2 && e3 && e2 > 0 && e3 > 0 then
+      e2 -= 1
+      e3 -= 1
+      e1 = ꜧ.delete q1
+      ꜧ.update q1 => ( e1 ? e1 + 1 : 1 )
+    end
+    ꜧ.update q2 => e2 if e2 && e2 != 0
+    ꜧ.update q3 => e3 if e3 && e3 != 0
+  }
+
   class << self
     def singular quantity
       self[ SY.Quantity( quantity ) => 1 ]

data/lib/sy/quantity.rb

@@ -87,6 +87,8 @@ class SY::Quantity
     coerces( *Array( coerces ) )
     Array( coerces_to ).each { |qnt| qnt.coerces self }
     puts "Composition of the initialized instance is #{composition}." if SY::DEBUG
+    puts "Initialized instance is #{relative? ? :relative : :absolute}" if SY::DEBUG
+    puts "Initialized instance object_id is #{object_id}" if SY::DEBUG
   end
 
   # Simple quantity is one with simple composition. If nontrivial composition
@@ -264,6 +266,8 @@ class SY::Quantity
   # Constructs a absolute magnitude of this quantity.
   # 
   def magnitude amount
+    puts "self.object_id is #{object_id}" if SY::DEBUG
+    puts "composition is #{composition}" if SY::DEBUG
     puts "Constructing #{self}#magnitude with amount #{amount}." if SY::DEBUG
     Magnitude().new( of: self, amount: amount )
       .tap { puts "#{self}#magnitude constructed!" if SY::DEBUG }

data/lib/sy/version.rb

@@ -1,5 +1,5 @@
 module SY
-  VERSION = "2.0.17"
+  VERSION = "2.0.18"
   DEBUG = false # debug mode switch - sometimes there are lines like
   # puts "something" if SY::DEBUG
 end

data/lib/sy.rb

@@ -1,4 +1,4 @@
-#encoding: utf-8
+# encoding: utf-8
 
 require 'y_support/null_object'
 require 'y_support/name_magic'
@@ -69,7 +69,8 @@ module SY
   # such as 42.unit to create magnitudes of SY::Amount.
   puts "About to construct UNIT." if SY::DEBUG
   UNIT = Unit.standard of: Amount
-  puts "UNIT constructed. SY::Unit instances are #{SY::Unit.instance_names}" if SY::DEBUG
+  puts "UNIT constructed. SY::Unit instances are " +
+    "#{SY::Unit.instance_names}" if SY::DEBUG
 
   # AVOGADRO_CONSTANT (Nᴀ) is a certain well-known amount of things:
   Nᴀ = AVOGADRO_CONSTANT = 6.02214e23
@@ -81,7 +82,8 @@ module SY
   puts "About to construct MOLE." if SY::DEBUG
   MOLE = Unit.standard of: MoleAmount, short: "mol", amount: Nᴀ.unit
   puts SY::Unit.__instances__ if SY::DEBUG
-  puts "MOLE constructed. SY::Unit instances are #{SY::Unit.instance_names}" if SY::DEBUG
+  puts "MOLE constructed. SY::Unit instances are" +
+    "#{SY::Unit.instance_names}" if SY::DEBUG
 
   # === Basic dimension L (length)
 
@@ -152,7 +154,7 @@ module SY
       puts "CelsiusMagnitude#+ method with #{m2}"   # FIXME: This message doesn't show.
       return magnitude amount + m2.amount if
         m2.quantity == SY::Temperature ||
-        m2.quantity.colleague == SY::Temperature
+          m2.quantity.colleague == SY::Temperature
       raise QuantityError, "Addition of Celsius temepratures is ambiguous!" if
         m2.quantity == SY::CelsiusTemperature
       super
@@ -162,7 +164,7 @@ module SY
       puts "CelsiusMagnitude#- method with #{m2}"   # FIXME: This message doesn't show.
       return magnitude amount - m2.amount if
         m2.quantity == SY::Temperature ||
-        m2.quantity.colleague == SY::Temperature
+          m2.quantity.colleague == SY::Temperature
       return super.( SY::Temperature ) if m2.quantity == SY::CelsiusTemperature
       super
     end
@@ -177,6 +179,7 @@ module SY
       SY::CelsiusTemperature.absolute.magnitude self
     end
   end
+
   # FIXME: Make this more systematic.
   # FIXME: Make sure that SI prefixes may not be used with Celsius
   # FIXME: Make sure that highly unusual SI prefixes may not be used
@@ -189,7 +192,6 @@ module SY
     include SY::CelsiusMagnitude
   end
 
-
   # alias :°C :celsius                 # with U+00B0 DEGREE SIGN
   # alias :˚C :celsius                 # with U+02DA RING ABOVE
   # alias :℃ :celsius                  # U+2103 DEGREE CELSIUS

data/test/sy_test.rb

@@ -48,7 +48,7 @@ describe SY::Dimension do
     assert_equal [0, 1], [:L, :M].map { |ß| SY.Dimension( :M ).send ß }
     assert_equal [1, 0], [:L, :M].map { |ß| SY.Dimension( :L )[ß] }
 
-    # #to_a, #to_hash, #zero?, 
+    # #to_a, #to_hash, #zero?
     ll = SY::BASE_DIMENSIONS.letters
     SY.Dimension( :M ).to_a.must_equal ll.map { |l| l == :M ? 1 : 0 }
     SY.Dimension( :M ).to_hash.must_equal Hash[ ll.zip SY.Dimension( :M ).to_a ]
@@ -346,18 +346,15 @@ describe SY::Quantity, SY::Magnitude do
       # joule
       ( 1.N * 1.m ).( SY::Energy ).must_equal 1.J
       1e-23.J.K⁻¹.must_equal 1.0e-20.mJ.K⁻¹
-      
-      
 
       # pascal
       ( 1.N / 1.m ** 2 ).( SY::Pressure ).must_be_within_epsilon 1.Pa, 1e-9
       
       # watt
       ( 1.V * 1.A ).( SY::Power ).must_be_within_epsilon 1.W, 1e-9
-      
 
       # pretty representation
-      ( 1.m / 3.s ).to_s.must_equal( "0.333.m.s⁻¹" ) # FIXME: Discovered a problem here, uncomment the line below
+      ( 1.m / 3.s ).to_s.must_equal( "0.333.m.s⁻¹" )
       ( 1.m / 7.01e7.s ).to_s.must_equal( "1.43e-08.m.s⁻¹" )
 
       assert_equal 1.m, 1.s * 1.m.s⁻¹
@@ -372,6 +369,7 @@ describe SY::Quantity, SY::Magnitude do
       assert_in_epsilon 1.µM, 1.µmol / 1.dm( 3 ).( SY::LitreVolume )
 
       assert_equal SY::Molarity.relative, 1.mol.l⁻¹.quantity
+      assert_equal SY::MoleAmount.relative, 1.M.l.quantity
       
       assert_equal 1 / SY::Time, 1 / SY::Time
       assert_equal 1 / SY::Time.relative, 1 / SY::Time

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sy
 version: !ruby/object:Gem::Version
-  version: 2.0.17
+  version: 2.0.18
 platform: ruby
 authors:
 - boris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-09 00:00:00.000000000 Z
+date: 2013-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport