# HG changeset patch
# User Tommaso Pecorella <tommaso.pecorella@unifi.it>
# Date 1434889095 -7200
# Parent  86ff30d2321f59819ed0e4612cb7f723cb8758ff
Wifi-energy dependance

diff --git a/src/energy/examples/basic-energy-model-test.cc b/src/energy/examples/basic-energy-model-test.cc
new file mode 100644
--- /dev/null
+++ b/src/energy/examples/basic-energy-model-test.cc
@@ -0,0 +1,449 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * 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
+ *
+ * Author: He Wu <mdzz@u.washington.edu>
+ */
+
+#include "ns3/basic-energy-source.h"
+#include "ns3/wifi-radio-energy-model.h"
+#include "ns3/basic-energy-source-helper.h"
+#include "ns3/wifi-radio-energy-model-helper.h"
+#include "ns3/energy-source-container.h"
+#include "ns3/device-energy-model-container.h"
+#include "ns3/log.h"
+#include "ns3/node.h"
+#include "ns3/simulator.h"
+#include "ns3/double.h"
+#include "ns3/config.h"
+#include "ns3/string.h"
+#include "ns3/yans-wifi-helper.h"
+#include "ns3/nqos-wifi-mac-helper.h"
+#include <cmath>
+
+using namespace ns3;
+
+NS_LOG_COMPONENT_DEFINE ("BasicEnergyModelTestSuite");
+
+/**
+ * Test case of update remaining energy for BasicEnergySource and
+ * WifiRadioEnergyModel.
+ */
+class BasicEnergyUpdateTest
+{
+public:
+  BasicEnergyUpdateTest ();
+  virtual ~BasicEnergyUpdateTest ();
+
+  /**
+   * Performs some tests involving state updates and the relative energy consumption
+   * \return true is some error happened.
+   */
+  bool DoRun (void);
+
+private:
+  /**
+   * \param state Radio state to switch to.
+   * \return False if no error occurs.
+   *
+   * Runs simulation for a while, check if final state & remaining energy is
+   * correctly updated.
+   */
+  bool StateSwitchTest (WifiPhy::State state);
+
+private:
+  double m_timeS;     // in seconds
+  double m_tolerance; // tolerance for power estimation
+
+  ObjectFactory m_energySource;
+  ObjectFactory m_deviceEnergyModel;
+};
+
+BasicEnergyUpdateTest::BasicEnergyUpdateTest ()
+{
+  m_timeS = 15.5; // idle for 15 seconds before changing state
+  m_tolerance = 1.0e-13;  //
+}
+
+BasicEnergyUpdateTest::~BasicEnergyUpdateTest ()
+{
+}
+
+bool
+BasicEnergyUpdateTest::DoRun (void)
+{
+  // set types
+  m_energySource.SetTypeId ("ns3::BasicEnergySource");
+  m_deviceEnergyModel.SetTypeId ("ns3::WifiRadioEnergyModel");
+
+  uint8_t ret = 0;
+
+  // run state switch tests
+  if (StateSwitchTest (WifiPhy::IDLE))
+    {
+      ret = 1;
+      std::cerr << "Problem with state switch test (WifiPhy idle)." << std::endl;
+    }
+  if (StateSwitchTest (WifiPhy::CCA_BUSY))
+    {
+      ret = 1;
+      std::cerr << "Problem with state switch test (WifiPhy cca busy)." << std::endl;
+    }
+  if (StateSwitchTest (WifiPhy::TX))
+    {
+      ret = 1;
+      std::cerr << "Problem with state switch test (WifiPhy tx)." << std::endl;
+    }
+  if (StateSwitchTest (WifiPhy::RX))
+    {
+      ret = 1;
+      std::cerr << "Problem with state switch test (WifiPhy rx)." << std::endl;
+    }
+  if (StateSwitchTest (WifiPhy::SWITCHING))
+    {
+      ret = 1;
+      std::cerr << "Problem with state switch test (WifiPhy switching)." << std::endl;
+    }
+  if (StateSwitchTest (WifiPhy::SLEEP))
+    {
+      ret = 1;
+      std::cerr << "Problem with state switch test (WifiPhy sleep)." << std::endl;
+    }
+  return ret;
+}
+
+bool
+BasicEnergyUpdateTest::StateSwitchTest (WifiPhy::State state)
+{
+  // create node
+  Ptr<Node> node = CreateObject<Node> ();
+
+  // create energy source
+  Ptr<BasicEnergySource> source = m_energySource.Create<BasicEnergySource> ();
+  // aggregate energy source to node
+  node->AggregateObject (source);
+
+  // create device energy model
+  Ptr<WifiRadioEnergyModel> model =
+    m_deviceEnergyModel.Create<WifiRadioEnergyModel> ();
+  // set energy source pointer
+  model->SetEnergySource (source);
+  // add device energy model to model list in energy source
+  source->AppendDeviceEnergyModel (model);
+
+  // retrieve device energy model from energy source
+  DeviceEnergyModelContainer models =
+    source->FindDeviceEnergyModels ("ns3::WifiRadioEnergyModel");
+  // check list
+  if ((models.GetN () == 0))
+    {
+      std::cerr << "Model list is empty!." << std::endl;
+      return true;
+    }
+  // get pointer
+  Ptr<WifiRadioEnergyModel> devModel =
+    DynamicCast<WifiRadioEnergyModel> (models.Get (0));
+  // check pointer
+  if ((devModel == 0))
+    {
+      std::cerr << "NULL pointer to device model!." << std::endl;
+      return true;
+    }
+
+  /*
+   * The radio will stay IDLE for m_timeS seconds. Then it will switch into a
+   * different state.
+   */
+
+  // schedule change of state
+  Simulator::Schedule (Seconds (m_timeS),
+                       &WifiRadioEnergyModel::ChangeState, devModel, state);
+
+  // Calculate remaining energy at simulation stop time
+  Simulator::Schedule (Seconds (m_timeS * 2), 
+                       &BasicEnergySource::UpdateEnergySource, source);
+
+  double timeDelta = 0.000000001; // 1 nanosecond
+  // run simulation; stop just after last scheduled event
+  Simulator::Stop (Seconds (m_timeS * 2 + timeDelta));
+  Simulator::Run ();
+
+  // energy = current * voltage * time
+
+  // calculate idle power consumption
+  double estRemainingEnergy = source->GetInitialEnergy ();
+  double voltage = source->GetSupplyVoltage ();
+  estRemainingEnergy -= devModel->GetIdleCurrentA () * voltage * m_timeS;
+
+  /*
+   * Manually calculate the number of periodic updates performed by the source.
+   * This is to check if the periodic updates are performed correctly.
+   */
+  double actualTime = m_timeS;
+  actualTime /= source->GetEnergyUpdateInterval ().GetSeconds ();
+  actualTime = floor (actualTime); // rounding for update interval
+  actualTime *= source->GetEnergyUpdateInterval ().GetSeconds ();
+
+  // calculate new state power consumption
+  double current = 0.0;
+  switch (state)
+    {
+    case WifiPhy::IDLE:
+      current = devModel->GetIdleCurrentA ();
+      break;
+    case WifiPhy::CCA_BUSY:
+      current = devModel->GetCcaBusyCurrentA ();
+      break;
+    case WifiPhy::TX:
+      current = devModel->GetTxCurrentA ();
+      break;
+    case WifiPhy::RX:
+      current = devModel->GetRxCurrentA ();
+      break;
+    case WifiPhy::SWITCHING:
+      current = devModel->GetSwitchingCurrentA ();
+      break;
+    case WifiPhy::SLEEP:
+      current = devModel->GetSleepCurrentA ();
+      break;
+    default:
+      NS_FATAL_ERROR ("Undefined radio state: " << state);
+      break;
+    }
+  estRemainingEnergy -= current * voltage * m_timeS;
+
+  // obtain remaining energy from source
+  double remainingEnergy = source->GetRemainingEnergy ();
+  NS_LOG_DEBUG ("Remaining energy is " << remainingEnergy);
+  NS_LOG_DEBUG ("Estimated remaining energy is " << estRemainingEnergy);
+  NS_LOG_DEBUG ("Difference is " << estRemainingEnergy - remainingEnergy);
+
+  // check remaining energy
+  if ((remainingEnergy > (estRemainingEnergy + m_tolerance)) ||
+      (remainingEnergy < (estRemainingEnergy - m_tolerance)))
+    {
+      std::cerr << "Incorrect remaining energy!" << std::endl;
+      return true;
+    }
+
+  // obtain radio state
+  WifiPhy::State endState = devModel->GetCurrentState ();
+  NS_LOG_DEBUG ("Radio state is " << endState);
+  // check end state
+  if (endState != state)
+    {
+      std::cerr << "Incorrect end state!" << std::endl;
+      return true;
+    }
+  Simulator::Destroy ();
+
+  return false; // no error
+}
+
+// -------------------------------------------------------------------------- //
+
+/**
+ * Test case of energy depletion handling for BasicEnergySource and
+ * WifiRadioEnergyModel.
+ */
+class BasicEnergyDepletionTest
+{
+public:
+  BasicEnergyDepletionTest ();
+  virtual ~BasicEnergyDepletionTest ();
+
+  /**
+   * Performs some tests involving energy depletion
+   * \return true is some error happened.
+   */
+  bool DoRun (void);
+
+private:
+  /**
+   * Callback invoked when energy is drained from source.
+   */
+  void DepletionHandler (void);
+
+  /**
+   * \param simTimeS Simulation time, in seconds.
+   * \param updateIntervalS Device model update interval, in seconds.
+   * \return False if all is good.
+   *
+   * Runs simulation with specified simulation time and update interval.
+   */
+  bool DepletionTestCase (double simTimeS, double updateIntervalS);
+
+private:
+  int m_numOfNodes;         // number of nodes in simulation
+  int m_callbackCount;      // counter for # of callbacks invoked
+  double m_simTimeS;        // maximum simulation time, in seconds
+  double m_timeStepS;       // simulation time step size, in seconds
+  double m_updateIntervalS; // update interval of each device model
+
+};
+
+BasicEnergyDepletionTest::BasicEnergyDepletionTest ()
+{
+  m_numOfNodes = 10;
+  m_callbackCount = 0;
+  m_simTimeS = 4.5;
+  m_timeStepS = 0.5;
+  m_updateIntervalS = 1.5;
+}
+
+BasicEnergyDepletionTest::~BasicEnergyDepletionTest ()
+{
+}
+
+bool
+BasicEnergyDepletionTest::DoRun (void)
+{
+  /*
+   * Run simulation with different simulation time and update interval.
+   */
+  uint8_t ret = 0;
+
+  for (double simTimeS = 0.0; simTimeS <= m_simTimeS; simTimeS += m_timeStepS)
+    {
+      for (double updateIntervalS = 0.5; updateIntervalS <= m_updateIntervalS;
+           updateIntervalS += m_timeStepS)
+        {
+          if (DepletionTestCase (simTimeS, updateIntervalS))
+            {
+              ret = 1;
+              std::cerr << "Depletion test case problem." << std::endl;
+            }
+          // reset callback count
+          m_callbackCount = 0;
+        }
+    }
+  return ret;
+}
+
+void
+BasicEnergyDepletionTest::DepletionHandler (void)
+{
+  m_callbackCount++;
+}
+
+bool
+BasicEnergyDepletionTest::DepletionTestCase (double simTimeS,
+                                             double updateIntervalS)
+{
+  // create node
+  NodeContainer c;
+  c.Create (m_numOfNodes);
+
+  std::string phyMode ("DsssRate1Mbps");
+
+  // disable fragmentation for frames below 2200 bytes
+  Config::SetDefault ("ns3::WifiRemoteStationManager::FragmentationThreshold",
+                      StringValue ("2200"));
+  // turn off RTS/CTS for frames below 2200 bytes
+  Config::SetDefault ("ns3::WifiRemoteStationManager::RtsCtsThreshold",
+                      StringValue ("2200"));
+  // Fix non-unicast data rate to be the same as that of unicast
+  Config::SetDefault ("ns3::WifiRemoteStationManager::NonUnicastMode",
+                      StringValue (phyMode));
+
+  // install YansWifiPhy
+  WifiHelper wifi;
+  wifi.SetStandard (WIFI_PHY_STANDARD_80211b);
+
+  YansWifiPhyHelper wifiPhy =  YansWifiPhyHelper::Default ();
+  /*
+   * This is one parameter that matters when using FixedRssLossModel, set it to
+   * zero; otherwise, gain will be added.
+   */
+  wifiPhy.Set ("RxGain", DoubleValue (0));
+  // ns-3 supports RadioTap and Prism tracing extensions for 802.11b
+  wifiPhy.SetPcapDataLinkType (YansWifiPhyHelper::DLT_IEEE802_11_RADIO);
+
+  YansWifiChannelHelper wifiChannel;
+  wifiChannel.SetPropagationDelay ("ns3::ConstantSpeedPropagationDelayModel");
+  wifiPhy.SetChannel (wifiChannel.Create ());
+
+  // Add a non-QoS upper MAC, and disable rate control
+  NqosWifiMacHelper wifiMac = NqosWifiMacHelper::Default ();
+  wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager",
+                                "DataMode", StringValue (phyMode),
+                                "ControlMode", StringValue (phyMode));
+  // Set it to ad-hoc mode
+  wifiMac.SetType ("ns3::AdhocWifiMac");
+  NetDeviceContainer devices = wifi.Install (wifiPhy, wifiMac, c);
+
+  /*
+   * Create and install energy source and a single basic radio energy model on
+   * the node using helpers.
+   */
+  // source helper
+  BasicEnergySourceHelper basicSourceHelper;
+  // set energy to 0 so that we deplete energy at the beginning of simulation
+  basicSourceHelper.Set ("BasicEnergySourceInitialEnergyJ", DoubleValue (0.0));
+  // set update interval
+  basicSourceHelper.Set ("PeriodicEnergyUpdateInterval",
+                         TimeValue (Seconds (updateIntervalS)));
+  // install source
+  EnergySourceContainer sources = basicSourceHelper.Install (c);
+
+  // device energy model helper
+  WifiRadioEnergyModelHelper radioEnergyHelper;
+  // set energy depletion callback
+  WifiRadioEnergyModel::WifiRadioEnergyDepletionCallback callback =
+    MakeCallback (&BasicEnergyDepletionTest::DepletionHandler, this);
+  radioEnergyHelper.SetDepletionCallback (callback);
+  // install on node
+  DeviceEnergyModelContainer deviceModels = radioEnergyHelper.Install (devices, sources);
+
+  // run simulation
+  Simulator::Stop (Seconds (simTimeS));
+  Simulator::Run ();
+  Simulator::Destroy ();
+
+  NS_LOG_DEBUG ("Simulation time = " << simTimeS << "s");
+  NS_LOG_DEBUG ("Update interval = " << updateIntervalS << "s");
+  NS_LOG_DEBUG ("Expected callback count is " << m_numOfNodes);
+  NS_LOG_DEBUG ("Actual callback count is " << m_callbackCount);
+
+  // check result, call back should only be invoked once
+  if (m_numOfNodes != m_callbackCount)
+    {
+      std::cerr << "Not all callbacks are invoked!" << std::endl;
+      return true;
+    }
+
+  return false;
+}
+
+// -------------------------------------------------------------------------- //
+
+int
+main (int argc, char **argv)
+{
+  BasicEnergyUpdateTest testEnergyUpdate;
+  if (testEnergyUpdate.DoRun ())
+    {
+      return 1;
+    }
+
+  BasicEnergyDepletionTest testEnergyDepletion;
+  if (testEnergyDepletion.DoRun ())
+    {
+      return 1;
+    }
+
+  return 0;
+}
diff --git a/src/energy/test/rv-battery-model-test.cc b/src/energy/examples/rv-battery-model-test.cc
rename from src/energy/test/rv-battery-model-test.cc
rename to src/energy/examples/rv-battery-model-test.cc
--- a/src/energy/test/rv-battery-model-test.cc
+++ b/src/energy/examples/rv-battery-model-test.cc
@@ -25,7 +25,6 @@
 #include "ns3/energy-source-container.h"
 #include "ns3/device-energy-model-container.h"
 #include "ns3/log.h"
-#include "ns3/test.h"
 #include "ns3/node.h"
 #include "ns3/simulator.h"
 #include "ns3/double.h"
@@ -40,30 +39,31 @@
 NS_LOG_COMPONENT_DEFINE ("RvBatteryModelTestSuite");
 
 /**
- * Test case of update remaining energy for RvBatteryModel and
- * WifiRadioEnergyModel.
+ * This example was originally devised as a test, then it was converted
+ * to an example.
+ *
+ * The script tests the remaining energy for RvBatteryModel and
+ * WifiRadioEnergyModel updates. It does so by
+ * mimicking the procedure and results published in
+ * D. Rakhmatov, S. Vrudhula, D.A. Wallach, "Battery lifetime prediction for energy-aware computing,"
+ * Proceedings of the 2002 International Symposium on Low Power Electronics and Design, 2002. ISLPED '02.
+ * doi: 10.1109/LPE.2002.146729
  */
-class BatteryLifetimeTest : public TestCase
+class BatteryLifetimeTest
 {
 public:
   BatteryLifetimeTest ();
   virtual ~BatteryLifetimeTest ();
 
-private:
   /**
-   * Creates load profiles according to "Battery Lifetime Prediction for Energy-
-   * Aware Computing" paper.
+   * Creates load profiles according to
+   * D. Rakhmatov, S. Vrudhula, D.A. Wallach, "Battery lifetime prediction for energy-aware computing,"
+   * Proceedings of the 2002 International Symposium on Low Power Electronics and Design, 2002. ISLPED '02.
+   * doi: 10.1109/LPE.2002.146729
    */
   void CreateLoadProfiles (void);
 
   /**
-   * \returns False if no error occurs.
-   *
-   * Runs test.
-   */
-  void DoRun (void);
-
-  /**
    * \param load Load value, in Amperes (A).
    * \param expLifetime Expected lifetime.
    * \return False if no error occurs.
@@ -86,7 +86,6 @@
                          std::vector<Time> timeStamps,
                          Time expLifetime);
 
-private:
   typedef struct LoadProfile
   {
     std::vector<double> loads;
@@ -95,14 +94,12 @@
     Time dualFoilLifeTime;
   } LoadProfile;
 
-private:
   std::vector<LoadProfile> m_loadProfiles;
   double m_alpha;
   double m_beta;
 };
 
 BatteryLifetimeTest::BatteryLifetimeTest ()
-  : TestCase ("RV battery model battery lifetime test case.")
 {
   // Itsy battery
   m_alpha = 35220;
@@ -637,56 +634,78 @@
   timeStamps.clear ();
 }
 
-void
-BatteryLifetimeTest::DoRun (void)
+int
+main (int argc, char **argv)
 {
   NS_LOG_DEBUG ("Constant load run.");
 
-  // 640mA
-  NS_TEST_ASSERT_MSG_EQ (ConstantLoadTest (0.640, Seconds (2844.0)), false,  "Problems with constant load test (640mA).");
-  // 320mA
-  NS_TEST_ASSERT_MSG_EQ (ConstantLoadTest (0.320, Seconds (6146.0)), false,  "Problems with constant load test (320mA).");
-  // 128mA
-  NS_TEST_ASSERT_MSG_EQ (ConstantLoadTest (0.128, Seconds (16052.0)), false,  "Problems with constant load test (128mA).");
-  // 64mA
-  NS_TEST_ASSERT_MSG_EQ (ConstantLoadTest (0.064, Seconds (32561.0)), false,  "Problems with constant load test (64mA).");
-  // 32mA
-  NS_TEST_ASSERT_MSG_EQ (ConstantLoadTest (0.032, Seconds (65580.0)), false,  "Problems with constant load test (32).");
+  BatteryLifetimeTest test;
+  int ret = 0;
+
+  if (test.ConstantLoadTest (0.640, Seconds (2844.0)))
+    {
+      ret = 1;
+      std::cerr << "Problems with constant load test (640mA)." << std::endl;
+    }
+  if (test.ConstantLoadTest (0.320, Seconds (6146.0)))
+    {
+      ret = 1;
+      std::cerr << "Problems with constant load test (320mA)." << std::endl;
+    }
+  if (test.ConstantLoadTest (0.128, Seconds (16052.0)))
+    {
+      ret = 1;
+      std::cerr << "Problems with constant load test (128mA)." << std::endl;
+    }
+  if (test.ConstantLoadTest (0.064, Seconds (32561.0)))
+    {
+      ret = 1;
+      std::cerr << "Problems with constant load test (64mA)." << std::endl;
+    }
+  if (test.ConstantLoadTest (0.032, Seconds (65580.0)))
+    {
+      ret = 1;
+      std::cerr << "Problems with constant load test (32mA)." << std::endl;
+    }
 
   // create load profiles for variable load test
-  CreateLoadProfiles ();
+  test.CreateLoadProfiles ();
 
   // variable load with Itsy battery
   NS_LOG_DEBUG ("\n\nItsy");
-  m_alpha = 35220;
-  m_beta = 0.637;
-  for (uint32_t i = 0; i < m_loadProfiles.size (); i++)
+  test.m_alpha = 35220;
+  test.m_beta = 0.637;
+  for (uint32_t i = 0; i < test.m_loadProfiles.size (); i++)
     {
       NS_LOG_DEBUG ("========");
       NS_LOG_DEBUG ("Variable load profile C" << i + 1);
-      if (VariableLoadTest (m_loadProfiles[i].loads,
-                            m_loadProfiles[i].timeStamps,
-                            m_loadProfiles[i].itsyLifetime))
+      if (test.VariableLoadTest (test.m_loadProfiles[i].loads,
+                                 test.m_loadProfiles[i].timeStamps,
+                                 test.m_loadProfiles[i].itsyLifetime))
         {
-          return;
+          ret = 1;
+          std::cerr << "Problems with variable load test (Itsy)." << std::endl;
         }
     }
 
   // variable load with DUALFOIL battery
   NS_LOG_DEBUG ("\n\nDUALFOIL");
-  m_alpha = 40027;
-  m_beta = 0.276;
-  for (uint32_t i = 0; i < m_loadProfiles.size (); i++)
+  test.m_alpha = 40027;
+  test.m_beta = 0.276;
+  for (uint32_t i = 0; i < test.m_loadProfiles.size (); i++)
     {
       NS_LOG_DEBUG ("========");
       NS_LOG_DEBUG ("Variable load profile C" << i + 1);
-      if (VariableLoadTest (m_loadProfiles[i].loads,
-                            m_loadProfiles[i].timeStamps,
-                            m_loadProfiles[i].dualFoilLifeTime))
+      if (test.VariableLoadTest (test.m_loadProfiles[i].loads,
+                                 test.m_loadProfiles[i].timeStamps,
+                                 test.m_loadProfiles[i].dualFoilLifeTime))
         {
-          return;
+          ret = 1;
+          std::cerr << "Problems with variable load test (DUALFOIL)." << std::endl;
         }
     }
+
+  return ret;
 }
 
 bool
@@ -761,14 +780,13 @@
   NS_LOG_DEBUG ("Expected lifetime = " << expLifetime.GetSeconds () << "s");
   NS_LOG_DEBUG ("Actual lifetime = " << actualLifetime.GetSeconds () << "s");
 
-  NS_TEST_ASSERT_MSG_EQ_RETURNS_BOOL (actualLifetime, expLifetime, "Incorrect lifetime!");
-  /*
-  NS_TEST_ASSERT_MSG_EQ_TOL_RETURNS_BOOL (actualLifetime.GetSeconds () / 60,
-                                         expLifetime.GetSeconds () / 60, 0.1,
-                                         "Incorrect lifetime!");
-   */
+  Simulator::Destroy ();
 
-  Simulator::Destroy ();
+  if (actualLifetime != expLifetime)
+    {
+      std::cerr << "ConstantLoadTest: Incorrect lifetime for load " << load << std::endl;
+      return true;
+    }
 
   return false; // error free
 }
@@ -859,34 +877,16 @@
   NS_LOG_DEBUG ("Actual lifetime = " << actualLifetime.GetSeconds () << "s");
   NS_LOG_DEBUG ("Difference = " << expLifetime.GetSeconds () - actualLifetime.GetSeconds () << "s");
 
-  //NS_TEST_ASSERT_MSG_EQ_RETURNS_BOOL (actualLifetime, expLifetime, "Incorrect lifetime!");
-  NS_TEST_ASSERT_MSG_EQ_TOL_RETURNS_BOOL (actualLifetime.GetSeconds (), expLifetime.GetSeconds (),
-                                          120, // error tolerance = 120s
-                                          "Incorrect lifetime!");
+  Simulator::Destroy ();
 
-  Simulator::Destroy ();
+  // error tolerance = 120s
+  if ((actualLifetime.GetSeconds ()) > (expLifetime.GetSeconds ()) + (120) ||
+      (actualLifetime.GetSeconds ()) < (expLifetime.GetSeconds ()) - (120))
+    {
+      std::cerr << "VariableLoadTest: Incorrect lifetime." << std::endl;
+      return true;
+    }
 
   return false;   // error free
 }
 
-// -------------------------------------------------------------------------- //
-
-/**
- * Unit test suite for energy model. Although the test suite involves 2 modules
- * it is still considered a unit test. Because a DeviceEnergyModel cannot live
- * without an EnergySource.
- */
-class RvBatteryModelTestSuite : public TestSuite
-{
-public:
-  RvBatteryModelTestSuite ();
-};
-
-RvBatteryModelTestSuite::RvBatteryModelTestSuite ()
-  : TestSuite ("rv-battery-model", SYSTEM)
-{
-  AddTestCase (new BatteryLifetimeTest, TestCase::QUICK);
-}
-
-// create an instance of the test suite
-static RvBatteryModelTestSuite g_rvBatteryModelTestSuite;
diff --git a/src/energy/examples/wscript b/src/energy/examples/wscript
--- a/src/energy/examples/wscript
+++ b/src/energy/examples/wscript
@@ -6,3 +6,10 @@
 
     obj = bld.create_ns3_program('li-ion-energy-source', ['core', 'energy'])
     obj.source = 'li-ion-energy-source.cc'
+
+    obj = bld.create_ns3_program('rv-battery-model-test', ['core', 'energy', 'wifi'])
+    obj.source = 'rv-battery-model-test.cc'
+    
+    obj = bld.create_ns3_program('basic-energy-model-test', ['core', 'energy', 'wifi'])
+    obj.source = 'basic-energy-model-test.cc'
+    
\ No newline at end of file
diff --git a/src/energy/helper/wifi-radio-energy-model-helper.cc b/src/energy/helper/wifi-radio-energy-model-helper.cc
deleted file mode 100644
--- a/src/energy/helper/wifi-radio-energy-model-helper.cc
+++ /dev/null
@@ -1,143 +0,0 @@
-/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/*
- * 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: Sidharth Nabar <snabar@uw.edu>, He Wu <mdzz@u.washington.edu>
- */
-
-#include "wifi-radio-energy-model-helper.h"
-#include "basic-energy-source-helper.h"
-#include "ns3/wifi-phy.h"
-#include "ns3/wifi-net-device.h"
-#include "ns3/config.h"
-#include "ns3/names.h"
-#include "ns3/wifi-tx-current-model.h"
-
-namespace ns3 {
-
-WifiRadioEnergyModelHelper::WifiRadioEnergyModelHelper ()
-{
-  m_radioEnergy.SetTypeId ("ns3::WifiRadioEnergyModel");
-  m_depletionCallback.Nullify ();
-  m_rechargedCallback.Nullify ();
-}
-
-WifiRadioEnergyModelHelper::~WifiRadioEnergyModelHelper ()
-{
-}
-
-void
-WifiRadioEnergyModelHelper::Set (std::string name, const AttributeValue &v)
-{
-  m_radioEnergy.Set (name, v);
-}
-
-void
-WifiRadioEnergyModelHelper::SetDepletionCallback (
-  WifiRadioEnergyModel::WifiRadioEnergyDepletionCallback callback)
-{
-  m_depletionCallback = callback;
-}
-
-void
-WifiRadioEnergyModelHelper::SetRechargedCallback (
-  WifiRadioEnergyModel::WifiRadioEnergyRechargedCallback callback)
-{
-  m_rechargedCallback = callback;
-}
-
-void
-WifiRadioEnergyModelHelper::SetTxCurrentModel (std::string name,
-                                               std::string n0, const AttributeValue& v0,
-                                               std::string n1, const AttributeValue& v1,
-                                               std::string n2, const AttributeValue& v2,
-                                               std::string n3, const AttributeValue& v3,
-                                               std::string n4, const AttributeValue& v4,
-                                               std::string n5, const AttributeValue& v5,
-                                               std::string n6, const AttributeValue& v6,
-                                               std::string n7, const AttributeValue& v7)
-{
-  ObjectFactory factory;
-  factory.SetTypeId (name);
-  factory.Set (n0, v0);
-  factory.Set (n1, v1);
-  factory.Set (n2, v2);
-  factory.Set (n3, v3);
-  factory.Set (n4, v4);
-  factory.Set (n5, v5);
-  factory.Set (n6, v6);
-  factory.Set (n7, v7);
-  m_txCurrentModel = factory;
-}
-
-
-/*
- * Private function starts here.
- */
-
-Ptr<DeviceEnergyModel>
-WifiRadioEnergyModelHelper::DoInstall (Ptr<NetDevice> device,
-                                       Ptr<EnergySource> source) const
-{
-  NS_ASSERT (device != NULL);
-  NS_ASSERT (source != NULL);
-  // check if device is WifiNetDevice
-  std::string deviceName = device->GetInstanceTypeId ().GetName ();
-  if (deviceName.compare ("ns3::WifiNetDevice") != 0)
-    {
-      NS_FATAL_ERROR ("NetDevice type is not WifiNetDevice!");
-    }
-  Ptr<Node> node = device->GetNode ();
-  Ptr<WifiRadioEnergyModel> model = m_radioEnergy.Create ()->GetObject<WifiRadioEnergyModel> ();
-  NS_ASSERT (model != NULL);
-  // set energy source pointer
-  model->SetEnergySource (source);
-  // set energy depletion callback
-  // if none is specified, make a callback to WifiPhy::SetSleepMode
-  Ptr<WifiNetDevice> wifiDevice = DynamicCast<WifiNetDevice> (device);
-  Ptr<WifiPhy> wifiPhy = wifiDevice->GetPhy ();
-  if (m_depletionCallback.IsNull ())
-    {
-      model->SetEnergyDepletionCallback (MakeCallback (&WifiPhy::SetSleepMode, wifiPhy));
-    }
-  else
-    {
-      model->SetEnergyDepletionCallback (m_depletionCallback);
-    }
-  // set energy recharged callback
-  // if none is specified, make a callback to WifiPhy::ResumeFromSleep
-  if (m_rechargedCallback.IsNull ())
-    {
-      model->SetEnergyRechargedCallback (MakeCallback (&WifiPhy::ResumeFromSleep, wifiPhy));
-    }
-  else
-    {
-      model->SetEnergyRechargedCallback (m_rechargedCallback);
-    }
-  // add model to device model list in energy source
-  source->AppendDeviceEnergyModel (model);
-  // create and register energy model phy listener
-  wifiPhy->RegisterListener (model->GetPhyListener ());
-  //
-  if (m_txCurrentModel.GetTypeId ().GetUid ())
-    {
-      Ptr<WifiTxCurrentModel> txcurrent = m_txCurrentModel.Create<WifiTxCurrentModel> ();
-      model->SetTxCurrentModel (txcurrent);
-    }
-  return model;
-}
-
-} // namespace ns3
diff --git a/src/energy/helper/wifi-radio-energy-model-helper.h b/src/energy/helper/wifi-radio-energy-model-helper.h
deleted file mode 100644
--- a/src/energy/helper/wifi-radio-energy-model-helper.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/*
-* 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
-*
-* Author: Sidharth Nabar <snabar@uw.edu>, He Wu <mdzz@u.washington.edu>
-*/
-
-#ifndef WIFI_RADIO_ENERGY_MODEL_HELPER_H
-#define WIFI_RADIO_ENERGY_MODEL_HELPER_H
-
-#include "energy-model-helper.h"
-#include "ns3/wifi-radio-energy-model.h"
-
-namespace ns3 {
-
-/**
- * \ingroup energy
- * \brief Assign WifiRadioEnergyModel to wifi devices.
- *
- * This installer installs WifiRadioEnergyModel for only WifiNetDevice objects.
- *
- */
-class WifiRadioEnergyModelHelper : public DeviceEnergyModelHelper
-{
-public:
-  /**
-   * Construct a helper which is used to add a radio energy model to a node
-   */
-  WifiRadioEnergyModelHelper ();
-
-  /**
-   * Destroy a RadioEnergy Helper
-   */
-  ~WifiRadioEnergyModelHelper ();
-
-  /**
-   * \param name the name of the attribute to set
-   * \param v the value of the attribute
-   *
-   * Sets an attribute of the underlying PHY object.
-   */
-  void Set (std::string name, const AttributeValue &v);
-
-  /**
-   * \param callback Callback function for energy depletion handling.
-   *
-   * Sets the callback to be invoked when energy is depleted.
-   */
-  void SetDepletionCallback (
-    WifiRadioEnergyModel::WifiRadioEnergyDepletionCallback callback);
-
-  /**
-   * \param callback Callback function for energy recharged handling.
-   *
-   * Sets the callback to be invoked when energy is recharged.
-   */
-  void SetRechargedCallback (
-    WifiRadioEnergyModel::WifiRadioEnergyRechargedCallback callback);
-
-  /**
-   * \param name the name of the model to set
-   * \param n0 the name of the attribute to set
-   * \param v0 the value of the attribute to set
-   * \param n1 the name of the attribute to set
-   * \param v1 the value of the attribute to set
-   * \param n2 the name of the attribute to set
-   * \param v2 the value of the attribute to set
-   * \param n3 the name of the attribute to set
-   * \param v3 the value of the attribute to set
-   * \param n4 the name of the attribute to set
-   * \param v4 the value of the attribute to set
-   * \param n5 the name of the attribute to set
-   * \param v5 the value of the attribute to set
-   * \param n6 the name of the attribute to set
-   * \param v6 the value of the attribute to set
-   * \param n7 the name of the attribute to set
-   * \param v7 the value of the attribute to set
-   *
-   * Configure a propagation delay for this channel.
-   */
-  void SetTxCurrentModel (std::string name,
-                          std::string n0 = "", const AttributeValue &v0 = EmptyAttributeValue (),
-                          std::string n1 = "", const AttributeValue &v1 = EmptyAttributeValue (),
-                          std::string n2 = "", const AttributeValue &v2 = EmptyAttributeValue (),
-                          std::string n3 = "", const AttributeValue &v3 = EmptyAttributeValue (),
-                          std::string n4 = "", const AttributeValue &v4 = EmptyAttributeValue (),
-                          std::string n5 = "", const AttributeValue &v5 = EmptyAttributeValue (),
-                          std::string n6 = "", const AttributeValue &v6 = EmptyAttributeValue (),
-                          std::string n7 = "", const AttributeValue &v7 = EmptyAttributeValue ());
-
-private:
-  /**
-   * \param device Pointer to the NetDevice to install DeviceEnergyModel.
-   * \param source Pointer to EnergySource to install.
-   *
-   * Implements DeviceEnergyModel::Install.
-   */
-  virtual Ptr<DeviceEnergyModel> DoInstall (Ptr<NetDevice> device,
-                                            Ptr<EnergySource> source) const;
-
-private:
-  ObjectFactory m_radioEnergy;
-  WifiRadioEnergyModel::WifiRadioEnergyDepletionCallback m_depletionCallback;
-  WifiRadioEnergyModel::WifiRadioEnergyRechargedCallback m_rechargedCallback;
-  ObjectFactory m_txCurrentModel;
-
-};
-
-} // namespace ns3
-
-#endif /* WIFI_RADIO_ENERGY_MODEL_HELPER_H */
diff --git a/src/energy/model/wifi-radio-energy-model.cc b/src/energy/model/wifi-radio-energy-model.cc
deleted file mode 100644
--- a/src/energy/model/wifi-radio-energy-model.cc
+++ /dev/null
@@ -1,572 +0,0 @@
-/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/*
- * 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
- *
- * Author: Sidharth Nabar <snabar@uw.edu>, He Wu <mdzz@u.washington.edu>
- */
-
-#include "ns3/log.h"
-#include "ns3/double.h"
-#include "ns3/simulator.h"
-#include "ns3/trace-source-accessor.h"
-#include "ns3/pointer.h"
-#include "energy-source.h"
-#include "wifi-radio-energy-model.h"
-#include "wifi-tx-current-model.h"
-
-namespace ns3 {
-
-NS_LOG_COMPONENT_DEFINE ("WifiRadioEnergyModel");
-
-NS_OBJECT_ENSURE_REGISTERED (WifiRadioEnergyModel);
-
-TypeId
-WifiRadioEnergyModel::GetTypeId (void)
-{
-  static TypeId tid = TypeId ("ns3::WifiRadioEnergyModel")
-    .SetParent<DeviceEnergyModel> ()
-    .SetGroupName ("Energy")
-    .AddConstructor<WifiRadioEnergyModel> ()
-    .AddAttribute ("IdleCurrentA",
-                   "The default radio Idle current in Ampere.",
-                   DoubleValue (0.273),  // idle mode = 273mA
-                   MakeDoubleAccessor (&WifiRadioEnergyModel::SetIdleCurrentA,
-                                       &WifiRadioEnergyModel::GetIdleCurrentA),
-                   MakeDoubleChecker<double> ())
-    .AddAttribute ("CcaBusyCurrentA",
-                   "The default radio CCA Busy State current in Ampere.",
-                   DoubleValue (0.273),  // default to be the same as idle mode
-                   MakeDoubleAccessor (&WifiRadioEnergyModel::SetCcaBusyCurrentA,
-                                       &WifiRadioEnergyModel::GetCcaBusyCurrentA),
-                   MakeDoubleChecker<double> ())
-    .AddAttribute ("TxCurrentA",
-                   "The radio Tx current in Ampere.",
-                   DoubleValue (0.380),    // transmit at 0dBm = 380mA
-                   MakeDoubleAccessor (&WifiRadioEnergyModel::SetTxCurrentA,
-                                       &WifiRadioEnergyModel::GetTxCurrentA),
-                   MakeDoubleChecker<double> ())
-    .AddAttribute ("RxCurrentA",
-                   "The radio Rx current in Ampere.",
-                   DoubleValue (0.313),    // receive mode = 313mA
-                   MakeDoubleAccessor (&WifiRadioEnergyModel::SetRxCurrentA,
-                                       &WifiRadioEnergyModel::GetRxCurrentA),
-                   MakeDoubleChecker<double> ())
-    .AddAttribute ("SwitchingCurrentA",
-                   "The default radio Channel Switch current in Ampere.",
-                   DoubleValue (0.273),  // default to be the same as idle mode
-                   MakeDoubleAccessor (&WifiRadioEnergyModel::SetSwitchingCurrentA,
-                                       &WifiRadioEnergyModel::GetSwitchingCurrentA),
-                   MakeDoubleChecker<double> ())
-    .AddAttribute ("SleepCurrentA",
-                   "The radio Sleep current in Ampere.",
-                   DoubleValue (0.033),  // sleep mode = 33mA
-                   MakeDoubleAccessor (&WifiRadioEnergyModel::SetSleepCurrentA,
-                                       &WifiRadioEnergyModel::GetSleepCurrentA),
-                   MakeDoubleChecker<double> ())
-    .AddAttribute ("TxCurrentModel", "A pointer to the attached tx current model.",
-                   PointerValue (),
-                   MakePointerAccessor (&WifiRadioEnergyModel::m_txCurrentModel),
-                   MakePointerChecker<WifiTxCurrentModel> ())
-    .AddTraceSource ("TotalEnergyConsumption",
-                     "Total energy consumption of the radio device.",
-                     MakeTraceSourceAccessor (&WifiRadioEnergyModel::m_totalEnergyConsumption),
-                     "ns3::TracedValue::DoubleCallback")
-  ; 
-  return tid;
-}
-
-WifiRadioEnergyModel::WifiRadioEnergyModel ()
-{
-  NS_LOG_FUNCTION (this);
-  m_currentState = WifiPhy::IDLE;  // initially IDLE
-  m_lastUpdateTime = Seconds (0.0);
-  m_nPendingChangeState = 0;
-  m_isSupersededChangeState = false;
-  m_energyDepletionCallback.Nullify ();
-  m_source = NULL;
-  // set callback for WifiPhy listener
-  m_listener = new WifiRadioEnergyModelPhyListener;
-  m_listener->SetChangeStateCallback (MakeCallback (&DeviceEnergyModel::ChangeState, this));
-  // set callback for updating the tx current
-  m_listener->SetUpdateTxCurrentCallback (MakeCallback (&WifiRadioEnergyModel::SetTxCurrentFromModel, this));
-}
-
-WifiRadioEnergyModel::~WifiRadioEnergyModel ()
-{
-  NS_LOG_FUNCTION (this);
-  delete m_listener;
-}
-
-void
-WifiRadioEnergyModel::SetEnergySource (Ptr<EnergySource> source)
-{
-  NS_LOG_FUNCTION (this << source);
-  NS_ASSERT (source != NULL);
-  m_source = source;
-}
-
-double
-WifiRadioEnergyModel::GetTotalEnergyConsumption (void) const
-{
-  NS_LOG_FUNCTION (this);
-  return m_totalEnergyConsumption;
-}
-
-double
-WifiRadioEnergyModel::GetIdleCurrentA (void) const
-{
-  NS_LOG_FUNCTION (this);
-  return m_idleCurrentA;
-}
-
-void
-WifiRadioEnergyModel::SetIdleCurrentA (double idleCurrentA)
-{
-  NS_LOG_FUNCTION (this << idleCurrentA);
-  m_idleCurrentA = idleCurrentA;
-}
-
-double
-WifiRadioEnergyModel::GetCcaBusyCurrentA (void) const
-{
-  NS_LOG_FUNCTION (this);
-  return m_ccaBusyCurrentA;
-}
-
-void
-WifiRadioEnergyModel::SetCcaBusyCurrentA (double CcaBusyCurrentA)
-{
-  NS_LOG_FUNCTION (this << CcaBusyCurrentA);
-  m_ccaBusyCurrentA = CcaBusyCurrentA;
-}
-
-double
-WifiRadioEnergyModel::GetTxCurrentA (void) const
-{
-  NS_LOG_FUNCTION (this);
-  return m_txCurrentA;
-}
-
-void
-WifiRadioEnergyModel::SetTxCurrentA (double txCurrentA)
-{
-  NS_LOG_FUNCTION (this << txCurrentA);
-  m_txCurrentA = txCurrentA;
-}
-
-double
-WifiRadioEnergyModel::GetRxCurrentA (void) const
-{
-  NS_LOG_FUNCTION (this);
-  return m_rxCurrentA;
-}
-
-void
-WifiRadioEnergyModel::SetRxCurrentA (double rxCurrentA)
-{
-  NS_LOG_FUNCTION (this << rxCurrentA);
-  m_rxCurrentA = rxCurrentA;
-}
-
-double
-WifiRadioEnergyModel::GetSwitchingCurrentA (void) const
-{
-  NS_LOG_FUNCTION (this);
-  return m_switchingCurrentA;
-}
-
-void
-WifiRadioEnergyModel::SetSwitchingCurrentA (double switchingCurrentA)
-{
-  NS_LOG_FUNCTION (this << switchingCurrentA);
-  m_switchingCurrentA = switchingCurrentA;
-}
-
-double
-WifiRadioEnergyModel::GetSleepCurrentA (void) const
-{
-  NS_LOG_FUNCTION (this);
-  return m_sleepCurrentA;
-}
-
-void
-WifiRadioEnergyModel::SetSleepCurrentA (double sleepCurrentA)
-{
-  NS_LOG_FUNCTION (this << sleepCurrentA);
-  m_sleepCurrentA = sleepCurrentA;
-}
-
-WifiPhy::State
-WifiRadioEnergyModel::GetCurrentState (void) const
-{
-  NS_LOG_FUNCTION (this);
-  return m_currentState;
-}
-
-void
-WifiRadioEnergyModel::SetEnergyDepletionCallback (
-  WifiRadioEnergyDepletionCallback callback)
-{
-  NS_LOG_FUNCTION (this);
-  if (callback.IsNull ())
-    {
-      NS_LOG_DEBUG ("WifiRadioEnergyModel:Setting NULL energy depletion callback!");
-    }
-  m_energyDepletionCallback = callback;
-}
-
-void
-WifiRadioEnergyModel::SetEnergyRechargedCallback (
-  WifiRadioEnergyRechargedCallback callback)
-{
-  NS_LOG_FUNCTION (this);
-  if (callback.IsNull ())
-    {
-      NS_LOG_DEBUG ("WifiRadioEnergyModel:Setting NULL energy recharged callback!");
-    }
-  m_energyRechargedCallback = callback;
-}
-
-void
-WifiRadioEnergyModel::SetTxCurrentModel (Ptr<WifiTxCurrentModel> model)
-{
-  m_txCurrentModel = model;
-}
-
-void
-WifiRadioEnergyModel::SetTxCurrentFromModel (double txPowerDbm)
-{
-  if (m_txCurrentModel)
-    {
-      m_txCurrentA = m_txCurrentModel->CalcTxCurrent (txPowerDbm);
-    }
-}
-
-void
-WifiRadioEnergyModel::ChangeState (int newState)
-{
-  NS_LOG_FUNCTION (this << newState);
-
-  Time duration = Simulator::Now () - m_lastUpdateTime;
-  NS_ASSERT (duration.GetNanoSeconds () >= 0); // check if duration is valid
-
-  // energy to decrease = current * voltage * time
-  double energyToDecrease = 0.0;
-  double supplyVoltage = m_source->GetSupplyVoltage ();
-  switch (m_currentState)
-    {
-    case WifiPhy::IDLE:
-      energyToDecrease = duration.GetSeconds () * m_idleCurrentA * supplyVoltage;
-      break;
-    case WifiPhy::CCA_BUSY:
-      energyToDecrease = duration.GetSeconds () * m_ccaBusyCurrentA * supplyVoltage;
-      break;
-    case WifiPhy::TX:
-      energyToDecrease = duration.GetSeconds () * m_txCurrentA * supplyVoltage;
-      break;
-    case WifiPhy::RX:
-      energyToDecrease = duration.GetSeconds () * m_rxCurrentA * supplyVoltage;
-      break;
-    case WifiPhy::SWITCHING:
-      energyToDecrease = duration.GetSeconds () * m_switchingCurrentA * supplyVoltage;
-      break;
-    case WifiPhy::SLEEP:
-      energyToDecrease = duration.GetSeconds () * m_sleepCurrentA * supplyVoltage;
-      break;
-    default:
-      NS_FATAL_ERROR ("WifiRadioEnergyModel:Undefined radio state: " << m_currentState);
-    }
-
-  // update total energy consumption
-  m_totalEnergyConsumption += energyToDecrease;
-
-  // update last update time stamp
-  m_lastUpdateTime = Simulator::Now ();
-
-  m_nPendingChangeState++;
-
-  // notify energy source
-  m_source->UpdateEnergySource ();
-
-  // in case the energy source is found to be depleted during the last update, a callback might be
-  // invoked that might cause a change in the Wifi PHY state (e.g., the PHY is put into SLEEP mode).
-  // This in turn causes a new call to this member function, with the consequence that the previous
-  // instance is resumed after the termination of the new instance. In particular, the state set
-  // by the previous instance is erroneously the final state stored in m_currentState. The check below
-  // ensures that previous instances do not change m_currentState.
-
-  if (!m_isSupersededChangeState)
-    {
-      // update current state & last update time stamp
-      SetWifiRadioState ((WifiPhy::State) newState);
-
-      // some debug message
-      NS_LOG_DEBUG ("WifiRadioEnergyModel:Total energy consumption is " <<
-                    m_totalEnergyConsumption << "J");
-    }
-
-  m_isSupersededChangeState = (m_nPendingChangeState > 1);
-
-  m_nPendingChangeState--;
-}
-
-void
-WifiRadioEnergyModel::HandleEnergyDepletion (void)
-{
-  NS_LOG_FUNCTION (this);
-  NS_LOG_DEBUG ("WifiRadioEnergyModel:Energy is depleted!");
-  // invoke energy depletion callback, if set.
-  if (!m_energyDepletionCallback.IsNull ())
-    {
-      m_energyDepletionCallback ();
-    }
-}
-
-void
-WifiRadioEnergyModel::HandleEnergyRecharged (void)
-{
-  NS_LOG_FUNCTION (this);
-  NS_LOG_DEBUG ("WifiRadioEnergyModel:Energy is recharged!");
-  // invoke energy recharged callback, if set.
-  if (!m_energyRechargedCallback.IsNull ())
-    {
-      m_energyRechargedCallback ();
-    }
-}
-
-WifiRadioEnergyModelPhyListener *
-WifiRadioEnergyModel::GetPhyListener (void)
-{
-  NS_LOG_FUNCTION (this);
-  return m_listener;
-}
-
-/*
- * Private functions start here.
- */
-
-void
-WifiRadioEnergyModel::DoDispose (void)
-{
-  NS_LOG_FUNCTION (this);
-  m_source = NULL;
-  m_energyDepletionCallback.Nullify ();
-}
-
-double
-WifiRadioEnergyModel::DoGetCurrentA (void) const
-{
-  NS_LOG_FUNCTION (this);
-  switch (m_currentState)
-    {
-    case WifiPhy::IDLE:
-      return m_idleCurrentA;
-    case WifiPhy::CCA_BUSY:
-      return m_ccaBusyCurrentA;
-    case WifiPhy::TX:
-      return m_txCurrentA;
-    case WifiPhy::RX:
-      return m_rxCurrentA;
-    case WifiPhy::SWITCHING:
-      return m_switchingCurrentA;
-    case WifiPhy::SLEEP:
-      return m_sleepCurrentA;
-    default:
-      NS_FATAL_ERROR ("WifiRadioEnergyModel:Undefined radio state:" << m_currentState);
-    }
-}
-
-void
-WifiRadioEnergyModel::SetWifiRadioState (const WifiPhy::State state)
-{
-  NS_LOG_FUNCTION (this << state);
-  m_currentState = state;
-  std::string stateName;
-  switch (state)
-    {
-    case WifiPhy::IDLE:
-      stateName = "IDLE";
-      break;
-    case WifiPhy::CCA_BUSY:
-      stateName = "CCA_BUSY";
-      break;
-    case WifiPhy::TX:
-      stateName = "TX";
-      break;
-    case WifiPhy::RX:
-      stateName = "RX";
-      break;
-    case WifiPhy::SWITCHING:
-      stateName = "SWITCHING";
-      break;
-    case WifiPhy::SLEEP:
-      stateName = "SLEEP";
-      break;
-    }
-  NS_LOG_DEBUG ("WifiRadioEnergyModel:Switching to state: " << stateName <<
-                " at time = " << Simulator::Now ());
-}
-
-// -------------------------------------------------------------------------- //
-
-WifiRadioEnergyModelPhyListener::WifiRadioEnergyModelPhyListener ()
-{
-  NS_LOG_FUNCTION (this);
-  m_changeStateCallback.Nullify ();
-  m_updateTxCurrentCallback.Nullify ();
-}
-
-WifiRadioEnergyModelPhyListener::~WifiRadioEnergyModelPhyListener ()
-{
-  NS_LOG_FUNCTION (this);
-}
-
-void
-WifiRadioEnergyModelPhyListener::SetChangeStateCallback (DeviceEnergyModel::ChangeStateCallback callback)
-{
-  NS_LOG_FUNCTION (this << &callback);
-  NS_ASSERT (!callback.IsNull ());
-  m_changeStateCallback = callback;
-}
-
-void
-WifiRadioEnergyModelPhyListener::SetUpdateTxCurrentCallback (UpdateTxCurrentCallback callback)
-{
-  NS_LOG_FUNCTION (this << &callback);
-  NS_ASSERT (!callback.IsNull ());
-  m_updateTxCurrentCallback = callback;
-}
-
-void
-WifiRadioEnergyModelPhyListener::NotifyRxStart (Time duration)
-{
-  NS_LOG_FUNCTION (this << duration);
-  if (m_changeStateCallback.IsNull ())
-    {
-      NS_FATAL_ERROR ("WifiRadioEnergyModelPhyListener:Change state callback not set!");
-    }
-  m_changeStateCallback (WifiPhy::RX);
-  m_switchToIdleEvent.Cancel ();
-}
-
-void
-WifiRadioEnergyModelPhyListener::NotifyRxEndOk (void)
-{
-  NS_LOG_FUNCTION (this);
-  if (m_changeStateCallback.IsNull ())
-    {
-      NS_FATAL_ERROR ("WifiRadioEnergyModelPhyListener:Change state callback not set!");
-    }
-  m_changeStateCallback (WifiPhy::IDLE);
-}
-
-void
-WifiRadioEnergyModelPhyListener::NotifyRxEndError (void)
-{
-  NS_LOG_FUNCTION (this);
-  if (m_changeStateCallback.IsNull ())
-    {
-      NS_FATAL_ERROR ("WifiRadioEnergyModelPhyListener:Change state callback not set!");
-    }
-  m_changeStateCallback (WifiPhy::IDLE);
-}
-
-void
-WifiRadioEnergyModelPhyListener::NotifyTxStart (Time duration, double txPowerDbm)
-{
-  NS_LOG_FUNCTION (this << duration << txPowerDbm);
-  if (m_updateTxCurrentCallback.IsNull ())
-    {
-      NS_FATAL_ERROR ("WifiRadioEnergyModelPhyListener:Update tx current callback not set!");
-    }
-  m_updateTxCurrentCallback (txPowerDbm);
-  if (m_changeStateCallback.IsNull ())
-    {
-      NS_FATAL_ERROR ("WifiRadioEnergyModelPhyListener:Change state callback not set!");
-    }
-  m_changeStateCallback (WifiPhy::TX);
-  // schedule changing state back to IDLE after TX duration
-  m_switchToIdleEvent.Cancel ();
-  m_switchToIdleEvent = Simulator::Schedule (duration, &WifiRadioEnergyModelPhyListener::SwitchToIdle, this);
-}
-
-void
-WifiRadioEnergyModelPhyListener::NotifyMaybeCcaBusyStart (Time duration)
-{
-  NS_LOG_FUNCTION (this << duration);
-  if (m_changeStateCallback.IsNull ())
-    {
-      NS_FATAL_ERROR ("WifiRadioEnergyModelPhyListener:Change state callback not set!");
-    }
-  m_changeStateCallback (WifiPhy::CCA_BUSY);
-  // schedule changing state back to IDLE after CCA_BUSY duration
-  m_switchToIdleEvent.Cancel ();
-  m_switchToIdleEvent = Simulator::Schedule (duration, &WifiRadioEnergyModelPhyListener::SwitchToIdle, this);
-}
-
-void
-WifiRadioEnergyModelPhyListener::NotifySwitchingStart (Time duration)
-{
-  NS_LOG_FUNCTION (this << duration);
-  if (m_changeStateCallback.IsNull ())
-    {
-      NS_FATAL_ERROR ("WifiRadioEnergyModelPhyListener:Change state callback not set!");
-    }
-  m_changeStateCallback (WifiPhy::SWITCHING);
-  // schedule changing state back to IDLE after CCA_BUSY duration
-  m_switchToIdleEvent.Cancel ();
-  m_switchToIdleEvent = Simulator::Schedule (duration, &WifiRadioEnergyModelPhyListener::SwitchToIdle, this);
-}
-
-void
-WifiRadioEnergyModelPhyListener::NotifySleep (void)
-{
-  NS_LOG_FUNCTION (this);
-  if (m_changeStateCallback.IsNull ())
-    {
-      NS_FATAL_ERROR ("WifiRadioEnergyModelPhyListener:Change state callback not set!");
-    }
-  m_changeStateCallback (WifiPhy::SLEEP);
-  m_switchToIdleEvent.Cancel ();
-}
-
-void
-WifiRadioEnergyModelPhyListener::NotifyWakeup(void)
-{
-  NS_LOG_FUNCTION (this);
-  if (m_changeStateCallback.IsNull ())
-    {
-      NS_FATAL_ERROR ("WifiRadioEnergyModelPhyListener:Change state callback not set!");
-    }
-  m_changeStateCallback (WifiPhy::IDLE);
-}
-
-/*
- * Private function state here.
- */
-
-void
-WifiRadioEnergyModelPhyListener::SwitchToIdle (void)
-{
-  NS_LOG_FUNCTION (this);
-  if (m_changeStateCallback.IsNull ())
-    {
-      NS_FATAL_ERROR ("WifiRadioEnergyModelPhyListener:Change state callback not set!");
-    }
-  m_changeStateCallback (WifiPhy::IDLE);
-}
-
-} // namespace ns3
diff --git a/src/energy/model/wifi-radio-energy-model.h b/src/energy/model/wifi-radio-energy-model.h
deleted file mode 100644
--- a/src/energy/model/wifi-radio-energy-model.h
+++ /dev/null
@@ -1,363 +0,0 @@
-/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/*
- * 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: Sidharth Nabar <snabar@uw.edu>, He Wu <mdzz@u.washington.edu>
- */
-
-#ifndef WIFI_RADIO_ENERGY_MODEL_H
-#define WIFI_RADIO_ENERGY_MODEL_H
-
-#include "ns3/device-energy-model.h"
-#include "ns3/nstime.h"
-#include "ns3/event-id.h"
-#include "ns3/traced-value.h"
-#include "ns3/wifi-phy.h"
-
-namespace ns3 {
-
-class WifiTxCurrentModel;
-
-/**
- * \ingroup energy
- * A WifiPhy listener class for notifying the WifiRadioEnergyModel of Wifi radio
- * state change.
- *
- */
-class WifiRadioEnergyModelPhyListener : public WifiPhyListener
-{
-public:
-  /**
-   * Callback type for updating the transmit current based on the nominal tx power.
-   */
-  typedef Callback<void, double> UpdateTxCurrentCallback;
-
-  WifiRadioEnergyModelPhyListener ();
-  virtual ~WifiRadioEnergyModelPhyListener ();
-
-  /**
-   * \brief Sets the change state callback. Used by helper class.
-   *
-   * \param callback Change state callback.
-   */
-  void SetChangeStateCallback (DeviceEnergyModel::ChangeStateCallback callback);
-
-  /**
-   * \brief Sets the update tx current callback.
-   *
-   * \param callback Update tx current callback.
-   */
-  void SetUpdateTxCurrentCallback (UpdateTxCurrentCallback callback);
-
-  /**
-   * \brief Switches the WifiRadioEnergyModel to RX state.
-   *
-   * \param duration the expected duration of the packet reception.
-   *
-   * Defined in ns3::WifiPhyListener
-   */
-  virtual void NotifyRxStart (Time duration);
-
-  /**
-   * \brief Switches the WifiRadioEnergyModel back to IDLE state.
-   *
-   * Defined in ns3::WifiPhyListener
-   *
-   * Note that for the WifiRadioEnergyModel, the behavior of the function is the
-   * same as NotifyRxEndError.
-   */
-  virtual void NotifyRxEndOk (void);
-
-  /**
-   * \brief Switches the WifiRadioEnergyModel back to IDLE state.
-   *
-   * Defined in ns3::WifiPhyListener
-   *
-   * Note that for the WifiRadioEnergyModel, the behavior of the function is the
-   * same as NotifyRxEndOk.
-   */
-  virtual void NotifyRxEndError (void);
-
-  /**
-   * \brief Switches the WifiRadioEnergyModel to TX state and switches back to
-   * IDLE after TX duration.
-   *
-   * \param duration the expected transmission duration.
-   * \param txPowerDbm the nominal tx power in dBm
-   *
-   * Defined in ns3::WifiPhyListener
-   */
-  virtual void NotifyTxStart (Time duration, double txPowerDbm);
-
-  /**
-   * \param duration the expected busy duration.
-   *
-   * Defined in ns3::WifiPhyListener
-   */
-  virtual void NotifyMaybeCcaBusyStart (Time duration);
-
-  /**
-   * \param duration the expected channel switching duration.
-   *
-   * Defined in ns3::WifiPhyListener
-   */
-  virtual void NotifySwitchingStart (Time duration);
-
-  /**
-   * Defined in ns3::WifiPhyListener
-   */
-  virtual void NotifySleep (void);
-
-  /**
-   * Defined in ns3::WifiPhyListener
-   */
-  virtual void NotifyWakeup (void);
-
-private:
-  /**
-   * A helper function that makes scheduling m_changeStateCallback possible.
-   */
-  void SwitchToIdle (void);
-
-private:
-  /**
-   * Change state callback used to notify the WifiRadioEnergyModel of a state
-   * change.
-   */
-  DeviceEnergyModel::ChangeStateCallback m_changeStateCallback;
-
-  /**
-   * Callback used to update the tx current stored in WifiRadioEnergyModel based on 
-   * the nominal tx power used to transmit the current frame.
-   */
-  UpdateTxCurrentCallback m_updateTxCurrentCallback;
-
-  EventId m_switchToIdleEvent;
-};
-
-// -------------------------------------------------------------------------- //
-
-/**
- * \ingroup energy
- * \brief A WiFi radio energy model.
- * 
- * 4 states are defined for the radio: TX, RX, IDLE, SLEEP. Default state is
- * IDLE.
- * The different types of transactions that are defined are: 
- *  1. Tx: State goes from IDLE to TX, radio is in TX state for TX_duration,
- *     then state goes from TX to IDLE.
- *  2. Rx: State goes from IDLE to RX, radio is in RX state for RX_duration,
- *     then state goes from RX to IDLE.
- *  3. Go_to_Sleep: State goes from IDLE to SLEEP.
- *  4. End_of_Sleep: State goes from SLEEP to IDLE.
- * The class keeps track of what state the radio is currently in.
- *
- * Energy calculation: For each transaction, this model notifies EnergySource
- * object. The EnergySource object will query this model for the total current.
- * Then the EnergySource object uses the total current to calculate energy.
- *
- * Default values for power consumption are based on measurements reported in:
- * 
- * Daniel Halperin, Ben Greenstein, Anmol Sheth, David Wetherall,
- * "Demystifying 802.11n power consumption", Proceedings of HotPower'10 
- * 
- * Power consumption in Watts (single antenna):
- * 
- * \f$ P_{tx} = 1.14 \f$ (transmit at 0dBm)
- * 
- * \f$ P_{rx} = 0.94 \f$
- * 
- * \f$ P_{idle} = 0.82 \f$
- * 
- * \f$ P_{sleep} = 0.10 \f$
- * 
- * Hence, considering the default supply voltage of 3.0 V for the basic energy
- * source, the default current values in Ampere are:
- * 
- * \f$ I_{tx} = 0.380 \f$
- * 
- * \f$ I_{rx} = 0.313 \f$
- * 
- * \f$ I_{idle} = 0.273 \f$
- * 
- * \f$ I_{sleep} = 0.033 \f$
- * 
- * The dependence of the power consumption in transmission mode on the nominal
- * transmit power can also be achieved through a wifi tx current model.
- *
- */
-class WifiRadioEnergyModel : public DeviceEnergyModel
-{
-public:
-  /**
-   * Callback type for energy depletion handling.
-   */
-  typedef Callback<void> WifiRadioEnergyDepletionCallback;
-
-  /**
-   * Callback type for energy recharged handling.
-   */
-  typedef Callback<void> WifiRadioEnergyRechargedCallback;
-
-public:
-  static TypeId GetTypeId (void);
-  WifiRadioEnergyModel ();
-  virtual ~WifiRadioEnergyModel ();
-
-  /**
-   * \brief Sets pointer to EnergySouce installed on node.
-   *
-   * \param source Pointer to EnergySource installed on node.
-   *
-   * Implements DeviceEnergyModel::SetEnergySource.
-   */
-  virtual void SetEnergySource (Ptr<EnergySource> source);
-
-  /**
-   * \returns Total energy consumption of the wifi device.
-   *
-   * Implements DeviceEnergyModel::GetTotalEnergyConsumption.
-   */
-  virtual double GetTotalEnergyConsumption (void) const;
-
-  // Setter & getters for state power consumption.
-  double GetIdleCurrentA (void) const;
-  void SetIdleCurrentA (double idleCurrentA);
-  double GetCcaBusyCurrentA (void) const;
-  void SetCcaBusyCurrentA (double ccaBusyCurrentA);
-  double GetTxCurrentA (void) const;
-  void SetTxCurrentA (double txCurrentA);
-  double GetRxCurrentA (void) const;
-  void SetRxCurrentA (double rxCurrentA);
-  double GetSwitchingCurrentA (void) const;
-  void SetSwitchingCurrentA (double switchingCurrentA);
-  double GetSleepCurrentA (void) const;
-  void SetSleepCurrentA (double sleepCurrentA);
-
-  /**
-   * \returns Current state.
-   */
-  WifiPhy::State GetCurrentState (void) const;
-
-  /**
-   * \param callback Callback function.
-   *
-   * Sets callback for energy depletion handling.
-   */
-  void SetEnergyDepletionCallback (WifiRadioEnergyDepletionCallback callback);
-
-  /**
-   * \param callback Callback function.
-   *
-   * Sets callback for energy recharged handling.
-   */
-  void SetEnergyRechargedCallback (WifiRadioEnergyRechargedCallback callback);
-
-  /**
-   * \param model the model used to compute the wifi tx current.
-   */
-  void SetTxCurrentModel (Ptr<WifiTxCurrentModel> model);
-
-  /**
-   * \brief Calls the CalcTxCurrent method of the tx current model to
-   *        compute the tx current based on such model
-   * 
-   * \param txPowerDbm the nominal tx power in dBm
-   */
-  void SetTxCurrentFromModel (double txPowerDbm);
-
-  /**
-   * \brief Changes state of the WifiRadioEnergyMode.
-   *
-   * \param newState New state the wifi radio is in.
-   *
-   * Implements DeviceEnergyModel::ChangeState.
-   */
-  virtual void ChangeState (int newState);
-
-  /**
-   * \brief Handles energy depletion.
-   *
-   * Implements DeviceEnergyModel::HandleEnergyDepletion
-   */
-  virtual void HandleEnergyDepletion (void);
-
-  /**
-   * \brief Handles energy recharged.
-   *
-   * Implements DeviceEnergyModel::HandleEnergyRecharged
-   */
-  virtual void HandleEnergyRecharged (void);
-
-  /**
-   * \returns Pointer to the PHY listener.
-   */
-  WifiRadioEnergyModelPhyListener * GetPhyListener (void);
-
-
-private:
-  void DoDispose (void);
-
-  /**
-   * \returns Current draw of device, at current state.
-   *
-   * Implements DeviceEnergyModel::GetCurrentA.
-   */
-  virtual double DoGetCurrentA (void) const;
-
-  /**
-   * \param state New state the radio device is currently in.
-   *
-   * Sets current state. This function is private so that only the energy model
-   * can change its own state.
-   */
-  void SetWifiRadioState (const WifiPhy::State state);
-
-private:
-  Ptr<EnergySource> m_source;
-
-  // Member variables for current draw in different radio modes.
-  double m_txCurrentA;
-  double m_rxCurrentA;
-  double m_idleCurrentA;
-  double m_ccaBusyCurrentA;
-  double m_switchingCurrentA;
-  double m_sleepCurrentA;
-  Ptr<WifiTxCurrentModel> m_txCurrentModel;
-
-  // This variable keeps track of the total energy consumed by this model.
-  TracedValue<double> m_totalEnergyConsumption;
-
-  // State variables.
-  WifiPhy::State m_currentState;  // current state the radio is in
-  Time m_lastUpdateTime;          // time stamp of previous energy update
-
-  uint8_t m_nPendingChangeState;
-  bool m_isSupersededChangeState;
-
-  // Energy depletion callback
-  WifiRadioEnergyDepletionCallback m_energyDepletionCallback;
-
-  // Energy recharged callback
-  WifiRadioEnergyRechargedCallback m_energyRechargedCallback;
-
-  // WifiPhy listener
-  WifiRadioEnergyModelPhyListener *m_listener;
-};
-
-} // namespace ns3
-
-#endif /* WIFI_RADIO_ENERGY_MODEL_H */
diff --git a/src/energy/model/wifi-tx-current-model.cc b/src/energy/model/wifi-tx-current-model.cc
deleted file mode 100644
--- a/src/energy/model/wifi-tx-current-model.cc
+++ /dev/null
@@ -1,143 +0,0 @@
-/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/*
- * Copyright (c) 2014 Universita' degli Studi di Napoli "Federico II"
- *
- * 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
- *
- * Author: Stefano Avallone <stefano.avallone@unina.it>
- */
-
-#include "wifi-tx-current-model.h"
-#include "ns3/log.h"
-#include "ns3/boolean.h"
-#include "ns3/double.h"
-#include "ns3/string.h"
-#include "ns3/pointer.h"
-#include <cmath>
-
-namespace ns3 {
-
-NS_LOG_COMPONENT_DEFINE ("WifiTxCurrentModel");
-
-// ------------------------------------------------------------------------- //
-
-NS_OBJECT_ENSURE_REGISTERED (WifiTxCurrentModel);
-
-TypeId 
-WifiTxCurrentModel::GetTypeId (void)
-{
-  static TypeId tid = TypeId ("ns3::WifiTxCurrentModel")
-    .SetParent<Object> ()
-    .SetGroupName ("Energy")
-  ;
-  return tid;
-}
-
-WifiTxCurrentModel::WifiTxCurrentModel()
-{
-}
-
-WifiTxCurrentModel::~WifiTxCurrentModel()
-{
-}
-
-double
-WifiTxCurrentModel::DbmToW (double dbm)
-{
-  double mW = std::pow (10.0, dbm / 10.0);
-  return mW / 1000.0;
-}
-
-// ------------------------------------------------------------------------- //
-
-NS_OBJECT_ENSURE_REGISTERED (LinearWifiTxCurrentModel);
-
-TypeId 
-LinearWifiTxCurrentModel::GetTypeId (void)
-{
-  static TypeId tid = TypeId ("ns3::LinearWifiTxCurrentModel")
-    .SetParent<WifiTxCurrentModel> ()
-    .AddConstructor<LinearWifiTxCurrentModel> ()
-    .AddAttribute ("Eta", "The efficiency of the power amplifier.",
-                   DoubleValue (0.10),
-                   MakeDoubleAccessor (&LinearWifiTxCurrentModel::SetEta,
-                                       &LinearWifiTxCurrentModel::GetEta),
-                   MakeDoubleChecker<double> ())
-    .AddAttribute ("Voltage", "The supply voltage (in Volts).",
-                   DoubleValue (3.0),
-                   MakeDoubleAccessor (&LinearWifiTxCurrentModel::SetVoltage,
-                                       &LinearWifiTxCurrentModel::GetVoltage),
-                   MakeDoubleChecker<double> ())
-    .AddAttribute ("IdleCurrent", "The current in the IDLE state (in Watts).",
-                   DoubleValue (0.273333),
-                   MakeDoubleAccessor (&LinearWifiTxCurrentModel::SetIdleCurrent,
-                                       &LinearWifiTxCurrentModel::GetIdleCurrent),
-                   MakeDoubleChecker<double> ())
-  ;
-  return tid;
-}
-
-LinearWifiTxCurrentModel::LinearWifiTxCurrentModel ()
-{
-}
-
-LinearWifiTxCurrentModel::~LinearWifiTxCurrentModel()
-{
-}
-
-void
-LinearWifiTxCurrentModel::SetEta (double eta)
-{
-  m_eta = eta;
-}
-
-void
-LinearWifiTxCurrentModel::SetVoltage (double voltage)
-{
-  m_voltage = voltage;
-}
-
-void
-LinearWifiTxCurrentModel::SetIdleCurrent (double idleCurrent)
-{
-  m_idleCurrent = idleCurrent;
-}
-
-double
-LinearWifiTxCurrentModel::GetEta (void) const
-{
-  return m_eta;
-}
-
-double
-LinearWifiTxCurrentModel::GetVoltage (void) const
-{
-  return m_voltage;
-}
-
-double
-LinearWifiTxCurrentModel::GetIdleCurrent (void) const
-{
-  return m_idleCurrent;
-}
-
-double
-LinearWifiTxCurrentModel::CalcTxCurrent (double txPowerDbm) const
-{
-  return DbmToW (txPowerDbm) / (m_voltage * m_eta) + m_idleCurrent;
-}
-
-// ------------------------------------------------------------------------- //
-
-} // namespace ns3
diff --git a/src/energy/model/wifi-tx-current-model.h b/src/energy/model/wifi-tx-current-model.h
deleted file mode 100644
--- a/src/energy/model/wifi-tx-current-model.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/*
- * Copyright (c) 2014 Universita' degli Studi di Napoli "Federico II"
- *
- * 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
- *
- * Author: Stefano Avallone <stefano.avallone@unina.it>
- */
-
-#ifndef WIFI_TX_CURRENT_MODEL_H
-#define WIFI_TX_CURRENT_MODEL_H
-
-#include "ns3/object.h"
-
-namespace ns3 {
-
-/**
- * \ingroup energy
- * 
- * \brief Modelize the transmit current as a function of the transmit power and mode
- *
- */
-class WifiTxCurrentModel : public Object
-{
-public:
-  static TypeId GetTypeId (void);
-
-  WifiTxCurrentModel ();
-  virtual ~WifiTxCurrentModel ();
-
-  /**
-   * \param txPowerDbm the nominal tx power in dBm
-   * \returns the transmit current (in Ampere)
-   */
-  virtual double CalcTxCurrent (double txPowerDbm) const = 0;
-
-  /**
-   * Convert from dBm to Watts.
-   *
-   * \param dbm the power in dBm
-   * \return the equivalent Watts for the given dBm
-   */
-  static double DbmToW (double dbm);
-};
-
-/**
- * \ingroup energy
- *
- * \brief a linear model of the Wifi transmit current
- *
- * This model assumes that the transmit current is a linear function
- * of the nominal transmit power used to send the frame.
- * In particular, the power absorbed during the transmission of a frame \f$ W_{tx} \f$
- * is given by the power absorbed by the power amplifier \f$ W_{pa} \f$ plus the power
- * absorbed by the RF subsystem. The latter is assumed to be the same as the power
- * absorbed in the IDLE state \f$ W_{idle} \f$.
- * 
- * The efficiency \f$ \eta \f$ of the power amplifier is given by 
- * \f$ \eta = \frac{P_{tx}}{W_{pa}} \f$, where \f$ P_{tx} \f$ is the output power, i.e.,
- * the nominal transmit power. Hence, \f$ W_{pa} = \frac{P_{tx}}{\eta} \f$
- * 
- * It turns out that \f$ W_{tx} = \frac{P_{tx}}{\eta} + W_{idle} \f$. By dividing both
- * sides by the supply voltage \f$ V \f$: \f$ I_{tx} = \frac{P_{tx}}{V \cdot \eta} + I_{idle} \f$,
- * where \f$ I_{tx} \f$ and \f$ I_{idle} \f$ are, respectively, the transmit current and
- * the idle current.
- * 
- * For more information, refer to:
- * Francesco Ivan Di Piazza, Stefano Mangione, and Ilenia Tinnirello.
- * "On the Effects of Transmit Power Control on the Energy Consumption of WiFi Network Cards",
- * Proceedings of ICST QShine 2009, pp. 463--475
- * 
- * If the tx current corresponding to a given nominal transmit power is known, the efficiency
- * of the power amplifier is given by the above formula:
- * \f$ \eta = \frac{P_{tx}}{(I_{tx}-I_{idle})\cdot V} \f$
- * 
- */
-class LinearWifiTxCurrentModel : public WifiTxCurrentModel
-{
-public:
-  static TypeId GetTypeId (void);
-
-  LinearWifiTxCurrentModel ();
-  virtual ~LinearWifiTxCurrentModel ();
-  
-  /**
-   * \param eta (dimension-less)
-   *
-   * Set the power amplifier efficiency.
-   */
-  void SetEta (double eta);
-
-  /**
-   * \param voltage (Volts)
-   *
-   * Set the supply voltage.
-   */
-  void SetVoltage (double voltage);
-
-  /**
-   * \param idleCurrent (Ampere)
-   *
-   * Set the current in the IDLE state.
-   */
-  void SetIdleCurrent (double idleCurrent);
-
-  /**
-   * \return the power amplifier efficiency.
-   */
-  double GetEta (void) const;
-
-  /**
-   * \return the supply voltage.
-   */
-  double GetVoltage (void) const;
-
-  /**
-   * \return the current in the IDLE state.
-   */
-  double GetIdleCurrent (void) const;
-
-  double CalcTxCurrent (double txPowerDbm) const;
-
-private:
-  double m_eta;
-  double m_voltage;
-  double m_idleCurrent;
-};
-
-} // namespace ns3
-
-#endif /* WIFI_TX_CURRENT_MODEL_H */
diff --git a/src/energy/test/basic-energy-model-test.cc b/src/energy/test/basic-energy-model-test.cc
deleted file mode 100644
--- a/src/energy/test/basic-energy-model-test.cc
+++ /dev/null
@@ -1,393 +0,0 @@
-/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/*
- * 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
- *
- * Author: He Wu <mdzz@u.washington.edu>
- */
-
-#include "ns3/basic-energy-source.h"
-#include "ns3/wifi-radio-energy-model.h"
-#include "ns3/basic-energy-source-helper.h"
-#include "ns3/wifi-radio-energy-model-helper.h"
-#include "ns3/energy-source-container.h"
-#include "ns3/device-energy-model-container.h"
-#include "ns3/log.h"
-#include "ns3/test.h"
-#include "ns3/node.h"
-#include "ns3/simulator.h"
-#include "ns3/double.h"
-#include "ns3/config.h"
-#include "ns3/string.h"
-#include "ns3/yans-wifi-helper.h"
-#include "ns3/nqos-wifi-mac-helper.h"
-#include <cmath>
-
-using namespace ns3;
-
-NS_LOG_COMPONENT_DEFINE ("BasicEnergyModelTestSuite");
-
-/**
- * Test case of update remaining energy for BasicEnergySource and
- * WifiRadioEnergyModel.
- */
-class BasicEnergyUpdateTest : public TestCase
-{
-public:
-  BasicEnergyUpdateTest ();
-  virtual ~BasicEnergyUpdateTest ();
-
-private:
-  void DoRun (void);
-
-  /**
-   * \param state Radio state to switch to.
-   * \return False if no error occurs.
-   *
-   * Runs simulation for a while, check if final state & remaining energy is
-   * correctly updated.
-   */
-  bool StateSwitchTest (WifiPhy::State state);
-
-private:
-  double m_timeS;     // in seconds
-  double m_tolerance; // tolerance for power estimation
-
-  ObjectFactory m_energySource;
-  ObjectFactory m_deviceEnergyModel;
-};
-
-BasicEnergyUpdateTest::BasicEnergyUpdateTest ()
-  : TestCase ("Basic energy model update remaining energy test case")
-{
-  m_timeS = 15.5; // idle for 15 seconds before changing state
-  m_tolerance = 1.0e-13;  //
-}
-
-BasicEnergyUpdateTest::~BasicEnergyUpdateTest ()
-{
-}
-
-void
-BasicEnergyUpdateTest::DoRun (void)
-{
-  // set types
-  m_energySource.SetTypeId ("ns3::BasicEnergySource");
-  m_deviceEnergyModel.SetTypeId ("ns3::WifiRadioEnergyModel");
-
-  // run state switch tests
-  NS_TEST_ASSERT_MSG_EQ (StateSwitchTest (WifiPhy::IDLE), false, "Problem with state switch test (WifiPhy idle).");
-  NS_TEST_ASSERT_MSG_EQ (StateSwitchTest (WifiPhy::CCA_BUSY), false, "Problem with state switch test (WifiPhy cca busy).");
-  NS_TEST_ASSERT_MSG_EQ (StateSwitchTest (WifiPhy::TX), false, "Problem with state switch test (WifiPhy tx).");
-  NS_TEST_ASSERT_MSG_EQ (StateSwitchTest (WifiPhy::RX), false, "Problem with state switch test (WifiPhy rx).");
-  NS_TEST_ASSERT_MSG_EQ (StateSwitchTest (WifiPhy::SWITCHING), false, "Problem with state switch test (WifiPhy switching).");
-  NS_TEST_ASSERT_MSG_EQ (StateSwitchTest (WifiPhy::SLEEP), false, "Problem with state switch test (WifiPhy sleep).");
-}
-
-bool
-BasicEnergyUpdateTest::StateSwitchTest (WifiPhy::State state)
-{
-  // create node
-  Ptr<Node> node = CreateObject<Node> ();
-
-  // create energy source
-  Ptr<BasicEnergySource> source = m_energySource.Create<BasicEnergySource> ();
-  // aggregate energy source to node
-  node->AggregateObject (source);
-
-  // create device energy model
-  Ptr<WifiRadioEnergyModel> model =
-    m_deviceEnergyModel.Create<WifiRadioEnergyModel> ();
-  // set energy source pointer
-  model->SetEnergySource (source);
-  // add device energy model to model list in energy source
-  source->AppendDeviceEnergyModel (model);
-
-  // retrieve device energy model from energy source
-  DeviceEnergyModelContainer models =
-    source->FindDeviceEnergyModels ("ns3::WifiRadioEnergyModel");
-  // check list
-  NS_TEST_ASSERT_MSG_EQ_RETURNS_BOOL (false, (models.GetN () == 0), "Model list is empty!");
-  // get pointer
-  Ptr<WifiRadioEnergyModel> devModel =
-    DynamicCast<WifiRadioEnergyModel> (models.Get (0));
-  // check pointer
-  NS_TEST_ASSERT_MSG_NE_RETURNS_BOOL (0, devModel, "NULL pointer to device model!");
-
-  /*
-   * The radio will stay IDLE for m_timeS seconds. Then it will switch into a
-   * different state.
-   */
-
-  // schedule change of state
-  Simulator::Schedule (Seconds (m_timeS),
-                       &WifiRadioEnergyModel::ChangeState, devModel, state);
-
-  // Calculate remaining energy at simulation stop time
-  Simulator::Schedule (Seconds (m_timeS * 2), 
-                       &BasicEnergySource::UpdateEnergySource, source);
-
-  double timeDelta = 0.000000001; // 1 nanosecond
-  // run simulation; stop just after last scheduled event
-  Simulator::Stop (Seconds (m_timeS * 2 + timeDelta));
-  Simulator::Run ();
-
-  // energy = current * voltage * time
-
-  // calculate idle power consumption
-  double estRemainingEnergy = source->GetInitialEnergy ();
-  double voltage = source->GetSupplyVoltage ();
-  estRemainingEnergy -= devModel->GetIdleCurrentA () * voltage * m_timeS;
-
-  /*
-   * Manually calculate the number of periodic updates performed by the source.
-   * This is to check if the periodic updates are performed correctly.
-   */
-  double actualTime = m_timeS;
-  actualTime /= source->GetEnergyUpdateInterval ().GetSeconds ();
-  actualTime = floor (actualTime); // rounding for update interval
-  actualTime *= source->GetEnergyUpdateInterval ().GetSeconds ();
-
-  // calculate new state power consumption
-  double current = 0.0;
-  switch (state)
-    {
-    case WifiPhy::IDLE:
-      current = devModel->GetIdleCurrentA ();
-      break;
-    case WifiPhy::CCA_BUSY:
-      current = devModel->GetCcaBusyCurrentA ();
-      break;
-    case WifiPhy::TX:
-      current = devModel->GetTxCurrentA ();
-      break;
-    case WifiPhy::RX:
-      current = devModel->GetRxCurrentA ();
-      break;
-    case WifiPhy::SWITCHING:
-      current = devModel->GetSwitchingCurrentA ();
-      break;
-    case WifiPhy::SLEEP:
-      current = devModel->GetSleepCurrentA ();
-      break;
-    default:
-      NS_FATAL_ERROR ("Undefined radio state: " << state);
-      break;
-    }
-  estRemainingEnergy -= current * voltage * m_timeS;
-
-  // obtain remaining energy from source
-  double remainingEnergy = source->GetRemainingEnergy ();
-  NS_LOG_DEBUG ("Remaining energy is " << remainingEnergy);
-  NS_LOG_DEBUG ("Estimated remaining energy is " << estRemainingEnergy);
-  NS_LOG_DEBUG ("Difference is " << estRemainingEnergy - remainingEnergy);
-  // check remaining energy
-  NS_TEST_ASSERT_MSG_EQ_TOL_RETURNS_BOOL (remainingEnergy, estRemainingEnergy, m_tolerance,
-                                          "Incorrect remaining energy!");
-
-  // obtain radio state
-  WifiPhy::State endState = devModel->GetCurrentState ();
-  NS_LOG_DEBUG ("Radio state is " << endState);
-  // check end state
-  NS_TEST_ASSERT_MSG_EQ_RETURNS_BOOL (endState, state,  "Incorrect end state!");
-  Simulator::Destroy ();
-
-  return false; // no error
-}
-
-// -------------------------------------------------------------------------- //
-
-/**
- * Test case of energy depletion handling for BasicEnergySource and
- * WifiRadioEnergyModel.
- */
-class BasicEnergyDepletionTest : public TestCase
-{
-public:
-  BasicEnergyDepletionTest ();
-  virtual ~BasicEnergyDepletionTest ();
-
-private:
-  void DoRun (void);
-
-  /**
-   * Callback invoked when energy is drained from source.
-   */
-  void DepletionHandler (void);
-
-  /**
-   * \param simTimeS Simulation time, in seconds.
-   * \param updateIntervalS Device model update interval, in seconds.
-   * \return False if all is good.
-   *
-   * Runs simulation with specified simulation time and update interval.
-   */
-  bool DepletionTestCase (double simTimeS, double updateIntervalS);
-
-private:
-  int m_numOfNodes;         // number of nodes in simulation
-  int m_callbackCount;      // counter for # of callbacks invoked
-  double m_simTimeS;        // maximum simulation time, in seconds
-  double m_timeStepS;       // simulation time step size, in seconds
-  double m_updateIntervalS; // update interval of each device model
-
-};
-
-BasicEnergyDepletionTest::BasicEnergyDepletionTest ()
-  : TestCase ("Basic energy model energy depletion test case")
-{
-  m_numOfNodes = 10;
-  m_callbackCount = 0;
-  m_simTimeS = 4.5;
-  m_timeStepS = 0.5;
-  m_updateIntervalS = 1.5;
-}
-
-BasicEnergyDepletionTest::~BasicEnergyDepletionTest ()
-{
-}
-
-void
-BasicEnergyDepletionTest::DoRun (void)
-{
-  /*
-   * Run simulation with different simulation time and update interval.
-   */
-  for (double simTimeS = 0.0; simTimeS <= m_simTimeS; simTimeS += m_timeStepS)
-    {
-      for (double updateIntervalS = 0.5; updateIntervalS <= m_updateIntervalS;
-           updateIntervalS += m_timeStepS)
-        {
-          NS_TEST_ASSERT_MSG_EQ (DepletionTestCase (simTimeS, updateIntervalS), false, "Depletion test case problem.");
-          // reset callback count
-          m_callbackCount = 0;
-        }
-    }
-}
-
-void
-BasicEnergyDepletionTest::DepletionHandler (void)
-{
-  m_callbackCount++;
-}
-
-bool
-BasicEnergyDepletionTest::DepletionTestCase (double simTimeS,
-                                             double updateIntervalS)
-{
-  // create node
-  NodeContainer c;
-  c.Create (m_numOfNodes);
-
-  std::string phyMode ("DsssRate1Mbps");
-
-  // disable fragmentation for frames below 2200 bytes
-  Config::SetDefault ("ns3::WifiRemoteStationManager::FragmentationThreshold",
-                      StringValue ("2200"));
-  // turn off RTS/CTS for frames below 2200 bytes
-  Config::SetDefault ("ns3::WifiRemoteStationManager::RtsCtsThreshold",
-                      StringValue ("2200"));
-  // Fix non-unicast data rate to be the same as that of unicast
-  Config::SetDefault ("ns3::WifiRemoteStationManager::NonUnicastMode",
-                      StringValue (phyMode));
-
-  // install YansWifiPhy
-  WifiHelper wifi;
-  wifi.SetStandard (WIFI_PHY_STANDARD_80211b);
-
-  YansWifiPhyHelper wifiPhy =  YansWifiPhyHelper::Default ();
-  /*
-   * This is one parameter that matters when using FixedRssLossModel, set it to
-   * zero; otherwise, gain will be added.
-   */
-  wifiPhy.Set ("RxGain", DoubleValue (0));
-  // ns-3 supports RadioTap and Prism tracing extensions for 802.11b
-  wifiPhy.SetPcapDataLinkType (YansWifiPhyHelper::DLT_IEEE802_11_RADIO);
-
-  YansWifiChannelHelper wifiChannel;
-  wifiChannel.SetPropagationDelay ("ns3::ConstantSpeedPropagationDelayModel");
-  wifiPhy.SetChannel (wifiChannel.Create ());
-
-  // Add a non-QoS upper MAC, and disable rate control
-  NqosWifiMacHelper wifiMac = NqosWifiMacHelper::Default ();
-  wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager",
-                                "DataMode", StringValue (phyMode),
-                                "ControlMode", StringValue (phyMode));
-  // Set it to ad-hoc mode
-  wifiMac.SetType ("ns3::AdhocWifiMac");
-  NetDeviceContainer devices = wifi.Install (wifiPhy, wifiMac, c);
-
-  /*
-   * Create and install energy source and a single basic radio energy model on
-   * the node using helpers.
-   */
-  // source helper
-  BasicEnergySourceHelper basicSourceHelper;
-  // set energy to 0 so that we deplete energy at the beginning of simulation
-  basicSourceHelper.Set ("BasicEnergySourceInitialEnergyJ", DoubleValue (0.0));
-  // set update interval
-  basicSourceHelper.Set ("PeriodicEnergyUpdateInterval",
-                         TimeValue (Seconds (updateIntervalS)));
-  // install source
-  EnergySourceContainer sources = basicSourceHelper.Install (c);
-
-  // device energy model helper
-  WifiRadioEnergyModelHelper radioEnergyHelper;
-  // set energy depletion callback
-  WifiRadioEnergyModel::WifiRadioEnergyDepletionCallback callback =
-    MakeCallback (&BasicEnergyDepletionTest::DepletionHandler, this);
-  radioEnergyHelper.SetDepletionCallback (callback);
-  // install on node
-  DeviceEnergyModelContainer deviceModels = radioEnergyHelper.Install (devices, sources);
-
-  // run simulation
-  Simulator::Stop (Seconds (simTimeS));
-  Simulator::Run ();
-  Simulator::Destroy ();
-
-  NS_LOG_DEBUG ("Simulation time = " << simTimeS << "s");
-  NS_LOG_DEBUG ("Update interval = " << updateIntervalS << "s");
-  NS_LOG_DEBUG ("Expected callback count is " << m_numOfNodes);
-  NS_LOG_DEBUG ("Actual callback count is " << m_callbackCount);
-
-  // check result, call back should only be invoked once
-  NS_TEST_ASSERT_MSG_EQ_RETURNS_BOOL (m_numOfNodes, m_callbackCount, "Not all callbacks are invoked!");
-
-  return false;
-}
-
-// -------------------------------------------------------------------------- //
-
-/**
- * Unit test suite for energy model. Although the test suite involves 2 modules
- * it is still considered a unit test. Because a DeviceEnergyModel cannot live
- * without an EnergySource.
- */
-class BasicEnergyModelTestSuite : public TestSuite
-{
-public:
-  BasicEnergyModelTestSuite ();
-};
-
-BasicEnergyModelTestSuite::BasicEnergyModelTestSuite ()
-  : TestSuite ("basic-energy-model", UNIT)
-{
-  AddTestCase (new BasicEnergyUpdateTest, TestCase::QUICK);
-  AddTestCase (new BasicEnergyDepletionTest, TestCase::QUICK);
-}
-
-// create an instance of the test suite
-static BasicEnergyModelTestSuite g_energyModelTestSuite;
-
diff --git a/src/energy/test/examples-to-run.py b/src/energy/test/examples-to-run.py
--- a/src/energy/test/examples-to-run.py
+++ b/src/energy/test/examples-to-run.py
@@ -7,7 +7,10 @@
 #     (example_name, do_run, do_valgrind_run).
 #
 # See test.py for more information.
-cpp_examples = []
+cpp_examples = [
+    ("li-ion-energy-source", "True", "True"),
+    ("rv-battery-model-test", "True", "True"),
+]
 
 # A list of Python examples to run in order to ensure that they remain
 # runnable over time.  Each tuple in the list contains
diff --git a/src/energy/test/li-ion-energy-source-test.cc b/src/energy/test/li-ion-energy-source-test.cc
--- a/src/energy/test/li-ion-energy-source-test.cc
+++ b/src/energy/test/li-ion-energy-source-test.cc
@@ -37,7 +37,6 @@
 
   void DoRun (void);
 
-  double m_simTime;
   Ptr<Node> m_node;
 };
 
diff --git a/src/energy/wscript b/src/energy/wscript
--- a/src/energy/wscript
+++ b/src/energy/wscript
@@ -1,9 +1,8 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
 def build(bld):
-    obj = bld.create_ns3_module('energy', ['wifi'])
+    obj = bld.create_ns3_module('energy', ['network'])
     obj.source = [
-        'model/wifi-radio-energy-model.cc',
         'model/energy-source.cc',
         'model/basic-energy-source.cc',
         'model/li-ion-energy-source.cc',
@@ -13,11 +12,9 @@
         'model/simple-device-energy-model.cc',
         'model/energy-harvester.cc',
         'model/basic-energy-harvester.cc',
-        'model/wifi-tx-current-model.cc',
         'helper/energy-source-container.cc',
         'helper/energy-model-helper.cc',
         'helper/basic-energy-source-helper.cc',
-        'helper/wifi-radio-energy-model-helper.cc',
         'helper/rv-battery-model-helper.cc',
         'helper/energy-harvester-container.cc',
         'helper/energy-harvester-helper.cc',
@@ -26,8 +23,6 @@
 
     obj_test = bld.create_ns3_module_test_library('energy')
     obj_test.source = [
-        'test/basic-energy-model-test.cc',
-        'test/rv-battery-model-test.cc',
         'test/li-ion-energy-source-test.cc',
         'test/basic-energy-harvester-test.cc',
         ]
@@ -35,7 +30,6 @@
     headers = bld(features='ns3header')
     headers.module = 'energy'
     headers.source = [
-        'model/wifi-radio-energy-model.h',
         'model/energy-source.h',
         'model/basic-energy-source.h',
         'model/li-ion-energy-source.h',
@@ -45,11 +39,9 @@
         'model/simple-device-energy-model.h',
         'model/energy-harvester.h',
         'model/basic-energy-harvester.h',
-        'model/wifi-tx-current-model.h',
         'helper/energy-source-container.h',
         'helper/energy-model-helper.h',
         'helper/basic-energy-source-helper.h',
-        'helper/wifi-radio-energy-model-helper.h',
         'helper/rv-battery-model-helper.h',
         'helper/energy-harvester-container.h',
         'helper/energy-harvester-helper.h',
diff --git a/src/uan/wscript b/src/uan/wscript
--- a/src/uan/wscript
+++ b/src/uan/wscript
@@ -1,7 +1,7 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
 def build(bld):
-    module = bld.create_ns3_module('uan', ['network', 'energy'])
+    module = bld.create_ns3_module('uan', ['network', 'energy', 'mobility'])
     module.source = [
         'model/uan-channel.cc',
         'model/uan-phy-gen.cc',
diff --git a/src/wifi/helper/wifi-radio-energy-model-helper.cc b/src/wifi/helper/wifi-radio-energy-model-helper.cc
new file mode 100644
--- /dev/null
+++ b/src/wifi/helper/wifi-radio-energy-model-helper.cc
@@ -0,0 +1,143 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * 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: Sidharth Nabar <snabar@uw.edu>, He Wu <mdzz@u.washington.edu>
+ */
+
+#include "wifi-radio-energy-model-helper.h"
+#include "ns3/basic-energy-source-helper.h"
+#include "ns3/wifi-phy.h"
+#include "ns3/wifi-net-device.h"
+#include "ns3/config.h"
+#include "ns3/names.h"
+#include "ns3/wifi-tx-current-model.h"
+
+namespace ns3 {
+
+WifiRadioEnergyModelHelper::WifiRadioEnergyModelHelper ()
+{
+  m_radioEnergy.SetTypeId ("ns3::WifiRadioEnergyModel");
+  m_depletionCallback.Nullify ();
+  m_rechargedCallback.Nullify ();
+}
+
+WifiRadioEnergyModelHelper::~WifiRadioEnergyModelHelper ()
+{
+}
+
+void
+WifiRadioEnergyModelHelper::Set (std::string name, const AttributeValue &v)
+{
+  m_radioEnergy.Set (name, v);
+}
+
+void
+WifiRadioEnergyModelHelper::SetDepletionCallback (
+  WifiRadioEnergyModel::WifiRadioEnergyDepletionCallback callback)
+{
+  m_depletionCallback = callback;
+}
+
+void
+WifiRadioEnergyModelHelper::SetRechargedCallback (
+  WifiRadioEnergyModel::WifiRadioEnergyRechargedCallback callback)
+{
+  m_rechargedCallback = callback;
+}
+
+void
+WifiRadioEnergyModelHelper::SetTxCurrentModel (std::string name,
+                                               std::string n0, const AttributeValue& v0,
+                                               std::string n1, const AttributeValue& v1,
+                                               std::string n2, const AttributeValue& v2,
+                                               std::string n3, const AttributeValue& v3,
+                                               std::string n4, const AttributeValue& v4,
+                                               std::string n5, const AttributeValue& v5,
+                                               std::string n6, const AttributeValue& v6,
+                                               std::string n7, const AttributeValue& v7)
+{
+  ObjectFactory factory;
+  factory.SetTypeId (name);
+  factory.Set (n0, v0);
+  factory.Set (n1, v1);
+  factory.Set (n2, v2);
+  factory.Set (n3, v3);
+  factory.Set (n4, v4);
+  factory.Set (n5, v5);
+  factory.Set (n6, v6);
+  factory.Set (n7, v7);
+  m_txCurrentModel = factory;
+}
+
+
+/*
+ * Private function starts here.
+ */
+
+Ptr<DeviceEnergyModel>
+WifiRadioEnergyModelHelper::DoInstall (Ptr<NetDevice> device,
+                                       Ptr<EnergySource> source) const
+{
+  NS_ASSERT (device != NULL);
+  NS_ASSERT (source != NULL);
+  // check if device is WifiNetDevice
+  std::string deviceName = device->GetInstanceTypeId ().GetName ();
+  if (deviceName.compare ("ns3::WifiNetDevice") != 0)
+    {
+      NS_FATAL_ERROR ("NetDevice type is not WifiNetDevice!");
+    }
+  Ptr<Node> node = device->GetNode ();
+  Ptr<WifiRadioEnergyModel> model = m_radioEnergy.Create ()->GetObject<WifiRadioEnergyModel> ();
+  NS_ASSERT (model != NULL);
+  // set energy source pointer
+  model->SetEnergySource (source);
+  // set energy depletion callback
+  // if none is specified, make a callback to WifiPhy::SetSleepMode
+  Ptr<WifiNetDevice> wifiDevice = DynamicCast<WifiNetDevice> (device);
+  Ptr<WifiPhy> wifiPhy = wifiDevice->GetPhy ();
+  if (m_depletionCallback.IsNull ())
+    {
+      model->SetEnergyDepletionCallback (MakeCallback (&WifiPhy::SetSleepMode, wifiPhy));
+    }
+  else
+    {
+      model->SetEnergyDepletionCallback (m_depletionCallback);
+    }
+  // set energy recharged callback
+  // if none is specified, make a callback to WifiPhy::ResumeFromSleep
+  if (m_rechargedCallback.IsNull ())
+    {
+      model->SetEnergyRechargedCallback (MakeCallback (&WifiPhy::ResumeFromSleep, wifiPhy));
+    }
+  else
+    {
+      model->SetEnergyRechargedCallback (m_rechargedCallback);
+    }
+  // add model to device model list in energy source
+  source->AppendDeviceEnergyModel (model);
+  // create and register energy model phy listener
+  wifiPhy->RegisterListener (model->GetPhyListener ());
+  //
+  if (m_txCurrentModel.GetTypeId ().GetUid ())
+    {
+      Ptr<WifiTxCurrentModel> txcurrent = m_txCurrentModel.Create<WifiTxCurrentModel> ();
+      model->SetTxCurrentModel (txcurrent);
+    }
+  return model;
+}
+
+} // namespace ns3
diff --git a/src/wifi/helper/wifi-radio-energy-model-helper.h b/src/wifi/helper/wifi-radio-energy-model-helper.h
new file mode 100644
--- /dev/null
+++ b/src/wifi/helper/wifi-radio-energy-model-helper.h
@@ -0,0 +1,124 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+* 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
+*
+* Author: Sidharth Nabar <snabar@uw.edu>, He Wu <mdzz@u.washington.edu>
+*/
+
+#ifndef WIFI_RADIO_ENERGY_MODEL_HELPER_H
+#define WIFI_RADIO_ENERGY_MODEL_HELPER_H
+
+#include "ns3/energy-model-helper.h"
+#include "ns3/wifi-radio-energy-model.h"
+
+namespace ns3 {
+
+/**
+ * \ingroup energy
+ * \brief Assign WifiRadioEnergyModel to wifi devices.
+ *
+ * This installer installs WifiRadioEnergyModel for only WifiNetDevice objects.
+ *
+ */
+class WifiRadioEnergyModelHelper : public DeviceEnergyModelHelper
+{
+public:
+  /**
+   * Construct a helper which is used to add a radio energy model to a node
+   */
+  WifiRadioEnergyModelHelper ();
+
+  /**
+   * Destroy a RadioEnergy Helper
+   */
+  ~WifiRadioEnergyModelHelper ();
+
+  /**
+   * \param name the name of the attribute to set
+   * \param v the value of the attribute
+   *
+   * Sets an attribute of the underlying PHY object.
+   */
+  void Set (std::string name, const AttributeValue &v);
+
+  /**
+   * \param callback Callback function for energy depletion handling.
+   *
+   * Sets the callback to be invoked when energy is depleted.
+   */
+  void SetDepletionCallback (
+    WifiRadioEnergyModel::WifiRadioEnergyDepletionCallback callback);
+
+  /**
+   * \param callback Callback function for energy recharged handling.
+   *
+   * Sets the callback to be invoked when energy is recharged.
+   */
+  void SetRechargedCallback (
+    WifiRadioEnergyModel::WifiRadioEnergyRechargedCallback callback);
+
+  /**
+   * \param name the name of the model to set
+   * \param n0 the name of the attribute to set
+   * \param v0 the value of the attribute to set
+   * \param n1 the name of the attribute to set
+   * \param v1 the value of the attribute to set
+   * \param n2 the name of the attribute to set
+   * \param v2 the value of the attribute to set
+   * \param n3 the name of the attribute to set
+   * \param v3 the value of the attribute to set
+   * \param n4 the name of the attribute to set
+   * \param v4 the value of the attribute to set
+   * \param n5 the name of the attribute to set
+   * \param v5 the value of the attribute to set
+   * \param n6 the name of the attribute to set
+   * \param v6 the value of the attribute to set
+   * \param n7 the name of the attribute to set
+   * \param v7 the value of the attribute to set
+   *
+   * Configure a propagation delay for this channel.
+   */
+  void SetTxCurrentModel (std::string name,
+                          std::string n0 = "", const AttributeValue &v0 = EmptyAttributeValue (),
+                          std::string n1 = "", const AttributeValue &v1 = EmptyAttributeValue (),
+                          std::string n2 = "", const AttributeValue &v2 = EmptyAttributeValue (),
+                          std::string n3 = "", const AttributeValue &v3 = EmptyAttributeValue (),
+                          std::string n4 = "", const AttributeValue &v4 = EmptyAttributeValue (),
+                          std::string n5 = "", const AttributeValue &v5 = EmptyAttributeValue (),
+                          std::string n6 = "", const AttributeValue &v6 = EmptyAttributeValue (),
+                          std::string n7 = "", const AttributeValue &v7 = EmptyAttributeValue ());
+
+private:
+  /**
+   * \param device Pointer to the NetDevice to install DeviceEnergyModel.
+   * \param source Pointer to EnergySource to install.
+   *
+   * Implements DeviceEnergyModel::Install.
+   */
+  virtual Ptr<DeviceEnergyModel> DoInstall (Ptr<NetDevice> device,
+                                            Ptr<EnergySource> source) const;
+
+private:
+  ObjectFactory m_radioEnergy;
+  WifiRadioEnergyModel::WifiRadioEnergyDepletionCallback m_depletionCallback;
+  WifiRadioEnergyModel::WifiRadioEnergyRechargedCallback m_rechargedCallback;
+  ObjectFactory m_txCurrentModel;
+
+};
+
+} // namespace ns3
+
+#endif /* WIFI_RADIO_ENERGY_MODEL_HELPER_H */
diff --git a/src/wifi/model/wifi-radio-energy-model.cc b/src/wifi/model/wifi-radio-energy-model.cc
new file mode 100644
--- /dev/null
+++ b/src/wifi/model/wifi-radio-energy-model.cc
@@ -0,0 +1,572 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * 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
+ *
+ * Author: Sidharth Nabar <snabar@uw.edu>, He Wu <mdzz@u.washington.edu>
+ */
+
+#include "ns3/log.h"
+#include "ns3/double.h"
+#include "ns3/simulator.h"
+#include "ns3/trace-source-accessor.h"
+#include "ns3/pointer.h"
+#include "ns3/energy-source.h"
+#include "wifi-radio-energy-model.h"
+#include "wifi-tx-current-model.h"
+
+namespace ns3 {
+
+NS_LOG_COMPONENT_DEFINE ("WifiRadioEnergyModel");
+
+NS_OBJECT_ENSURE_REGISTERED (WifiRadioEnergyModel);
+
+TypeId
+WifiRadioEnergyModel::GetTypeId (void)
+{
+  static TypeId tid = TypeId ("ns3::WifiRadioEnergyModel")
+    .SetParent<DeviceEnergyModel> ()
+    .SetGroupName ("Energy")
+    .AddConstructor<WifiRadioEnergyModel> ()
+    .AddAttribute ("IdleCurrentA",
+                   "The default radio Idle current in Ampere.",
+                   DoubleValue (0.273),  // idle mode = 273mA
+                   MakeDoubleAccessor (&WifiRadioEnergyModel::SetIdleCurrentA,
+                                       &WifiRadioEnergyModel::GetIdleCurrentA),
+                   MakeDoubleChecker<double> ())
+    .AddAttribute ("CcaBusyCurrentA",
+                   "The default radio CCA Busy State current in Ampere.",
+                   DoubleValue (0.273),  // default to be the same as idle mode
+                   MakeDoubleAccessor (&WifiRadioEnergyModel::SetCcaBusyCurrentA,
+                                       &WifiRadioEnergyModel::GetCcaBusyCurrentA),
+                   MakeDoubleChecker<double> ())
+    .AddAttribute ("TxCurrentA",
+                   "The radio Tx current in Ampere.",
+                   DoubleValue (0.380),    // transmit at 0dBm = 380mA
+                   MakeDoubleAccessor (&WifiRadioEnergyModel::SetTxCurrentA,
+                                       &WifiRadioEnergyModel::GetTxCurrentA),
+                   MakeDoubleChecker<double> ())
+    .AddAttribute ("RxCurrentA",
+                   "The radio Rx current in Ampere.",
+                   DoubleValue (0.313),    // receive mode = 313mA
+                   MakeDoubleAccessor (&WifiRadioEnergyModel::SetRxCurrentA,
+                                       &WifiRadioEnergyModel::GetRxCurrentA),
+                   MakeDoubleChecker<double> ())
+    .AddAttribute ("SwitchingCurrentA",
+                   "The default radio Channel Switch current in Ampere.",
+                   DoubleValue (0.273),  // default to be the same as idle mode
+                   MakeDoubleAccessor (&WifiRadioEnergyModel::SetSwitchingCurrentA,
+                                       &WifiRadioEnergyModel::GetSwitchingCurrentA),
+                   MakeDoubleChecker<double> ())
+    .AddAttribute ("SleepCurrentA",
+                   "The radio Sleep current in Ampere.",
+                   DoubleValue (0.033),  // sleep mode = 33mA
+                   MakeDoubleAccessor (&WifiRadioEnergyModel::SetSleepCurrentA,
+                                       &WifiRadioEnergyModel::GetSleepCurrentA),
+                   MakeDoubleChecker<double> ())
+    .AddAttribute ("TxCurrentModel", "A pointer to the attached tx current model.",
+                   PointerValue (),
+                   MakePointerAccessor (&WifiRadioEnergyModel::m_txCurrentModel),
+                   MakePointerChecker<WifiTxCurrentModel> ())
+    .AddTraceSource ("TotalEnergyConsumption",
+                     "Total energy consumption of the radio device.",
+                     MakeTraceSourceAccessor (&WifiRadioEnergyModel::m_totalEnergyConsumption),
+                     "ns3::TracedValue::DoubleCallback")
+  ; 
+  return tid;
+}
+
+WifiRadioEnergyModel::WifiRadioEnergyModel ()
+{
+  NS_LOG_FUNCTION (this);
+  m_currentState = WifiPhy::IDLE;  // initially IDLE
+  m_lastUpdateTime = Seconds (0.0);
+  m_nPendingChangeState = 0;
+  m_isSupersededChangeState = false;
+  m_energyDepletionCallback.Nullify ();
+  m_source = NULL;
+  // set callback for WifiPhy listener
+  m_listener = new WifiRadioEnergyModelPhyListener;
+  m_listener->SetChangeStateCallback (MakeCallback (&DeviceEnergyModel::ChangeState, this));
+  // set callback for updating the tx current
+  m_listener->SetUpdateTxCurrentCallback (MakeCallback (&WifiRadioEnergyModel::SetTxCurrentFromModel, this));
+}
+
+WifiRadioEnergyModel::~WifiRadioEnergyModel ()
+{
+  NS_LOG_FUNCTION (this);
+  delete m_listener;
+}
+
+void
+WifiRadioEnergyModel::SetEnergySource (Ptr<EnergySource> source)
+{
+  NS_LOG_FUNCTION (this << source);
+  NS_ASSERT (source != NULL);
+  m_source = source;
+}
+
+double
+WifiRadioEnergyModel::GetTotalEnergyConsumption (void) const
+{
+  NS_LOG_FUNCTION (this);
+  return m_totalEnergyConsumption;
+}
+
+double
+WifiRadioEnergyModel::GetIdleCurrentA (void) const
+{
+  NS_LOG_FUNCTION (this);
+  return m_idleCurrentA;
+}
+
+void
+WifiRadioEnergyModel::SetIdleCurrentA (double idleCurrentA)
+{
+  NS_LOG_FUNCTION (this << idleCurrentA);
+  m_idleCurrentA = idleCurrentA;
+}
+
+double
+WifiRadioEnergyModel::GetCcaBusyCurrentA (void) const
+{
+  NS_LOG_FUNCTION (this);
+  return m_ccaBusyCurrentA;
+}
+
+void
+WifiRadioEnergyModel::SetCcaBusyCurrentA (double CcaBusyCurrentA)
+{
+  NS_LOG_FUNCTION (this << CcaBusyCurrentA);
+  m_ccaBusyCurrentA = CcaBusyCurrentA;
+}
+
+double
+WifiRadioEnergyModel::GetTxCurrentA (void) const
+{
+  NS_LOG_FUNCTION (this);
+  return m_txCurrentA;
+}
+
+void
+WifiRadioEnergyModel::SetTxCurrentA (double txCurrentA)
+{
+  NS_LOG_FUNCTION (this << txCurrentA);
+  m_txCurrentA = txCurrentA;
+}
+
+double
+WifiRadioEnergyModel::GetRxCurrentA (void) const
+{
+  NS_LOG_FUNCTION (this);
+  return m_rxCurrentA;
+}
+
+void
+WifiRadioEnergyModel::SetRxCurrentA (double rxCurrentA)
+{
+  NS_LOG_FUNCTION (this << rxCurrentA);
+  m_rxCurrentA = rxCurrentA;
+}
+
+double
+WifiRadioEnergyModel::GetSwitchingCurrentA (void) const
+{
+  NS_LOG_FUNCTION (this);
+  return m_switchingCurrentA;
+}
+
+void
+WifiRadioEnergyModel::SetSwitchingCurrentA (double switchingCurrentA)
+{
+  NS_LOG_FUNCTION (this << switchingCurrentA);
+  m_switchingCurrentA = switchingCurrentA;
+}
+
+double
+WifiRadioEnergyModel::GetSleepCurrentA (void) const
+{
+  NS_LOG_FUNCTION (this);
+  return m_sleepCurrentA;
+}
+
+void
+WifiRadioEnergyModel::SetSleepCurrentA (double sleepCurrentA)
+{
+  NS_LOG_FUNCTION (this << sleepCurrentA);
+  m_sleepCurrentA = sleepCurrentA;
+}
+
+WifiPhy::State
+WifiRadioEnergyModel::GetCurrentState (void) const
+{
+  NS_LOG_FUNCTION (this);
+  return m_currentState;
+}
+
+void
+WifiRadioEnergyModel::SetEnergyDepletionCallback (
+  WifiRadioEnergyDepletionCallback callback)
+{
+  NS_LOG_FUNCTION (this);
+  if (callback.IsNull ())
+    {
+      NS_LOG_DEBUG ("WifiRadioEnergyModel:Setting NULL energy depletion callback!");
+    }
+  m_energyDepletionCallback = callback;
+}
+
+void
+WifiRadioEnergyModel::SetEnergyRechargedCallback (
+  WifiRadioEnergyRechargedCallback callback)
+{
+  NS_LOG_FUNCTION (this);
+  if (callback.IsNull ())
+    {
+      NS_LOG_DEBUG ("WifiRadioEnergyModel:Setting NULL energy recharged callback!");
+    }
+  m_energyRechargedCallback = callback;
+}
+
+void
+WifiRadioEnergyModel::SetTxCurrentModel (Ptr<WifiTxCurrentModel> model)
+{
+  m_txCurrentModel = model;
+}
+
+void
+WifiRadioEnergyModel::SetTxCurrentFromModel (double txPowerDbm)
+{
+  if (m_txCurrentModel)
+    {
+      m_txCurrentA = m_txCurrentModel->CalcTxCurrent (txPowerDbm);
+    }
+}
+
+void
+WifiRadioEnergyModel::ChangeState (int newState)
+{
+  NS_LOG_FUNCTION (this << newState);
+
+  Time duration = Simulator::Now () - m_lastUpdateTime;
+  NS_ASSERT (duration.GetNanoSeconds () >= 0); // check if duration is valid
+
+  // energy to decrease = current * voltage * time
+  double energyToDecrease = 0.0;
+  double supplyVoltage = m_source->GetSupplyVoltage ();
+  switch (m_currentState)
+    {
+    case WifiPhy::IDLE:
+      energyToDecrease = duration.GetSeconds () * m_idleCurrentA * supplyVoltage;
+      break;
+    case WifiPhy::CCA_BUSY:
+      energyToDecrease = duration.GetSeconds () * m_ccaBusyCurrentA * supplyVoltage;
+      break;
+    case WifiPhy::TX:
+      energyToDecrease = duration.GetSeconds () * m_txCurrentA * supplyVoltage;
+      break;
+    case WifiPhy::RX:
+      energyToDecrease = duration.GetSeconds () * m_rxCurrentA * supplyVoltage;
+      break;
+    case WifiPhy::SWITCHING:
+      energyToDecrease = duration.GetSeconds () * m_switchingCurrentA * supplyVoltage;
+      break;
+    case WifiPhy::SLEEP:
+      energyToDecrease = duration.GetSeconds () * m_sleepCurrentA * supplyVoltage;
+      break;
+    default:
+      NS_FATAL_ERROR ("WifiRadioEnergyModel:Undefined radio state: " << m_currentState);
+    }
+
+  // update total energy consumption
+  m_totalEnergyConsumption += energyToDecrease;
+
+  // update last update time stamp
+  m_lastUpdateTime = Simulator::Now ();
+
+  m_nPendingChangeState++;
+
+  // notify energy source
+  m_source->UpdateEnergySource ();
+
+  // in case the energy source is found to be depleted during the last update, a callback might be
+  // invoked that might cause a change in the Wifi PHY state (e.g., the PHY is put into SLEEP mode).
+  // This in turn causes a new call to this member function, with the consequence that the previous
+  // instance is resumed after the termination of the new instance. In particular, the state set
+  // by the previous instance is erroneously the final state stored in m_currentState. The check below
+  // ensures that previous instances do not change m_currentState.
+
+  if (!m_isSupersededChangeState)
+    {
+      // update current state & last update time stamp
+      SetWifiRadioState ((WifiPhy::State) newState);
+
+      // some debug message
+      NS_LOG_DEBUG ("WifiRadioEnergyModel:Total energy consumption is " <<
+                    m_totalEnergyConsumption << "J");
+    }
+
+  m_isSupersededChangeState = (m_nPendingChangeState > 1);
+
+  m_nPendingChangeState--;
+}
+
+void
+WifiRadioEnergyModel::HandleEnergyDepletion (void)
+{
+  NS_LOG_FUNCTION (this);
+  NS_LOG_DEBUG ("WifiRadioEnergyModel:Energy is depleted!");
+  // invoke energy depletion callback, if set.
+  if (!m_energyDepletionCallback.IsNull ())
+    {
+      m_energyDepletionCallback ();
+    }
+}
+
+void
+WifiRadioEnergyModel::HandleEnergyRecharged (void)
+{
+  NS_LOG_FUNCTION (this);
+  NS_LOG_DEBUG ("WifiRadioEnergyModel:Energy is recharged!");
+  // invoke energy recharged callback, if set.
+  if (!m_energyRechargedCallback.IsNull ())
+    {
+      m_energyRechargedCallback ();
+    }
+}
+
+WifiRadioEnergyModelPhyListener *
+WifiRadioEnergyModel::GetPhyListener (void)
+{
+  NS_LOG_FUNCTION (this);
+  return m_listener;
+}
+
+/*
+ * Private functions start here.
+ */
+
+void
+WifiRadioEnergyModel::DoDispose (void)
+{
+  NS_LOG_FUNCTION (this);
+  m_source = NULL;
+  m_energyDepletionCallback.Nullify ();
+}
+
+double
+WifiRadioEnergyModel::DoGetCurrentA (void) const
+{
+  NS_LOG_FUNCTION (this);
+  switch (m_currentState)
+    {
+    case WifiPhy::IDLE:
+      return m_idleCurrentA;
+    case WifiPhy::CCA_BUSY:
+      return m_ccaBusyCurrentA;
+    case WifiPhy::TX:
+      return m_txCurrentA;
+    case WifiPhy::RX:
+      return m_rxCurrentA;
+    case WifiPhy::SWITCHING:
+      return m_switchingCurrentA;
+    case WifiPhy::SLEEP:
+      return m_sleepCurrentA;
+    default:
+      NS_FATAL_ERROR ("WifiRadioEnergyModel:Undefined radio state:" << m_currentState);
+    }
+}
+
+void
+WifiRadioEnergyModel::SetWifiRadioState (const WifiPhy::State state)
+{
+  NS_LOG_FUNCTION (this << state);
+  m_currentState = state;
+  std::string stateName;
+  switch (state)
+    {
+    case WifiPhy::IDLE:
+      stateName = "IDLE";
+      break;
+    case WifiPhy::CCA_BUSY:
+      stateName = "CCA_BUSY";
+      break;
+    case WifiPhy::TX:
+      stateName = "TX";
+      break;
+    case WifiPhy::RX:
+      stateName = "RX";
+      break;
+    case WifiPhy::SWITCHING:
+      stateName = "SWITCHING";
+      break;
+    case WifiPhy::SLEEP:
+      stateName = "SLEEP";
+      break;
+    }
+  NS_LOG_DEBUG ("WifiRadioEnergyModel:Switching to state: " << stateName <<
+                " at time = " << Simulator::Now ());
+}
+
+// -------------------------------------------------------------------------- //
+
+WifiRadioEnergyModelPhyListener::WifiRadioEnergyModelPhyListener ()
+{
+  NS_LOG_FUNCTION (this);
+  m_changeStateCallback.Nullify ();
+  m_updateTxCurrentCallback.Nullify ();
+}
+
+WifiRadioEnergyModelPhyListener::~WifiRadioEnergyModelPhyListener ()
+{
+  NS_LOG_FUNCTION (this);
+}
+
+void
+WifiRadioEnergyModelPhyListener::SetChangeStateCallback (DeviceEnergyModel::ChangeStateCallback callback)
+{
+  NS_LOG_FUNCTION (this << &callback);
+  NS_ASSERT (!callback.IsNull ());
+  m_changeStateCallback = callback;
+}
+
+void
+WifiRadioEnergyModelPhyListener::SetUpdateTxCurrentCallback (UpdateTxCurrentCallback callback)
+{
+  NS_LOG_FUNCTION (this << &callback);
+  NS_ASSERT (!callback.IsNull ());
+  m_updateTxCurrentCallback = callback;
+}
+
+void
+WifiRadioEnergyModelPhyListener::NotifyRxStart (Time duration)
+{
+  NS_LOG_FUNCTION (this << duration);
+  if (m_changeStateCallback.IsNull ())
+    {
+      NS_FATAL_ERROR ("WifiRadioEnergyModelPhyListener:Change state callback not set!");
+    }
+  m_changeStateCallback (WifiPhy::RX);
+  m_switchToIdleEvent.Cancel ();
+}
+
+void
+WifiRadioEnergyModelPhyListener::NotifyRxEndOk (void)
+{
+  NS_LOG_FUNCTION (this);
+  if (m_changeStateCallback.IsNull ())
+    {
+      NS_FATAL_ERROR ("WifiRadioEnergyModelPhyListener:Change state callback not set!");
+    }
+  m_changeStateCallback (WifiPhy::IDLE);
+}
+
+void
+WifiRadioEnergyModelPhyListener::NotifyRxEndError (void)
+{
+  NS_LOG_FUNCTION (this);
+  if (m_changeStateCallback.IsNull ())
+    {
+      NS_FATAL_ERROR ("WifiRadioEnergyModelPhyListener:Change state callback not set!");
+    }
+  m_changeStateCallback (WifiPhy::IDLE);
+}
+
+void
+WifiRadioEnergyModelPhyListener::NotifyTxStart (Time duration, double txPowerDbm)
+{
+  NS_LOG_FUNCTION (this << duration << txPowerDbm);
+  if (m_updateTxCurrentCallback.IsNull ())
+    {
+      NS_FATAL_ERROR ("WifiRadioEnergyModelPhyListener:Update tx current callback not set!");
+    }
+  m_updateTxCurrentCallback (txPowerDbm);
+  if (m_changeStateCallback.IsNull ())
+    {
+      NS_FATAL_ERROR ("WifiRadioEnergyModelPhyListener:Change state callback not set!");
+    }
+  m_changeStateCallback (WifiPhy::TX);
+  // schedule changing state back to IDLE after TX duration
+  m_switchToIdleEvent.Cancel ();
+  m_switchToIdleEvent = Simulator::Schedule (duration, &WifiRadioEnergyModelPhyListener::SwitchToIdle, this);
+}
+
+void
+WifiRadioEnergyModelPhyListener::NotifyMaybeCcaBusyStart (Time duration)
+{
+  NS_LOG_FUNCTION (this << duration);
+  if (m_changeStateCallback.IsNull ())
+    {
+      NS_FATAL_ERROR ("WifiRadioEnergyModelPhyListener:Change state callback not set!");
+    }
+  m_changeStateCallback (WifiPhy::CCA_BUSY);
+  // schedule changing state back to IDLE after CCA_BUSY duration
+  m_switchToIdleEvent.Cancel ();
+  m_switchToIdleEvent = Simulator::Schedule (duration, &WifiRadioEnergyModelPhyListener::SwitchToIdle, this);
+}
+
+void
+WifiRadioEnergyModelPhyListener::NotifySwitchingStart (Time duration)
+{
+  NS_LOG_FUNCTION (this << duration);
+  if (m_changeStateCallback.IsNull ())
+    {
+      NS_FATAL_ERROR ("WifiRadioEnergyModelPhyListener:Change state callback not set!");
+    }
+  m_changeStateCallback (WifiPhy::SWITCHING);
+  // schedule changing state back to IDLE after CCA_BUSY duration
+  m_switchToIdleEvent.Cancel ();
+  m_switchToIdleEvent = Simulator::Schedule (duration, &WifiRadioEnergyModelPhyListener::SwitchToIdle, this);
+}
+
+void
+WifiRadioEnergyModelPhyListener::NotifySleep (void)
+{
+  NS_LOG_FUNCTION (this);
+  if (m_changeStateCallback.IsNull ())
+    {
+      NS_FATAL_ERROR ("WifiRadioEnergyModelPhyListener:Change state callback not set!");
+    }
+  m_changeStateCallback (WifiPhy::SLEEP);
+  m_switchToIdleEvent.Cancel ();
+}
+
+void
+WifiRadioEnergyModelPhyListener::NotifyWakeup(void)
+{
+  NS_LOG_FUNCTION (this);
+  if (m_changeStateCallback.IsNull ())
+    {
+      NS_FATAL_ERROR ("WifiRadioEnergyModelPhyListener:Change state callback not set!");
+    }
+  m_changeStateCallback (WifiPhy::IDLE);
+}
+
+/*
+ * Private function state here.
+ */
+
+void
+WifiRadioEnergyModelPhyListener::SwitchToIdle (void)
+{
+  NS_LOG_FUNCTION (this);
+  if (m_changeStateCallback.IsNull ())
+    {
+      NS_FATAL_ERROR ("WifiRadioEnergyModelPhyListener:Change state callback not set!");
+    }
+  m_changeStateCallback (WifiPhy::IDLE);
+}
+
+} // namespace ns3
diff --git a/src/wifi/model/wifi-radio-energy-model.h b/src/wifi/model/wifi-radio-energy-model.h
new file mode 100644
--- /dev/null
+++ b/src/wifi/model/wifi-radio-energy-model.h
@@ -0,0 +1,363 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * 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: Sidharth Nabar <snabar@uw.edu>, He Wu <mdzz@u.washington.edu>
+ */
+
+#ifndef WIFI_RADIO_ENERGY_MODEL_H
+#define WIFI_RADIO_ENERGY_MODEL_H
+
+#include "ns3/device-energy-model.h"
+#include "ns3/nstime.h"
+#include "ns3/event-id.h"
+#include "ns3/traced-value.h"
+#include "ns3/wifi-phy.h"
+
+namespace ns3 {
+
+class WifiTxCurrentModel;
+
+/**
+ * \ingroup energy
+ * A WifiPhy listener class for notifying the WifiRadioEnergyModel of Wifi radio
+ * state change.
+ *
+ */
+class WifiRadioEnergyModelPhyListener : public WifiPhyListener
+{
+public:
+  /**
+   * Callback type for updating the transmit current based on the nominal tx power.
+   */
+  typedef Callback<void, double> UpdateTxCurrentCallback;
+
+  WifiRadioEnergyModelPhyListener ();
+  virtual ~WifiRadioEnergyModelPhyListener ();
+
+  /**
+   * \brief Sets the change state callback. Used by helper class.
+   *
+   * \param callback Change state callback.
+   */
+  void SetChangeStateCallback (DeviceEnergyModel::ChangeStateCallback callback);
+
+  /**
+   * \brief Sets the update tx current callback.
+   *
+   * \param callback Update tx current callback.
+   */
+  void SetUpdateTxCurrentCallback (UpdateTxCurrentCallback callback);
+
+  /**
+   * \brief Switches the WifiRadioEnergyModel to RX state.
+   *
+   * \param duration the expected duration of the packet reception.
+   *
+   * Defined in ns3::WifiPhyListener
+   */
+  virtual void NotifyRxStart (Time duration);
+
+  /**
+   * \brief Switches the WifiRadioEnergyModel back to IDLE state.
+   *
+   * Defined in ns3::WifiPhyListener
+   *
+   * Note that for the WifiRadioEnergyModel, the behavior of the function is the
+   * same as NotifyRxEndError.
+   */
+  virtual void NotifyRxEndOk (void);
+
+  /**
+   * \brief Switches the WifiRadioEnergyModel back to IDLE state.
+   *
+   * Defined in ns3::WifiPhyListener
+   *
+   * Note that for the WifiRadioEnergyModel, the behavior of the function is the
+   * same as NotifyRxEndOk.
+   */
+  virtual void NotifyRxEndError (void);
+
+  /**
+   * \brief Switches the WifiRadioEnergyModel to TX state and switches back to
+   * IDLE after TX duration.
+   *
+   * \param duration the expected transmission duration.
+   * \param txPowerDbm the nominal tx power in dBm
+   *
+   * Defined in ns3::WifiPhyListener
+   */
+  virtual void NotifyTxStart (Time duration, double txPowerDbm);
+
+  /**
+   * \param duration the expected busy duration.
+   *
+   * Defined in ns3::WifiPhyListener
+   */
+  virtual void NotifyMaybeCcaBusyStart (Time duration);
+
+  /**
+   * \param duration the expected channel switching duration.
+   *
+   * Defined in ns3::WifiPhyListener
+   */
+  virtual void NotifySwitchingStart (Time duration);
+
+  /**
+   * Defined in ns3::WifiPhyListener
+   */
+  virtual void NotifySleep (void);
+
+  /**
+   * Defined in ns3::WifiPhyListener
+   */
+  virtual void NotifyWakeup (void);
+
+private:
+  /**
+   * A helper function that makes scheduling m_changeStateCallback possible.
+   */
+  void SwitchToIdle (void);
+
+private:
+  /**
+   * Change state callback used to notify the WifiRadioEnergyModel of a state
+   * change.
+   */
+  DeviceEnergyModel::ChangeStateCallback m_changeStateCallback;
+
+  /**
+   * Callback used to update the tx current stored in WifiRadioEnergyModel based on 
+   * the nominal tx power used to transmit the current frame.
+   */
+  UpdateTxCurrentCallback m_updateTxCurrentCallback;
+
+  EventId m_switchToIdleEvent;
+};
+
+// -------------------------------------------------------------------------- //
+
+/**
+ * \ingroup energy
+ * \brief A WiFi radio energy model.
+ * 
+ * 4 states are defined for the radio: TX, RX, IDLE, SLEEP. Default state is
+ * IDLE.
+ * The different types of transactions that are defined are: 
+ *  1. Tx: State goes from IDLE to TX, radio is in TX state for TX_duration,
+ *     then state goes from TX to IDLE.
+ *  2. Rx: State goes from IDLE to RX, radio is in RX state for RX_duration,
+ *     then state goes from RX to IDLE.
+ *  3. Go_to_Sleep: State goes from IDLE to SLEEP.
+ *  4. End_of_Sleep: State goes from SLEEP to IDLE.
+ * The class keeps track of what state the radio is currently in.
+ *
+ * Energy calculation: For each transaction, this model notifies EnergySource
+ * object. The EnergySource object will query this model for the total current.
+ * Then the EnergySource object uses the total current to calculate energy.
+ *
+ * Default values for power consumption are based on measurements reported in:
+ * 
+ * Daniel Halperin, Ben Greenstein, Anmol Sheth, David Wetherall,
+ * "Demystifying 802.11n power consumption", Proceedings of HotPower'10 
+ * 
+ * Power consumption in Watts (single antenna):
+ * 
+ * \f$ P_{tx} = 1.14 \f$ (transmit at 0dBm)
+ * 
+ * \f$ P_{rx} = 0.94 \f$
+ * 
+ * \f$ P_{idle} = 0.82 \f$
+ * 
+ * \f$ P_{sleep} = 0.10 \f$
+ * 
+ * Hence, considering the default supply voltage of 3.0 V for the basic energy
+ * source, the default current values in Ampere are:
+ * 
+ * \f$ I_{tx} = 0.380 \f$
+ * 
+ * \f$ I_{rx} = 0.313 \f$
+ * 
+ * \f$ I_{idle} = 0.273 \f$
+ * 
+ * \f$ I_{sleep} = 0.033 \f$
+ * 
+ * The dependence of the power consumption in transmission mode on the nominal
+ * transmit power can also be achieved through a wifi tx current model.
+ *
+ */
+class WifiRadioEnergyModel : public DeviceEnergyModel
+{
+public:
+  /**
+   * Callback type for energy depletion handling.
+   */
+  typedef Callback<void> WifiRadioEnergyDepletionCallback;
+
+  /**
+   * Callback type for energy recharged handling.
+   */
+  typedef Callback<void> WifiRadioEnergyRechargedCallback;
+
+public:
+  static TypeId GetTypeId (void);
+  WifiRadioEnergyModel ();
+  virtual ~WifiRadioEnergyModel ();
+
+  /**
+   * \brief Sets pointer to EnergySouce installed on node.
+   *
+   * \param source Pointer to EnergySource installed on node.
+   *
+   * Implements DeviceEnergyModel::SetEnergySource.
+   */
+  virtual void SetEnergySource (Ptr<EnergySource> source);
+
+  /**
+   * \returns Total energy consumption of the wifi device.
+   *
+   * Implements DeviceEnergyModel::GetTotalEnergyConsumption.
+   */
+  virtual double GetTotalEnergyConsumption (void) const;
+
+  // Setter & getters for state power consumption.
+  double GetIdleCurrentA (void) const;
+  void SetIdleCurrentA (double idleCurrentA);
+  double GetCcaBusyCurrentA (void) const;
+  void SetCcaBusyCurrentA (double ccaBusyCurrentA);
+  double GetTxCurrentA (void) const;
+  void SetTxCurrentA (double txCurrentA);
+  double GetRxCurrentA (void) const;
+  void SetRxCurrentA (double rxCurrentA);
+  double GetSwitchingCurrentA (void) const;
+  void SetSwitchingCurrentA (double switchingCurrentA);
+  double GetSleepCurrentA (void) const;
+  void SetSleepCurrentA (double sleepCurrentA);
+
+  /**
+   * \returns Current state.
+   */
+  WifiPhy::State GetCurrentState (void) const;
+
+  /**
+   * \param callback Callback function.
+   *
+   * Sets callback for energy depletion handling.
+   */
+  void SetEnergyDepletionCallback (WifiRadioEnergyDepletionCallback callback);
+
+  /**
+   * \param callback Callback function.
+   *
+   * Sets callback for energy recharged handling.
+   */
+  void SetEnergyRechargedCallback (WifiRadioEnergyRechargedCallback callback);
+
+  /**
+   * \param model the model used to compute the wifi tx current.
+   */
+  void SetTxCurrentModel (Ptr<WifiTxCurrentModel> model);
+
+  /**
+   * \brief Calls the CalcTxCurrent method of the tx current model to
+   *        compute the tx current based on such model
+   * 
+   * \param txPowerDbm the nominal tx power in dBm
+   */
+  void SetTxCurrentFromModel (double txPowerDbm);
+
+  /**
+   * \brief Changes state of the WifiRadioEnergyMode.
+   *
+   * \param newState New state the wifi radio is in.
+   *
+   * Implements DeviceEnergyModel::ChangeState.
+   */
+  virtual void ChangeState (int newState);
+
+  /**
+   * \brief Handles energy depletion.
+   *
+   * Implements DeviceEnergyModel::HandleEnergyDepletion
+   */
+  virtual void HandleEnergyDepletion (void);
+
+  /**
+   * \brief Handles energy recharged.
+   *
+   * Implements DeviceEnergyModel::HandleEnergyRecharged
+   */
+  virtual void HandleEnergyRecharged (void);
+
+  /**
+   * \returns Pointer to the PHY listener.
+   */
+  WifiRadioEnergyModelPhyListener * GetPhyListener (void);
+
+
+private:
+  void DoDispose (void);
+
+  /**
+   * \returns Current draw of device, at current state.
+   *
+   * Implements DeviceEnergyModel::GetCurrentA.
+   */
+  virtual double DoGetCurrentA (void) const;
+
+  /**
+   * \param state New state the radio device is currently in.
+   *
+   * Sets current state. This function is private so that only the energy model
+   * can change its own state.
+   */
+  void SetWifiRadioState (const WifiPhy::State state);
+
+private:
+  Ptr<EnergySource> m_source;
+
+  // Member variables for current draw in different radio modes.
+  double m_txCurrentA;
+  double m_rxCurrentA;
+  double m_idleCurrentA;
+  double m_ccaBusyCurrentA;
+  double m_switchingCurrentA;
+  double m_sleepCurrentA;
+  Ptr<WifiTxCurrentModel> m_txCurrentModel;
+
+  // This variable keeps track of the total energy consumed by this model.
+  TracedValue<double> m_totalEnergyConsumption;
+
+  // State variables.
+  WifiPhy::State m_currentState;  // current state the radio is in
+  Time m_lastUpdateTime;          // time stamp of previous energy update
+
+  uint8_t m_nPendingChangeState;
+  bool m_isSupersededChangeState;
+
+  // Energy depletion callback
+  WifiRadioEnergyDepletionCallback m_energyDepletionCallback;
+
+  // Energy recharged callback
+  WifiRadioEnergyRechargedCallback m_energyRechargedCallback;
+
+  // WifiPhy listener
+  WifiRadioEnergyModelPhyListener *m_listener;
+};
+
+} // namespace ns3
+
+#endif /* WIFI_RADIO_ENERGY_MODEL_H */
diff --git a/src/wifi/model/wifi-tx-current-model.cc b/src/wifi/model/wifi-tx-current-model.cc
new file mode 100644
--- /dev/null
+++ b/src/wifi/model/wifi-tx-current-model.cc
@@ -0,0 +1,143 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2014 Universita' degli Studi di Napoli "Federico II"
+ *
+ * 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
+ *
+ * Author: Stefano Avallone <stefano.avallone@unina.it>
+ */
+
+#include "wifi-tx-current-model.h"
+#include "ns3/log.h"
+#include "ns3/boolean.h"
+#include "ns3/double.h"
+#include "ns3/string.h"
+#include "ns3/pointer.h"
+#include <cmath>
+
+namespace ns3 {
+
+NS_LOG_COMPONENT_DEFINE ("WifiTxCurrentModel");
+
+// ------------------------------------------------------------------------- //
+
+NS_OBJECT_ENSURE_REGISTERED (WifiTxCurrentModel);
+
+TypeId 
+WifiTxCurrentModel::GetTypeId (void)
+{
+  static TypeId tid = TypeId ("ns3::WifiTxCurrentModel")
+    .SetParent<Object> ()
+    .SetGroupName ("Energy")
+  ;
+  return tid;
+}
+
+WifiTxCurrentModel::WifiTxCurrentModel()
+{
+}
+
+WifiTxCurrentModel::~WifiTxCurrentModel()
+{
+}
+
+double
+WifiTxCurrentModel::DbmToW (double dbm)
+{
+  double mW = std::pow (10.0, dbm / 10.0);
+  return mW / 1000.0;
+}
+
+// ------------------------------------------------------------------------- //
+
+NS_OBJECT_ENSURE_REGISTERED (LinearWifiTxCurrentModel);
+
+TypeId 
+LinearWifiTxCurrentModel::GetTypeId (void)
+{
+  static TypeId tid = TypeId ("ns3::LinearWifiTxCurrentModel")
+    .SetParent<WifiTxCurrentModel> ()
+    .AddConstructor<LinearWifiTxCurrentModel> ()
+    .AddAttribute ("Eta", "The efficiency of the power amplifier.",
+                   DoubleValue (0.10),
+                   MakeDoubleAccessor (&LinearWifiTxCurrentModel::SetEta,
+                                       &LinearWifiTxCurrentModel::GetEta),
+                   MakeDoubleChecker<double> ())
+    .AddAttribute ("Voltage", "The supply voltage (in Volts).",
+                   DoubleValue (3.0),
+                   MakeDoubleAccessor (&LinearWifiTxCurrentModel::SetVoltage,
+                                       &LinearWifiTxCurrentModel::GetVoltage),
+                   MakeDoubleChecker<double> ())
+    .AddAttribute ("IdleCurrent", "The current in the IDLE state (in Watts).",
+                   DoubleValue (0.273333),
+                   MakeDoubleAccessor (&LinearWifiTxCurrentModel::SetIdleCurrent,
+                                       &LinearWifiTxCurrentModel::GetIdleCurrent),
+                   MakeDoubleChecker<double> ())
+  ;
+  return tid;
+}
+
+LinearWifiTxCurrentModel::LinearWifiTxCurrentModel ()
+{
+}
+
+LinearWifiTxCurrentModel::~LinearWifiTxCurrentModel()
+{
+}
+
+void
+LinearWifiTxCurrentModel::SetEta (double eta)
+{
+  m_eta = eta;
+}
+
+void
+LinearWifiTxCurrentModel::SetVoltage (double voltage)
+{
+  m_voltage = voltage;
+}
+
+void
+LinearWifiTxCurrentModel::SetIdleCurrent (double idleCurrent)
+{
+  m_idleCurrent = idleCurrent;
+}
+
+double
+LinearWifiTxCurrentModel::GetEta (void) const
+{
+  return m_eta;
+}
+
+double
+LinearWifiTxCurrentModel::GetVoltage (void) const
+{
+  return m_voltage;
+}
+
+double
+LinearWifiTxCurrentModel::GetIdleCurrent (void) const
+{
+  return m_idleCurrent;
+}
+
+double
+LinearWifiTxCurrentModel::CalcTxCurrent (double txPowerDbm) const
+{
+  return DbmToW (txPowerDbm) / (m_voltage * m_eta) + m_idleCurrent;
+}
+
+// ------------------------------------------------------------------------- //
+
+} // namespace ns3
diff --git a/src/wifi/model/wifi-tx-current-model.h b/src/wifi/model/wifi-tx-current-model.h
new file mode 100644
--- /dev/null
+++ b/src/wifi/model/wifi-tx-current-model.h
@@ -0,0 +1,142 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2014 Universita' degli Studi di Napoli "Federico II"
+ *
+ * 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
+ *
+ * Author: Stefano Avallone <stefano.avallone@unina.it>
+ */
+
+#ifndef WIFI_TX_CURRENT_MODEL_H
+#define WIFI_TX_CURRENT_MODEL_H
+
+#include "ns3/object.h"
+
+namespace ns3 {
+
+/**
+ * \ingroup energy
+ * 
+ * \brief Modelize the transmit current as a function of the transmit power and mode
+ *
+ */
+class WifiTxCurrentModel : public Object
+{
+public:
+  static TypeId GetTypeId (void);
+
+  WifiTxCurrentModel ();
+  virtual ~WifiTxCurrentModel ();
+
+  /**
+   * \param txPowerDbm the nominal tx power in dBm
+   * \returns the transmit current (in Ampere)
+   */
+  virtual double CalcTxCurrent (double txPowerDbm) const = 0;
+
+  /**
+   * Convert from dBm to Watts.
+   *
+   * \param dbm the power in dBm
+   * \return the equivalent Watts for the given dBm
+   */
+  static double DbmToW (double dbm);
+};
+
+/**
+ * \ingroup energy
+ *
+ * \brief a linear model of the Wifi transmit current
+ *
+ * This model assumes that the transmit current is a linear function
+ * of the nominal transmit power used to send the frame.
+ * In particular, the power absorbed during the transmission of a frame \f$ W_{tx} \f$
+ * is given by the power absorbed by the power amplifier \f$ W_{pa} \f$ plus the power
+ * absorbed by the RF subsystem. The latter is assumed to be the same as the power
+ * absorbed in the IDLE state \f$ W_{idle} \f$.
+ * 
+ * The efficiency \f$ \eta \f$ of the power amplifier is given by 
+ * \f$ \eta = \frac{P_{tx}}{W_{pa}} \f$, where \f$ P_{tx} \f$ is the output power, i.e.,
+ * the nominal transmit power. Hence, \f$ W_{pa} = \frac{P_{tx}}{\eta} \f$
+ * 
+ * It turns out that \f$ W_{tx} = \frac{P_{tx}}{\eta} + W_{idle} \f$. By dividing both
+ * sides by the supply voltage \f$ V \f$: \f$ I_{tx} = \frac{P_{tx}}{V \cdot \eta} + I_{idle} \f$,
+ * where \f$ I_{tx} \f$ and \f$ I_{idle} \f$ are, respectively, the transmit current and
+ * the idle current.
+ * 
+ * For more information, refer to:
+ * Francesco Ivan Di Piazza, Stefano Mangione, and Ilenia Tinnirello.
+ * "On the Effects of Transmit Power Control on the Energy Consumption of WiFi Network Cards",
+ * Proceedings of ICST QShine 2009, pp. 463--475
+ * 
+ * If the tx current corresponding to a given nominal transmit power is known, the efficiency
+ * of the power amplifier is given by the above formula:
+ * \f$ \eta = \frac{P_{tx}}{(I_{tx}-I_{idle})\cdot V} \f$
+ * 
+ */
+class LinearWifiTxCurrentModel : public WifiTxCurrentModel
+{
+public:
+  static TypeId GetTypeId (void);
+
+  LinearWifiTxCurrentModel ();
+  virtual ~LinearWifiTxCurrentModel ();
+  
+  /**
+   * \param eta (dimension-less)
+   *
+   * Set the power amplifier efficiency.
+   */
+  void SetEta (double eta);
+
+  /**
+   * \param voltage (Volts)
+   *
+   * Set the supply voltage.
+   */
+  void SetVoltage (double voltage);
+
+  /**
+   * \param idleCurrent (Ampere)
+   *
+   * Set the current in the IDLE state.
+   */
+  void SetIdleCurrent (double idleCurrent);
+
+  /**
+   * \return the power amplifier efficiency.
+   */
+  double GetEta (void) const;
+
+  /**
+   * \return the supply voltage.
+   */
+  double GetVoltage (void) const;
+
+  /**
+   * \return the current in the IDLE state.
+   */
+  double GetIdleCurrent (void) const;
+
+  double CalcTxCurrent (double txPowerDbm) const;
+
+private:
+  double m_eta;
+  double m_voltage;
+  double m_idleCurrent;
+};
+
+} // namespace ns3
+
+#endif /* WIFI_TX_CURRENT_MODEL_H */
diff --git a/src/wifi/wscript b/src/wifi/wscript
--- a/src/wifi/wscript
+++ b/src/wifi/wscript
@@ -1,7 +1,7 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
 def build(bld):
-    obj = bld.create_ns3_module('wifi', ['network', 'propagation'])
+    obj = bld.create_ns3_module('wifi', ['network', 'propagation', 'energy'])
     obj.source = [
         'model/wifi-information-element.cc',
         'model/wifi-information-element-vector.cc',
@@ -69,6 +69,9 @@
         'model/mpdu-aggregator.cc',
         'model/mpdu-standard-aggregator.cc',
         'model/ampdu-tag.cc',
+        'model/wifi-radio-energy-model.cc',
+        'model/wifi-tx-current-model.cc',
+        'helper/wifi-radio-energy-model-helper.cc',
         'helper/ht-wifi-mac-helper.cc',
         'helper/athstats-helper.cc',
         'helper/wifi-helper.cc',
@@ -154,6 +157,9 @@
         'model/mpdu-aggregator.h',
         'model/mpdu-standard-aggregator.h',
         'model/ampdu-tag.h',
+        'model/wifi-radio-energy-model.h',
+        'model/wifi-tx-current-model.h',
+        'helper/wifi-radio-energy-model-helper.h',
         'helper/ht-wifi-mac-helper.h',
         'helper/athstats-helper.h',
         'helper/wifi-helper.h',