merge

src/buildings/examples/buildings-pathloss-profiler.cc

@@ -67,7 +67,7 @@ main (int argc, char *argv[])
   mmEnb->SetPosition (Vector (0.0, 0.0, hEnb));
   if (enbIndoor)
     {
-      static Ptr<Building> building1 = Create<Building> (0.0, 10.0, 0.0, 10.0, 0.0, 20.0 /*, 1, 1, 1*/);
+      Ptr<Building> building1 = Create<Building> (0.0, 10.0, 0.0, 10.0, 0.0, 20.0 /*, 1, 1, 1*/);
       building1->SetBuildingType (Building::Residential);
       building1->SetExtWallsType (Building::ConcreteWithWindows);
       mmEnb->SetIndoor (building1);

src/buildings/model/building.cc

@@ -55,7 +55,6 @@ Building::GetTypeId (void)
                    MakeUintegerAccessor (&Building::GetNFloors, &Building::SetNFloors),
                    MakeUintegerChecker<uint32_t> ())
     .AddAttribute ("Id", "The id (unique integer) of this Building.",
-                   TypeId::ATTR_GET,
                    UintegerValue (0),
                    MakeUintegerAccessor (&Building::GetId),
                    MakeUintegerChecker<uint32_t> ())
@@ -93,7 +92,7 @@ Building::Building (double xMin,
                   << " Building::Building (double xMin, double xMax, double yMin, " << std::endl
                   << "                     double yMax, double zMin, double zMax)\n" << std::endl
                   << "so you can't do any more stuff like:" << std::endl
-                  << "Ptr<Building> b = CreateObject<building> (" 
+                  << "Ptr<Building> b = CreateObject<Building> (" 
                   << xMin << ", "
                   << xMax << ", "
                   << yMin << ", "

src/buildings/model/building.h

@@ -222,12 +222,6 @@ private:
 
 };
 
-//std::ostream &operator << (std::ostream &os, const Box &box);
-//std::istream &operator >> (std::istream &is, Box &box);
-
-
-//ATTRIBUTE_HELPER_HEADER (Building);
-
 } // namespace ns3
 
 #endif /* BUILDING_H */

src/buildings/test/examples-to-run.py

@@ -0,0 +1,21 @@
+#! /usr/bin/env python
+# -*- coding: utf-8 -*-
+## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
+
+# A list of C++ examples to run in order to ensure that they remain
+# buildable and runnable over time.  Each tuple in the list contains
+#
+#     (example_name, do_run, do_valgrind_run).
+#
+# See test.py for more information.
+cpp_examples = [
+    ("buildings-pathloss-profiler", "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
+#
+#     (example_name, do_run).
+#
+# See test.py for more information.
+python_examples = []

src/lte/examples/lena-rem-sector-antenna.cc

@@ -29,7 +29,7 @@
 #include <iomanip>
 #include <string>
 #include <vector>
-//#include "ns3/gtk-config-store.h"
+#include "ns3/gtk-config-store.h"
 
 using namespace ns3;
 using std::vector;
@@ -105,15 +105,6 @@ main (int argc, char *argv[])
           enbPosition.push_back (v);
           Ptr<BuildingsMobilityModel> mmEnb = enbNodes.Get (plantedEnb)->GetObject<BuildingsMobilityModel> ();
           mmEnb->SetPosition (v);
-
-          // Positioning UEs attached to eNB
-          mobility.Install (ueNodes.at(plantedEnb));
-          for (uint32_t ue = 0; ue < nUe; ue++)
-            {
-              Ptr<BuildingsMobilityModel> mmUe = ueNodes.at(plantedEnb).Get (ue)->GetObject<BuildingsMobilityModel> ();
-              Vector vUe (v.x, v.y, v.z);
-              mmUe->SetPosition (vUe);
-            }
         }
     }
 
@@ -227,8 +218,8 @@ main (int argc, char *argv[])
 
   Simulator::Run ();
 
-  // GtkConfigStore config;
-  // config.ConfigureAttributes ();
+//  GtkConfigStore config;
+//  config.ConfigureAttributes ();
 
   lteHelper = 0;
   Simulator::Destroy ();