From 997e981f3e5858f8961c395aa56d0603e3320f82 Mon Sep 17 00:00:00 2001 From: Pahimar Date: Thu, 26 May 2016 16:03:12 -0400 Subject: [PATCH] Added more detail into the log message on HOW EE3 determined the value for an object --- .../pahimar/ee3/exchange/EnergyValueRegistry.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/pahimar/ee3/exchange/EnergyValueRegistry.java b/src/main/java/com/pahimar/ee3/exchange/EnergyValueRegistry.java index ae1f0791..e8335d1f 100644 --- a/src/main/java/com/pahimar/ee3/exchange/EnergyValueRegistry.java +++ b/src/main/java/com/pahimar/ee3/exchange/EnergyValueRegistry.java @@ -601,6 +601,13 @@ public class EnergyValueRegistry { // Save the results to disk save(); + + // Report the objects for which we were unable to compute an energy value for + if (ConfigurationHandler.Settings.energyValueDebugLoggingEnabled) { + uncomputedStacks.stream() + .filter(wrappedStack -> getEnergyValue(stackValueMap, wrappedStack, false) == null) + .forEach(wrappedStack -> LogHelper.info(ENERGY_VALUE_MARKER, "Unable to compute an energy value for {}", wrappedStack)); + } } /** @@ -635,10 +642,10 @@ public class EnergyValueRegistry { if (computedOutputValue != null && computedOutputValue.compareTo(currentOutputValue) < 0) { - uncomputedStacks.removeIf(wrappedStack -> uncomputedStacks.contains(WrappedStack.wrap(recipeOutput, 1))); + uncomputedStacks.remove(WrappedStack.wrap(recipeOutput, 1)); if (ConfigurationHandler.Settings.energyValueDebugLoggingEnabled) { - LogHelper.info(ENERGY_VALUE_MARKER, "Pass {}: Calculated value {} for object {}", passNumber, computedOutputValue, WrappedStack.wrap(recipeOutput, 1)); + LogHelper.info(ENERGY_VALUE_MARKER, "Pass {}: Calculated value {} for object {} with recipe inputs {} and output {}", passNumber, computedOutputValue, WrappedStack.wrap(recipeOutput, 1), recipeInputs, recipeOutput); } tempComputedMap.put(WrappedStack.wrap(recipeOutput), computedOutputValue); @@ -652,11 +659,11 @@ public class EnergyValueRegistry { long passDuration = System.nanoTime() - passStartTime; if (ConfigurationHandler.Settings.energyValueDebugLoggingEnabled) { - LogHelper.info(ENERGY_VALUE_MARKER, "Pass {}: Calculated {} values for objects in {} ms", passNumber, tempComputedMap.size(), passDuration / 100000); + LogHelper.info(ENERGY_VALUE_MARKER, "Pass {}: Calculated {} different values for objects in {} ms", passNumber, tempComputedMap.size(), passDuration / 100000); } } long endingTime = System.nanoTime() - startingTime; - LogHelper.info(ENERGY_VALUE_MARKER, "Finished energy value calculation - calculated {} values for objects in {} ms", computedMap.size() - stackValueMap.size(), endingTime / 100000); + LogHelper.info(ENERGY_VALUE_MARKER, "Finished energy value calculation - calculated {} new values for objects in {} ms", computedMap.size() - stackValueMap.size(), endingTime / 100000); return computedMap; }