Including getScore in Creature

Author: [email protected]

README.md

@@ -19,6 +19,6 @@ Proxy for accessing the ws3d Virtual Environment directly from Java, without req
 ```
 	dependencies {
             ...
-            implementation 'com.github.CST-Group:WS3DProxy:0.0.3'
+            implementation 'com.github.CST-Group:WS3DProxy:0.0.4'
 	}
 ```

build.gradle

@@ -10,7 +10,7 @@ java {
 }
 
 
-version = '0.0.3'
+version = '0.0.4'
 
 repositories {
     mavenCentral()

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 #Thu Jan 23 12:51:32 BRT 2020
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists

src/main/java/ws3dproxy/model/Bag.java

@@ -41,12 +41,12 @@ public class Bag {
     public Bag(int numFood, int numCrystals, int numPerishableFood, int numNonPerishableFood, List<Integer> crystals) {
 
         //Initialization with all possible crystal types RED, GREEN, BLUE, YELLOW, MAGENTA, WHITE:
-        crystalsPerType.put(Constants.colorRED, new Integer(0));
-        crystalsPerType.put(Constants.colorGREEN, new Integer(0));
-        crystalsPerType.put(Constants.colorBLUE, new Integer(0));
-        crystalsPerType.put(Constants.colorYELLOW, new Integer(0));
-        crystalsPerType.put(Constants.colorMAGENTA, new Integer(0));
-        crystalsPerType.put(Constants.colorWHITE, new Integer(0));
+        crystalsPerType.put(Constants.colorRED, Integer.valueOf(0));
+        crystalsPerType.put(Constants.colorGREEN, Integer.valueOf(0));
+        crystalsPerType.put(Constants.colorBLUE, Integer.valueOf(0));
+        crystalsPerType.put(Constants.colorYELLOW, Integer.valueOf(0));
+        crystalsPerType.put(Constants.colorMAGENTA, Integer.valueOf(0));
+        crystalsPerType.put(Constants.colorWHITE, Integer.valueOf(0));
 
         supportedCrystalTypes.add(Constants.colorRED);
         supportedCrystalTypes.add(Constants.colorGREEN);

src/main/java/ws3dproxy/model/Creature.java

@@ -425,6 +425,10 @@ public synchronized void setWorldMap(WorldMap worldMap) {
         this.worldMap = worldMap;
     }
 
+    public synchronized double getScore() {
+        return this.s.score;
+    }
+    
     public synchronized double getSpeed() {
         return this.a.speed;
     }

src/main/java/ws3dproxy/model/SelfAttributes.java

@@ -88,24 +88,24 @@ private void updateMap(String indexID, String name, String  colorName, Actuator
         infoMap.put(Constants.TOKEN_NAME_ID, name);
         infoMap.put(Constants.TOKEN_INDEX, indexID);
         infoMap.put(Constants.TOKEN_COLOR, colorName);
-        infoMap.put(Constants.TOKEN_CREATURE_X, (new Double(s.comX)).toString());//center of mass
-        infoMap.put(Constants.TOKEN_CREATURE_Y, (new Double(s.comY)).toString());// ""
-        infoMap.put(Constants.TOKEN_CREATURE_X1, (new Double(s.x1)).toString());
-        infoMap.put(Constants.TOKEN_CREATURE_Y1, (new Double(s.y1)).toString());
-        infoMap.put(Constants.TOKEN_CREATURE_X2, (new Double(s.x2)).toString());
-        infoMap.put(Constants.TOKEN_CREATURE_Y2, (new Double(s.y2)).toString());
-        infoMap.put(Constants.TOKEN_SPEED, (new Double(act.speed)).toString());
-        infoMap.put(Constants.TOKEN_WHEEL, (new Double(act.wheel)).toString());
+        infoMap.put(Constants.TOKEN_CREATURE_X, (Double.valueOf(s.comX)).toString());//center of mass
+        infoMap.put(Constants.TOKEN_CREATURE_Y, (Double.valueOf(s.comY)).toString());// ""
+        infoMap.put(Constants.TOKEN_CREATURE_X1, (Double.valueOf(s.x1)).toString());
+        infoMap.put(Constants.TOKEN_CREATURE_Y1, (Double.valueOf(s.y1)).toString());
+        infoMap.put(Constants.TOKEN_CREATURE_X2, (Double.valueOf(s.x2)).toString());
+        infoMap.put(Constants.TOKEN_CREATURE_Y2, (Double.valueOf(s.y2)).toString());
+        infoMap.put(Constants.TOKEN_SPEED, (Double.valueOf(act.speed)).toString());
+        infoMap.put(Constants.TOKEN_WHEEL, (Double.valueOf(act.wheel)).toString());
         //TODO: include:
 //        infoMap.put(Constants.TOKEN_WHEEL_R, (new Double(act.vr)).toString());
 //        infoMap.put(Constants.TOKEN_WHEEL_L, (new Double(act.vl)).toString());
-        infoMap.put(Constants.TOKEN_CREATURE_PITCH, (new Double(s.pitch)).toString());
-        infoMap.put(Constants.TOKEN_CREATURE_ENERGY, (new Double(s.fuel)).toString());
-        infoMap.put(Constants.TOKEN_SEROTONIN, (new Double(s.serotonin)).toString());
-        infoMap.put(Constants.TOKEN_ENDORPHINE, (new Double(s.endorphine)).toString());  
-        infoMap.put(Constants.TOKEN_SCORE, (new Double(s.score)).toString());
-        infoMap.put(Constants.TOKEN_HAS_LEAFLET, (new Integer(hasLeaflet)).toString());
-        infoMap.put(Constants.TOKEN_HAS_COLLIDED, (new Integer(hasCollided)).toString());
+        infoMap.put(Constants.TOKEN_CREATURE_PITCH, (Double.valueOf(s.pitch)).toString());
+        infoMap.put(Constants.TOKEN_CREATURE_ENERGY, (Double.valueOf(s.fuel)).toString());
+        infoMap.put(Constants.TOKEN_SEROTONIN, (Double.valueOf(s.serotonin)).toString());
+        infoMap.put(Constants.TOKEN_ENDORPHINE, (Double.valueOf(s.endorphine)).toString());  
+        infoMap.put(Constants.TOKEN_SCORE, (Double.valueOf(s.score)).toString());
+        infoMap.put(Constants.TOKEN_HAS_LEAFLET, (Integer.valueOf(hasLeaflet)).toString());
+        infoMap.put(Constants.TOKEN_HAS_COLLIDED, (Integer.valueOf(hasCollided)).toString());
         infoMap.put(Constants.TOKEN_MY_LEAFLETS, manipulatedLeaflet(myLeaflets));
 
     }