remove redundant comments and null checks

S010MON · Apr 7, 2022 · 77bec47 · 77bec47
1 parent 53b4138
commit 77bec47
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 16 deletions.
diff --git a/src/main/java/app/model/Coverage.java b/src/main/java/app/model/Coverage.java
@@ -17,6 +17,7 @@ public class Coverage
 
     public Coverage(Map map)
     {
+        System.out.println("Build coverage map ...");
         width = map.getWidth();
         height = map.getHeight();
         vectors = new VectorSet();
@@ -30,6 +31,7 @@ public Coverage(Map map)
                     vectors.add(v);
             }
         }
+        System.out.print(" done");
     }
 
     public double percentSeen(VectorSet seen)

diff --git a/src/main/java/app/model/Map.java b/src/main/java/app/model/Map.java
@@ -45,7 +45,7 @@ public class Map
 
     public Map(Settings settings)
     {
-        System.out.print("Loading settings ... ");
+        System.out.println("Loading settings ... ");
         this.settings = settings;
         this.width = settings.getWidth();
         this.height = settings.getHeight();
@@ -91,31 +91,23 @@ public Map(Settings settings)
             agents.add(intruder);
         }
 
-        if (HUMAN_ACTIVE && intruderSpawn != null)
+        if (HUMAN_ACTIVE)
         {
             Vector humanStart = randPosition(intruderSpawn);
-            if (humanStart != null)
-            {
-                human = new Human(humanStart, new Vector(1, 0), 10, Team.INTRUDER);
-                //Assumes the human is a guard
-                human.setMaxWalk(settings.getWalkSpeedGuard());
-                human.setMaxSprint(settings.getSprintSpeedGuard());
-                agents.add(human);
-            }
+            human = new Human(humanStart, new Vector(1, 0), 10, Team.INTRUDER);
+            human.setMaxWalk(settings.getWalkSpeedGuard());
+            human.setMaxSprint(settings.getSprintSpeedGuard());
+            agents.add(human);
         }
 
         this.coverage = new Coverage(this);
-        System.out.println("done.");
+        System.out.print(" done");
     }
 
-    /**
-     * Only for testing, delete later
-     */
     public Map(Agent agent, ArrayList<Furniture> obstacles)
     {
         agents = new ArrayList<>();
         agents.add(agent);
-
         furniture = new ArrayList<>();
         furniture.addAll(obstacles);
     }
@@ -143,7 +135,6 @@ public void addSoundFurniture(SettingsObject obj)
 
     public void addSoundSource(SettingsObject obj)
     {
-        // TODO for now?
         this.soundSources.add(SoundSourceFactory.make(SoundSourceType.SIREN, Vector.from(obj.getRect()), obj.getAmplitude()));
     }