fix some bugs, including the selection of language

GAIGResearch · Jun 19, 2017 · 2ed2e97 · 2ed2e97
1 parent 26764e1
commit 2ed2e97
Show file tree

Hide file tree

Showing 1,548 changed files with 52 additions and 31 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/.idea/libraries/gson_2_6_2.xml b/.idea/libraries/gson_2_6_2.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/LICENSE.txt b/LICENSE.txt
diff --git a/README.md b/README.md
diff --git a/README_CODE_STRUCTURE.txt b/README_CODE_STRUCTURE.txt
diff --git a/actionsFile_aliens_lvl0.txt b/actionsFile_aliens_lvl0.txt
diff --git a/build.xml b/build.xml
diff --git a/clients/GVGAI-JavaClient/GVGAI-JavaClient.iml b/clients/GVGAI-JavaClient/GVGAI-JavaClient.iml
diff --git a/clients/GVGAI-JavaClient/lib/gson-2.8.0.jar b/clients/GVGAI-JavaClient/lib/gson-2.8.0.jar
diff --git a/clients/GVGAI-JavaClient/src/TestLearningClient.java b/clients/GVGAI-JavaClient/src/TestLearningClient.java
@@ -21,7 +21,7 @@ public static void main(String[] args)
         {
             scriptFile = "clients\\GVGAI-JavaClient\\src\\utils\\runServer_nocompile.bat";
         }else{
-            scriptFile = "src/utils/runServer_nocompile.sh";
+            scriptFile = "clients/GVGAI-JavaClient/src/utils/runServer_nocompile.sh";
         }
 
         //Agent to play with

diff --git a/clients/GVGAI-JavaClient/src/agents/random/Agent.java b/clients/GVGAI-JavaClient/src/agents/random/Agent.java
diff --git a/clients/GVGAI-JavaClient/src/serialization/ArrayAdapter.java b/clients/GVGAI-JavaClient/src/serialization/ArrayAdapter.java
diff --git a/clients/GVGAI-JavaClient/src/serialization/ArrayAdapterFactory.java b/clients/GVGAI-JavaClient/src/serialization/ArrayAdapterFactory.java
diff --git a/clients/GVGAI-JavaClient/src/serialization/Observation.java b/clients/GVGAI-JavaClient/src/serialization/Observation.java
diff --git a/clients/GVGAI-JavaClient/src/serialization/SerializableStateObservation.java b/clients/GVGAI-JavaClient/src/serialization/SerializableStateObservation.java
diff --git a/clients/GVGAI-JavaClient/src/serialization/Types.java b/clients/GVGAI-JavaClient/src/serialization/Types.java
diff --git a/clients/GVGAI-JavaClient/src/utils/AbstractPlayer.java b/clients/GVGAI-JavaClient/src/utils/AbstractPlayer.java
diff --git a/clients/GVGAI-JavaClient/src/utils/ClientComm.java b/clients/GVGAI-JavaClient/src/utils/ClientComm.java
diff --git a/clients/GVGAI-JavaClient/src/utils/CompetitionParameters.java b/clients/GVGAI-JavaClient/src/utils/CompetitionParameters.java
diff --git a/clients/GVGAI-JavaClient/src/utils/ElapsedCpuTimer.java b/clients/GVGAI-JavaClient/src/utils/ElapsedCpuTimer.java
diff --git a/clients/GVGAI-JavaClient/src/utils/ElapsedWallTimer.java b/clients/GVGAI-JavaClient/src/utils/ElapsedWallTimer.java
diff --git a/clients/GVGAI-JavaClient/src/utils/IO.java b/clients/GVGAI-JavaClient/src/utils/IO.java
diff --git a/clients/GVGAI-JavaClient/src/utils/IOPipe.java b/clients/GVGAI-JavaClient/src/utils/IOPipe.java
diff --git a/clients/GVGAI-JavaClient/src/utils/IOSocket.java b/clients/GVGAI-JavaClient/src/utils/IOSocket.java
diff --git a/clients/GVGAI-JavaClient/src/utils/JavaClient.java b/clients/GVGAI-JavaClient/src/utils/JavaClient.java
diff --git a/clients/GVGAI-JavaClient/src/utils/runServer_nocompile.sh b/clients/GVGAI-JavaClient/src/utils/runServer_nocompile.sh
@@ -19,5 +19,4 @@ rm -rf $build_folder
 mkdir -p $build_folder
 find ${src_folder} -name "*.java" > sources.txt
 javac -cp ${gson} -d $build_folder @sources.txt
-
 java -agentlib:jdwp=transport=dt_socket,server=y,address=8000,suspend=n -classpath ${build_folder}:${gson} tracks.singleLearning.utils.JavaServer ${SERVER_GAMES_DIR} > logs/output_server_redirect.txt 2> logs/output_server_redirect_err.txt
diff --git a/clients/GVGAI-PythonClient/src/AbstractPlayer.py b/clients/GVGAI-PythonClient/src/AbstractPlayer.py
@@ -1,8 +1,8 @@
 from SerializableStateObservation import SerializableStateObservation
 from Types import *
 
-class AbstractPlayer:
 
+class AbstractPlayer:
     def init(self, sso, elapsedTimer):
         """
         * Public method to be called at the start of every level of a game.

diff --git a/clients/GVGAI-PythonClient/src/ClientComm.py b/clients/GVGAI-PythonClient/src/ClientComm.py
@@ -5,6 +5,7 @@
 from AbstractPlayer import *
 from SerializableStateObservation import *
 
+
 class ClientComm:
     TOKEN_SEP = '#'
 

diff --git a/clients/GVGAI-PythonClient/src/CompetitionParameters.py b/clients/GVGAI-PythonClient/src/CompetitionParameters.py
@@ -1,5 +1,6 @@
 import sys
 
+
 class CompetitionParameters:
     if 'win32' in sys.platform:
         OS_WIN = True

diff --git a/clients/GVGAI-PythonClient/src/ElapsedCpuTimer.py b/clients/GVGAI-PythonClient/src/ElapsedCpuTimer.py
@@ -1,5 +1,6 @@
 import time
 
+
 class ElapsedCpuTimer:
     if 'win32' in sys.platform():
         OS_WIN = True

diff --git a/clients/GVGAI-PythonClient/src/IOSocket.py b/clients/GVGAI-PythonClient/src/IOSocket.py
@@ -4,6 +4,7 @@
 
 import ClientComm
 
+
 class IOSocket:
 
     def __init__(self,port):  

diff --git a/clients/GVGAI-PythonClient/src/PythonClient.py b/clients/GVGAI-PythonClient/src/PythonClient.py
diff --git a/clients/GVGAI-PythonClient/src/SampleAgents/SampleRandomAgent.py b/clients/GVGAI-PythonClient/src/SampleAgents/SampleRandomAgent.py
diff --git a/clients/GVGAI-PythonClient/src/SerializableStateObservation.py b/clients/GVGAI-PythonClient/src/SerializableStateObservation.py
diff --git a/clients/GVGAI-PythonClient/src/TestLearningClient.py b/clients/GVGAI-PythonClient/src/TestLearningClient.py
@@ -1,7 +1,7 @@
 from ClientComm import ClientComm
 from CompetitionParameters import CompetitionParameters
 import subprocess, traceback, sys
-
+import os.path
 
 class TestLearningClient:
     def __init__(self):
@@ -10,7 +10,7 @@ def __init__(self):
         if(CompetitionParameters.OS_WIN):
             self.scriptFile = "utils\\runServer_nocompile_python.bat"
         else:
-            self.scriptFile = "utils/runServer_nocompile_python.sh"
+            self.scriptFile = os.path.join("utils", "runServer_nocompile_python.sh")
 
         self.agentName = "SampleRandomAgent"
 

diff --git a/clients/GVGAI-PythonClient/src/Types.py b/clients/GVGAI-PythonClient/src/Types.py
diff --git a/clients/GVGAI-PythonClient/src/Utils/runServer_nocompile_python.bat b/clients/GVGAI-PythonClient/src/Utils/runServer_nocompile_python.bat
diff --git a/clients/GVGAI-PythonClient/src/Utils/runServer_nocompile_python.sh b/clients/GVGAI-PythonClient/src/Utils/runServer_nocompile_python.sh
@@ -10,7 +10,6 @@ fi
 
 #Point at the folder that contains 'examples/'
 SERVER_GAMES_DIR='../../../'
-
 src_folder='../../../src'
 build_folder='out'
 gson='lib/gson-2.8.0.jar'
@@ -20,4 +19,4 @@ mkdir -p $build_folder
 find ${src_folder} -name "*.java" > sources.txt
 javac -cp ${gson} -d $build_folder @sources.txt
 
-java -agentlib:jdwp=transport=dt_socket,server=y,address=8000,suspend=n -classpath ${build_folder}:${gson} tracks.singleLearning.utils.JavaServer ${SERVER_GAMES_DIR} > logs/output_server_redirect.txt 2> logs/output_server_redirect_err.txt
+java -agentlib:jdwp=transport=dt_socket,server=y,address=8080,suspend=n -classpath ${build_folder}:${gson} tracks.singleLearning.utils.JavaServer ${SERVER_GAMES_DIR} > logs/output_server_redirect.txt 2> logs/output_server_redirect_err.txt
diff --git a/clients/GVGAI-PythonClient/src/lib/gson-2.8.0.jar b/clients/GVGAI-PythonClient/src/lib/gson-2.8.0.jar
diff --git a/clients/gson-2.6.2.jar b/clients/gson-2.6.2.jar
diff --git a/doc/javadoc/Test.html b/doc/javadoc/Test.html
diff --git a/doc/javadoc/allclasses-frame.html b/doc/javadoc/allclasses-frame.html
diff --git a/doc/javadoc/allclasses-noframe.html b/doc/javadoc/allclasses-noframe.html
diff --git a/doc/javadoc/constant-values.html b/doc/javadoc/constant-values.html
diff --git a/doc/javadoc/controllers/Heuristics/SimpleStateHeuristic.html b/doc/javadoc/controllers/Heuristics/SimpleStateHeuristic.html
diff --git a/doc/javadoc/controllers/Heuristics/StateHeuristic.html b/doc/javadoc/controllers/Heuristics/StateHeuristic.html
diff --git a/doc/javadoc/controllers/Heuristics/WinScoreHeuristic.html b/doc/javadoc/controllers/Heuristics/WinScoreHeuristic.html
diff --git a/doc/javadoc/controllers/Heuristics/package-frame.html b/doc/javadoc/controllers/Heuristics/package-frame.html
diff --git a/doc/javadoc/controllers/Heuristics/package-summary.html b/doc/javadoc/controllers/Heuristics/package-summary.html
diff --git a/doc/javadoc/controllers/Heuristics/package-tree.html b/doc/javadoc/controllers/Heuristics/package-tree.html
diff --git a/doc/javadoc/controllers/human/Agent.html b/doc/javadoc/controllers/human/Agent.html
diff --git a/doc/javadoc/controllers/human/package-frame.html b/doc/javadoc/controllers/human/package-frame.html
diff --git a/doc/javadoc/controllers/human/package-summary.html b/doc/javadoc/controllers/human/package-summary.html
diff --git a/doc/javadoc/controllers/human/package-tree.html b/doc/javadoc/controllers/human/package-tree.html
diff --git a/doc/javadoc/controllers/replayer/Agent.html b/doc/javadoc/controllers/replayer/Agent.html
diff --git a/doc/javadoc/controllers/replayer/package-frame.html b/doc/javadoc/controllers/replayer/package-frame.html
diff --git a/doc/javadoc/controllers/replayer/package-summary.html b/doc/javadoc/controllers/replayer/package-summary.html
diff --git a/doc/javadoc/controllers/replayer/package-tree.html b/doc/javadoc/controllers/replayer/package-tree.html
diff --git a/doc/javadoc/controllers/sampleGA/Agent.html b/doc/javadoc/controllers/sampleGA/Agent.html
diff --git a/doc/javadoc/controllers/sampleGA/package-frame.html b/doc/javadoc/controllers/sampleGA/package-frame.html
diff --git a/doc/javadoc/controllers/sampleGA/package-summary.html b/doc/javadoc/controllers/sampleGA/package-summary.html
diff --git a/doc/javadoc/controllers/sampleGA/package-tree.html b/doc/javadoc/controllers/sampleGA/package-tree.html
diff --git a/doc/javadoc/controllers/sampleMCTS/Agent.html b/doc/javadoc/controllers/sampleMCTS/Agent.html
diff --git a/doc/javadoc/controllers/sampleMCTS/SingleMCTSPlayer.html b/doc/javadoc/controllers/sampleMCTS/SingleMCTSPlayer.html
diff --git a/doc/javadoc/controllers/sampleMCTS/SingleTreeNode.html b/doc/javadoc/controllers/sampleMCTS/SingleTreeNode.html
diff --git a/doc/javadoc/controllers/sampleMCTS/package-frame.html b/doc/javadoc/controllers/sampleMCTS/package-frame.html
diff --git a/doc/javadoc/controllers/sampleMCTS/package-summary.html b/doc/javadoc/controllers/sampleMCTS/package-summary.html
diff --git a/doc/javadoc/controllers/sampleMCTS/package-tree.html b/doc/javadoc/controllers/sampleMCTS/package-tree.html
diff --git a/doc/javadoc/controllers/sampleRandom/Agent.html b/doc/javadoc/controllers/sampleRandom/Agent.html
diff --git a/doc/javadoc/controllers/sampleRandom/package-frame.html b/doc/javadoc/controllers/sampleRandom/package-frame.html
diff --git a/doc/javadoc/controllers/sampleRandom/package-summary.html b/doc/javadoc/controllers/sampleRandom/package-summary.html
diff --git a/doc/javadoc/controllers/sampleRandom/package-tree.html b/doc/javadoc/controllers/sampleRandom/package-tree.html
diff --git a/doc/javadoc/core/ArcadeMachine.html b/doc/javadoc/core/ArcadeMachine.html
diff --git a/doc/javadoc/core/Node.html b/doc/javadoc/core/Node.html
diff --git a/doc/javadoc/core/SpriteGroup.html b/doc/javadoc/core/SpriteGroup.html
diff --git a/doc/javadoc/core/VGDLFactory.html b/doc/javadoc/core/VGDLFactory.html
diff --git a/doc/javadoc/core/VGDLParser.html b/doc/javadoc/core/VGDLParser.html
diff --git a/doc/javadoc/core/VGDLRegistry.html b/doc/javadoc/core/VGDLRegistry.html
diff --git a/doc/javadoc/core/VGDLSprite.html b/doc/javadoc/core/VGDLSprite.html
diff --git a/doc/javadoc/core/VGDLViewer.html b/doc/javadoc/core/VGDLViewer.html
diff --git a/doc/javadoc/core/competition/AgentExecutor.html b/doc/javadoc/core/competition/AgentExecutor.html
diff --git a/doc/javadoc/core/competition/CompetitionParameters.html b/doc/javadoc/core/competition/CompetitionParameters.html
diff --git a/doc/javadoc/core/competition/package-frame.html b/doc/javadoc/core/competition/package-frame.html
diff --git a/doc/javadoc/core/competition/package-summary.html b/doc/javadoc/core/competition/package-summary.html
diff --git a/doc/javadoc/core/competition/package-tree.html b/doc/javadoc/core/competition/package-tree.html
diff --git a/doc/javadoc/core/content/Content.html b/doc/javadoc/core/content/Content.html
diff --git a/doc/javadoc/core/content/GameContent.html b/doc/javadoc/core/content/GameContent.html
diff --git a/doc/javadoc/core/content/InteractionContent.html b/doc/javadoc/core/content/InteractionContent.html
diff --git a/doc/javadoc/core/content/MappingContent.html b/doc/javadoc/core/content/MappingContent.html
diff --git a/doc/javadoc/core/content/SpriteContent.html b/doc/javadoc/core/content/SpriteContent.html
diff --git a/doc/javadoc/core/content/TerminationContent.html b/doc/javadoc/core/content/TerminationContent.html
diff --git a/doc/javadoc/core/content/package-frame.html b/doc/javadoc/core/content/package-frame.html
diff --git a/doc/javadoc/core/content/package-summary.html b/doc/javadoc/core/content/package-summary.html
diff --git a/doc/javadoc/core/content/package-tree.html b/doc/javadoc/core/content/package-tree.html
diff --git a/doc/javadoc/core/game/BasicGame.html b/doc/javadoc/core/game/BasicGame.html
diff --git a/doc/javadoc/core/game/Event.html b/doc/javadoc/core/game/Event.html
diff --git a/doc/javadoc/core/game/ForwardModel.html b/doc/javadoc/core/game/ForwardModel.html
diff --git a/doc/javadoc/core/game/Game.Bucket.html b/doc/javadoc/core/game/Game.Bucket.html
diff --git a/doc/javadoc/core/game/Game.html b/doc/javadoc/core/game/Game.html
diff --git a/doc/javadoc/core/game/Observation.html b/doc/javadoc/core/game/Observation.html
diff --git a/doc/javadoc/core/game/StateObservation.html b/doc/javadoc/core/game/StateObservation.html
diff --git a/doc/javadoc/core/game/package-frame.html b/doc/javadoc/core/game/package-frame.html
diff --git a/doc/javadoc/core/game/package-summary.html b/doc/javadoc/core/game/package-summary.html
diff --git a/doc/javadoc/core/game/package-tree.html b/doc/javadoc/core/game/package-tree.html
diff --git a/doc/javadoc/core/package-frame.html b/doc/javadoc/core/package-frame.html
diff --git a/doc/javadoc/core/package-summary.html b/doc/javadoc/core/package-summary.html
diff --git a/doc/javadoc/core/package-tree.html b/doc/javadoc/core/package-tree.html
diff --git a/doc/javadoc/core/player/AbstractPlayer.html b/doc/javadoc/core/player/AbstractPlayer.html
diff --git a/doc/javadoc/core/player/package-frame.html b/doc/javadoc/core/player/package-frame.html
diff --git a/doc/javadoc/core/player/package-summary.html b/doc/javadoc/core/player/package-summary.html
diff --git a/doc/javadoc/core/player/package-tree.html b/doc/javadoc/core/player/package-tree.html
diff --git a/doc/javadoc/core/termination/MultiSpriteCounter.html b/doc/javadoc/core/termination/MultiSpriteCounter.html
diff --git a/doc/javadoc/core/termination/SpriteCounter.html b/doc/javadoc/core/termination/SpriteCounter.html
diff --git a/doc/javadoc/core/termination/Termination.html b/doc/javadoc/core/termination/Termination.html
diff --git a/doc/javadoc/core/termination/Timeout.html b/doc/javadoc/core/termination/Timeout.html
diff --git a/doc/javadoc/core/termination/package-frame.html b/doc/javadoc/core/termination/package-frame.html
diff --git a/doc/javadoc/core/termination/package-summary.html b/doc/javadoc/core/termination/package-summary.html
diff --git a/doc/javadoc/core/termination/package-tree.html b/doc/javadoc/core/termination/package-tree.html
diff --git a/doc/javadoc/deprecated-list.html b/doc/javadoc/deprecated-list.html
diff --git a/doc/javadoc/help-doc.html b/doc/javadoc/help-doc.html
diff --git a/doc/javadoc/index-files/index-1.html b/doc/javadoc/index-files/index-1.html
diff --git a/doc/javadoc/index-files/index-10.html b/doc/javadoc/index-files/index-10.html
diff --git a/doc/javadoc/index-files/index-11.html b/doc/javadoc/index-files/index-11.html
diff --git a/doc/javadoc/index-files/index-12.html b/doc/javadoc/index-files/index-12.html
diff --git a/doc/javadoc/index-files/index-13.html b/doc/javadoc/index-files/index-13.html
diff --git a/doc/javadoc/index-files/index-14.html b/doc/javadoc/index-files/index-14.html
diff --git a/doc/javadoc/index-files/index-15.html b/doc/javadoc/index-files/index-15.html
diff --git a/doc/javadoc/index-files/index-16.html b/doc/javadoc/index-files/index-16.html
diff --git a/doc/javadoc/index-files/index-17.html b/doc/javadoc/index-files/index-17.html
diff --git a/doc/javadoc/index-files/index-18.html b/doc/javadoc/index-files/index-18.html
diff --git a/doc/javadoc/index-files/index-19.html b/doc/javadoc/index-files/index-19.html
diff --git a/doc/javadoc/index-files/index-2.html b/doc/javadoc/index-files/index-2.html
diff --git a/doc/javadoc/index-files/index-20.html b/doc/javadoc/index-files/index-20.html
diff --git a/doc/javadoc/index-files/index-21.html b/doc/javadoc/index-files/index-21.html
diff --git a/doc/javadoc/index-files/index-22.html b/doc/javadoc/index-files/index-22.html
diff --git a/doc/javadoc/index-files/index-23.html b/doc/javadoc/index-files/index-23.html
diff --git a/doc/javadoc/index-files/index-24.html b/doc/javadoc/index-files/index-24.html
diff --git a/doc/javadoc/index-files/index-25.html b/doc/javadoc/index-files/index-25.html
diff --git a/doc/javadoc/index-files/index-26.html b/doc/javadoc/index-files/index-26.html
diff --git a/doc/javadoc/index-files/index-27.html b/doc/javadoc/index-files/index-27.html
diff --git a/doc/javadoc/index-files/index-3.html b/doc/javadoc/index-files/index-3.html
diff --git a/doc/javadoc/index-files/index-4.html b/doc/javadoc/index-files/index-4.html
diff --git a/doc/javadoc/index-files/index-5.html b/doc/javadoc/index-files/index-5.html
diff --git a/doc/javadoc/index-files/index-6.html b/doc/javadoc/index-files/index-6.html
diff --git a/doc/javadoc/index-files/index-7.html b/doc/javadoc/index-files/index-7.html
diff --git a/doc/javadoc/index-files/index-8.html b/doc/javadoc/index-files/index-8.html
diff --git a/doc/javadoc/index-files/index-9.html b/doc/javadoc/index-files/index-9.html
diff --git a/doc/javadoc/index.html b/doc/javadoc/index.html
diff --git a/doc/javadoc/ontology/Types.ACTIONS.html b/doc/javadoc/ontology/Types.ACTIONS.html
diff --git a/doc/javadoc/ontology/Types.WINNER.html b/doc/javadoc/ontology/Types.WINNER.html
diff --git a/doc/javadoc/ontology/Types.html b/doc/javadoc/ontology/Types.html
diff --git a/doc/javadoc/ontology/avatar/FlakAvatar.html b/doc/javadoc/ontology/avatar/FlakAvatar.html
diff --git a/doc/javadoc/ontology/avatar/HorizontalAvatar.html b/doc/javadoc/ontology/avatar/HorizontalAvatar.html
diff --git a/doc/javadoc/ontology/avatar/MovingAvatar.html b/doc/javadoc/ontology/avatar/MovingAvatar.html
diff --git a/doc/javadoc/ontology/avatar/NoisyRotatingFlippingAvatar.html b/doc/javadoc/ontology/avatar/NoisyRotatingFlippingAvatar.html
diff --git a/doc/javadoc/ontology/avatar/RotatingAvatar.html b/doc/javadoc/ontology/avatar/RotatingAvatar.html
diff --git a/doc/javadoc/ontology/avatar/RotatingFlippingAvatar.html b/doc/javadoc/ontology/avatar/RotatingFlippingAvatar.html
diff --git a/doc/javadoc/ontology/avatar/VerticalAvatar.html b/doc/javadoc/ontology/avatar/VerticalAvatar.html
diff --git a/doc/javadoc/ontology/avatar/oriented/AimedAvatar.html b/doc/javadoc/ontology/avatar/oriented/AimedAvatar.html
diff --git a/doc/javadoc/ontology/avatar/oriented/AimedFlakAvatar.html b/doc/javadoc/ontology/avatar/oriented/AimedFlakAvatar.html
diff --git a/doc/javadoc/ontology/avatar/oriented/InertialAvatar.html b/doc/javadoc/ontology/avatar/oriented/InertialAvatar.html
diff --git a/doc/javadoc/ontology/avatar/oriented/MarioAvatar.html b/doc/javadoc/ontology/avatar/oriented/MarioAvatar.html
diff --git a/doc/javadoc/ontology/avatar/oriented/OrientedAvatar.html b/doc/javadoc/ontology/avatar/oriented/OrientedAvatar.html
diff --git a/doc/javadoc/ontology/avatar/oriented/ShootAvatar.html b/doc/javadoc/ontology/avatar/oriented/ShootAvatar.html
diff --git a/doc/javadoc/ontology/avatar/oriented/package-frame.html b/doc/javadoc/ontology/avatar/oriented/package-frame.html
diff --git a/doc/javadoc/ontology/avatar/oriented/package-summary.html b/doc/javadoc/ontology/avatar/oriented/package-summary.html
diff --git a/doc/javadoc/ontology/avatar/oriented/package-tree.html b/doc/javadoc/ontology/avatar/oriented/package-tree.html
diff --git a/doc/javadoc/ontology/avatar/package-frame.html b/doc/javadoc/ontology/avatar/package-frame.html
diff --git a/doc/javadoc/ontology/avatar/package-summary.html b/doc/javadoc/ontology/avatar/package-summary.html
diff --git a/doc/javadoc/ontology/avatar/package-tree.html b/doc/javadoc/ontology/avatar/package-tree.html
diff --git a/doc/javadoc/ontology/effects/Effect.html b/doc/javadoc/ontology/effects/Effect.html
diff --git a/doc/javadoc/ontology/effects/binary/BounceForward.html b/doc/javadoc/ontology/effects/binary/BounceForward.html
diff --git a/doc/javadoc/ontology/effects/binary/CollectResource.html b/doc/javadoc/ontology/effects/binary/CollectResource.html
diff --git a/doc/javadoc/ontology/effects/binary/KillIfFromAbove.html b/doc/javadoc/ontology/effects/binary/KillIfFromAbove.html
diff --git a/doc/javadoc/ontology/effects/binary/KillIfOtherHasMore.html b/doc/javadoc/ontology/effects/binary/KillIfOtherHasMore.html
diff --git a/doc/javadoc/ontology/effects/binary/PullWithIt.html b/doc/javadoc/ontology/effects/binary/PullWithIt.html
diff --git a/doc/javadoc/ontology/effects/binary/TeleportToExit.html b/doc/javadoc/ontology/effects/binary/TeleportToExit.html
diff --git a/doc/javadoc/ontology/effects/binary/WallStop.html b/doc/javadoc/ontology/effects/binary/WallStop.html
diff --git a/doc/javadoc/ontology/effects/binary/package-frame.html b/doc/javadoc/ontology/effects/binary/package-frame.html
diff --git a/doc/javadoc/ontology/effects/binary/package-summary.html b/doc/javadoc/ontology/effects/binary/package-summary.html
diff --git a/doc/javadoc/ontology/effects/binary/package-tree.html b/doc/javadoc/ontology/effects/binary/package-tree.html
diff --git a/doc/javadoc/ontology/effects/package-frame.html b/doc/javadoc/ontology/effects/package-frame.html
diff --git a/doc/javadoc/ontology/effects/package-summary.html b/doc/javadoc/ontology/effects/package-summary.html
diff --git a/doc/javadoc/ontology/effects/package-tree.html b/doc/javadoc/ontology/effects/package-tree.html
diff --git a/doc/javadoc/ontology/effects/unary/ChangeResource.html b/doc/javadoc/ontology/effects/unary/ChangeResource.html
diff --git a/doc/javadoc/ontology/effects/unary/CloneSprite.html b/doc/javadoc/ontology/effects/unary/CloneSprite.html
diff --git a/doc/javadoc/ontology/effects/unary/FlipDirection.html b/doc/javadoc/ontology/effects/unary/FlipDirection.html
diff --git a/doc/javadoc/ontology/effects/unary/KillIfHasLess.html b/doc/javadoc/ontology/effects/unary/KillIfHasLess.html
diff --git a/doc/javadoc/ontology/effects/unary/KillIfHasMore.html b/doc/javadoc/ontology/effects/unary/KillIfHasMore.html
diff --git a/doc/javadoc/ontology/effects/unary/KillSprite.html b/doc/javadoc/ontology/effects/unary/KillSprite.html
diff --git a/doc/javadoc/ontology/effects/unary/ReverseDirection.html b/doc/javadoc/ontology/effects/unary/ReverseDirection.html
diff --git a/doc/javadoc/ontology/effects/unary/SpawnIfHasMore.html b/doc/javadoc/ontology/effects/unary/SpawnIfHasMore.html
diff --git a/doc/javadoc/ontology/effects/unary/StepBack.html b/doc/javadoc/ontology/effects/unary/StepBack.html
diff --git a/doc/javadoc/ontology/effects/unary/TransformTo.html b/doc/javadoc/ontology/effects/unary/TransformTo.html
diff --git a/doc/javadoc/ontology/effects/unary/TurnAround.html b/doc/javadoc/ontology/effects/unary/TurnAround.html
diff --git a/doc/javadoc/ontology/effects/unary/UndoAll.html b/doc/javadoc/ontology/effects/unary/UndoAll.html
diff --git a/doc/javadoc/ontology/effects/unary/WrapAround.html b/doc/javadoc/ontology/effects/unary/WrapAround.html
diff --git a/doc/javadoc/ontology/effects/unary/package-frame.html b/doc/javadoc/ontology/effects/unary/package-frame.html
diff --git a/doc/javadoc/ontology/effects/unary/package-summary.html b/doc/javadoc/ontology/effects/unary/package-summary.html
diff --git a/doc/javadoc/ontology/effects/unary/package-tree.html b/doc/javadoc/ontology/effects/unary/package-tree.html
diff --git a/doc/javadoc/ontology/package-frame.html b/doc/javadoc/ontology/package-frame.html
diff --git a/doc/javadoc/ontology/package-summary.html b/doc/javadoc/ontology/package-summary.html
diff --git a/doc/javadoc/ontology/package-tree.html b/doc/javadoc/ontology/package-tree.html
diff --git a/doc/javadoc/ontology/physics/ContinuousPhysics.html b/doc/javadoc/ontology/physics/ContinuousPhysics.html
diff --git a/doc/javadoc/ontology/physics/GravityPhysics.html b/doc/javadoc/ontology/physics/GravityPhysics.html
diff --git a/doc/javadoc/ontology/physics/GridPhysics.html b/doc/javadoc/ontology/physics/GridPhysics.html
diff --git a/doc/javadoc/ontology/physics/NoFrictionPhysics.html b/doc/javadoc/ontology/physics/NoFrictionPhysics.html
diff --git a/doc/javadoc/ontology/physics/Physics.html b/doc/javadoc/ontology/physics/Physics.html
diff --git a/doc/javadoc/ontology/physics/package-frame.html b/doc/javadoc/ontology/physics/package-frame.html
diff --git a/doc/javadoc/ontology/physics/package-summary.html b/doc/javadoc/ontology/physics/package-summary.html
diff --git a/doc/javadoc/ontology/physics/package-tree.html b/doc/javadoc/ontology/physics/package-tree.html
diff --git a/doc/javadoc/ontology/sprites/Conveyor.html b/doc/javadoc/ontology/sprites/Conveyor.html
diff --git a/doc/javadoc/ontology/sprites/Door.html b/doc/javadoc/ontology/sprites/Door.html
diff --git a/doc/javadoc/ontology/sprites/Flicker.html b/doc/javadoc/ontology/sprites/Flicker.html
diff --git a/doc/javadoc/ontology/sprites/Immovable.html b/doc/javadoc/ontology/sprites/Immovable.html
diff --git a/doc/javadoc/ontology/sprites/OrientedFlicker.html b/doc/javadoc/ontology/sprites/OrientedFlicker.html
diff --git a/doc/javadoc/ontology/sprites/Passive.html b/doc/javadoc/ontology/sprites/Passive.html
diff --git a/doc/javadoc/ontology/sprites/Resource.html b/doc/javadoc/ontology/sprites/Resource.html
diff --git a/doc/javadoc/ontology/sprites/ResourcePack.html b/doc/javadoc/ontology/sprites/ResourcePack.html
diff --git a/doc/javadoc/ontology/sprites/Spreader.html b/doc/javadoc/ontology/sprites/Spreader.html
diff --git a/doc/javadoc/ontology/sprites/missile/ErraticMissile.html b/doc/javadoc/ontology/sprites/missile/ErraticMissile.html
diff --git a/doc/javadoc/ontology/sprites/missile/Missile.html b/doc/javadoc/ontology/sprites/missile/Missile.html
diff --git a/doc/javadoc/ontology/sprites/missile/RandomMissile.html b/doc/javadoc/ontology/sprites/missile/RandomMissile.html
diff --git a/doc/javadoc/ontology/sprites/missile/Walker.html b/doc/javadoc/ontology/sprites/missile/Walker.html
diff --git a/doc/javadoc/ontology/sprites/missile/WalkerJumper.html b/doc/javadoc/ontology/sprites/missile/WalkerJumper.html
diff --git a/doc/javadoc/ontology/sprites/missile/package-frame.html b/doc/javadoc/ontology/sprites/missile/package-frame.html
diff --git a/doc/javadoc/ontology/sprites/missile/package-summary.html b/doc/javadoc/ontology/sprites/missile/package-summary.html
diff --git a/doc/javadoc/ontology/sprites/missile/package-tree.html b/doc/javadoc/ontology/sprites/missile/package-tree.html
diff --git a/doc/javadoc/ontology/sprites/npc/AlternateChaser.html b/doc/javadoc/ontology/sprites/npc/AlternateChaser.html
diff --git a/doc/javadoc/ontology/sprites/npc/Chaser.html b/doc/javadoc/ontology/sprites/npc/Chaser.html
diff --git a/doc/javadoc/ontology/sprites/npc/Fleeing.html b/doc/javadoc/ontology/sprites/npc/Fleeing.html
diff --git a/doc/javadoc/ontology/sprites/npc/RandomAltChaser.html b/doc/javadoc/ontology/sprites/npc/RandomAltChaser.html
diff --git a/doc/javadoc/ontology/sprites/npc/RandomInertial.html b/doc/javadoc/ontology/sprites/npc/RandomInertial.html
diff --git a/doc/javadoc/ontology/sprites/npc/RandomNPC.html b/doc/javadoc/ontology/sprites/npc/RandomNPC.html
diff --git a/doc/javadoc/ontology/sprites/npc/package-frame.html b/doc/javadoc/ontology/sprites/npc/package-frame.html
diff --git a/doc/javadoc/ontology/sprites/npc/package-summary.html b/doc/javadoc/ontology/sprites/npc/package-summary.html
diff --git a/doc/javadoc/ontology/sprites/npc/package-tree.html b/doc/javadoc/ontology/sprites/npc/package-tree.html
diff --git a/doc/javadoc/ontology/sprites/package-frame.html b/doc/javadoc/ontology/sprites/package-frame.html
diff --git a/doc/javadoc/ontology/sprites/package-summary.html b/doc/javadoc/ontology/sprites/package-summary.html
diff --git a/doc/javadoc/ontology/sprites/package-tree.html b/doc/javadoc/ontology/sprites/package-tree.html
diff --git a/doc/javadoc/ontology/sprites/producer/Bomber.html b/doc/javadoc/ontology/sprites/producer/Bomber.html
diff --git a/doc/javadoc/ontology/sprites/producer/Portal.html b/doc/javadoc/ontology/sprites/producer/Portal.html
diff --git a/doc/javadoc/ontology/sprites/producer/SpawnPoint.html b/doc/javadoc/ontology/sprites/producer/SpawnPoint.html
diff --git a/doc/javadoc/ontology/sprites/producer/SpriteProducer.html b/doc/javadoc/ontology/sprites/producer/SpriteProducer.html
diff --git a/doc/javadoc/ontology/sprites/producer/package-frame.html b/doc/javadoc/ontology/sprites/producer/package-frame.html
diff --git a/doc/javadoc/ontology/sprites/producer/package-summary.html b/doc/javadoc/ontology/sprites/producer/package-summary.html
diff --git a/doc/javadoc/ontology/sprites/producer/package-tree.html b/doc/javadoc/ontology/sprites/producer/package-tree.html
diff --git a/doc/javadoc/overview-frame.html b/doc/javadoc/overview-frame.html
diff --git a/doc/javadoc/overview-summary.html b/doc/javadoc/overview-summary.html
diff --git a/doc/javadoc/overview-tree.html b/doc/javadoc/overview-tree.html
diff --git a/doc/javadoc/package-frame.html b/doc/javadoc/package-frame.html
diff --git a/doc/javadoc/package-list b/doc/javadoc/package-list
diff --git a/doc/javadoc/package-summary.html b/doc/javadoc/package-summary.html
diff --git a/doc/javadoc/package-tree.html b/doc/javadoc/package-tree.html
diff --git a/doc/javadoc/resources/background.gif b/doc/javadoc/resources/background.gif
diff --git a/doc/javadoc/resources/tab.gif b/doc/javadoc/resources/tab.gif
diff --git a/doc/javadoc/resources/titlebar.gif b/doc/javadoc/resources/titlebar.gif
diff --git a/doc/javadoc/resources/titlebar_end.gif b/doc/javadoc/resources/titlebar_end.gif
diff --git a/doc/javadoc/serialized-form.html b/doc/javadoc/serialized-form.html
diff --git a/doc/javadoc/stylesheet.css b/doc/javadoc/stylesheet.css
diff --git a/doc/javadoc/tools/ElapsedCpuTimer.TimerType.html b/doc/javadoc/tools/ElapsedCpuTimer.TimerType.html
diff --git a/doc/javadoc/tools/ElapsedCpuTimer.html b/doc/javadoc/tools/ElapsedCpuTimer.html
diff --git a/doc/javadoc/tools/IO.html b/doc/javadoc/tools/IO.html
diff --git a/doc/javadoc/tools/JEasyFrame.html b/doc/javadoc/tools/JEasyFrame.html
diff --git a/doc/javadoc/tools/KeyInput.html b/doc/javadoc/tools/KeyInput.html
diff --git a/doc/javadoc/tools/Pair.html b/doc/javadoc/tools/Pair.html
diff --git a/doc/javadoc/tools/StatSummary.html b/doc/javadoc/tools/StatSummary.html
diff --git a/doc/javadoc/tools/Utils.html b/doc/javadoc/tools/Utils.html
diff --git a/doc/javadoc/tools/Vector2d.html b/doc/javadoc/tools/Vector2d.html
diff --git a/doc/javadoc/tools/package-frame.html b/doc/javadoc/tools/package-frame.html
diff --git a/doc/javadoc/tools/package-summary.html b/doc/javadoc/tools/package-summary.html
diff --git a/doc/javadoc/tools/package-tree.html b/doc/javadoc/tools/package-tree.html
diff --git a/doc/singlelearningtrackinstructions.md b/doc/singlelearningtrackinstructions.md
diff --git a/doc/singlelearningtrackinstructions.pdf b/doc/singlelearningtrackinstructions.pdf
diff --git a/examples/2player/accelerator.txt b/examples/2player/accelerator.txt
diff --git a/examples/2player/accelerator_lvl0.txt b/examples/2player/accelerator_lvl0.txt
diff --git a/examples/2player/accelerator_lvl1.txt b/examples/2player/accelerator_lvl1.txt
diff --git a/examples/2player/accelerator_lvl2.txt b/examples/2player/accelerator_lvl2.txt
diff --git a/examples/2player/accelerator_lvl3.txt b/examples/2player/accelerator_lvl3.txt
diff --git a/examples/2player/accelerator_lvl4.txt b/examples/2player/accelerator_lvl4.txt
diff --git a/examples/2player/beekeeper.txt b/examples/2player/beekeeper.txt
diff --git a/examples/2player/beekeeper_lvl0.txt b/examples/2player/beekeeper_lvl0.txt
diff --git a/examples/2player/beekeeper_lvl1.txt b/examples/2player/beekeeper_lvl1.txt
diff --git a/examples/2player/beekeeper_lvl2.txt b/examples/2player/beekeeper_lvl2.txt
diff --git a/examples/2player/beekeeper_lvl3.txt b/examples/2player/beekeeper_lvl3.txt
diff --git a/examples/2player/beekeeper_lvl4.txt b/examples/2player/beekeeper_lvl4.txt
diff --git a/examples/2player/bombergirl.txt b/examples/2player/bombergirl.txt
diff --git a/examples/2player/bombergirl_lvl0.txt b/examples/2player/bombergirl_lvl0.txt
diff --git a/examples/2player/bombergirl_lvl1.txt b/examples/2player/bombergirl_lvl1.txt
diff --git a/examples/2player/bombergirl_lvl2.txt b/examples/2player/bombergirl_lvl2.txt
diff --git a/examples/2player/bombergirl_lvl3.txt b/examples/2player/bombergirl_lvl3.txt
diff --git a/examples/2player/bombergirl_lvl4.txt b/examples/2player/bombergirl_lvl4.txt
diff --git a/examples/2player/breedingdragons.txt b/examples/2player/breedingdragons.txt
diff --git a/examples/2player/breedingdragons_lvl0.txt b/examples/2player/breedingdragons_lvl0.txt
diff --git a/examples/2player/breedingdragons_lvl1.txt b/examples/2player/breedingdragons_lvl1.txt
diff --git a/examples/2player/breedingdragons_lvl2.txt b/examples/2player/breedingdragons_lvl2.txt
diff --git a/examples/2player/breedingdragons_lvl3.txt b/examples/2player/breedingdragons_lvl3.txt