From 49e727e8edba49e5d2cfe49930e6034f3ca985e7 Mon Sep 17 00:00:00 2001
From: ZorazeAli <zoraze.ali@cttc.es>
Date: Wed, 29 Jan 2020 13:02:18 +0100
Subject: [PATCH] buildings: Stop using deprecated method IsOutdoor

---
 .../model/buildings-propagation-loss-model.cc       |  9 ++++++---
 .../hybrid-buildings-propagation-loss-model.cc      | 13 ++++++++-----
 .../model/oh-buildings-propagation-loss-model.cc    | 13 ++++++++-----
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/buildings/model/buildings-propagation-loss-model.cc b/src/buildings/model/buildings-propagation-loss-model.cc
index fc1a762db..f52a7ed0c 100644
--- a/src/buildings/model/buildings-propagation-loss-model.cc
+++ b/src/buildings/model/buildings-propagation-loss-model.cc
@@ -188,9 +188,12 @@ double
 BuildingsPropagationLossModel::EvaluateSigma (Ptr<MobilityBuildingInfo> a, Ptr<MobilityBuildingInfo> b)
 const
 {
-  if (a->IsOutdoor ())
+  bool isAIndoor = a->IsIndoor ();
+  bool isBIndoor = b->IsIndoor ();
+
+  if (!isAIndoor) // a is outdoor
     {
-      if (b->IsOutdoor ())
+      if (!isBIndoor) // b is outdoor
         {
           return (m_shadowingSigmaOutdoor);
         }
@@ -201,7 +204,7 @@ const
         }
     }
   else
-  if (b->IsIndoor ())
+  if (isBIndoor) // b is indoor
     {
       return (m_shadowingSigmaIndoor);
     }
diff --git a/src/buildings/model/hybrid-buildings-propagation-loss-model.cc b/src/buildings/model/hybrid-buildings-propagation-loss-model.cc
index 64656e140..b6082c41e 100644
--- a/src/buildings/model/hybrid-buildings-propagation-loss-model.cc
+++ b/src/buildings/model/hybrid-buildings-propagation-loss-model.cc
@@ -153,10 +153,13 @@ HybridBuildingsPropagationLossModel::GetLoss (Ptr<MobilityModel> a, Ptr<Mobility
   NS_ASSERT_MSG ((a1 != 0) && (b1 != 0), "HybridBuildingsPropagationLossModel only works with MobilityBuildingInfo");
 
   double loss = 0.0;
+  bool isAIndoor = a1->IsIndoor ();
+  bool isBIndoor = b1->IsIndoor ();
 
-  if (a1->IsOutdoor ())
+
+  if (!isAIndoor) // a is outdoor
     {
-      if (b1->IsOutdoor ())
+      if (!isBIndoor) // b is outdoor
         {
           if (distance > 1000)
             {
@@ -208,7 +211,7 @@ HybridBuildingsPropagationLossModel::GetLoss (Ptr<MobilityModel> a, Ptr<Mobility
   else
     {
       // a is indoor
-      if (b1->IsIndoor ())
+      if (isBIndoor) // b is indoor
         {
           if (a1->GetBuilding () == b1->GetBuilding ())
             {
@@ -247,8 +250,8 @@ HybridBuildingsPropagationLossModel::GetLoss (Ptr<MobilityModel> a, Ptr<Mobility
               loss = ItuR1411 (a, b) + ExternalWallLoss (a1)  + HeightLoss (a1);
               NS_LOG_INFO (this << " I-O (<1000)  ITUR1411 + BEL + HG: " << loss);
             }
-        } // end b1->IsIndoor ()
-    } // end a1->IsOutdoor ()
+        } // end if (isBIndoor)
+    } // end if (!isAIndoor)
 
   loss = std::max (loss, 0.0);
 
diff --git a/src/buildings/model/oh-buildings-propagation-loss-model.cc b/src/buildings/model/oh-buildings-propagation-loss-model.cc
index 65b752aa8..2a4e0f41e 100644
--- a/src/buildings/model/oh-buildings-propagation-loss-model.cc
+++ b/src/buildings/model/oh-buildings-propagation-loss-model.cc
@@ -74,9 +74,12 @@ OhBuildingsPropagationLossModel::GetLoss (Ptr<MobilityModel> a, Ptr<MobilityMode
 
   double loss = 0.0;
 
-  if (a1->IsOutdoor ())
+  bool isAIndoor = a1->IsIndoor ();
+  bool isBIndoor = b1->IsIndoor ();
+
+  if (!isAIndoor) // a is outdoor
     {
-      if (b1->IsOutdoor ())
+      if (!isBIndoor) // b is outdoor
         {
           loss = m_okumuraHata->GetLoss (a, b);
           NS_LOG_INFO (this << " O-O : " << loss);
@@ -91,7 +94,7 @@ OhBuildingsPropagationLossModel::GetLoss (Ptr<MobilityModel> a, Ptr<MobilityMode
   else
     {
       // a is indoor
-      if (b1->IsIndoor ())
+      if (isBIndoor) // b is indoor
         {
           if (a1->GetBuilding () == b1->GetBuilding ())
             {
@@ -111,8 +114,8 @@ OhBuildingsPropagationLossModel::GetLoss (Ptr<MobilityModel> a, Ptr<MobilityMode
         {
           loss = m_okumuraHata->GetLoss (a, b) + ExternalWallLoss (a1);
           NS_LOG_INFO (this << " I-O : " << loss);
-        } // end b1->IsIndoor ()
-    } // end a1->IsOutdoor ()
+        } // end if (isBIndoor)
+    } // end if (!isAIndoor)
 
   loss = std::max (0.0, loss);
   return loss;