gitignore for .class

GAIGResearch · May 5, 2017 · b7ac94e · b7ac94e
2 parents 7cc9771 + 00a5547
commit b7ac94e
Show file tree

Hide file tree

Showing 20 changed files with 42,177 additions and 1,276 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,3 +21,4 @@ out/
 /build/dist/
 
 *.ipr
+*.class
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/clients/GVGAI-JavaClient/src/ClientComm.java b/clients/GVGAI-JavaClient/src/ClientComm.java
@@ -16,7 +16,7 @@
 public class ClientComm {
 
     public static enum COMM_STATE {
-        START, INIT, INIT_END, ACT, ACT_END, ENDED, ENDED_END
+        START, INIT, INIT_END, ACT, ACT_END, ENDED, ENDED_END, CHOOSE
     }
 
     /**
@@ -130,6 +130,13 @@ private void listen() throws IOException {
                 writeToFile("action: " + rndAction);
                 writeToServer(rndAction);
 
+            }else if(commState == COMM_STATE.CHOOSE)
+            {
+                //This is the place to pick a level to be played after the initial 2 levels have gone through
+                Random r = new Random();
+                Integer message = r.nextInt(2);
+                writeToServer(message.toString());
+
             }else if(commState == COMM_STATE.ENDED_END)
             {
                 // TODO: 27/03/2017 Daniel: is the game stopped ?
@@ -201,6 +208,10 @@ public COMM_STATE processCommandLine() throws IOException {
             game.remMillis = sso.elapsedTimer;
             return COMM_STATE.ACT_END;
 
+        }else if(sso.gameState == SerializableStateObservation.State.CHOOSE_LEVEL) {
+            game.remMillis = sso.elapsedTimer;
+            return COMM_STATE.CHOOSE;
+
         }
         return commState;
     }
@@ -209,6 +220,15 @@ public void processLine(String json) throws IOException{
         writeToFile("initializing gson");
         try {
             Gson gson = new Gson();
+
+            // Debug line
+            //fileOutput.write(json);
+
+            if (json.equals("INIT_START")){
+                this.sso.gameState = SerializableStateObservation.State.INIT_STATE;
+                return;
+            }
+
             this.sso = gson.fromJson(json, SerializableStateObservation.class);
             writeToFile("gson initialized");
         } catch (Exception e){

diff --git a/debugClientLog.txt b/debugClientLog.txt
@@ -0,0 +1,31 @@
+Listening for transport dt_socket at address: 8000
+INIT_DONE
+ACTION_RIGHT
+ACTION_RIGHT
+ACTION_LEFT
+ACTION_RIGHT
+ACTION_LEFT
+ACTION_RIGHT
+ACTION_RIGHT
+ACTION_LEFT
+ACTION_RIGHT
+ACTION_LEFT
+ACTION_RIGHT
+ACTION_RIGHT
+ACTION_LEFT
+ACTION_RIGHT
+ACTION_RIGHT
+ACTION_RIGHT
+ACTION_LEFT
+ACTION_LEFT
+ACTION_LEFT
+ACTION_LEFT
+ACTION_RIGHT
+ACTION_RIGHT
+ACTION_RIGHT
+ACTION_LEFT
+ACTION_RIGHT
+ACTION_LEFT
+ACTION_RIGHT
+ACTION_RIGHT
+ACTION_LEFT