[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/tossim sim_noise.c, 1.11, 1.12

[Phil Levis]

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

Modified Files:
	sim_noise.c 
Log Message:
Committed fix to sim_noise from Mike at JHU.


Index: sim_noise.c
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/tossim/sim_noise.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** sim_noise.c	4 Sep 2007 17:19:23 -0000	1.11
--- sim_noise.c	19 Sep 2007 22:16:25 -0000	1.12
***************
*** 255,267 ****
      pKey[i] = /* noiseData[node_id].noiseTrace[i]; // */ search_bin_num(noiseData[node_id].noiseTrace[i]);
    }
!   sim_noise_dist(node_id);
!   arrangeKey(node_id);
    for(i = NOISE_HISTORY; i < noiseData[node_id].noiseTraceIndex; i++) {
      if (i == NOISE_HISTORY) {
        //printf("Inserting first element.\n");
      }
-     pKey[NOISE_HISTORY-1] = /*noiseData[node_id].noiseTrace[i]; //*/ search_bin_num(noiseData[node_id].noiseTrace[i]);
      sim_noise_dist(node_id);
      arrangeKey(node_id);
    }
  
--- 255,266 ----
      pKey[i] = /* noiseData[node_id].noiseTrace[i]; // */ search_bin_num(noiseData[node_id].noiseTrace[i]);
    }
! 
    for(i = NOISE_HISTORY; i < noiseData[node_id].noiseTraceIndex; i++) {
      if (i == NOISE_HISTORY) {
        //printf("Inserting first element.\n");
      }
      sim_noise_dist(node_id);
      arrangeKey(node_id);
+     pKey[NOISE_HISTORY-1] =  search_bin_num(noiseData[node_id].noiseTrace[i]);
    }
  
***************
*** 417,427 ****
    }
    
!   sim_noise_add(node_id, noiseData[node_id].noiseTrace[NOISE_HISTORY]);
!   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]);
      arrangeKey(node_id);
    }
    noiseData[node_id].generated = 1;
--- 416,426 ----
    }
    
!   //sim_noise_add(node_id, noiseData[node_id].noiseTrace[NOISE_HISTORY]);
!   //arrangeKey(node_id);
    
    for(i = NOISE_HISTORY; i < noiseData[node_id].noiseTraceIndex; i++) {
!     sim_noise_add(node_id, noiseData[node_id].noiseTrace[i]);
      arrangeKey(node_id);
+     noiseData[node_id].key[NOISE_HISTORY-1] = search_bin_num(noiseData[node_id].noiseTrace[i]);
    }
    noiseData[node_id].generated = 1;