[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r4402 - gnuradio/trunk/gr-trellis/src/lib
From: |
anastas |
Subject: |
[Commit-gnuradio] r4402 - gnuradio/trunk/gr-trellis/src/lib |
Date: |
Tue, 6 Feb 2007 16:55:34 -0700 (MST) |
Author: anastas
Date: 2007-02-06 16:55:34 -0700 (Tue, 06 Feb 2007)
New Revision: 4402
Modified:
gnuradio/trunk/gr-trellis/src/lib/interleaver.cc
gnuradio/trunk/gr-trellis/src/lib/interleaver.h
gnuradio/trunk/gr-trellis/src/lib/interleaver.i
gnuradio/trunk/gr-trellis/src/lib/quicksort_index.cc
gnuradio/trunk/gr-trellis/src/lib/quicksort_index.h
Log:
Minor fix in interleaver class: invoking with negative seed will not reset the
random number generator.
Modified: gnuradio/trunk/gr-trellis/src/lib/interleaver.cc
===================================================================
--- gnuradio/trunk/gr-trellis/src/lib/interleaver.cc 2007-02-06 23:26:38 UTC
(rev 4401)
+++ gnuradio/trunk/gr-trellis/src/lib/interleaver.cc 2007-02-06 23:55:34 UTC
(rev 4402)
@@ -85,13 +85,13 @@
//######################################################################
//# Generate a random interleaver
//######################################################################
-interleaver::interleaver(int K, unsigned int seed)
+interleaver::interleaver(int K, int seed)
{
d_K=K;
d_INTER.resize(d_K);
d_DEINTER.resize(d_K);
- srand(seed);
+ if(seed>=0) srand((unsigned int)seed);
std::vector<int> tmp(d_K);
for(int i=0;i<d_K;i++) {
d_INTER[i]=i;
Modified: gnuradio/trunk/gr-trellis/src/lib/interleaver.h
===================================================================
--- gnuradio/trunk/gr-trellis/src/lib/interleaver.h 2007-02-06 23:26:38 UTC
(rev 4401)
+++ gnuradio/trunk/gr-trellis/src/lib/interleaver.h 2007-02-06 23:55:34 UTC
(rev 4402)
@@ -38,7 +38,7 @@
interleaver(const interleaver & INTERLEAVER);
interleaver(int K, const std::vector<int> & INTER);
interleaver(const char *name);
- interleaver(int K, unsigned int seed);
+ interleaver(int K, int seed);
int K () const { return d_K; }
const std::vector<int> & INTER () const { return d_INTER; }
const std::vector<int> & DEINTER () const { return d_DEINTER; }
Modified: gnuradio/trunk/gr-trellis/src/lib/interleaver.i
===================================================================
--- gnuradio/trunk/gr-trellis/src/lib/interleaver.i 2007-02-06 23:26:38 UTC
(rev 4401)
+++ gnuradio/trunk/gr-trellis/src/lib/interleaver.i 2007-02-06 23:55:34 UTC
(rev 4402)
@@ -30,7 +30,7 @@
interleaver(const interleaver & INTERLEAVER);
interleaver(int K, const std::vector<int> & INTER);
interleaver(const char *name);
- interleaver(int K, unsigned int seed);
+ interleaver(int K, int seed);
int K () const { return d_K; }
const std::vector<int> & INTER () const { return d_INTER; }
const std::vector<int> & DEINTER () const { return d_DEINTER; }
Modified: gnuradio/trunk/gr-trellis/src/lib/quicksort_index.cc
===================================================================
--- gnuradio/trunk/gr-trellis/src/lib/quicksort_index.cc 2007-02-06
23:26:38 UTC (rev 4401)
+++ gnuradio/trunk/gr-trellis/src/lib/quicksort_index.cc 2007-02-06
23:55:34 UTC (rev 4402)
@@ -61,7 +61,7 @@
}
// instantiate an <int> version of the quicksort_index
-
+//template <int> void SWAP (int & a, int & b);
template
void
quicksort_index<int>
Modified: gnuradio/trunk/gr-trellis/src/lib/quicksort_index.h
===================================================================
--- gnuradio/trunk/gr-trellis/src/lib/quicksort_index.h 2007-02-06 23:26:38 UTC
(rev 4401)
+++ gnuradio/trunk/gr-trellis/src/lib/quicksort_index.h 2007-02-06 23:55:34 UTC
(rev 4402)
@@ -29,7 +29,6 @@
void SWAP (T & a, T & b);
template <class T>
-void quicksort_index (std::vector<T> & p, std::vector<int> & index,
- int left, int right);
+void quicksort_index (std::vector<T> & p, std::vector<int> & index, int left,
int right);
#endif
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r4402 - gnuradio/trunk/gr-trellis/src/lib,
anastas <=