mgmg 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c14a55ea3bffa94e0b9aa9e65a7a5013d34d8bec62179baae302dabdd150f08
-  data.tar.gz: db35e0738dc57da24e132bacea2cd30a1040d6dc563449ce3b3b8b19a62fa0ae
+  metadata.gz: 79211ca6cd5422500f7dc957eadfb2c1812459c98fd39b84fc9a3ebf178174ec
+  data.tar.gz: efa0254194363114aee22993e78cab9359e9a7c92f454d5fffc12b1d14368e6c
 SHA512:
-  metadata.gz: 475431bc7166ad3c18fb60aec3fb921e43a2987086caf357ab20de75b085da125df70941c4810e06094f3b859c8480258dae41a89b29a46562cb3a4510016aa5
-  data.tar.gz: a4466773b3f3f77e9636b4ab5fa46934ec3781f8d088e889c39dbb72f45e79c5a7217dbb15b79767e067283bf30425449f28804a1794b591bbbef07669ed8749
+  metadata.gz: 822a754eeeec7b9b9e8d6f1497041c153a56b62d190da8101f798e9b78334cc64406f35167623387c346b9f2453027a7e17a3ebaefc2ec4d38cbfcbe381b01e6
+  data.tar.gz: f43028c621ea4025123c1ca338f46c8965d545a8f6a92569cc5bb7f5279d11ea01be0dbe6453c1ffe06c831c55be1cdf439ed66b81fa8e08a4d01ac994348e5f

data/CHANGELOG.md

@@ -184,3 +184,8 @@
 - `Mgmg.#find_upperbound`のアルゴリズムに誤りがあり，大きく間違えた解を返していた問題を修正．
 - `Mgmg::IR#attack`等において，引数が`nil`(製作Lvを指定せず，多項式を返す)の場合に，例外となっていたバグを修正．
 - オブション`smith/armor/comp_max`のデフォルト値を10^9に変更．
+
+## 1.8.0 2022/11/14
+- オプション`comp_ext`を`fib_ext`に変更し，追加探索の範囲を修正．
+- オプション`smith/armor/comp_max`の扱い方を修正し，デフォルト値を10^5に変更．
+- `Enumerable#find_max`，`Mgmg.#find_lowerbound`のバグを修正．

data/lib/mgmg/option.rb

@@ -2,13 +2,13 @@ module Mgmg
 	class Option
 		Defaults = {
 			left_associative: true, include_system_equips: true,
-			smith_max: 1_000_000_000, armor_max: 1_000_000_000, comp_max: 1_000_000_000,
-			comp_ext: [0.1, 100, 10_000, 0.1]
+			smith_max: 100_000, armor_max: 100_000, comp_max: 100_000,
+			fib_ext: [4, 10]
 		}
 		def initialize(
 			left_associative: Defaults[:left_associative],
 			smith_min: nil, armor_min:nil, comp_min: nil, smith_max: Defaults[:smith_max], armor_max: Defaults[:armor_max], comp_max: Defaults[:comp_max],
-			comp_ext: Defaults[:comp_ext],
+			fib_ext: Defaults[:fib_ext],
 			magdef_maximize: true,
 			target_weight: 0, reinforcement: [], buff: nil,
 			irep: nil, cut_exp: Float::INFINITY,
@@ -21,7 +21,7 @@ module Mgmg
 			@smith_max = smith_max
 			@armor_max = armor_max
 			@comp_max = comp_max
-			@comp_ext = comp_ext
+			@fib_ext = fib_ext
 			@magdef_maximize = magdef_maximize
 			@target_weight = target_weight
 			@reinforcement = reinforcement
@@ -37,7 +37,7 @@ module Mgmg
 			@include_system_equips = include_system_equips
 			@system_equips_checked = false
 		end
-		attr_accessor :left_associative, :smith_min, :armor_min, :comp_min, :smith_max, :armor_max, :comp_max, :comp_ext
+		attr_accessor :left_associative, :smith_min, :armor_min, :comp_min, :smith_max, :armor_max, :comp_max, :fib_ext
 		attr_accessor :magdef_maximize, :target_weight, :reinforcement, :irep, :cut_exp, :include_system_equips, :system_equips_checked
 		def initialize_copy(other)
 			@left_associative = other.left_associative
@@ -47,7 +47,7 @@ module Mgmg
 			@smith_max = other.smith_max
 			@armor_max = other.armor_max
 			@comp_max = other.comp_max
-			@comp_ext = other.comp_ext
+			@fib_ext = other.fib_ext.dup
 			@magdef_maximize = other.magdef_maximize
 			@target_weight = other.target_weight
 			@reinforcement = other.reinforcement.dup

data/lib/mgmg/search.rb

@@ -34,7 +34,7 @@ class String
 		if target <= opt.irep.para_call(para, smith, opt.comp_min)
 			return opt.comp_min
 		elsif opt.irep.para_call(para, smith, opt.comp_max) < target
-			raise Mgmg::SearchCutException
+			raise Mgmg::SearchCutException, "given comp_max=#{opt.comp_max} does not satisfies the target"
 		end
 		while 1 < opt.comp_max - opt.comp_min do
 			comp = (opt.comp_max - opt.comp_min).div(2) + opt.comp_min
@@ -71,7 +71,12 @@ class String
 	def search(para, target, opt: Mgmg::Option.new)
 		opt = opt.dup.set_default(self)
 		opt_nocut = opt.dup; opt_nocut.cut_exp = Float::INFINITY
-		opt.comp_min = comp_search(para, target, opt.smith_max, opt:)
+		begin
+			opt.comp_min = comp_search(para, target, opt.smith_max, opt:)
+		rescue Mgmg::SearchCutException
+			foo = opt.irep.para_call(para, opt.smith_max, opt.comp_max)
+			raise Mgmg::SearchCutException, "#{self} could not reach target=#{target} until (smith_max, comp_max)=(#{opt.smith_max}, #{opt.comp_max}), which yields #{foo.comma3}"
+		end
 		opt.smith_max = smith_search(para, target, opt.comp_min, opt: opt_nocut)
 		opt.smith_min = smith_search(para, target, opt.comp_max, opt: opt_nocut)
 		raise Mgmg::SearchCutException if opt.cut_exp < Mgmg.exp(opt.smith_min, opt.comp_min)
@@ -104,7 +109,8 @@ class String
 			end
 		end
 		exp_best = opt.cut_exp
-		opt.cut_exp = exp_best + (exp_best*opt.comp_ext[0]).to_i.clamp(opt.comp_ext[1], opt.comp_ext[2])
+		diff = values.max-values.min
+		opt.cut_exp = exp_best + diff*opt.fib_ext[0]
 		(comps[0]-1).downto(opt.comp_min) do |comp|
 			exp_best, ret = fine(exp_best, ret, para, target, comp, opt, eo)
 		rescue Mgmg::SearchCutException
@@ -170,7 +176,8 @@ class String
 				values = [values[1], values[2], cur, values[3]]
 			end
 		end
-		th = max - (max*opt.comp_ext[3]).ceil
+		diff = values.max-values.min
+		th = max - diff*opt.fib_ext[1]
 		(comps[0]-1).downto(opt.comp_min) do |comp|
 			next if ( eo & (2**(comp&1)) == 0 )
 			cur, smith = eval_comp_fm(para, comp, eo, opt, max, max_exp)
@@ -292,7 +299,7 @@ module Enumerable
 		if target <= opt.irep.para_call(para, smith, armor, opt.comp_min)
 			return opt.comp_min
 		elsif opt.irep.para_call(para, smith, armor, opt.comp_max) < target
-			raise ArgumentError, "given comp_max=#{opt.comp_max} does not satisfies the target"
+			raise Mgmg::SearchCutException, "given comp_max=#{opt.comp_max} does not satisfies the target"
 		end
 		while 1 < opt.comp_max - opt.comp_min do
 			comp = (opt.comp_max - opt.comp_min).div(2) + opt.comp_min
@@ -304,152 +311,6 @@ module Enumerable
 		end
 		opt.comp_max
 	end
-	private def eval_comp_a(para, target, comp, opt, eo)
-		return [nil, Float::INFINITY] if (comp < opt.comp_min or opt.comp_max < comp)
-		comp -= 1 if ( opt.comp_min<comp  and eo & (2**(comp&1)) == 0 )
-		armor = armor_search(para, target, -1, comp, opt:)
-		exp = Mgmg.exp(armor, comp)
-		[[-1, armor, comp], exp]
-	rescue Mgmg::SearchCutException
-		[nil, Float::INFINITY]
-	end
-	private def fine_a(exp_best, ret, para, target, comp, opt, eo)
-		return [exp_best, ret] if eo & (2**(comp&1)) == 0
-		armor = armor_search(para, target, -1, comp, opt:)
-		exp = Mgmg.exp(armor, comp)
-		if exp < exp_best
-			exp_best, ret = exp, [-1, armor, comp]
-		elsif exp == exp_best
-			if ret.nil? or opt.irep.para_call(para, *ret) < opt.irep.para_call(para, -1, armor, comp) then
-				ret = [-1, armor, comp]
-			end
-		end
-		[exp_best, ret]
-	end
-	private def search_aonly(para, target, opt: Mgmg::Option.new)
-		opt_nocut = opt.dup; opt_nocut.cut_exp = Float::INFINITY
-		opt.armor_max = armor_search(para, target, -1, opt.comp_min, opt: opt_nocut)
-		opt.armor_min = armor_search(para, target, -1, opt.comp_max, opt: opt_nocut)
-		raise Mgmg::SearchCutException if opt.cut_exp < Mgmg.exp(opt.armor_min, opt.comp_min)
-		opt.comp_max = comp_search(para, target, -1, opt.armor_min, opt:)
-		ret = nil
-		exp = Mgmg.exp(opt.armor_min, opt.comp_max)
-		opt.cut_exp, ret = exp, [-1, opt.armor_min, opt.comp_max] if exp <= opt.cut_exp
-		exp = Mgmg.exp(opt.armor_max, opt.comp_min)
-		opt.cut_exp, ret = exp, [-1, opt.armor_max, opt.comp_min] if ( exp < opt.cut_exp || (ret.nil? && exp==opt.cut_exp) )
-		eo = opt.irep.eo_para(para)
-		comps = Mgmg.fib_init(opt.comp_min, opt.comp_max)
-		values = comps.map do |comp|
-			r, e = eval_comp_a(para, target, comp, opt_nocut, eo)
-			opt.cut_exp, ret = e, r if e < opt.cut_exp
-			e
-		end
-		while 3 < comps[3]-comps[0]
-			if values[1] <= values[2]
-				comp = comps[0] + comps[2]-comps[1]
-				comps = [comps[0], comp, comps[1], comps[2]]
-				r, e = eval_comp_a(para, target, comp, opt_nocut, eo)
-				opt.cut_exp, ret = e, r if e < opt.cut_exp
-				values = [values[0], e, values[1], values[2]]
-			else
-				comp = comps[1] + comps[3]-comps[2]
-				comps = [comps[1], comps[2], comp, comps[3]]
-				r, e = eval_comp_a(para, target, comp, opt_nocut, eo)
-				opt.cut_exp, ret = e, r if e < opt.cut_exp
-				values = [values[1], values[2], e, values[3]]
-			end
-		end
-		exp_best = opt.cut_exp
-		opt.cut_exp = exp_best + (exp_best*opt.comp_ext[0]).to_i.clamp(opt.comp_ext[1], opt.comp_ext[2])
-		(comps[0]-1).downto(opt.comp_min) do |comp|
-			exp_best, ret = fine_a(exp_best, ret, para, target, comp, opt, eo)
-		rescue Mgmg::SearchCutException
-			break
-		end
-		(comps[3]+1).upto(opt.comp_max) do |comp|
-			exp_best, ret = fine_a(exp_best, ret, para, target, comp, opt, eo)
-		rescue Mgmg::SearchCutException
-			break
-		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}"
-		end
-		ret
-	end
-	private def eval_comp_s(para, target, comp, opt, eo)
-		return [nil, Float::INFINITY] if (comp < opt.comp_min or opt.comp_max < comp)
-		comp -= 1 if ( opt.comp_min<comp  and eo & (2**(comp&1)) == 0 )
-		smith = smith_search(para, target, -1, comp, opt:)
-		exp = Mgmg.exp(smith, comp)
-		[[smith, -1, comp], exp]
-	rescue Mgmg::SearchCutException
-		[nil, Float::INFINITY]
-	end
-	private def fine_s(exp_best, ret, para, target, comp, opt, eo)
-		return [exp_best, ret] if eo & (2**(comp&1)) == 0
-		smith = smith_search(para, target, -1, comp, opt:)
-		exp = Mgmg.exp(smith, comp)
-		if exp < exp_best
-			exp_best, ret = exp, [smith, -1, comp]
-		elsif exp == exp_best
-			if ret.nil? or opt.irep.para_call(para, *ret) < opt.irep.para_call(para, smith, -1, comp) then
-				ret = [smith, -1, comp]
-			end
-		end
-		[exp_best, ret]
-	end
-	private def search_sonly(para, target, opt: Mgmg::Option.new)
-		opt_nocut = opt.dup; opt_nocut.cut_exp = Float::INFINITY
-		opt.smith_max = smith_search(para, target, -1, opt.comp_min, opt: opt_nocut)
-		opt.smith_min = smith_search(para, target, -1, opt.comp_max, opt: opt_nocut)
-		raise Mgmg::SearchCutException if opt.cut_exp < Mgmg.exp(opt.smith_min, opt.comp_min)
-		opt.comp_max = comp_search(para, target, opt.smith_min, -1, opt:)
-		ret = nil
-		exp = Mgmg.exp(opt.smith_min, opt.comp_max)
-		opt.cut_exp, ret = exp, [opt.smith_min, -1, opt.comp_max] if exp <= opt.cut_exp
-		exp = Mgmg.exp(opt.smith_max, opt.comp_min)
-		opt.cut_exp, ret = exp, [opt.smith_max, -1, opt.comp_min] if ( exp < opt.cut_exp || (ret.nil? && exp==opt.cut_exp) )
-		eo = opt.irep.eo_para(para)
-		comps = Mgmg.fib_init(opt.comp_min, opt.comp_max)
-		values = comps.map do |comp|
-			r, e = eval_comp_s(para, target, comp, opt_nocut, eo)
-			opt.cut_exp, ret = e, r if e < opt.cut_exp
-			e
-		end
-		while 3 < comps[3]-comps[0]
-			if values[1] <= values[2]
-				comp = comps[0] + comps[2]-comps[1]
-				comps = [comps[0], comp, comps[1], comps[2]]
-				r, e = eval_comp_s(para, target, comp, opt_nocut, eo)
-				opt.cut_exp, ret = e, r if e < opt.cut_exp
-				values = [values[0], e, values[1], values[2]]
-			else
-				comp = comps[1] + comps[3]-comps[2]
-				comps = [comps[1], comps[2], comp, comps[3]]
-				r, e = eval_comp_s(para, target, comp, opt_nocut, eo)
-				opt.cut_exp, ret = e, r if e < opt.cut_exp
-				values = [values[1], values[2], e, values[3]]
-			end
-		end
-		exp_best = opt.cut_exp
-		opt.cut_exp = exp_best + (exp_best*opt.comp_ext[0]).to_i.clamp(opt.comp_ext[1], opt.comp_ext[2])
-		(comps[0]-1).downto(opt.comp_min) do |comp|
-			exp_best, ret = fine_s(exp_best, ret, para, target, comp, opt, eo)
-		rescue Mgmg::SearchCutException
-			break
-		end
-		(comps[3]+1).upto(opt.comp_max) do |comp|
-			exp_best, ret = fine_s(exp_best, ret, para, target, comp, opt, eo)
-		rescue Mgmg::SearchCutException
-			break
-		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}"
-		end
-		ret
-	end
 	private def eval_comp_sa(para, target, comp, opt, eo)
 		return [nil, Float::INFINITY] if (comp < opt.comp_min or opt.comp_max < comp)
 		comp -= 1 if ( opt.comp_min<comp  and eo & (2**(comp&1)) == 0 )
@@ -474,10 +335,15 @@ module Enumerable
 	end
 	def search(para, target, opt: Mgmg::Option.new)
 		opt = opt.dup.set_default(self)
-		opt.comp_min = comp_search(para, target, opt.smith_max, opt.armor_max, opt:)
+		begin
+			opt.comp_min = comp_search(para, target, opt.smith_max, opt.armor_max, opt:)
+		rescue Mgmg::SearchCutException
+			foo = opt.irep.para_call(para, opt.smith_max, opt.armor_max, opt.comp_max)
+			raise Mgmg::SearchCutException, "#{self} could not reach target=#{target} until (smith_max, armor_max, comp_max)=(#{opt.smith_max}, #{opt.armor_max}, #{opt.comp_max}), which yields #{foo.comma3}"
+		end
 		opt_nocut = opt.dup; opt_nocut.cut_exp = Float::INFINITY
-		opt.smith_max = smith_search(para, target, opt.armor_min, opt.comp_min, opt: opt_nocut) rescue ( return search_aonly(para, target, opt:) )
-		opt.armor_max = armor_search(para, target, opt.smith_min, opt.comp_min, opt: opt_nocut) rescue ( return search_sonly(para, target, opt:) )
+		opt.smith_max = smith_search(para, target, opt.armor_min, opt.comp_min, opt: opt_nocut) rescue ( opt.smith_max )
+		opt.armor_max = armor_search(para, target, opt.smith_min, opt.comp_min, opt: opt_nocut) rescue ( opt.armor_max )
 		opt.smith_min = smith_search(para, target, opt.armor_max, opt.comp_max, opt: opt_nocut)
 		opt.armor_min = armor_search(para, target, opt.smith_max, opt.comp_max, opt: opt_nocut)
 		raise Mgmg::SearchCutException if opt.cut_exp < Mgmg.exp(opt.smith_min, opt.armor_min, opt.comp_min)
@@ -507,7 +373,8 @@ module Enumerable
 			end
 		end
 		exp_best = opt.cut_exp
-		opt.cut_exp = exp_best + (exp_best*opt.comp_ext[0]).to_i.clamp(opt.comp_ext[1], opt.comp_ext[2])
+		diff = values.max-values.min
+		opt.cut_exp = exp_best + diff*opt.fib_ext[0]
 		(comps[0]-1).downto(opt.comp_min) do |comp|
 			exp_best, ret = fine_sa(exp_best, ret, para, target, comp, opt, eo)
 		rescue Mgmg::SearchCutException
@@ -539,13 +406,15 @@ module Enumerable
 	end
 	private def eval_arm(para, armor, comp, eo, opt, ret, max, max_exp)
 		smith = Mgmg.invexp3(max_exp, armor, comp)
+		exp = Mgmg.exp(smith, armor, comp)
+		return [-Float::INFINITY, ret, max] if max_exp < exp
 		cur = opt.irep.para_call(para, smith, armor, comp)
 		smith = minimize_smith(para, smith, armor, comp, cur, opt) if max <= cur
-		ret, max = [smith, armor, comp], cur if ( max < cur || ( max == cur && Mgmg.exp(smith, armor, comp) < Mgmg.exp(*ret) ) )
+		ret, max = [smith, armor, comp], cur if ( max < cur || ( max == cur && exp < Mgmg.exp(*ret) ) )
 		[cur, ret, max]
 	end
 	private def eval_comp_fm(para, comp, eo, opt, ret, max, max_exp)
-		return [-Float::INFINITY, Float::INFINITY, max] if (comp < opt.comp_min or opt.comp_max < comp)
+		return [-Float::INFINITY, ret, max] if (comp < opt.comp_min or opt.comp_max < comp)
 		comp -= 1 if ( opt.comp_min<comp and ( eo & (2**(comp&1)) == 0 ) )
 		cur = -Float::INFINITY
 		a_max = [opt.armor_max, Mgmg.invexp3(max_exp, opt.smith_min, comp)].min
@@ -569,7 +438,8 @@ module Enumerable
 				cur = cur_i if cur < cur_i
 			end
 		end
-		th = max - (max*opt.comp_ext[3]).ceil
+		diff = a_vals.max-a_vals.min
+		th = max - diff*opt.fib_ext[1]
 		(arms[0]-1).downto(opt.armor_min) do |armor|
 			cur_i, ret, max = eval_arm(para, armor, comp, eo, opt, ret, max, max_exp)
 			break if cur_i < th
@@ -608,7 +478,8 @@ module Enumerable
 				values = [values[1], values[2], cur, values[3]]
 			end
 		end
-		th = max - (max*opt.comp_ext[3]).ceil
+		diff = values.max-values.min
+		th = max - diff*opt.fib_ext[1]
 		(comps[0]-1).downto(opt.comp_min) do |comp|
 			next if ( eo & (2**(comp&1)) == 0 )
 			cur, ret, max = eval_comp_fm(para, comp, eo, opt, ret, max, max_exp)
@@ -670,28 +541,27 @@ module Mgmg
 			loop do
 				foo = a.find_max(para, eb, opt: opt_a)
 				break if sca == foo
-				sca, pa = foo, opt_a.irep.para_call(para, *foo)
+				bar = opt_a.irep.para_call(para, *foo)
+				break if bar < pa
+				sca, pa = foo, bar
 				scb = b.search(para, pa, opt: opt_b)
 				foo = Mgmg.exp(*scb)
 				break if eb == foo
 				eb = foo
 			end
 			ea = Mgmg.exp(*sca)
-			while ea<=eb
-				tag = pa + Eighth
-				raise Mgmg::SearchCutException, "given recipes are never reversed from start target=#{start.comma3} until term target=#{term.comma3}" if term < tag
-				sca, scb = a.search(para, tag, opt: opt_a), b.search(para, tag, opt: opt_b)
-				ea, eb = Mgmg.exp(*sca), Mgmg.exp(*scb)
-				pa, pb = opt_a.irep.para_call(para, *sca), opt_b.irep.para_call(para, *scb)
-				break if ea == eb && pa < pb
-			end
-			if eb < ea || ( ea == eb && pa < pb )
+			if (eb <= ea and pa <= pb and (eb+pa)!=(ea+pb)) or (eb < ea and sca == a.search(para, pb, opt: opt_a)) then
 				until ea < eb || ( ea == eb && pb < pa )
 					sca = a.find_max(para, ea-1, opt: opt_a)
 					ea, pa = Mgmg.exp(*sca), opt_a.irep.para_call(para, *sca)
 				end
 				return [pa, pb]
 			end
+			tag = pa + Eighth
+			raise Mgmg::SearchCutException, "given recipes are never reversed from start target=#{start.comma3} until term target=#{term.comma3}" if term < tag
+			sca, scb = a.search(para, tag, opt: opt_a), b.search(para, tag, opt: opt_b)
+			ea, eb = Mgmg.exp(*sca), Mgmg.exp(*scb)
+			pa, pb = opt_a.irep.para_call(para, *sca), opt_b.irep.para_call(para, *scb)
 		end
 		raise UnexpectedError
 	end

data/lib/mgmg/version.rb

@@ -1,3 +1,3 @@
 module Mgmg
-	VERSION = "1.7.0"
+	VERSION = "1.8.0"
 end

data/reference.md

@@ -130,9 +130,9 @@
 `opt`は，`comp_min`，`comp_max`，`left_associative`，`reinforcement`，`irep`を使用します．
 
 ## `String#search(para, target, opt: Mgmg.option())`
-合計経験値が最小となる鍛冶・防具製作Lvと道具製作Lvの組を探索します．道具製作Lvを決定変数として，`smith_search`の返り値との合計経験値を最小化する道具製作Lvをフィボナッチ探索で探索した後，得られた解 c の前後を探索し，最適化します．道具製作Lv c における合計経験値`exp`に対して，`exp+(exp*opt.comp_ext[0]).to_i.clamp(opt.comp_ext[1], opt.comp_ext[2])`を超えない範囲を探索します．この目的関数は単峰ではないため，フィボナッチ探索のみでは最適解が得られないことがあります．
+合計経験値が最小となる鍛冶・防具製作Lvと道具製作Lvの組を探索します．道具製作Lvを決定変数として，`smith_search`の返り値との合計経験値を最小化する道具製作Lvをフィボナッチ探索で探索した後，得られた解 c の前後を探索し，最適化します．このとき，道具製作Lv c における合計経験値`exp`，及びフィボナッチ探索で得られた最後の4点の経験値の最大値`exp2`に対して，`exp+(exp2-exp)*opt.fib_ext[0]`を超えない範囲を探索します．この目的関数は単峰ではないため，フィボナッチ探索のみでは最適解が得られないことがあります．
 
-その他は`String#smith_seach`と同様で，`opt`は，`String#smith_search`または`String#comp_search`で使われるすべてのパラメータと，`comp_ext`を使用します．
+その他は`String#smith_seach`と同様で，`opt`は，`String#smith_search`または`String#comp_search`で使われるすべてのパラメータと，`fib_ext`を使用します．
 
 ## `Enumerable#search(para, target, opt: Mgmg.option())`
 複数装備の組について，`para`の値が`target`以上となる最小経験値の`[鍛冶Lv，防具製作Lv，道具製作Lv]`を返します．
@@ -145,7 +145,7 @@
 ## `String#find_max(para, max_exp, opt: Mgmg.option())`
 経験値の合計が`max_exp`以下の範囲で，`para`の値が最大となる鍛冶・防具製作Lvと道具製作Lvからなる配列を返します．`para`の値が最大となる組が複数存在する場合，経験値が小さい方が優先されます．
 
-`String#search`と同様に，道具製作Lvをフィボナッチ探索で探索した後，得られた解 c の前後を探索し，最適化します．道具製作Lv c における最大の`para`値`p_c`に対して，`p_c-(p_c*opt.comp_ext[3]).ceil`を下回らない範囲を探索します．
+`String#search`と同様に，道具製作Lvをフィボナッチ探索で探索した後，得られた解 c の前後を探索し，最適化します．道具製作Lv c における最大の`para`値`p_c`，及びフィボナッチ探索で得られた最後の4点の`para`値の最小値`p_min`に対して，`p_c-(p_c-p_min)*opt.fib_ext[1]`を下回らない範囲を探索します．
 
 ## `Enumerable#find_max(para, max_exp, opt: Mgmg.option())`
 複数装備の組について，経験値の合計が`max_exp`以下の範囲で，`para`の値が最大となる鍛冶Lv，防具製作Lv，道具製作Lvからなる配列を返します．`para`の値が最大となる組が複数存在する場合，経験値が小さい方が優先されます．
@@ -454,8 +454,8 @@ alias として`*`があるほか`scalar(1.quo(value))`として`quo`，`/`，`s
 |smith_min|`recipe.min_level(target_weight)`|非対応|鍛冶Lvに関する探索範囲の最小値|`String#search`など|
 |armor_min|`recipe.min_level(*target_weight)[1]`|非対応|防具製作Lvに関する探索範囲の最小値|`Enumerable#search`など．`String`系では代わりに`smith_min`を使う|
 |comp_min|`recipe.min_comp`|非対応|道具製作Lvに関する探索範囲の最小値|`String#search`など|
-|smith_max, armor_max, comp_max|`1_000_000_000`|対応|各製作Lvの探索範囲の最大値|`String#search`など|
-|comp_ext|`[0.1, 100, 10_000, 0.1]`|対応|フィボナッチ探索後に追加探索を行う範囲|`String#search`など|
+|smith_max, armor_max, comp_max|`100_000`|対応|各製作Lvの探索範囲の最大値|`String#search`など|
+|fib_ext|`[4, 10]`|対応|フィボナッチ探索後に追加探索を行う範囲|`String#search`など|
 |target_weight|`0`|非対応|`smith_min`のデフォルト値計算に使う目標重量|`String#search`など|
 |magdef_maximize|`true`|非対応|目標を魔防最大(真)かコスト最小(偽)にするためのスイッチ|`String#phydef_optimize`|
 |reinforcement|`[]`|非対応|[前述](#mgmgequipreinforcearg)の`Mgmg::Equip#reinforce`による強化リスト|一部を除くすべてのメソッド|

metadata

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