mgmg 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ae250ef7035838c1f0598c419e66259c1cde7ab692e5b5ffefcd78ab845207d
-  data.tar.gz: 0fd5f62e8c3ac85ba990010bca631e08111b50d69fad11d782fcadfe075781fd
+  metadata.gz: d35a19c90c58e70a8410540581af727523ea22584580bbf5ccf3b50fd19cbe4c
+  data.tar.gz: ca9c6122b4d7d84389787a10ac7073e5f3f633d1c1fffab58be1ad693e3613d4
 SHA512:
-  metadata.gz: 40bdd74efb69a024d87d265340caefd48ee90f4d3fd9d74d2a7a46fd78c6a553bc931798636b1ebc8bed8e95cfa8c6501a554c073897ac0ae9be3fdd37298466
-  data.tar.gz: 9c32dfaf9a0d1027afd33e70562e813f7cce5a0378e0e81f806e77e3d4415ee4d779a09b7d3b122d523d9a0f8cc10af1a97da0ee3e3464440777b82efee35c48
+  metadata.gz: ab690d14c5d159646fa354b551eefe5a2afb7ab8c227769cdd5397262c5b810776611c3171c88af3143a96b18eac10050348c80c9b9801fc809544ec7291414d
+  data.tar.gz: a17fafc6c8eefdca6a137b0311f2e8ca1e44c71a8ea8a6341359ab6929d6b25228b8d0be96ef06ee29be514e0abfaa93cbc1a0f45ae1cb746175d39ad7a3207d

data/CHANGELOG.md

@@ -30,7 +30,7 @@
 - マニュアル等の不備を修正．
 
 ## 1.0.9 2019/05/30
-- 丸めを無視した多項式近似(変数は製作レベル)を表す `Mgmg::TPolynomial`およびこれを生成するメソッド String#poly を追加．
+- 丸めを無視した多項式近似(変数は製作レベル)を表す`Mgmg::TPolynomial`およびこれを生成するメソッド`String#poly`を追加．
 
 ## 1.0.10 2019/06/29
 - 消費エレメント量を返す`Mgmg::Equip#total_cost`を追加．
@@ -93,3 +93,9 @@
 - `Mgmg.#exp`に3引数を与えられるように修正．
 - `String#search`，`Enumerable#search`を追加．
 - `Enumerable#min_levels`，`Enumerable#min_level`，`Enumerable#min_smith`，`Enumerable#min_comp`を追加．
+
+## 1.3.2 2021/05/18
+- `Mgmg::TPolynomial`に比較演算子を追加．
+- `String#phydef_optimize`，`String#buster_optimize`を追加．
+- (`Enumerable#search`から呼び出される)`Enumerable#comp_search`における最大道具製作レベルチェックが間違っていたバグを修正．
+- `String#search`および`Enumerable#search`において，総経験値量が等しい組み合わせの場合，目標パラメータが大きくなる製作Lvの組み合わせを返すように修正．

data/README.md

@@ -174,6 +174,15 @@ puts '小竜咆哮'.build
 ### `String#peff(para, smith, comp=smith, left_associative: true)`
 近似多項式における偏微分値を使用した場合の，`String#eff`と同様の値を返します．`self.poly(para, left_associative: left_associative).eff(smith, comp)`と等価です．
 
+### `String#phydef_optimize(smith=nil, comp=smith, left_associative: true, magdef_maximize: true)`
+反転物防装備の反転材の種別，素材の最適化を行い，修正したレシピを返します．
+`smith`，`comp`は探索を行う製作レベルを表し，`smith`が`nil`の場合，近似多項式で最適化を行います．近似多項式では，道具製作レベルの次数が高い項の係数を最適化します．
+物防を最大化するレシピのうち，`magdef_maximize`が真なら魔防を最大化する組み合わせ，偽ならコストを最小化(≒魔防を最小化)する組み合わせを探索します．
+ある範囲での全数探索を行うため，段数の多いレシピでは計算量が膨大になるほか，厳密な最適化を保証するものではなく，今後のアップデートで解が変わるような変更が入る可能性があります．
+
+### `String#buster_optimize(smith=nil, comp=smith, left_associative: true)`
+`String#phydef_optimize`の魔力弓版で，反転材の素材の最適化を行い，修正したレシピを返します．
+
 ### `Mgmg::Equip`
 前述の`String#build`によって生成される装備品のクラスです．複数装備の合計値を表す「複数装備」という種別の装備品の場合もあります．以下のようなインスタンスメソッドが定義されています．
 

data/lib/mgmg.rb

@@ -5,6 +5,7 @@ require_relative './mgmg/equip'
 require_relative './mgmg/poly'
 require_relative './mgmg/system_equip'
 require_relative './mgmg/search'
+require_relative './mgmg/optimize'
 
 class String
 	def min_level(w=1)
@@ -70,6 +71,12 @@ class String
 		puts "with levels (#{smith}, #{comp}) 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)
+	end
+	def buster_optimize(smith=nil, comp=smith, left_associative: true)
+		Mgmg::Optimize.buster_optimize(self, smith, comp, left_associative: left_associative)
+	end
 end
 module Enumerable
 	def build(smith=-1, armor=smith, comp=armor.tap{armor=smith}, left_associative: true)

data/lib/mgmg/optimize.rb

@@ -0,0 +1,213 @@
+module Mgmg
+	module Optimize; end
+	class << Optimize
+		InvList = [%w|帽子 フード サンダル|.freeze, %w|宝1 骨1 木1 木2 骨2|.freeze, %w|宝1 骨1 木1|.freeze].freeze
+		def phydef_optimize(str, smith, comp=smith, left_associative: true, magdef_maximize: true)
+			best = ( smith.nil? ? [str, str.poly(:phydef), str.poly(:magdef), str.poly(:cost)] : [str, str.build(smith, comp)] )
+			str = Mgmg.check_string(str)
+			ai = 0
+			while str.sub!(/(帽子|フード|サンダル)\([宝木骨][12][宝木骨]1\)/){
+				ai += 1
+				"<A#{ai}>"
+			}; end
+			bi = 0
+			while str.sub!(/[宝木骨]1\)/){
+				bi += 1
+				"<B#{bi}>)"
+			}; end
+			skin = false
+			m = /([^\+]*\([^\(]+[綿皮]1\))\]*\Z/.match(str)
+			if m
+				if smith
+					if m[1].sub(/綿1\)/, '皮1)').build(smith).weight == m[1].sub(/皮1\)/, '綿1)').build(smith).weight
+						skin = true
+					end
+				else
+					skin = true
+				end
+				str = str.sub(/皮(1\)\]*)\Z/) do
+					"綿#{$1}"
+				end
+			end
+			a = Array.new(ai){ [0, 0, 0] }
+			b0 = Array.new(bi){ 0 }
+			while a
+				b = b0
+				while b
+					r = pd_apply_idx(str, a, b)
+					best = pd_better(best, ( smith.nil? ? [r, r.poly(:phydef), r.poly(:magdef), r.poly(:cost)] : [r, r.build(smith, comp)] ), magdef_maximize)
+					b = pd_next_b(b)
+				end
+				a = pd_next_a(a)
+			end
+			if skin
+				str = str.sub(/綿(1\)\]*)\Z/) do
+					"皮#{$1}"
+				end
+				a = Array.new(ai){ [0, 0, 0] }
+				while a
+					b = b0
+					while b
+						r = pd_apply_idx(str, a, b)
+						best = pd_better(best, ( smith.nil? ? [r, r.poly(:phydef), r.poly(:magdef), r.poly(:cost)] : [r, r.build(smith, comp)] ), magdef_maximize)
+						b = pd_next_b(b)
+					end
+					a = pd_next_a(a)
+				end
+			end
+			best[0]
+		end
+		private def pd_better(pre, cur, mag)
+			case pre.size
+			when 2
+				if pre[1].phydef < cur[1].phydef
+					return cur
+				elsif pre[1].phydef == cur[1].phydef
+					if mag
+						if pre[1].magdef < cur[1].magdef
+							return cur
+						elsif pre[1].magdef == cur[1].magdef
+							if cur[1].total_cost.sum < pre[1].total_cost.sum
+								return cur
+							end
+						end
+					else
+						if cur[1].comp_cost < pre[1].comp_cost
+							return cur
+						elsif cur[1].comp_cost == pre[1].comp_cost
+							if cur[1].total_cost.sum < pre[1].total_cost.sum
+								return cur
+							end
+						end
+					end
+				end
+				return pre
+			when 4
+				if pre[1] < cur[1]
+					return cur
+				elsif pre[1] == cur[1]
+					if mag
+						if pre[2] < cur[2]
+							return cur
+						elsif pre[2] == cur[2]
+							if cur[3] < pre[3]
+								return cur
+							end
+						end
+					else
+						if cur[3] < pre[3]
+							return cur
+						end
+					end
+				end
+				return pre
+			else
+				raise "Unexpected Error"
+			end
+		end
+		private def pd_apply_idx(str, a, b)
+			a.each.with_index do |aa, i|
+				str = str.sub("<A#{i+1}>", "#{InvList[0][aa[0]]}(#{InvList[1][aa[1]]}#{InvList[2][aa[2]]})")
+			end
+			b.each.with_index do |bb, i|
+				str = str.sub("<B#{i+1}>", InvList[2][bb])
+			end
+			str
+		end
+		private def pd_next_b_full(b)
+			0.upto(b.length-1) do |i|
+				b[i] += 1
+				if b[i] == InvList[2].size
+					b[i] = 0
+				else
+					return b
+				end
+			end
+			nil
+		end
+		private def pd_next_b(b)
+			if b[0] == 0
+				return Array.new(b.length, 1)
+			end
+			nil
+		end
+		private def pd_next_a(a)
+			0.upto(a.length-1) do |i|
+				0.upto(2) do |j|
+					a[i][j] += 1
+					if a[i][j] == InvList[j].size
+						a[i][j] = 0
+					else
+						return a
+					end
+				end
+			end
+			nil
+		end
+		
+		MwList = %w|綿 皮 骨 木 水|.freeze
+		def buster_optimize(str, smith, comp=smith, left_associative: true)
+			best = ( smith.nil? ? [str, str.poly(:mag_das)] : [str, str.build(smith, comp)] )
+			str = Mgmg.check_string(str)
+			ai = -1
+			org = nil
+			while str.sub!(/弓\(([骨水綿皮木][12][骨水綿皮木]1)\)/){
+				ai += 1
+				if ai == 0
+					org = $1.dup
+				end
+				"弓(<A#{ai}>)"
+			}; end
+			str = str.sub(/<A0>/, org)
+			a = Array.new(ai){ [0, 0, 0] }
+			while a
+				r = bus_apply_idx(str, a)
+				best = bus_better(best, ( smith.nil? ? [r, r.poly(:mag_das)] : [r, r.build(smith, comp)] ))
+				a = bus_next_a(a)
+			end
+			best[0]
+		end
+		private def bus_apply_idx(str, a)
+			a.each.with_index do |aa, i|
+				str = str.sub("<A#{i+1}>", "#{MwList[aa[0]]}#{aa[1]+1}#{MwList[aa[2]]}1")
+			end
+			str
+		end
+		private def bus_better(pre, cur)
+			if pre[1].kind_of?(Mgmg::Equip)
+				if pre[1].mag_das < cur[1].mag_das
+					return cur
+				elsif pre[1].mag_das == cur[1].mag_das
+					if cur[1].total_cost.sum < pre[1].total_cost.sum
+						return cur
+					end
+				end
+				return pre
+			else
+				if pre[1] < cur[1]
+					return cur
+				end
+				return pre
+			end
+		end
+		private def bus_next_a(a)
+			0.upto(a.length-1) do |i|
+				[0, 2].each do |j|
+					a[i][j] += 1
+					if a[i][j] == 5
+						a[i][j] = 0
+					else
+						return a
+					end
+				end
+				a[i][1] += 1
+				if a[i][1] == 2
+					a[i][1] = 0
+				else
+					return a
+				end
+			end
+			nil
+		end
+	end
+end

data/lib/mgmg/poly.rb

@@ -139,10 +139,12 @@ module Mgmg
 			ret
 		end
 		def +(other)
+			other = self.coerce(other)[0] unless other.kind_of?(self.class)
 			mat = @mat.padd(other.mat)
 			self.class.new(mat, 28, 0, 12, 12)
 		end
 		def -(other)
+			other = self.coerce(other)[0] unless other.kind_of?(self.class)
 			mat = @mat.padd(other.mat.scalar(-1))
 			self.class.new(mat, 28, 0, 12, 12)
 		end
@@ -204,6 +206,76 @@ module Mgmg
 			end
 			ret.nil? ? 0 : ret
 		end
+		
+		def coerce(other)
+			[self.class.new(Mat.new(1, 1, other), 28, 0, 12, 12), self]
+		end
+		def <(other)
+			foo = self-other
+			(foo.mat.row_size-1).downto(0) do |s|
+				(foo.mat.col_size-1).downto(0) do |c|
+					bar = foo.mat.body[s][c]
+					if bar < 0
+						return true
+					elsif 0 < bar
+						return false
+					end
+				end
+			end
+			false
+		end
+		def <=(other)
+			foo = self-other
+			(foo.mat.row_size-1).downto(0) do |s|
+				(foo.mat.col_size-1).downto(0) do |c|
+					bar = foo.mat.body[s][c]
+					if bar < 0
+						return true
+					elsif 0 < bar
+						return false
+					end
+				end
+			end
+			true
+		end
+		def >(other)
+			foo = other-self
+			(foo.mat.row_size-1).downto(0) do |s|
+				(foo.mat.col_size-1).downto(0) do |c|
+					bar = foo.mat.body[s][c]
+					if bar < 0
+						return true
+					elsif 0 < bar
+						return false
+					end
+				end
+			end
+			false
+		end
+		def >=(other)
+			foo = other-self
+			(foo.mat.row_size-1).downto(0) do |s|
+				(foo.mat.col_size-1).downto(0) do |c|
+					bar = foo.mat.body[s][c]
+					if bar < 0
+						return true
+					elsif 0 < bar
+						return false
+					end
+				end
+			end
+			true
+		end
+		def ==(other)
+			foo = self-other
+			(foo.mat.row_size-1).downto(0) do |s|
+				(foo.mat.col_size-1).downto(0) do |c|
+					bar = foo.mat.body[s][c]
+					return false if bar != 0
+				end
+			end
+			true
+		end
 	end
 	class << TPolynomial
 		ParamIndex = Hash.new

data/lib/mgmg/search.rb

@@ -72,7 +72,13 @@ class String
 			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)
 			exp = Mgmg.exp(smith, comp)
-			minex, ret = exp, [smith, comp] if exp < minex
+			if exp < minex
+				minex, ret = exp, [smith, comp]
+			elsif exp == minex
+				if build(*ret).para_call(para) < build(smith, comp).para_call(para)
+					ret = [smith, comp]
+				end
+			end
 		rescue Mgmg::SearchCutException
 		end
 		raise Mgmg::SearchCutException, "the result exceeds given cut_exp=#{cut_exp}" if cut_exp < minex
@@ -165,7 +171,13 @@ module Enumerable
 				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)
 				exp = Mgmg.exp(smith, armor, comp)
-				minex, ret = exp, [smith, armor] if exp < minex
+				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)
+						ret = [smith, armor]
+					end
+				end
 			rescue Mgmg::SearchCutException
 			end
 		else
@@ -173,7 +185,13 @@ module Enumerable
 				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)
 				exp = Mgmg.exp(smith, armor, comp)
-				minex, ret = exp, [smith, armor] if exp < minex
+				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)
+						ret = [smith, armor]
+					end
+				end
 			rescue Mgmg::SearchCutException
 			end
 		end
@@ -187,7 +205,7 @@ module Enumerable
 		end
 		if target <= build(smith, armor, comp_min, left_associative: left_associative).para_call(para)
 			return comp_min
-		elsif build(smith, comp_max, left_associative: left_associative).para_call(para) < target
+		elsif build(smith, armor, comp_max, left_associative: left_associative).para_call(para) < target
 			raise ArgumentError, "given comp_max=#{comp_max} does not satisfies the target"
 		end
 		while 1 < comp_max - comp_min do
@@ -221,7 +239,13 @@ module Enumerable
 			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)
 			exp = Mgmg.exp(smith, armor, comp)
-			minex, ret = exp, [smith, armor, comp] if exp < minex
+			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)
+					ret = [smith, armor, comp]
+				end
+			end
 		rescue Mgmg::SearchCutException
 		end
 		raise Mgmg::SearchCutException, "the result exceeds given cut_exp=#{cut_exp}" if cut_exp < minex

data/lib/mgmg/utils.rb

@@ -221,6 +221,9 @@ module Mgmg
 		def col_size
 			@body[0].length
 		end
+		def shape
+			[row_size(), col_size()]
+		end
 		def each_with_index
 			@body.each.with_index do |row, i|
 				row.each.with_index do |e, j|

data/lib/mgmg/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mgmg
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - KAZOON
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-08-31 00:00:00.000000000 Z
+date: 2021-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,7 +52,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.3
-description: 
+description:
 email:
 - cycloawaodorin+gem@gmail.com
 executables: []
@@ -70,6 +70,7 @@ files:
 - lib/mgmg.rb
 - lib/mgmg/const.rb
 - lib/mgmg/equip.rb
+- lib/mgmg/optimize.rb
 - lib/mgmg/poly.rb
 - lib/mgmg/search.rb
 - lib/mgmg/system_equip.rb
@@ -82,7 +83,7 @@ metadata:
   homepage_uri: https://github.com/cycloawaodorin/
   source_code_uri: https://github.com/cycloawaodorin/mgmg
   changelog_uri: https://github.com/cycloawaodorin/mgmg/blob/master/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -97,8 +98,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.2.17
+signing_key:
 specification_version: 4
 summary: Calculate specs of equipments of Megurimeguru, a game produced by Kou.
 test_files: []