mgmg 1.3.2 → 1.4.2

data/lib/mgmg/search.rb

@@ -1,5 +1,6 @@
 class String
-	def smith_search(para, target, comp, smith_min=nil, smith_max=10000, left_associative: true, cut_exp: Float::INFINITY, min_smith: false)
+	def smith_search(para, target, comp, smith_min=nil, smith_max=10000, left_associative: true, cut_exp: Float::INFINITY, min_smith: false, irep: nil, reinforcement: [])
+		irep = ir(left_associative: left_associative, reinforcement: reinforcement) if irep.nil?
 		if smith_min.nil?
 			if min_smith
 				smith_min = self.min_smith.min_smith
@@ -16,14 +17,14 @@ class String
 				raise Mgmg::SearchCutException
 			end
 		end
-		if target <= build(smith_min, comp, left_associative: left_associative).para_call(para)
+		if target <= irep.para_call(para, smith_min, comp)
 			return smith_min
-		elsif build(smith_max, comp, left_associative: left_associative).para_call(para) < target
+		elsif irep.para_call(para, smith_max, comp) < target
 			raise Mgmg::SearchCutException
 		end
 		while 1 < smith_max - smith_min do
 			smith = (smith_max - smith_min).div(2) + smith_min
-			if build(smith, comp, left_associative: left_associative).para_call(para) < target
+			if irep.para_call(para, smith, comp) < target
 				smith_min = smith
 			else
 				smith_max = smith
@@ -31,19 +32,20 @@ class String
 		end
 		smith_max
 	end
-	def comp_search(para, target, smith, comp_min=nil, comp_max=10000, left_associative: true)
+	def comp_search(para, target, smith, comp_min=nil, comp_max=10000, left_associative: true, irep: nil, reinforcement: [])
+		irep = ir(left_associative: left_associative, reinforcement: reinforcement) if irep.nil?
 		comp_min = min_comp(left_associative: left_associative)
 		if comp_max < comp_min
 			raise ArgumentError, "comp_min <= comp_max is needed, (comp_min, comp_max) = (#{comp_min}, #{comp_max}) are given"
 		end
-		if target <= build(smith, comp_min, left_associative: left_associative).para_call(para)
+		if target <= irep.para_call(para, smith, comp_min)
 			return comp_min
-		elsif build(smith, comp_max, left_associative: left_associative).para_call(para) < target
+		elsif irep.para_call(para, smith, comp_max) < target
 			raise Mgmg::SearchCutException
 		end
 		while 1 < comp_max - comp_min do
 			comp = (comp_max - comp_min).div(2) + comp_min
-			if build(smith, comp, left_associative: left_associative).para_call(para) < target
+			if irep.para_call(para, smith, comp) < target
 				comp_min = comp
 			else
 				comp_max = comp
@@ -51,7 +53,8 @@ class String
 		end
 		comp_max
 	end
-	def search(para, target, smith_min=nil, comp_min=nil, smith_max=10000, comp_max=10000, left_associative: true, step: 1, cut_exp: Float::INFINITY, min_smith: false)
+	def search(para, target, smith_min=nil, comp_min=nil, smith_max=10000, comp_max=10000, left_associative: true, step: 1, cut_exp: Float::INFINITY, min_smith: false, irep: nil, reinforcement: [])
+		irep = ir(left_associative: left_associative, reinforcement: reinforcement) if irep.nil?
 		if smith_min.nil?
 			if min_smith
 				smith_min = self.min_smith
@@ -60,22 +63,22 @@ class String
 			end
 		end
 		comp_min = min_comp(left_associative: left_associative) if comp_min.nil?
-		comp_min = comp_search(para, target, smith_max, comp_min, comp_max, left_associative: left_associative)
-		smith_max = smith_search(para, target, comp_min, smith_min, smith_max, left_associative: left_associative)
-		smith_min = smith_search(para, target, comp_max, smith_min, smith_max, left_associative: left_associative)
+		comp_min = comp_search(para, target, smith_max, comp_min, comp_max, left_associative: left_associative, irep: irep)
+		smith_max = smith_search(para, target, comp_min, smith_min, smith_max, left_associative: left_associative, irep: irep)
+		smith_min = smith_search(para, target, comp_max, smith_min, smith_max, left_associative: left_associative, irep: irep)
 		raise Mgmg::SearchCutException if cut_exp < Mgmg.exp(smith_min, comp_min)
-		comp_max = comp_search(para, target, smith_min, comp_min, comp_max, left_associative: left_associative)
+		comp_max = comp_search(para, target, smith_min, comp_min, comp_max, left_associative: left_associative, irep: irep)
 		minex, ret = Mgmg.exp(smith_min, comp_max), [smith_min, comp_max]
 		exp = Mgmg.exp(smith_max, comp_min)
 		minex, ret = exp, [smith_max, comp_min] if exp < minex
 		(comp_min+step).step(comp_max-1, step) do |comp|
 			break if minex < Mgmg.exp(smith_min, comp)
-			smith = smith_search(para, target, comp, smith_min, smith_max, left_associative: left_associative, cut_exp: [minex, cut_exp].min)
+			smith = smith_search(para, target, comp, smith_min, smith_max, left_associative: left_associative, cut_exp: [minex, cut_exp].min, irep: irep)
 			exp = Mgmg.exp(smith, comp)
 			if exp < minex
 				minex, ret = exp, [smith, comp]
 			elsif exp == minex
-				if build(*ret).para_call(para) < build(smith, comp).para_call(para)
+				if irep.para_call(para, *ret) < irep.para_call(para, smith, comp)
 					ret = [smith, comp]
 				end
 			end
@@ -86,7 +89,8 @@ class String
 	end
 end
 module Enumerable
-	def smith_search(para, target, armor, comp, smith_min=nil, smith_max=10000, left_associative: true, cut_exp: Float::INFINITY, min_smith: false)
+	def smith_search(para, target, armor, comp, smith_min=nil, smith_max=10000, left_associative: true, cut_exp: Float::INFINITY, min_smith: false, irep: nil, reinforcement: [])
+		irep = ir(left_associative: left_associative, reinforcement: reinforcement) if irep.nil?
 		if smith_min.nil?
 			if min_smith
 				smith_min = self.min_smith[0]
@@ -103,14 +107,14 @@ module Enumerable
 				raise Mgmg::SearchCutException
 			end
 		end
-		if build(smith_max, armor, comp, left_associative: left_associative).para_call(para) < target
+		if irep.para_call(para, smith_max, armor, comp) < target
 			raise Mgmg::SearchCutException
-		elsif target <= build(smith_min, armor, comp, left_associative: left_associative).para_call(para)
+		elsif target <= irep.para_call(para, smith_min, armor, comp)
 			return smith_min
 		end
 		while 1 < smith_max - smith_min do
 			smith = (smith_max - smith_min).div(2) + smith_min
-			if build(smith, armor, comp, left_associative: left_associative).para_call(para) < target
+			if irep.para_call(para, smith, armor, comp) < target
 				smith_min = smith
 			else
 				smith_max = smith
@@ -118,7 +122,8 @@ module Enumerable
 		end
 		smith_max
 	end
-	def armor_search(para, target, smith, comp, armor_min=nil, armor_max=10000, left_associative: true, cut_exp: Float::INFINITY, min_smith: false)
+	def armor_search(para, target, smith, comp, armor_min=nil, armor_max=10000, left_associative: true, cut_exp: Float::INFINITY, min_smith: false, irep: nil, reinforcement: [])
+		irep = ir(left_associative: left_associative, reinforcement: reinforcement) if irep.nil?
 		if armor_min.nil?
 			if min_smith
 				armor_min = self.min_smith[1]
@@ -135,14 +140,14 @@ module Enumerable
 				raise Mgmg::SearchCutException
 			end
 		end
-		if build(smith, armor_max, comp, left_associative: left_associative).para_call(para) < target
+		if irep.para_call(para, smith, armor_max, comp) < target
 			raise Mgmg::SearchCutException
-		elsif target <= build(smith, armor_min, comp, left_associative: left_associative).para_call(para)
+		elsif target <= irep.para_call(para, smith, armor_min, comp)
 			return armor_min
 		end
 		while 1 < armor_max - armor_min do
 			armor = (armor_max - armor_min).div(2) + armor_min
-			if build(smith, armor, comp, left_associative: left_associative).para_call(para) < target
+			if irep.para_call(para, smith, armor, comp) < target
 				armor_min = armor
 			else
 				armor_max = armor
@@ -150,7 +155,8 @@ module Enumerable
 		end
 		armor_max
 	end
-	def sa_search(para, target, comp, smith_min=nil, armor_min=nil, smith_max=10000, armor_max=10000, left_associative: true, cut_exp: Float::INFINITY, min_smith: false)
+	def sa_search(para, target, comp, smith_min=nil, armor_min=nil, smith_max=10000, armor_max=10000, left_associative: true, cut_exp: Float::INFINITY, min_smith: false, irep: nil, reinforcement: [])
+		irep = ir(left_associative: left_associative, reinforcement: reinforcement) if irep.nil?
 		if min_smith
 			s, a = self.min_smith
 		else
@@ -158,23 +164,23 @@ module Enumerable
 		end
 		smith_min = s if smith_min.nil?
 		armor_min = a if armor_min.nil?
-		smith_min = smith_search(para, target, armor_max, comp, smith_min, smith_max, left_associative: true)
-		armor_min = armor_search(para, target, smith_max, comp, armor_min, armor_max, left_associative: true)
+		smith_min = smith_search(para, target, armor_max, comp, smith_min, smith_max, left_associative: true, irep: irep)
+		armor_min = armor_search(para, target, smith_max, comp, armor_min, armor_max, left_associative: true, irep: irep)
 		raise Mgmg::SearchCutException if cut_exp < Mgmg.exp(smith_min, armor_min, comp)
-		smith_max = smith_search(para, target, armor_min, comp, smith_min, smith_max, left_associative: true)
-		armor_max = armor_search(para, target, smith_min, comp, armor_min, armor_max, left_associative: true)
+		smith_max = smith_search(para, target, armor_min, comp, smith_min, smith_max, left_associative: true, irep: irep)
+		armor_max = armor_search(para, target, smith_min, comp, armor_min, armor_max, left_associative: true, irep: irep)
 		minex, ret = Mgmg.exp(smith_min, armor_max, comp), [smith_min, armor_max]
 		exp = Mgmg.exp(smith_max, armor_min, comp)
 		if exp < minex
 			minex, ret = exp, [smith_max, armor_min]
 			(armor_min+1).upto(armor_max-1) do |armor|
 				break if minex < Mgmg.exp(smith_min, armor, comp)
-				smith = smith_search(para, target, armor, comp, smith_min, smith_max, left_associative: left_associative, cut_exp: [minex, cut_exp].min)
+				smith = smith_search(para, target, armor, comp, smith_min, smith_max, left_associative: left_associative, cut_exp: [minex, cut_exp].min, irep: irep)
 				exp = Mgmg.exp(smith, armor, comp)
 				if exp < minex
 					minex, ret = exp, [smith, armor]
 				elsif exp == minex
-					if build(*ret, comp).para_call(para) < build(smith, armor, comp).para_call(para)
+					if irep.para_call(para, *ret, comp) < irep.para_call(para, smith, armor, comp)
 						ret = [smith, armor]
 					end
 				end
@@ -183,12 +189,12 @@ module Enumerable
 		else
 			(smith_min+1).upto(smith_max-1) do |smith|
 				break if minex < Mgmg.exp(smith, armor_min, comp)
-				armor = armor_search(para, target, smith, comp, armor_min, armor_max, left_associative: left_associative, cut_exp: [minex, cut_exp].min)
+				armor = armor_search(para, target, smith, comp, armor_min, armor_max, left_associative: left_associative, cut_exp: [minex, cut_exp].min, irep: irep)
 				exp = Mgmg.exp(smith, armor, comp)
 				if exp < minex
 					minex, ret = exp, [smith, armor]
 				elsif exp == minex
-					if build(*ret, comp).para_call(para) < build(smith, armor, comp).para_call(para)
+					if irep.para_call(para, *ret, comp) < irep.para_call(para, smith, armor, comp)
 						ret = [smith, armor]
 					end
 				end
@@ -198,19 +204,20 @@ module Enumerable
 		raise Mgmg::SearchCutException if cut_exp < minex
 		ret
 	end
-	def comp_search(para, target, smith, armor, comp_min=nil, comp_max=10000, left_associative: true)
+	def comp_search(para, target, smith, armor, comp_min=nil, comp_max=10000, left_associative: true, irep: nil, reinforcement: [])
+		irep = ir(left_associative: left_associative, reinforcement: reinforcement) if irep.nil?
 		comp_min = min_comp(left_associative: left_associative)
 		if comp_max < comp_min
 			raise ArgumentError, "comp_min <= comp_max is needed, (comp_min, comp_max) = (#{comp_min}, #{comp_max}) are given"
 		end
-		if target <= build(smith, armor, comp_min, left_associative: left_associative).para_call(para)
+		if target <= irep.para_call(para, smith, armor, comp_min)
 			return comp_min
-		elsif build(smith, armor, comp_max, left_associative: left_associative).para_call(para) < target
+		elsif irep.para_call(para, smith, armor, comp_max) < target
 			raise ArgumentError, "given comp_max=#{comp_max} does not satisfies the target"
 		end
 		while 1 < comp_max - comp_min do
 			comp = (comp_max - comp_min).div(2) + comp_min
-			if build(smith, armor, comp, left_associative: left_associative).para_call(para) < target
+			if irep.para_call(para, smith, armor, comp) < target
 				comp_min = comp
 			else
 				comp_max = comp
@@ -218,7 +225,8 @@ module Enumerable
 		end
 		comp_max
 	end
-	def search(para, target, smith_min=nil, armor_min=nil, comp_min=nil, smith_max=10000, armor_max=10000, comp_max=10000, left_associative: true, cut_exp: Float::INFINITY, min_smith: false)
+	def search(para, target, smith_min=nil, armor_min=nil, comp_min=nil, smith_max=10000, armor_max=10000, comp_max=10000, left_associative: true, cut_exp: Float::INFINITY, min_smith: false, irep: nil, reinforcement: [])
+		irep = ir(left_associative: left_associative, reinforcement: reinforcement) if irep.nil?
 		if min_smith
 			s, a = self.min_smith
 		else
@@ -227,22 +235,22 @@ module Enumerable
 		smith_min = s if smith_min.nil?
 		armor_min = a if armor_min.nil?
 		comp_min = min_comp(left_associative: left_associative) if comp_min.nil?
-		comp_min = comp_search(para, target, smith_max, armor_max, comp_min, comp_max, left_associative: left_associative)
-		smith_max, armor_max = sa_search(para, target, comp_min, smith_min, armor_min, smith_max, armor_max, left_associative: left_associative)
-		smith_min, armor_min = sa_search(para, target, comp_max, smith_min, armor_min, smith_max, armor_max, left_associative: left_associative)
+		comp_min = comp_search(para, target, smith_max, armor_max, comp_min, comp_max, left_associative: left_associative, irep: irep)
+		smith_max, armor_max = sa_search(para, target, comp_min, smith_min, armor_min, smith_max, armor_max, left_associative: left_associative, irep: irep)
+		smith_min, armor_min = sa_search(para, target, comp_max, smith_min, armor_min, smith_max, armor_max, left_associative: left_associative, irep: irep)
 		raise Mgmg::SearchCutException if cut_exp < Mgmg.exp(smith_min, armor_min, comp_min)
-		comp_max = comp_search(para, target, smith_min, armor_min, comp_min, comp_max, left_associative: left_associative)
+		comp_max = comp_search(para, target, smith_min, armor_min, comp_min, comp_max, left_associative: left_associative, irep: irep)
 		minex, ret = Mgmg.exp(smith_min, armor_min, comp_max), [smith_min, armor_min, comp_max]
 		exp = Mgmg.exp(smith_max, armor_max, comp_min)
 		minex, ret = exp, [smith_max, armor_max, comp_min] if exp < minex
 		(comp_min+1).upto(comp_max-1) do |comp|
 			break if minex < Mgmg.exp(smith_min, armor_min, comp)
-			smith, armor = sa_search(para, target, comp, smith_min, armor_min, smith_max, armor_max, left_associative: left_associative, cut_exp: [minex, cut_exp].min)
+			smith, armor = sa_search(para, target, comp, smith_min, armor_min, smith_max, armor_max, left_associative: left_associative, cut_exp: [minex, cut_exp].min, irep: irep)
 			exp = Mgmg.exp(smith, armor, comp)
 			if exp < minex
 				minex, ret = exp, [smith, armor, comp]
 			elsif exp == minex
-				if build(*ret).para_call(para) < build(smith, armor, comp).para_call(para)
+				if irep.para_call(para, *ret) < irep.para_call(para, smith, armor, comp)
 					ret = [smith, armor, comp]
 				end
 			end
@@ -252,3 +260,106 @@ module Enumerable
 		ret
 	end
 end
+
+module Mgmg
+	module_function def find_lowerbound(a, b, para, start, term, smith_min_a: nil, smith_min_b: nil, armor_min_a: nil, armor_min_b: nil, min_smith: false, reinforcement: [])
+		if term <= start
+			raise ArgumentError, "start < term is needed, (start, term) = (#{start}, #{term}) are given"
+		end
+		ira, irb = a.ir(reinforcement: reinforcement), b.ir(reinforcement: reinforcement)
+		sca, scb = a.search(para, start, smith_min_a, armor_min_a, min_smith: min_smith, irep: ira), b.search(para, start, smith_min_b, armor_min_b, min_smith: min_smith, irep: irb)
+		ea, eb = Mgmg.exp(*sca), Mgmg.exp(*scb)
+		if eb < ea || ( ea == eb && ira.para_call(para, *sca) < irb.para_call(para, *scb) )
+			a, b, ira, irb, sca, scb, ea, eb = b, a, irb, ira, scb, sca, eb, ea
+			smith_min_a, smith_min_b, armor_min_a, armor_min_b = smith_min_b, smith_min_a, armor_min_b, armor_min_a
+		end
+		tag = ira.para_call(para, *sca) + 1
+		sca, scb = a.search(para, term, smith_min_a, armor_min_a, min_smith: min_smith, irep: ira), b.search(para, term, smith_min_b, armor_min_b, min_smith: min_smith, irep: irb)
+		ea, eb = Mgmg.exp(*sca), Mgmg.exp(*scb)
+		if ea < eb || ( ea == eb && irb.para_call(para, *scb) < ira.para_call(para, *sca) )
+			raise Mgmg::SearchCutException
+		end
+		while tag < term
+			sca, scb = a.search(para, tag, smith_min_a, armor_min_a, min_smith: min_smith, irep: ira), b.search(para, tag, smith_min_b, armor_min_b, min_smith: min_smith, irep: irb)
+			ea, eb = Mgmg.exp(*sca), Mgmg.exp(*scb)
+			pa, pb = ira.para_call(para, *sca), irb.para_call(para, *scb)
+			if eb < ea
+				return [tag-1, pb]
+			elsif ea == eb
+				if pa < pb
+					return [tag-1, pa]
+				else
+					tag = pb + 1
+				end
+			else
+				tag = pa + 1
+			end
+		end
+		raise UnexpectedError
+	end
+	
+	module_function def find_upperbound(a, b, para, start, term, smith_min_a: nil, smith_min_b: nil, armor_min_a: nil, armor_min_b: nil, min_smith: false, reinforcement: [])
+		if start <= term
+			raise ArgumentError, "term < start is needed, (start, term) = (#{start}, #{term}) are given"
+		end
+		ira, irb = a.ir(reinforcement: reinforcement), b.ir(reinforcement: reinforcement)
+		sca, scb = a.search(para, start, smith_min_a, armor_min_a, min_smith: min_smith, irep: ira), b.search(para, start, smith_min_b, armor_min_b, min_smith: min_smith, irep: irb)
+		ea, eb = Mgmg.exp(*sca), Mgmg.exp(*scb)
+		if ea < eb || ( ea == eb && irb.para_call(para, *scb) < ira.para_call(para, *sca) )
+			a, b, ira, irb, sca, scb, ea, eb = b, a, irb, ira, scb, sca, eb, ea
+			smith_min_a, smith_min_b, armor_min_a, armor_min_b = smith_min_b, smith_min_a, armor_min_b, armor_min_a
+		end
+		tagu = ira.para_call(para, *sca)
+		sca[-1] -= 2
+		tagl = ira.para_call(para, *sca)
+		sca, scb = a.search(para, term, smith_min_a, armor_min_a, min_smith: min_smith, irep: ira), b.search(para, term, smith_min_b, armor_min_b, min_smith: min_smith, irep: irb)
+		ea, eb = Mgmg.exp(*sca), Mgmg.exp(*scb)
+		if eb < ea || ( ea == eb && ira.para_call(para, *sca) < irb.para_call(para, *scb) )
+			raise Mgmg::SearchCutException
+		end
+		while term < tagu
+			ret = nil
+			sca = a.search(para, tagl, smith_min_a, armor_min_a, min_smith: min_smith, irep: ira)
+			next_tagu, next_sca = tagl, sca
+			scb = b.search(para, tagl, smith_min_b, armor_min_b, min_smith: min_smith, irep: irb)
+			while tagl < tagu
+				ea, eb = Mgmg.exp(*sca), Mgmg.exp(*scb)
+				pa, pb = ira.para_call(para, *sca), irb.para_call(para, *scb)
+				if ea < eb
+					ret = tagl
+					sca = a.search(para, pa + 1, smith_min_a, armor_min_a, min_smith: min_smith, irep: ira)
+					tagl = ira.para_call(para, *sca)
+					scb = b.search(para, tagl, smith_min_b, armor_min_b, min_smith: min_smith, irep: irb)
+				elsif ea == eb
+					if pb < pa
+						ret = tagl
+						sca = a.search(para, pa + 1, smith_min_a, armor_min_a, min_smith: min_smith, irep: ira)
+						tagl = ira.para_call(para, *sca)
+						scb = b.search(para, tagl, smith_min_b, armor_min_b, min_smith: min_smith, irep: irb)
+					else
+						scb = b.search(para, pb + 1, smith_min_b, armor_min_b, min_smith: min_smith, irep: irb)
+						tagl = irb.para_call(para, *scb)
+						sca = a.search(para, tagl, smith_min_a, armor_min_a, min_smith: min_smith, irep: ira)
+					end
+				else
+					sca = a.search(para, pa + 1, smith_min_a, armor_min_a, min_smith: min_smith, irep: ira)
+					tagl = ira.para_call(para, *sca)
+					scb = b.search(para, tagl, smith_min_b, armor_min_b, min_smith: min_smith, irep: irb)
+				end
+			end
+			if ret.nil?
+				tagu = next_tagu
+				next_sca[-1] -= 2
+				tagl = ira.para_call(para, *next_sca)
+				if tagl == tagu
+					tagl = term
+				end
+			else
+				pa = ira.para_call(para, *a.search(para, ret+1, smith_min_a, armor_min_a, min_smith: min_smith, irep: ira))
+				pb = irb.para_call(para, *b.search(para, ret+1, smith_min_b, armor_min_b, min_smith: min_smith, irep: irb))
+				return [ret, [pa, pb].min]
+			end
+		end
+		raise UnexpectedError
+	end
+end

data/lib/mgmg/utils.rb

@@ -14,6 +14,31 @@ module Mgmg
 				end
 			end
 		end
+		refine Float do
+			alias :cdiv :quo # Floatの場合は普通の割り算
+			def comma3
+				s = self.to_s
+				case s
+				when %r|e|
+					s
+				when %r|\.|
+					ary = s.split('.')
+					ary[0].gsub(/(\d)(?=(\d{3})+(?!\d))/, '\1,') + '.' + ary[1]
+				else
+					s
+				end
+			end
+		end
+		refine Rational do
+			alias :cdiv :quo # Rationalの場合は普通の割り算
+			def comma3
+				if self.denominator == 1
+					self.numerator.comma3
+				else
+					self.to_f.comma3
+				end
+			end
+		end
 	end
 	using Refiner
 	
@@ -47,6 +72,11 @@ module Mgmg
 		attr_accessor :equip
 	end
 	class SearchCutException < StandardError; end
+	class UnexpectedError < StandardError
+		def initialize()
+			super("There is a bug in `mgmg' gem. Please report to https://github.com/cycloawaodorin/mgmg/issues .")
+		end
+	end
 	
 	module_function def exp(smith, armor, comp=armor.tap{armor=0})
 		if armor <= 0
@@ -129,6 +159,15 @@ module Mgmg
 		end
 		str
 	end
+		
+	module_function def parse_material(str)
+		m = /\A.+?(\d+)\Z/.match(str)
+		mat = MaterialIndex[str.to_sym]
+		if m.nil? || mat.nil?
+			raise InvalidMaterialError.new(str)
+		end
+		[mat, m[1].to_i, mat<90 ? mat.div(10) : 9]
+	end
 	
 	class Vec < Array
 		def add!(other)

data/lib/mgmg/version.rb

@@ -1,3 +1,3 @@
 module Mgmg
-  VERSION = "1.3.2"
+  VERSION = "1.4.2"
 end

data/lib/mgmg.rb

@@ -3,7 +3,10 @@ require_relative './mgmg/utils'
 require_relative './mgmg/const'
 require_relative './mgmg/equip'
 require_relative './mgmg/poly'
+require_relative './mgmg/ir'
 require_relative './mgmg/system_equip'
+require_relative './mgmg/cuisine'
+require_relative './mgmg/reinforce'
 require_relative './mgmg/search'
 require_relative './mgmg/optimize'
 
@@ -11,8 +14,8 @@ class String
 	def min_level(w=1)
 		Mgmg::Equip.min_level(self, w)
 	end
-	def min_levels(left_associative: true)
-		build(-1, -1, left_associative: left_associative).min_levels
+	def min_levels(w=1, left_associative: true)
+		build(-1, -1, left_associative: left_associative).min_levels(w)
 	end
 	def min_smith(left_associative: true)
 		Mgmg::Equip.min_smith(self, left_associative: left_associative)
@@ -23,19 +26,26 @@ class String
 	def build(smith=-1, comp=smith, left_associative: true)
 		Mgmg::Equip.build(self, smith, comp, left_associative: left_associative)
 	end
+	def ir(left_associative: true, reinforcement: [])
+		Mgmg::IR.build(self, left_associative: left_associative, reinforcement: reinforcement)
+	end
 	def poly(para=:cost, left_associative: true)
 		la = left_associative
 		case para
 		when :atkstr
 			self.poly(:attack, left_associative: la) + self.poly(:str, left_associative: la)
 		when :atk_sd
-			self.poly(:attack) + self.poly(:str, left_associative: la).quo(2) + self.poly(:dex, left_associative: la).quo(2)
+			self.poly(:attack, left_associative: la) + self.poly(:str, left_associative: la).quo(2) + self.poly(:dex, left_associative: la).quo(2)
 		when :dex_as
-			self.poly(:dex) + self.poly(:attack, left_associative: la).quo(2) + self.poly(:str, left_associative: la).quo(2)
+			self.poly(:dex, left_associative: la) + self.poly(:attack, left_associative: la).quo(2) + self.poly(:str, left_associative: la).quo(2)
 		when :mag_das
-			self.poly(:magic) + self.poly(:dex_as, left_associative: la).quo(2)
+			self.poly(:magic, left_associative: la) + self.poly(:dex_as, left_associative: la).quo(2)
 		when :magmag
-			self.poly(:magdef) + self.poly(:magic, left_associative: la).quo(2)
+			self.poly(:magdef, left_associative: la) + self.poly(:magic, left_associative: la).quo(2)
+		when :pmdef
+			pd = self.poly(:phydef, left_associative: la)
+			md = self.poly(:magmag, left_associative: la)
+			pd <= md ? pd : md
 		when :cost
 			if Mgmg::SystemEquip.keys.include?(self)
 				return Mgmg::TPolynomial.new(Mgmg::Mat.new(1, 1, 0.quo(1)), 28, 0, 12, 12)
@@ -62,13 +72,20 @@ class String
 	def peff(para, smith, comp=smith, left_associative: true)
 		poly(para, left_associative: left_associative).eff(smith, comp)
 	end
-	def show(smith=-1, comp=smith, left_associative: true)
-		built = self.build(smith, comp, left_associative: left_associative)
-		pstr = '%.3f' % built.fpower
+	def show(smith=-1, comp=smith, left_associative: true, para: :power, reinforcement: [])
+		rein = case reinforcement
+		when Array
+			reinforcement.map{|r| Mgmg::Reinforcement.compile(r)}
+		else
+			[Mgmg::Reinforcement.compile(reinforcement)]
+		end
+		built = self.build(smith, comp, left_associative: left_associative).reinforce(*rein)
+		pstr = '%.3f' % built.para_call(para)
 		pstr.sub!(/\.?0+\Z/, '')
 		puts "Building"
 		puts "  #{self}"
-		puts "with levels (#{smith}, #{comp}) yields (#{pstr}, #{built.total_cost})"
+		rein = rein.empty? ? '' : " reinforced by {#{rein.join(',')}}"
+		puts "with levels (#{smith}, #{comp})#{rein} yields (#{pstr}, #{built.total_cost})"
 		puts "  #{built}"
 	end
 	def phydef_optimize(smith=nil, comp=smith, left_associative: true, magdef_maximize: true)
@@ -80,21 +97,42 @@ class String
 end
 module Enumerable
 	def build(smith=-1, armor=smith, comp=armor.tap{armor=smith}, left_associative: true)
-		self.map do |str|
+		self.sum do |str|
 			m = /\A\[*([^\+]+)/.match(str)
 			if Mgmg::EquipPosition[m[1].build(0).kind] == 0
 				str.build(smith, comp, left_associative: left_associative)
 			else
 				str.build(armor, comp, left_associative: left_associative)
 			end
-		end.sum
+		end
+	end
+	def ir(left_associative: true, reinforcement: [])
+		self.sum do |str|
+			str.ir(left_associative: left_associative)
+		end.add_reinforcement(reinforcement)
+	end
+	def show(smith=-1, armor=smith, comp=armor.tap{armor=smith}, left_associative: true, para: :power, reinforcement: [])
+		rein = case reinforcement
+		when Array
+			reinforcement.map{|r| Mgmg::Reinforcement.compile(r)}
+		else
+			[Mgmg::Reinforcement.compile(reinforcement)]
+		end
+		built = self.build(smith, armor, comp, left_associative: left_associative).reinforce(*rein)
+		pstr = '%.3f' % built.para_call(para)
+		pstr.sub!(/\.?0+\Z/, '')
+		puts "Building"
+		puts "  #{self.join(', ')}"
+		rein = rein.empty? ? '' : " reinforced by {#{rein.join(',')}}"
+		puts "with levels (#{smith}, #{armor}, #{comp})#{rein} yields (#{pstr}, #{built.total_cost})"
+		puts "  #{built}"
 	end
-	def min_levels(left_associative: true)
-		build(-1, -1, -1, left_associative: left_associative).min_levels
+	def min_levels(w=1, left_associative: true)
+		build(-1, -1, -1, left_associative: left_associative).min_levels(w)
 	end
-	def min_level(left_associative: true)
+	def min_level(w=1, left_associative: true)
 		ret = [0, 0]
-		build(-1, -1, -1, left_associative: left_associative).min_levels.each do |str, level|
+		build(-1, -1, -1, left_associative: left_associative).min_levels(w).each do |str, level|
 			m = /\A\[*([^\+]+)/.match(str)
 			if Mgmg::EquipPosition[m[1].build(0).kind] == 0
 				ret[0] = [ret[0], level].max