seshbot-packing 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a3ee88fef7cdb7044eb06951aaee1a388dc499a33226d553ecf1d4af3865df2
-  data.tar.gz: 7ceb6a0a5ad57b515e881352907e42c3bec29330c1055a8947e9662f03ad0ebc
+  metadata.gz: f77cf089e5f02caf10d7af67e7d75260d3529c560b2cfee232ba3b72f5f36e94
+  data.tar.gz: ec54cf2361668f1c92789f9337f0feb8f744a1208192e74368d46773eddf1f4f
 SHA512:
-  metadata.gz: d7d04a459fbfc6dc06b7b028b535f5a1ab8e87579eb59f3aebc6803d82587abd7582c94074217e6935e189ba56d185138841aca429c3e774ff872c6e82e4a93c
-  data.tar.gz: 030363e4fe38d1f095766f836b86960639e8f3a23cbdde611c3d305cb259315816adc0a488cde7134f778958d3022f19056a0f850244324e0a844bc855195ba9
+  metadata.gz: 1e5539df5a295507c496115dfda6f972310c24ed88dfc97a2712f55e8c852e2f4f64bde98168e4d626f7a7f5484cfdf472705c0f4fec6139f06e90620bbc8ad4
+  data.tar.gz: c482b9e179a56795a7ff2559d72f708ab27a684dae5e11f9d9fca423ea543752f80dd0e377cccbdb6241e6605b7ec20c75412bb5f4984e6d67caf7935e0fe28e

data/lib/seshbot/packing/recipe.rb

@@ -8,21 +8,40 @@ module Seshbot
           # we want the recipe that is 'best' (packaging into as few items as possible, or unpacaging into as many as possible)
           best_recipe = nil
           best_recipe_output_quantity = nil
+          best_recipe_inputs_quantity = nil
           recipes.each do |recipe_name, recipe|
+            recipe_inputs = recipe['inputs'].nil? ? [recipe] : recipe['inputs']
+
             recipe_factor = _calculate_recipe_factor(recipe, items)
             recipe_output_quantity = recipe_factor * recipe['output_quantity']
+            recipe_inputs_quantity = recipe_factor * recipe_inputs.map { |r| r['input_quantity'] }.sum
 
             # is this recipe the 'best'? (if packaging, best is the one that creates fewest quantity)
             is_best = if best_recipe_output_quantity.nil?
               true
             else
-              unpacking ?
+              #
+              # the below code uses output as the main feature, but if they are equal uses the number of inputs
+              #
+
+              output_equal = recipe_output_quantity == best_recipe_output_quantity
+
+              # when packing, fewer outputs are better
+              output_better = unpacking ?
                   recipe_output_quantity > best_recipe_output_quantity :
                   recipe_output_quantity < best_recipe_output_quantity
+
+              # when packing, more inputs are better
+              inputs_better = unpacking ?
+                  recipe_inputs_quantity < best_recipe_inputs_quantity :
+                  recipe_inputs_quantity > best_recipe_inputs_quantity
+
+              output_equal ? inputs_better : output_better
             end
 
             if is_best
               best_recipe_output_quantity = recipe_output_quantity
+              best_recipe_inputs_quantity = recipe_inputs_quantity
               best_recipe = recipe
             end
           end

data/lib/seshbot/packing/version.rb

@@ -1,5 +1,5 @@
 module Seshbot
   module Packing
-    VERSION = '0.9.1'
+    VERSION = '0.9.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seshbot-packing
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Shaun
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-07 00:00:00.000000000 Z
+date: 2021-04-08 00:00:00.000000000 Z
 dependencies: []
 description:
 email: