merge to 68

openair2/LAYER2/MAC/flexran_agent_scheduler_dlsch_ue.c

@@ -88,16 +88,16 @@ typedef enum {
 
 
 // number of active slices for  past and current time
-int n_active_slices = 2;
-int n_active_slices_current = 2;
+int n_active_slices = 1;
+int n_active_slices_current = 1;
 
 // ue to slice mapping
 int slicing_strategy = UEID_TO_SLICEID;
 int slicing_strategy_current = UEID_TO_SLICEID;
 
 // RB share for each slice for past and current time
-float slice_percentage[MAX_NUM_SLICES] = {0.5, 0.5, 0.0, 0.0};
-float slice_percentage_current[MAX_NUM_SLICES] = {0.5, 0.5, 0.0, 0.0};
+float slice_percentage[MAX_NUM_SLICES] = {1.0, 1.0, 0.0, 0.0};
+float slice_percentage_current[MAX_NUM_SLICES] = {1.0, 1.0, 0.0, 0.0};
 float total_slice_percentage = 0;
 
 // MAX MCS for each slice for past and current time

openair2/LAYER2/MAC/flexran_agent_scheduler_ulsch_ue.c

@@ -58,12 +58,12 @@
 #include "T.h"
 
 /* number of active slices for  past and current time*/
-int n_active_slices_uplink = 2;
-int n_active_slices_uplink_current = 2;
+int n_active_slices_uplink = 1;
+int n_active_slices_uplink_current = 1;
 
 /* RB share for each slice for past and current time*/
-float slice_percentage_uplink[MAX_NUM_SLICES] = {0.5, 0.5, 0.0, 0.0};
-float slice_percentage_current_uplink[MAX_NUM_SLICES] = {0.5, 0.5, 0.0, 0.0};
+float slice_percentage_uplink[MAX_NUM_SLICES] = {1.0, 1.0, 0.0, 0.0};
+float slice_percentage_current_uplink[MAX_NUM_SLICES] = {1.0, 1.0, 0.0, 0.0};
 float total_slice_percentage_uplink = 0;
 
 // MAX MCS for each slice for past and current time
@@ -477,11 +477,11 @@ flexran_schedule_ue_ul_spec_default(mid_t   mod_id,
     //LOG_N(MAC,"[eNB %d]frame %d subframe %d slice %d: calling the scheduler\n", mod_id, frame, subframe,i);
     
 
-    
+    slice_sched_ul[i](mod_id, frame, cooperation_flag, subframe, sched_subframe,ul_info);
 
   }
 
-    slice_sched_ul[0](mod_id, frame, cooperation_flag, subframe, sched_subframe,ul_info);
+    
   
 }