--- a/src/contrib/energy/helper/energy-source-container.cc	Tue Mar 22 16:21:35 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,143 +0,0 @@
-/* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
-/*
- * Copyright (c) 2008 INRIA
- * Copyright (c) 2010 Network Security Lab, University of Washington, Seattle.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation;
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * Authors: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
- *          Sidharth Nabar <snabar@uw.edu>, He Wu <mdzz@u.washington.edu>
- */
-
-#include "energy-source-container.h"
-#include "ns3/names.h"
-
-namespace ns3 {
-
-TypeId
-EnergySourceContainer::GetTypeId (void)
-{
-  static TypeId tid = TypeId ("ns3::EnergySourceContainer")
-    .SetParent<Object> ()
-    .AddConstructor<EnergySourceContainer> ()
-  ;
-  return tid;
-}
-
-EnergySourceContainer::EnergySourceContainer ()
-{
-}
-
-EnergySourceContainer::~EnergySourceContainer ()
-{
-}
-
-EnergySourceContainer::EnergySourceContainer (Ptr<EnergySource> source)
-{
-  NS_ASSERT (source != NULL);
-  m_sources.push_back (source);
-}
-
-EnergySourceContainer::EnergySourceContainer (std::string sourceName)
-{
-  Ptr<EnergySource> source = Names::Find<EnergySource> (sourceName);
-  NS_ASSERT (source != NULL);
-  m_sources.push_back (source);
-}
-
-EnergySourceContainer::EnergySourceContainer (const EnergySourceContainer &a,
-                                              const EnergySourceContainer &b)
-{
-  *this = a;
-  Add (b);
-}
-
-EnergySourceContainer::Iterator
-EnergySourceContainer::Begin (void) const
-{
-  return m_sources.begin ();
-}
-
-EnergySourceContainer::Iterator
-EnergySourceContainer::End (void) const
-{
-  return m_sources.end ();
-}
-
-uint32_t
-EnergySourceContainer::GetN (void) const
-{
-  return m_sources.size ();
-}
-
-Ptr<EnergySource>
-EnergySourceContainer::Get (uint32_t i) const
-{
-  return m_sources[i];
-}
-
-void
-EnergySourceContainer::Add (EnergySourceContainer container)
-{
-  for (Iterator i = container.Begin (); i != container.End (); i++)
-    {
-      m_sources.push_back (*i);
-    }
-}
-
-void
-EnergySourceContainer::Add (Ptr<EnergySource> source)
-{
-  NS_ASSERT (source != NULL);
-  m_sources.push_back (source);
-}
-
-void
-EnergySourceContainer::Add (std::string sourceName)
-{
-  Ptr<EnergySource> source = Names::Find<EnergySource> (sourceName);
-  NS_ASSERT (source != NULL);
-  m_sources.push_back (source);
-}
-
-/*
- * Private functions start here.
- */
-
-void
-EnergySourceContainer::DoDispose (void)
-{
-  // call Object::Dispose for all EnergySource objects
-  for (std::vector< Ptr<EnergySource> >::iterator i = m_sources.begin ();
-       i != m_sources.end (); i++)
-    {
-      (*i)->DisposeDeviceModels ();
-      (*i)->Dispose ();
-    }
-  m_sources.clear ();
-}
-
-void
-EnergySourceContainer::DoStart (void)
-{
-  // call Object::Start for all EnergySource objects
-  for (std::vector< Ptr<EnergySource> >::iterator i = m_sources.begin ();
-       i != m_sources.end (); i++)
-    {
-      (*i)->Start ();
-      (*i)->StartDeviceModels ();
-    }
-}
-
-} // namespace ns3