Merge pull request #121 from EntelectChallenge/develop

Blaarkies · web-flow · commit b956b2e01f31 · 2018-09-06T13:34:31.000+02:00
Release 3.0.2
diff --git a/game-engine-interface/pom.xml b/game-engine-interface/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>za.co.entelect.challenge</groupId>
     <artifactId>game-engine-interface</artifactId>
-    <version>3.0.1</version>
+    <version>3.0.2</version>
 
     <distributionManagement>
         <repository>
diff --git a/game-engine/core/pom.xml b/game-engine/core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>game-engine</artifactId>
         <groupId>za.co.entelect.challenge</groupId>
-        <version>3.0.1</version>
+        <version>3.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>za.co.entelect.challenge</groupId>
             <artifactId>domain</artifactId>
-            <version>3.0.1</version>
+            <version>3.0.2</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
diff --git a/game-engine/domain/pom.xml b/game-engine/domain/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>game-engine</artifactId>
         <groupId>za.co.entelect.challenge</groupId>
-        <version>3.0.1</version>
+        <version>3.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/game-engine/domain/src/main/java/za/co/entelect/challenge/entities/Building.java b/game-engine/domain/src/main/java/za/co/entelect/challenge/entities/Building.java
@@ -126,11 +126,11 @@ public void damageSelfDirectly(int damageTaken, TowerDefensePlayer missileOwner)
     }
 
     private void setHealthAndAddScore(int damageTaken, TowerDefensePlayer missileOwner) {
-
+        int previousHealth = health;
         health -= damageTaken;
         health = Math.max(0, health);
 
-        missileOwner.addScore(damageTaken * destroyMultiplier);
+        missileOwner.addScore((previousHealth - health) * destroyMultiplier);
     }
 
     public void decreaseCooldown() {
diff --git a/game-engine/domain/src/main/java/za/co/entelect/challenge/entities/TowerDefenseGameMap.java b/game-engine/domain/src/main/java/za/co/entelect/challenge/entities/TowerDefenseGameMap.java
@@ -108,11 +108,6 @@ public void deconstructBuilding(Building building) {
 
     public void removeBuilding(Building building) {
         buildings.remove(building);
-        try {
-            getPlayerOpponent(building.getPlayerType()).addScore(building.getDestroyMultiplier());
-        } catch (Exception e) {
-            log.error(e);
-        }
     }
 
     private Direction getDirectionAndUpdateBuilding(Building b) {
diff --git a/game-engine/pom.xml b/game-engine/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>za.co.entelect.challenge</groupId>
     <artifactId>game-engine</artifactId>
-    <version>3.0.1</version>
+    <version>3.0.2</version>
     <modules>
         <module>domain</module>
         <module>core</module>
@@ -16,7 +16,7 @@
 
     <properties>
         <java.version>1.8</java.version>
-        <game.engine.interfaces.version>3.0.1</game.engine.interfaces.version>
+        <game.engine.interfaces.version>3.0.2</game.engine.interfaces.version>
         <junit.version>4.12</junit.version>
         <apache.commons.configuration.version>2.2</apache.commons.configuration.version>
         <gson.version>2.8.2</gson.version>
diff --git a/game-runner/pom.xml b/game-runner/pom.xml
@@ -6,14 +6,14 @@
 
     <groupId>za.co.entelect.challenge</groupId>
     <artifactId>game-runner</artifactId>
-    <version>3.0.1</version>
+    <version>3.0.2</version>
 
     <properties>
         <java.version>1.8</java.version>
         <reflections.version>0.9.11</reflections.version>
         <gson.version>2.8.2</gson.version>
-        <game.engine.interface.version>3.0.1</game.engine.interface.version>
-        <game.engine.core.version>3.0.1</game.engine.core.version>
+        <game.engine.interface.version>3.0.2</game.engine.interface.version>
+        <game.engine.core.version>3.0.2</game.engine.core.version>
     </properties>
 
     <dependencies>
diff --git a/game-runner/src/main/java/za/co/entelect/challenge/botrunners/BotRunner.java b/game-runner/src/main/java/za/co/entelect/challenge/botrunners/BotRunner.java
@@ -5,6 +5,7 @@
 import org.apache.commons.exec.ExecuteWatchdog;
 import org.apache.commons.exec.PumpStreamHandler;
 import za.co.entelect.challenge.entities.BotMetaData;
+import za.co.entelect.challenge.entities.BotArguments;
 import za.co.entelect.challenge.game.contracts.exceptions.TimeoutException;
 
 import java.io.ByteArrayOutputStream;
@@ -37,6 +38,8 @@ public String getBotFileName() {
         return botMetaData.getBotFileName();
     }
 
+    public BotArguments getArguments() { return botMetaData.getArguments(); }
+
     protected String RunSimpleCommandLineCommand(String line, int expectedExitValue) throws IOException, TimeoutException {
         CommandLine cmdLine = CommandLine.parse(line);
         DefaultExecutor executor = new DefaultExecutor();
diff --git a/game-runner/src/main/java/za/co/entelect/challenge/botrunners/HaskellBotRunner.java b/game-runner/src/main/java/za/co/entelect/challenge/botrunners/HaskellBotRunner.java
@@ -1,6 +1,7 @@
 package za.co.entelect.challenge.botrunners;
 
 import za.co.entelect.challenge.entities.BotMetaData;
+import za.co.entelect.challenge.entities.BotArguments;
 import za.co.entelect.challenge.game.contracts.exceptions.TimeoutException;
 
 import java.io.IOException;
@@ -13,12 +14,20 @@ public HaskellBotRunner(BotMetaData botMetaData, int timeoutInMilliseconds) {
 
     @Override
     protected String runBot() throws IOException, TimeoutException {
+        String runTimeArguments;
+        if (this.getArguments() != null) {
+            int coreCount = this.getArguments().getCoreCount();
+            runTimeArguments = " +RTS -N" + Integer.toString(coreCount) + " -RTS";
+        } else {
+            runTimeArguments = "";
+        }
+
         String line;
 
         if(System.getProperty("os.name").contains("Windows")) {
-            line = "cmd /c \"" + this.getBotFileName() + "\"";
+            line = "cmd /c \"" + this.getBotFileName() + runTimeArguments + "\"";
         } else {
-            line = "\"./" + this.getBotFileName() + "\"";
+            line = "./" + this.getBotFileName() + runTimeArguments;
         }
 
         return RunSimpleCommandLineCommand(line, 0);
diff --git a/game-runner/src/main/java/za/co/entelect/challenge/entities/BotArguments.java b/game-runner/src/main/java/za/co/entelect/challenge/entities/BotArguments.java
@@ -0,0 +1,16 @@
+package za.co.entelect.challenge.entities;
+
+import com.google.gson.annotations.SerializedName;
+
+public class BotArguments {
+    @SerializedName("coreCount")
+    private int coreCount;
+
+    public BotArguments(int coreCount) {
+        this.coreCount = coreCount;
+    }
+
+    public int getCoreCount() {
+        return this.coreCount;
+    }
+}
diff --git a/game-runner/src/main/java/za/co/entelect/challenge/entities/BotMetaData.java b/game-runner/src/main/java/za/co/entelect/challenge/entities/BotMetaData.java
@@ -2,6 +2,7 @@
 
 import com.google.gson.annotations.SerializedName;
 import za.co.entelect.challenge.enums.BotLanguage;
+import za.co.entelect.challenge.entities.BotArguments;
 
 import java.nio.file.Paths;
 
@@ -19,6 +20,8 @@ public class BotMetaData {
     private String botLocation;
     @SerializedName("botFileName")
     private String botFileName;
+    @SerializedName("arguments")
+    private BotArguments arguments;
 
     public BotMetaData(BotLanguage language, String botLocation, String botFileName){
         this.botLanguage = language;
@@ -57,4 +60,8 @@ public BotLanguage getBotLanguage(){
     public String getBotDirectory() {
         return Paths.get(getBotLocation()).toAbsolutePath().normalize().toString();
     }
+
+    public BotArguments getArguments() {
+        return this.arguments;
+    }
 }
diff --git a/starter-bots/haskell/README.md b/starter-bots/haskell/README.md
@@ -24,3 +24,39 @@ Haskell creates native binaries so you can simply run:
 ```
 
 from the command line to invoke the bot program.
+
+## Running the Bot with Multiple Threads
+In order to run the Haskell bot with multiple threads (and possibly
+cores) you need to change the bot configuration to inform the runner
+to supply the appropriate runtime arguments.  The following is an
+example "bot.json" for launching the bot with 2 threads:
+
+```
+{
+    "author": "John Doe",
+    "email": "john.doe@email.com",
+    "nickName": "a-bot",
+    "botLocation": "/bin",
+    "botFileName": "EntelectChallenge2018-exe",
+    "botLanguage": "haskell",
+    "arguments": {
+        "coreCount": 2
+    }
+}
+```
+
+You should also ensure that the executable is built with the
+"-rtsopts" and "-threaded" compile time flags.  These are supplied
+under the "executables" section in "package.yaml".  e.g.
+
+```
+executables:
+  EntelectChallenge2018-exe:
+    main:                Main.hs
+    source-dirs:         app
+    ghc-options:
+    - -threaded
+    - -rtsopts
+    dependencies:
+    - EntelectChallenge2018
+```
diff --git a/starter-bots/haskell/bot.json b/starter-bots/haskell/bot.json
@@ -4,5 +4,8 @@
 	"nickName": "Bill",
 	"botLocation": "/bin",
 	"botFileName": "EntelectChallenge2018-exe",
-	"botLanguage": "haskell"
+	"botLanguage": "haskell",
+    	"arguments": {
+        	"coreCount": 2
+    	}
 }
diff --git a/starter-pack/ReadMe.txt b/starter-pack/ReadMe.txt
@@ -12,13 +12,13 @@
 | |____| |  | |/ ____ \| |____| |____| |____| |\  | |__| | |____ 
  \_____|_|  |_/_/    \_\______|______|______|_| \_|\_____|______|
 
- ____         ___        __ 
-|___ \       / _ \      /_ |
-  __) |     | | | |      | |
- |__ <      | | | |      | |
- ___) |  _  | |_| |  _   | |
-|____/  (_)  \___/  (_)  |_|
-                                              
+ ____         ___        ___  
+|___ \       / _ \      |__ \ 
+  __) |     | | | |        ) |
+ |__ <      | | | |       / / 
+ ___) |  _  | |_| |  _   / /_ 
+|____/  (_)  \___/  (_) |____|
+                                         
 
 Welcome to the starter pack for the 2018 Entelect Challenge!
 Here you will find all that you'll need to run your first bot and compete in this year's challenge.
diff --git a/starter-pack/makefile b/starter-pack/makefile
@@ -1,5 +1,5 @@
 default:
-	java -jar tower-defence-runner-3.0.1.jar
+	java -jar tower-defence-runner-3.0.2.jar
 
 run:
-	java -jar tower-defence-runner-3.0.1.jar
+	java -jar tower-defence-runner-3.0.2.jar
diff --git a/starter-pack/run.bat b/starter-pack/run.bat
@@ -1,2 +1,2 @@
-java -jar tower-defence-runner-3.0.1.jar
+java -jar tower-defence-runner-3.0.2.jar
 pause
diff --git a/starter-pack/starter-bots/haskell/README.md b/starter-pack/starter-bots/haskell/README.md
@@ -24,3 +24,39 @@ Haskell creates native binaries so you can simply run:
 ```
 
 from the command line to invoke the bot program.
+
+## Running the Bot with Multiple Threads
+In order to run the Haskell bot with multiple threads (and possibly
+cores) you need to change the bot configuration to inform the runner
+to supply the appropriate runtime arguments.  The following is an
+example "bot.json" for launching the bot with 2 threads:
+
+```
+{
+    "author": "John Doe",
+    "email": "john.doe@email.com",
+    "nickName": "a-bot",
+    "botLocation": "/bin",
+    "botFileName": "EntelectChallenge2018-exe",
+    "botLanguage": "haskell",
+    "arguments": {
+        "coreCount": 2
+    }
+}
+```
+
+You should also ensure that the executable is built with the
+"-rtsopts" and "-threaded" compile time flags.  These are supplied
+under the "executables" section in "package.yaml".  e.g.
+
+```
+executables:
+  EntelectChallenge2018-exe:
+    main:                Main.hs
+    source-dirs:         app
+    ghc-options:
+    - -threaded
+    - -rtsopts
+    dependencies:
+    - EntelectChallenge2018
+```
diff --git a/starter-pack/starter-bots/haskell/bot.json b/starter-pack/starter-bots/haskell/bot.json
@@ -4,5 +4,8 @@
 	"nickName": "Bill",
 	"botLocation": "/bin",
 	"botFileName": "EntelectChallenge2018-exe",
-	"botLanguage": "haskell"
+	"botLanguage": "haskell",
+    	"arguments": {
+        	"coreCount": 2
+    	}
 }
diff --git a/starter-pack/tower-defence-runner-3.0.2.jar b/starter-pack/tower-defence-runner-3.0.2.jar

Original file line number	Diff line number	Diff line change
`@@ -126,11 +126,11 @@ public void damageSelfDirectly(int damageTaken, TowerDefensePlayer missileOwner)`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`private void setHealthAndAddScore(int damageTaken, TowerDefensePlayer missileOwner) {`
`129`		`-`
	`129`	`+ int previousHealth = health;`
`130`	`130`	`health -= damageTaken;`
`131`	`131`	`health = Math.max(0, health);`
`132`	`132`
`133`		`- missileOwner.addScore(damageTaken * destroyMultiplier);`
	`133`	`+ missileOwner.addScore((previousHealth - health) * destroyMultiplier);`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`public void decreaseCooldown() {`