mgmg 1.5.7 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 959345a0547c379e6ea2cc55e56283b580429c6b25d2a50df0c3ac9c7b02f8db
-  data.tar.gz: 8832f8ad1f54c1f06c77a2c72b25631fbfa9e9f98b5fe0d48ae15c7dd15568da
+  metadata.gz: b9da45e92b9c5fb1cae6577e532cce280c997f46c1df019514b1eb976d89f03f
+  data.tar.gz: 6f905a8d05126dbc81c71e73ddd64988e96a2033f520f6ded8b595ac96eb06be
 SHA512:
-  metadata.gz: d22e5011de865ee5a40550ca1341ae7f5c4ea696f086c95e9ce7be273cd2c4d1acbd6b676c1e87371fc1af05bfd90c1dc796d2b3076a3f5f7a01c1336bed7856
-  data.tar.gz: a70bd19a98d4212ff63d535be59b528d054dc4cbf981eda4bed20ef9e4dce065bc48f7aa4a15e9e6b90542872dde0c3537558557ce3ad1e4129ab174ceb84b8b
+  metadata.gz: cfaf9d22a5aaa36fdef9c15348117a014a4a9385947417a614a3f1fc82622ee4f1ad4c0d5615cbde9dded71b4a2a13edb88938e0fc88c818fafe27625b8f9885
+  data.tar.gz: 46734977a74542248d65449eb9b49aa4c9ce6f5b875a194c1ec8db6bdab47856fa341c9c77ef29f28c76dd4d078899260da64a6c8d04510fd7b4c692af8581c1

data/CHANGELOG.md

@@ -165,3 +165,12 @@
 ## 1.5.7 2022/10/15
 - 経験値上限を指定して，目標パラメータを最大化する製作Lvを返す`Mgmg::Recipe#find_max`を追加．
 - `Mgmg::Recipe#search`において，解の経験値が`cut_exp`ちょうどの場合に例外となっていたバグを修正．
+
+## 1.6.0 2022/10/18
+- `Mgmg.#find_upperbound`のアルゴリズムを改善し，探索下限目標値の引数を削除．
+- `Enumerable#search`，`Enumerable#find_max`が正しい解を返さない場合があったバグを修正．
+
+## 1.6.1 2022/10/21
+- `Mgmg.#find_lowerbound`，`Mgmg.#find_upperbound`において，同値レシピを指定した場合などを例外とするように修正．
+- `Enumerable#to_recipe`にも`allow_over20`キーワード引数を導入し，デフォルトで☆20を超えるレシピを含む場合に例外とするように修正．
+- 実効HP(最大HP+腕力)を表す`Mgmg::Equip#hs`を追加．

data/lib/mgmg/equip.rb

@@ -105,6 +105,9 @@ module Mgmg
 		def magic2
 			magic()*2
 		end
+		def hs
+			hp()+str()
+		end
 		[:fire, :earth, :water].each.with_index do |s, i|
 			define_method(s){ @element[i] }
 		end

data/lib/mgmg/ir.rb

@@ -220,6 +220,9 @@ module Mgmg
 		def pmdef(s, ac, x=nil)
 			[phydef(s, ac, x), magmag(s, ac, x)].min
 		end
+		def hs(s, ac, x=nil)
+			hp(s, ac, x)+str(s, ac, x)
+		end
 		
 		def power(s, a=s, c=a.tap{a=s})
 			case @kind

data/lib/mgmg/option.rb

@@ -2,7 +2,7 @@ module Mgmg
 	class Option
 		Defaults = {
 			left_associative: true, include_system_equips: true,
-			smith_max: 10000, armor_max: 10000, comp_max: 10000
+			smith_max: 10_000, armor_max: 10_000, comp_max: 10_000
 		}
 		def initialize(
 			left_associative: Defaults[:left_associative],

data/lib/mgmg/recipe.rb

@@ -130,7 +130,7 @@ module Mgmg
 		def ir(**kw)
 			temp_opt(**kw).irep
 		end
-		%i|attack phydef magdef hp mp str dex speed magic atkstr atk_sd dex_as mag_das magic2 magmag pmdef|.each do |sym|
+		%i|attack phydef magdef hp mp str dex speed magic atkstr atk_sd dex_as mag_das magic2 magmag pmdef hs|.each do |sym|
 			define_method(sym) do |s, ac=s, x=false, **kw|
 				s, ac, x = correct_level(s, ac, x, temp_opt(**kw))
 				ir(**kw).method(sym).call(s, ac, x)

data/lib/mgmg/search.rb

@@ -79,15 +79,27 @@ class String
 		ret
 	end
 	
+	private def minimize_smith(para, smith, comp, cur, opt)
+		(smith-1).downto(opt.smith_min) do |s|
+			foo = opt.irep.para_call(para, s, comp)
+			if cur == foo
+				smith = s
+			else
+				break
+			end
+		end
+		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).step(Mgmg.invexp2c(max_exp, opt.smith_min), opt.step) do |comp|
+		(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
 			ret, max = [smith, comp], cur if ( max < cur || ( max == cur && Mgmg.exp(smith, comp) < Mgmg.exp(*ret) ) )
 		end
 		ret
@@ -211,20 +223,79 @@ module Enumerable
 		end
 		opt.comp_max
 	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) )
+		(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
+			end
+		rescue Mgmg::SearchCutException
+		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 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) )
+		(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
+			end
+		rescue Mgmg::SearchCutException
+		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
 	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:)
 		opt_nocut = opt.dup; opt_nocut.cut_exp = Float::INFINITY
-		opt.smith_max, opt.armor_max = sa_search(para, target, opt.comp_min, opt: opt_nocut)
-		opt.smith_min, opt.armor_min = sa_search(para, target, opt.comp_max, opt: opt_nocut)
+		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_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)
 		opt.comp_max = comp_search(para, target, opt.smith_min, opt.armor_min, opt:)
-		ret = nil
 		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
-		exp = Mgmg.exp(opt.smith_max, opt.armor_max, opt.comp_min)
-		opt.cut_exp, ret = exp, [opt.smith_max, opt.armor_max, opt.comp_min] if ( exp < opt.cut_exp || (ret.nil? && exp==opt.cut_exp) )
-		(opt.comp_min+1).upto(opt.comp_max-1) do |comp|
+		(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)
@@ -244,17 +315,31 @@ module Enumerable
 		ret
 	end
 	
+	private def minimize_smith(para, smith, armor, comp, cur, opt)
+		return -1 if opt.smith_min < 0
+		(smith-1).downto(opt.smith_min) do |s|
+			foo = opt.irep.para_call(para, s, armor, comp)
+			if cur == foo
+				smith = s
+			else
+				break
+			end
+		end
+		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.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+1).step(Mgmg.invexp3c(max_exp, opt.smith_min, opt.armor_min), opt.step) do |comp|
+		(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
 			end
 		end
 		ret
@@ -281,38 +366,49 @@ module Mgmg
 		end
 		sca, scb = a.search(para, start, opt: opt_a), b.search(para, start, opt: opt_b)
 		ea, eb = Mgmg.exp(*sca), Mgmg.exp(*scb)
-		if eb < ea || ( ea == eb && opt_a.irep.para_call(para, *sca) < opt_b.irep.para_call(para, *scb) )
+		pa, pb = opt_a.irep.para_call(para, *sca), opt_b.irep.para_call(para, *scb)
+		if eb < ea || ( ea == eb && pa < pb )
 			a, b, opt_a, opt_b, sca, scb, ea, eb = b, a, opt_b, opt_a, scb, sca, eb, ea
-		end
-		tag = opt_a.irep.para_call(para, *sca) + Eighth
-		sca, scb = a.search(para, term, opt: opt_a), b.search(para, term, opt: opt_b)
-		ea, eb = Mgmg.exp(*sca), Mgmg.exp(*scb)
-		if ea < eb || ( ea == eb && opt_b.irep.para_call(para, *scb) < opt_a.irep.para_call(para, *sca) )
-			raise Mgmg::SearchCutException
-		end
-		while tag < term
-			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)
-			if eb < ea
-				return [(tag-Eighth).to_ii, pb]
-			elsif ea == eb
-				if pa < pb
-					return [(tag-Eighth).to_ii, pa]
-				else
-					tag = pb + Eighth
-				end
-			else
+		elsif eb == ea && pa == pb
+			raise Mgmg::SearchCutException, "given recipes are equivalent at start target=#{start.comma3}"
+		end
+		scat, scbt = a.search(para, term, opt: opt_a), b.search(para, term, opt: opt_b)
+		eat, ebt = Mgmg.exp(*scat), Mgmg.exp(*scbt)
+		if eat < ebt || ( eat == ebt && opt_b.irep.para_call(para, *scbt) <= opt_a.irep.para_call(para, *scat) )
+			raise Mgmg::SearchCutException, "given recipes will never be reversed from start target=#{start.comma3} until term target=#{term.comma3}"
+		end
+		
+		loop do
+			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)
+				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 )
+				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
 		end
 		raise UnexpectedError
 	end
 	
-	module_function def find_upperbound(a, b, para, start, term, opt_a: Option.new, opt_b: Option.new)
-		if start <= term
-			raise ArgumentError, "term < start is needed, (start, term) = (#{start}, #{term}) are given"
-		end
+	module_function def find_upperbound(a, b, para, start, opt_a: Option.new, opt_b: Option.new)
 		if a.kind_of?(Recipe)
 			opt_a = a.option.dup
 			a = a.recipe
@@ -327,58 +423,58 @@ module Mgmg
 		end
 		sca, scb = a.search(para, start, opt: opt_a), b.search(para, start, opt: opt_b)
 		ea, eb = Mgmg.exp(*sca), Mgmg.exp(*scb)
-		if ea < eb || ( ea == eb && opt_b.irep.para_call(para, *scb) < opt_a.irep.para_call(para, *sca) )
+		pa, pb = opt_a.irep.para_call(para, *sca), opt_b.irep.para_call(para, *scb)
+		if ea < eb || ( ea == eb && pb < pa )
 			a, b, opt_a, opt_b, sca, scb, ea, eb = b, a, opt_b, opt_a, scb, sca, eb, ea
-		end
-		tagu = opt_a.irep.para_call(para, *sca)
-		sca[-1] -= 2
-		tagl = opt_a.irep.para_call(para, *sca)
-		sca, scb = a.search(para, term, opt: opt_a), b.search(para, term, opt: opt_b)
-		ea, eb = Mgmg.exp(*sca), Mgmg.exp(*scb)
-		if eb < ea || ( ea == eb && opt_a.irep.para_call(para, *sca) < opt_b.irep.para_call(para, *scb) )
-			raise Mgmg::SearchCutException
-		end
-		while term < tagu
-			ret = nil
-			sca = a.search(para, tagl, opt: opt_a)
-			next_tagu, next_sca = tagl, sca
-			scb = b.search(para, tagl, opt: opt_b)
-			while tagl < tagu
+		elsif eb == ea && pa == pb
+			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)
+				break if sca == foo
+				bar = opt_a.irep.para_call(para, *foo)
+				break if pa < bar
+				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 do
+				res = 0
+				begin
+					sca = a.find_max(para, ea-1, opt: opt_a)
+				rescue Mgmg::SearchCutException
+					res += 1
+				end
+				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
-					ret = tagl
-					sca = a.search(para, pa + Eighth, opt: opt_a)
-					tagl = opt_a.irep.para_call(para, *sca)
-					scb = b.search(para, tagl, opt: opt_b)
-				elsif ea == eb
-					if pb < pa
-						ret = tagl
-						sca = a.search(para, pa + Eighth, opt: opt_a)
-						tagl = opt_a.irep.para_call(para, *sca)
-						scb = b.search(para, tagl, opt: opt_b)
-					else
-						scb = b.search(para, pb + Eighth, opt: opt_b)
-						tagl = opt_b.irep.para_call(para, *scb)
-						sca = a.search(para, tagl, opt: opt_a)
+				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)
 					end
-				else
-					sca = a.search(para, pa + Eighth, opt: opt_a)
-					tagl = opt_a.irep.para_call(para, *sca)
-					scb = b.search(para, tagl, opt: opt_b)
+					return [pa, pb]
+				elsif res == 2
+					raise Mgmg::SearchCutException, "given recipes are never reversed from the start target=#{start.comma3} until #{pa.comma3}"
 				end
 			end
-			if ret.nil?
-				tagu = next_tagu
-				next_sca[-1] -= 2
-				tagl = opt_a.irep.para_call(para, *next_sca)
-				if tagl == tagu
-					tagl = term
+			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
-			else
-				pa = opt_a.irep.para_call(para, *a.search(para, ret+Eighth, opt: opt_a))
-				pb = opt_b.irep.para_call(para, *b.search(para, ret+Eighth, opt: opt_b))
-				return [ret.to_ii, [pa, pb].min]
+				return [pa, pb]
 			end
 		end
 		raise UnexpectedError
@@ -386,7 +482,32 @@ module Mgmg
 	
 	module_function def find_lubounds(a, b, para, lower, upper, opt_a: Mgmg::Option.new, opt_b: Mgmg::Option.new)
 		xl, yl = find_lowerbound(a, b, para, lower, upper, opt_a:, opt_b:)
-		xu, yu = find_upperbound(a, b, para, upper, lower, opt_a:, opt_b:)
+		xu, yu = find_upperbound(a, b, para, upper, opt_a:, opt_b:)
 		[xl, yl, xu, yu]
 	end
+	module_function def find_lubounds2(a, b, para, lower, upper, opt_a: Mgmg::Option.new, opt_b: Mgmg::Option.new)
+		xl, yl, xu, yu = find_lubounds(a, b, para, lower, upper, opt_a: Mgmg::Option.new, opt_b: Mgmg::Option.new)
+		if a.kind_of?(Recipe)
+			opt_a = a.option.dup
+			a = a.recipe
+		else
+			opt_a = opt_a.dup.set_default(a)
+		end
+		if b.kind_of?(Recipe)
+			opt_b = b.option.dup
+			b = b.recipe
+		else
+			opt_b = opt_b.dup.set_default(b)
+		end
+		sca, scb = a.search(para, lower, opt: opt_a), b.search(para, lower, 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)
+		if eb < ea || ( ea == eb && pa < pb )
+			a, b, opt_a, opt_b, sca, scb, ea, eb = b, a, opt_b, opt_a, scb, sca, eb, ea
+		end
+		sca, scb = a.search(para, xl, opt: opt_a), b.search(para, yu, 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)
+		[sca, ea, pa, scb, eb, pb]
+	end
 end

data/lib/mgmg/utils.rb

@@ -158,7 +158,11 @@ module Mgmg
 		end
 	end
 	module_function def invexp2(exp, comp)
-		ret = Math.sqrt(exp - (2*((comp-1)**2)) - 3).floor + 2
+		begin
+			ret = Math.sqrt(exp - (2*((comp-1)**2)) - 3).floor + 2
+		rescue Math::DomainError
+			return -1
+		end
 		if Mgmg.exp(ret, comp) <= exp
 			ret
 		else
@@ -166,7 +170,11 @@ module Mgmg
 		end
 	end
 	module_function def invexp2c(exp, s)
-		ret = Math.sqrt((exp - (((s-1)**2)) - 3).quo(2)).floor + 2
+		begin
+			ret = Math.sqrt((exp - (((s-1)**2)) - 3).quo(2)).floor + 2
+		rescue Math::DomainError
+			return -1
+		end
 		if Mgmg.exp(s, ret) <= exp
 			ret
 		else
@@ -174,7 +182,12 @@ module Mgmg
 		end
 	end
 	module_function def invexp3(exp, sa, comp)
-		ret = Math.sqrt(exp - ((sa-1)**2) - (2*((comp-1)**2)) - 4).floor + 2
+		return invexp2(exp, comp) if sa < 0
+		begin
+			ret = Math.sqrt(exp - ((sa-1)**2) - (2*((comp-1)**2)) - 4).floor + 2
+		rescue Math::DomainError
+			return -1
+		end
 		if Mgmg.exp(ret, sa, comp) <= exp
 			ret
 		else
@@ -182,7 +195,16 @@ module Mgmg
 		end
 	end
 	module_function def invexp3c(exp, smith, armor)
-		ret = Math.sqrt((exp - ((smith-1)**2) - ((armor-1)**2) - 4).quo(2)).floor + 2
+		if smith < 0
+			return invexp2c(exp, armor)
+		elsif armor < 0
+			return invexp2c(exp, smith)
+		end
+		begin
+			ret = Math.sqrt((exp - ((smith-1)**2) - ((armor-1)**2) - 4).quo(2)).floor + 2
+		rescue Math::DomainError
+			return -1
+		end
 		if Mgmg.exp(smith, armor, ret) <= exp
 			ret
 		else

data/lib/mgmg/version.rb

@@ -1,3 +1,3 @@
 module Mgmg
-	VERSION = "1.5.7"
+	VERSION = "1.6.1"
 end

data/lib/mgmg.rb

@@ -89,6 +89,8 @@ class String
 			pd = self.poly(:phydef, opt:)
 			md = self.poly(:magmag, opt:)
 			pd <= md ? pd : md
+		when :hs
+			self.poly(:hp, opt:) + self.poly(:str, opt:)
 		when :cost
 			if opt.include_system_equips and Mgmg::SystemEquip.has_key?(self) then
 				return Mgmg::TPolynomial.new(Mgmg::Mat.new(1, 1, 0.quo(1)), 28, 0, 12, 12)
@@ -140,7 +142,13 @@ class String
 end
 module Enumerable
 	using Mgmg::Refiner
-	def to_recipe(para=:power, **kw)
+	def to_recipe(para=:power, allow_over20: false, **kw)
+		unless allow_over20
+			self.each do |e|
+				foo = e.build(-1).star
+				raise Mgmg::Over20Error, foo if 20 < foo
+			end
+		end
 		Mgmg::Recipe.new(self, para, **kw)
 	end
 	def build(smith=-1, armor=smith, comp=armor.tap{armor=smith}, opt: Mgmg::Option.new)

data/reference.md

@@ -1,7 +1,7 @@
 # リファレンス
 本ライブラリで定義される主要なメソッドを以下に解説します．
 
-## `String#to_recipe(para=:power, allow_over20: false, **kw)`，`Enumerable#to_recipe(para=:power, **kw)`
+## `String#to_recipe(para=:power, allow_over20: false, **kw)`，`Enumerable#to_recipe(para=:power, allow_over20: false, **kw)`
 レシピ文字列である`self`と，注目パラメータ`para`，オプション`Mgmg.option(**kw)`をセットにした[後述](#mgmgrecipe)の`Mgmg::Recipe`オブジェクトを生成して返します．デフォルト値としてセットされたパラメータを使用する以外は，レシピ文字列と同様に扱えます．
 
 `allow_over20`が偽の場合，レシピの☆を確認し，20を超える場合は，例外`Mgmg::Over20Error`を発生します．このチェックを抑制したい場合は，真にしてください．
@@ -161,7 +161,7 @@
 
 `opt_a`，`opt_b`には，それぞれ`a`と`b`に関するオプションパラメータを指定します．`smith_min`，`armor_min`，`min_smith`，`left_associative`，`reinforcement`，`irep`を使用します．
 
-## `Mgmg.#find_upperbound(a, b, para, start, term, opt_a: Mgmg.option(), opt_b: Mgmg.option())`
+## `Mgmg.#find_upperbound(a, b, para, start, opt_a: Mgmg.option(), opt_b: Mgmg.option())`
 `Mgmg.#find_lowerbound`とは逆に，目標値を下げながら，優劣が逆転する最大の目標値を探索し，返します．返り値は`[逆転する最大目標値, 逆転前の最小para値]`です．目標値が，前者よりも少しでも大きいと逆転が起こらず(逆転する目標値の上限)，少しだけ大きい時の`para`値が後者になります．
 
 `opt_a`，`opt_b`は，`Mgmg.#find_lowerbound`と同様です．
@@ -455,7 +455,7 @@ 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|`10000`|対応|各製作Lvの探索範囲の最大値|`String#search`など|
+|smith_max, armor_max, comp_max|`10,000`|対応|各製作Lvの探索範囲の最大値|`String#search`など|
 |target_weight|`0`|非対応|`smith_min`のデフォルト値計算に使う目標重量|`String#search`など|
 |step|`1`|非対応|探索時において道具製作Lvを動かす幅|`String#search`など|
 |magdef_maximize|`true`|非対応|目標を魔防最大(真)かコスト最小(偽)にするためのスイッチ|`String#phydef_optimize`|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mgmg
 version: !ruby/object:Gem::Version
-  version: 1.5.7
+  version: 1.6.1
 platform: ruby
 authors:
 - KAZOON
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-15 00:00:00.000000000 Z
+date: 2022-10-21 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.23
+rubygems_version: 3.3.24
 signing_key:
 specification_version: 4
 summary: Calculate specs of equipments of Megurimeguru, a game produced by Kou.