Changeset 3762

Timestamp:

05/09/07 15:35:51 (6 years ago)

Author:

phelps

Message:

did reordering vector for QAM constellation

Files:

• SigProc/trunk/SigProc/modem.cpp (modified) (1 diff)

SigProc/trunk/SigProc/modem.cpp

@@ -99 +99 @@
         signed short I_temp[M];
         signed short Q_temp[M];
+        unsigned short symbolReorder[M];
         bool orderedSymbolBits_temp[M][bitsPersymbol];
-        unsigned short row_increment[pow(bitsPersymbol/2,2)-1];
-        unsigned short column_increment[pow(bitsPersymbol/2,2)-1];
+        unsigned short row_increment[pow(bitsPersymbol/2,2)];
+        unsigned short column_increment[pow(bitsPersymbol/2,2)];
         unsigned int bit_increment;
         
-        for(unsigned int bit = 0, bit<bitsPersymbol/2, bit++){      
+        for(unsigned short bit = 0, bit<bitsPersymbol/2, bit++){            
             bit_increment[bit] = pow(2,bit);
-            for(unsigned int inc_count = bit_increment-1, inc_count<pow(bitsPersymbol/2,2)-1, inc_count = inc_count + bit_increment){
-                row_increment[inc_count] = row_increment[inc_count] + bit_increment;
-                column_increment[inc_count] = row_increment[inc_count]*2;
+            for(unsigned short inc_count = bit_increment-1, inc_count<pow(bitsPersymbol/2,2)-1, inc_count = inc_count + bit_increment){
+                row_increment[inc_count+1] = row_increment[inc_count] + bit_increment;
+                column_increment[inc_count+1] = row_increment[inc_count]*2;
             }
         }
+        
+        for(unsigned short column = 0, column<pow(bitsPersymbol/2,2)-1, column++){
+            for(unsigned short row = 0, row<pow(bitsPersymbol/2,2)-1, row++){
+                symbolReorder[row+column*pow(bitsPersymbol/2,2)] = 1+row_increment[row]+column_increment[column];
+            }
+        }
+