View | Details | Raw Unified | Return to bug 1793
Collapse All | Expand All

(-)a/src/lte/model/lte-common.cc (-2 lines)
 Lines 269-275    Link Here 
269
    }
269
    }
270
270
271
  uint8_t ieValue = lround (hysteresisDb * 2.0);
271
  uint8_t ieValue = lround (hysteresisDb * 2.0);
272
  NS_ASSERT (ieValue >= 0);
273
  NS_ASSERT (ieValue <= 30);
272
  NS_ASSERT (ieValue <= 30);
274
  return ieValue;
273
  return ieValue;
275
}
274
}
 Lines 301-307    Link Here 
301
    }
300
    }
302
301
303
  uint8_t ieValue = lround (a3OffsetDb * 2.0);
302
  uint8_t ieValue = lround (a3OffsetDb * 2.0);
304
  NS_ASSERT (ieValue >= -30);
305
  NS_ASSERT (ieValue <= 30);
303
  NS_ASSERT (ieValue <= 30);
306
  return ieValue;
304
  return ieValue;
307
}
305
}
(-)a/src/lte/model/lte-ue-rrc.cc (-1 / +1 lines)
 Lines 1487-1493    Link Here 
1487
          storedMeasIt->second.rsrp = (1 - m_varMeasConfig.aRsrp) * storedMeasIt->second.rsrp
1487
          storedMeasIt->second.rsrp = (1 - m_varMeasConfig.aRsrp) * storedMeasIt->second.rsrp
1488
            + m_varMeasConfig.aRsrp * rsrp;
1488
            + m_varMeasConfig.aRsrp * rsrp;
1489
1489
1490
          if (isnan (storedMeasIt->second.rsrq))
1490
          if (std::isnan (storedMeasIt->second.rsrq))
1491
            {
1491
            {
1492
              // the previous RSRQ measurements provided UE PHY are invalid
1492
              // the previous RSRQ measurements provided UE PHY are invalid
1493
              storedMeasIt->second.rsrq = rsrq; // replace it with unfiltered value
1493
              storedMeasIt->second.rsrq = rsrq; // replace it with unfiltered value
(-)a/src/lte/test/test-lte-handover-target.cc (-2 / +2 lines)
 Lines 156-167    Link Here 
156
156
157
  uint16_t nEnb = gridSizeX * gridSizeY;
157
  uint16_t nEnb = gridSizeX * gridSizeY;
158
158
159
  if ((sourceCellId < 0) && (sourceCellId > nEnb))
159
  if (sourceCellId > nEnb)
160
    {
160
    {
161
      NS_FATAL_ERROR ("Invalid source cell ID " << sourceCellId);
161
      NS_FATAL_ERROR ("Invalid source cell ID " << sourceCellId);
162
    }
162
    }
163
163
164
  if ((targetCellId < 0) && (targetCellId > nEnb))
164
  if (targetCellId > nEnb)
165
    {
165
    {
166
      NS_FATAL_ERROR ("Invalid target cell ID " << targetCellId);
166
      NS_FATAL_ERROR ("Invalid target cell ID " << targetCellId);
167
    }
167
    }

Return to bug 1793