xqsr3 0.38.0 → 0.38.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e4daad1c3c67fdf61c583a51ba736ff81e75b80
-  data.tar.gz: d6d61c42b272907440cd1050b24d86be9cada0b9
+  metadata.gz: 893916b4985f2cf4aacd3880f28d9199b3137f49
+  data.tar.gz: d611a888f54fc3d6bee966a040530637bdfe2423
 SHA512:
-  metadata.gz: 3a5986a93e709f33a02cfc1c90343b0f520ab4960c8b42b97df96fc71a34debfd41932a2012e98afcd6392e5d37b2b694bc7f6fc4fcefbd9c25b6a3587c8d5dc
-  data.tar.gz: 0d7d35382e452b1f104d04da69c7113e9f59e157357ff78efbaa0c9cb9f3a92c181122792b8fafcbb9ac5c6c6cb9c7da2e2ca432d02b1e55c5e4c93616baaa5e
+  metadata.gz: 222348a3e0621835acbb5df342e2625eb6f6c7d355b59e9aded4e105e3acdbfe27a13cff0af939964ecde0eab65f16a5bebd8560afb71781a653c98ba981cc0b
+  data.tar.gz: efd82ceb69653fcc88954b3fb03267d3719e00642de1c7a2de564fe008751e0476be9625da6037af8bdcc1aecbf242ceced924f29403858a9d5a3b8eff861391

data/lib/xqsr3/containers/frequency_map.rb

@@ -285,9 +285,13 @@ class FrequencyMap
 	# keys must be created and sorted from which enumeration is directed
 	def each_by_key
 
-		@elements.keys.sort.each do |key|
+		sorted_elements = @elements.sort { |a, b| a[0] <=> b[0] }
 
-			yield key, @elements[key]
+		return sorted_elements.each unless block_given?
+
+		sorted_elements.each do |k, v|
+
+			yield k, v
 		end
 	end
 
@@ -298,22 +302,13 @@ class FrequencyMap
 	# and map all entries into it in order to achieve the ordering
 	def each_by_frequency
 
-		tm = {}
-		@elements.each do |element, frequency|
-
-			tm[frequency]	=	[]	unless tm.has_key?(frequency)
+		ar = @elements.to_a.sort { |a, b| b[1] <=> a[1] }
 
-			tm[frequency].push element
-		end
-
-		keys = tm.keys.sort.reverse
-		keys.each do |frequency|
+		return ar.each unless block_given?
 
-			elements = tm[frequency].sort
-			elements.each do |element|
+		ar.each do |k, v|
 
-				yield element, frequency
-			end
+			yield k, v
 		end
 	end
 

data/lib/xqsr3/version.rb

@@ -5,7 +5,7 @@
 # Purpose:      Version for Xqsr3 library
 #
 # Created:      3rd April 2016
-# Updated:      25th July 2022
+# Updated:      26th July 2022
 #
 # Home:         http://github.com/synesissoftware/xqsr3
 #
@@ -51,7 +51,7 @@
 module Xqsr3
 
 	# Current version of the Xqsr3 library
-	VERSION				=	'0.38.0'
+	VERSION				=	'0.38.1'
 
 	private
 	VERSION_PARTS_		=	VERSION.split(/[.]/).collect { |n| n.to_i } # :nodoc:

data/test/unit/containers/tc_frequency_map.rb

@@ -335,7 +335,7 @@ class Test_Xqsr3_Containers_FrequencyMap < Test::Unit::TestCase
 		assert_eql fm1, fm3
 	end
 
-	def test_each
+	def test_each_WITH_BLOCK
 
 		fm = FrequencyMap.new
 
@@ -358,7 +358,25 @@ class Test_Xqsr3_Containers_FrequencyMap < Test::Unit::TestCase
 		assert_equal [:ghi, 2], r[2]
 	end
 
-	def test_each_by_key
+	def test_each_WITHOUT_BLOCK
+
+		fm = FrequencyMap.new
+
+		fm << :def
+		fm << :abc << :abc << :abc << :abc
+		fm << :ghi << :ghi
+
+		r = fm.each.to_a
+
+		r.sort! { |a, b| a[0] <=> b[0] }
+
+		assert_equal 3, r.size
+		assert_equal [:abc, 4], r[0]
+		assert_equal [:def, 1], r[1]
+		assert_equal [:ghi, 2], r[2]
+	end
+
+	def test_each_by_key_WITH_BLOCK
 
 		fm = FrequencyMap.new
 
@@ -379,7 +397,23 @@ class Test_Xqsr3_Containers_FrequencyMap < Test::Unit::TestCase
 		assert_equal [:ghi, 2], r[2]
 	end
 
-	def test_each_by_frequency
+	def test_each_by_key_WITHOUT_BLOCK
+
+		fm = FrequencyMap.new
+
+		fm << :def
+		fm << :abc << :abc << :abc << :abc
+		fm << :ghi << :ghi
+
+		r = fm.each_by_key.to_a
+
+		assert_equal 3, r.size
+		assert_equal [:abc, 4], r[0]
+		assert_equal [:def, 1], r[1]
+		assert_equal [:ghi, 2], r[2]
+	end
+
+	def test_each_by_frequency_WITH_BLOCK
 
 		fm = FrequencyMap.new
 
@@ -400,7 +434,23 @@ class Test_Xqsr3_Containers_FrequencyMap < Test::Unit::TestCase
 		assert_equal [:def, 1], r[2]
 	end
 
-	def each_value
+	def test_each_by_frequency_WITHOUT_BLOCK
+
+		fm = FrequencyMap.new
+
+		fm << :def
+		fm << :abc << :abc << :abc << :abc
+		fm << :ghi << :ghi
+
+		r = fm.each_by_frequency.to_a
+
+		assert_equal 3, r.size
+		assert_equal [:abc, 4], r[0]
+		assert_equal [:ghi, 2], r[1]
+		assert_equal [:def, 1], r[2]
+	end
+
+	def test_each_value_WITH_BLOCK
 
 		fm = FrequencyMap.new
 
@@ -412,7 +462,7 @@ class Test_Xqsr3_Containers_FrequencyMap < Test::Unit::TestCase
 
 		fm.each_value do |v|
 
-			r << [v]
+			r << v
 		end
 
 		r.sort!
@@ -421,7 +471,7 @@ class Test_Xqsr3_Containers_FrequencyMap < Test::Unit::TestCase
 		assert_equal [1, 2, 4], r
 	end
 
-	def each_with_index
+	def test_each_value_WITHOUT_BLOCK
 
 		fm = FrequencyMap.new
 
@@ -429,19 +479,37 @@ class Test_Xqsr3_Containers_FrequencyMap < Test::Unit::TestCase
 		fm << :abc << :abc << :abc << :abc
 		fm << :ghi << :ghi
 
-		fm.each_with_index do |k, v, index|
-
-			case	index
-			when	0
-				assert_equal :abc, k
-				assert_equal 2, v
-			when	1
-				assert_equal :def, k
-				assert_equal 1, v
-			else
-				assert false, "should never get here"
-			end
+		r = fm.each_value.to_a
+
+		r.sort!
+
+		assert_equal 3, r.size
+		assert_equal [1, 2, 4], r
+	end
+
+	def test_each_with_index_WITH_BLOCK
+
+		fm = FrequencyMap.new
+
+		fm << :def
+		fm << :abc << :abc << :abc << :abc
+		fm << :ghi << :ghi
+
+		indexes = []
+		kvs = {}
+
+		fm.each_with_index do |kv, index|
+
+			k = kv[0]
+			v = kv[1]
+
+			indexes << index
+
+			kvs[k] = v
 		end
+
+		assert_equal [ 0, 1, 2 ], indexes
+		assert_equal Hash[ :abc, 4, :def, 1, :ghi, 2 ], kvs
 	end
 
 	def test_empty

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xqsr3
 version: !ruby/object:Gem::Version
-  version: 0.38.0
+  version: 0.38.1
 platform: ruby
 authors:
 - Matt Wilson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-25 00:00:00.000000000 Z
+date: 2022-07-26 00:00:00.000000000 Z
 dependencies: []
 description: |
   eXtensions by fine Quantum for Standard Ruby and 3rd-party libraries is a