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

(-)a/src/energy/helper/basic-energy-source-helper.cc (-7 / +1 lines)
 Lines 42-54    Link Here 
42 
BasicEnergySourceHelper::DoInstall (Ptr<Node> node) const
 42 
BasicEnergySourceHelper::DoInstall (Ptr<Node> node) const
43 
{
 43 
{
44 
  NS_ASSERT (node != NULL);
 44 
  NS_ASSERT (node != NULL);
45 
  // check if energy source already exists
 45 
  Ptr<EnergySource> source = m_basicEnergySource.Create<EnergySource> ();
46 
  Ptr<EnergySource> source = node->GetObject<EnergySource> ();
47 
  if (source != NULL)
48 
    {
49 
      NS_FATAL_ERROR ("Energy source already installed!");
50 
    }
51 
  source = m_basicEnergySource.Create<EnergySource> ();
52 
  NS_ASSERT (source != NULL);
 46 
  NS_ASSERT (source != NULL);
53 
  source->SetNode (node);
 47 
  source->SetNode (node);
54 
  return source;
 48 
  return source;
(-)a/src/energy/helper/energy-model-helper.h (-2 / +2 lines)
 Lines 38-45    Link Here 
38 
 * \ingroup energy
 38 
 * \ingroup energy
39 
 * \brief Creates EnergySource objects.
 39 
 * \brief Creates EnergySource objects.
40 
 *
 40 
 *
41 
 * This class creates and installs an energy source onto network nodes. Only a
 41 
 * This class creates and installs an energy source onto network nodes.
42 
 * single source can exist on a network node.
 42 
 * Multiple sources can exist on a network node.
43 
 *
 43 
 *
44 
 */
 44 
 */
45 
class EnergySourceHelper
 45 
class EnergySourceHelper
(-)a/src/energy/helper/rv-battery-model-helper.cc (-7 / +1 lines)
 Lines 42-54    Link Here 
42 
RvBatteryModelHelper::DoInstall (Ptr<Node> node) const
 42 
RvBatteryModelHelper::DoInstall (Ptr<Node> node) const
43 
{
 43 
{
44 
  NS_ASSERT (node != NULL);
 44 
  NS_ASSERT (node != NULL);
45 
  // check if energy source already exists
 45 
  Ptr<EnergySource> source = m_rvBatteryModel.Create<EnergySource> ();
46 
  Ptr<EnergySource> source = node->GetObject<EnergySource> ();
47 
  if (source != NULL)
48 
    {
49 
      NS_FATAL_ERROR ("Energy source already installed!");
50 
    }
51 
  source = m_rvBatteryModel.Create<EnergySource> ();
52 
  NS_ASSERT (source != NULL);
 46 
  NS_ASSERT (source != NULL);
53 
  source->SetNode (node);
 47 
  source->SetNode (node);
54 
  return source;
 48 
  return source;

Return to bug 1873