From 347b7238dca96351450a5fd1fd65e297a352e10d Mon Sep 17 00:00:00 2001 From: Mathieu Lacage Date: Thu, 19 Jul 2007 12:38:30 +0200 Subject: [PATCH] create a mobility module --- SConstruct | 80 ++++++++++--------- src/{node => mobility}/grid-topology.cc | 0 src/{node => mobility}/grid-topology.h | 0 .../hierarchical-mobility-model.cc | 0 .../hierarchical-mobility-model.h | 0 .../mobility-model-notifier.cc | 0 .../mobility-model-notifier.h | 0 src/{node => mobility}/mobility-model.cc | 0 src/{node => mobility}/mobility-model.h | 0 .../ns2-mobility-file-topology.cc | 12 +-- .../ns2-mobility-file-topology.h | 0 src/{node => mobility}/position.cc | 0 src/{node => mobility}/position.h | 0 .../random-direction-2d-mobility-model.cc | 0 .../random-direction-2d-mobility-model.h | 0 src/{node => mobility}/random-position.cc | 0 src/{node => mobility}/random-position.h | 0 src/{node => mobility}/random-topology.cc | 0 src/{node => mobility}/random-topology.h | 0 .../random-walk-2d-mobility-model.cc | 0 .../random-walk-2d-mobility-model.h | 0 .../random-waypoint-mobility-model.cc | 0 .../random-waypoint-mobility-model.h | 0 .../rectangle-default-value.cc | 0 .../rectangle-default-value.h | 0 src/{node => mobility}/rectangle.cc | 0 src/{node => mobility}/rectangle.h | 0 src/{node => mobility}/speed.cc | 0 src/{node => mobility}/speed.h | 0 .../static-mobility-model.cc | 0 .../static-mobility-model.h | 0 src/{node => mobility}/static-speed-helper.cc | 0 src/{node => mobility}/static-speed-helper.h | 0 .../static-speed-mobility-model.cc | 0 .../static-speed-mobility-model.h | 0 35 files changed, 50 insertions(+), 42 deletions(-) rename src/{node => mobility}/grid-topology.cc (100%) rename src/{node => mobility}/grid-topology.h (100%) rename src/{node => mobility}/hierarchical-mobility-model.cc (100%) rename src/{node => mobility}/hierarchical-mobility-model.h (100%) rename src/{node => mobility}/mobility-model-notifier.cc (100%) rename src/{node => mobility}/mobility-model-notifier.h (100%) rename src/{node => mobility}/mobility-model.cc (100%) rename src/{node => mobility}/mobility-model.h (100%) rename src/{node => mobility}/ns2-mobility-file-topology.cc (98%) rename src/{node => mobility}/ns2-mobility-file-topology.h (100%) rename src/{node => mobility}/position.cc (100%) rename src/{node => mobility}/position.h (100%) rename src/{node => mobility}/random-direction-2d-mobility-model.cc (100%) rename src/{node => mobility}/random-direction-2d-mobility-model.h (100%) rename src/{node => mobility}/random-position.cc (100%) rename src/{node => mobility}/random-position.h (100%) rename src/{node => mobility}/random-topology.cc (100%) rename src/{node => mobility}/random-topology.h (100%) rename src/{node => mobility}/random-walk-2d-mobility-model.cc (100%) rename src/{node => mobility}/random-walk-2d-mobility-model.h (100%) rename src/{node => mobility}/random-waypoint-mobility-model.cc (100%) rename src/{node => mobility}/random-waypoint-mobility-model.h (100%) rename src/{node => mobility}/rectangle-default-value.cc (100%) rename src/{node => mobility}/rectangle-default-value.h (100%) rename src/{node => mobility}/rectangle.cc (100%) rename src/{node => mobility}/rectangle.h (100%) rename src/{node => mobility}/speed.cc (100%) rename src/{node => mobility}/speed.h (100%) rename src/{node => mobility}/static-mobility-model.cc (100%) rename src/{node => mobility}/static-mobility-model.h (100%) rename src/{node => mobility}/static-speed-helper.cc (100%) rename src/{node => mobility}/static-speed-helper.h (100%) rename src/{node => mobility}/static-speed-mobility-model.cc (100%) rename src/{node => mobility}/static-speed-mobility-model.h (100%) diff --git a/SConstruct b/SConstruct index 831532e0c..38c89ceaf 100644 --- a/SConstruct +++ b/SConstruct @@ -227,6 +227,48 @@ common.add_inst_headers([ 'data-rate.h', ]) +mobility = build.Ns3Module ('mobility', 'src/mobility'); +ns3.add (mobility); +mobility.add_deps (['core', 'simulator', 'node']) +mobility.add_sources ([ + 'position.cc', + 'speed.cc', + 'random-position.cc', + 'rectangle-default-value.cc', + 'rectangle.cc', + 'mobility-model.cc', + 'mobility-model-notifier.cc', + 'static-speed-helper.cc', + 'static-mobility-model.cc', + 'static-speed-mobility-model.cc', + 'hierarchical-mobility-model.cc', + 'random-direction-2d-mobility-model.cc', + 'random-waypoint-mobility-model.cc', + 'random-walk-2d-mobility-model.cc', + 'grid-topology.cc', + 'random-topology.cc', + 'ns2-mobility-file-topology.cc', + ]) +mobility.add_inst_headers ([ + 'position.h', + 'speed.h', + 'random-position.h', + 'rectangle-default-value.h', + 'rectangle.h', + 'mobility-model.h', + 'mobility-model-notifier.h', + 'static-speed-helper.h', + 'static-mobility-model.h', + 'static-speed-mobility-model.h', + 'hierarchical-mobility-model.h', + 'random-direction-2d-mobility-model.h', + 'random-waypoint-mobility-model.h', + 'random-walk-2d-mobility-model.h', + 'grid-topology.h', + 'random-topology.h', + 'ns2-mobility-file-topology.h', + ]) + node = build.Ns3Module ('node', 'src/node') ns3.add (node) node.add_deps (['core', 'common', 'simulator']) @@ -246,23 +288,6 @@ node.add_sources ([ 'udp.cc', 'ipv4.cc', 'application.cc', - 'mobility-model.cc', - 'mobility-model-notifier.cc', - 'static-mobility-model.cc', - 'static-speed-mobility-model.cc', - 'grid-topology.cc', - 'random-topology.cc', - 'random-walk-2d-mobility-model.cc', - 'hierarchical-mobility-model.cc', - 'ns2-mobility-file-topology.cc', - 'position.cc', - 'random-position.cc', - 'speed.cc', - 'static-speed-helper.cc', - 'random-waypoint-mobility-model.cc', - 'rectangle-default-value.cc', - 'rectangle.cc', - 'random-direction-2d-mobility-model.cc', ]) node.add_inst_headers ([ 'node.h', @@ -280,23 +305,6 @@ node.add_inst_headers ([ 'udp.h', 'ipv4.h', 'application.h', - 'mobility-model.h', - 'mobility-model-notifier.h', - 'static-mobility-model.h', - 'static-speed-mobility-model.h', - 'grid-topology.h', - 'random-topology.h', - 'random-walk-2d-mobility-model.h', - 'hierarchical-mobility-model.h', - 'ns2-mobility-file-topology.h', - 'position.h', - 'random-position.h', - 'speed.h', - 'static-speed-helper.h', - 'random-waypoint-mobility-model.h', - 'rectangle-default-value.h', - 'rectangle.h', - 'random-direction-2d-mobility-model.h', ]) applications = build.Ns3Module ('applications', 'src/applications') @@ -446,13 +454,13 @@ sample_callback.add_source('main-callback.cc') sample_random_walk = build.Ns3Module('sample-random-walk', 'samples') sample_random_walk.set_executable() ns3.add(sample_random_walk) -sample_random_walk.add_deps(['core', 'node']) +sample_random_walk.add_deps(['core', 'mobility']) sample_random_walk.add_source('main-random-walk.cc') sample_grid_topology = build.Ns3Module('sample-grid-topology', 'samples') sample_grid_topology.set_executable() ns3.add(sample_grid_topology) -sample_grid_topology.add_deps(['core', 'internet-node']) +sample_grid_topology.add_deps(['core', 'internet-node', 'mobility']) sample_grid_topology.add_source('main-grid-topology.cc') sample_ptr = build.Ns3Module('sample-ptr', 'samples') diff --git a/src/node/grid-topology.cc b/src/mobility/grid-topology.cc similarity index 100% rename from src/node/grid-topology.cc rename to src/mobility/grid-topology.cc diff --git a/src/node/grid-topology.h b/src/mobility/grid-topology.h similarity index 100% rename from src/node/grid-topology.h rename to src/mobility/grid-topology.h diff --git a/src/node/hierarchical-mobility-model.cc b/src/mobility/hierarchical-mobility-model.cc similarity index 100% rename from src/node/hierarchical-mobility-model.cc rename to src/mobility/hierarchical-mobility-model.cc diff --git a/src/node/hierarchical-mobility-model.h b/src/mobility/hierarchical-mobility-model.h similarity index 100% rename from src/node/hierarchical-mobility-model.h rename to src/mobility/hierarchical-mobility-model.h diff --git a/src/node/mobility-model-notifier.cc b/src/mobility/mobility-model-notifier.cc similarity index 100% rename from src/node/mobility-model-notifier.cc rename to src/mobility/mobility-model-notifier.cc diff --git a/src/node/mobility-model-notifier.h b/src/mobility/mobility-model-notifier.h similarity index 100% rename from src/node/mobility-model-notifier.h rename to src/mobility/mobility-model-notifier.h diff --git a/src/node/mobility-model.cc b/src/mobility/mobility-model.cc similarity index 100% rename from src/node/mobility-model.cc rename to src/mobility/mobility-model.cc diff --git a/src/node/mobility-model.h b/src/mobility/mobility-model.h similarity index 100% rename from src/node/mobility-model.h rename to src/mobility/mobility-model.h diff --git a/src/node/ns2-mobility-file-topology.cc b/src/mobility/ns2-mobility-file-topology.cc similarity index 98% rename from src/node/ns2-mobility-file-topology.cc rename to src/mobility/ns2-mobility-file-topology.cc index 9845d62f0..7d0b8c915 100644 --- a/src/node/ns2-mobility-file-topology.cc +++ b/src/mobility/ns2-mobility-file-topology.cc @@ -18,14 +18,14 @@ * * Author: Mathieu Lacage */ -#include "ns3/debug.h" -#include "ns3/simulator.h" -#include "ns2-mobility-file-topology.h" -#include "node-list.h" -#include "node.h" -#include "static-speed-mobility-model.h" #include #include +#include "ns3/debug.h" +#include "ns3/simulator.h" +#include "ns3/node-list.h" +#include "ns3/node.h" +#include "ns2-mobility-file-topology.h" +#include "static-speed-mobility-model.h" NS_DEBUG_COMPONENT_DEFINE ("Ns2MobilityFileTopology"); diff --git a/src/node/ns2-mobility-file-topology.h b/src/mobility/ns2-mobility-file-topology.h similarity index 100% rename from src/node/ns2-mobility-file-topology.h rename to src/mobility/ns2-mobility-file-topology.h diff --git a/src/node/position.cc b/src/mobility/position.cc similarity index 100% rename from src/node/position.cc rename to src/mobility/position.cc diff --git a/src/node/position.h b/src/mobility/position.h similarity index 100% rename from src/node/position.h rename to src/mobility/position.h diff --git a/src/node/random-direction-2d-mobility-model.cc b/src/mobility/random-direction-2d-mobility-model.cc similarity index 100% rename from src/node/random-direction-2d-mobility-model.cc rename to src/mobility/random-direction-2d-mobility-model.cc diff --git a/src/node/random-direction-2d-mobility-model.h b/src/mobility/random-direction-2d-mobility-model.h similarity index 100% rename from src/node/random-direction-2d-mobility-model.h rename to src/mobility/random-direction-2d-mobility-model.h diff --git a/src/node/random-position.cc b/src/mobility/random-position.cc similarity index 100% rename from src/node/random-position.cc rename to src/mobility/random-position.cc diff --git a/src/node/random-position.h b/src/mobility/random-position.h similarity index 100% rename from src/node/random-position.h rename to src/mobility/random-position.h diff --git a/src/node/random-topology.cc b/src/mobility/random-topology.cc similarity index 100% rename from src/node/random-topology.cc rename to src/mobility/random-topology.cc diff --git a/src/node/random-topology.h b/src/mobility/random-topology.h similarity index 100% rename from src/node/random-topology.h rename to src/mobility/random-topology.h diff --git a/src/node/random-walk-2d-mobility-model.cc b/src/mobility/random-walk-2d-mobility-model.cc similarity index 100% rename from src/node/random-walk-2d-mobility-model.cc rename to src/mobility/random-walk-2d-mobility-model.cc diff --git a/src/node/random-walk-2d-mobility-model.h b/src/mobility/random-walk-2d-mobility-model.h similarity index 100% rename from src/node/random-walk-2d-mobility-model.h rename to src/mobility/random-walk-2d-mobility-model.h diff --git a/src/node/random-waypoint-mobility-model.cc b/src/mobility/random-waypoint-mobility-model.cc similarity index 100% rename from src/node/random-waypoint-mobility-model.cc rename to src/mobility/random-waypoint-mobility-model.cc diff --git a/src/node/random-waypoint-mobility-model.h b/src/mobility/random-waypoint-mobility-model.h similarity index 100% rename from src/node/random-waypoint-mobility-model.h rename to src/mobility/random-waypoint-mobility-model.h diff --git a/src/node/rectangle-default-value.cc b/src/mobility/rectangle-default-value.cc similarity index 100% rename from src/node/rectangle-default-value.cc rename to src/mobility/rectangle-default-value.cc diff --git a/src/node/rectangle-default-value.h b/src/mobility/rectangle-default-value.h similarity index 100% rename from src/node/rectangle-default-value.h rename to src/mobility/rectangle-default-value.h diff --git a/src/node/rectangle.cc b/src/mobility/rectangle.cc similarity index 100% rename from src/node/rectangle.cc rename to src/mobility/rectangle.cc diff --git a/src/node/rectangle.h b/src/mobility/rectangle.h similarity index 100% rename from src/node/rectangle.h rename to src/mobility/rectangle.h diff --git a/src/node/speed.cc b/src/mobility/speed.cc similarity index 100% rename from src/node/speed.cc rename to src/mobility/speed.cc diff --git a/src/node/speed.h b/src/mobility/speed.h similarity index 100% rename from src/node/speed.h rename to src/mobility/speed.h diff --git a/src/node/static-mobility-model.cc b/src/mobility/static-mobility-model.cc similarity index 100% rename from src/node/static-mobility-model.cc rename to src/mobility/static-mobility-model.cc diff --git a/src/node/static-mobility-model.h b/src/mobility/static-mobility-model.h similarity index 100% rename from src/node/static-mobility-model.h rename to src/mobility/static-mobility-model.h diff --git a/src/node/static-speed-helper.cc b/src/mobility/static-speed-helper.cc similarity index 100% rename from src/node/static-speed-helper.cc rename to src/mobility/static-speed-helper.cc diff --git a/src/node/static-speed-helper.h b/src/mobility/static-speed-helper.h similarity index 100% rename from src/node/static-speed-helper.h rename to src/mobility/static-speed-helper.h diff --git a/src/node/static-speed-mobility-model.cc b/src/mobility/static-speed-mobility-model.cc similarity index 100% rename from src/node/static-speed-mobility-model.cc rename to src/mobility/static-speed-mobility-model.cc diff --git a/src/node/static-speed-mobility-model.h b/src/mobility/static-speed-mobility-model.h similarity index 100% rename from src/node/static-speed-mobility-model.h rename to src/mobility/static-speed-mobility-model.h