wifi: Fix noise interference calculation

sderonne · sderonne · commit 1e50fef75b04 · 2018-12-08T19:31:47.000+01:00
diff --git a/src/wifi/model/interference-helper.cc b/src/wifi/model/interference-helper.cc
@@ -245,7 +245,7 @@ InterferenceHelper::CalculateNoiseInterferenceW (Ptr<Event> event, NiChanges *ni
         {
           continue;
         }
-      if (it->first > Simulator::Now ())
+      if (it->first >= Simulator::Now ())
         {
           break;
         }
@@ -259,6 +259,7 @@ InterferenceHelper::CalculateNoiseInterferenceW (Ptr<Event> event, NiChanges *ni
       ni->insert (*it);
     }
   ni->emplace (event->GetEndTime (), NiChange (0, event));
+  NS_ASSERT_MSG (noiseInterferenceW >= 0, "CalculateNoiseInterferenceW returns negative value " << noiseInterferenceW);
   return noiseInterferenceW;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -245,7 +245,7 @@ InterferenceHelper::CalculateNoiseInterferenceW (Ptr<Event> event, NiChanges *ni`
`245`	`245`	`{`
`246`	`246`	`continue;`
`247`	`247`	`}`
`248`		`- if (it->first > Simulator::Now ())`
	`248`	`+ if (it->first >= Simulator::Now ())`
`249`	`249`	`{`
`250`	`250`	`break;`
`251`	`251`	`}`
`@@ -259,6 +259,7 @@ InterferenceHelper::CalculateNoiseInterferenceW (Ptr<Event> event, NiChanges *ni`
`259`	`259`	`ni->insert (*it);`
`260`	`260`	`}`
`261`	`261`	`ni->emplace (event->GetEndTime (), NiChange (0, event));`
	`262`	`+ NS_ASSERT_MSG (noiseInterferenceW >= 0, "CalculateNoiseInterferenceW returns negative value " << noiseInterferenceW);`
`262`	`263`	`return noiseInterferenceW;`
`263`	`264`	`}`
`264`	`265`