From 18d6e32f6446099fb62f494fc36d6e5b25927984 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20L=C3=B6wenstrom?= <jan.loewenstrom@web.de>
Date: Thu, 5 Mar 2020 11:58:57 +0100
Subject: [PATCH] split DinoWorld between simple and advanced example

---
 .../evironment/jumpingDino/DinoWorld.java     | 43 ++++++-------------
 .../jumpingDino/DinoWorldAdvanced.java        | 26 +++++++++++
 src/main/java/example/JumpingDino.java        |  2 +-
 3 files changed, 41 insertions(+), 30 deletions(-)
 create mode 100644 src/main/java/evironment/jumpingDino/DinoWorldAdvanced.java

diff --git a/src/main/java/evironment/jumpingDino/DinoWorld.java b/src/main/java/evironment/jumpingDino/DinoWorld.java
index 103fc08..9c18bd9 100644
--- a/src/main/java/evironment/jumpingDino/DinoWorld.java
+++ b/src/main/java/evironment/jumpingDino/DinoWorld.java
@@ -12,24 +12,15 @@ import java.awt.*;
 
 @Getter
 public class DinoWorld implements Environment<DinoAction>, Visualizable {
-    private Dino dino;
-    private Obstacle currentObstacle;
-    private boolean randomObstacleSpeed;
-    private boolean randomObstacleDistance;
+    protected Dino dino;
+    protected Obstacle currentObstacle;
     private DinoWorldComponent comp;
 
-    public DinoWorld(boolean randomObstacleSpeed, boolean randomObstacleDistance){
-        this.randomObstacleSpeed = randomObstacleSpeed;
-        this.randomObstacleDistance = randomObstacleDistance;
+    public DinoWorld(){
         dino = new Dino(Config.DINO_SIZE, Config.DINO_STARTING_X, Config.FRAME_HEIGHT - Config.GROUND_Y - Config.DINO_SIZE, 0, 0, Color.GREEN);
         spawnNewObstacle();
         comp = new DinoWorldComponent(this);
     }
-
-    public DinoWorld(){
-        this(false, false);
-    }
-
     private boolean ranIntoObstacle(){
         Obstacle o = currentObstacle;
         Dino p = dino;
@@ -43,7 +34,7 @@ public class DinoWorld implements Environment<DinoAction>, Visualizable {
         return xAxis && yAxis;
     }
 
-    private int getDistanceToObstacle(){
+    protected int getDistanceToObstacle(){
         return currentObstacle.getX() - dino.getX() + Config.DINO_SIZE;
     }
 
@@ -78,27 +69,20 @@ public class DinoWorld implements Environment<DinoAction>, Visualizable {
             done = true;
         }
 
-        return new StepResultEnvironment(new DinoStateWithSpeed(getDistanceToObstacle(), dino.isInJump(), getCurrentObstacle().getDx()), reward, done, "");
+        return new StepResultEnvironment(generateReturnState(), reward, done, "");
     }
 
+    protected State generateReturnState(){
+        return new DinoState(getDistanceToObstacle(), dino.isInJump());
+    }
 
-    private void spawnNewObstacle(){
+    protected void spawnNewObstacle(){
         int dx;
         int xSpawn;
 
-        if(randomObstacleSpeed){
-            dx = -(int)((Math.random() + 0.5) * Config.OBSTACLE_SPEED);
-        }else{
-            dx = -Config.OBSTACLE_SPEED;
-        }
-
-        if(randomObstacleDistance){
-            // randomly spawning more right outside of the screen
-            xSpawn = (int)(Math.random() + 0.5 * Config.FRAME_WIDTH + Config.FRAME_WIDTH  + Config.OBSTACLE_SIZE);
-        }else{
-            // instantly respawning on the left screen border
-            xSpawn = Config.FRAME_WIDTH + Config.OBSTACLE_SIZE;
-        }
+        dx = -Config.OBSTACLE_SPEED;
+        // instantly respawning on the left screen border
+        xSpawn = Config.FRAME_WIDTH + Config.OBSTACLE_SIZE;
 
         currentObstacle = new Obstacle(Config.OBSTACLE_SIZE, xSpawn, Config.FRAME_HEIGHT - Config.GROUND_Y - Config.OBSTACLE_SIZE, dx, 0, Color.BLACK);
     }
@@ -106,11 +90,12 @@ public class DinoWorld implements Environment<DinoAction>, Visualizable {
     private void spawnDino(){
         dino = new Dino(Config.DINO_SIZE, Config.DINO_STARTING_X, Config.FRAME_HEIGHT - Config.GROUND_Y - Config.DINO_SIZE, 0, 0, Color.GREEN);
     }
+
     @Override
     public State reset() {
         spawnDino();
         spawnNewObstacle();
-        return new DinoState(getDistanceToObstacle(), dino.isInJump());
+        return generateReturnState();
     }
 
     @Override
diff --git a/src/main/java/evironment/jumpingDino/DinoWorldAdvanced.java b/src/main/java/evironment/jumpingDino/DinoWorldAdvanced.java
new file mode 100644
index 0000000..7513ff0
--- /dev/null
+++ b/src/main/java/evironment/jumpingDino/DinoWorldAdvanced.java
@@ -0,0 +1,26 @@
+package evironment.jumpingDino;
+
+import core.State;
+
+import java.awt.*;
+
+public class DinoWorldAdvanced extends DinoWorld{
+    public DinoWorldAdvanced(){
+        super();
+    }
+
+    @Override
+    protected State generateReturnState() {
+        return new DinoStateWithSpeed(getDistanceToObstacle(), dino.isInJump(), getCurrentObstacle().getDx());
+    }
+
+    @Override
+    protected void spawnNewObstacle() {
+        int dx;
+        int xSpawn;
+        dx = -(int)((Math.random() + 0.5) * Config.OBSTACLE_SPEED);
+        // randomly spawning more right outside of the screen
+        xSpawn = (int)(Math.random() + 0.5 * Config.FRAME_WIDTH + Config.FRAME_WIDTH  + Config.OBSTACLE_SIZE);
+        currentObstacle = new Obstacle(Config.OBSTACLE_SIZE, xSpawn, Config.FRAME_HEIGHT - Config.GROUND_Y - Config.OBSTACLE_SIZE, dx, 0, Color.BLACK);
+    }
+}
diff --git a/src/main/java/example/JumpingDino.java b/src/main/java/example/JumpingDino.java
index ce81753..3f71ca1 100644
--- a/src/main/java/example/JumpingDino.java
+++ b/src/main/java/example/JumpingDino.java
@@ -12,7 +12,7 @@ public class JumpingDino {
         RNG.setSeed(55);
 
         RLController<DinoAction> rl = new RLControllerGUI<>(
-                new DinoWorld(false, false),
+                new DinoWorld(),
                 Method.MC_CONTROL_FIRST_VISIT,
                 DinoAction.values());