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

(-)a/src/lte/test/lte-test-cqa-ff-mac-scheduler.cc (+2 lines)
 Lines 345-350    Link Here 
345 
      mm->SetPosition (Vector (m_dist, 0.0, 0.0));
 345 
      mm->SetPosition (Vector (m_dist, 0.0, 0.0));
346 
      Ptr<LteUeNetDevice> lteUeDev = ueDevs.Get (i)->GetObject<LteUeNetDevice> ();
 346 
      Ptr<LteUeNetDevice> lteUeDev = ueDevs.Get (i)->GetObject<LteUeNetDevice> ();
347 
      Ptr<LteUePhy> uePhy = lteUeDev->GetPhy ();
 347 
      Ptr<LteUePhy> uePhy = lteUeDev->GetPhy ();
348 
      uePhy->SetAttribute ("EnableUplinkPowerControl", BooleanValue (false));
348 
      uePhy->SetAttribute ("TxPower", DoubleValue (23.0));
 349 
      uePhy->SetAttribute ("TxPower", DoubleValue (23.0));
349 
      uePhy->SetAttribute ("NoiseFigure", DoubleValue (9.0));
 350 
      uePhy->SetAttribute ("NoiseFigure", DoubleValue (9.0));
350 
    }
 351 
    }
 Lines 584-589    Link Here 
584 
      mm->SetPosition (Vector (m_dist.at (i), 0.0, 0.0));
 585 
      mm->SetPosition (Vector (m_dist.at (i), 0.0, 0.0));
585 
      Ptr<LteUeNetDevice> lteUeDev = ueDevs.Get (i)->GetObject<LteUeNetDevice> ();
 586 
      Ptr<LteUeNetDevice> lteUeDev = ueDevs.Get (i)->GetObject<LteUeNetDevice> ();
586 
      Ptr<LteUePhy> uePhy = lteUeDev->GetPhy ();
 587 
      Ptr<LteUePhy> uePhy = lteUeDev->GetPhy ();
588 
      uePhy->SetAttribute ("EnableUplinkPowerControl", BooleanValue (false));
587 
      uePhy->SetAttribute ("TxPower", DoubleValue (23.0));
 589 
      uePhy->SetAttribute ("TxPower", DoubleValue (23.0));
588 
      uePhy->SetAttribute ("NoiseFigure", DoubleValue (9.0));
 590 
      uePhy->SetAttribute ("NoiseFigure", DoubleValue (9.0));
589 
    }
 591 
    }
(-)a/src/lte/test/lte-test-fdbet-ff-mac-scheduler.cc (+2 lines)
 Lines 258-263    Link Here 
258 
      mm->SetPosition (Vector (m_dist, 0.0, 0.0));
 258 
      mm->SetPosition (Vector (m_dist, 0.0, 0.0));
259 
      Ptr<LteUeNetDevice> lteUeDev = ueDevs.Get (i)->GetObject<LteUeNetDevice> ();
 259 
      Ptr<LteUeNetDevice> lteUeDev = ueDevs.Get (i)->GetObject<LteUeNetDevice> ();
260 
      Ptr<LteUePhy> uePhy = lteUeDev->GetPhy ();
 260 
      Ptr<LteUePhy> uePhy = lteUeDev->GetPhy ();
261 
      uePhy->SetAttribute ("EnableUplinkPowerControl", BooleanValue (false));
261 
      uePhy->SetAttribute ("TxPower", DoubleValue (23.0));
 262 
      uePhy->SetAttribute ("TxPower", DoubleValue (23.0));
262 
      uePhy->SetAttribute ("NoiseFigure", DoubleValue (9.0));
 263 
      uePhy->SetAttribute ("NoiseFigure", DoubleValue (9.0));
263 
    }
 264 
    }
 Lines 422-427    Link Here 
422 
      mm->SetPosition (Vector (m_dist.at (i), 0.0, 0.0));
 423 
      mm->SetPosition (Vector (m_dist.at (i), 0.0, 0.0));
423 
      Ptr<LteUeNetDevice> lteUeDev = ueDevs.Get (i)->GetObject<LteUeNetDevice> ();
 424 
      Ptr<LteUeNetDevice> lteUeDev = ueDevs.Get (i)->GetObject<LteUeNetDevice> ();
424 
      Ptr<LteUePhy> uePhy = lteUeDev->GetPhy ();
 425 
      Ptr<LteUePhy> uePhy = lteUeDev->GetPhy ();
426 
      uePhy->SetAttribute ("EnableUplinkPowerControl", BooleanValue (false));
425 
      uePhy->SetAttribute ("TxPower", DoubleValue (23.0));
 427 
      uePhy->SetAttribute ("TxPower", DoubleValue (23.0));
426 
      uePhy->SetAttribute ("NoiseFigure", DoubleValue (9.0));
 428 
      uePhy->SetAttribute ("NoiseFigure", DoubleValue (9.0));
427 
    }
 429 
    }
(-)a/src/lte/test/lte-test-fdmt-ff-mac-scheduler.cc (+1 lines)
 Lines 243-248    Link Here 
243 
      mm->SetPosition (Vector (m_dist, 0.0, 0.0));
 243 
      mm->SetPosition (Vector (m_dist, 0.0, 0.0));
244 
      Ptr<LteUeNetDevice> lteUeDev = ueDevs.Get (i)->GetObject<LteUeNetDevice> ();
 244 
      Ptr<LteUeNetDevice> lteUeDev = ueDevs.Get (i)->GetObject<LteUeNetDevice> ();
245 
      Ptr<LteUePhy> uePhy = lteUeDev->GetPhy ();
 245 
      Ptr<LteUePhy> uePhy = lteUeDev->GetPhy ();
246 
      uePhy->SetAttribute ("EnableUplinkPowerControl", BooleanValue (false));
246 
      uePhy->SetAttribute ("TxPower", DoubleValue (23.0));
 247 
      uePhy->SetAttribute ("TxPower", DoubleValue (23.0));
247 
      uePhy->SetAttribute ("NoiseFigure", DoubleValue (9.0));
 248 
      uePhy->SetAttribute ("NoiseFigure", DoubleValue (9.0));
248 
    }
 249 
    }
(-)a/src/lte/test/lte-test-fdtbfq-ff-mac-scheduler.cc (+2 lines)
 Lines 342-347    Link Here 
342 
      mm->SetPosition (Vector (m_dist, 0.0, 0.0));
 342 
      mm->SetPosition (Vector (m_dist, 0.0, 0.0));
343 
      Ptr<LteUeNetDevice> lteUeDev = ueDevs.Get (i)->GetObject<LteUeNetDevice> ();
 343 
      Ptr<LteUeNetDevice> lteUeDev = ueDevs.Get (i)->GetObject<LteUeNetDevice> ();
344 
      Ptr<LteUePhy> uePhy = lteUeDev->GetPhy ();
 344 
      Ptr<LteUePhy> uePhy = lteUeDev->GetPhy ();
345 
      uePhy->SetAttribute ("EnableUplinkPowerControl", BooleanValue (false));
345 
      uePhy->SetAttribute ("TxPower", DoubleValue (23.0));
 346 
      uePhy->SetAttribute ("TxPower", DoubleValue (23.0));
346 
      uePhy->SetAttribute ("NoiseFigure", DoubleValue (9.0));
 347 
      uePhy->SetAttribute ("NoiseFigure", DoubleValue (9.0));
347 
    }
 348 
    }
 Lines 581-586    Link Here 
581 
      mm->SetPosition (Vector (m_dist.at (i), 0.0, 0.0));
 582 
      mm->SetPosition (Vector (m_dist.at (i), 0.0, 0.0));
582 
      Ptr<LteUeNetDevice> lteUeDev = ueDevs.Get (i)->GetObject<LteUeNetDevice> ();
 583 
      Ptr<LteUeNetDevice> lteUeDev = ueDevs.Get (i)->GetObject<LteUeNetDevice> ();
583 
      Ptr<LteUePhy> uePhy = lteUeDev->GetPhy ();
 584 
      Ptr<LteUePhy> uePhy = lteUeDev->GetPhy ();
585 
      uePhy->SetAttribute ("EnableUplinkPowerControl", BooleanValue (false));
584 
      uePhy->SetAttribute ("TxPower", DoubleValue (23.0));
 586 
      uePhy->SetAttribute ("TxPower", DoubleValue (23.0));
585 
      uePhy->SetAttribute ("NoiseFigure", DoubleValue (9.0));
 587 
      uePhy->SetAttribute ("NoiseFigure", DoubleValue (9.0));
586 
    }
 588 
    }
(-)a/src/lte/test/lte-test-pf-ff-mac-scheduler.cc (+2 lines)
 Lines 275-280    Link Here 
275 
      mm->SetPosition (Vector (m_dist, 0.0, 0.0));
 275 
      mm->SetPosition (Vector (m_dist, 0.0, 0.0));
276 
      Ptr<LteUeNetDevice> lteUeDev = ueDevs.Get (i)->GetObject<LteUeNetDevice> ();
 276 
      Ptr<LteUeNetDevice> lteUeDev = ueDevs.Get (i)->GetObject<LteUeNetDevice> ();
277 
      Ptr<LteUePhy> uePhy = lteUeDev->GetPhy ();
 277 
      Ptr<LteUePhy> uePhy = lteUeDev->GetPhy ();
278 
      uePhy->SetAttribute ("EnableUplinkPowerControl", BooleanValue (false));
278 
      uePhy->SetAttribute ("TxPower", DoubleValue (23.0));
 279 
      uePhy->SetAttribute ("TxPower", DoubleValue (23.0));
279 
      uePhy->SetAttribute ("NoiseFigure", DoubleValue (9.0));
 280 
      uePhy->SetAttribute ("NoiseFigure", DoubleValue (9.0));
280 
    }
 281 
    }
 Lines 438-443    Link Here 
438 
      mm->SetPosition (Vector (m_dist.at (i), 0.0, 0.0));
 439 
      mm->SetPosition (Vector (m_dist.at (i), 0.0, 0.0));
439 
      Ptr<LteUeNetDevice> lteUeDev = ueDevs.Get (i)->GetObject<LteUeNetDevice> ();
 440 
      Ptr<LteUeNetDevice> lteUeDev = ueDevs.Get (i)->GetObject<LteUeNetDevice> ();
440 
      Ptr<LteUePhy> uePhy = lteUeDev->GetPhy ();
 441 
      Ptr<LteUePhy> uePhy = lteUeDev->GetPhy ();
442 
      uePhy->SetAttribute ("EnableUplinkPowerControl", BooleanValue (false));
441 
      uePhy->SetAttribute ("TxPower", DoubleValue (23.0));
 443 
      uePhy->SetAttribute ("TxPower", DoubleValue (23.0));
442 
      uePhy->SetAttribute ("NoiseFigure", DoubleValue (9.0));
 444 
      uePhy->SetAttribute ("NoiseFigure", DoubleValue (9.0));
443 
    }
 445 
    }
(-)a/src/lte/test/lte-test-pss-ff-mac-scheduler.cc (+2 lines)
 Lines 343-348    Link Here 
343 
      mm->SetPosition (Vector (m_dist, 0.0, 0.0));
 343 
      mm->SetPosition (Vector (m_dist, 0.0, 0.0));
344 
      Ptr<LteUeNetDevice> lteUeDev = ueDevs.Get (i)->GetObject<LteUeNetDevice> ();
 344 
      Ptr<LteUeNetDevice> lteUeDev = ueDevs.Get (i)->GetObject<LteUeNetDevice> ();
345 
      Ptr<LteUePhy> uePhy = lteUeDev->GetPhy ();
 345 
      Ptr<LteUePhy> uePhy = lteUeDev->GetPhy ();
346 
      uePhy->SetAttribute ("EnableUplinkPowerControl", BooleanValue (false));
346 
      uePhy->SetAttribute ("TxPower", DoubleValue (23.0));
 347 
      uePhy->SetAttribute ("TxPower", DoubleValue (23.0));
347 
      uePhy->SetAttribute ("NoiseFigure", DoubleValue (9.0));
 348 
      uePhy->SetAttribute ("NoiseFigure", DoubleValue (9.0));
348 
    }
 349 
    }
 Lines 582-587    Link Here 
582 
      mm->SetPosition (Vector (m_dist.at (i), 0.0, 0.0));
 583 
      mm->SetPosition (Vector (m_dist.at (i), 0.0, 0.0));
583 
      Ptr<LteUeNetDevice> lteUeDev = ueDevs.Get (i)->GetObject<LteUeNetDevice> ();
 584 
      Ptr<LteUeNetDevice> lteUeDev = ueDevs.Get (i)->GetObject<LteUeNetDevice> ();
584 
      Ptr<LteUePhy> uePhy = lteUeDev->GetPhy ();
 585 
      Ptr<LteUePhy> uePhy = lteUeDev->GetPhy ();
586 
      uePhy->SetAttribute ("EnableUplinkPowerControl", BooleanValue (false));
585 
      uePhy->SetAttribute ("TxPower", DoubleValue (23.0));
 587 
      uePhy->SetAttribute ("TxPower", DoubleValue (23.0));
586 
      uePhy->SetAttribute ("NoiseFigure", DoubleValue (9.0));
 588 
      uePhy->SetAttribute ("NoiseFigure", DoubleValue (9.0));
587 
    }
 589 
    }
(-)a/src/lte/test/lte-test-rr-ff-mac-scheduler.cc (+1 lines)
 Lines 239-244    Link Here 
239 
      mm->SetPosition (Vector (m_dist, 0.0, 0.0));
 239 
      mm->SetPosition (Vector (m_dist, 0.0, 0.0));
240 
      Ptr<LteUeNetDevice> lteUeDev = ueDevs.Get (i)->GetObject<LteUeNetDevice> ();
 240 
      Ptr<LteUeNetDevice> lteUeDev = ueDevs.Get (i)->GetObject<LteUeNetDevice> ();
241 
      Ptr<LteUePhy> uePhy = lteUeDev->GetPhy ();
 241 
      Ptr<LteUePhy> uePhy = lteUeDev->GetPhy ();
242 
      uePhy->SetAttribute ("EnableUplinkPowerControl", BooleanValue (false));
242 
      uePhy->SetAttribute ("TxPower", DoubleValue (23.0));
 243 
      uePhy->SetAttribute ("TxPower", DoubleValue (23.0));
243 
      uePhy->SetAttribute ("NoiseFigure", DoubleValue (9.0));
 244 
      uePhy->SetAttribute ("NoiseFigure", DoubleValue (9.0));
244 
    }
 245 
    }
(-)a/src/lte/test/lte-test-tdbet-ff-mac-scheduler.cc (+2 lines)
 Lines 258-263    Link Here 
258 
      mm->SetPosition (Vector (m_dist, 0.0, 0.0));
 258 
      mm->SetPosition (Vector (m_dist, 0.0, 0.0));
259 
      Ptr<LteUeNetDevice> lteUeDev = ueDevs.Get (i)->GetObject<LteUeNetDevice> ();
 259 
      Ptr<LteUeNetDevice> lteUeDev = ueDevs.Get (i)->GetObject<LteUeNetDevice> ();
260 
      Ptr<LteUePhy> uePhy = lteUeDev->GetPhy ();
 260 
      Ptr<LteUePhy> uePhy = lteUeDev->GetPhy ();
261 
      uePhy->SetAttribute ("EnableUplinkPowerControl", BooleanValue (false));
261 
      uePhy->SetAttribute ("TxPower", DoubleValue (23.0));
 262 
      uePhy->SetAttribute ("TxPower", DoubleValue (23.0));
262 
      uePhy->SetAttribute ("NoiseFigure", DoubleValue (9.0));
 263 
      uePhy->SetAttribute ("NoiseFigure", DoubleValue (9.0));
263 
    }
 264 
    }
 Lines 424-429    Link Here 
424 
      mm->SetPosition (Vector (m_dist.at (i), 0.0, 0.0));
 425 
      mm->SetPosition (Vector (m_dist.at (i), 0.0, 0.0));
425 
      Ptr<LteUeNetDevice> lteUeDev = ueDevs.Get (i)->GetObject<LteUeNetDevice> ();
 426 
      Ptr<LteUeNetDevice> lteUeDev = ueDevs.Get (i)->GetObject<LteUeNetDevice> ();
426 
      Ptr<LteUePhy> uePhy = lteUeDev->GetPhy ();
 427 
      Ptr<LteUePhy> uePhy = lteUeDev->GetPhy ();
428 
      uePhy->SetAttribute ("EnableUplinkPowerControl", BooleanValue (false));
427 
      uePhy->SetAttribute ("TxPower", DoubleValue (23.0));
 429 
      uePhy->SetAttribute ("TxPower", DoubleValue (23.0));
428 
      uePhy->SetAttribute ("NoiseFigure", DoubleValue (9.0));
 430 
      uePhy->SetAttribute ("NoiseFigure", DoubleValue (9.0));
429 
    }
 431 
    }
(-)a/src/lte/test/lte-test-tdmt-ff-mac-scheduler.cc (+1 lines)
 Lines 243-248    Link Here 
243 
      mm->SetPosition (Vector (m_dist, 0.0, 0.0));
 243 
      mm->SetPosition (Vector (m_dist, 0.0, 0.0));
244 
      Ptr<LteUeNetDevice> lteUeDev = ueDevs.Get (i)->GetObject<LteUeNetDevice> ();
 244 
      Ptr<LteUeNetDevice> lteUeDev = ueDevs.Get (i)->GetObject<LteUeNetDevice> ();
245 
      Ptr<LteUePhy> uePhy = lteUeDev->GetPhy ();
 245 
      Ptr<LteUePhy> uePhy = lteUeDev->GetPhy ();
246 
      uePhy->SetAttribute ("EnableUplinkPowerControl", BooleanValue (false));
246 
      uePhy->SetAttribute ("TxPower", DoubleValue (23.0));
 247 
      uePhy->SetAttribute ("TxPower", DoubleValue (23.0));
247 
      uePhy->SetAttribute ("NoiseFigure", DoubleValue (9.0));
 248 
      uePhy->SetAttribute ("NoiseFigure", DoubleValue (9.0));
248 
    }
 249 
    }
(-)a/src/lte/test/lte-test-tdtbfq-ff-mac-scheduler.cc (+2 lines)
 Lines 342-347    Link Here 
342 
      mm->SetPosition (Vector (m_dist, 0.0, 0.0));
 342 
      mm->SetPosition (Vector (m_dist, 0.0, 0.0));
343 
      Ptr<LteUeNetDevice> lteUeDev = ueDevs.Get (i)->GetObject<LteUeNetDevice> ();
 343 
      Ptr<LteUeNetDevice> lteUeDev = ueDevs.Get (i)->GetObject<LteUeNetDevice> ();
344 
      Ptr<LteUePhy> uePhy = lteUeDev->GetPhy ();
 344 
      Ptr<LteUePhy> uePhy = lteUeDev->GetPhy ();
345 
      uePhy->SetAttribute ("EnableUplinkPowerControl", BooleanValue (false));
345 
      uePhy->SetAttribute ("TxPower", DoubleValue (23.0));
 346 
      uePhy->SetAttribute ("TxPower", DoubleValue (23.0));
346 
      uePhy->SetAttribute ("NoiseFigure", DoubleValue (9.0));
 347 
      uePhy->SetAttribute ("NoiseFigure", DoubleValue (9.0));
347 
    }
 348 
    }
 Lines 581-586    Link Here 
581 
      mm->SetPosition (Vector (m_dist.at (i), 0.0, 0.0));
 582 
      mm->SetPosition (Vector (m_dist.at (i), 0.0, 0.0));
582 
      Ptr<LteUeNetDevice> lteUeDev = ueDevs.Get (i)->GetObject<LteUeNetDevice> ();
 583 
      Ptr<LteUeNetDevice> lteUeDev = ueDevs.Get (i)->GetObject<LteUeNetDevice> ();
583 
      Ptr<LteUePhy> uePhy = lteUeDev->GetPhy ();
 584 
      Ptr<LteUePhy> uePhy = lteUeDev->GetPhy ();
585 
      uePhy->SetAttribute ("EnableUplinkPowerControl", BooleanValue (false));
584 
      uePhy->SetAttribute ("TxPower", DoubleValue (23.0));
 586 
      uePhy->SetAttribute ("TxPower", DoubleValue (23.0));
585 
      uePhy->SetAttribute ("NoiseFigure", DoubleValue (9.0));
 587 
      uePhy->SetAttribute ("NoiseFigure", DoubleValue (9.0));
586 
    }
 588 
    }
(-)a/src/lte/test/lte-test-tta-ff-mac-scheduler.cc (+1 lines)
 Lines 246-251    Link Here 
246 
      mm->SetPosition (Vector (m_dist, 0.0, 0.0));
 246 
      mm->SetPosition (Vector (m_dist, 0.0, 0.0));
247 
      Ptr<LteUeNetDevice> lteUeDev = ueDevs.Get (i)->GetObject<LteUeNetDevice> ();
 247 
      Ptr<LteUeNetDevice> lteUeDev = ueDevs.Get (i)->GetObject<LteUeNetDevice> ();
248 
      Ptr<LteUePhy> uePhy = lteUeDev->GetPhy ();
 248 
      Ptr<LteUePhy> uePhy = lteUeDev->GetPhy ();
249 
      uePhy->SetAttribute ("EnableUplinkPowerControl", BooleanValue (false));
249 
      uePhy->SetAttribute ("TxPower", DoubleValue (23.0));
 250 
      uePhy->SetAttribute ("TxPower", DoubleValue (23.0));
250 
      uePhy->SetAttribute ("NoiseFigure", DoubleValue (9.0));
 251 
      uePhy->SetAttribute ("NoiseFigure", DoubleValue (9.0));
251 
    }
 252 
    }

Return to bug 2339