Merge pull request #43 from MaxRobinsonTheGreat/mut-probs-ui

removed mut prob balancing

src/Controllers/ControlPanel.js

@@ -192,15 +192,12 @@ class ControlPanel {
             switch(this.id){
                 case "add-prob":
                     Hyperparams.addProb = this.value;
-                    Hyperparams.balanceMutationProbs(1);
                     break;
                 case "change-prob":
                     Hyperparams.changeProb = this.value;
-                    Hyperparams.balanceMutationProbs(2);
                     break;
                 case "remove-prob":
                     Hyperparams.removeProb = this.value;
-                    Hyperparams.balanceMutationProbs(3);
                     break;
             }
             $('#add-prob').val(Math.floor(Hyperparams.addProb));

src/Hyperparameters.js

@@ -29,24 +29,6 @@ const Hyperparams = {
 
         this.foodDropProb = 0;
     },
-
-    balanceMutationProbs : function(choice) {
-        if (choice == 1) {
-            var remaining = 100 - this.addProb;
-            this.changeProb = remaining/2;
-            this.removeProb = remaining/2;
-        }
-        else if (choice == 2) {
-            var remaining = 100 - this.changeProb;
-            this.addProb = remaining/2;
-            this.removeProb = remaining/2;
-        }
-        else {
-            var remaining = 100 - this.removeProb;
-            this.changeProb = remaining/2;
-            this.addProb = remaining/2;
-        }
-    }
 }
 
 Hyperparams.setDefaults();

src/Organism/Organism.js

@@ -123,42 +123,37 @@ class Organism {
     }
 
     mutate() {
-        var choice = Math.floor(Math.random() * 100);
+        let mutated = false;
-        var mutated = false;
+        if (this.calcRandomChance(Hyperparams.addProb)) {
-        if (choice <= Hyperparams.addProb) {
+            let branch = this.anatomy.getRandomCell();
-            // add cell
+            let state = CellStates.getRandomLivingType();//branch.state;
-            // console.log("add cell")
+            let growth_direction = Neighbors.all[Math.floor(Math.random() * Neighbors.all.length)]
-
+            let c = branch.loc_col+growth_direction[0];
-            var branch = this.anatomy.getRandomCell();
+            let r = branch.loc_row+growth_direction[1];
-            var state = CellStates.getRandomLivingType();//branch.state;
-            var growth_direction = Neighbors.all[Math.floor(Math.random() * Neighbors.all.length)]
-            var c = branch.loc_col+growth_direction[0];
-            var r = branch.loc_row+growth_direction[1];
             if (this.anatomy.canAddCellAt(c, r)){
                 mutated = true;
                 this.anatomy.addRandomizedCell(state, c, r);
             }
         }
-        else if (choice <= Hyperparams.addProb + Hyperparams.changeProb){
+        if (this.calcRandomChance(Hyperparams.changeProb)){
-            // change cell
+            let cell = this.anatomy.getRandomCell();
-            var cell = this.anatomy.getRandomCell();
+            let state = CellStates.getRandomLivingType();
-            var state = CellStates.getRandomLivingType();
-            // console.log("change cell", state)
             this.anatomy.replaceCell(state, cell.loc_col, cell.loc_row);
             mutated = true;
         }
-        else if (choice <= Hyperparams.addProb + Hyperparams.changeProb + Hyperparams.removeProb){
+        if (this.calcRandomChance(Hyperparams.removeProb)){
-            // remove cell
-            // console.log("remove cell")
-
             if(this.anatomy.cells.length > 1) {
-                var cell = this.anatomy.getRandomCell();
+                let cell = this.anatomy.getRandomCell();
                 mutated = this.anatomy.removeCell(cell.loc_col, cell.loc_row);
             }
         }
         return mutated;
     }
 
+    calcRandomChance(prob) {
+        return (Math.random() * 100) <= prob;
+    }
+
     attemptMove() {
         var direction = Directions.scalars[this.direction];
         var direction_c = direction[0];