Changeset 4745

Timestamp:

08/16/07 21:16:32 (6 years ago)

Author:

jgaeddert

Message:

adding test; fixing bits->symbol conversion method

Location:

experimental/components/DigitalModem/trunk/DigitalModem

Files:

• atsrc/DigitalModulator_testsuite.h (modified) (2 diffs)
• src/DigitalModem.cpp (modified) (1 diff)

experimental/components/DigitalModem/trunk/DigitalModem/atsrc/DigitalModulator_testsuite.h

@@ -15 +15 @@
 {
 public:
-    void test_01() {
+
+    void test_ConvertBitsToSymbol_01() {
+        char b[2] = {BIT0, BIT1};
+        
+        unsigned short s;
+        
+        SetModulationScheme( SigProc::BPSK );
+
+        for (unsigned int i=0; i<2; i++) {
+            ConvertBitsToSymbol(b+i*bitsPerSymbol, s);
+            TS_ASSERT_EQUALS( s, i );
+        }
+    }
+
+    void test_ConvertBitsToSymbol_02() {
+        char b[8] = {BIT0, BIT0,
+                     BIT0, BIT1,
+                     BIT1, BIT0,
+                     BIT1, BIT1};
+        
+        unsigned short s;
+        
+        SetModulationScheme( SigProc::QPSK );
+
+        for (unsigned int i=0; i<4; i++) {
+            ConvertBitsToSymbol(b+i*bitsPerSymbol, s);
+            TS_ASSERT_EQUALS( s, i );
+        }
+    }
+
+    void test_ConvertBitsToSymbol_03() {
+        char b[24] = {BIT0, BIT0, BIT0,
+                      BIT0, BIT0, BIT1,
+                      BIT0, BIT1, BIT0,
+                      BIT0, BIT1, BIT1,
+                      BIT1, BIT0, BIT0,
+                      BIT1, BIT0, BIT1,
+                      BIT1, BIT1, BIT0,
+                      BIT1, BIT1, BIT1};
+        
+        unsigned short s;
+        
+        SetModulationScheme( SigProc::PSK8 );
+
+        for (unsigned int i=0; i<8; i++) {
+            ConvertBitsToSymbol(b+i*bitsPerSymbol, s);
+            TS_ASSERT_EQUALS( s, i );
+        }
     }
 };
@@ -22 +69 @@
 //       definition, otherwise the python script does not recognize it
 //       as a test class
-class DigitalModulator_TestDemodulation : public CxxTest::TestSuite,
+class DigitalModulator_TestModulation : public CxxTest::TestSuite,
     public DigitalModem
 {

experimental/components/DigitalModem/trunk/DigitalModem/src/DigitalModem.cpp

@@ -205 +205 @@
     
     for (unsigned int i=0; i<bitsPerSymbol; i++) {
-        s &= (bitsIn[bitsPerSymbol-i-1] > 0) ? 1 : 0;
-        s >>= 1;
-    }
-}
-
-
+        s <<= 1;
+        s |= (bitsIn[i] > 0) ? 1 : 0;
+    }
+}
+
+