From c4765573f9804ee5be7eead9658e6363e34ca0f0 Mon Sep 17 00:00:00 2001
From: Tommaso Pecorella <tommaso.pecorella@unifi.it>
Date: Sun, 29 Mar 2015 16:12:50 +0200
Subject: [PATCH] SetGroupName for energy module

---
 src/energy/helper/energy-harvester-container.cc | 1 +
 src/energy/helper/energy-source-container.cc    | 1 +
 src/energy/model/basic-energy-harvester.cc      | 1 +
 src/energy/model/basic-energy-source.cc         | 1 +
 src/energy/model/device-energy-model.cc         | 1 +
 src/energy/model/energy-harvester.cc            | 1 +
 src/energy/model/energy-source.cc               | 1 +
 src/energy/model/li-ion-energy-source.cc        | 1 +
 src/energy/model/rv-battery-model.cc            | 1 +
 src/energy/model/simple-device-energy-model.cc  | 1 +
 src/energy/model/wifi-radio-energy-model.cc     | 1 +
 src/energy/model/wifi-tx-current-model.cc       | 1 +
 12 files changed, 12 insertions(+)

diff --git a/src/energy/helper/energy-harvester-container.cc b/src/energy/helper/energy-harvester-container.cc
index 28518300a..a23ddbd3a 100644
--- a/src/energy/helper/energy-harvester-container.cc
+++ b/src/energy/helper/energy-harvester-container.cc
@@ -35,6 +35,7 @@ EnergyHarvesterContainer::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::EnergyHarvesterContainer")
     .SetParent<Object> ()
+    .SetGroupName ("Energy")
     .AddConstructor<EnergyHarvesterContainer> ()
   ;
   return tid;
diff --git a/src/energy/helper/energy-source-container.cc b/src/energy/helper/energy-source-container.cc
index f1583ec4f..0ab1e4684 100644
--- a/src/energy/helper/energy-source-container.cc
+++ b/src/energy/helper/energy-source-container.cc
@@ -32,6 +32,7 @@ EnergySourceContainer::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::EnergySourceContainer")
     .SetParent<Object> ()
+    .SetGroupName ("Energy")
     .AddConstructor<EnergySourceContainer> ()
   ;
   return tid;
diff --git a/src/energy/model/basic-energy-harvester.cc b/src/energy/model/basic-energy-harvester.cc
index e7942cc0f..6c1da9d9f 100644
--- a/src/energy/model/basic-energy-harvester.cc
+++ b/src/energy/model/basic-energy-harvester.cc
@@ -39,6 +39,7 @@ BasicEnergyHarvester::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::BasicEnergyHarvester")
   .SetParent<EnergyHarvester> ()
+  .SetGroupName ("Energy")
   .AddConstructor<BasicEnergyHarvester> ()
   .AddAttribute ("PeriodicHarvestedPowerUpdateInterval",
                  "Time between two consecutive periodic updates of the harvested power. By default, the value is updated every 1 s",
diff --git a/src/energy/model/basic-energy-source.cc b/src/energy/model/basic-energy-source.cc
index cfeaca712..8799bb12e 100644
--- a/src/energy/model/basic-energy-source.cc
+++ b/src/energy/model/basic-energy-source.cc
@@ -36,6 +36,7 @@ BasicEnergySource::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::BasicEnergySource")
     .SetParent<EnergySource> ()
+    .SetGroupName ("Energy")
     .AddConstructor<BasicEnergySource> ()
     .AddAttribute ("BasicEnergySourceInitialEnergyJ",
                    "Initial energy stored in basic energy source.",
diff --git a/src/energy/model/device-energy-model.cc b/src/energy/model/device-energy-model.cc
index b7b79ef1d..d4b5a578f 100644
--- a/src/energy/model/device-energy-model.cc
+++ b/src/energy/model/device-energy-model.cc
@@ -32,6 +32,7 @@ DeviceEnergyModel::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::DeviceEnergyModel")
     .SetParent<Object> ()
+    .SetGroupName ("Energy")
   ;
   return tid;
 }
diff --git a/src/energy/model/energy-harvester.cc b/src/energy/model/energy-harvester.cc
index c9cca3f0a..89c8db645 100644
--- a/src/energy/model/energy-harvester.cc
+++ b/src/energy/model/energy-harvester.cc
@@ -33,6 +33,7 @@ EnergyHarvester::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::EnergyHarvester")
     .SetParent<Object> ()
+    .SetGroupName ("Energy")
   ;
   return tid;
 }
diff --git a/src/energy/model/energy-source.cc b/src/energy/model/energy-source.cc
index ad5e86098..a1a24c8dc 100644
--- a/src/energy/model/energy-source.cc
+++ b/src/energy/model/energy-source.cc
@@ -37,6 +37,7 @@ EnergySource::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::EnergySource")
     .SetParent<Object> ()
+    .SetGroupName ("Energy")
   ;
   return tid;
 }
diff --git a/src/energy/model/li-ion-energy-source.cc b/src/energy/model/li-ion-energy-source.cc
index e6f1b52fb..9516c0085 100644
--- a/src/energy/model/li-ion-energy-source.cc
+++ b/src/energy/model/li-ion-energy-source.cc
@@ -38,6 +38,7 @@ LiIonEnergySource::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::LiIonEnergySource")
     .SetParent<EnergySource> ()
+    .SetGroupName ("Energy")
     .AddConstructor<LiIonEnergySource> ()
     .AddAttribute ("LiIonEnergySourceInitialEnergyJ",
                    "Initial energy stored in basic energy source.",
diff --git a/src/energy/model/rv-battery-model.cc b/src/energy/model/rv-battery-model.cc
index 91db8d162..20522f903 100644
--- a/src/energy/model/rv-battery-model.cc
+++ b/src/energy/model/rv-battery-model.cc
@@ -37,6 +37,7 @@ RvBatteryModel::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::RvBatteryModel")
     .SetParent<EnergySource> ()
+    .SetGroupName ("Energy")
     .AddConstructor<RvBatteryModel> ()
     .AddAttribute ("RvBatteryModelPeriodicEnergyUpdateInterval",
                    "RV battery model sampling interval.",
diff --git a/src/energy/model/simple-device-energy-model.cc b/src/energy/model/simple-device-energy-model.cc
index 9aabf90c1..64d29f838 100644
--- a/src/energy/model/simple-device-energy-model.cc
+++ b/src/energy/model/simple-device-energy-model.cc
@@ -35,6 +35,7 @@ SimpleDeviceEnergyModel::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::SimpleDeviceEnergyModel")
     .SetParent<DeviceEnergyModel> ()
+    .SetGroupName ("Energy")
     .AddConstructor<SimpleDeviceEnergyModel> ()
     .AddTraceSource ("TotalEnergyConsumption",
                      "Total energy consumption of the radio device.",
diff --git a/src/energy/model/wifi-radio-energy-model.cc b/src/energy/model/wifi-radio-energy-model.cc
index b24878d42..4a26a08ba 100644
--- a/src/energy/model/wifi-radio-energy-model.cc
+++ b/src/energy/model/wifi-radio-energy-model.cc
@@ -38,6 +38,7 @@ WifiRadioEnergyModel::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::WifiRadioEnergyModel")
     .SetParent<DeviceEnergyModel> ()
+    .SetGroupName ("Energy")
     .AddConstructor<WifiRadioEnergyModel> ()
     .AddAttribute ("IdleCurrentA",
                    "The default radio Idle current in Ampere.",
diff --git a/src/energy/model/wifi-tx-current-model.cc b/src/energy/model/wifi-tx-current-model.cc
index a76f899ec..bddd822f6 100644
--- a/src/energy/model/wifi-tx-current-model.cc
+++ b/src/energy/model/wifi-tx-current-model.cc
@@ -39,6 +39,7 @@ WifiTxCurrentModel::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::WifiTxCurrentModel")
     .SetParent<Object> ()
+    .SetGroupName ("Energy")
   ;
   return tid;
 }