showcases: fix: renamed NED files and networks to be more specific

inet-framework · Sep 2, 2022 · 6b2763f · 6b2763f
1 parent 1427d0e
commit 6b2763f
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 17 deletions.
diff --git a/...cases/mobility/basic/MobilityShowcase.ned → .../mobility/basic/BasicMobilityShowcase.ned b/...cases/mobility/basic/MobilityShowcase.ned → .../mobility/basic/BasicMobilityShowcase.ned
@@ -3,7 +3,7 @@ package inet.showcases.mobility.basic;
 import inet.node.inet.StandardHost;
 import inet.visualizer.common.IntegratedVisualizer;
 
-network MobilityShowcase
+network BasicMobilityShowcase
 {
     parameters:
         int numHosts;

diff --git a/showcases/mobility/basic/omnetpp.ini b/showcases/mobility/basic/omnetpp.ini
@@ -1,5 +1,6 @@
 [General]
 #abstract-config = true (requires omnet 6)
+network = BasicMobilityShowcase
 
 image-path = "/home/user/Integration/inet/showcases/general/simpleMobility"
 
@@ -19,15 +20,13 @@ image-path = "/home/user/Integration/inet/showcases/general/simpleMobility"
 **.constraintAreaMaxZ = 0m
 
 [Config LinearMobility]
-network = MobilityShowcase
 
 *.numHosts = 7
 
 *.host[*].mobility.typename = "LinearMobility"
 **.mobility.speed = 40mps
 
 [Config CircleMobility]
-network = MobilityShowcase
 
 *.numHosts = 2
 
@@ -46,7 +45,6 @@ network = MobilityShowcase
 *.host[1].mobility.startAngle = 270deg
 
 [Config TurtleMobility]
-network = MobilityShowcase
 
 *.numHosts = 2
 
@@ -56,7 +54,6 @@ network = MobilityShowcase
 *.host[1].mobility.turtleScript = xmldoc("config2.xml")
 
 [Config FacingMobility]
-network = MobilityShowcase
 
 *.numHosts = 7
 
@@ -93,7 +90,6 @@ network = MobilityShowcase
 *.host[6].mobility.initialZ = 0m
 
 [Config GaussMarkovMobility]
-network = MobilityShowcase
 
 *.numHosts = 7
 
@@ -107,15 +103,13 @@ network = MobilityShowcase
 **.mobility.alpha = 0
 
 [Config StaticGridMobility]
-network = MobilityShowcase
 
 *.numHosts = 7
 
 *.*host[*].mobility.typename = "StaticGridMobility"
 *.*host[*].mobility.numHosts = 7
 
 [Config StationaryMobility]
-network = MobilityShowcase
 
 *.numHosts = 3
 
@@ -136,7 +130,6 @@ network = MobilityShowcase
 *.host[2].mobility.initialHeading = 180deg
 
 [Config BonnMotionMobility]
-network = MobilityShowcase
 
 *.numHosts = 2
 

diff --git a/...s/mobility/combining/MobilityShowcase.ned → ...y/combining/CombiningMobilityShowcase.ned b/...s/mobility/combining/MobilityShowcase.ned → ...y/combining/CombiningMobilityShowcase.ned
@@ -8,7 +8,7 @@ import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211ScalarRadioMed
 import inet.visualizer.common.IntegratedMultiVisualizer;
 
 
-network MobilityShowcase
+network CombiningMobilityShowcase
 {
     parameters:
         int numHosts;

diff --git a/showcases/mobility/combining/omnetpp.ini b/showcases/mobility/combining/omnetpp.ini
@@ -19,7 +19,7 @@ image-path = "/home/user/Integration/inet/showcases/general/compoundMobility"
 **.constraintAreaMaxZ = 0m
 
 [Config Attached1]
-network = MobilityShowcase
+network = CombiningMobilityShowcase
 
 *.numHosts = 4
 
@@ -39,7 +39,7 @@ network = MobilityShowcase
 *.host[3].mobility.offsetHeading = 45deg
 
 [Config Attached2]
-network = MobilityShowcase
+network = CombiningMobilityShowcase
 
 *.numHosts = 5
 
@@ -63,7 +63,7 @@ network = MobilityShowcase
 *.host[4].mobility.offsetHeading = -180deg
 
 [Config Superpositioning1]
-network = MobilityShowcase
+network = CombiningMobilityShowcase
 
 *.numHosts = 1
 
@@ -92,7 +92,7 @@ network = MobilityShowcase
 **.mobility.element[1].constraintAreaMaxZ = 0m
 
 [Config Superpositioning2]
-network = MobilityShowcase
+network = CombiningMobilityShowcase
 
 *.numHosts = 2
 
@@ -200,7 +200,7 @@ sim-time-limit = 10000s
 *.visualizer.*.mobilityVisualizer[1].orientationFillColor = "yellow"
 
 [Config Attached3D]
-network = MobilityShowcase
+network = CombiningMobilityShowcase
 
 *.numHosts = 2
 

diff --git a/...ses/mobility/spatial/MobilityShowcase.ned → ...ility/spatial/SpatialMobilityShowcase.ned b/...ses/mobility/spatial/MobilityShowcase.ned → ...ility/spatial/SpatialMobilityShowcase.ned
@@ -9,7 +9,7 @@ import inet.node.inet.StandardHost;
 import inet.visualizer.common.IntegratedVisualizer;
 
 
-network MobilityShowcase
+network SpatialMobilityShowcase
 {
     parameters:
         int numHosts;

diff --git a/showcases/mobility/spatial/omnetpp.ini b/showcases/mobility/spatial/omnetpp.ini
@@ -1,5 +1,5 @@
 [General]
-network = MobilityShowcase
+network = SpatialMobilityShowcase
 #abstract-config = true (requires omnet 6)
 
 # scene visualization