Changed the default to be that all platforms #include stdio.h unless specifically...

[tinyos-2.x.git] / tos / lib / tossim / sim_noise.h

diff --git a/tos/lib/tossim/sim_noise.h b/tos/lib/tossim/sim_noise.h
index 078c58427c56c7ee2178eb1ea14b37310912fe78..c5387254f3360fae300b038cdea1f46a2e803be2 100644 (file)
--- a/tos/lib/tossim/sim_noise.h
+++ b/tos/lib/tossim/sim_noise.h
@@ -41,15 +41,16 @@ extern "C" {
 #endif
 
 enum {
-  NOISE_MIN = -100,
-  NOISE_MAX = -30,
-  NOISE_MIN_QUANTIZE = -100,
+  NOISE_MIN = -115,
+  NOISE_MAX = -5,
+  NOISE_MIN_QUANTIZE = -115,
   NOISE_QUANTIZE_INTERVAL = 5,
-  NOISE_BIN_SIZE = (NOISE_MAX - NOISE_MIN)/NOISE_QUANTIZE_INTERVAL,
+  NOISE_BIN_SIZE = ((NOISE_MAX - NOISE_MIN) / NOISE_QUANTIZE_INTERVAL) + 1,
   NOISE_HISTORY = 20,
   NOISE_DEFAULT_ELEMENT_SIZE = 8,
-  NOISE_HASHTABLE_SIZE = 8192,
-  NOISE_MIN_TRACE = 1024, 
+  NOISE_HASHTABLE_SIZE = 128,
+  NOISE_MIN_TRACE = 128, 
+  NOISE_NUM_VALUES = NOISE_MAX - NOISE_MIN + 1,    //TODO check the + 1, also in NOISE_BIN_SIZE above in the inner parens
 };
   
 typedef struct sim_noise_hash_t {
@@ -58,7 +59,7 @@ typedef struct sim_noise_hash_t {
   int size;
   char *elements;
   char flag;
-  float dist[NOISE_BIN_SIZE];
+  float dist[NOISE_NUM_VALUES];
 } sim_noise_hash_t;
 
 typedef struct sim_noise_node_t {
@@ -70,6 +71,7 @@ typedef struct sim_noise_node_t {
   char* noiseTrace;
   uint32_t noiseTraceLen;
   uint32_t noiseTraceIndex;
+  bool generated;
 } sim_noise_node_t;
 
 void sim_noise_init();
@@ -83,4 +85,3 @@ void sim_noise_create_model(uint16_t node_id);
 #endif
   
 #endif // _SIM_NOISE_HASH_H_
-