Skip to content

fix type conversion error #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Orienfish wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix type conversion error #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9d755e
fix type conversion error
Orienfish Jul 28, 2020
7330f99
fix bug
Orienfish Aug 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 22 additions & 22 deletions examples/lora.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ double length = 1000; //!< Square city with length as distance
double iterationCount = 5; //!< Square city with length as distance
int pktsize = 51; //!< size of packets, in bytes
int duration = 24*60*60; //!< Duration of the simulation
int measurementStart = 0; //!< Start of the measured simulation (gives time to settle)
int measurementStart = 0; //!< Start of the measured simulation (gives time to settle)
double interval = 120; // interval between packets, minutes
bool verbose = false; // enable logging (different from trace)
bool nakagami = true; // enable nakagami path loss
Expand All @@ -96,10 +96,10 @@ uint8_t offsets [7] = {2,3,3,1,2,2,3};
// End configuration
/////////////////////////////////

uint32_t
uint32_t
GetClosestGateway (Ptr<MobilityModel> location)
{
uint32_t closestNode;
uint32_t closestNode;
double smallestDistance = 99999999;
for (uint32_t i = 0; i<gateways.GetN (); i++)
{
Expand Down Expand Up @@ -142,7 +142,7 @@ Received (const Ptr<const Packet> packet)
copy->RemoveTrailer (trailer);
Address addr = (header.GetAddr());
std::get<1>(errorMap[addr])++;
if ( trailer.GetGateway () == GetClosestGateway (deviceMap[addr]->GetNode ()->GetObject<MobilityModel>()))
if ( trailer.GetGateway () == GetClosestGateway (deviceMap[addr]->GetNode ()->GetObject<MobilityModel>()))
std::get<3>(errorMap[addr])++;
}
}
Expand Down Expand Up @@ -229,24 +229,24 @@ mainBody ()
MobilityHelper mobility;
Ptr<ListPositionAllocator> basePositionList = CreateObject<ListPositionAllocator> ();
// place gateways in a hexagonal structure
basePositionList->Add (Vector (0.0,0.0,0.0)); //network
basePositionList->Add (Vector (0.0,0.0,0.0)); //network
// center gateway
basePositionList->Add (Vector (length,length,50));
// 3 gateway equally spaced around the central gateway
basePositionList->Add (Vector (length/2,1866*length/1000,50.0)); //main base station
basePositionList->Add (Vector (length/2,134*length/1000,50.0)); //main base station
basePositionList->Add (Vector (2*length,length,50.0)); //main base station
basePositionList->Add (Vector (length/2,1866*length/1000,50.0)); //main base station
basePositionList->Add (Vector (length/2,134*length/1000,50.0)); //main base station
basePositionList->Add (Vector (2*length,length,50.0)); //main base station
// 3 gateways equally spaced between all other gw's
basePositionList->Add (Vector (0,length,50.0)); //main base station
basePositionList->Add (Vector (1.500*length,1866*length/1000,50.0)); //main base station
basePositionList->Add (Vector (1.500*length,134*length/1000,50.0)); //main base station
//basePositionList->Add (Vector (length,length,50.0)); //main base station
//basePositionList->Add (Vector (length/3,length,50.0)); //main base station
//basePositionList->Add (Vector (4*length/3,1.5774*length,50.0)); //main base station
basePositionList->Add (Vector (0,length,50.0)); //main base station
basePositionList->Add (Vector (1.500*length,1866*length/1000,50.0)); //main base station
basePositionList->Add (Vector (1.500*length,134*length/1000,50.0)); //main base station
//basePositionList->Add (Vector (length,length,50.0)); //main base station
//basePositionList->Add (Vector (length/3,length,50.0)); //main base station
//basePositionList->Add (Vector (4*length/3,1.5774*length,50.0)); //main base station
//basePositionList->Add (Vector (length*4/3,.42265*length,50.0)); //main base station
//basePositionList->Add (Vector (length*2/3,1.5774*length,50.0)); //main base station
//basePositionList->Add (Vector (length*2/3,.42265*length,50.0)); //main base station
//basePositionList->Add (Vector (5*length/3,length,50.0)); //main base station
//basePositionList->Add (Vector (length*2/3,1.5774*length,50.0)); //main base station
//basePositionList->Add (Vector (length*2/3,.42265*length,50.0)); //main base station
//basePositionList->Add (Vector (5*length/3,length,50.0)); //main base station
mobility.SetPositionAllocator (basePositionList);
mobility.SetMobilityModel ("ns3::ConstantPositionMobilityModel");
mobility.Install(loraBackendNodes);
Expand Down Expand Up @@ -324,7 +324,7 @@ mainBody ()
for (uint32_t i = 0; i<loraNetDevices.GetN(); i++)
{
loraNetDevices.Get(i)->SetAttribute("Reliable",BooleanValue(true));

Ptr<LoRaPhy> temp = StaticCast<LoRaPhy>(StaticCast<LoRaNetDevice>(loraNetDevices.Get(i))->GetPhy());
}

Expand Down Expand Up @@ -356,7 +356,7 @@ mainBody ()
address.SetBase ("10.1.1.0", "255.255.255.0");
Ipv4InterfaceContainer interfaces = address.Assign (csmaDevices);

// set addresses
// set addresses
std::cout << "Set the addresses" << std::endl;
lorahelper.FinishGateways (loraCoordinatorNodes, gateways, interfaces.GetAddress(0));
// Reset the power after each succesfull message
Expand Down Expand Up @@ -394,7 +394,7 @@ mainBody ()

// hookup functions to the network for measuring performance
loraNetwork->TraceConnectWithoutContext("NetRx",MakeCallback(&ReceivedUnique));
loraNetwork->TraceConnectWithoutContext("NetPromiscRx",MakeCallback(&Received));
loraNetwork->TraceConnectWithoutContext("NetPromiscRx",MakeCallback(&Received));

// Configure interference
if (interference)
Expand Down Expand Up @@ -426,7 +426,7 @@ mainBody ()
return 0;
}

int
int
main (int argc, char** argv)
{
CommandLine cmd;
Expand Down Expand Up @@ -470,7 +470,7 @@ main (int argc, char** argv)
*m_stream->GetStream() << ", learning " << learning << ", optimized " << optimized;
*m_stream->GetStream() << ", energy " << monitorEnergy << ", iterations " << iterationCount<<std::endl;

*m_stream->GetStream() << "ID, transmitted, received, uniquelyReceived, closestReceived, xCoords, yCoords, avgRetransmission, avgDelay, noAck, acksReceived,timeInSimulation,energyleft << std::endl;
*m_stream->GetStream() << "ID, transmitted, received, uniquelyReceived, closestReceived, xCoords, yCoords, avgRetransmission, avgDelay, noAck, acksReceived,timeInSimulation,energyleft" << std::endl;
for (uint8_t iterationI=0;iterationI<iterationCount;iterationI++){
std::cout << "Iteration: " << (int)iterationI << std::endl;
mainBody();
Expand Down
4 changes: 2 additions & 2 deletions model/lora-rs-net-device.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ namespace ns3 {
LoRaNetDevice::DoDispose ();
}

uint32_t
uint32_t
LoRaRsNetDevice::GetOffset ()
{
return m_offset;
Expand Down Expand Up @@ -144,7 +144,7 @@ namespace ns3 {
m_state = RX1_PENDING;

}
if (Simulator::GetDelayLeft(m_beaconTimeout) <= 0)
if (Simulator::GetDelayLeft(m_beaconTimeout) <= Seconds(0))
{
if (m_state != BEACON && m_state!=RX)
{
Expand Down