Merge branch 'master' into ul_improve

This commit is contained in:
ismagom 2015-09-14 23:52:23 +02:00
commit 4cd64b6de8
1 changed files with 40 additions and 41 deletions

View File

@ -2,19 +2,17 @@ clear
ueConfig=struct('NCellID',1,'CyclicPrefixUL','Normal','NTxAnts',1);
puschConfig=struct('NLayers',1,'OrthCover','Off','PRBSet',0,'Shortened',0);
addpath('../../debug/srslte/lib/phch/test')
TBs=336;
cqilen=0;
mods={'16QAM'};
rvs=0;
betas=5;
addpath('../../build/srslte/lib/phch/test')
TBs=336;
cqilen=0;
mods={'16QAM'};
rvs=0;
betas=5;
for i=1:length(TBs)
for m=1:length(mods)
for r=1:length(rvs)
for bcqi=1:length(betas)
for bri=1:length(betas)
for back=1:length(betas)
for c=1:length(cqilen)
@ -40,9 +38,11 @@ for i=1:length(TBs)
if (cqilen(c)>0 || TBs(i)>0)
[mat, info]=lteULSCH(ueConfig,puschConfig,trblkin,ones(1,cqilen(c)),ri_bit,ack_bit,[]);
mat(mat==-2)=2;
mat(mat==-1)=3;
mat(mat==-2)=3;
mat(mat==-1)=2;
[lib]=srslte_ulsch_encode(ueConfig,puschConfig,trblkin,ones(1,cqilen(c)),ri_bit,ack_bit);
lib(lib==192)=3;
lib(lib==48)=2;
err=sum(abs(double(mat)-double(lib)));
if (err > 0)
disp(err)
@ -55,7 +55,6 @@ for i=1:length(TBs)
end
end
end
end
end
if (length(TBs) == 1)