From: gnawali <gnawali>
Date: Fri, 13 Mar 2009 05:13:29 +0000 (+0000)
Subject: trunc->round as suggested out by Andreas Kopke, and one other trunc->round
X-Git-Tag: rc_6_tinyos_2_1_1~457
X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=e8ef72a8db84092e80f9ad2785c6dc2994bb4e08

trunc->round as suggested out by Andreas Kopke, and one other trunc->round
---

diff --git a/tos/lib/net/4bitle/LinkEstimatorP.nc b/tos/lib/net/4bitle/LinkEstimatorP.nc
index d0f30756..5b27083f 100644
--- a/tos/lib/net/4bitle/LinkEstimatorP.nc
+++ b/tos/lib/net/4bitle/LinkEstimatorP.nc
@@ -276,7 +276,7 @@ implementation {
   // called when new beacon estimate is done
   // also called when new DEETX estimate is done
   void updateEETX(neighbor_table_entry_t *ne, uint16_t newEst) {
-    ne->eetx = (ALPHA * ne->eetx + (10 - ALPHA) * newEst)/10;
+    ne->eetx = (ALPHA * ne->eetx + (10 - ALPHA) * newEst + 5)/10;
   }
 
 
@@ -346,8 +346,8 @@ implementation {
 	      ne->inquality = (ALPHA * ne->inquality) / 10;
 	    } else {
 	      newEst = (255 * ne->rcvcnt) / totalPkt;
-	      dbg("LI,LITest", "  %hu: %hhu -> %hhu", ne->ll_addr, ne->inquality, (ALPHA * ne->inquality + (10-ALPHA) * newEst)/10);
-	      ne->inquality = (ALPHA * ne->inquality + (10-ALPHA) * newEst)/10;
+	      dbg("LI,LITest", "  %hu: %hhu -> %hhu", ne->ll_addr, ne->inquality, (ALPHA * ne->inquality + (10-ALPHA) * newEst + 5)/10);
+	      ne->inquality = (ALPHA * ne->inquality + (10-ALPHA) * newEst + 5)/10;
 	    }
 	    ne->rcvcnt = 0;
 	    ne->failcnt = 0;
diff --git a/tos/lib/net/le/LinkEstimatorP.nc b/tos/lib/net/le/LinkEstimatorP.nc
index c83727bf..5a0f1b62 100644
--- a/tos/lib/net/le/LinkEstimatorP.nc
+++ b/tos/lib/net/le/LinkEstimatorP.nc
@@ -252,7 +252,7 @@ implementation {
   // called when new beacon estimate is done
   // also called when new DEETX estimate is done
   void updateEETX(neighbor_table_entry_t *ne, uint16_t newEst) {
-    ne->eetx = (ALPHA * ne->eetx + (10 - ALPHA) * newEst)/10;
+    ne->eetx = (ALPHA * ne->eetx + (10 - ALPHA) * newEst + 5)/10;
   }
 
 
@@ -341,8 +341,8 @@ implementation {
 	      ne->inquality = (ALPHA * ne->inquality) / 10;
 	    } else {
 	      newEst = (255 * ne->rcvcnt) / totalPkt;
-	      dbg("LI,LITest", "  %hu: %hhu -> %hhu", ne->ll_addr, ne->inquality, (ALPHA * ne->inquality + (10-ALPHA) * newEst)/10);
-	      ne->inquality = (ALPHA * ne->inquality + (10-ALPHA) * newEst)/10;
+	      dbg("LI,LITest", "  %hu: %hhu -> %hhu", ne->ll_addr, ne->inquality, (ALPHA * ne->inquality + (10-ALPHA) * newEst + 5)/10);
+	      ne->inquality = (ALPHA * ne->inquality + (10-ALPHA) * newEst + 5)/10;
 	    }
 	    ne->rcvcnt = 0;
 	    ne->failcnt = 0;