Changeset 9702

Timestamp:

11/04/09 21:45:56 (4 years ago)

Author:

hvolos

Message:

improved VBLAST

Files:

• ossiedev/branches/hvolos/components/MIMODec/MIMODec.cpp (modified) (7 diffs)

ossiedev/branches/hvolos/components/MIMODec/MIMODec.cpp

@@ -187 +187 @@
         cx_mat H(Mr,Nt); //Channel Matrix
         //std::cout<<NH<<","<<Mr<<"X"<<Nt<<" M:"<< MIMOmethod<<" DL:"<<Data_length<<std::endl;
+        short int k=0;
         for (int i=0;i<Mr;i++) {
             for (int j=0;j<Nt;j++) {
-                H(i,j)=cx_double((*I_in)[i*Mr+j],(*Q_in)[i*Mr+j])/10000.0;
+                H(i,j)=cx_double((*I_in)[k],(*Q_in)[k])/1e4;
+                k++;
                 //std::cout<<"Iin:"<<(*I_in)[i*Mr+j]<<"  ";
                 //std::cout<<"H("<<i<<","<<j<<")="<<H(i,j)<<"  ";
             }
         }
-        //std::cout<<std::endl;
+        //std::cout<<"H:"<<H<<std::endl;
 
         cx_double r1;
@@ -210 +212 @@
             break;
         case 2:
-            OutData_length=(Data_length-NH);
+            OutData_length=(Data_length-NH)*Nt/Mr;
             std::cout<<"MIMODec VBLAST:";
             break;
@@ -223 +225 @@
 
 
-
-        short int j;
-        j=0;
+        short int j=0;
+
         switch (MIMOmethod) {
         case 0: //MRC
+            /**
+                j=0;
+
+                for (short int i=NH; i<Data_length;i+=Mr) {
+                    // std::cout<<i<<","<<j;
+                    rx_symbols(j,0)=0;
+
+                    for (short int k=0;k<Mr;k++) {
+                        r1=cx_double((*I_in)[i+k],(*Q_in)[i+k]);
+                        rx_symbols(j,0)+=r1*conj(H(k,0));
+                        //  std::cout<<","<<k;
+                    }
+                    //std::cout<<std::endl;
+
+                    j+=1;
+                }
+                **/
         {
             cx_mat rx(Mr,OutData_length);
@@ -244 +262 @@
             j=0;
             for (short int i=NH; i<Data_length;i+=Mr) {
-                 //std::cout<<i<<", j"<<j;
+                //std::cout<<i<<", j"<<j;
 
                 for (short int k=0;k<Mr;k++) {
@@ -255 +273 @@
             //std::cout<<"rx:"<<rx<<std::endl;
             scale=(htrans(h)*h);
+            //std::cout<<"Scale:"<<scale<<std::endl;
 
             rx_symbols=htrans(h)*rx/1;
@@ -261 +280 @@
         }
 
-            break;
+        break;
         case 1: //STBC Alamouti 2x
             j=0;
@@ -283 +302 @@
         case 2: //VBLAST
 
-            if (!(Mr==Nt)||!(Mr==2)) {
-                std::cout<<"Temporarily only 2x2 VBLAST is supported"<<std::endl;
+            cx_mat r(Mr,OutData_length/Nt);
+            cx_mat z(1,OutData_length/Nt);
+            cx_mat s(1,OutData_length/Nt);
+
+
+            cx_mat T(Nt,Mr);
+            cx_mat w(1,Mr);
+            T.zeros();
+
+
+
+
+            //Computer pseudo-inverse (Moore-Penrose method)
+
+            T=inv(htrans(H)*H)*htrans(H);
+           // std::cout<<"H:"<<H<<std::endl;
+           // std::cout<<"T:"<<T<<std::endl;
+            //std::cout<<"HTH"<<H*T*H<<std::endl;
+
+            double n,nmax;
+            short I,Q,sno;
+            short int k,k2,st;
+
+            st=0;
+            for (short int i=NH; i<Data_length;i+=Mr) {
+                for (short int l=0;l<Mr;l++) r(l,st)=cx_double((*I_in)[i+l],(*Q_in)[i+l]);
+                st++;
+            };
+
+            nmax=-1;
+            for (k2=0;k2<Nt;k2++) {
+                 //if (k2>0) {
+                T=pinv(H);
+                //std::cout<<"T:"<<T<<std::endl;
+               // std::cout<<"HTH"<<H*T*H<<std::endl;
+                //}
+                k=k2;
+                nmax=-1;
+                for (short int i=0;i<Nt;i++) {
+                    w=T.row(i);
+                    n= norm(abs(w),2);
+                    if (n>nmax) {
+                        nmax=n;
+                        k=i;
+                        //std::cout<<"k:"<<k<<" nmax:"<<nmax<<std::endl;
+                    }
+                }
+
+                w=T.row(k);
+                //std::cout<<"w:"<<w<<std::endl;
+                z=w*r;
+                //std::cout<<"z:"<<z<<std::endl;
+                //  std::cout<<" z=w*r;"<<std::endl;
+
+                for (short int i=0;i<(OutData_length/Nt);i++) {
+                    SigProc::DemodulateQPSK((short)(real(z(0,i))),(short)(imag(z(0,i))),sno);
+                    SigProc::ModulateQPSK(sno,I,Q);
+                    //std::cout<<"sno:"<<sno<<" I,Q:"<<I<<","<<Q<<std::endl;
+                    s(0,i)=cx_double(I,Q)*0.989/sqrt(Nt);
+                }
+                // std::cout<<" s size:"<<s.n_elem<<"s:"<<s<<std::endl;
+                r=r-H.col(k)*s;
+                //std::cout<<" r="<<H.col(k)*s<<std::endl;
+                //std::cout<<"r"<<r<<std::endl;
+                //std::cout<<"H.col:"<<H.col(k)<<std::endl;
+                //std::cout<<"zeros"<<zeros<cx_colvec>(Mr)<<std::endl;
+                H.col(k)=zeros<cx_colvec>(Mr);
+
+               // std::cout<<"H"<<H<<std::endl;
+
+                //std::cout<<"rx_index:"<<(i-NH)/Mr+k<<" , i="<<i<<" ,k="<<k<<" ,st="<<st<<std::endl;
+                st=0;
+                for (short int i=k;i<OutData_length;i+=Nt) {
+                    rx_symbols(i,0)=z(0,st);
+                    st++;
+                    // std::cout<<"i:"<<i<<std::endl;
+                }
+
+
+            }
+
+
+
+            /**
+
+                    if (!(Mr==Nt)||!(Mr==2)){
+                    std::cout<<"Temporarily only 2x2 VBLAST is supported"<<std::endl;
                 throw(0);
-            }
-
-
-            cx_mat r(Mr,1);
-
-            cx_mat T0(Nt,Mr);
-            cx_mat T(Nt,Mr);
-            cx_rowvec w;
-            T.zeros();
-
-            //Computer pseudo-inverse (Moore-Penrose method)
-            T=conj(H)*inv(H*conj(H));
-            //std::cout<<"H:"<<H<<std::endl;
-            //std::cout<<"T:"<<T<<std::endl;
-
-            double n,nmin;
-            cx_mat z(1,1),s(1,1);
-            short I,Q,sno;
-
-            n=0;
-            nmin=0;
-            short int k;
-
-            //n=norm(abs(w),2);
-            //std::cout<<"k:"<<k<<" n:"<<n<<std::endl;
-            mat sicorder(Mr,2);
-            sicorder.zeros();
-
-            for (k=0;k<Mr;k++) {
-                w=T.row(k);
-                sicorder(k,0)=norm(abs(w),2);
-                sicorder(k,1)=k;
-            }
-
-            short int l,l2,l2p,k2;
-            for (k=0;k<Mr-1;k++) {
-                for (l=0;l<(Mr-k-1);l++) {
-                    l2=sicorder(l,1);
-                    l2p=sicorder(l+1,1);
-                    if (sicorder(l2,0)<sicorder(l2p,0)) {
-                        sicorder(l,1)=l2p;
-                        sicorder(l+1,1)=l2;
                     }
-                }
-            }
-
-            // std::cout<<"sicorder:"<<sicorder<<std::endl;
-
-
-
-
-            for (short int i=NH; i<Data_length;i+=Mr) {
-                for (short int l=0;l<Mr;l++) r(l,0)=cx_double((*I_in)[i+l],(*Q_in)[i+l]);
-                for (k2=0;k2<Mr;k2++) {
-                    k=sicorder(k2,1);
-                    //T=pinv(H);
-
-                    w=T.row(k);
-                    //std::cout<<"w:"<<w<<std::endl;
-                    z=w*r;
-                    //std::cout<<"z:"<<z<<std::endl;
-                    SigProc::DemodulateQPSK((short)(real(z(0,0))),(short)(imag(z(0,0))),sno);
-                    SigProc::ModulateQPSK(sno,I,Q);
-                    //std::cout<<"sno:"<<sno<<std::endl;
-                    s=cx_double(I,Q)/sqrt(Nt)*0.7;;
-                    r=r-H.col(k)*s;
-                    //std::cout<<"r"<<r<<std::endl;
-                    //H.col(k)=zeros<cx_colvec>(1,Nt);
-                    rx_symbols(i+k-NH,0)=z(0,0);
-
-                }
-
-
-            }
-
+                        cx_mat r(Mr,1);
+
+                        cx_mat T0(Nt,Mr);
+                        cx_mat T(Nt,Mr);
+                        cx_rowvec w;
+                        T.zeros();
+
+                        //Computer pseudo-inverse (Moore-Penrose method)
+                        T=conj(H)*inv(H*conj(H));
+                        //std::cout<<"H:"<<H<<std::endl;
+                        //std::cout<<"T:"<<T<<std::endl;
+
+                        double n,nmin;
+                        cx_mat z(1,1),s(1,1);
+                        short I,Q,sno;
+
+                        n=0;
+                        nmin=0;
+                        short int k;
+
+                        //n=norm(abs(w),2);
+                        //std::cout<<"k:"<<k<<" n:"<<n<<std::endl;
+                        mat sicorder(Mr,2);
+                        sicorder.zeros();
+
+                        for (k=0;k<Mr;k++) {
+                            w=T.row(k);
+                            sicorder(k,0)=norm(abs(w),2);
+                            sicorder(k,1)=k;
+                        }
+
+                        short int l,l2,l2p,k2;
+                        for (k=0;k<Mr-1;k++) {
+                            for (l=0;l<(Mr-k-1);l++) {
+                                l2=sicorder(l,1);
+                                l2p=sicorder(l+1,1);
+                                if (sicorder(l2,0)<sicorder(l2p,0)){
+                                    sicorder(l,1)=l2p;
+                                    sicorder(l+1,1)=l2;
+                                }
+                            }
+                        }
+
+                       // std::cout<<"sicorder:"<<sicorder<<std::endl;
+
+
+
+
+                        for (short int i=NH; i<Data_length;i+=Mr) {
+                            for (short int l=0;l<Mr;l++) r(l,0)=cx_double((*I_in)[i+l],(*Q_in)[i+l]);
+                            for (k2=0;k2<Mr;k2++) {
+                                k=sicorder(k2,1);
+                                //T=pinv(H);
+
+                                w=T.row(k);
+                                //std::cout<<"w:"<<w<<std::endl;
+                                z=w*r;
+                                //std::cout<<"z:"<<z<<std::endl;
+                                SigProc::DemodulateQPSK((short)(real(z(0,0))),(short)(imag(z(0,0))),sno);
+                                SigProc::ModulateQPSK(sno,I,Q);
+                                //std::cout<<"sno:"<<sno<<std::endl;
+                                s=cx_double(I,Q)/sqrt(Nt)*0.7;;
+                                r=r-H.col(k)*s;
+                                //std::cout<<"r"<<r<<std::endl;
+                                //H.col(k)=zeros<cx_colvec>(1,Nt);
+                                rx_symbols(i+k-NH,0)=z(0,0);
+
+                            }
+
+
+                        }
+            **/
             break;
         }