dadada/ns-3-leo
dadada/ns-3-leo
1
0
Fork 0
mirror of https://gitlab.ibr.cs.tu-bs.de/tschuber/ns-3-leo.git synced 2025-06-08 10:03:58 +02:00
Code Issues Releases Wiki Activity

Remove LeoMobilityModel

Browse source
This commit is contained in:
Tim Schubert 2020-07-06 17:24:28 +02:00
parent 4eda5589cb
commit 8ab0bc023e
8 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
model/isl-propagation-loss-model.cc
View file

@ -22,6 +22,8 @@
* Pavel Boyko <boyko@iitp.ru> for matrix * Pavel Boyko <boyko@iitp.ru> for matrix
*/ */
#include "ns3/log.h"
#include "isl-propagation-loss-model.h" #include "isl-propagation-loss-model.h"
namespace ns3 { namespace ns3 {

1
model/isl-propagation-loss-model.h
View file

@ -25,7 +25,6 @@
#ifndef ISL_PROPAGATION_LOSS_MODEL_H #ifndef ISL_PROPAGATION_LOSS_MODEL_H
#define ISL_PROPAGATION_LOSS_MODEL_H #define ISL_PROPAGATION_LOSS_MODEL_H
#include "leo-mobility-model.h"
#include <ns3/object.h> #include <ns3/object.h>
#include <ns3/propagation-loss-model.h> #include <ns3/propagation-loss-model.h>

3
model/leo-propagation-loss-model.cc
View file

@ -1,5 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
#include "ns3/log.h"
#include "leo-propagation-loss-model.h" #include "leo-propagation-loss-model.h"
namespace ns3 { namespace ns3 {
@ -38,7 +39,7 @@ LeoPropagationLossModel::DoCalcRxPower (double txPowerDbm,
// TODO perform line-earth intersection (ray tracing) // TODO perform line-earth intersection (ray tracing)
double rxc = 0;//-m_variable->GetValue (); double rxc = 0;//-m_variable->GetValue ();
NS_LOG_DEBUG ("attenuation coefficient="<<rxc<<"Db"); //NS_LOG_DEBUG ("attenuation coefficient="<<rxc<<"Db");
return txPowerDbm + rxc; return txPowerDbm + rxc;
} }

1
model/leo-propagation-loss-model.h
View file

@ -3,7 +3,6 @@
#ifndef LEO_PROPAGATION_LOSS_MODEL_H #ifndef LEO_PROPAGATION_LOSS_MODEL_H
#define LEO_PROPAGATION_LOSS_MODEL_H #define LEO_PROPAGATION_LOSS_MODEL_H
#include "leo-mobility-model.h"
#include <ns3/object.h> #include <ns3/object.h>
#include <ns3/propagation-loss-model.h> #include <ns3/propagation-loss-model.h>

6
test/isl-mock-channel-test-suite.cc
View file

@ -42,7 +42,7 @@ IslMockChannelTransmitUnknownTestCase::DoRun (void)
Time txTime; Time txTime;
channel->SetAttribute ("PropagationDelay", StringValue ("ns3::ConstantSpeedPropagationDelayModel")); channel->SetAttribute ("PropagationDelay", StringValue ("ns3::ConstantSpeedPropagationDelayModel"));
channel->SetAttribute ("PropagationLoss", StringValue ("ns3::IslPropagationLossModel")); channel->SetAttribute ("PropagationLoss", StringValue ("ns3::IslPropagationLossModel"));
dev->SetAttribute ("MobilityModel", StringValue ("ns3::LeoMobilityModel")); dev->SetAttribute ("MobilityModel", StringValue ("ns3::WaypointMobilityModel"));
bool result = channel->TransmitStart (p, srcId, destAddr, txTime); bool result = channel->TransmitStart (p, srcId, destAddr, txTime);
NS_TEST_ASSERT_MSG_EQ (result, false, "Unknown destination fails to deliver"); NS_TEST_ASSERT_MSG_EQ (result, false, "Unknown destination fails to deliver");
@ -80,13 +80,13 @@ IslMockChannelTransmitKnownTestCase::DoRun (void)
Ptr<Node> srcNode = CreateObject<Node> (); Ptr<Node> srcNode = CreateObject<Node> ();
Ptr<MockNetDevice> srcDev = CreateObject<MockNetDevice> (); Ptr<MockNetDevice> srcDev = CreateObject<MockNetDevice> ();
srcDev->SetNode (srcNode); srcDev->SetNode (srcNode);
srcDev->SetAttribute ("MobilityModel", StringValue ("ns3::LeoMobilityModel")); srcDev->SetAttribute ("MobilityModel", StringValue ("ns3::WaypointMobilityModel"));
int32_t srcId = channel->Attach (srcDev); int32_t srcId = channel->Attach (srcDev);
Ptr<Node> dstNode = CreateObject<Node> (); Ptr<Node> dstNode = CreateObject<Node> ();
Ptr<MockNetDevice> dstDev = CreateObject<MockNetDevice> (); Ptr<MockNetDevice> dstDev = CreateObject<MockNetDevice> ();
dstDev->SetNode (dstNode); dstDev->SetNode (dstNode);
dstDev->SetAttribute ("MobilityModel", StringValue ("ns3::LeoMobilityModel")); dstDev->SetAttribute ("MobilityModel", StringValue ("ns3::WaypointMobilityModel"));
channel->Attach (dstDev); channel->Attach (dstDev);
Address destAddr = dstDev->GetAddress (); Address destAddr = dstDev->GetAddress ();

2
test/isl-test-suite.cc
View file

@ -41,7 +41,7 @@ IslIcmpTestCase::DoRun (void)
isl.SetDeviceAttribute ("DataRate", StringValue ("5Gbps")); isl.SetDeviceAttribute ("DataRate", StringValue ("5Gbps"));
isl.SetChannelAttribute ("PropagationDelay", StringValue ("ns3::ConstantSpeedPropagationDelayModel")); isl.SetChannelAttribute ("PropagationDelay", StringValue ("ns3::ConstantSpeedPropagationDelayModel"));
isl.SetChannelAttribute ("PropagationLoss", StringValue ("ns3::IslPropagationLossModel")); isl.SetChannelAttribute ("PropagationLoss", StringValue ("ns3::IslPropagationLossModel"));
isl.SetDeviceAttribute ("MobilityModel", StringValue ("ns3::LeoMobilityModel")); isl.SetDeviceAttribute ("MobilityModel", StringValue ("ns3::WaypointMobilityModel"));
NetDeviceContainer devices; NetDeviceContainer devices;
devices = isl.Install (nodes); devices = isl.Install (nodes);

8
test/leo-mock-channel-test-suite.cc
View file

@ -88,7 +88,7 @@ LeoMockChannelTransmitKnownTestCase::DoRun (void)
Ptr<Node> dstNode = CreateObject<Node> (); Ptr<Node> dstNode = CreateObject<Node> ();
Ptr<LeoMockNetDevice> dstDev = CreateObject<LeoMockNetDevice> (); Ptr<LeoMockNetDevice> dstDev = CreateObject<LeoMockNetDevice> ();
dstDev->SetNode (dstNode); dstDev->SetNode (dstNode);
dstDev->SetAttribute ("MobilityModel", StringValue ("ns3::LeoMobilityModel")); dstDev->SetAttribute ("MobilityModel", StringValue ("ns3::WaypointMobilityModel"));
dstDev->SetDeviceType (LeoMockNetDevice::SAT); dstDev->SetDeviceType (LeoMockNetDevice::SAT);
channel->Attach (dstDev); channel->Attach (dstDev);
@ -131,7 +131,7 @@ LeoMockChannelTransmitSpaceGroundTestCase::DoRun (void)
Ptr<Node> srcNode = CreateObject<Node> (); Ptr<Node> srcNode = CreateObject<Node> ();
Ptr<LeoMockNetDevice> srcDev = CreateObject<LeoMockNetDevice> (); Ptr<LeoMockNetDevice> srcDev = CreateObject<LeoMockNetDevice> ();
srcDev->SetNode (srcNode); srcDev->SetNode (srcNode);
srcDev->SetAttribute ("MobilityModel", StringValue ("ns3::LeoMobilityModel")); srcDev->SetAttribute ("MobilityModel", StringValue ("ns3::WaypointMobilityModel"));
srcDev->SetDeviceType (LeoMockNetDevice::SAT); srcDev->SetDeviceType (LeoMockNetDevice::SAT);
int32_t srcId = channel->Attach (srcDev); int32_t srcId = channel->Attach (srcDev);
@ -181,14 +181,14 @@ LeoMockChannelTransmitSpaceSpaceTestCase::DoRun (void)
Ptr<Node> srcNode = CreateObject<Node> (); Ptr<Node> srcNode = CreateObject<Node> ();
Ptr<LeoMockNetDevice> srcDev = CreateObject<LeoMockNetDevice> (); Ptr<LeoMockNetDevice> srcDev = CreateObject<LeoMockNetDevice> ();
srcDev->SetNode (srcNode); srcDev->SetNode (srcNode);
srcDev->SetAttribute ("MobilityModel", StringValue ("ns3::LeoMobilityModel")); srcDev->SetAttribute ("MobilityModel", StringValue ("ns3::WaypointMobilityModel"));
srcDev->SetDeviceType (LeoMockNetDevice::SAT); srcDev->SetDeviceType (LeoMockNetDevice::SAT);
int32_t srcId = channel->Attach (srcDev); int32_t srcId = channel->Attach (srcDev);
Ptr<Node> dstNode = CreateObject<Node> (); Ptr<Node> dstNode = CreateObject<Node> ();
Ptr<LeoMockNetDevice> dstDev = CreateObject<LeoMockNetDevice> (); Ptr<LeoMockNetDevice> dstDev = CreateObject<LeoMockNetDevice> ();
dstDev->SetNode (dstNode); dstDev->SetNode (dstNode);
dstDev->SetAttribute ("MobilityModel", StringValue ("ns3::LeoMobilityModel")); dstDev->SetAttribute ("MobilityModel", StringValue ("ns3::WaypointMobilityModel"));
dstDev->SetDeviceType (LeoMockNetDevice::SAT); dstDev->SetDeviceType (LeoMockNetDevice::SAT);
channel->Attach (dstDev); channel->Attach (dstDev);

2
test/leo-test-suite.cc
View file

@ -48,7 +48,7 @@ LeoTestCase1::DoRun (void)
LeoHelper leo; LeoHelper leo;
leo.SetDeviceAttribute ("DataRate", StringValue ("10Mbps")); leo.SetDeviceAttribute ("DataRate", StringValue ("10Mbps"));
leo.SetChannelAttribute ("PropagationDelay", StringValue ("ns3::ConstantSpeedPropagationDelayModel")); leo.SetChannelAttribute ("PropagationDelay", StringValue ("ns3::ConstantSpeedPropagationDelayModel"));
leo.SetDeviceAttribute ("MobilityModel", StringValue ("ns3::LeoMobilityModel")); leo.SetDeviceAttribute ("MobilityModel", StringValue ("ns3::WaypointMobilityModel"));
NetDeviceContainer allDevices = leo.Install (satellites, gateways, terminals); NetDeviceContainer allDevices = leo.Install (satellites, gateways, terminals);