mgmg 1.8.1 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3698312de546d3f9a7eac1aadd6024ae8132a8c58f97c041fa07b788828a3bcc
-  data.tar.gz: 19d8263ccfd11a476472868a8420959cccc356bbd7f69fcf619f831fde589794
+  metadata.gz: 67f8cb095fc1716b95438a8eda538d4318811ee2f204c93a75c78b6814951f37
+  data.tar.gz: e17d1ae24f42c252332ae48ab8698faa1c79d1315bf3cd686fa6ee8fd9a8e306
 SHA512:
-  metadata.gz: c0edb6042eb1fccbe9d6b4761afd1a2ad0814910850b2664325d20f109fe9d6805cf28aab5d25b363842cde62dce3e1739319668446e912b6a15d94e2043654f
-  data.tar.gz: 70ed1f01ca7bfd7ef4be9fc886f74f2049d466cc73e2fb79276dd9768d40bed0232119cde2a177def7721f677271ff602b71d3231d207a94a5850fcd82844b8a
+  metadata.gz: 9289ac21117cfc2d1177e17c3a5ad8b1b329800013959a7261f9b16b9d399e6f4820ec6d6f5b3cce51deaa11dbf0b9a2285ee6ed5f5a9131d657821d531f3203
+  data.tar.gz: d9c86b0ce3d605d52e574ca63722f56d23e6d07f7f3e46bf105abc321620edcc8eae5f5e29b00ac4866976e51eafc6a363d5761029891bde0cc8566b48ff67ee

data/CHANGELOG.md

@@ -194,3 +194,6 @@
 - `Mgmg::Recipe`に`name`属性を追加．`String/Enumerable#to_recipe`の際，キーワード引数`name`を追加することで設定できる．
 - `Mgmg.#efficient_list` を追加．
 - `Enumerable#build`，`Enumerable#search`で意図せぬ例外が発生していた問題を修正．
+
+## 1.8.2 2022/11/21
+- オプション`cut_exp`で探索が打ち切られる場合に，`Mgmg::SearchCutException`でない例外が発生する場合があったバグを修正．

data/lib/mgmg/recipe.rb

@@ -86,16 +86,24 @@ module Mgmg
 				raise BrokenRecipeError
 			end
 		end
-		def show(smith=-1, armor=smith, comp=armor.tap{armor=smith}, para: @para, **kw)
+		def show(smith=-1, armor=smith, comp=armor.tap{armor=smith}, para: @para, search: nil, find_max: nil, **kw)
 			opt = temp_opt(**kw)
-			smith, armor, comp = opt.smith_min, opt.armor_min, opt.comp_min if smith.nil?
-			case @recipe
-			when String
-				@recipe.show(smith, comp, para:, name: @name, opt:)
-			when Enumerable
-				@recipe.show(smith, armor, comp, para:, name: @name, opt:)
+			if search
+				sc = @recipe.search(para, search, opt:)
+				@recipe.show(*sc, para:, name: @name, opt:)
+			elsif find_max
+				sc = @recipe.search(para, find_max, opt:)
+				@recipe.show(*sc, para:, name: @name, opt:)
 			else
-				raise BrokenRecipeError
+				smith, armor, comp = opt.smith_min, opt.armor_min, opt.comp_min if smith.nil?
+				case @recipe
+				when String
+					@recipe.show(smith, comp, para:, name: @name, opt:)
+				when Enumerable
+					@recipe.show(smith, armor, comp, para:, name: @name, opt:)
+				else
+					raise BrokenRecipeError
+				end
 			end
 		end
 		def search(target, para: @para, **kw)

data/lib/mgmg/search.rb

@@ -69,6 +69,7 @@ class String
 		[exp_best, ret]
 	end
 	def search(para, target, opt: Mgmg::Option.new)
+		org_cut_exp = opt.cut_exp
 		opt = opt.dup.set_default(self)
 		opt_nocut = opt.dup; opt_nocut.cut_exp = Float::INFINITY
 		begin
@@ -109,6 +110,7 @@ class String
 			end
 		end
 		exp_best = opt.cut_exp
+		values = values.filter(&:finite?)
 		diff = values.max-values.min
 		if 0 < diff
 			opt.cut_exp = exp_best + diff*opt.fib_ext[0]
@@ -124,8 +126,8 @@ class String
 			end
 		end
 		if ret.nil?
-			max = opt.irep.para_call(para, *find_max(para, opt.cut_exp, opt:))
-			raise Mgmg::SearchCutException, "the maximum output with given cut_exp=#{opt.cut_exp.comma3} is #{max.comma3}, which does not reach given target=#{target.comma3}"
+			max = opt.irep.para_call(para, *find_max(para, org_cut_exp, opt:))
+			raise Mgmg::SearchCutException, "the maximum output with given cut_exp=#{org_cut_exp.comma3} is #{max.comma3}, which does not reach given target=#{target.comma3}"
 		end
 		ret
 	end
@@ -178,6 +180,7 @@ class String
 				values = [values[1], values[2], cur, values[3]]
 			end
 		end
+		values = values.filter(&:finite?)
 		diff = values.max-values.min
 		if 0 < diff
 			th = max - diff*opt.fib_ext[1]
@@ -338,6 +341,7 @@ module Enumerable
 		[exp_best, ret]
 	end
 	def search(para, target, opt: Mgmg::Option.new)
+		org_cut_exp = opt.cut_exp
 		opt = opt.dup.set_default(self)
 		begin
 			opt.comp_min = comp_search(para, target, opt.smith_max, opt.armor_max, opt:)
@@ -377,6 +381,7 @@ module Enumerable
 			end
 		end
 		exp_best = opt.cut_exp
+		values = values.filter(&:finite?)
 		diff = values.max-values.min
 		if 0 < diff
 			opt.cut_exp = exp_best + diff*opt.fib_ext[0]
@@ -392,8 +397,8 @@ module Enumerable
 			end
 		end
 		if ret.nil?
-			max = opt.irep.para_call(para, *find_max(para, opt.cut_exp, opt:))
-			raise Mgmg::SearchCutException, "the maximum output with given cut_exp=#{opt.cut_exp.comma3} is #{max.comma3}, which does not reach given target=#{target.comma3}"
+			max = opt.irep.para_call(para, *find_max(para, org_cut_exp, opt:))
+			raise Mgmg::SearchCutException, "the maximum output with given cut_exp=#{org_cut_exp.comma3} is #{max.comma3}, which does not reach given target=#{target.comma3}"
 		end
 		ret
 	end
@@ -444,6 +449,7 @@ module Enumerable
 				cur = cur_i if cur < cur_i
 			end
 		end
+		a_vals = a_vals.filter(&:finite?)
 		diff = a_vals.max-a_vals.min
 		if 0 < diff
 			th = max - diff*opt.fib_ext[1]
@@ -486,6 +492,7 @@ module Enumerable
 				values = [values[1], values[2], cur, values[3]]
 			end
 		end
+		values = values.filter(&:finite?)
 		diff = values.max-values.min
 		if 0 < diff
 			th = max - diff*opt.fib_ext[1]

data/lib/mgmg/utils.rb

@@ -166,6 +166,7 @@ module Mgmg
 		end
 	end
 	module_function def invexp2(exp, comp)
+		raise ArgumentError, "exp must be finite" unless exp.finite?
 		begin
 			ret = Math.sqrt(exp - (2*((comp-1)**2)) - 3).floor + 2
 		rescue Math::DomainError
@@ -178,6 +179,7 @@ module Mgmg
 		end
 	end
 	module_function def invexp2c(exp, s)
+		raise ArgumentError, "exp must be finite" unless exp.finite?
 		begin
 			ret = Math.sqrt((exp - (((s-1)**2)) - 3).quo(2)).floor + 2
 		rescue Math::DomainError
@@ -190,6 +192,7 @@ module Mgmg
 		end
 	end
 	module_function def invexp3(exp, sa, comp)
+		raise ArgumentError, "exp must be finite" unless exp.finite?
 		return invexp2(exp, comp) if sa < 0
 		begin
 			ret = Math.sqrt(exp - ((sa-1)**2) - (2*((comp-1)**2)) - 4).floor + 2
@@ -203,6 +206,7 @@ module Mgmg
 		end
 	end
 	module_function def invexp3c(exp, smith, armor)
+		raise ArgumentError, "exp must be finite" unless exp.finite?
 		if smith < 0
 			return invexp2c(exp, armor)
 		elsif armor < 0

data/lib/mgmg/version.rb

@@ -1,3 +1,3 @@
 module Mgmg
-	VERSION = "1.8.1"
+	VERSION = "1.8.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mgmg
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.2
 platform: ruby
 authors:
 - KAZOON
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-11-19 00:00:00.000000000 Z
+date: 2022-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler