Enhancements 2, 3, and 4

Implemented MOX fluid-reactor behavior. Added fields for stopping the reactor early based on time or temperature. Added a way to design a reactor with pre-heated components (e.g. 60k coolant cells that were heated by fuel rods in another reactor).
MauveCloud · Feb 24, 2015 · caa4b0b · caa4b0b
1 parent 134b15f
commit caa4b0b
Show file tree

Hide file tree

Showing 22 changed files with 463 additions and 42 deletions.
diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml
@@ -3,6 +3,11 @@
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
+            <file>file:/E:/GitHub/Ic2ExpReactorPlanner/src/Ic2ExpReactorPlanner/AdvancedHeatExchanger.java</file>
+            <file>file:/E:/GitHub/Ic2ExpReactorPlanner/src/Ic2ExpReactorPlanner/CoolantCell60k.java</file>
+            <file>file:/E:/GitHub/Ic2ExpReactorPlanner/src/Ic2ExpReactorPlanner/CoolantCell10k.java</file>
+            <file>file:/E:/GitHub/Ic2ExpReactorPlanner/src/Ic2ExpReactorPlanner/ReactorPlannerFrame.java</file>
+            <file>file:/E:/GitHub/Ic2ExpReactorPlanner/src/Ic2ExpReactorPlanner/Reactor.java</file>
             <file>file:/E:/GitHub/Ic2ExpReactorPlanner/src/Ic2ExpReactorPlanner/Simulator.java</file>
         </group>
     </open-files>

diff --git a/src/Ic2ExpReactorPlanner/AdvancedHeatExchanger.java b/src/Ic2ExpReactorPlanner/AdvancedHeatExchanger.java
@@ -33,7 +33,11 @@ public AdvancedHeatExchanger() {
      */
     @Override
     public String toString() {
-        return "Advanced Heat Exchanger";
+        String result = "Advanced Heat Exchanger";
+        if (getInitialHeat() > 0) {
+            result += String.format(" (initial heat: %,d)", (int)getInitialHeat());
+        }
+        return result;
     }
 
     @Override

diff --git a/src/Ic2ExpReactorPlanner/AdvancedHeatVent.java b/src/Ic2ExpReactorPlanner/AdvancedHeatVent.java
@@ -27,7 +27,11 @@ public AdvancedHeatVent() {
      */
     @Override
     public String toString() {
-        return "Advanced Heat Vent";
+        String result = "Advanced Heat Vent";
+        if (getInitialHeat() > 0) {
+            result += String.format(" (initial heat: %,d)", (int)getInitialHeat());
+        }
+        return result;
     }
 
     @Override

diff --git a/src/Ic2ExpReactorPlanner/ComponentHeatExchanger.java b/src/Ic2ExpReactorPlanner/ComponentHeatExchanger.java
@@ -33,7 +33,11 @@ public ComponentHeatExchanger() {
      */
     @Override
     public String toString() {
-        return "Component Heat Exchanger";
+        String result = "Component Heat Exchanger";
+        if (getInitialHeat() > 0) {
+            result += String.format(" (initial heat: %,d)", (int)getInitialHeat());
+        }
+        return result;
     }
 
     @Override

diff --git a/src/Ic2ExpReactorPlanner/CoolantCell10k.java b/src/Ic2ExpReactorPlanner/CoolantCell10k.java
@@ -11,7 +11,7 @@ public class CoolantCell10k extends ReactorComponent {
      */
     private static final String imageFilename = "reactorCoolantSimple.png";    
 
-    public static final MaterialsList MATERIALS = new MaterialsList("Tin Plate", "Water", 8, "Lapis Lazuli");
+    public static final MaterialsList MATERIALS = new MaterialsList(5, "Tin Plate", "Distilled Water", "Lapis Lazuli");
 
     /**
      * Creates a new instance.
@@ -27,7 +27,11 @@ public CoolantCell10k() {
      */
     @Override
     public String toString() {
-        return "10k Coolant Cell";
+        String result = "10k Coolant Cell";
+        if (getInitialHeat() > 0) {
+            result += String.format(" (initial heat: %,d)", (int)getInitialHeat());
+        }
+        return result;
     }
 
     @Override

diff --git a/src/Ic2ExpReactorPlanner/CoolantCell30k.java b/src/Ic2ExpReactorPlanner/CoolantCell30k.java
@@ -27,7 +27,11 @@ public CoolantCell30k() {
      */
     @Override
     public String toString() {
-        return "30k Coolant Cell";
+        String result = "30k Coolant Cell";
+        if (getInitialHeat() > 0) {
+            result += String.format(" (initial heat: %,d)", (int)getInitialHeat());
+        }
+        return result;
     }
 
     @Override

diff --git a/src/Ic2ExpReactorPlanner/CoolantCell60k.java b/src/Ic2ExpReactorPlanner/CoolantCell60k.java
@@ -27,7 +27,11 @@ public CoolantCell60k() {
      */
     @Override
     public String toString() {
-        return "60k Coolant Cell";
+        String result = "60k Coolant Cell";
+        if (getInitialHeat() > 0) {
+            result += String.format(" (initial heat: %,d)", (int)getInitialHeat());
+        }
+        return result;
     }
 
     @Override

diff --git a/src/Ic2ExpReactorPlanner/DualFuelRodMox.java b/src/Ic2ExpReactorPlanner/DualFuelRodMox.java
@@ -34,6 +34,10 @@ public String toString() {
     public void generateHeat() {
         int pulses = countNeutronNeighbors() + 2;
         int heat = 4 * pulses * (pulses + 1);
+        final Reactor parentReactor = getParent();
+        if (parentReactor.isFluid() && (parentReactor.getCurrentHeat() / parentReactor.getMaxHeat()) > 0.5) {
+            heat *= 2;
+        }
         handleHeat(heat);
         applyDamage(1.0);
     }

diff --git a/src/Ic2ExpReactorPlanner/FuelRodMox.java b/src/Ic2ExpReactorPlanner/FuelRodMox.java
@@ -34,6 +34,10 @@ public String toString() {
     public void generateHeat() {
         int pulses = countNeutronNeighbors() + 1;
         int heat = 2 * pulses * (pulses + 1);
+        final Reactor parentReactor = getParent();
+        if (parentReactor.isFluid() && (parentReactor.getCurrentHeat() / parentReactor.getMaxHeat()) > 0.5) {
+            heat *= 2;
+        }
         handleHeat(heat);
         applyDamage(1.0);
     }

diff --git a/src/Ic2ExpReactorPlanner/HeatExchanger.java b/src/Ic2ExpReactorPlanner/HeatExchanger.java
@@ -33,7 +33,11 @@ public HeatExchanger() {
      */
     @Override
     public String toString() {
-        return "Heat Exchanger";
+        String result = "Heat Exchanger";
+        if (getInitialHeat() > 0) {
+            result += String.format(" (initial heat: %,d)", (int)getInitialHeat());
+        }
+        return result;
     }
 
     @Override

diff --git a/src/Ic2ExpReactorPlanner/HeatVent.java b/src/Ic2ExpReactorPlanner/HeatVent.java
@@ -27,7 +27,11 @@ public HeatVent() {
      */
     @Override
     public String toString() {
-        return "Heat Vent";
+        String result = "Heat Vent";
+        if (getInitialHeat() > 0) {
+            result += String.format(" (initial heat: %,d)", (int)getInitialHeat());
+        }
+        return result;
     }
 
     @Override

diff --git a/src/Ic2ExpReactorPlanner/LzhCondensator.java b/src/Ic2ExpReactorPlanner/LzhCondensator.java
@@ -27,7 +27,11 @@ public LzhCondensator() {
      */
     @Override
     public String toString() {
-        return "LZH-Condensator";
+        String result = "LZH-Condensator";
+        if (getInitialHeat() > 0) {
+            result += String.format(" (initial heat: %,d)", (int)getInitialHeat());
+        }
+        return result;
     }
 
     @Override

diff --git a/src/Ic2ExpReactorPlanner/OverclockedHeatVent.java b/src/Ic2ExpReactorPlanner/OverclockedHeatVent.java
@@ -27,7 +27,11 @@ public OverclockedHeatVent() {
      */
     @Override
     public String toString() {
-        return "Overclocked Heat Vent";
+        String result = "Overclocked Heat Vent";
+        if (getInitialHeat() > 0) {
+            result += String.format(" (initial heat: %,d)", (int)getInitialHeat());
+        }
+        return result;
     }
 
     @Override

diff --git a/src/Ic2ExpReactorPlanner/QuadFuelRodMox.java b/src/Ic2ExpReactorPlanner/QuadFuelRodMox.java
@@ -34,6 +34,10 @@ public String toString() {
     public void generateHeat() {
         int pulses = countNeutronNeighbors() + 3;
         int heat = 8 * pulses * (pulses + 1);
+        final Reactor parentReactor = getParent();
+        if (parentReactor.isFluid() && (parentReactor.getCurrentHeat() / parentReactor.getMaxHeat()) > 0.5) {
+            heat *= 2;
+        }
         handleHeat(heat);
         applyDamage(1.0);
     }

diff --git a/src/Ic2ExpReactorPlanner/Reactor.java b/src/Ic2ExpReactorPlanner/Reactor.java
@@ -21,6 +21,8 @@ public class Reactor {
 
     private double ventedHeat = 0.0;
 
+    private boolean fluid = false;
+
     public ReactorComponent getComponentAt(int row, int column) {
         if (row >= 0 && row < grid.length && column >= 0 && column < grid[row].length) {
             return grid[row][column];
@@ -166,6 +168,9 @@ public String getCode() {
                 final ReactorComponent component = grid[row][col];
                 final int id = ComponentFactory.getID(component);
                 result.append(String.format("%02X", id));
+                if (component != null && component.getInitialHeat() > 0) {
+                    result.append(String.format("(h%s)", Integer.toString((int)component.getInitialHeat(), 36)));
+                }
             }
         }
         return result.toString();
@@ -177,15 +182,58 @@ public String getCode() {
      */
     public void setCode(String code) {
         int pos = 0;
-        if (code.length() == 108 && code.matches("[0-9A-Fa-f]+")) {
-            for (int row = 0; row < grid.length; row++) {
-                for (int col = 0; col < grid[row].length; col++) {
-                    int id = Integer.parseInt(code.substring(pos, pos + 2), 16);
-                    setComponentAt(row, col, ComponentFactory.createComponent(id));
-                    pos += 2;
+        int[][] ids = new int[grid.length][grid[0].length];
+        char[][] paramTypes = new char[grid.length][grid[0].length];
+        int[][] params = new int[grid.length][grid[0].length];
+        if (code.length() >= 108 && code.matches("[0-9A-Za-z()]+")) {
+            try {
+                for (int row = 0; row < grid.length; row++) {
+                    for (int col = 0; col < grid[row].length; col++) {
+                        ids[row][col] = Integer.parseInt(code.substring(pos, pos + 2), 16);
+//                    setComponentAt(row, col, ComponentFactory.createComponent(id));
+                        pos += 2;
+                        if (pos < code.length() && code.charAt(pos) == '(') {
+                            paramTypes[row][col] = code.charAt(pos + 1);
+                            int tempPos = pos + 2;
+                            StringBuilder param = new StringBuilder(10);
+                            while (code.charAt(tempPos) != ')') {
+                                param.append(code.charAt(tempPos));
+                                tempPos++;
+                            }
+                            params[row][col] = Integer.parseInt(param.toString(), 36);
+                            pos = tempPos + 1;
+                        }
+                    }
                 }
+                for (int row = 0; row < grid.length; row++) {
+                    for (int col = 0; col < grid[row].length; col++) {
+                        final ReactorComponent component = ComponentFactory.createComponent(ids[row][col]);
+                        if (paramTypes[row][col] == 'h') {
+                            component.setInitialHeat(params[row][col]);
+                        }
+                        setComponentAt(row, col, component);
+                    }
+                }
+            } catch (Exception e) {
+                e.printStackTrace(System.err);
             }
         }
     }
+
+    /**
+     * Checks whether the reactor is to simulate a fluid-style reactor, rather than a direct EU-output reactor.
+     * @return true if this was set to be a fluid-style reactor, false if this was set to be direct EU-output reactor.
+     */
+    public boolean isFluid() {
+        return fluid;
+    }
+
+    /**
+     * Sets whether the reactor is to simulate a fluid-style reactor, rather than a direct EU-output reactor.
+     * @param fluid true if this is to be a fluid-style reactor, false if this is to be direct EU-output reactor.
+     */
+    public void setFluid(boolean fluid) {
+        this.fluid = fluid;
+    }
 
 }
diff --git a/src/Ic2ExpReactorPlanner/ReactorComponent.java b/src/Ic2ExpReactorPlanner/ReactorComponent.java
@@ -18,6 +18,7 @@ public class ReactorComponent {
     private int row = -10;
     private int column = -10;
 
+    private double initialHeat = 0.0;
     private double currentHeat = 0.0;
     private double maxHeat = 1.0;
 
@@ -131,7 +132,7 @@ public final double getCurrentHeat() {
      * Resets heat to 0 (used when resetting simulation).
      */
     public final void clearCurrentHeat() {
-        currentHeat = 0.0;
+        currentHeat = initialHeat;
     }
 
     /**
@@ -230,5 +231,25 @@ public boolean isBroken() {
     public MaterialsList getMaterials() {
         return null;
     }
+
+    /**
+     * Gets the initial heat previously set for the component.
+     * @return the initial heat.
+     */
+    public double getInitialHeat() {
+        return initialHeat;
+    }
+
+    /**
+     * Set the initial heat of the component, as long as the component can accept heat, 
+     * and the initial heat greater than or equal to zero and less than the max heat.
+     * If any condition is false, the value is ignored.
+     * @param initialHeat the initial heat to set
+     */
+    public void setInitialHeat(double initialHeat) {
+        if (this.isHeatAcceptor() && initialHeat >= 0 && initialHeat < this.getMaxHeat()) {
+            this.initialHeat = initialHeat;
+        }
+    }
 
 }
diff --git a/src/Ic2ExpReactorPlanner/ReactorHeatExchanger.java b/src/Ic2ExpReactorPlanner/ReactorHeatExchanger.java
@@ -30,7 +30,11 @@ public ReactorHeatExchanger() {
      */
     @Override
     public String toString() {
-        return "Reactor Heat Exchanger";
+        String result = "Reactor Heat Exchanger";
+        if (getInitialHeat() > 0) {
+            result += String.format(" (initial heat: %,d)", (int)getInitialHeat());
+        }
+        return result;
     }
 
     @Override

diff --git a/src/Ic2ExpReactorPlanner/ReactorHeatVent.java b/src/Ic2ExpReactorPlanner/ReactorHeatVent.java
@@ -27,7 +27,11 @@ public ReactorHeatVent() {
      */
     @Override
     public String toString() {
-        return "Reactor Heat Vent";
+        String result = "Reactor Heat Vent";
+        if (getInitialHeat() > 0) {
+            result += String.format(" (initial heat: %,d)", (int)getInitialHeat());
+        }
+        return result;
     }
 
     @Override