analysis allocate

src/main/java/autumn_2023/centralized/CentralizedControlCommandExecutorFire.java

@@ -74,6 +74,7 @@ public class CentralizedControlCommandExecutorFire extends CommandExecutor<Comma
   @Override
   public CommandExecutor setCommand(CommandFire command) {
     EntityID agentID = this.agentInfo.getID();
+    System.out.println("time:"+this.agentInfo.getTime()+" fbid:"+this.agentInfo.getID()+" commandAction:"+command.getAction()+" commandTarget:"+command.getTargetID()+" commanderID:"+command.getSenderID());
     if(!this.commandCompleted) return this;
     if (command.isToIDDefined() && Objects.requireNonNull(command.getToID()).getValue() == agentID.getValue()) {
       this.commandType = command.getAction();// 司令で出された行動内容

src/main/java/autumn_2023/module/complex/CentralizedControlFBAllocator.java

@@ -165,7 +165,7 @@ public class CentralizedControlFBAllocator extends FireTargetAllocator {
       if(allocate[i] == -1) continue;
       this.fireBrigadeInfoMap.get(rowlist.get(i)).target = collist.get(allocate[i]);
     }
-    //this.printAllocate(allocate, rowlist, collist, row);
+    this.printAllocate(allocate, rowlist, collist, row);
     return this;
   }
 
@@ -181,33 +181,42 @@ public class CentralizedControlFBAllocator extends FireTargetAllocator {
     super.updateInfo(messageManager);
 
     Set<EntityID> recievetasks = messageManager.getReceivedMessageList(MessageCivilian.class).stream()
-      .map(e -> {
-        MessageCivilian mesciv = (MessageCivilian) e;
-        MessageUtil.reflectMessage(this.worldInfo, mesciv);
-        return(mesciv);
-      })
-      .map(MessageCivilian::getAgentID)
-      .filter(e -> this.isNeedRescueHuman(this.worldInfo.getEntity(e)))
-      .filter(e -> !(finishEntityIDs.contains(e)))
-      .collect(Collectors.toSet());
-      
+    .map(e -> {
+      MessageCivilian mesciv = (MessageCivilian) e;
+      MessageUtil.reflectMessage(this.worldInfo, mesciv);
+      return(mesciv);
+    })
+    .map(MessageCivilian::getAgentID)
+    .filter(e -> this.isNeedRescueHuman(this.worldInfo.getEntity(e)))
+    .filter(e -> !(finishEntityIDs.contains(e)))
+    .collect(Collectors.toSet());
+    
+    System.out.println("time:"+this.agentInfo.getTime()+" centerid:"+this.agentInfo.getID()+" recievetasks:"+recievetasks);
     this.taskSet.addAll(recievetasks);
 
+    // 消防隊の情報をリセット
+    for(EntityID fbid : this.fireBrigadeInfoMap.keySet()){
+      FireBrigadeInfo fbi = this.fireBrigadeInfoMap.get(fbid);
+      fbi.resetInfo();
+    }
+    List<EntityID> fblist = new ArrayList<>();
     List<CommunicationMessage> mesfblist = messageManager.getReceivedMessageList(MessageFireBrigade.class);
     for(CommunicationMessage mes : mesfblist){
       MessageFireBrigade mesfb = (MessageFireBrigade) mes;
       MessageUtil.reflectMessage(this.worldInfo, mesfb);
       EntityID fbID = mesfb.getAgentID();
+      fblist.add(fbID);
       FireBrigadeInfo fbi = this.fireBrigadeInfoMap.get(fbID);
       fbi.setInfo(mesfb.getTargetID(), mesfb.getPosition(), mesfb.getBuriedness(),
           (mesfb.getAction() == MessageFireBrigade.ACTION_RESCUE) ? false : true, this.agentInfo.getTime());
     }
+    System.out.println("time:"+this.agentInfo.getTime()+" centerid:"+this.agentInfo.getID()+" fblist:"+fblist);
 
     List<EntityID> reportlist = messageManager.getReceivedMessageList(MessageReport.class).stream()
-      .map(MessageReport.class::cast)
-      .filter(MessageReport::isDone)
-      .map(MessageReport::getFromID)
-      .collect(Collectors.toList());
+    .map(MessageReport.class::cast)
+    .filter(MessageReport::isDone)
+    .map(MessageReport::getFromID)
+    .collect(Collectors.toList());
     
     this.finishEntityIDs.addAll(reportlist);
     this.taskSet.removeAll(reportlist);
@@ -294,5 +303,16 @@ public class CentralizedControlFBAllocator extends FireTargetAllocator {
       this.canNewAction = canNewAction;
       this.commandTime = commandTime;
     }
+    /**
+     * 消防隊に関する情報をリセットするメソッド
+     */
+    public void resetInfo(){
+      prevtarget = null;
+      position = null;
+      buriedness = -1;
+      target = null;
+      canNewAction = true;
+      commandTime = -1;
+    }
   }
 }
\ No newline at end of file