Commit a189c088 authored by Samir Medjiah's avatar Samir Medjiah
Browse files

Update of the sample usecase to comply with modifications to Sensor 

Module.
parent 53e17eab

simulations/omnetpp_usecase.ini

+8 −1
Original line number Original line Diff line number Diff line
@@ -12,6 +12,12 @@ SimpleNetwork.intersection*.application[0].sensor[0].name = "intersectionState" 
SimpleNetwork.intersection*.application[0].actuatorCount = 1

SimpleNetwork.intersection*.application[0].actuatorCount = 1

SimpleNetwork.intersection*.application[0].actuator[0].name = "threeLights"

SimpleNetwork.intersection*.application[0].actuator[0].name = "threeLights"





SimpleNetwork.intersection01.application[0].sensor[0].baseURL = "mn1-cse"

SimpleNetwork.intersection02.application[0].sensor[0].baseURL = "mn1-cse"

SimpleNetwork.intersection03.application[0].sensor[0].baseURL = "mn1-cse"

SimpleNetwork.intersection04.application[0].sensor[0].baseURL = "mn2-cse"

SimpleNetwork.intersection05.application[0].sensor[0].baseURL = "mn2-cse" 



SimpleNetwork.mnNode1.name = "mn1-cse"

SimpleNetwork.mnNode1.name = "mn1-cse"

SimpleNetwork.mnNode2.name = "mn2-cse"

SimpleNetwork.mnNode2.name = "mn2-cse"

SimpleNetwork.inNode.name = "in-cse"

SimpleNetwork.inNode.name = "in-cse"
@@ -31,6 +37,7 @@ SimpleNetwork.intersection01.nic[0].networkAddress = "10.0.2.11" 
SimpleNetwork.intersection02.nic[0].networkAddress = "10.0.2.12"

SimpleNetwork.intersection02.nic[0].networkAddress = "10.0.2.12"

SimpleNetwork.intersection03.nic[0].networkAddress = "10.0.2.13"

SimpleNetwork.intersection03.nic[0].networkAddress = "10.0.2.13"







SimpleNetwork.WiFi.subnetAddress = "10.0.3.0/24"

SimpleNetwork.WiFi.subnetAddress = "10.0.3.0/24"

SimpleNetwork.mnNode2.nic[0].networkAddress = "10.0.3.10"

SimpleNetwork.mnNode2.nic[0].networkAddress = "10.0.3.10"

SimpleNetwork.intersection04.nic[0].networkAddress = "10.0.3.11"

SimpleNetwork.intersection04.nic[0].networkAddress = "10.0.3.11"
@@ -73,6 +80,6 @@ SimpleNetwork.cloudServer.database.performanceDescriptor = "data://{\"Performanc 
SimpleNetwork.cloudServer.database.isStandAlone = true

SimpleNetwork.cloudServer.database.isStandAlone = true









**.ramManager.maximumBytes = 1000000

**.ramManager.maximumBytes = 200000

**.cpuManager.IPS = 20000

**.cpuManager.IPS = 20000

src/Solution/ApplicationLayer/Sensor.cc

+1 −0
Original line number Original line Diff line number Diff line
@@ -10,6 +10,7 @@ void Sensor::initialize() 
{

{

    this->name = par("name").stdstringValue();

    this->name = par("name").stdstringValue();

    this->baseURL = par("baseURL").stdstringValue();

    this->baseURL = par("baseURL").stdstringValue();

    this->cinID = par("baseID");

    this->protocol = Protocol::StrToInt(getParentModule()->par("protocol").stdstringValue());

    this->protocol = Protocol::StrToInt(getParentModule()->par("protocol").stdstringValue());





    json objParam = SensorDeserializer::parseInput(par("cinGenerator").stdstringValue());

    json objParam = SensorDeserializer::parseInput(par("cinGenerator").stdstringValue());

src/Solution/ApplicationLayer/Sensor.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -26,7 +26,7 @@ class Sensor : public cSimpleModule 
     string baseURL;

     string baseURL;

     int protocol;

     int protocol;

     EventGenerator* cinGenerator;

     EventGenerator* cinGenerator;

     int cinID = 0;

     long cinID;





     map<int, double> sendingTime;

     map<int, double> sendingTime;

     cOutVector cinRTT;

     cOutVector cinRTT;

src/Solution/ApplicationLayer/Sensor.ned

+2 −1
Original line number Original line Diff line number Diff line
@@ -11,7 +11,8 @@ simple Sensor 
{

{

    parameters:

    parameters:

        string name;

        string name;

        string baseURL;

        string baseURL= default("");

        int baseID = default(0);

        string cinGenerator = default("");

        string cinGenerator = default("");

        

        

        @display("i=block/tx");

        @display("i=block/tx");