mgmg 1.6.2 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0aee0bc2d348dfc0e23ce8556cea710f7645b6a590145f67bc1d5715b8c999a1
-  data.tar.gz: eed968af79443fabb9b65e931b93079a5dd8c839af6ea0b6f84a62c1ad411eda
+  metadata.gz: 0c14a55ea3bffa94e0b9aa9e65a7a5013d34d8bec62179baae302dabdd150f08
+  data.tar.gz: db35e0738dc57da24e132bacea2cd30a1040d6dc563449ce3b3b8b19a62fa0ae
 SHA512:
-  metadata.gz: 218e8c123428a6ec6228c1d296973c8ec01ba77d09430c3e33e49df081364b2e3e295b4f02a480b5349a709dd26e955e8472852e872ba73dd87b2044ec690904
-  data.tar.gz: 1c9db46a5f5fe0fdcb76bc0fbeab261414e2d9df4661d3dfe91f137ab066e739584170695fc58868d5d64e1ddec578866a90fd9291c9a47eca31f3cfafab915d
+  metadata.gz: 475431bc7166ad3c18fb60aec3fb921e43a2987086caf357ab20de75b085da125df70941c4810e06094f3b859c8480258dae41a89b29a46562cb3a4510016aa5
+  data.tar.gz: a4466773b3f3f77e9636b4ab5fa46934ec3781f8d088e889c39dbb72f45e79c5a7217dbb15b79767e067283bf30425449f28804a1794b591bbbef07669ed8749

data/CHANGELOG.md

@@ -177,3 +177,10 @@
 
 ## 1.6.2 2022/10/31
 - 既製品を含むかどうかのチェックを行った場合，同じレシピについては繰り返しチェックしないようにして高速化した．
+
+## 1.7.0 2022/11/12
+- オプション`step`を廃止し，レシピに応じて自動的に無駄な探索を省略するように変更．
+- `String/Enumerable#search/find_max`において，フィボナッチ探索を用いたアルゴリズムに変更．単峰でないため，オプション`comp_ext`を使って追加の探索を行い，取りこぼしを避ける．
+- `Mgmg.#find_upperbound`のアルゴリズムに誤りがあり，大きく間違えた解を返していた問題を修正．
+- `Mgmg::IR#attack`等において，引数が`nil`(製作Lvを指定せず，多項式を返す)の場合に，例外となっていたバグを修正．
+- オブション`smith/armor/comp_max`のデフォルト値を10^9に変更．

data/lib/mgmg/ir.rb

@@ -67,9 +67,9 @@ module Mgmg
 					ms
 				else
 					if ms == '0'
-						"[[#{ss}[(c+#{@equip9})/2]/100]/#{@den}]"
+						"[[#{ss}[(c+#{@equip9})/2]/100](#{@coef})/#{@den}]"
 					else
-						"#{ms}+[[#{ss}[(c+#{@equip9})/2]/100]/#{@den}]"
+						"#{ms}+[[#{ss}[(c+#{@equip9})/2]/100](#{@coef})/#{@den}]"
 					end
 				end
 			end
@@ -136,8 +136,46 @@ module Mgmg
 				end
 			end
 		end
-		def initialize(kind, star, main_m, sub_m, para, rein=[])
-			@kind, @star, @main, @sub, @para = kind, star, main_m, sub_m, para
+		class Reined
+			def initialize(body, rein)
+				@body, @rein = body, rein
+			end
+			attr_accessor :body, :rein
+			def initialize_copy(other)
+				@body, @rein = other.body.dup, other.rein.dup
+			end
+			def evaluate(s, c)
+				ret = @body.evaluate(s, c)
+				@rein.each do |r|
+					if r != 0
+						ret *= (100+r).quo(100)
+					end
+				end
+				ret
+			end
+			def evaluate3(s, a, c)
+				ret = @body.evaluate3(s, a, c)
+				@rein.each do |r|
+					if r != 0
+						ret *= (100+r).quo(100)
+					end
+				end
+				ret
+			end
+			def to_s
+				ret = @body.to_s
+				buff = ''
+				@rein.each do |r|
+					if r != 0
+						buff += "(#{100+r}/100)"
+					end
+				end
+				ret = '('+ret+')'+buff unless buff.empty?
+				ret
+			end
+		end
+		def initialize(kind, star, main_m, sub_m, para, eo, rein=[])
+			@kind, @star, @main, @sub, @para, @eo = kind, star, main_m, sub_m, para, eo
 			add_reinforcement(rein)
 		end
 		def add_reinforcement(rein)
@@ -150,13 +188,14 @@ module Mgmg
 			end
 			self
 		end
-		attr_accessor :kind, :star, :main, :sub, :para, :rein
+		attr_accessor :kind, :star, :main, :sub, :para, :eo, :rein
 		def initialize_copy(other)
 			@kind = other.kind
 			@star = other.star.dup
 			@main = other.main
 			@sub = other.sub
 			@para = other.para.dup
+			@eo = other.eo.dup
 			@rein = other.rein.dup
 		end
 		
@@ -182,11 +221,41 @@ module Mgmg
 			end
 		end
 		
+		def eo_para(para)
+			case para
+			when :atkstr
+				self.class.eo_add(eo_para(:attack), eo_para(:str))
+			when :atk_sd
+				self.class.eo_add(self.class.eo_add(eo_para(:attack), eo_para(:str)), eo_para(:dex))
+			when :dex_as
+				self.class.eo_add(self.class.eo_add(eo_para(:dex), eo_para(:attack)), eo_para(:str))
+			when :mag_das
+				self.class.eo_add(eo_para(:magic), eo_para(:dex_as))
+			when :magic2
+				eo_para(:magic)
+			when :magmag
+				self.class.eo_add(eo_para(:magdef), eo_para(:magic))
+			when :pmdef
+				self.class.eo_add(eo_para(:phydef), eo_para(:magmag))
+			when :hs
+				self.class.eo_add(eo_para(:hp), eo_para(:str))
+			when :cost
+				ret = nil
+				@eo.each do |foo|
+					ret = self.class.eo_add(ret, foo)
+				end
+				ret
+			else
+				@eo[%i|attack phydef magdef hp mp str dex speed magic|.index(para)]
+			end
+		end
+		
 		%i|attack phydef magdef hp mp str dex speed magic|.each.with_index do |sym, i|
 			define_method(sym) do |s=nil, ac=s, x=nil|
-				ret = if s.nil?
-					@para[i]
-				elsif x.nil?
+				if s.nil?
+					return Reined.new(@para[i], @rein.map{|r| r.vec[i]})
+				end
+				ret = if x.nil?
 					@para[i].evaluate(s, ac)
 				else
 					@para[i].evaluate3(s, ac, x)
@@ -312,12 +381,15 @@ module Mgmg
 			@para = Array.new(9) do |i|
 				Multi.sum(self.para[i], other.para[i])
 			end
+			@eo.map!.with_index do |seo, i|
+				self.class.eo_add(seo, other.eo[i])
+			end
 			self
 		end
 		def +(other)
 			self.dup.add!(other)
 		end
-		Zero = self.new(28, Vec.new(6, 0).freeze, 12, 12, Array.new(9){Const.new(0)}.freeze)
+		Zero = self.new(28, Vec.new(6, 0).freeze, 12, 12, Array.new(9){Const.new(0)}.freeze, Array.new(9, nil).freeze)
 		Zero.rein.freeze; Zero.freeze
 		
 		class << self
@@ -368,7 +440,15 @@ module Mgmg
 					end
 				end
 				
-				new(main_k, main_s+sub_s, main_sub, sub_main, para)
+				eo = Array.new(9) do |i|
+					if EquipFilter[main_k][i] == 0
+						main.eo[i]
+					else
+						eo_add(main.eo[i], eo_mul(2**(Equip9[main_k][i]&1), sub.eo[i]))
+					end
+				end
+				
+				new(main_k, main_s+sub_s, main_sub, sub_main, para, eo)
 			end
 			def smith(str)
 				str = Mgmg.check_string(str)
@@ -395,7 +475,15 @@ module Mgmg
 					end
 				end
 				
-				ret = new(kind, (main_s+sub_s).div(2), main_mc, sub_mc, para)
+				eo = Array.new(9) do |i|
+					if coef[i] == 0
+						nil
+					else
+						0
+					end
+				end
+				
+				ret = new(kind, (main_s+sub_s).div(2), main_mc, sub_mc, para, eo)
 				Cache.store(str, ret.freeze)
 				ret.dup
 			end
@@ -403,7 +491,33 @@ module Mgmg
 				para = equip.para.map do |value|
 					Mgmg::IR::Const.new(value)
 				end
-				new(equip.kind, equip.star, equip.main, equip.sub, para)
+				eo = equip.para.map do |value|
+					if value == 0
+						nil
+					else
+						0
+					end
+				end
+				new(equip.kind, equip.star, equip.main, equip.sub, para, eo)
+			end
+			
+			def eo_add(eo0, eo1)
+				if eo0
+					if eo1
+						eo0 | eo1
+					else
+						eo0
+					end
+				else
+					eo1
+				end
+			end
+			def eo_mul(eq, seo)
+				if seo
+					eq | seo
+				else
+					nil
+				end
 			end
 		end
 	end

data/lib/mgmg/option.rb

@@ -2,12 +2,14 @@ module Mgmg
 	class Option
 		Defaults = {
 			left_associative: true, include_system_equips: true,
-			smith_max: 10_000, armor_max: 10_000, comp_max: 10_000
+			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]
 		}
 		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],
-			step: 1, magdef_maximize: true,
+			comp_ext: Defaults[:comp_ext],
+			magdef_maximize: true,
 			target_weight: 0, reinforcement: [], buff: nil,
 			irep: nil, cut_exp: Float::INFINITY,
 			include_system_equips: Defaults[:include_system_equips]
@@ -19,7 +21,7 @@ module Mgmg
 			@smith_max = smith_max
 			@armor_max = armor_max
 			@comp_max = comp_max
-			@step = step
+			@comp_ext = comp_ext
 			@magdef_maximize = magdef_maximize
 			@target_weight = target_weight
 			@reinforcement = reinforcement
@@ -35,8 +37,8 @@ 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
-		attr_accessor :step, :magdef_maximize, :target_weight, :reinforcement, :irep, :cut_exp, :include_system_equips, :system_equips_checked
+		attr_accessor :left_associative, :smith_min, :armor_min, :comp_min, :smith_max, :armor_max, :comp_max, :comp_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
 			@smith_min = other.smith_min
@@ -45,7 +47,7 @@ module Mgmg
 			@smith_max = other.smith_max
 			@armor_max = other.armor_max
 			@comp_max = other.comp_max
-			@step = other.step
+			@comp_ext = other.comp_ext
 			@magdef_maximize = other.magdef_maximize
 			@target_weight = other.target_weight
 			@reinforcement = other.reinforcement.dup

data/lib/mgmg/search.rb

@@ -46,6 +46,28 @@ class String
 		end
 		opt.comp_max
 	end
+	private def eval_comp(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, comp, opt:)
+		exp = Mgmg.exp(smith, comp)
+		[[smith, comp], exp]
+	rescue Mgmg::SearchCutException
+		[nil, Float::INFINITY]
+	end
+	private def fine(exp_best, ret, para, target, comp, opt, eo)
+		return [exp_best, ret] if eo & (2**(comp&1)) == 0
+		smith = smith_search(para, target, comp, opt:)
+		exp = Mgmg.exp(smith, comp)
+		if exp < exp_best
+			exp_best, ret = exp, [smith, comp]
+		elsif exp == exp_best
+			if ret.nil? or opt.irep.para_call(para, *ret) < opt.irep.para_call(para, smith, comp) then
+				ret = [smith, comp]
+			end
+		end
+		[exp_best, ret]
+	end
 	def search(para, target, opt: Mgmg::Option.new)
 		opt = opt.dup.set_default(self)
 		opt_nocut = opt.dup; opt_nocut.cut_exp = Float::INFINITY
@@ -59,18 +81,39 @@ class String
 		opt.cut_exp, ret = exp, [opt.smith_min, 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, opt.comp_min] if ( exp < opt.cut_exp || (ret.nil? && exp==opt.cut_exp) )
-		(opt.comp_min+opt.step).step(opt.comp_max-1, opt.step) do |comp|
-			break if opt.cut_exp < Mgmg.exp(opt.smith_min, comp)
-			smith = smith_search(para, target, comp, opt:)
-			exp = Mgmg.exp(smith, comp)
-			if exp < opt.cut_exp
-				opt.cut_exp, ret = exp, [smith, comp]
-			elsif exp == opt.cut_exp
-				if ret.nil? or opt.irep.para_call(para, *ret) < opt.irep.para_call(para, smith, comp) then
-					ret = [smith, comp]
-				end
+		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(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(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(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(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(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:))
@@ -90,17 +133,55 @@ class String
 		end
 		smith
 	end
+	private def eval_comp_fm(para, comp, eo, opt, max, max_exp)
+		return [-Float::INFINITY, 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 = Mgmg.invexp2(max_exp, comp)
+		cur = opt.irep.para_call(para, smith, comp)
+		smith = minimize_smith(para, smith, comp, cur, opt) if max <= cur
+		[cur, smith]
+	end
 	def find_max(para, max_exp, opt: Mgmg::Option.new)
 		opt = opt.dup.set_default(self)
 		exp = Mgmg.exp(opt.smith_min, opt.comp_min)
 		raise Mgmg::SearchCutException, "the recipe requires #{exp.comma3} experiment points, which exceeds given max_exp=#{max_exp.comma3}" if max_exp < exp
 		ret = [Mgmg.invexp2(max_exp, opt.comp_min), opt.comp_min]
 		max = opt.irep.para_call(para, *ret)
-		(opt.comp_min+1).upto(Mgmg.invexp2c(max_exp, opt.smith_min)) do |comp|
-			smith = Mgmg.invexp2(max_exp, comp)
-			cur = opt.irep.para_call(para, smith, comp)
-			smith = minimize_smith(para, smith, comp, cur, opt) if max <= cur
+		eo = opt.irep.eo_para(para)
+		opt.comp_max = Mgmg.invexp2c(max_exp, opt.smith_min)
+		comps = Mgmg.fib_init(opt.comp_min+1, opt.comp_max)
+		values = comps.map do |comp|
+			cur, smith = eval_comp_fm(para, comp, eo, opt, max, max_exp)
 			ret, max = [smith, comp], cur if ( max < cur || ( max == cur && Mgmg.exp(smith, comp) < Mgmg.exp(*ret) ) )
+			cur
+		end
+		while 3 < comps[3]-comps[0]
+			if values[2] <= values[1]
+				comp = comps[0] + comps[2]-comps[1]
+				comps = [comps[0], comp, comps[1], comps[2]]
+				cur, smith = eval_comp_fm(para, comp, eo, opt, max, max_exp)
+				ret, max = [smith, comp], cur if ( max < cur || ( max == cur && Mgmg.exp(smith, comp) < Mgmg.exp(*ret) ) )
+				values = [values[0], cur, values[1], values[2]]
+			else
+				comp = comps[1] + comps[3]-comps[2]
+				comps = [comps[1], comps[2], comp, comps[3]]
+				cur, smith = eval_comp_fm(para, comp, eo, opt, max, max_exp)
+				ret, max = [smith, comp], cur if ( max < cur || ( max == cur && Mgmg.exp(smith, comp) < Mgmg.exp(*ret) ) )
+				values = [values[1], values[2], cur, values[3]]
+			end
+		end
+		th = max - (max*opt.comp_ext[3]).ceil
+		(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)
+			ret, max = [smith, comp], cur if ( max < cur || ( max == cur && Mgmg.exp(smith, comp) < Mgmg.exp(*ret) ) )
+			break if cur < th
+		end
+		(comps[3]+1).upto(opt.comp_max) do |comp|
+			next if ( eo & (2**(comp&1)) == 0 )
+			cur, smith = eval_comp_fm(para, comp, eo, opt, max, max_exp)
+			ret, max = [smith, comp], cur if ( max < cur || ( max == cur && Mgmg.exp(smith, comp) < Mgmg.exp(*ret) ) )
+			break if cur < th
 		end
 		ret
 	end
@@ -223,6 +304,28 @@ 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)
@@ -234,18 +337,39 @@ module Enumerable
 		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) )
-		(opt.comp_min+opt.step).step(opt.comp_max-1, opt.step) do |comp|
-			break if opt.cut_exp < Mgmg.exp(opt.armor_min, comp)
-			armor = armor_search(para, target, -1, comp, opt:)
-			exp = Mgmg.exp(armor, comp)
-			if exp < opt.cut_exp
-				opt.cut_exp, ret = exp, [-1, armor, comp]
-			elsif exp == opt.cut_exp
-				if ret.nil? or opt.irep.para_call(para, *ret) < opt.irep.para_call(para, -1, armor, comp) then
-					ret = [-1, armor, comp]
-				end
+		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:))
@@ -253,6 +377,28 @@ module Enumerable
 		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)
@@ -264,18 +410,39 @@ module Enumerable
 		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) )
-		(opt.comp_min+opt.step).step(opt.comp_max-1, opt.step) do |comp|
-			break if opt.cut_exp < Mgmg.exp(opt.smith_min, comp)
-			smith = smith_search(para, target, -1, comp, opt:)
-			exp = Mgmg.exp(smith, comp)
-			if exp < opt.cut_exp
-				opt.cut_exp, ret = exp, [smith, -1, comp]
-			elsif exp == opt.cut_exp
-				if ret.nil? or opt.irep.para_call(para, *ret) < opt.irep.para_call(para, smith, -1, comp) then
-					ret = [smith, -1, comp]
-				end
+		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:))
@@ -283,6 +450,28 @@ module Enumerable
 		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 )
+		sa = sa_search(para, target, comp, opt:)
+		exp = Mgmg.exp(*sa, comp)
+		[[*sa, comp], exp]
+	rescue Mgmg::SearchCutException
+		[nil, Float::INFINITY]
+	end
+	private def fine_sa(exp_best, ret, para, target, comp, opt, eo)
+		return [exp_best, ret] if eo & (2**(comp&1)) == 0
+		sa = sa_search(para, target, comp, opt:)
+		exp = Mgmg.exp(*sa, comp)
+		if exp < exp_best
+			exp_best, ret = exp, [*sa, comp]
+		elsif exp == exp_best
+			if ret.nil? or opt.irep.para_call(para, *ret) < opt.irep.para_call(para, *sa, comp) then
+				ret = [*sa, comp]
+			end
+		end
+		[exp_best, ret]
+	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:)
@@ -295,18 +484,39 @@ module Enumerable
 		opt.comp_max = comp_search(para, target, opt.smith_min, opt.armor_min, opt:)
 		exp = Mgmg.exp(opt.smith_min, opt.armor_min, opt.comp_max)
 		opt.cut_exp, ret = exp, [opt.smith_min, opt.armor_min,opt. comp_max] if exp <= opt.cut_exp
-		(opt.comp_min).upto(opt.comp_max-1) do |comp|
-			break if opt.cut_exp < Mgmg.exp(opt.smith_min, opt.armor_min, comp)
-			smith, armor = sa_search(para, target, comp, opt:)
-			exp = Mgmg.exp(smith, armor, comp)
-			if exp < opt.cut_exp
-				opt.cut_exp, ret = exp, [smith, armor, comp]
-			elsif exp == opt.cut_exp
-				if ret.nil? or opt.irep.para_call(para, *ret) < opt.irep.para_call(para, smith, armor, comp) then
-					ret = [smith, armor, comp]
-				end
+		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_sa(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_sa(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_sa(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_sa(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_sa(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:))
@@ -327,25 +537,103 @@ module Enumerable
 		end
 		smith
 	end
+	private def eval_arm(para, armor, comp, eo, opt, ret, max, max_exp)
+		smith = Mgmg.invexp3(max_exp, armor, comp)
+		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) ) )
+		[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)
+		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
+		arms = Mgmg.fib_init(opt.armor_min, a_max)
+		a_vals = arms.map do |armor|
+			cur_i, ret, max = eval_arm(para, armor, comp, eo, opt, ret, max, max_exp)
+			cur_i
+		end
+		while 3 < arms[3]-arms[0]
+			if a_vals[2] <= a_vals[1]
+				armor = arms[0] + arms[2]-arms[1]
+				arms = [arms[0], armor, arms[1], arms[2]]
+				cur_i, ret, max = eval_arm(para, armor, comp, eo, opt, ret, max, max_exp)
+				a_vals = [a_vals[0], cur_i, a_vals[1], a_vals[2]]
+				cur = cur_i if cur < cur_i
+			else
+				armor = arms[1] + arms[3]-arms[2]
+				arms = [arms[1], arms[2], armor, arms[3]]
+				cur_i, ret, max = eval_arm(para, armor, comp, eo, opt, ret, max, max_exp)
+				a_vals = [a_vals[1], a_vals[2], cur_i, a_vals[3]]
+				cur = cur_i if cur < cur_i
+			end
+		end
+		th = max - (max*opt.comp_ext[3]).ceil
+		(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
+			cur = cur_i if cur < cur_i
+		end
+		(arms[3]+1).upto(a_max) do |armor|
+			cur_i, ret, max = eval_arm(para, armor, comp, eo, opt, ret, max, max_exp)
+			break if cur_i < th
+			cur = cur_i if cur < cur_i
+		end
+		[cur, ret, max]
+	end
 	def find_max(para, max_exp, opt: Mgmg::Option.new)
 		opt = opt.dup.set_default(self)
 		exp = Mgmg.exp(opt.smith_min, opt.armor_min, opt.comp_min)
 		raise Mgmg::SearchCutException, "the recipe requires #{exp.comma3} experiment points, which exceeds given max_exp=#{max_exp.comma3}" if max_exp < exp
 		ret = [Mgmg.invexp3(max_exp, opt.armor_min, opt.comp_min), opt.armor_min, opt.comp_min]
 		max = opt.irep.para_call(para, *ret)
-		(opt.comp_min).step(Mgmg.invexp3c(max_exp, opt.smith_min, opt.armor_min), opt.step) do |comp|
-			opt.armor_min.upto(Mgmg.invexp3(max_exp, opt.smith_min, comp)) do |armor|
-				smith = Mgmg.invexp3(max_exp, armor, comp)
-				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) ) )
-				break if armor < 0
+		eo = opt.irep.eo_para(para)
+		opt.comp_max = [opt.comp_max, Mgmg.invexp3c(max_exp, opt.smith_min, opt.armor_min)].min
+		comps = Mgmg.fib_init(opt.comp_min, opt.comp_max)
+		values = comps.map do |comp|
+			cur, ret, max = eval_comp_fm(para, comp, eo, opt, ret, max, max_exp)
+			cur
+		end
+		while 3 < comps[3]-comps[0]
+			if values[2] <= values[1]
+				comp = comps[0] + comps[2]-comps[1]
+				comps = [comps[0], comp, comps[1], comps[2]]
+				cur, ret, max = eval_comp_fm(para, comp, eo, opt, ret, max, max_exp)
+				values = [values[0], cur, values[1], values[2]]
+			else
+				comp = comps[1] + comps[3]-comps[2]
+				comps = [comps[1], comps[2], comp, comps[3]]
+				cur, ret, max = eval_comp_fm(para, comp, eo, opt, ret, max, max_exp)
+				values = [values[1], values[2], cur, values[3]]
 			end
 		end
+		th = max - (max*opt.comp_ext[3]).ceil
+		(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)
+			break if cur < th
+		end
+		(comps[3]+1).upto(opt.comp_max) do |comp|
+			next if ( eo & (2**(comp&1)) == 0 )
+			cur, ret, max = eval_comp_fm(para, comp, eo, opt, ret, max, max_exp)
+			break if cur < th
+		end
 		ret
 	end
 end
 
+class << Mgmg
+	def fib_init(min, max)
+		z = min-1
+		a, b = 2, 3
+		while z + b < max do
+			a, b = b, a+b
+		end
+		[z, z+b-a, z+a, z+b]
+	end
+end
+
 module Mgmg
 	Eighth = 1.quo(8)
 	module_function def find_lowerbound(a, b, para, start, term, opt_a: Option.new, opt_b: Option.new)
@@ -430,7 +718,6 @@ module Mgmg
 			raise Mgmg::SearchCutException, "given recipes are equivalent at start target=#{start.comma3}"
 		end
 		
-		
 		loop do
 			loop do
 				foo = a.find_max(para, eb, opt: opt_a)
@@ -444,38 +731,40 @@ module Mgmg
 				eb = foo
 			end
 			ea = Mgmg.exp(*sca)
-			while ea==eb do
-				res = 0
-				begin
-					sca = a.find_max(para, ea-1, opt: opt_a)
-				rescue Mgmg::SearchCutException
-					res += 1
+			pb = opt_b.irep.para_call(para, *scb)
+			if ea <= eb and pb <= pa and (ea+pb)!=(eb+pa) then
+				until pa < pb
+					scb = b.search(para, pb+Eighth, opt: opt_b)
+					pb = opt_b.irep.para_call(para, *scb)
 				end
+				return [pa, pb]
+			elsif ea < eb
+				return [pa, pb] if scb == b.search(para, pa, opt: opt_b)
+			end
+			tag = [ea, eb].min - 1
+			begin
+				scb = b.find_max(para, tag, opt: opt_b)
+			rescue Mgmg::SearchCutException
+				eb, pb = Mgmg.exp(*scb), opt_b.irep.para_call(para, *scb)
 				begin
-					scb = b.find_max(para, eb-1, opt: opt_b)
-				rescue Mgmg::SearchCutException
-					res += 1
-				end
-				ea, eb = Mgmg.exp(*sca), Mgmg.exp(*scb)
-				pa, pb = opt_a.irep.para_call(para, *sca), opt_b.irep.para_call(para, *scb)
-				if ea < eb || ( ea == eb && pb < pa )
-					until pa < pb
-						scb = b.search(para, pb+Eighth, opt: opt_b)
-						pb = opt_b.irep.para_call(para, *scb)
+					sca = a.find_max(para, eb, opt: opt_a)
+					ea, pa = Mgmg.exp(*sca), opt_a.irep.para_call(para, *sca)
+					while eb <= ea
+						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]
-				elsif res == 2
+				rescue Mgmg::SearchCutException
 					raise Mgmg::SearchCutException, "given recipes are never reversed from the start target=#{start.comma3} until #{pa.comma3}"
 				end
-			end
-			if ea < eb
-				pb = opt_b.irep.para_call(para, *scb)
-				until pa < pb
-					scb = b.search(para, pb+Eighth, opt: opt_b)
-					pb = opt_b.irep.para_call(para, *scb)
-				end
 				return [pa, pb]
 			end
+			begin
+				sca = a.find_max(para, tag, opt: opt_a)
+			rescue Mgmg::SearchCutException
+				raise Mgmg::SearchCutException, "given recipes are never reversed from the start target=#{start.comma3} until #{opt_a.irep.para_call(para, *sca).comma3}"
+			end
+			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.6.2"
+	VERSION = "1.7.0"
 end

data/reference.md

@@ -130,12 +130,9 @@
 `opt`は，`comp_min`，`comp_max`，`left_associative`，`reinforcement`，`irep`を使用します．
 
 ## `String#search(para, target, opt: Mgmg.option())`
-道具製作Lvを `c_min=comp_search(para, target, opt.smith_max, opt: opt)` から `c_max=comp_search(para, target, opt.smith_min, opt: opt)` まで，`opt.step`ずつ動かして，
-`smith_search`を行い，その過程で得られた最小経験値の鍛冶・防具製作Lvと道具製作Lvからなる配列を返します．
-レシピ中の，対象パラメータの種別値がすべて奇数，または全て偶数であるなら，`opt.step`を`2`にしても探索すべき範囲を網羅できます．
-その他は`String#smith_seach`と同様です．
+合計経験値が最小となる鍛冶・防具製作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])`を超えない範囲を探索します．この目的関数は単峰ではないため，フィボナッチ探索のみでは最適解が得られないことがあります．
 
-`opt`は，`String#smith_search`または`String#comp_search`で使われるすべてのパラメータを使用します．
+その他は`String#smith_seach`と同様で，`opt`は，`String#smith_search`または`String#comp_search`で使われるすべてのパラメータと，`comp_ext`を使用します．
 
 ## `Enumerable#search(para, target, opt: Mgmg.option())`
 複数装備の組について，`para`の値が`target`以上となる最小経験値の`[鍛冶Lv，防具製作Lv，道具製作Lv]`を返します．
@@ -143,11 +140,13 @@
 
 `opt.smith_min`および`opt.armor_min`のデフォルト値は，武器・防具の各総重量を`opt.target_weight`で製作するのに必要な鍛冶・防具製作Lv (`self.min_level(*opt.target_weight)`)です．`opt.target_weight`には2要素からなる配列を指定しますが，整数が与えられた場合，それを2つ並べた配列と同等のものとして扱います．合計重量を指定することにはならないので注意してください．`opt.target_weight`のデフォルト値は`0`です．
 
-その他は，`String#smith_seach`と同様です．
+その他は，`String#seach`と同様です．
 
 ## `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`を下回らない範囲を探索します．
+
 ## `Enumerable#find_max(para, max_exp, opt: Mgmg.option())`
 複数装備の組について，経験値の合計が`max_exp`以下の範囲で，`para`の値が最大となる鍛冶Lv，防具製作Lv，道具製作Lvからなる配列を返します．`para`の値が最大となる組が複数存在する場合，経験値が小さい方が優先されます．
 
@@ -455,9 +454,9 @@ 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|`10,000`|対応|各製作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`など|
 |target_weight|`0`|非対応|`smith_min`のデフォルト値計算に使う目標重量|`String#search`など|
-|step|`1`|非対応|探索時において道具製作Lvを動かす幅|`String#search`など|
 |magdef_maximize|`true`|非対応|目標を魔防最大(真)かコスト最小(偽)にするためのスイッチ|`String#phydef_optimize`|
 |reinforcement|`[]`|非対応|[前述](#mgmgequipreinforcearg)の`Mgmg::Equip#reinforce`による強化リスト|一部を除くすべてのメソッド|
 |buff|`[]`|非対応|`reinforcement`のエイリアス|どちらか一方のみを指定する|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mgmg
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.7.0
 platform: ruby
 authors:
 - KAZOON
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-30 00:00:00.000000000 Z
+date: 2022-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.24
+rubygems_version: 3.3.25
 signing_key:
 specification_version: 4
 summary: Calculate specs of equipments of Megurimeguru, a game produced by Kou.