Changeset 4096

Timestamp:

06/02/07 15:45:30 (6 years ago)

Author:

jgaeddert

Message:

Fixing 16-QAM test in Demodulator component

Files:

• experimental/components/Demodulator/atsrc/Demodulator_testsuite.h (modified) (2 diffs)

experimental/components/Demodulator/atsrc/Demodulator_testsuite.h

@@ -205 +205 @@
     }
 
-    void xtest_Demodulate16QAM() {
+    void test_Demodulate16QAM() {
         short I[16] = {
             -15, -15, -15, -15,
@@ -218 +218 @@
         char * bits_out = new char[64];
 
-        SetModulationScheme( MOD_8PSK );
+        SetModulationScheme( MOD_16QAM );
         DemodulateSequence(I, Q, 16, bits_out);
 
         TS_ASSERT_EQUALS( bits_out[0],  BIT0 );
         TS_ASSERT_EQUALS( bits_out[1],  BIT0 );
-        TS_ASSERT_EQUALS( bits_out[2],  BIT0 );
+        TS_ASSERT_EQUALS( bits_out[2],  BIT1 );
         TS_ASSERT_EQUALS( bits_out[3],  BIT0 );
 
         TS_ASSERT_EQUALS( bits_out[4],  BIT0 );
-        TS_ASSERT_EQUALS( bits_out[5],  BIT1 );
+        TS_ASSERT_EQUALS( bits_out[5],  BIT0 );
         TS_ASSERT_EQUALS( bits_out[6],  BIT1 );
-        TS_ASSERT_EQUALS( bits_out[7],  BIT0 );
-
-        TS_ASSERT_EQUALS( bits_out[8],  BIT1 );
-        TS_ASSERT_EQUALS( bits_out[9],  BIT1 );
+        TS_ASSERT_EQUALS( bits_out[7],  BIT1 );
+
+        TS_ASSERT_EQUALS( bits_out[8],  BIT0 );
+        TS_ASSERT_EQUALS( bits_out[9],  BIT0 );
         TS_ASSERT_EQUALS( bits_out[10], BIT0 );
-        TS_ASSERT_EQUALS( bits_out[11], BIT0 );
-
-        TS_ASSERT_EQUALS( bits_out[12], BIT1 );
-        TS_ASSERT_EQUALS( bits_out[13], BIT1 );
+        TS_ASSERT_EQUALS( bits_out[11], BIT1 );
+
+        TS_ASSERT_EQUALS( bits_out[12], BIT0 );
+        TS_ASSERT_EQUALS( bits_out[13], BIT0 );
         TS_ASSERT_EQUALS( bits_out[14], BIT0 );
-        TS_ASSERT_EQUALS( bits_out[15], BIT1 );
-
-        TS_ASSERT_EQUALS( bits_out[16], BIT1 );
+        TS_ASSERT_EQUALS( bits_out[15], BIT0 );
+
+        TS_ASSERT_EQUALS( bits_out[16], BIT0 );
         TS_ASSERT_EQUALS( bits_out[17], BIT1 );
-        TS_ASSERT_EQUALS( bits_out[18], BIT0 );
-        TS_ASSERT_EQUALS( bits_out[19], BIT1 );
-
-        TS_ASSERT_EQUALS( bits_out[20], BIT1 );
-        TS_ASSERT_EQUALS( bits_out[21], BIT0 );
+        TS_ASSERT_EQUALS( bits_out[18], BIT1 );
+        TS_ASSERT_EQUALS( bits_out[19], BIT0 );
+
+        TS_ASSERT_EQUALS( bits_out[20], BIT0 );
+        TS_ASSERT_EQUALS( bits_out[21], BIT1 );
         TS_ASSERT_EQUALS( bits_out[22], BIT1 );
-        TS_ASSERT_EQUALS( bits_out[23], BIT0 );
+        TS_ASSERT_EQUALS( bits_out[23], BIT1 );
 
         TS_ASSERT_EQUALS( bits_out[24], BIT0 );
-        TS_ASSERT_EQUALS( bits_out[25], BIT0 );
+        TS_ASSERT_EQUALS( bits_out[25], BIT1 );
         TS_ASSERT_EQUALS( bits_out[26], BIT0 );
-        TS_ASSERT_EQUALS( bits_out[27], BIT0 );
+        TS_ASSERT_EQUALS( bits_out[27], BIT1 );
 
         TS_ASSERT_EQUALS( bits_out[28], BIT0 );
-        TS_ASSERT_EQUALS( bits_out[29], BIT0 );
+        TS_ASSERT_EQUALS( bits_out[29], BIT1 );
         TS_ASSERT_EQUALS( bits_out[30], BIT0 );
         TS_ASSERT_EQUALS( bits_out[31], BIT0 );
 
-        TS_ASSERT_EQUALS( bits_out[32], BIT0 );
-        TS_ASSERT_EQUALS( bits_out[33], BIT0 );
-        TS_ASSERT_EQUALS( bits_out[34], BIT0 );
+        TS_ASSERT_EQUALS( bits_out[32], BIT1 );
+        TS_ASSERT_EQUALS( bits_out[33], BIT1 );
+        TS_ASSERT_EQUALS( bits_out[34], BIT1 );
         TS_ASSERT_EQUALS( bits_out[35], BIT0 );
 
-        TS_ASSERT_EQUALS( bits_out[36], BIT0 );
+        TS_ASSERT_EQUALS( bits_out[36], BIT1 );
         TS_ASSERT_EQUALS( bits_out[37], BIT1 );
         TS_ASSERT_EQUALS( bits_out[38], BIT1 );
-        TS_ASSERT_EQUALS( bits_out[39], BIT0 );
+        TS_ASSERT_EQUALS( bits_out[39], BIT1 );
 
         TS_ASSERT_EQUALS( bits_out[40], BIT1 );
         TS_ASSERT_EQUALS( bits_out[41], BIT1 );
         TS_ASSERT_EQUALS( bits_out[42], BIT0 );
-        TS_ASSERT_EQUALS( bits_out[43], BIT0 );
+        TS_ASSERT_EQUALS( bits_out[43], BIT1 );
 
         TS_ASSERT_EQUALS( bits_out[44], BIT1 );
         TS_ASSERT_EQUALS( bits_out[45], BIT1 );
         TS_ASSERT_EQUALS( bits_out[46], BIT0 );
-        TS_ASSERT_EQUALS( bits_out[47], BIT1 );
+        TS_ASSERT_EQUALS( bits_out[47], BIT0 );
 
         TS_ASSERT_EQUALS( bits_out[48], BIT1 );
-        TS_ASSERT_EQUALS( bits_out[49], BIT1 );
-        TS_ASSERT_EQUALS( bits_out[50], BIT0 );
-        TS_ASSERT_EQUALS( bits_out[51], BIT1 );
+        TS_ASSERT_EQUALS( bits_out[49], BIT0 );
+        TS_ASSERT_EQUALS( bits_out[50], BIT1 );
+        TS_ASSERT_EQUALS( bits_out[51], BIT0 );
 
         TS_ASSERT_EQUALS( bits_out[52], BIT1 );
         TS_ASSERT_EQUALS( bits_out[53], BIT0 );
         TS_ASSERT_EQUALS( bits_out[54], BIT1 );
-        TS_ASSERT_EQUALS( bits_out[55], BIT0 );
-
-        TS_ASSERT_EQUALS( bits_out[56], BIT0 );
+        TS_ASSERT_EQUALS( bits_out[55], BIT1 );
+
+        TS_ASSERT_EQUALS( bits_out[56], BIT1 );
         TS_ASSERT_EQUALS( bits_out[57], BIT0 );
         TS_ASSERT_EQUALS( bits_out[58], BIT0 );
-        TS_ASSERT_EQUALS( bits_out[59], BIT0 );
-
-        TS_ASSERT_EQUALS( bits_out[60], BIT0 );
+        TS_ASSERT_EQUALS( bits_out[59], BIT1 );
+
+        TS_ASSERT_EQUALS( bits_out[60], BIT1 );
         TS_ASSERT_EQUALS( bits_out[61], BIT0 );
         TS_ASSERT_EQUALS( bits_out[62], BIT0 );