fixed issue in assigning parties

digas99 · digas99 · commit de3c015a4a55 · 2023-03-30T18:03:34.000+01:00
diff --git a/src/sharedRegions/AssaultParty.java b/src/sharedRegions/AssaultParty.java
@@ -86,7 +86,6 @@ public void setRoom(Museum museum, Museum.Room room) {
       logger(this, "Was given room " + room);
       GenericIO.writelnString(room + " has distance " + room.getDistance() + " and paintings " + room.getPaintings());
       this.room = room;
-      museum.clearRooms(id);
       room.setAssaultPartyID(id);
       inRoom = 0;
    }
@@ -97,7 +96,6 @@ public void setRoom(Museum museum, Museum.Room room) {
     */
    public void resetAssaultParty() {
       begin = false;
-      room = null;
       nextThiefID = -1;
       for (int i = 0; i < N_THIEVES_PER_PARTY; i++)
          thieves[i] = null;
@@ -179,9 +177,13 @@ public synchronized void crawlIn() {
       OrdinaryThief ordinaryThief = (OrdinaryThief) Thread.currentThread();
       ordinaryThief.setThiefState(OrdinaryThiefStates.CRAWLING_INWARDS);
       int thiefID = ordinaryThief.getThiefID();
-      addThief(thiefID);
 
-      if (nextThiefID == -1) nextThiefID = thiefID;
+      if (nextThiefID == -1) {
+         resetAssaultParty();
+         nextThiefID = thiefID;
+      }
+
+      addThief(thiefID);
 
       do {
          // wait until master says to begin
@@ -281,10 +283,13 @@ private void updateThiefPosition(int thiefID, int move, boolean backwards) {
    private boolean wrongSeparation(boolean backwards) {
       orderThieves(backwards);
 
-      boolean valid0 = Math.abs(thieves[0].getPosition() - thieves[1].getPosition()) <= MAX_SEPARATION_LIMIT;
-      boolean valid1 = Math.abs(thieves[1].getPosition() - thieves[2].getPosition()) <= MAX_SEPARATION_LIMIT;
-      //if (!valid0 || !valid1) GenericIO.writelnString("WRONG SEPARATION");
-      return !valid0 || !valid1;
+      for (int i = 0; i < N_THIEVES_PER_PARTY-1; i++) {
+            int currentPos = thieves[i].getPosition();
+            int nextPos = thieves[i+1].getPosition();
+            if (Math.abs(currentPos - nextPos) > MAX_SEPARATION_LIMIT)
+               return true;
+      }
+      return false;
    }
 
    // make sure thieves are not overlapping
diff --git a/src/sharedRegions/CollectionSite.java b/src/sharedRegions/CollectionSite.java
@@ -90,10 +90,17 @@ public CollectionSite(GeneralRepos repos) {
     public synchronized int appraiseSit() {
         MasterThief masterThief = (MasterThief) Thread.currentThread();
 
-        if (endHeist && occupancy() == 0)
+        masterThief.setRoomState(roomState);
+
+        if (endHeist && occupancy() == 0 && masterThief.getConcentrationSite().occupancy() == N_THIEVES_ORDINARY)
             return END_HEIST;
 
-        if ((masterThief.getActiveAssaultParties() > 0)
+        /*
+        logger(masterThief, "Appraising situation. Concentration Site Occupancy: " + masterThief.getConcentrationSite().occupancy() + "/" + N_THIEVES_ORDINARY);
+        logger(masterThief, "Appraising situation. Active Assault Parties: " + masterThief.getActiveAssaultParties() + "/" + N_ASSAULT_PARTIES);
+        logger(masterThief, "Appraising situation. Thief Queue Size: " + thiefQueue.size() + "/" + N_ASSAULT_PARTIES);
+         */
+        if ((masterThief.getActiveAssaultParties() > 0 && masterThief.getConcentrationSite().occupancy() < N_THIEVES_PER_PARTY)
                     || thiefQueue.size() > 0)
             return WAIT_FOR_CANVAS;
 
diff --git a/src/sharedRegions/ConcentrationSite.java b/src/sharedRegions/ConcentrationSite.java
@@ -40,6 +40,10 @@ public int occupancy() {
         return count;
     }
 
+    public void endHeist(boolean endHeist) {
+        this.endHeist = endHeist;
+    }
+
     public ConcentrationSite(GeneralRepos repos) throws MemException {
         endHeist = makeParty = false;
         inside = new boolean[N_THIEVES_ORDINARY];
