git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4135 818b1a75-f10b-46b9-bf7c-635c3b92a50f

openair1/SIMULATION/LTE_FEMTO/femtoUtils.c

@@ -510,7 +510,7 @@ void _makeOutputDir(options_t *opts)
   sprintf(auxFile,"OutputBlerRound_%d.m",opts->testNumber);
     
   opts->outputBler =fopen(auxFile,"w");
-  fprintf( opts->outputBler,"SNR; rate1; MCS; TBS; rate; err0; trials0; err1; trials1; err2; trials2; err3; trials3; dci_err; nprb1; nprb2\n");
+  fprintf( opts->outputBler,"SNR; rate1;rate2; MCS; TBS; rate; err0; trials0; err1; trials1; err2; trials2; err3; trials3; dci_err; nprb1; nprb2\n");
     
   sprintf(auxFile,"OutputBER_%d.m",opts->testNumber);
   opts->outputBer =fopen(auxFile,"w");

openair1/SIMULATION/LTE_FEMTO/femtoUtils.h

@@ -23,6 +23,7 @@ typedef struct {
     double snr_max;
     double snr_step;
     int nframes;
+    int interf_count[8];
     int fixed_channel_flag;
     int fixed_data_set;
     int extended_prefix_flag;
@@ -155,17 +156,17 @@ u32  _allocRBs(options_t *opts, int ind);
 void _freeMemory(data_t data,options_t opts);
 void _makeSimulation(data_t data,options_t opts,DCI_ALLOC_t *dci_alloc,DCI_ALLOC_t *dci_alloc_rx,u32 *NB_RB2,LTE_DL_FRAME_PARMS  *frame_parms,u8 num_pdcch_symbols);
 void _printResults(u32 *errs,u32 *round_trials,u32 dci_errors,double rate);
-void _printFileResults(double SNR, double rate1, double rate,u32  *errs,u32  *round_trials,u32 dci_errors,options_t opts,double BER);
+void _printFileResults(double SNR, double rate1,double rate2	, double rate,u32  *errs,u32  *round_trials,u32 dci_errors,options_t opts,double BER);
 void _initErrsRoundsTrials(u32 **errs,u32 **trials,int allocFlag,options_t opts);
 void _fillData(options_t opts,data_t data,int numSubFrames);
-void _applyNoise(options_t opts,data_t data,double sigma2,double iqim,int numSubFrames);
+void _applyNoise(options_t *opts,data_t data,double sigma2,double iqim,int numSubFrames);
 u8 _generate_dci_top(int num_ue_spec_dci,int num_common_dci,DCI_ALLOC_t *dci_alloc,options_t opts,u8 num_pdcch_symbols);
 void do_OFDM_mod(mod_sym_t **txdataF, s32 **txdata, u16 next_slot, LTE_DL_FRAME_PARMS *frame_parms);
 //void _apply_Multipath_Noise_Interference(options_t opts,data_t data,data_t data_fixed,double sigma2_dB,double sigma2,int numSubFrames);
-void _apply_Multipath_Noise_Interference(options_t opts,data_t data,double sigma2_dB,double sigma2,int numSubFrames);
+void _apply_Multipath_Noise_Interference(options_t *opts,data_t data,double sigma2_dB,double sigma2,int numSubFrames,int round);
 void _writeOuputOneFrame(options_t opts,u32 coded_bits_per_codeword,short *uncoded_ber_bit,u32 tbs);
 void _dumpTransportBlockSegments(u32 C,u32 Cminus,u32 Kminus,u32 Kplus,  u8 ** c_UE,u8 ** c_eNB);
-void _applyInterference(options_t opts,data_t data,double sigma2,double iqim,int numSubFrames);
+void _applyInterference(options_t *opts,data_t data,double sigma2,double iqim,int numSubFrames,int round);
 double compute_ber_soft(u8* ref, s16* rec, int n);
 void _fillPerfectChannelDescription(options_t opts,u8 l);