From 0836571c8e449f2f35151f66f01af9608936bc75 Mon Sep 17 00:00:00 2001
From: vivek-shankar <vivek-shankar.varadharajan@polymtl.ca>
Date: Tue, 10 Jul 2018 14:03:26 -0400
Subject: [PATCH] barrier enhance fix on branch dev

---
 buzz_scripts/include/act/barrier.bzz | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/buzz_scripts/include/act/barrier.bzz b/buzz_scripts/include/act/barrier.bzz
index a87bed7..f7d5910 100644
--- a/buzz_scripts/include/act/barrier.bzz
+++ b/buzz_scripts/include/act/barrier.bzz
@@ -55,13 +55,7 @@ function barrier_wait(threshold, transf, resumef, bc) {
   var allgood = 0
   log("--->BS: ", barrier.size(), " / ", threshold, " (", BARRIER_VSTIG, " - ", barrier.get("d"), ") t= ", timeW)
   if(barrier.size() - 1 >= threshold or barrier.get("d") == 1) {
-    var bi = LOWEST_ROBOT_ID
-    allgood = 1
-    while (bi<LOWEST_ROBOT_ID+threshold) {
-      if(barrier.get(bi) != bc)
-        allgood = 0
-      bi = bi + 1
-    }
+    allgood = barrier_allgood(barrier,bc)
   }
   
   if(allgood) {
@@ -78,3 +72,19 @@ function barrier_wait(threshold, transf, resumef, bc) {
 
   timeW = timeW+1
 }
+
+barriergood = 1
+
+# Barrer check all entries
+function barrier_allgood(barrier, bc) {
+  barriergood = 1
+  barrier.foreach(
+    function(key, value, robot){
+      #log("VS entry : ", key, " ", value, " ", robot)
+      if(value != bc and key != "d"){
+        barriergood = 0
+      }
+    }
+  )
+  return barriergood
+}