Merge branch 'interference-helper-windowend'

Alexander Krotov · Alexander Krotov · commit 9b55e42d7925 · 2019-10-17T17:38:05.000+03:00
MR !118
diff --git a/src/wifi/model/interference-helper.cc b/src/wifi/model/interference-helper.cc
@@ -306,7 +306,7 @@ InterferenceHelper::CalculatePayloadPer (Ptr<const Event> event, NiChanges *ni,
           psr *= CalculateChunkSuccessRate (CalculateSnr (powerW,
                                                           noiseInterferenceW,
                                                           txVector.GetChannelWidth ()),
-                                            current - previous,
+                                            Min (windowEnd, current) - previous,
                                             payloadMode, txVector);
           NS_LOG_DEBUG ("Both previous and current point to the windowed payload: mode=" << payloadMode << ", psr=" << psr);
         }
@@ -316,7 +316,7 @@ InterferenceHelper::CalculatePayloadPer (Ptr<const Event> event, NiChanges *ni,
           psr *= CalculateChunkSuccessRate (CalculateSnr (powerW,
                                                           noiseInterferenceW,
                                                           txVector.GetChannelWidth ()),
-                                            current - windowStart,
+                                            Min (windowEnd, current) - windowStart,
                                             payloadMode, txVector);
           NS_LOG_DEBUG ("previous is before windowed payload and current is in the windowed payload: mode=" << payloadMode << ", psr=" << psr);
         }
diff --git a/src/wifi/test/wifi-phy-reception-test.cc b/src/wifi/test/wifi-phy-reception-test.cc
@@ -1635,7 +1635,7 @@ void
 TestAmpduReception::DoRun (void)
 {
   RngSeedManager::SetSeed (1);
-  RngSeedManager::SetRun (1);
+  RngSeedManager::SetRun (2);
   int64_t streamNumber = 1;
   double rxPowerDbm = -30;
   m_phy->AssignStreams (streamNumber);

Original file line number	Diff line number	Diff line change
`@@ -1635,7 +1635,7 @@ void`
`1635`	`1635`	`TestAmpduReception::DoRun (void)`
`1636`	`1636`	`{`
`1637`	`1637`	`RngSeedManager::SetSeed (1);`
`1638`		`- RngSeedManager::SetRun (1);`
	`1638`	`+ RngSeedManager::SetRun (2);`
`1639`	`1639`	`int64_t streamNumber = 1;`
`1640`	`1640`	`double rxPowerDbm = -30;`
`1641`	`1641`	`m_phy->AssignStreams (streamNumber);`