lte: Move common constants from scheduler classes to parent class

src/lte/model/cqa-ff-mac-scheduler.h

@@ -35,13 +35,6 @@
 #include <set>
 #include <vector>
 
-// value for SINR outside the range defined by FF-API, used to indicate that there
-// is no CQI for this element
-
-#define NO_SINR -5000
-#define HARQ_PROC_NUM 8
-#define HARQ_DL_TIMEOUT 11
-
 namespace ns3
 {
 

src/lte/model/fdbet-ff-mac-scheduler.h

@@ -32,13 +32,6 @@
 #include <map>
 #include <vector>
 
-// value for SINR outside the range defined by FF-API, used to indicate that there
-// is no CQI for this element
-#define NO_SINR -5000
-
-#define HARQ_PROC_NUM 8
-#define HARQ_DL_TIMEOUT 11
-
 namespace ns3
 {
 

src/lte/model/fdmt-ff-mac-scheduler.h

@@ -33,17 +33,6 @@
 #include <set>
 #include <vector>
 
-/**
- * value for SINR outside the range defined by FF-API, used to indicate that there
- * is no CQI for this element
- */
-#define NO_SINR -5000
-
-/// number of HARQ processes
-#define HARQ_PROC_NUM 8
-/// HARQ DL timeout
-#define HARQ_DL_TIMEOUT 11
-
 namespace ns3
 {
 

src/lte/model/fdtbfq-ff-mac-scheduler.h

@@ -32,17 +32,6 @@
 #include <map>
 #include <vector>
 
-/**
- * value for SINR outside the range defined by FF-API, used to indicate that there
- * is no CQI for this element
- */
-#define NO_SINR -5000
-
-/// HARQ number of processes
-#define HARQ_PROC_NUM 8
-/// HARQ DL timeout
-#define HARQ_DL_TIMEOUT 11
-
 namespace ns3
 {
 

src/lte/model/ff-mac-scheduler.h

@@ -61,6 +61,16 @@ using UlHarqProcessesDciBuffer_t = std::vector<UlDciListElement_s>;
 /// UL HARQ process status vector
 using UlHarqProcessesStatus_t = std::vector<uint8_t>;
 
+/// Value for SINR outside the range defined by FF-API, used to indicate that there is
+/// no CQI for this element
+constexpr double NO_SINR = -5000;
+
+/// Number of HARQ processes
+constexpr uint32_t HARQ_PROC_NUM = 8;
+
+/// HARQ DL timeout
+constexpr uint32_t HARQ_DL_TIMEOUT = 11;
+
 /**
  * \ingroup ff-api
  *

src/lte/model/pf-ff-mac-scheduler.h

@@ -31,13 +31,6 @@
 #include <map>
 #include <vector>
 
-// value for SINR outside the range defined by FF-API, used to indicate that there
-// is no CQI for this element
-#define NO_SINR -5000
-
-#define HARQ_PROC_NUM 8
-#define HARQ_DL_TIMEOUT 11
-
 namespace ns3
 {
 

src/lte/model/pss-ff-mac-scheduler.h

@@ -32,13 +32,6 @@
 #include <map>
 #include <vector>
 
-// value for SINR outside the range defined by FF-API, used to indicate that there
-// is no CQI for this element
-#define NO_SINR -5000
-
-#define HARQ_PROC_NUM 8
-#define HARQ_DL_TIMEOUT 11
-
 namespace ns3
 {
 

src/lte/model/rr-ff-mac-scheduler.h

@@ -31,9 +31,6 @@
 #include <map>
 #include <vector>
 
-#define HARQ_PROC_NUM 8
-#define HARQ_DL_TIMEOUT 11
-
 namespace ns3
 {
 

src/lte/model/tdbet-ff-mac-scheduler.h

@@ -32,13 +32,6 @@
 #include <map>
 #include <vector>
 
-// value for SINR outside the range defined by FF-API, used to indicate that there
-// is no CQI for this element
-#define NO_SINR -5000
-
-#define HARQ_PROC_NUM 8
-#define HARQ_DL_TIMEOUT 11
-
 namespace ns3
 {
 

src/lte/model/tdmt-ff-mac-scheduler.h

@@ -33,13 +33,6 @@
 #include <set>
 #include <vector>
 
-// value for SINR outside the range defined by FF-API, used to indicate that there
-// is no CQI for this element
-#define NO_SINR -5000
-
-#define HARQ_PROC_NUM 8
-#define HARQ_DL_TIMEOUT 11
-
 namespace ns3
 {
 

src/lte/model/tdtbfq-ff-mac-scheduler.h

@@ -32,13 +32,6 @@
 #include <map>
 #include <vector>
 
-// value for SINR outside the range defined by FF-API, used to indicate that there
-// is no CQI for this element
-#define NO_SINR -5000
-
-#define HARQ_PROC_NUM 8
-#define HARQ_DL_TIMEOUT 11
-
 namespace ns3
 {
 

src/lte/model/tta-ff-mac-scheduler.h

@@ -33,13 +33,6 @@
 #include <set>
 #include <vector>
 
-// value for SINR outside the range defined by FF-API, used to indicate that there
-// is no CQI for this element
-#define NO_SINR -5000
-
-#define HARQ_PROC_NUM 8
-#define HARQ_DL_TIMEOUT 11
-
 namespace ns3
 {