Assignment 4 schedule and aggregation of order #12

Hot fix for sync issues between scheduler and orderprocessing
HBRS-MAAS · Nov 25, 2018 · 51db03c · 51db03c
1 parent 2da0edc
commit 51db03c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/main/java/org/team_pjt/agents/OrderProcessing.java b/src/main/java/org/team_pjt/agents/OrderProcessing.java
@@ -241,17 +241,19 @@ public void action() {
                     }
                     break;
                 case 2:
-                    System.out.println("in case 3");
                     distributeScheduledOrder();
                     break;
             }
         }
 
         @Override
         public boolean done() {
-            boolean isDone = step >= 3 || messageCounter == allCustomers.length;
+            boolean isDone = messageCounter == allCustomers.length;
             if(isDone) {
                 myAgent.addBehaviour(new schedulerSyncing());
+            }
+            isDone = isDone || step >= 3;
+            if(isDone) {
                 myAgent.addBehaviour(new OfferRequestServer());
                 finished();
             }

diff --git a/src/main/java/org/team_pjt/agents/SchedulerAgent.java b/src/main/java/org/team_pjt/agents/SchedulerAgent.java
@@ -75,7 +75,7 @@ public void action() {
             ACLMessage newOrder = myAgent.receive(mtNewOrder);
             if(newOrder != null) {
                 if(newOrder.getContent().toUpperCase().equals("NO NEW ORDER")) {
-//                    System.out.println(myAgent.getName() + " called finished()");
+                    System.out.println(myAgent.getName() + " called finished()");
                     finished();
                 }
                 else {