changes

Author: jCodingStuff

core/src/com/group/golf/Physics/Physics.java

@@ -38,6 +38,15 @@ public Physics(Course course, Ball ball) {
 
     }
 
+    public Physics(Physics other) {
+        this.course = other.course;
+        this.ball = other.ball;
+        this.collision = other.collision;
+        this.offsets = other.offsets;
+        this.scales = other.scales;
+        this.water = other.water;
+    }
+
 
     /**
      * Sets the acceleration , velocity and position
@@ -245,4 +254,8 @@ public boolean isWater() {
     public void setWater(boolean water) {
         this.water = water;
     }
+
+    public void setCollision(Collision collision) {
+        this.collision = collision;
+    }
 }

core/src/com/group/golf/ai/GeneticBot.java

@@ -26,9 +26,9 @@ public class GeneticBot implements Bot {
 
     private int counter = 0;
 
-    private static final int POPULATION_SIZE = 100;
+    private static final int POPULATION_SIZE = 50;
     private static final int DNA_LENGTH = 5;
-    private static final double MAX_FORCE = 3000;
+    private static final double MAX_FORCE = 500;
 
     private static final int GENERATION_LIMIT = 5;
     private static final double MUTATION_RATE = 0.01;
@@ -52,8 +52,6 @@ public GeneticBot(Course course, Ball ball) {
         this.virtualBall = new Ball(ball);
         this.virtualBall.setPosition(this.course.getStart()[0], this.course.getStart()[1]);
 
-        this.virtualEngine = new Physics(course, this.virtualBall);
-
         this.crossOver = new AverageCrossOver(this);
         this.mutation = new AlterMutation();
         this.computer = new InverseScoreComputer();
@@ -75,12 +73,16 @@ public void makeMove() {
     @Override
     public void setPhysics(Physics physics) {
         this.engine = physics;
+        this.virtualEngine = new Physics(physics);
+        this.virtualEngine.setBall(this.virtualBall);
     }
 
     @Override
     public void setCollision(Collision collision) {
         this.collision = collision;
         this.virtualCollision = new Collision(collision);
+        this.virtualCollision.setBall(this.virtualEngine.getBall());
+        this.virtualEngine.setCollision(this.virtualCollision);
         this.startEvolution();
     }
 

core/src/com/group/golf/ai/botMartijn.java

@@ -21,8 +21,8 @@ public class botMartijn implements Bot {
 
     //Constants for the method Score
         private static final double WATER_SCORE = 0.0; //needs adjusting by trial and error
-        private static final double DISTANCE_SCORE = 0.0; //needs adjusting by trial and error
-        private static final double PREVIOUS_SCORE = 0.0; //needs adjusting by trial and error
+        private static final double DISTANCE_SCORE = 0.6; //needs adjusting by trial and error
+        private static final double PREVIOUS_SCORE = 0.3; //needs adjusting by trial and error
         private static final double METHOD4 = 0.0;
 
 
@@ -48,19 +48,23 @@ public botMartijn(Course course, Ball ball) {
 
             this.virtualBall = new Ball(ball);
             this.virtualBall.setPosition(this.course.getStart()[0], this.course.getStart()[1]);
-            this.virtualEngine = new Physics(course, this.virtualBall);
 
             this.maxForce = this.ball.getMass() * this.course.getVmax();  //open for adjustment
         }
 
         @Override
         public void setPhysics(Physics physics) {
             this.engine = physics;
+            this.virtualEngine = new Physics(physics);
+            this.virtualEngine.setBall(this.virtualBall);
         }
 
         @Override
         public void setCollision(Collision collision) {
             this.collision = collision;
+            this.virtualCollision = new Collision(collision);
+            this.virtualCollision.setBall(this.virtualEngine.getBall());
+            this.virtualEngine.setCollision(this.virtualCollision);
         }
 
         @Override

core/src/com/group/golf/screens/BotScreen.java

@@ -16,10 +16,7 @@
 import com.group.golf.Course;
 import com.group.golf.Golf;
 import com.group.golf.Physics.Physics;
-import com.group.golf.ai.Bot;
-import com.group.golf.ai.DumBot;
-import com.group.golf.ai.GeneticBot;
-import com.group.golf.ai.RandomBot;
+import com.group.golf.ai.*;
 import com.group.golf.math.Computable;
 import com.group.golf.math.Function;
 
@@ -164,7 +161,7 @@ public void changed(ChangeEvent event, Actor actor) {
                     martijn.setTouchable(Touchable.disabled);
                     dum.setTouchable(Touchable.disabled);
                     back.setTouchable(Touchable.disabled);
-                    Bot genBot = new GeneticBot(course, ball);
+                    Bot genBot = new botMartijn(course, ball);
                     this.game.setScreen(new CourseScreen(this.game, this.course, this.ball, genBot));
                     this.screen.dispose();
                 }