diff --git a/showcases/mobility/basic/MobilityShowcase.ned b/showcases/mobility/basic/BasicMobilityShowcase.ned similarity index 92% rename from showcases/mobility/basic/MobilityShowcase.ned rename to showcases/mobility/basic/BasicMobilityShowcase.ned index bb0c88151be..0570bc9af95 100644 --- a/showcases/mobility/basic/MobilityShowcase.ned +++ b/showcases/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 index 2281276b4cd..16eb8e1c774 100644 --- 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,7 +20,6 @@ image-path = "/home/user/Integration/inet/showcases/general/simpleMobility" **.constraintAreaMaxZ = 0m [Config LinearMobility] -network = MobilityShowcase *.numHosts = 7 @@ -27,7 +27,6 @@ network = MobilityShowcase **.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,7 +103,6 @@ network = MobilityShowcase **.mobility.alpha = 0 [Config StaticGridMobility] -network = MobilityShowcase *.numHosts = 7 @@ -115,7 +110,6 @@ network = MobilityShowcase *.*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/showcases/mobility/combining/MobilityShowcase.ned b/showcases/mobility/combining/CombiningMobilityShowcase.ned similarity index 100% rename from showcases/mobility/combining/MobilityShowcase.ned rename to showcases/mobility/combining/CombiningMobilityShowcase.ned diff --git a/showcases/mobility/combining/omnetpp.ini b/showcases/mobility/combining/omnetpp.ini index b8089dcf914..33ae4f28ee2 100644 --- 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/showcases/mobility/spatial/MobilityShowcase.ned b/showcases/mobility/spatial/SpatialMobilityShowcase.ned similarity index 93% rename from showcases/mobility/spatial/MobilityShowcase.ned rename to showcases/mobility/spatial/SpatialMobilityShowcase.ned index aed7ddaed80..5a6f3b92251 100644 --- a/showcases/mobility/spatial/MobilityShowcase.ned +++ b/showcases/mobility/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 index 7620f5c0bb1..539cab4e4e4 100644 --- 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