Merge branch 'master' into ul_improve

master
ismagom 9 years ago
commit 4cd64b6de8

@ -2,53 +2,52 @@ clear
ueConfig=struct('NCellID',1,'CyclicPrefixUL','Normal','NTxAnts',1); ueConfig=struct('NCellID',1,'CyclicPrefixUL','Normal','NTxAnts',1);
puschConfig=struct('NLayers',1,'OrthCover','Off','PRBSet',0,'Shortened',0); puschConfig=struct('NLayers',1,'OrthCover','Off','PRBSet',0,'Shortened',0);
addpath('../../debug/srslte/lib/phch/test') addpath('../../build/srslte/lib/phch/test')
TBs=336;
cqilen=0;
mods={'16QAM'};
rvs=0;
betas=5;
TBs=336;
cqilen=0;
mods={'16QAM'};
rvs=0;
betas=5;
for i=1:length(TBs) for i=1:length(TBs)
for m=1:length(mods) for m=1:length(mods)
for r=1:length(rvs) for r=1:length(rvs)
for bcqi=1:length(betas) for bri=1:length(betas)
for bri=1:length(betas) for back=1:length(betas)
for back=1:length(betas) for c=1:length(cqilen)
for c=1:length(cqilen)
trblkin=randi(2,TBs(i),1)-1; trblkin=randi(2,TBs(i),1)-1;
puschConfig.Modulation = mods{m}; puschConfig.Modulation = mods{m};
puschConfig.RV = rvs(r); puschConfig.RV = rvs(r);
puschConfig.BetaCQI = 5; puschConfig.BetaCQI = 5;
puschConfig.BetaRI = betas(bri); puschConfig.BetaRI = betas(bri);
puschConfig.BetaACK = betas(back); puschConfig.BetaACK = betas(back);
if (betas(bri)>0) if (betas(bri)>0)
ri_bit=randi(2,1,1)-1; ri_bit=randi(2,1,1)-1;
else else
ri_bit=[]; ri_bit=[];
end end
if (betas(back)>0) if (betas(back)>0)
ack_bit=randi(2,1,1)-1; ack_bit=randi(2,1,1)-1;
else else
ack_bit=[]; ack_bit=[];
end end
if (cqilen(c)>0 || TBs(i)>0) if (cqilen(c)>0 || TBs(i)>0)
[mat, info]=lteULSCH(ueConfig,puschConfig,trblkin,ones(1,cqilen(c)),ri_bit,ack_bit,[]); [mat, info]=lteULSCH(ueConfig,puschConfig,trblkin,ones(1,cqilen(c)),ri_bit,ack_bit,[]);
mat(mat==-2)=2; mat(mat==-2)=3;
mat(mat==-1)=3; mat(mat==-1)=2;
[lib]=srslte_ulsch_encode(ueConfig,puschConfig,trblkin,ones(1,cqilen(c)),ri_bit,ack_bit); [lib]=srslte_ulsch_encode(ueConfig,puschConfig,trblkin,ones(1,cqilen(c)),ri_bit,ack_bit);
err=sum(abs(double(mat)-double(lib))); lib(lib==192)=3;
if (err > 0) lib(lib==48)=2;
disp(err) err=sum(abs(double(mat)-double(lib)));
plot(abs(double(mat)-double(lib))) if (err > 0)
error('Error!'); disp(err)
end plot(abs(double(mat)-double(lib)))
error('Error!');
end end
end end
end end

Loading…
Cancel
Save