Changeset 4402

Show
Ignore:
Timestamp:
02/06/07 16:55:34
Author:
anastas
Message:

Minor fix in interleaver class: invoking with negative seed will not reset the random number generator.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • gnuradio/trunk/gr-trellis/src/lib/interleaver.cc

    r4400 r4402  
    8686//# Generate a random interleaver 
    8787//###################################################################### 
    88 interleaver::interleaver(int K, unsigned int seed) 
     88interleaver::interleaver(int K, int seed) 
    8989{ 
    9090  d_K=K; 
    …… 
    9292  d_DEINTER.resize(d_K); 
    9393 
    94   srand(seed); 
     94  if(seed>=0) srand((unsigned int)seed);  
    9595  std::vector<int> tmp(d_K); 
    9696  for(int i=0;i<d_K;i++) { 

  • gnuradio/trunk/gr-trellis/src/lib/interleaver.h

    r3534 r4402  
    3939  interleaver(int K, const std::vector<int> & INTER); 
    4040  interleaver(const char *name); 
    41   interleaver(int K, unsigned int seed); 
     41  interleaver(int K, int seed); 
    4242  int K () const { return d_K; } 
    4343  const std::vector<int> & INTER () const { return d_INTER; } 

  • gnuradio/trunk/gr-trellis/src/lib/interleaver.i

    r3534 r4402  
    3131  interleaver(int K, const std::vector<int> & INTER); 
    3232  interleaver(const char *name); 
    33   interleaver(int K, unsigned int seed); 
     33  interleaver(int K, int seed); 
    3434  int K () const { return d_K; } 
    3535  const std::vector<int> & INTER () const { return d_INTER; } 

  • gnuradio/trunk/gr-trellis/src/lib/quicksort_index.cc

    r4400 r4402  
    6262 
    6363// instantiate an <int> version of the quicksort_index 
    64  
     64//template <int> void SWAP (int & a, int & b); 
    6565template 
    6666void 

  • gnuradio/trunk/gr-trellis/src/lib/quicksort_index.h

    r4400 r4402  
    3030 
    3131template <class T> 
    32 void quicksort_index (std::vector<T> & p, std::vector<int> & index, 
    33                       int left, int right); 
     32void quicksort_index (std::vector<T> & p, std::vector<int> & index, int left, int right); 
    3433 
    3534#endif