Improved consistency of efficiency calculations for an exploding reac…

…tor.
MauveCloud · Feb 23, 2018 · 0eabdca · 0eabdca
1 parent b227314
commit 0eabdca
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/src/Ic2ExpReactorPlanner/SimpleSimulator.java b/src/Ic2ExpReactorPlanner/SimpleSimulator.java
@@ -141,16 +141,18 @@ protected Void doInBackground() throws Exception {
                         }
                     }
                 }
-                lastEUoutput = reactor.getCurrentEUoutput();
-                totalEUoutput += lastEUoutput;
-                lastHeatOutput = reactor.getVentedHeat();
-                totalHeatOutput += lastHeatOutput;
-                if (reactor.getCurrentHeat() <= reactor.getMaxHeat() && lastEUoutput > 0.0) {
-                    reactorTicks++;
-                    minEUoutput = Math.min(lastEUoutput, minEUoutput);
-                    maxEUoutput = Math.max(lastEUoutput, maxEUoutput);
-                    minHeatOutput = Math.min(lastHeatOutput, minHeatOutput);
-                    maxHeatOutput = Math.max(lastHeatOutput, maxHeatOutput);
+                if (reactor.getCurrentHeat() <= reactor.getMaxHeat()) {
+                    lastEUoutput = reactor.getCurrentEUoutput();
+                    totalEUoutput += lastEUoutput;
+                    lastHeatOutput = reactor.getVentedHeat();
+                    totalHeatOutput += lastHeatOutput;
+                    if (lastEUoutput > 0.0) {
+                        reactorTicks++;
+                        minEUoutput = Math.min(lastEUoutput, minEUoutput);
+                        maxEUoutput = Math.max(lastEUoutput, maxEUoutput);
+                        minHeatOutput = Math.min(lastHeatOutput, minHeatOutput);
+                        maxHeatOutput = Math.max(lastHeatOutput, maxHeatOutput);
+                    }
                 }
                 for (int row = 0; row < 6; row++) {
                     for (int col = 0; col < 9; col++) {