maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed include paths in mexfiles and modified makefiles

Browse Source 
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4241 818b1a75-f10b-46b9-bf7c-635c3b92a50f
This commit is contained in:
thomas
2013-10-21 14:39:37 +00:00
parent 2d784ce851
commit 087dc65d9a
17 changed files with 59 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/USERSPACE_TOOLS/MATLAB/SIMULATION/LTE_PHY/TM4/InitSimparms.m
+5
View File
@@ -47,8 +47,13 @@ simparms.tseeds = set_taus_seed(1); % taus seeds
simparms.ptr_td = dlsch_decoding_init();
% Init codewords
% simparms.codeword(1) = InitCodeword(simparms,mcs(1));
% simparms.codeword(2) = InitCodeword(simparms,mcs(2));
simparms.codeword(1) = InitCodeword(simparms,mcs(1));
simparms.codeword(2) = InitCodeword(simparms,mcs(2));
% simparms.codeword(3) = InitCodeword(simparms,mcs(1));
% simparms.codeword(4) = InitCodeword(simparms,mcs(1));
end
openair1/USERSPACE_TOOLS/MATLAB/SIMULATION/LTE_PHY/TM4/tm4.m
+3 -4
View File
@@ -29,13 +29,12 @@ addpath('../../../PHY/TOOLS/mexfiles');
addpath('../../../SIMULATION/TOOLS/mexfiles');
% profile on;
%% System parameters
nt = 2; % number of transmit antennas
nr = 2; % number of receive antennas
N = 100; % number of frames (or subframes, codewords)
nSNR = 1; % number of SNR points
SNRdB = 20; % SNR per receive antenna in dB
SNRdB = 5; % SNR per receive antenna in dB
% nSNR = 13;
% SNRdB = linspace(8,20,nSNR);
MCS = [16 16]; % MCS for the 2 users
@@ -84,7 +83,7 @@ noise = zeros(simparms.NB_ANTENNAS_RX,simparms.nb_re);
%% XFORMS
if (XFORMS)
scrsz = get(0,'ScreenSize');
scrsz = get(0,'ScreenSize');mu_mimo
figure('Position',[1 scrsz(4)/2 scrsz(3)/2 scrsz(4)/2])
subplot(1,2,1);
xlim([1 simparms.codeword(1).G]);
@@ -199,7 +198,7 @@ for iSNR=1:length(simparms.snr)
Hmagb0(idxs:idxe,:)]...
= dlsch_channel_compensation_prec(y_fxp_t,H_fxp_t,pmi_ext,simparms,simparms.codeword(1),symbol-1);
% Interfering user
% Interfering stream
[ymf1(idxs:idxe,:)...
Heff1(idxs:idxe,:)...
Hmag1(idxs:idxe,:)...
openair1/USERSPACE_TOOLS/MATLAB/SIMULATION/LTE_PHY/TM5/tm5.m
+11 -10
View File
@@ -18,15 +18,16 @@ addpath('../../../PHY/TOOLS/mexfiles');
addpath('../../../SIMULATION/TOOLS/mexfiles');
% profile on;
tic
%% System parameters
nt = 2;
nr = 1;
nr = 2;
N = 1000; % number of frames (codewords)
nSNR = 1;
SNRdB = 30;
%SNRdB = [1:20];
SNRdB = 10;
% nSNR = 13;
% SNRdB = linspace(8,20,nSNR);
%SNRdB = linspace(1,20,nSNR);
MCS = [9 9]; % MCS for the 2 users, currently it is assumed that mcs(2)=mcs(1)
j = sqrt(-1);
amp = 1/32;
@@ -237,12 +238,12 @@ for iSNR=1:length(simparms.snr)
end
%% Post Processing
% total_frame_erros = sum(frame_errors,2);
% fer = total_frame_erros/N;
% figure; semilogy(SNRdB,fer); grid;
% total_frame_erros = sum(simparms.frame_errors,2);
% fer = total_frame_erros/N;
% figure; semilogy(SNRdB,fer); grid;
%
% disp(fer);
%
% disp(fer);
% profile viewer
toc
openair1/USERSPACE_TOOLS/MATLAB/SIMULATION/TOOLS/mexfiles/set_taus_seed.c
+1 -1
View File
@@ -1,4 +1,4 @@
#include "defs.h"
#include "../../../defs.h"
/*==============================================================================
* set_taus_seed.c
openair1/USERSPACE_TOOLS/MATLAB/SIMULATION/TOOLS/mexfiles/taus.c
+1 -2
View File
@@ -1,4 +1,4 @@
#include "defs.h"
#include "../../../defs.h"
/*==============================================================================
* taus.c
@@ -62,7 +62,6 @@ void mexFunction( int nlhs, mxArray *plhs[],
for(i=0;i<len;i++)
out[i] = (unsigned char)(mtaus()&0xff);
tseeds_out[0] = s0;
tseeds_out[1] = s1;
tseeds_out[2] = s2;