From 49f2daeb1063eb15119ab09d8297375db824a8d2 Mon Sep 17 00:00:00 2001
From: K20014 <82937878+K20014@users.noreply.github.com>
Date: Fri, 3 Nov 2023 14:10:54 +0900
Subject: [PATCH] =?UTF-8?q?=E9=80=B2=E6=8D=97=E3=81=AE=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/module.cfg                                          | 6 ++++--
 .../centralized/AuctionCommandExecutorFire.java            | 6 ++++++
 .../module/complex/AuctionFireTargetAllocator.java         | 7 +++++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/config/module.cfg b/config/module.cfg
index a4c092c..19bca67 100755
--- a/config/module.cfg
+++ b/config/module.cfg
@@ -105,5 +105,7 @@ DefaultTacticsFireBrigade.Search : autumn_2023.module.complex.AuctionFBSearch
 DefaultTacticsFireBrigade.CommandExecutorFire : autumn_2023.centralized.AuctionCommandExecutorFire
 DefaultTacticsFireStation.TargetAllocator : autumn_2023.module.complex.AuctionFireTargetAllocator
 DefaultTacticsFireStation.CommandPicker : autumn_2023.centralized.AuctionCommandPickerFire
-MessageManager.PlatoonMessageCoordinator : autumn_2023.module.comm.DefaultMessageCoordinator
-MessageManager.CenterMessageCoordinator : autumn_2023.module.comm.DefaultMessageCoordinator
\ No newline at end of file
+MessageManager.PlatoonMessageCoordinator : autumn_2023.module.comm.AuctionMessageCoordinator
+MessageManager.CenterMessageCoordinator : autumn_2023.module.comm.AuctionMessageCoordinator
+MessageManager.PlatoonChannelSubscriber : autumn_2023.module.comm.AuctionChannelSubscriber
+MessageManager.CenterChannelSubscriber : autumn_2023.module.comm.AuctionChannelSubscriber
\ No newline at end of file
diff --git a/src/main/java/autumn_2023/centralized/AuctionCommandExecutorFire.java b/src/main/java/autumn_2023/centralized/AuctionCommandExecutorFire.java
index 87a2101..8d6307e 100644
--- a/src/main/java/autumn_2023/centralized/AuctionCommandExecutorFire.java
+++ b/src/main/java/autumn_2023/centralized/AuctionCommandExecutorFire.java
@@ -3,6 +3,7 @@ package autumn_2023.centralized;
 import adf.core.agent.action.common.ActionMove;
 import adf.core.agent.action.common.ActionRest;
 import adf.core.agent.communication.MessageManager;
+import adf.core.agent.communication.standard.bundle.StandardMessageBundle;
 import adf.core.agent.communication.standard.bundle.centralized.CommandFire;
 import adf.core.agent.communication.standard.bundle.information.MessageCivilian;
 import adf.core.agent.develop.DevelopData;
@@ -91,6 +92,11 @@ public class AuctionCommandExecutorFire extends CommandExecutor<CommandFire> {
                 .filter(e -> !this.bidCentreCivilians.contains(e))
                 .collect(Collectors.toSet());
 
+        if (this.agentInfo.getTime() == 1) { 
+            final var index = new StandardMessageBundle().getMessageClassList().size() + 1;
+            messageManager.registerMessageClass(index, MessageCost.class);
+        }
+
         // 新規メッセージクラスを用いてタスク実行時のコストを救急司令所に送信
         if (this.commandType == -1) 
         {
diff --git a/src/main/java/autumn_2023/module/complex/AuctionFireTargetAllocator.java b/src/main/java/autumn_2023/module/complex/AuctionFireTargetAllocator.java
index 6b75023..1fe1f37 100644
--- a/src/main/java/autumn_2023/module/complex/AuctionFireTargetAllocator.java
+++ b/src/main/java/autumn_2023/module/complex/AuctionFireTargetAllocator.java
@@ -2,6 +2,7 @@ package autumn_2023.module.complex;
 
 import adf.core.agent.communication.MessageManager;
 import adf.core.agent.communication.standard.bundle.MessageUtil;
+import adf.core.agent.communication.standard.bundle.StandardMessageBundle;
 import adf.core.agent.communication.standard.bundle.information.MessageCivilian;
 import adf.core.agent.develop.DevelopData;
 import adf.core.agent.info.AgentInfo;
@@ -111,6 +112,10 @@ public class AuctionFireTargetAllocator extends FireTargetAllocator{
     public FireTargetAllocator updateInfo(MessageManager messageManager) 
     {
         super.updateInfo(messageManager);
+        if (this.agentInfo.getTime() == 1) { 
+            final var index = new StandardMessageBundle().getMessageClassList().size() + 1;
+            messageManager.registerMessageClass(index, MessageCost.class);
+        }
 
         // 受信処理
         // そのステップで受信した(前ステップで送信された)メッセージ一覧
@@ -131,6 +136,7 @@ public class AuctionFireTargetAllocator extends FireTargetAllocator{
                         || !this.finishreceivedCivilians.contains(mesCiv.getAgentID()))
                     {
                         this.receivedAgentCivilians.add(mesCiv.getAgentID());
+                        System.out.println("receivedAgentCivilians = " + mesCiv.getAgentID());
                     }
                 }
             }
@@ -141,6 +147,7 @@ public class AuctionFireTargetAllocator extends FireTargetAllocator{
             if (this.worldInfo.getEntity(mesCos.getSenderID()) instanceof FireBrigade) 
             {
                 this.rescueCosts.add(mesCos);
+                System.out.println("rescueCosts = " + mesCos);
             }
         }
         }
-- 
GitLab