better interface for RunManagerMovingAIBenchmark and RunManagerWarehouse

Alleninggx · Feb 9, 2023 · 45da63d · 45da63d
1 parent 17f2909
commit 45da63d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 17 deletions.
diff --git a/src/main/java/Environment/RunManagers/RunManagerMovingAIBenchmark.java b/src/main/java/Environment/RunManagers/RunManagerMovingAIBenchmark.java
@@ -11,11 +11,11 @@
 public class RunManagerMovingAIBenchmark extends A_RunManager{
 
     private final String entireBenchmarkDir;
-    private final Integer maxNumAgents;
+    private final int[] agentNums;
 
-    public RunManagerMovingAIBenchmark(String entireBenchmarkDir, Integer maxNumAgents) {
+    public RunManagerMovingAIBenchmark(String entireBenchmarkDir, int[] agentNums) {
         this.entireBenchmarkDir = entireBenchmarkDir;
-        this.maxNumAgents = maxNumAgents;
+        this.agentNums = agentNums;
     }
 
 
@@ -27,19 +27,17 @@ void setSolvers() {
 
     @Override
     void setExperiments() {
-        addAllMapsAndInstances(this.maxNumAgents, this.entireBenchmarkDir);
+        addAllMapsAndInstances(this.entireBenchmarkDir, this.agentNums);
     }
 
     /* = Experiments =  */
 
-    private void addAllMapsAndInstances(Integer maxNumAgents, String entireBenchmarkDir){
-        maxNumAgents = maxNumAgents != null ? maxNumAgents : -1;
-
+    private void addAllMapsAndInstances(String entireBenchmarkDir, int[] agentNums){
         /*  =   Set Properties   =  */
-        InstanceProperties properties = new InstanceProperties(null, -1, IntStream.rangeClosed(1, maxNumAgents).toArray());
+        InstanceProperties properties = new InstanceProperties(null, -1, agentNums);
 
         /*  =   Set Instance Manager   =  */
-        InstanceManager instanceManager = new InstanceManager(entireBenchmarkDir, new InstanceBuilder_MovingAI(),properties);
+        InstanceManager instanceManager = new InstanceManager(entireBenchmarkDir, new InstanceBuilder_MovingAI(), properties);
 
         /*  =   Add new experiment   =  */
         Experiment EntireMovingAIBenchmark = new Experiment("EntireMovingAIBenchmark", instanceManager);

diff --git a/src/main/java/Environment/RunManagers/RunManagerWarehouse.java b/src/main/java/Environment/RunManagers/RunManagerWarehouse.java
@@ -11,11 +11,11 @@
 public class RunManagerWarehouse extends A_RunManager{
 
     private final String warehouseMaps;
-    private final Integer maxNumAgents;
+    private final int[] agentNums;
 
-    public RunManagerWarehouse(String warehouseMaps, Integer maxNumAgents) {
+    public RunManagerWarehouse(String warehouseMaps, int[] agentNums) {
         this.warehouseMaps = warehouseMaps;
-        this.maxNumAgents = maxNumAgents;
+        this.agentNums = agentNums;
     }
 
     @Override
@@ -26,16 +26,14 @@ void setSolvers() {
 
     @Override
     void setExperiments() {
-        addAllMapsAndInstances(this.maxNumAgents, this.warehouseMaps);
+        addAllMapsAndInstances(this.warehouseMaps, this.agentNums);
     }
 
     /* = Experiments =  */
 
-    private void addAllMapsAndInstances(Integer maxNumAgents, String instancesDir){
-        maxNumAgents = maxNumAgents != null ? maxNumAgents : -1;
-
+    private void addAllMapsAndInstances(String instancesDir, int[] agentNums){
         /*  =   Set Properties   =  */
-        InstanceProperties properties = new InstanceProperties(null, -1, IntStream.rangeClosed(1, maxNumAgents).toArray());
+        InstanceProperties properties = new InstanceProperties(null, -1, agentNums);
 
         /*  =   Set Instance Manager   =  */
         InstanceManager instanceManager = new InstanceManager(instancesDir, new InstanceBuilder_Warehouse(),properties);