OLD | NEW |
1 /* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ | 1 /* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ |
2 /* | 2 /* |
3 * Copyright (c) 2014 Piotr Gawlowicz | 3 * Copyright (c) 2014 Piotr Gawlowicz |
4 * | 4 * |
5 * This program is free software; you can redistribute it and/or modify | 5 * This program is free software; you can redistribute it and/or modify |
6 * it under the terms of the GNU General Public License version 2 as | 6 * it under the terms of the GNU General Public License version 2 as |
7 * published by the Free Software Foundation; | 7 * published by the Free Software Foundation; |
8 * | 8 * |
9 * This program is distributed in the hope that it will be useful, | 9 * This program is distributed in the hope that it will be useful, |
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
(...skipping 504 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
515 | 515 |
516 return minContinuousUlBandwidth; | 516 return minContinuousUlBandwidth; |
517 } | 517 } |
518 | 518 |
519 void | 519 void |
520 LteFrStrictAlgorithm::DoReportUeMeas (uint16_t rnti, | 520 LteFrStrictAlgorithm::DoReportUeMeas (uint16_t rnti, |
521 LteRrcSap::MeasResults measResults) | 521 LteRrcSap::MeasResults measResults) |
522 { | 522 { |
523 NS_LOG_FUNCTION (this << rnti << (uint16_t) measResults.measId); | 523 NS_LOG_FUNCTION (this << rnti << (uint16_t) measResults.measId); |
524 NS_LOG_INFO ("RNTI :" << rnti << " MeasId: " << (uint16_t) measResults.measId | 524 NS_LOG_INFO ("RNTI :" << rnti << " MeasId: " << (uint16_t) measResults.measId |
525 << " RSRP: " << (uint16_t)measResults.rsrpResult | 525 << " RSRP: " << (uint16_t)measResults.measResultPCell.rs
rpResult |
526 << " RSRQ: " << (uint16_t)measResults.rsrqResult); | 526 << " RSRQ: " << (uint16_t)measResults.measResultPCell.rs
rqResult); |
527 | 527 |
528 if (measResults.measId != m_measId) | 528 if (measResults.measId != m_measId) |
529 { | 529 { |
530 NS_LOG_WARN ("Ignoring measId " << (uint16_t) measResults.measId); | 530 NS_LOG_WARN ("Ignoring measId " << (uint16_t) measResults.measId); |
531 } | 531 } |
532 else | 532 else |
533 { | 533 { |
534 std::map< uint16_t, uint8_t >::iterator it = m_ues.find (rnti); | 534 std::map< uint16_t, uint8_t >::iterator it = m_ues.find (rnti); |
535 if (it == m_ues.end ()) | 535 if (it == m_ues.end ()) |
536 { | 536 { |
537 m_ues.insert (std::pair< uint16_t, uint8_t > (rnti, AreaUnset)); | 537 m_ues.insert (std::pair< uint16_t, uint8_t > (rnti, AreaUnset)); |
538 } | 538 } |
539 it = m_ues.find (rnti); | 539 it = m_ues.find (rnti); |
540 | 540 |
541 if (measResults.rsrqResult < m_edgeSubBandThreshold) | 541 if (measResults.measResultPCell.rsrqResult < m_edgeSubBandThreshold) |
542 { | 542 { |
543 if (it->second != CellEdge ) | 543 if (it->second != CellEdge ) |
544 { | 544 { |
545 NS_LOG_INFO ("UE RNTI: " << rnti << " will be served in Edge sub-b
and"); | 545 NS_LOG_INFO ("UE RNTI: " << rnti << " will be served in Edge sub-b
and"); |
546 it->second = CellEdge; | 546 it->second = CellEdge; |
547 | 547 |
548 LteRrcSap::PdschConfigDedicated pdschConfigDedicated; | 548 LteRrcSap::PdschConfigDedicated pdschConfigDedicated; |
549 pdschConfigDedicated.pa = m_edgeAreaPowerOffset; | 549 pdschConfigDedicated.pa = m_edgeAreaPowerOffset; |
550 m_ffrRrcSapUser->SetPdschConfigDedicated (rnti, pdschConfigDedicat
ed); | 550 m_ffrRrcSapUser->SetPdschConfigDedicated (rnti, pdschConfigDedicat
ed); |
551 } | 551 } |
(...skipping 15 matching lines...) Expand all Loading... |
567 | 567 |
568 void | 568 void |
569 LteFrStrictAlgorithm::DoRecvLoadInformation (EpcX2Sap::LoadInformationParams par
ams) | 569 LteFrStrictAlgorithm::DoRecvLoadInformation (EpcX2Sap::LoadInformationParams par
ams) |
570 { | 570 { |
571 NS_LOG_FUNCTION (this); | 571 NS_LOG_FUNCTION (this); |
572 NS_LOG_WARN ("Method should not be called, since it is empty"); | 572 NS_LOG_WARN ("Method should not be called, since it is empty"); |
573 | 573 |
574 } | 574 } |
575 | 575 |
576 } // end of namespace ns3 | 576 } // end of namespace ns3 |
OLD | NEW |