mgmg 1.6.0 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: beb7f465bd84969abfb7ce5897d95f46171e84c2a0e3de9a14c42ccef5c23dfc
-  data.tar.gz: '09a7eda9204cb28a7a9fc24857353fb5cdcfd21e44564d4a25997658c92fdfd3'
+  metadata.gz: 0aee0bc2d348dfc0e23ce8556cea710f7645b6a590145f67bc1d5715b8c999a1
+  data.tar.gz: eed968af79443fabb9b65e931b93079a5dd8c839af6ea0b6f84a62c1ad411eda
 SHA512:
-  metadata.gz: 5642dc8af3ac998c76650047c97747a32f2b631e9f6438c6a95e6068a9534dcd726d34dd8466fb1cba0e787f11847552aab4812e1b32d4320ff23a5ec8e15e18
-  data.tar.gz: a327745f26724f3f6bbeabf2ed9fcb687ca4e462ac608c219165845b6ccfeafd5a30c32fdda4ee182dd268db8e0b4528e0acc1bc819eaaae0698d9400c764797
+  metadata.gz: 218e8c123428a6ec6228c1d296973c8ec01ba77d09430c3e33e49df081364b2e3e295b4f02a480b5349a709dd26e955e8472852e872ba73dd87b2044ec690904
+  data.tar.gz: 1c9db46a5f5fe0fdcb76bc0fbeab261414e2d9df4661d3dfe91f137ab066e739584170695fc58868d5d64e1ddec578866a90fd9291c9a47eca31f3cfafab915d

data/CHANGELOG.md

@@ -169,3 +169,11 @@
 ## 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`を追加．
+
+## 1.6.2 2022/10/31
+- 既製品を含むかどうかのチェックを行った場合，同じレシピについては繰り返しチェックしないようにして高速化した．

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

@@ -33,9 +33,10 @@ module Mgmg
 			@irep = irep
 			@cut_exp = cut_exp
 			@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
+		attr_accessor :step, :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
@@ -76,7 +77,7 @@ module Mgmg
 			self
 		end
 		def set_default(recipe, force: false)
-			if @include_system_equips
+			if (!@system_equips_checked) and @include_system_equips then
 				case recipe
 				when String
 					@include_system_equips = false unless Mgmg::SystemEquipRegexp.values.any?{|re| re.match(recipe)}
@@ -85,6 +86,7 @@ module Mgmg
 				else
 					raise ArgumentError, 'recipe should be String or Enumerable'
 				end
+				@system_equips_checked = true
 			end
 			update_sa_min(recipe, force)
 			@comp_min = recipe.min_comp(opt: self) if force || @comp_min.nil?

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

@@ -369,6 +369,13 @@ module Mgmg
 		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
+		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
@@ -419,13 +426,18 @@ module Mgmg
 		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
+		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
-				sca, pa = foo, opt_a.irep.para_call(para, *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

data/lib/mgmg/version.rb

@@ -1,3 +1,3 @@
 module Mgmg
-	VERSION = "1.6.0"
+	VERSION = "1.6.2"
 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`を発生します．このチェックを抑制したい場合は，真にしてください．

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mgmg
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.2
 platform: ruby
 authors:
 - KAZOON
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-18 00:00:00.000000000 Z
+date: 2022-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler