mgmg 1.4.2 → 1.5.2

data/lib/mgmg/utils.rb

@@ -17,16 +17,33 @@ module Mgmg
 		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]
+				s = (self*100).round.to_s
+				if s[0] == '-'
+					g, s = '-', s[1..(-1)]
 				else
-					s
+					g = ''
 				end
+				raise unless %r|\A\d+\Z|.match(s)
+				case s.length
+				when 1
+					if s == '0'
+						'0.0'
+					else
+						g+'0.0'+s
+					end
+				when 2
+					if s[1] == '0'
+						g+'0.'+s[0]
+					else
+						g+'0.'+s
+					end
+				else
+					i, d = s[0..(-3)], s[(-2)..(-1)]
+					d = d[0] if d[1] == '0'
+					g+i.gsub(/(\d)(?=(\d{3})+(?!\d))/, '\1,') + '.' + d
+				end
+			rescue
+				self.to_s
 			end
 		end
 		refine Rational do
@@ -71,6 +88,27 @@ module Mgmg
 		end
 		attr_accessor :equip
 	end
+	class InvalidReinforcementNameError < StandardError
+		def initialize(str)
+			@name = str
+			super("Unknown skill or preset cuisine name `#{@name}' is given.")
+		end
+		attr_accessor :name
+	end
+	class InvalidRecipeError < StandardError
+		def initialize(msg=nil)
+			if msg.nil?
+				super("Neither String nor Enumerable recipe was set.")
+			else
+				super(msg)
+			end
+		end
+	end
+	class Over20Error < StandardError
+		def initialize(star)
+			super("The star of given recipe is #{star}. It can't be built since the star is over 20.")
+		end
+	end
 	class SearchCutException < StandardError; end
 	class UnexpectedError < StandardError
 		def initialize()
@@ -115,8 +153,13 @@ module Mgmg
 	module_function def invexp3(exp, sa, comp)
 		Math.sqrt(exp - ((sa-1)**2) - (2*((comp-1)**2)) - 4).round + 1
 	end
+	module_function def option(recipe=nil, **kw)
+		ret = Option.new(**kw)
+		ret.set_default(recipe) unless recipe.nil?
+		ret
+	end
 	
-	CharacterList = /[^\(\)\+0123456789\[\]あきくしすたてなねのびりるイウガクグサジスタダチツデトドニノフブペボムラリルロンヴー一万二光兜典刀剣劣匠双古名吹咆品哮地大天太子安宝小帽弓弩当息悪戦手指斧書服木本杖業樹歴殺水氷法火炎牙物玉王産用界異的皮盾短石砕竜紫綿耳聖脛腕腿般良色衣袋覇質軍軽輝輪重量金鉄鎧闇陽靴額飾首骨鬼龍]/
+	CharacterList = /[^\(\)\+0123456789\[\]あきくしすたてなねのびりるイウガクグサジスタダチツデトドニノフブペボムラリルロンヴー一万二光兜典刀剣劣匠双古名吹咆品哮地大天太子安宝小帽弓弩当息悪戦手指斧書服木本杖業樹歴殺水氷法火炎牙物玉王産用界異的皮盾短石砕竜紫綿耳聖脛腕腿般良色衣袋覇質軍軽輝輪重量金鉄鎧闇陽靴額飾首骨鬼龍]/.freeze
 	module_function def check_string(str)
 		str = str.gsub(/[\s　\\]/, '')
 		if m = CharacterList.match(str)
@@ -159,7 +202,7 @@ module Mgmg
 		end
 		str
 	end
-		
+	
 	module_function def parse_material(str)
 		m = /\A.+?(\d+)\Z/.match(str)
 		mat = MaterialIndex[str.to_sym]

data/lib/mgmg/version.rb

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

data/lib/mgmg.rb

@@ -7,134 +7,237 @@ require_relative './mgmg/ir'
 require_relative './mgmg/system_equip'
 require_relative './mgmg/cuisine'
 require_relative './mgmg/reinforce'
+require_relative './mgmg/option'
+require_relative './mgmg/recipe'
 require_relative './mgmg/search'
 require_relative './mgmg/optimize'
 
 class String
-	def min_level(w=1)
-		Mgmg::Equip.min_level(self, w)
+	using Mgmg::Refiner
+	def to_recipe(para=:power, allow_over20: false, **kw)
+		ret = Mgmg::Recipe.new(self, para, **kw)
+		raise Mgmg::Over20Error, ret.ir.star if (!allow_over20 and 20<ret.ir.star)
+		ret
+	end
+	def min_weight(opt: Mgmg::Option.new)
+		build(build(opt:).min_levels_max, opt:).weight
+	end
+	def max_weight(include_outsourcing=false, opt: Mgmg::Option.new)
+		if include_outsourcing
+			build(-1, opt:).weight
+		else
+			build(min_smith(opt:), opt:).weight
+		end
+	end
+	def min_level(w=0, include_outsourcing=false, opt: Mgmg::Option.new)
+		built = build(-1, opt:)
+		w = build(built.min_levels_max, -1, opt:).weight - w if w <= 0
+		return -1 if include_outsourcing && built.weight <= w
+		ms = min_smith(opt:)
+		return ms if build(ms, opt:).weight <= w
+		ary = [ms]
+		4.downto(1) do |wi| # 単品の最大重量は[斧|重鎧](金10石10)の5
+			built.min_levels(wi).values.each do |v|
+				(ary.include?(v) or ary << v) if ms < v
+			end
+		end
+		ary.sort.each do |l|
+			return l if build(l, opt:).weight <= w
+		end
+		raise ArgumentError, "w=`#{w}' is given, but the minimum weight for the recipe is `#{min_weight(opt:)}'."
+	end
+	def min_levels(w=1, opt: Mgmg::Option.new)
+		build(opt:).min_levels(w)
 	end
-	def min_levels(w=1, left_associative: true)
-		build(-1, -1, left_associative: left_associative).min_levels(w)
+	def min_levels_max(w=1, opt: Mgmg::Option.new)
+		min_levels(w, opt:).values.append(-1).max
 	end
-	def min_smith(left_associative: true)
-		Mgmg::Equip.min_smith(self, left_associative: left_associative)
+	def min_smith(opt: Mgmg::Option.new)
+		Mgmg::Equip.min_smith(self, opt:)
 	end
-	def min_comp(left_associative: true)
-		Mgmg::Equip.min_comp(self, left_associative: left_associative)
+	def min_comp(opt: Mgmg::Option.new)
+		Mgmg::Equip.min_comp(self, opt:)
 	end
-	def build(smith=-1, comp=smith, left_associative: true)
-		Mgmg::Equip.build(self, smith, comp, left_associative: left_associative)
+	def build(smith=-1, comp=smith, opt: Mgmg::Option.new)
+		Mgmg::Equip.build(self, smith, comp, left_associative: opt.left_associative).reinforce(*opt.reinforcement)
 	end
-	def ir(left_associative: true, reinforcement: [])
-		Mgmg::IR.build(self, left_associative: left_associative, reinforcement: reinforcement)
+	def ir(opt: Mgmg::Option.new)
+		Mgmg::IR.build(self, left_associative: opt.left_associative, reinforcement: opt.reinforcement)
 	end
-	def poly(para=:cost, left_associative: true)
-		la = left_associative
+	def poly(para=:cost, opt: Mgmg::Option.new)
 		case para
 		when :atkstr
-			self.poly(:attack, left_associative: la) + self.poly(:str, left_associative: la)
+			self.poly(:attack, opt:) + self.poly(:str, opt:)
 		when :atk_sd
-			self.poly(:attack, left_associative: la) + self.poly(:str, left_associative: la).quo(2) + self.poly(:dex, left_associative: la).quo(2)
+			self.poly(:attack, opt:) + self.poly(:str, opt:).quo(2) + self.poly(:dex, opt:).quo(2)
 		when :dex_as
-			self.poly(:dex, left_associative: la) + self.poly(:attack, left_associative: la).quo(2) + self.poly(:str, left_associative: la).quo(2)
+			self.poly(:dex, opt:) + self.poly(:attack, opt:).quo(2) + self.poly(:str, opt:).quo(2)
 		when :mag_das
-			self.poly(:magic, left_associative: la) + self.poly(:dex_as, left_associative: la).quo(2)
+			self.poly(:magic, opt:) + self.poly(:dex_as, opt:).quo(2)
+		when :magic2
+			self.poly(:magic, opt:).scalar(2)
 		when :magmag
-			self.poly(:magdef, left_associative: la) + self.poly(:magic, left_associative: la).quo(2)
+			self.poly(:magdef, opt:) + self.poly(:magic, opt:).quo(2)
 		when :pmdef
-			pd = self.poly(:phydef, left_associative: la)
-			md = self.poly(:magmag, left_associative: la)
+			pd = self.poly(:phydef, opt:)
+			md = self.poly(:magmag, opt:)
 			pd <= md ? pd : md
 		when :cost
-			if Mgmg::SystemEquip.keys.include?(self)
+			if Mgmg::SystemEquip.has_key?(self)
 				return Mgmg::TPolynomial.new(Mgmg::Mat.new(1, 1, 0.quo(1)), 28, 0, 12, 12)
 			end
-			built = self.build(-1)
+			built = self.build(-1, opt:)
 			const = (built.star**2) * ( /\+/.match(self) ? 5 : ( built.kind < 8 ? 2 : 1 ) )
-			ret = poly(:attack, left_associative: la) + poly(:phydef, left_associative: la) + poly(:magdef, left_associative: la)
-			ret += poly(:hp, left_associative: la).quo(4) + poly(:mp, left_associative: la).quo(4)
-			ret += poly(:str, left_associative: la) + poly(:dex, left_associative: la) + poly(:speed, left_associative: la) + poly(:magic, left_associative: la)
+			ret = poly(:attack, opt:) + poly(:phydef, opt:) + poly(:magdef, opt:)
+			ret += poly(:hp, opt:).quo(4) + poly(:mp, opt:).quo(4)
+			ret += poly(:str, opt:) + poly(:dex, opt:) + poly(:speed, opt:) + poly(:magic, opt:)
 			ret.mat.body[0][0] += const
 			ret
 		else
-			Mgmg::TPolynomial.build(self, para, left_associative: la)
+			Mgmg::TPolynomial.build(self, para, left_associative: opt.left_associative)
 		end
 	end
-	def eff(para, smith, comp=smith, left_associative: true)
-		a = build(smith, comp, left_associative: left_associative).para_call(para)
-		b = build(smith+1, comp, left_associative: left_associative).para_call(para)
-		c = build(smith, comp+2, left_associative: left_associative).para_call(para)
+	def eff(para, smith, comp=smith, opt: Mgmg::Option.new)
+		a = build(smith, comp, opt:).para_call(para)
+		b = build(smith+1, comp, opt:).para_call(para)
+		c = build(smith, comp+2, opt:).para_call(para)
 		sden = smith==0 ? 1 : 2*smith-1
 		cden = comp==0 ? 4 : 8*comp
 		[(b-a).quo(sden), (c-a).quo(cden)]
 	end
-	def peff(para, smith, comp=smith, left_associative: true)
-		poly(para, left_associative: left_associative).eff(smith, comp)
+	def peff(para, smith, comp=smith, opt: Mgmg::Option.new)
+		poly(para, opt:).eff(smith, comp)
 	end
-	def show(smith=-1, comp=smith, left_associative: true, para: :power, reinforcement: [])
-		rein = case reinforcement
+	def show(smith=-1, comp=smith, para: :power, opt: Mgmg::Option.new)
+		rein = case opt.reinforcement
 		when Array
-			reinforcement.map{|r| Mgmg::Reinforcement.compile(r)}
+			opt.reinforcement.map{|r| Mgmg::Reinforcement.compile(r)}
 		else
-			[Mgmg::Reinforcement.compile(reinforcement)]
+			[Mgmg::Reinforcement.compile(opt.reinforcement)]
 		end
-		built = self.build(smith, comp, left_associative: left_associative).reinforce(*rein)
+		built = build(smith, comp, opt:)
 		pstr = '%.3f' % built.para_call(para)
 		pstr.sub!(/\.?0+\Z/, '')
-		puts "Building"
+		puts "With levels (#{smith}, #{comp}: #{Mgmg.exp(smith, comp).comma3}), building"
 		puts "  #{self}"
-		rein = rein.empty? ? '' : " reinforced by {#{rein.join(',')}}"
-		puts "with levels (#{smith}, #{comp})#{rein} yields (#{pstr}, #{built.total_cost})"
+		rein = rein.empty? ? '' : "reinforced by {#{rein.join(',')}} "
+		puts "#{rein}yields (#{pstr}, #{built.total_cost})"
 		puts "  #{built}"
 	end
-	def phydef_optimize(smith=nil, comp=smith, left_associative: true, magdef_maximize: true)
-		Mgmg::Optimize.phydef_optimize(self, smith, comp, left_associative: left_associative, magdef_maximize: magdef_maximize)
+	def phydef_optimize(smith=nil, comp=smith, opt: Mgmg::Option.new)
+		Mgmg::Optimize.phydef_optimize(self, smith, comp, opt:)
 	end
-	def buster_optimize(smith=nil, comp=smith, left_associative: true)
-		Mgmg::Optimize.buster_optimize(self, smith, comp, left_associative: left_associative)
+	def buster_optimize(smith=nil, comp=smith, opt: Mgmg::Option.new)
+		Mgmg::Optimize.buster_optimize(self, smith, comp, opt:)
 	end
 end
 module Enumerable
-	def build(smith=-1, armor=smith, comp=armor.tap{armor=smith}, left_associative: true)
-		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)
+	using Mgmg::Refiner
+	def to_recipe(para=:power, **kw)
+		Mgmg::Recipe.new(self, para, **kw)
+	end
+	def build(smith=-1, armor=smith, comp=armor.tap{armor=smith}, opt: Mgmg::Option.new)
+		opt = opt.dup
+		rein = opt.reinforcement
+		opt.reinforcement = []
+		self.sum(Mgmg::Equip::Zero) do |str|
+			if Mgmg::EquipPosition[str.build(opt:).kind] == 0
+				str.build(smith, comp, opt:)
 			else
-				str.build(armor, comp, left_associative: left_associative)
+				str.build(armor, comp, opt:)
 			end
-		end
+		end.reinforce(*rein)
 	end
-	def ir(left_associative: true, reinforcement: [])
-		self.sum do |str|
-			str.ir(left_associative: left_associative)
-		end.add_reinforcement(reinforcement)
+	def ir(opt: Mgmg::Option.new)
+		self.sum(Mgmg::IR::Zero) do |str|
+			str.ir(opt:)
+		end.add_reinforcement(opt.reinforcement)
 	end
-	def show(smith=-1, armor=smith, comp=armor.tap{armor=smith}, left_associative: true, para: :power, reinforcement: [])
-		rein = case reinforcement
+	def show(smith=-1, armor=smith, comp=armor.tap{armor=smith}, para: :power, opt: Mgmg::Option.new)
+		rein = case opt.reinforcement
 		when Array
-			reinforcement.map{|r| Mgmg::Reinforcement.compile(r)}
+			opt.reinforcement.map{|r| Mgmg::Reinforcement.compile(r)}
 		else
-			[Mgmg::Reinforcement.compile(reinforcement)]
+			[Mgmg::Reinforcement.compile(opt.reinforcement)]
 		end
-		built = self.build(smith, armor, comp, left_associative: left_associative).reinforce(*rein)
+		built = self.build(smith, armor, comp, opt:)
 		pstr = '%.3f' % built.para_call(para)
 		pstr.sub!(/\.?0+\Z/, '')
-		puts "Building"
+		puts "With levels (#{smith}, #{armor}, #{comp}: #{Mgmg.exp(smith, armor, comp).comma3}), building"
 		puts "  #{self.join(', ')}"
-		rein = rein.empty? ? '' : " reinforced by {#{rein.join(',')}}"
-		puts "with levels (#{smith}, #{armor}, #{comp})#{rein} yields (#{pstr}, #{built.total_cost})"
+		rein = rein.empty? ? '' : "reinforced by {#{rein.join(',')}} "
+		puts "#{rein}yields (#{pstr}, #{built.total_cost})"
 		puts "  #{built}"
 	end
-	def min_levels(w=1, left_associative: true)
-		build(-1, -1, -1, left_associative: left_associative).min_levels(w)
+	def min_weight(opt: Mgmg::Option.new)
+		build(*build(opt:).min_levels_max, -1, opt:).weight
+	end
+	def max_weight(include_outsourcing=false, opt: Mgmg::Option.new)
+		if include_outsourcing
+			build(-1, opt:).weight
+		else
+			build(*min_smith(opt:), -1, opt:).weight
+		end
+	end
+	def min_weights(opt: Mgmg::Option.new)
+		weapons, armors = [], []
+		each do |str|
+			if Mgmg::EquipPosition[str.build(opt:).kind] == 0
+				weapons << str
+			else
+				armors << str
+			end
+		end
+		[weapons.min_weight(opt:), armors.min_weight(opt:)]
+	end
+	def max_weights(include_outsourcing=false, opt: Mgmg::Option.new)
+		weapons, armors = [], []
+		each do |str|
+			if Mgmg::EquipPosition[str.build(opt:).kind] == 0
+				weapons << str
+			else
+				armors << str
+			end
+		end
+		[weapons.max_weight(include_outsourcing, opt:), armors.max_weight(include_outsourcing, opt:)]
+	end
+	def min_level(ws=0, wa=ws, include_outsourcing=false, opt: Mgmg::Option.new)
+		weapons, armors = [], []
+		each do |str|
+			if Mgmg::EquipPosition[str.build(opt:).kind] == 0
+				weapons << str
+			else
+				armors << str
+			end
+		end
+		ms, ma = min_smith(opt:)
+		rs = min_level_sub(ws, ms, 0, weapons, include_outsourcing, opt:)
+		ra = min_level_sub(wa, ma, 1, armors, include_outsourcing, opt:)
+		[rs, ra]
+	end
+	private def min_level_sub(w, ms, i, recipe, include_outsourcing, opt: Mgmg::Option.new)
+		built = recipe.build(opt:)
+		w = recipe.build(built.min_levels_max[i], opt:).weight - w if w <= 0
+		return -1 if include_outsourcing && built.weight <= w
+		return ms if build(ms, opt:).weight <= w
+		ary = [ms]
+		4.downto(1) do |wi|
+			built.min_levels(wi).values.each do |v|
+				(ary.include?(v) or ary << v) if ms << v
+			end
+		end
+		ary.sort.each do |l|
+			return l if recipe.build(l, opt:).weight <= w
+		end
+		raise ArgumentError, "w#{%w|s a|[i]}=`#{w}' is given, but the minimum weight for the #{%w|weapon(s) armor(s)|[i]} is `#{recipe.min_weight(opt:)}'."
+	end
+	def min_levels(w=1, opt: Mgmg::Option.new)
+		build(opt:).min_levels(w)
 	end
-	def min_level(w=1, left_associative: true)
-		ret = [0, 0]
-		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
+	def min_levels_max(w=1, opt: Mgmg::Option.new)
+		ret = [-1, -1]
+		min_levels(w, opt:).each do |str, level|
+			if Mgmg::EquipPosition[str.build(opt:).kind] == 0
 				ret[0] = [ret[0], level].max
 			else
 				ret[1] = [ret[1], level].max
@@ -142,12 +245,11 @@ module Enumerable
 		end
 		ret
 	end
-	def min_smith(left_associative: true)
-		ret = [0, 0]
+	def min_smith(opt: Mgmg::Option.new)
+		ret = [-1, -1]
 		self.each do |str|
-			s = Mgmg::Equip.min_smith(str, left_associative: left_associative)
-			m = /\A\[*([^\+]+)/.match(str)
-			if Mgmg::EquipPosition[m[1].build(0).kind] == 0
+			s = Mgmg::Equip.min_smith(str, opt:)
+			if Mgmg::EquipPosition[str.build(opt:).kind] == 0
 				ret[0] = [ret[0], s].max
 			else
 				ret[1] = [ret[1], s].max
@@ -155,9 +257,9 @@ module Enumerable
 		end
 		ret
 	end
-	def min_comp(left_associative: true)
+	def min_comp(opt: Mgmg::Option.new)
 		self.map do |str|
-			Mgmg::Equip.min_comp(str, left_associative: left_associative)
-		end.max
+			Mgmg::Equip.min_comp(str, opt:)
+		end.append(-1).max
 	end
 end

data/mgmg.gemspec

@@ -35,9 +35,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", ">= 2.1.2"
-  spec.add_development_dependency "rake", ">= 13.0.1"
-  spec.add_development_dependency "irb", ">= 1.2.3"
+  spec.add_development_dependency "bundler", ">= 2.3.16"
+  spec.add_development_dependency "rake", ">= 13.0.6"
+  spec.add_development_dependency "irb", ">= 1.4.1"
   
-  spec.required_ruby_version = '>= 2.4.0'
+  spec.required_ruby_version = '>= 3.1.0'
 end