deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

ETX 1.0 is 8, not 16, in the new collect code

Browse source
This commit is contained in:
nifi 2010-10-07 20:59:48 +00:00
parent 0cabe483c3
commit 54692bf62a
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
examples/sky-shell/src/se/sics/contiki/collect/SensorDataAggregator.java
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: SensorDataAggregator.java,v 1.10 2010/09/30 22:24:45 nifi Exp $ * $Id: SensorDataAggregator.java,v 1.11 2010/10/07 20:59:48 nifi Exp $
* *
* ----------------------------------------------------------------- * -----------------------------------------------------------------
* *
@ -34,8 +34,8 @@
* *
* Authors : Joakim Eriksson, Niclas Finne * Authors : Joakim Eriksson, Niclas Finne
* Created : 20 aug 2008 * Created : 20 aug 2008
* Updated : $Date: 2010/09/30 22:24:45 $ * Updated : $Date: 2010/10/07 20:59:48 $
* $Revision: 1.10 $ * $Revision: 1.11 $
*/ */
package se.sics.contiki.collect; package se.sics.contiki.collect;
@ -242,7 +242,7 @@ public class SensorDataAggregator implements SensorInfo {
} }
public double getAverageRtmetric() { public double getAverageRtmetric() {
return dataCount > 0 ? ((values[BEST_NEIGHBOR_RTMETRIC] + values[BEST_NEIGHBOR_ETX]) / dataCount) : 0.0; return dataCount > 0 ? ((values[BEST_NEIGHBOR_RTMETRIC] + (values[BEST_NEIGHBOR_ETX] / 8.0)) / dataCount) : 0.0;
} }
public double getAverageRadioIntensity() { public double getAverageRadioIntensity() {
@ -270,7 +270,7 @@ public class SensorDataAggregator implements SensorInfo {
} }
public double getAverageBestNeighborETX() { public double getAverageBestNeighborETX() {
return getAverageValue(BEST_NEIGHBOR_ETX) / 16.0; return getAverageValue(BEST_NEIGHBOR_ETX) / 8.0;
} }
public int getPacketCount() { public int getPacketCount() {