diff --git a/src/backend/Simulator.java b/src/backend/Simulator.java index c8b718e..b491400 100644 --- a/src/backend/Simulator.java +++ b/src/backend/Simulator.java @@ -29,7 +29,8 @@ public class Simulator extends Thread { private boolean loopingBorder; private boolean clickActionFlag; private int loopDelay = 150; - private ArrayList ruleSurviveCriteria= new ArrayList() ; + private ArrayList ruleSurviveCriteria= new ArrayList(); + private ArrayList ruleBirthCriteria=new ArrayList() ; //Rules rule = new Rules(); //TODO : add missing attribute(s) @@ -42,16 +43,16 @@ public class Simulator extends Thread { clickActionFlag=false; cells = new ArrayList>(); newCells = new ArrayList>(); - + agents = new ArrayList(); fieldBirthValues = new ArrayList(); fieldSurviveValues = new ArrayList(); //TODO : add missing attribute initialization - - - + ruleSurviveCriteria.add(2);//initializing system with conway rule + ruleSurviveCriteria.add(3); + ruleBirthCriteria.add(3); //initialize grid with dead cells for(int x=0; x < getWidth();x++) { ArrayList arrayCell = new ArrayList(); //initialize first dimension with ArrayLists @@ -485,6 +486,25 @@ public class Simulator extends Thread { public void loadAgents(ArrayList stringArray) { //TODO : Same idea as other load methods, but for agent list + if(stringArray.size()<=0) { + System.out.println("empty agents file"); + return; + } + //TODO : remove previous rule (=emptying lists) + + + + for(int x=0; x