renamed interference test

src/lte/test/lte-test-interference.cc

@@ -33,17 +33,17 @@
 #include "ns3/lte-ue-phy.h"
 #include "ns3/lte-ue-net-device.h"
 
-#include "ns3/lte-test-link-adaptation-with-interference.h"
+#include "ns3/lte-test-interference.h"
 
 #include "lte-test-sinr-chunk-processor.h"
 
-NS_LOG_COMPONENT_DEFINE ("LteLinkAdaptationWithInterferenceTest");
+NS_LOG_COMPONENT_DEFINE ("LteInterferenceTest");
 
 using namespace ns3;
 
 
 void
-LteTestDlSchedulingCallback (LteLinkAdaptationWithInterferenceTestCase *testcase, std::string path,
+LteTestDlSchedulingCallback (LteInterferenceTestCase *testcase, std::string path,
                              uint32_t frameNo, uint32_t subframeNo, uint16_t rnti,
                              uint8_t mcsTb1, uint16_t sizeTb1, uint8_t mcsTb2, uint16_t sizeTb2)
 {
@@ -51,7 +51,7 @@ LteTestDlSchedulingCallback (LteLinkAdaptationWithInterferenceTestCase *testcase
 }
 
 void
-LteTestUlSchedulingCallback (LteLinkAdaptationWithInterferenceTestCase *testcase, std::string path,
+LteTestUlSchedulingCallback (LteInterferenceTestCase *testcase, std::string path,
                             uint32_t frameNo, uint32_t subframeNo, uint16_t rnti,
                             uint8_t mcs, uint16_t sizeTb)
 {
@@ -63,22 +63,22 @@ LteTestUlSchedulingCallback (LteLinkAdaptationWithInterferenceTestCase *testcase
  * TestSuite
  */
 
-LteLinkAdaptationWithInterferenceTestSuite::LteLinkAdaptationWithInterferenceTestSuite ()
+LteInterferenceTestSuite::LteInterferenceTestSuite ()
   : TestSuite ("lte-interference", SYSTEM)
 {
-  NS_LOG_INFO ("Creating LteLinkAdaptionWithInterferenceTestSuite");
+  NS_LOG_INFO ("Creating LteInterferenceTestSuite");
 
-  AddTestCase (new LteLinkAdaptationWithInterferenceTestCase ("d1=3000, d2=6000",  3000.000000, 6000.000000,  3.844681, 1.714583,  0.761558, 0.389662, 4, 2));    
+  AddTestCase (new LteInterferenceTestCase ("d1=3000, d2=6000",  3000.000000, 6000.000000,  3.844681, 1.714583,  0.761558, 0.389662, 4, 2));    
 }
 
-static LteLinkAdaptationWithInterferenceTestSuite lteLinkAdaptationWithInterferenceTestSuite;
+static LteInterferenceTestSuite lteLinkAdaptationWithInterferenceTestSuite;
 
 
 /**
  * TestCase
  */
 
-LteLinkAdaptationWithInterferenceTestCase::LteLinkAdaptationWithInterferenceTestCase (std::string name, double d1, double d2, double dlSinr, double ulSinr, double dlSe, double ulSe, uint16_t dlMcs, uint16_t ulMcs)
+LteInterferenceTestCase::LteInterferenceTestCase (std::string name, double d1, double d2, double dlSinr, double ulSinr, double dlSe, double ulSe, uint16_t dlMcs, uint16_t ulMcs)
   : TestCase (name),
     m_d1 (d1),
     m_d2 (d2),
@@ -91,12 +91,12 @@ LteLinkAdaptationWithInterferenceTestCase::LteLinkAdaptationWithInterferenceTest
 {
 }
 
-LteLinkAdaptationWithInterferenceTestCase::~LteLinkAdaptationWithInterferenceTestCase ()
+LteInterferenceTestCase::~LteInterferenceTestCase ()
 {
 }
 
 void
-LteLinkAdaptationWithInterferenceTestCase::DoRun (void)
+LteInterferenceTestCase::DoRun (void)
 {
   /**
     * Simulation Topology
@@ -180,7 +180,7 @@ LteLinkAdaptationWithInterferenceTestCase::DoRun (void)
 
 
 void
-LteLinkAdaptationWithInterferenceTestCase::DlScheduling (uint32_t frameNo, uint32_t subframeNo, uint16_t rnti,
+LteInterferenceTestCase::DlScheduling (uint32_t frameNo, uint32_t subframeNo, uint16_t rnti,
                                          uint8_t mcsTb1, uint16_t sizeTb1, uint8_t mcsTb2, uint16_t sizeTb2)
 {
   /**
@@ -195,7 +195,7 @@ LteLinkAdaptationWithInterferenceTestCase::DlScheduling (uint32_t frameNo, uint3
 }
 
 void
-LteLinkAdaptationWithInterferenceTestCase::UlScheduling (uint32_t frameNo, uint32_t subframeNo, uint16_t rnti,
+LteInterferenceTestCase::UlScheduling (uint32_t frameNo, uint32_t subframeNo, uint16_t rnti,
                                          uint8_t mcs, uint16_t sizeTb)
 {
   /**

src/lte/test/lte-test-interference.h

@@ -19,8 +19,8 @@
  *         Nicola Baldo <nbaldo@cttc.es>
  */
 
-#ifndef LTE_TEST_LINK_ADAPTATION_WITH_INTERFERENCE_H
-#define LTE_TEST_LINK_ADAPTATION_WITH_INTERFERENCE_H
+#ifndef LTE_TEST_INTERFERENCE_H
+#define LTE_TEST_INTERFERENCE_H
 
 #include "ns3/test.h"
 
@@ -31,18 +31,18 @@ using namespace ns3;
 /**
  * Test that SINR calculation and MCS selection works fine in a multi-cell interference scenario.
  */
-class LteLinkAdaptationWithInterferenceTestSuite : public TestSuite
+class LteInterferenceTestSuite : public TestSuite
 {
 public:
-  LteLinkAdaptationWithInterferenceTestSuite ();
+  LteInterferenceTestSuite ();
 };
 
 
-class LteLinkAdaptationWithInterferenceTestCase : public TestCase
+class LteInterferenceTestCase : public TestCase
 {
 public:
-  LteLinkAdaptationWithInterferenceTestCase (std::string name, double d1, double d2, double dlSinr, double ulSinr, double dlSe, double ulSe, uint16_t dlMcs, uint16_t ulMcs);
-  virtual ~LteLinkAdaptationWithInterferenceTestCase ();
+  LteInterferenceTestCase (std::string name, double d1, double d2, double dlSinr, double ulSinr, double dlSe, double ulSe, uint16_t dlMcs, uint16_t ulMcs);
+  virtual ~LteInterferenceTestCase ();
   
   void DlScheduling (uint32_t frameNo, uint32_t subframeNo, uint16_t rnti,
                        uint8_t mcsTb1, uint16_t sizeTb1, uint8_t mcsTb2, uint16_t sizeTb2);
@@ -65,4 +65,4 @@ private:
 };
 
 
-#endif /* LTE_TEST_LINK_ADAPTATION_H */
+#endif /* LTE_TEST_INTERFERENCE_H */

src/lte/wscript

@@ -53,7 +53,7 @@ def build(bld):
         'test/lte-test-downlink-sinr.cc',
         'test/lte-test-uplink-sinr.cc',
         'test/lte-test-link-adaptation.cc',
-        'test/lte-test-link-adaptation-with-interference.cc',
+        'test/lte-test-interference.cc',
         'test/lte-test-sinr-chunk-processor.cc',
         'test/lte-test-ue-phy.cc',
         'test/lte-test-rr-ff-mac-scheduler.cc',
@@ -111,7 +111,7 @@ def build(bld):
         'test/lte-test-downlink-sinr.h',
         'test/lte-test-uplink-sinr.h',
         'test/lte-test-link-adaptation.h',
-        'test/lte-test-link-adaptation-with-interference.h',
+        'test/lte-test-interference.h',
         'test/lte-test-sinr-chunk-processor.h',
         'test/lte-test-ue-phy.h',
         'test/lte-test-rr-ff-mac-scheduler.h',