LteChannelModel: Rename isError() to isReceptionSuccessful()

avarga · avarga · commit 6360a42a07a7 · 2026-01-23T20:59:24.000+01:00
Because it returns true for success, and false for reception error.

Ditto for isError_D2D()
diff --git a/src/simu5g/stack/phy/LtePhyEnb.cc b/src/simu5g/stack/phy/LtePhyEnb.cc
@@ -176,7 +176,7 @@ void LtePhyEnb::handleAirFrame(cMessage *msg)
         return; // If frame contains a control packet no further action is needed
 
     // DAS removed - single antenna only
-    bool result = channelModel->isError(frame, lteInfo);
+    bool result = channelModel->isReceptionSuccessful(frame, lteInfo);
     if (result)
         numAirFrameReceived_++;
     else
diff --git a/src/simu5g/stack/phy/LtePhyEnbD2D.cc b/src/simu5g/stack/phy/LtePhyEnbD2D.cc
@@ -195,7 +195,7 @@ void LtePhyEnbD2D::handleAirFrame(cMessage *msg)
         return; // If frame contains a control pkt no further action is needed
 
     // DAS removed - single antenna only
-    bool result = channelModel->isError(frame, lteInfo);
+    bool result = channelModel->isReceptionSuccessful(frame, lteInfo);
     if (result)
         numAirFrameReceived_++;
     else
diff --git a/src/simu5g/stack/phy/LtePhyUe.cc b/src/simu5g/stack/phy/LtePhyUe.cc
@@ -471,7 +471,7 @@ void LtePhyUe::handleAirFrame(cMessage *msg)
         recordCqi(cqi, DL);
     }
     // apply decider to received packet (DAS removed - single antenna only)
-    bool result = channelModel->isError(frame, lteInfo);
+    bool result = channelModel->isReceptionSuccessful(frame, lteInfo);
 
     // update statistics
     if (result)
diff --git a/src/simu5g/stack/phy/LtePhyUeD2D.cc b/src/simu5g/stack/phy/LtePhyUeD2D.cc
@@ -190,7 +190,7 @@ void LtePhyUeD2D::handleAirFrame(cMessage *msg)
     }
 
     // Apply decider to received packet.
-    bool result = channelModel->isError(frame, lteInfo);
+    bool result = channelModel->isReceptionSuccessful(frame, lteInfo);
 
     // Update statistics.
     if (result)
@@ -432,9 +432,9 @@ void LtePhyUeD2D::decodeAirFrame(LteAirFrame *frame, UserControlInfo *lteInfo)
     // Apply decider to received packet
     bool result;
     if (lteInfo->getDirection() == D2D_MULTI)
-        result = channelModel->isError_D2D(frame, lteInfo, bestRsrpVector_);
+        result = channelModel->isReceptionSuccessful_D2D(frame, lteInfo, bestRsrpVector_);
     else
-        result = channelModel->isError(frame, lteInfo);
+        result = channelModel->isReceptionSuccessful(frame, lteInfo);
 
     // Update statistics
     if (result)
diff --git a/src/simu5g/stack/phy/NrPhyUe.cc b/src/simu5g/stack/phy/NrPhyUe.cc
@@ -157,7 +157,7 @@ void NrPhyUe::handleAirFrame(cMessage *msg)
         }
     }
 
-    bool result = channelModel->isError(frame, lteInfo);
+    bool result = channelModel->isReceptionSuccessful(frame, lteInfo);
 
     // Update statistics
     if (result)
diff --git a/src/simu5g/stack/phy/channelmodel/LteChannelModel.cc b/src/simu5g/stack/phy/channelmodel/LteChannelModel.cc
@@ -72,12 +72,7 @@ std::vector<double> LteChannelModel::getSIR(LteAirFrame *frame, UserControlInfo
     return tmp;
 }
 
-bool LteChannelModel::isError(LteAirFrame *frame, UserControlInfo *lteInfo)
-{
-    return true;
-}
-
-bool LteChannelModel::isError_D2D(LteAirFrame *frame, UserControlInfo *lteInfo, const std::vector<double>& rsrpVector)
+bool LteChannelModel::isReceptionSuccessful_D2D(LteAirFrame *frame, UserControlInfo *lteInfo, const std::vector<double>& rsrpVector)
 {
     return true;
 }
diff --git a/src/simu5g/stack/phy/channelmodel/LteChannelModel.h b/src/simu5g/stack/phy/channelmodel/LteChannelModel.h
@@ -81,7 +81,7 @@ class LteChannelModel : public cSimpleModule
      * @param frame pointer to the packet
      * @param lteInfo pointer to the user control info
      */
-    virtual bool isError(LteAirFrame *frame, UserControlInfo *lteI) = 0;
+    virtual bool isReceptionSuccessful(LteAirFrame *frame, UserControlInfo *lteInfo) = 0;
 
     /*
      * Compute Attenuation caused by path loss and shadowing (optional)
@@ -134,7 +134,7 @@ class LteChannelModel : public cSimpleModule
      * @param lteInfo pointer to the user control info
      * @param rsrpVector the received signal for each RB, if it has already been computed
      */
-    virtual bool isError_D2D(LteAirFrame *frame, UserControlInfo *lteInfo, const std::vector<double>& rsrpVector) = 0;
+    virtual bool isReceptionSuccessful_D2D(LteAirFrame *frame, UserControlInfo *lteInfo, const std::vector<double>& rsrpVector) = 0;
     /*
      * Compute received useful signal for each band for user nodeId according to path loss, shadowing (optional), and multipath fading
      *
diff --git a/src/simu5g/stack/phy/channelmodel/LteDummyChannelModel.cc b/src/simu5g/stack/phy/channelmodel/LteDummyChannelModel.cc
@@ -92,7 +92,7 @@ std::vector<double> LteDummyChannelModel::getSIR(LteAirFrame *frame, UserControl
     return tmp;
 }
 
-bool LteDummyChannelModel::isError(LteAirFrame *frame, UserControlInfo *lteInfo)
+bool LteDummyChannelModel::isReceptionSuccessful(LteAirFrame *frame, UserControlInfo *lteInfo)
 {
     // Number of RTX
     unsigned char nTx = lteInfo->getTxNumber();
@@ -118,7 +118,7 @@ bool LteDummyChannelModel::isError(LteAirFrame *frame, UserControlInfo *lteInfo)
     return true;
 }
 
-bool LteDummyChannelModel::isError_D2D(LteAirFrame *frame, UserControlInfo *lteInfo, const std::vector<double>& rsrpVector)
+bool LteDummyChannelModel::isReceptionSuccessful_D2D(LteAirFrame *frame, UserControlInfo *lteInfo, const std::vector<double>& rsrpVector)
 {
     // Number of RTX
     unsigned char nTx = lteInfo->getTxNumber();
diff --git a/src/simu5g/stack/phy/channelmodel/LteDummyChannelModel.h b/src/simu5g/stack/phy/channelmodel/LteDummyChannelModel.h
@@ -34,7 +34,7 @@ class LteDummyChannelModel : public LteChannelModel
      * @param frame pointer to the packet
      * @param lteInfo pointer to the user control info
      */
-    bool isError(LteAirFrame *frame, UserControlInfo *lteInfo) override;
+    bool isReceptionSuccessful(LteAirFrame *frame, UserControlInfo *lteInfo) override;
     /*
      * Compute the path-loss attenuation according to the selected scenario
      */
@@ -92,7 +92,7 @@ class LteDummyChannelModel : public LteChannelModel
      * @param lteInfo pointer to the user control info
      * @param rsrpVector the received signal for each RB, if it has already been computed
      */
-    bool isError_D2D(LteAirFrame *frame, UserControlInfo *lteInfo, const std::vector<double>& rsrpVector) override;
+    bool isReceptionSuccessful_D2D(LteAirFrame *frame, UserControlInfo *lteInfo, const std::vector<double>& rsrpVector) override;
     /*
      * Compute received useful signal for D2D transmissions
      */
diff --git a/src/simu5g/stack/phy/channelmodel/LteRealisticChannelModel.cc b/src/simu5g/stack/phy/channelmodel/LteRealisticChannelModel.cc
@@ -1705,7 +1705,7 @@ double LteRealisticChannelModel::jakesFading(MacNodeId nodeId, double speed,
     return linearToDb(re_h * re_h + im_h * im_h);
 }
 
-bool LteRealisticChannelModel::isError(LteAirFrame *frame, UserControlInfo *lteInfo)
+bool LteRealisticChannelModel::isReceptionSuccessful(LteAirFrame *frame, UserControlInfo *lteInfo)
 {
     EV << "LteRealisticChannelModel::error" << endl;
 
@@ -1847,7 +1847,7 @@ bool LteRealisticChannelModel::isError(LteAirFrame *frame, UserControlInfo *lteI
     return true;
 }
 
-bool LteRealisticChannelModel::isError_D2D(LteAirFrame *frame, UserControlInfo *lteInfo, const std::vector<double>& rsrpVector)
+bool LteRealisticChannelModel::isReceptionSuccessful_D2D(LteAirFrame *frame, UserControlInfo *lteInfo, const std::vector<double>& rsrpVector)
 {
     EV << "LteRealisticChannelModel::error_D2D" << endl;
 
diff --git a/src/simu5g/stack/phy/channelmodel/LteRealisticChannelModel.h b/src/simu5g/stack/phy/channelmodel/LteRealisticChannelModel.h
@@ -295,7 +295,7 @@ class LteRealisticChannelModel : public LteChannelModel
      * @param lteinfo pointer to the user control info
      * @param rsrpVector the received signal for each RB, if it has already been computed
      */
-    bool isError_D2D(LteAirFrame *frame, UserControlInfo *lteI, const std::vector<double>& rsrpVector) override;
+    bool isReceptionSuccessful_D2D(LteAirFrame *frame, UserControlInfo *lteI, const std::vector<double>& rsrpVector) override;
 
     /*
      * Compute the error probability of the transmitted packet according to cqi used, txmode, and the received power
@@ -304,7 +304,7 @@ class LteRealisticChannelModel : public LteChannelModel
      * @param frame pointer to the packet
      * @param lteinfo pointer to the user control info
      */
-    bool isError(LteAirFrame *frame, UserControlInfo *lteI) override;
+    bool isReceptionSuccessful(LteAirFrame *frame, UserControlInfo *lteI) override;
 
     /*
      * Compute the path-loss attenuation according to the selected scenario

Original file line number	Diff line number	Diff line change
`@@ -471,7 +471,7 @@ void LtePhyUe::handleAirFrame(cMessage *msg)`
`471`	`471`	`recordCqi(cqi, DL);`
`472`	`472`	`}`
`473`	`473`	`// apply decider to received packet (DAS removed - single antenna only)`
`474`		`- bool result = channelModel->isError(frame, lteInfo);`
	`474`	`+ bool result = channelModel->isReceptionSuccessful(frame, lteInfo);`
`475`	`475`
`476`	`476`	`// update statistics`
`477`	`477`	`if (result)`
Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ void NrPhyUe::handleAirFrame(cMessage *msg)`
`157`	`157`	`}`
`158`	`158`	`}`
`159`	`159`
`160`		`- bool result = channelModel->isError(frame, lteInfo);`
	`160`	`+ bool result = channelModel->isReceptionSuccessful(frame, lteInfo);`
`161`	`161`
`162`	`162`	`// Update statistics`
`163`	`163`	`if (result)`
Original file line number	Diff line number	Diff line change
`@@ -72,12 +72,7 @@ std::vector<double> LteChannelModel::getSIR(LteAirFrame *frame, UserControlInfo`
`72`	`72`	`return tmp;`
`73`	`73`	`}`
`74`	`74`
`75`		`-bool LteChannelModel::isError(LteAirFrame frame, UserControlInfo lteInfo)`
`76`		`-{`
`77`		`- return true;`
`78`		`-}`
`79`		`-`
`80`		`-bool LteChannelModel::isError_D2D(LteAirFrame frame, UserControlInfo lteInfo, const std::vector<double>& rsrpVector)`
	`75`	`+bool LteChannelModel::isReceptionSuccessful_D2D(LteAirFrame frame, UserControlInfo lteInfo, const std::vector<double>& rsrpVector)`
`81`	`76`	`{`
`82`	`77`	`return true;`
`83`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ std::vector<double> LteDummyChannelModel::getSIR(LteAirFrame *frame, UserControl`
`92`	`92`	`return tmp;`
`93`	`93`	`}`
`94`	`94`
`95`		`-bool LteDummyChannelModel::isError(LteAirFrame frame, UserControlInfo lteInfo)`
	`95`	`+bool LteDummyChannelModel::isReceptionSuccessful(LteAirFrame frame, UserControlInfo lteInfo)`
`96`	`96`	`{`
`97`	`97`	`// Number of RTX`
`98`	`98`	`unsigned char nTx = lteInfo->getTxNumber();`
`@@ -118,7 +118,7 @@ bool LteDummyChannelModel::isError(LteAirFrame frame, UserControlInfo lteInfo)`
`118`	`118`	`return true;`
`119`	`119`	`}`
`120`	`120`
`121`		`-bool LteDummyChannelModel::isError_D2D(LteAirFrame frame, UserControlInfo lteInfo, const std::vector<double>& rsrpVector)`
	`121`	`+bool LteDummyChannelModel::isReceptionSuccessful_D2D(LteAirFrame frame, UserControlInfo lteInfo, const std::vector<double>& rsrpVector)`
`122`	`122`	`{`
`123`	`123`	`// Number of RTX`
`124`	`124`	`unsigned char nTx = lteInfo->getTxNumber();`
Original file line number	Diff line number	Diff line change
`@@ -1705,7 +1705,7 @@ double LteRealisticChannelModel::jakesFading(MacNodeId nodeId, double speed,`
`1705`	`1705`	`return linearToDb(re_h * re_h + im_h * im_h);`
`1706`	`1706`	`}`
`1707`	`1707`
`1708`		`-bool LteRealisticChannelModel::isError(LteAirFrame frame, UserControlInfo lteInfo)`
	`1708`	`+bool LteRealisticChannelModel::isReceptionSuccessful(LteAirFrame frame, UserControlInfo lteInfo)`
`1709`	`1709`	`{`
`1710`	`1710`	`EV << "LteRealisticChannelModel::error" << endl;`
`1711`	`1711`
`@@ -1847,7 +1847,7 @@ bool LteRealisticChannelModel::isError(LteAirFrame frame, UserControlInfo lteI`
`1847`	`1847`	`return true;`
`1848`	`1848`	`}`
`1849`	`1849`
`1850`		`-bool LteRealisticChannelModel::isError_D2D(LteAirFrame frame, UserControlInfo lteInfo, const std::vector<double>& rsrpVector)`
	`1850`	`+bool LteRealisticChannelModel::isReceptionSuccessful_D2D(LteAirFrame frame, UserControlInfo lteInfo, const std::vector<double>& rsrpVector)`
`1851`	`1851`	`{`
`1852`	`1852`	`EV << "LteRealisticChannelModel::error_D2D" << endl;`
`1853`	`1853`