[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/tossim CpmModelC.nc, 1.8, 1.9 sim_noise.c, 1.7, 1.8

[Phil Levis]

Update of /cvsroot/tinyos/tinyos-2.x/tos/lib/tossim
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv19285

Modified Files:
	CpmModelC.nc sim_noise.c 
Log Message:
Fix off by one error



Index: CpmModelC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/tossim/CpmModelC.nc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** CpmModelC.nc	20 Jul 2007 22:35:11 -0000	1.8
--- CpmModelC.nc	29 Jul 2007 23:38:25 -0000	1.9
***************
*** 128,132 ****
        noise_val = (double)sim_noise_generate(node_id, quotient);
      }
!     dbg("CpmModelC", "OUT: noise_hash_generation()\n");
  
      return noise_val;
--- 128,132 ----
        noise_val = (double)sim_noise_generate(node_id, quotient);
      }
!     dbg("CpmModelC,Tal", "%s: OUT: noise_hash_generation(): %lf\n", sim_time_string(), noise_val);
  
      return noise_val;

Index: sim_noise.c
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/tossim/sim_noise.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** sim_noise.c	20 Apr 2007 21:39:36 -0000	1.7
--- sim_noise.c	29 Jul 2007 23:38:25 -0000	1.8
***************
*** 93,96 ****
--- 93,97 ----
    noiseData[node_id].noiseTrace[noiseData[node_id].noiseTraceIndex] = noiseVal;
    noiseData[node_id].noiseTraceIndex++;
+   dbg("Insert", "Adding noise value %i for %i of %i\n", (int)noiseData[node_id].noiseTraceIndex, (int)node_id, (int)noiseVal);
  }
  
***************
*** 134,138 ****
    sim_noise_hash_t *noise_hash;
    noise_hash = (sim_noise_hash_t *)hashtable_search(pnoiseTable, key);
!   dbg("Insert,HashZeroDebug", "Adding noise value %hhi\n", noise);
    if (noise_hash == NULL)	{
      noise_hash = (sim_noise_hash_t *)malloc(sizeof(sim_noise_hash_t));
--- 135,139 ----
    sim_noise_hash_t *noise_hash;
    noise_hash = (sim_noise_hash_t *)hashtable_search(pnoiseTable, key);
!   dbg("Insert", "Adding noise value %hhi\n", noise);
    if (noise_hash == NULL)	{
      noise_hash = (sim_noise_hash_t *)malloc(sizeof(sim_noise_hash_t));
***************
*** 383,386 ****
--- 384,388 ----
    for(i=0; i<NOISE_HISTORY; i++) {
      noiseData[node_id].key[i] = search_bin_num(noiseData[node_id].noiseTrace[i]);
+     dbg("Insert", "Setting history %i to be %i\n", (int)i, (int)noiseData[node_id].key[i]);
    }
    
***************
*** 388,392 ****
    arrangeKey(node_id);
    
!   for(i = NOISE_HISTORY; i < noiseData[node_id].noiseTraceIndex; i++) {
      noiseData[node_id].key[NOISE_HISTORY-1] = search_bin_num(noiseData[node_id].noiseTrace[i]);
      sim_noise_add(node_id, noiseData[node_id].noiseTrace[i+1]);
--- 390,394 ----
    arrangeKey(node_id);
    
!   for(i = NOISE_HISTORY+1; i < noiseData[node_id].noiseTraceIndex; i++) {
      noiseData[node_id].key[NOISE_HISTORY-1] = search_bin_num(noiseData[node_id].noiseTrace[i]);
      sim_noise_add(node_id, noiseData[node_id].noiseTrace[i+1]);