Fix generic types, MASSIVE code clean up, update librikka

src/main/java/simelectricity/api/internal/ISEEnergyNetAgent.java

@@ -34,7 +34,7 @@ public interface ISEEnergyNetAgent {
      * @return A reference to ISESubComponent, which also implements the corresponding ISEComponentParameter.
      *          TileEntity should store this reference and use it to access simulation results, e.g. voltage.
      */
-    ISESubComponent newComponent(ISEComponentParameter dataProvider, TileEntity parent);
+    ISESubComponent<?> newComponent(ISEComponentParameter dataProvider, TileEntity parent);
 
     /**
      * Create a new cable component, WITHOUT register it.

src/main/java/simelectricity/api/node/ISEPairedComponent.java

@@ -0,0 +1,8 @@
+package simelectricity.api.node;
+
+import javax.annotation.Nonnull;
+
+public interface ISEPairedComponent<T extends ISEPairedComponent<?>> extends ISESubComponent<T> {
+	@Nonnull
+	T getComplement();
+}

src/main/java/simelectricity/api/node/ISESubComponent.java

@@ -10,6 +10,6 @@
  * API users should not implement this interface anywhere!
  */
 
-public interface ISESubComponent<T extends ISESubComponent> extends ISESimulatable, ISEComponentParameter {
-	T getComplement();
+public interface ISESubComponent<T extends ISESubComponent<?>> extends ISESimulatable, ISEComponentParameter {
+
 }

src/main/java/simelectricity/api/tile/ISETile.java

@@ -12,5 +12,5 @@ public interface ISETile {
     /**
      * @return the component on the given side, null if not applicable
      */
-    ISESubComponent getComponent(Direction side);
+    ISESubComponent<?> getComponent(Direction side);
 }

src/main/java/simelectricity/common/ConfigManager.java

@@ -10,7 +10,8 @@
 import net.minecraftforge.common.ForgeConfigSpec;
 import net.minecraftforge.common.ForgeConfigSpec.BooleanValue;
 import simelectricity.SimElectricity;
-import simelectricity.energynet.EnergyNetSimulator;
+import simelectricity.energynet.EnergyNet;
+import simelectricity.energynet.EnergyNetAgent;
 import simelectricity.essential.Essential;
 
 @Mod.EventBusSubscriber(modid = SimElectricity.MODID, bus = Mod.EventBusSubscriber.Bus.MOD)
@@ -19,39 +20,31 @@ public class ConfigManager {
 
     public static BooleanValue showDebugOutput_Spec;
     public static BooleanValue showEnergyNetInfo_Spec;
-    public static ForgeConfigSpec.ConfigValue<String> matrixSolver_Spec;
-    public static ForgeConfigSpec.IntValue precision_Spec;
     public static ForgeConfigSpec.IntValue maxIteration_Spec;
-    public static ForgeConfigSpec.IntValue shuntPN_Spec;
+    public static ForgeConfigSpec.ConfigValue<String> matrixSolver;
+    public static ForgeConfigSpec.IntValue precision;
+    public static ForgeConfigSpec.IntValue shuntPN;
     public static ForgeConfigSpec.DoubleValue joule2rf;
 
     public static boolean showDebugOutput;
     public static boolean showEnergyNetInfo;
-    public static String matrixSolver;
-    public static int precision;
     public static int maxIteration;
-    public static int shuntPN;
 
-    private static ConfigManager instace;
     private static ForgeConfigSpec configSpec;
 
     public static void register() {
         Pair<ConfigManager, ForgeConfigSpec> specPair = new ForgeConfigSpec.Builder().configure(ConfigManager::new);
         configSpec = specPair.getRight();
-        instace = specPair.getLeft();
 
         ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, ConfigManager.configSpec);
     }
 
     public static void syncConfig() {
         showDebugOutput = showDebugOutput_Spec.get();
         showEnergyNetInfo = showEnergyNetInfo_Spec.get();
-        matrixSolver = matrixSolver_Spec.get();
-        precision = precision_Spec.get();
         maxIteration = maxIteration_Spec.get();
-        shuntPN = shuntPN_Spec.get();
 
-        EnergyNetSimulator.config();
+        EnergyNetAgent.mapping.values().forEach(EnergyNet::notifyConfigChanged);
     }
 
     @SubscribeEvent
@@ -67,10 +60,10 @@ private ConfigManager(ForgeConfigSpec.Builder builder) {
 
         showDebugOutput_Spec = ForgeConfigHelper.boolVal(builder, SimElectricity.MODID, "Enable Debug Output", false, "Display debug information in the console, e.g. S->C sync notifications");
         showEnergyNetInfo_Spec = ForgeConfigHelper.boolVal(builder, SimElectricity.MODID,"Show EnergyNet Info", false, "Display EnergyNet information in the console, e.g. tile attached/deteched/changed event");
-        matrixSolver_Spec = ForgeConfigHelper.stringVal(builder, SimElectricity.MODID,"Matrix Solver", "QR", "The preferred matrix solving algorithm (QR is much more effective than Gaussian.). Options: QR, Gaussian. Warning: CASE SENSITIVE!");
-        precision_Spec = ForgeConfigHelper.intVal(builder, SimElectricity.MODID, "Precision", 3, "3 means that the result is accurate up to 3 decimal places");
+        matrixSolver = ForgeConfigHelper.stringVal(builder, SimElectricity.MODID,"Matrix Solver", "QR", "The preferred matrix solving algorithm (QR is much more effective than Gaussian.). Options: QR, Gaussian. Warning: CASE SENSITIVE!");
+        precision = ForgeConfigHelper.intVal(builder, SimElectricity.MODID, "Precision", 3, "3 means that the result is accurate up to 3 decimal places");
         maxIteration_Spec = ForgeConfigHelper.intVal(builder, SimElectricity.MODID, "Max iteration", 50, "To aviod infinite loop, the simualtor aborts the simulation when this threshold is reached");
-        shuntPN_Spec = ForgeConfigHelper.intVal(builder, SimElectricity.MODID, "RPN", 1000000000, "The resistance put in parallel with every PN junction, alleviate convergence issue");//
+        shuntPN = ForgeConfigHelper.intVal(builder, SimElectricity.MODID, "RPN", 1000000000, "The resistance put in parallel with every PN junction, alleviate convergence issue");//
         joule2rf = ForgeConfigHelper.doubleVal(builder, Essential.MODID, "Joule to RF conversion ratio", 1, 0, Double.MAX_VALUE, "This number determines how many RF equal to 1 Joule");
 
         builder.pop();

src/main/java/simelectricity/energynet/EnergyNet.java

@@ -21,7 +21,6 @@
 
 import net.minecraft.world.server.ServerWorld;
 import simelectricity.api.node.ISESimulatable;
-import simelectricity.common.ConfigManager;
 import simelectricity.common.SELogger;
 import simelectricity.energynet.components.SEComponent;
 import simelectricity.energynet.components.SwitchA;
@@ -148,7 +147,7 @@ public String[] info() {
         if (tileEntityGraph.size() == 0 && this.dataProvider.getGridObjectCount() == 0) {
             return new String[]{
                     "EnergyNet is empty and idle",
-                    "Matrix solving algorithsm: " + ConfigManager.matrixSolver
+                    "Matrix solving algorithsm: " + this.simulator.getMatrixSolverName()
             };
         }
 
@@ -157,7 +156,7 @@ public String[] info() {
                     "EnergyNet is idle",
                     "Tiles: " + String.valueOf(tileEntityGraph.size()),
                     "Grid Objects: " + String.valueOf(this.dataProvider.getGridObjectCount()),
-                    "Matrix solving algorithsm: " + ConfigManager.matrixSolver,
+                    "Matrix solving algorithsm: " + this.simulator.getMatrixSolverName()
             };
         } else {
             return new String[]{
@@ -167,7 +166,7 @@ public String[] info() {
                     "Matrix size: " + this.simulator.getMatrixSize(),
                     //"Non-zero elements: " + String.valueOf(this.matrix.getTotalNonZeros()),
                     "Density: " + this.simulator.getDensity() + "%",
-                    "Matrix solving algorithsm: " + ConfigManager.matrixSolver,
+                    "Matrix solving algorithsm: " + this.simulator.getMatrixSolverName(),
                     "Iterations:" + String.valueOf(iterations)
             };
         }
@@ -177,6 +176,10 @@ public void reFresh() {
         this.scheduledRefresh = true;
     }
 
+    public void notifyConfigChanged() {
+        this.simulator.setConfigChanged();
+    }
+
     public void notifyServerShuttingdown() {
         this.simulator.suicide();
     }
@@ -216,4 +219,9 @@ public static final double getCurrentMagnitude(ISESimulatable Tile) {
 
         return Double.NaN;
     }
+
+    @Override
+    public String toString() {
+    	return "EnergyNet for " + world.getProviderName();
+    }
 }

src/main/java/simelectricity/energynet/EnergyNetAgent.java

@@ -46,8 +46,7 @@
 import java.util.WeakHashMap;
 
 public class EnergyNetAgent implements ISEEnergyNetAgent {
-    @SuppressWarnings("unchecked")
-    public static Map<World, EnergyNet> mapping = new WeakHashMap();
+    public static Map<World, EnergyNet> mapping = new WeakHashMap<>();
 
     /**
      * Return the instance of energyNet for a specific world,
@@ -138,7 +137,7 @@ else if (neighborTileEntity instanceof ISEWireTile)
     }
 
     @Override
-    public ISESubComponent newComponent(ISEComponentParameter dataProvider, TileEntity parent) {
+    public ISESubComponent<?> newComponent(ISEComponentParameter dataProvider, TileEntity parent) {
         if (dataProvider instanceof ISEDiode)
             //Create a pair of DiodeInput and DiodeOutput at the same time
             return new DiodeInput((ISEDiode) dataProvider, parent);

src/main/java/simelectricity/energynet/EnergyNetDataProvider.java

@@ -35,7 +35,7 @@ public class EnergyNetDataProvider extends WorldSavedData {
     ///////////////////////////////////////
     /// GridTile update notification
     ///////////////////////////////////////
-    private final Set<ISEGridTile> updatedGridTile = new HashSet();
+    private final Set<ISEGridTile> updatedGridTile = new HashSet<>();
     //Map between coord and GridNode
     private final HashMap<BlockPos, GridNode> gridNodeMap = new HashMap<>();
     private final List<TileEntity> loadedTiles = new LinkedList<>();
@@ -118,7 +118,7 @@ public void addTile(TileEntity te) {
                 ISETile tile = (ISETile) te;
 
                 for (Direction direction : Direction.values()) {
-                    ISESubComponent subComponent = tile.getComponent(direction);
+                    ISESubComponent<?> subComponent = tile.getComponent(direction);
                     if (subComponent != null) {
                         this.tileEntityGraph.addVertex((SEComponent) subComponent);
                     }
@@ -144,7 +144,7 @@ public void updateTileConnection(TileEntity te) {
 
             if (cable.isGridInterConnectionPoint) {
                 GridNode gridNode = getGridObjectAtCoord(te.getPos());
-                this.tileEntityGraph.interconnection(cable, gridNode);
+                SEGraph.interconnection(cable, gridNode);
             }
 
             //Build connection with neighbors
@@ -181,7 +181,7 @@ public void updateTileConnection(TileEntity te) {
                     }
                 } else if (neighborTileEntity instanceof ISETile) {
                     ISETile tile = (ISETile) neighborTileEntity;
-                    ISESubComponent component = tile.getComponent(direction.getOpposite());
+                    ISESubComponent<?> component = tile.getComponent(direction.getOpposite());
 
                     if (component != null) {
                         this.tileEntityGraph.addEdge((SEComponent) component, cable);
@@ -192,7 +192,7 @@ public void updateTileConnection(TileEntity te) {
             ISETile tile = (ISETile) te;
 
             for (Direction direction : Direction.values()) {
-                ISESubComponent subComponent = tile.getComponent(direction);
+                ISESubComponent<?> subComponent = tile.getComponent(direction);
                 if (subComponent != null) {
                     this.tileEntityGraph.isolateVertex((SEComponent) subComponent);
                 }
@@ -250,7 +250,7 @@ public void updateTileConnection(TileEntity te) {
             } else {
                 // ISETile
                 for (Direction direction : Direction.values()) {
-                    ISESubComponent subComponent = tile.getComponent(direction);
+                    ISESubComponent<?> subComponent = tile.getComponent(direction);
                     if (subComponent != null) {
                         TileEntity neighborTileEntity = getTileEntityOnDirection(te, direction);
 
@@ -282,10 +282,10 @@ public void updateTileParam(TileEntity te) {
         } else if (te instanceof ISETile) {
             ISETile tile = (ISETile) te;
             for (Direction direction : Direction.values()) {
-                ISESubComponent subComponent = tile.getComponent(direction);
+                ISESubComponent<?> subComponent = tile.getComponent(direction);
 
                 if (subComponent instanceof Tile)
-                    ((Tile) subComponent).updateComponentParameters();
+                    ((Tile<?>) subComponent).updateComponentParameters();
             }
         } else {
             throw new RuntimeException("Unexpected TileEntity:" + te);
@@ -303,7 +303,7 @@ public void removeTile(TileEntity te) {
         } else if (te instanceof ISETile) {
             ISETile tile = (ISETile) te;
             for (Direction direction : Direction.values()) {
-                ISESubComponent subComponent = tile.getComponent(direction);
+                ISESubComponent<?> subComponent = tile.getComponent(direction);
                 if (subComponent != null) {
                     this.tileEntityGraph.removeVertex((SEComponent) subComponent);
                 }
@@ -425,7 +425,6 @@ public void onGridTileInvalidate(TileEntity te) {
 
         this.loadedGridTiles.remove(te);
 
-        ISEGridTile gridTile = (ISEGridTile) te;
         GridNode gridObject = this.gridNodeMap.get(te.getPos());
 
         //gridObject can be null if the GridObject is just removed

src/main/java/simelectricity/energynet/EnergyNetSimulator.java

@@ -4,7 +4,6 @@
 import simelectricity.common.SELogger;
 import simelectricity.energynet.components.*;
 import simelectricity.energynet.matrix.IMatrixSolver;
-import simelectricity.energynet.matrix.IMatrixSolver.MatrixHelper;
 
 import java.util.Iterator;
 import java.util.LinkedList;
@@ -16,20 +15,33 @@ public class EnergyNetSimulator extends Thread {
     /**
      * The absolute tolerance
      */
-    private static double epsilon;
+    private double epsilon;
     /**
      * The conductance placed between each PN junction(to alleviate convergence problem)
      */
-    private static double Gpn;
+    private double Gpn;
     /**
      * Matrix solving algorithm used to solve the problem
      */
-    private static IMatrixSolver matrix;
+    private IMatrixSolver matrix;
 
-    public static final void config() {
-        epsilon = Math.pow(10, -ConfigManager.precision);
-        Gpn = 1.0D / ConfigManager.shuntPN;
-        matrix = MatrixHelper.newSolver(ConfigManager.matrixSolver);
+    public String getMatrixSolverName() {
+        return matrix.getClass().getSimpleName();
+    }
+
+    private volatile boolean configChanged;
+    public void setConfigChanged() {
+    	configChanged = true;
+    }
+
+    private void checkAndUpdateConfig() {
+        if (configChanged) {
+        	configChanged = false;
+
+            epsilon = Math.pow(10, -ConfigManager.precision.get());
+            Gpn = 1.0D / ConfigManager.shuntPN.get();
+            matrix = IMatrixSolver.newSolver(ConfigManager.matrixSolver.get());
+        }
     }
 
 	/////////////////////////////////////////////////
@@ -121,6 +133,11 @@ public void run() {
             try {
                 SELogger.logInfo(SELogger.simulator, this.getName() + " wake up");
 
+                if (this.matrix == null)
+                	this.setConfigChanged();
+
+                checkAndUpdateConfig();
+
                 processing = true;
                 SELogger.logInfo(SELogger.simulator, this.getName() + " Started");
                 startAt = System.currentTimeMillis();
@@ -169,7 +186,7 @@ private final void calcCurrents(double[] voltages, double[] currents, Iterator<S
 
 
             if (columnNode instanceof CableBase) {
-                CableBase cableBase = (CableBase) columnNode;
+                CableBase<?> cableBase = (CableBase<?>) columnNode;
 
                 if (cableBase.hasShuntResistance())
                     currents[columnNode.index] -= voltages[cableBase.index] / cableBase.getShuntResistance();
@@ -320,7 +337,7 @@ private final void formJacobian(double[] voltages, Iterator<SEComponent> iterato
 
             //Cable - GridNode
             if (columnNode instanceof CableBase) {
-                CableBase cableBase = (CableBase) columnNode;
+                CableBase<?> cableBase = (CableBase<?>) columnNode;
 
                 if (cableBase.hasShuntResistance())
                     diagonalElement += 1.0D / cableBase.getShuntResistance();
@@ -366,7 +383,7 @@ private final void formJacobian(double[] voltages, Iterator<SEComponent> iterato
                 if (gridNode.type == GridNode.ISEGridNode_TransformerSecondary) {
                     GridNode sec = gridNode;
                     GridNode pri = sec.complement;
-                    double ratio = pri.ratio;
+//                    double ratio = pri.ratio;
                     double res = pri.resistance;
 
                     diagonalElement += 1.0D / res;

src/main/java/simelectricity/energynet/SEGraph.java

@@ -39,7 +39,7 @@ private static boolean shouldCalcVoltage(SEComponent node) {
         if (SEGraph.isInterconnectionTerminal(node))        //A interconnection terminal
             return true;
 
-        if (node instanceof CableBase && ((CableBase) node).hasShuntResistance())
+        if (node instanceof CableBase && ((CableBase<?>) node).hasShuntResistance())
             return true;
 
         return node instanceof GridNode && ((GridNode) node).type != GridNode.ISEGridNode_Wire;
@@ -59,9 +59,9 @@ private static boolean isInterconnectionTerminal(SEComponent node) {
 
     public static double calcR(SEComponent cur, SEComponent neighbor) {
         if (cur instanceof CableBase) {
-            CableBase curConductor = (CableBase) cur;
+            CableBase<?> curConductor = (CableBase<?>) cur;
             if (neighbor instanceof CableBase) {
-                return curConductor.getResistance() + ((CableBase) neighbor).getResistance();
+                return curConductor.getResistance() + ((CableBase<?>) neighbor).getResistance();
             } else {
                 return curConductor.getResistance();
             }
@@ -74,7 +74,7 @@ public static double calcR(SEComponent cur, SEComponent neighbor) {
             }
         } else {
             if (neighbor instanceof CableBase) {
-                return ((CableBase) neighbor).getResistance();
+                return ((CableBase<?>) neighbor).getResistance();
             }
         }
 
@@ -122,7 +122,7 @@ public void removeVertex(SEComponent node) {
     public void isolateVertex(SEComponent node) {        
         //Cut possible interconnection
         if (node instanceof Cable)
-            this.breakInterconnection((Cable) node);
+            SEGraph.breakInterconnection((Cable) node);
 
         //Remove this node from its neighbor list
         for (SEComponent neighbor : node.neighbors) {
@@ -195,7 +195,7 @@ public LinkedList<GridNode> removeGridVertex(GridNode gridNode) {
             return null;
 
         //Cut possible interconnection
-        this.breakInterconnection(gridNode);
+        SEGraph.breakInterconnection(gridNode);
 
         //Break transformer
         this.breakTransformer(gridNode);