bugs fixed

Author: fabaindaiz

JCoreWars.iml

@@ -15,10 +15,9 @@ public static void main(String[] args) {
         mars.setMenuDisplay();
 
         Vector<String> wArgs = new Vector<>();
-        wArgs.add("C:/informatica/Core Wars/warriors/Validate.red");
-        //wArgs.add("C:/informatica/Core Wars/warriors/imp.red");
-        //wArgs.add("C:/informatica/Core Wars/warriors/imp.red");
-        //wArgs.add("C:/informatica/Core Wars/warriors/imp.red");
+        wArgs.add("C:/informatica/Core Wars/warriors/imp.red");
+        wArgs.add("C:/informatica/Core Wars/warriors/imp.red");
+        wArgs.add("C:/informatica/Core Wars/warriors/imp.red");
         marsCore.setWarriors(wArgs);
 
         aplicationCore.application_start();

src/fabaindaiz/jcorewars/Juno.java

@@ -35,11 +35,13 @@ public DisplayManager(AplicationCore core) {
 
     public void setMenuDisplay() {
         menuDisplay = new MenuDisplay(frame);
+
+        frame.setVisible(true);
+        frame.repaint();
     }
 
     private JPanel getCorePanel() {
         JPanel panel = new JPanel(new BorderLayout());
-
         appCore.application_display(panel);
 
         return panel;

src/fabaindaiz/jcorewars/display/DisplayManager.java

@@ -44,11 +44,12 @@ public class jMARS
 	 * Starting function for the application. It sets up a frame and adds the applet to it.
 	 * @param args - array of command line arguments
 	 */
-	public static void main(String[] args)
-	{
+	public static void main(String[] args) {
 		Vector<String> wArgs = new Vector<>();
 		int numWarriors = 0;
 
+		args = new String[]{"C:/informatica/Core Wars/warriors/Validate.red"};
+
 		if (args.length == 0)
 		{
 			System.out.println("usage: jMARS [options] warrior1.red [warrior2.red ...]");

src/fabaindaiz/jcorewars/jMARS.java

@@ -72,8 +72,7 @@ public void init() {
             }
         }
         MARS = new MarsVM(coreSize, maxProc);
-        MARS.warriorManager.loadWarriors(warriors, minWarriorDistance);
-
+        MARS.warriorManager.loadWarriors(warriors, minWarriorDistance, maxWarriorLength);
         application.application_update();
 
         runWarriors = numWarriors;
@@ -122,10 +121,9 @@ public void run() {
             startTime = new Date();
 
             MARS.reset();
-            runWarriors = numWarriors;
-            MARS.warriorManager.loadWarriors(warriors, minWarriorDistance);
-
+            MARS.warriorManager.loadWarriors(warriors, minWarriorDistance, maxWarriorLength);
             application.application_update();
+            runWarriors = numWarriors;
 
             cycleNum = 0;
         }

src/fabaindaiz/jcorewars/marsVM/MarsCore.java

@@ -7,27 +7,25 @@ public class StepReport {
 
     public Memory[] core;
     protected WarriorExecutor warrior;
-    protected int numProc;
 
     protected int[] readAddr;
-    protected int[] indirReadAddr;
     protected int[] writeAddr;
     protected int[] decAddr;
     protected int[] incAddr;
 
     protected int numRead;
-    protected int numIndirRead;
     protected int numWrite;
     protected int numDec;
     protected int numInc;
 
+    protected int numProc;
     protected int execAddr;
+
     protected boolean pDie;
     protected boolean wDeath;
 
     protected final static int MAX_READS = 4;
     protected final static int MAX_WRITES = 4;
-    protected final static int MAX_INDIR_READS = 4;
     protected final static int MAX_DECS = 5;
     protected final static int MAX_INCS = 5;
 
@@ -39,13 +37,11 @@ public StepReport(Memory[] core, WarriorExecutor warrior) {
         this.warrior = warrior;
 
         readAddr = new int[MAX_READS];
-        indirReadAddr = new int[MAX_INDIR_READS];
         writeAddr = new int[MAX_WRITES];
         decAddr = new int[MAX_DECS];
         incAddr = new int[MAX_INCS];
 
         numRead = 0;
-        numIndirRead = 0;
         numWrite = 0;
         numDec = 0;
         numInc = 0;
@@ -76,15 +72,6 @@ public void read(int addr) {
         numRead++;
     }
 
-    /**
-     * Set a location read from indirection
-     * @param addr - address of location read
-     */
-    public void indirRead(int addr) {
-        indirReadAddr[numIndirRead] = addr;
-        numIndirRead++;
-    }
-
     /**
      * Set a location that was written to
      * @param addr - address written to
@@ -160,16 +147,6 @@ public int[] addrRead() {
         return value;
     }
 
-    /**
-     * Get the addresses read through indirection
-     * @return int[] - array of addresses
-     */
-    public int[] addrIndirRead() {
-        int[] value = new int[numIndirRead];
-        if (numIndirRead >= 0) System.arraycopy(indirReadAddr, 0, value, 0, numIndirRead);
-        return value;
-    }
-
     /**
      * Get the addresses written to
      * @return int[] - array of addresses

src/fabaindaiz/jcorewars/marsVM/StepReport.java

@@ -44,7 +44,7 @@ public void loadCore(Memory[] core) {
         int i = 0;
 
         for (Memory mem: core) {
-            instr.addElement(String.format("%04d", i) + mem.toString());
+            instr.addElement(String.format("%06d", i) + mem.toString());
             instrColor.add(Color.white);
             i++;
         }

src/fabaindaiz/jcorewars/steplistener/CoreList.java

@@ -53,8 +53,11 @@ public void loadProc(Vector<WarriorProcess<Integer>> list, Vector<Color> color)
         proc1.removeAll();
         proc1.add(procList.get(0));
 
-        //proc2.removeAll();
-        //proc2.add(procList.get(1));
+        if (procList.size() >= 2) {
+            proc2.removeAll();
+            proc2.add(procList.get(1));
+        }
+
     }
 
     @Override

src/fabaindaiz/jcorewars/steplistener/ProcList.java

@@ -22,7 +22,7 @@ public WarriorManager(MarsVM marsVM) {
         this.coreSize = marsVM.coreSize;
     }
 
-    public void loadWarriors(WarriorLoader[] warriors, int minWarriorDistance) {
+    public void loadWarriors(WarriorLoader[] warriors, int minWarriorDistance, int maxWarriorLength) {
 
         loadWarrior(warriors[0], 0, 0);
         int[] location = new int[warriors.length];
@@ -37,15 +37,15 @@ public void loadWarriors(WarriorLoader[] warriors, int minWarriorDistance) {
                     validSpot = false;
                 }
                 for (int k : location) {
-                    if (r < (minWarriorDistance + k) && r > (minWarriorDistance + k)) {
+                    if (r < (k + maxWarriorLength + minWarriorDistance) && r > (k - minWarriorDistance)) {
                         validSpot = false;
                         break;
                     }
                 }
             } while (!validSpot);
 
             loadWarrior(warriors[i], r, i);
-            //location[i] = r;
+            location[i] = r;
         }
     }