Merge branch 'master' of https://github.com/BotMaster3000/CellSimulator

BotMaster3000 · BotMaster3000 · commit 13933eb7ab86 · 2019-03-24T19:33:29.000+01:00
diff --git a/.vs/CellSimulator/v15/.suo b/.vs/CellSimulator/v15/.suo
diff --git a/Cell.cs b/Cell.cs
@@ -18,7 +18,7 @@ public class Cell
         public int maxEnergy = 100;
 
         public string lastAction = "Born";
-        
+
         public Cell(int cellId)
         {
             id = cellId;
@@ -27,15 +27,15 @@ public Cell(int cellId)
         public bool Eat(Random rand)
         {
             bool didEat = false;
-            if(rand.Next(0, 101) > 75)
+            if (rand.Next(0, 101) > 75)
             {
                 didEat = true;
             }
             if (didEat)
             {
                 food += 40;
             }
-            if(food > maxFood)
+            if (food > maxFood)
             {
                 food = maxFood;
             }
@@ -44,10 +44,10 @@ public bool Eat(Random rand)
         public bool Split(Random rand)
         {
             bool didSplit = false;
-            if(rand.Next(0, 101) > 75)
+            if (rand.Next(0, 101) > 75)
             {
                 didSplit = true;
-            }            
+            }
             return didSplit;
         }
     }
diff --git a/CellOverseer.cs b/CellOverseer.cs
@@ -15,7 +15,7 @@ public class CellOverseer
 
         public CellOverseer(int startingCells)
         {
-            for(int i = 0; i < startingCells; ++i)
+            for (int i = 0; i < startingCells; ++i)
             {
                 AddNewCell(cells);
             }
@@ -28,13 +28,13 @@ public void AddNewCell(List<Cell> cellList)
         public void SimulateNext()
         {
             List<Cell> stillAliveCells = new List<Cell>();
-            foreach(Cell cell in cells)
+            foreach (Cell cell in cells)
             {
-                if(cell.energy <= 0 || cell.food <= 0)
+                if (cell.energy <= 0 || cell.food <= 0)
                 {
                     continue;
                 }
-                if(cell.food >= 60)
+                if (cell.food >= 60)
                 {
                     if (cell.Split(rand))
                     {
@@ -58,8 +58,8 @@ public void SimulateNext()
                     else
                     {
                         cell.lastAction = "FailEat";
-                    }                    
-                }                
+                    }
+                }
                 cell.energy -= 5;
                 cell.food -= 5;
                 if (cell.energy <= 0 || cell.food <= 0)
@@ -74,7 +74,7 @@ public void SimulateNext()
         public void SaveToFile()
         {
             List<string> linesToAppend = new List<string>();
-            foreach(Cell cell in cells)
+            foreach (Cell cell in cells)
             {
                 string lineToAppend = cell.id + "|" + cell.age + "|" + cell.food + "|" + cell.maxFood + "|" + cell.energy + "|" + cell.maxEnergy + "|" + cell.lastAction;
                 linesToAppend.Add(lineToAppend);
@@ -83,15 +83,15 @@ public void SaveToFile()
             File.AppendAllLines("CellList-" + nameAppender + ".txt", linesToAppend);
         }
         public bool LoadFromFile(string fileName)
-        {            
-            if(!File.Exists(fileName))
+        {
+            if (!File.Exists(fileName))
             {
                 return false;
             }
 
             List<Cell> listOfCells = new List<Cell>();
             string[] dataLines = File.ReadAllLines(fileName);
-            foreach(string dataLine in dataLines)
+            foreach (string dataLine in dataLines)
             {
                 string[] splitDataLine = dataLine.Split('|');
                 Cell tempCell = new Cell(cellIdCounter)
diff --git a/Program.cs b/Program.cs
@@ -10,33 +10,40 @@ class Program
     {
         static void Main(string[] args)
         {
+            bool showCellInfo = true;
             CellOverseer overseer = new CellOverseer(1);
             while (true)
             {
-                foreach(Cell cell in overseer.cells)
+                if (showCellInfo)
                 {
-                    Console.WriteLine("ID:" + cell.id + "|AGE:" + cell.age + "|FOOD:" + cell.food + "|ENERGY:" + cell.energy + "|ACTION:" + cell.lastAction);
+                    foreach (Cell cell in overseer.cells)
+                    {
+                        Console.WriteLine("ID:" + cell.id + "|AGE:" + cell.age + "|FOOD:" + cell.food + "|ENERGY:" + cell.energy + "|ACTION:" + cell.lastAction);
+                    }
                 }
                 Console.WriteLine("ALIVE:" + overseer.cells.Count());
-                string keyPressed = Console.ReadLine();
-                if(keyPressed != "")
+                string commandEntered = Console.ReadLine().ToLower();
+                if (!string.IsNullOrEmpty(commandEntered))
                 {
-                    if(keyPressed == "save")
-                    {
-                        overseer.SaveToFile();
-                        continue;
-                    }
-                    else if(keyPressed == "load")
+                    switch (commandEntered)
                     {
-                        string fileName = Console.ReadLine();
-                        if(fileName == "")
-                        {
+                        case "save":
+                            overseer.SaveToFile();
                             continue;
-                        }
-                        else
-                        {
-                            overseer.LoadFromFile(fileName);
-                        }
+                        case "load":
+                            string fileName = Console.ReadLine();
+                            if (string.IsNullOrEmpty(fileName))
+                            {
+                                continue;
+                            }
+                            else
+                            {
+                                overseer.LoadFromFile(fileName);
+                            }
+                            break;
+                        case "switchshowinfo":
+                            showCellInfo = !showCellInfo;
+                            break;
                     }
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public class Cell`
`18`	`18`	`public int maxEnergy = 100;`
`19`	`19`
`20`	`20`	`public string lastAction = "Born";`
`21`		`-`
	`21`	`+`
`22`	`22`	`public Cell(int cellId)`
`23`	`23`	`{`
`24`	`24`	`id = cellId;`
`@@ -27,15 +27,15 @@ public Cell(int cellId)`
`27`	`27`	`public bool Eat(Random rand)`
`28`	`28`	`{`
`29`	`29`	`bool didEat = false;`
`30`		`- if(rand.Next(0, 101) > 75)`
	`30`	`+ if (rand.Next(0, 101) > 75)`
`31`	`31`	`{`
`32`	`32`	`didEat = true;`
`33`	`33`	`}`
`34`	`34`	`if (didEat)`
`35`	`35`	`{`
`36`	`36`	`food += 40;`
`37`	`37`	`}`
`38`		`- if(food > maxFood)`
	`38`	`+ if (food > maxFood)`
`39`	`39`	`{`
`40`	`40`	`food = maxFood;`
`41`	`41`	`}`
`@@ -44,10 +44,10 @@ public bool Eat(Random rand)`
`44`	`44`	`public bool Split(Random rand)`
`45`	`45`	`{`
`46`	`46`	`bool didSplit = false;`
`47`		`- if(rand.Next(0, 101) > 75)`
	`47`	`+ if (rand.Next(0, 101) > 75)`
`48`	`48`	`{`
`49`	`49`	`didSplit = true;`
`50`		`- }`
	`50`	`+ }`
`51`	`51`	`return didSplit;`
`52`	`52`	`}`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public class CellOverseer`
`15`	`15`
`16`	`16`	`public CellOverseer(int startingCells)`
`17`	`17`	`{`
`18`		`- for(int i = 0; i < startingCells; ++i)`
	`18`	`+ for (int i = 0; i < startingCells; ++i)`
`19`	`19`	`{`
`20`	`20`	`AddNewCell(cells);`
`21`	`21`	`}`
`@@ -28,13 +28,13 @@ public void AddNewCell(List<Cell> cellList)`
`28`	`28`	`public void SimulateNext()`
`29`	`29`	`{`
`30`	`30`	`List<Cell> stillAliveCells = new List<Cell>();`
`31`		`- foreach(Cell cell in cells)`
	`31`	`+ foreach (Cell cell in cells)`
`32`	`32`	`{`
`33`		`- if(cell.energy <= 0 \|\| cell.food <= 0)`
	`33`	`+ if (cell.energy <= 0 \|\| cell.food <= 0)`
`34`	`34`	`{`
`35`	`35`	`continue;`
`36`	`36`	`}`
`37`		`- if(cell.food >= 60)`
	`37`	`+ if (cell.food >= 60)`
`38`	`38`	`{`
`39`	`39`	`if (cell.Split(rand))`
`40`	`40`	`{`
`@@ -58,8 +58,8 @@ public void SimulateNext()`
`58`	`58`	`else`
`59`	`59`	`{`
`60`	`60`	`cell.lastAction = "FailEat";`
`61`		`- }`
`62`		`- }`
	`61`	`+ }`
	`62`	`+ }`
`63`	`63`	`cell.energy -= 5;`
`64`	`64`	`cell.food -= 5;`
`65`	`65`	`if (cell.energy <= 0 \|\| cell.food <= 0)`
`@@ -74,7 +74,7 @@ public void SimulateNext()`
`74`	`74`	`public void SaveToFile()`
`75`	`75`	`{`
`76`	`76`	`List<string> linesToAppend = new List<string>();`
`77`		`- foreach(Cell cell in cells)`
	`77`	`+ foreach (Cell cell in cells)`
`78`	`78`	`{`
`79`	`79`	`string lineToAppend = cell.id + "\|" + cell.age + "\|" + cell.food + "\|" + cell.maxFood + "\|" + cell.energy + "\|" + cell.maxEnergy + "\|" + cell.lastAction;`
`80`	`80`	`linesToAppend.Add(lineToAppend);`
`@@ -83,15 +83,15 @@ public void SaveToFile()`
`83`	`83`	`File.AppendAllLines("CellList-" + nameAppender + ".txt", linesToAppend);`
`84`	`84`	`}`
`85`	`85`	`public bool LoadFromFile(string fileName)`
`86`		`- {`
`87`		`- if(!File.Exists(fileName))`
	`86`	`+ {`
	`87`	`+ if (!File.Exists(fileName))`
`88`	`88`	`{`
`89`	`89`	`return false;`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`List<Cell> listOfCells = new List<Cell>();`
`93`	`93`	`string[] dataLines = File.ReadAllLines(fileName);`
`94`		`- foreach(string dataLine in dataLines)`
	`94`	`+ foreach (string dataLine in dataLines)`
`95`	`95`	`{`
`96`	`96`	`string[] splitDataLine = dataLine.Split('\|');`
`97`	`97`	`Cell tempCell = new Cell(cellIdCounter)`