Skip to content

Commit

Permalink
code cleaning: remove unused NED parameters
Browse files Browse the repository at this point in the history
  • Loading branch information
ZoltanBojthe authored and avarga committed Oct 16, 2024
1 parent d074be8 commit e4d52c3
Show file tree
Hide file tree
Showing 19 changed files with 2 additions and 52 deletions.
7 changes: 0 additions & 7 deletions src/apps/d2dMultihop/eventGenerator/EventGenerator.ned
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,5 @@ simple EventGenerator
double startTime @unit(s) = default(0.1s);
volatile double eventPeriod @unit(s) = default(1s);
bool singleEventSource = default(true);

bool forceStartingCoord = default(false);
double startingCoordX @unit(m) = default(-1.0m);
double startingCoordY @unit(m) = default(-1.0m);

int startingUe = default(0);

@display("i=block/cogwheel");
}
2 changes: 0 additions & 2 deletions src/apps/mec/DeviceApp/DeviceApp.ned
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ simple DeviceApp like IApp

string localAddress = default(""); // used local address for UE and UALCMP, may be left empty ("")
int localPort = default(-1); // UE port number to listen on
double startTime @unit(s) = default(1s); // time first session begins
double stopTime @unit(s) = default(-1s); // time of finishing sending, negative values mean forever
int timeToLive = default(-1); // if not -1, set the TTL (IPv4) or Hop Limit (IPv6) field of sent packets to this value
int dscp = default(-1); // if not -1, set the DSCP (IPv4/IPv6) field of sent packets to this value
int tos = default(-1); // if not -1, set the Type Of Service (IPv4) / Traffic Class (IPv6) field of sent packets to this value
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,6 @@ simple MecRequestBackgroundApp extends MecAppBase
{
parameters:
@class(MecRequestBackgroundApp);
int numberOfApplications = default(1);
bool allocateHostResources = default(false);

int packetSize @unit(B) = default(10B);

mecAppId = default(0); // it will be override by getId() in initialize
mecAppIndex = default(0);

Expand All @@ -41,10 +36,5 @@ simple MecRequestBackgroundApp extends MecAppBase
requiredDisk = default(100MB);
requiredCpu = default(15000);

string connectAddress = default(""); // server address (may be symbolic)
int connectPort = default(1000); // port number to connect to
double startTime @unit(s) = default(1s); // time first session begins
double stopTime @unit(s) = default(-1s); // time of finishing sending, negative values mean forever

@display("i=block/app");
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ simple MecRequestBackgroundGeneratorApp extends MecAppBase
int numberOfApplications;
bool allocateHostResources = default(false);

int packetSize @unit(B) = default(10B);

//resource required info
requiredRam = default(10MB);
requiredDisk = default(100MB);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,5 @@ simple MecRequestForegroundApp extends MecAppBase
{
parameters:
@class(MecRequestForegroundApp);
bool allocateHostResources = default(false);

int packetSize @unit(B) = default(10B);
double lambda @unit(s) = default(10ms);
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@ simple MecRTVideoStreamingReceiver extends MecAppBase
parameters:
@class(MecRTVideoStreamingReceiver);
@display("i=block/app;is=s");

int packetSize @unit(B) = default(10B);

double discardPercentage = 0.8;
double initialPlayoutDelay @unit(s) = 150ms;
}
1 change: 0 additions & 1 deletion src/apps/mecRequestResponseApp/MecRequestApp.ned
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ simple MecRequestApp like IApp

double period @unit("s") = default(1s);
double startTime @unit("s") = default(0s);
double stopTime @unit("s") = default(200s);

int appId = default(1);
bool enableMigration = default(false);
Expand Down
2 changes: 1 addition & 1 deletion src/apps/voip/VoIPReceiver.ned
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ simple VoIPReceiver like IApp
{
parameters:
int localPort = default(3000);
int emodel_Ie_ = default(5);
int emodel_Ie_ = default(5); // TODO from some ITU standard, figure it out
int emodel_Bpl_ = default(10);
int emodel_A_ = default(5);
double emodel_Ro_ = default(93.2);
Expand Down
2 changes: 1 addition & 1 deletion src/apps/voip/VoIPSender.ned
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ simple VoIPSender like IApp
bool is_talk = default(true); // whether transmission starts with talk or silence
double sampling_time @unit("s") = default(0.02s);
double startTime @unit("s") = default(0s);
bool silences = default(true);
bool silences = default(true); //TODO remove?
int tos = default(-1); // if not -1, set the Type Of Service (IPv4) / Traffic Class (IPv6) field of sent packets to this value

@signal[voIPGeneratedThroughput];
Expand Down
6 changes: 0 additions & 6 deletions src/common/cellInfo/CellInfo.ned
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,6 @@ simple CellInfo
// The maximum Y-coordinate of the area constraint, unconstrained by default
double constraintAreaMaxY @unit(m) = default(1m/0);

// Speed used in CircleMobility and ConstSpeedMobility modules
double speed @unit(mps) = default(0mps);

// Position update interval for CircleMobility and ConstSpeedMobility
double positionUpdateInterval @unit(s) = default(0.001s);

// Interval for sending broadcast messages (used for handover or DAS)
double broadcastMessageInterval @unit(s) = default(1s);

Expand Down
1 change: 0 additions & 1 deletion src/corenetwork/gtp/GtpUser.ned
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ simple GtpUser
string ipOutInterface = default(""); // optional: manual specification of outgoing interface for received IP
int localPort = default(31);
int tunnelPeerPort = default(31);
bool filter = default(true);

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ simple ServiceRegistry like IApp

string serverThreadClass = default("simu5g.nodes.mec.MECPlatform.MECServices.MECServiceBase.SocketManager");

int destPort = default(4000);
int tos = default(-1); // if not -1, set the Type Of Service (IPv4) / Traffic Class (IPv6) field of sent packets to this value

string binderModule = default("binder");
Expand Down
1 change: 0 additions & 1 deletion src/nodes/mec/UALCMP/UALCMPApp.ned
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ simple UALCMPApp like IApp

string serverThreadClass = default("simu5g.nodes.mec.MECPlatform.MECServices.MECServiceBase.SocketManager");

int destPort = default(4000);
int tos = default(-1); // if not -1, set the Type Of Service (IPv4) / Traffic Class (IPv6) field of sent packets to this value

@signal[requestQueueSize];
Expand Down
1 change: 0 additions & 1 deletion src/stack/mac/ILteMac.ned
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ moduleinterface ILteMac
{
parameters:
@display("i=block/mac");
string interfaceTableModule;

gates:
input RLC_to_MAC; // RLC to MAC
Expand Down
1 change: 0 additions & 1 deletion src/stack/mac/LteMacBase.ned
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ simple LteMacBase like ILteMac
parameters:
@display("i=block/mac");
string binderModule = default("binder");
string interfaceTableModule;
string packetFlowManagerModule = default("^.packetFlowManager"); // TODO or nrPacketFlowManager

//# Mac Queues
Expand Down
3 changes: 0 additions & 3 deletions src/stack/mac/LteMacEnb.ned
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,6 @@ simple LteMacEnb extends LteMacBase
// AMC Mode: "auto", "piloted", "multi", "das", "D2D"
string amcMode @enum(AUTO,D2D) = default("AUTO");

//Min disance used to pair two MuMimo UE
int muMimoMinDistance = default(50);

// resource allocation type ("distributed" or "localized")
string rbAllocationType @enum(distributed,localized) = default("localized");

Expand Down
5 changes: 0 additions & 5 deletions src/stack/phy/ChannelModel/LteRealisticChannelModel.ned
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,6 @@ simple LteRealisticChannelModel extends LteChannelModel

bool enable_extCell_los = default(true);

// read channel information from log file
bool useRsrqFromLog = default(false);
int rsrqShift = default(22);
double rsrqScale = default(1.0);

// collection of SINR statistics can be disabled because it might be quite time-consuming
bool collectSinrStatistics = default(true);

Expand Down
2 changes: 0 additions & 2 deletions src/stack/phy/ChannelModel/NRChannelModel_3GPP38_901.ned
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,4 @@ simple NRChannelModel_3GPP38_901 extends NRChannelModel
{
parameters:
@class("NRChannelModel_3GPP38_901");

bool useBuildingPenetrationLossHighLossModel = default(false);
}
1 change: 0 additions & 1 deletion src/world/radio/ChannelControl.ned
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ simple ChannelControl
double alpha = default(2); // path loss coefficient
double carrierFrequency @unit("Hz") = default(2.4GHz); // base carrier frequency of all the channels (in Hz)
int numChannels = default(1); // number of radio channels (frequencies)
string propagationModel @enum("FreeSpaceModel","TwoRayGroundModel","RiceModel","RayleighModel","NakagamiModel","LogNormalShadowingModel") = default("FreeSpaceModel");
@display("i=misc/sun");
@labels(node);
}

0 comments on commit e4d52c3

Please sign in to comment.