From 87054aaa522217211974a022421a004492b7cd2f Mon Sep 17 00:00:00 2001 From: Rudolf Hornig Date: Thu, 25 Apr 2019 11:21:54 +0200 Subject: [PATCH 01/10] removed deep include configuration --- Castalia/.gitignore | 9 +++++++++ Castalia/makemake | 2 +- Castalia/src/helpStructures/CastaliaModule.cc | 2 +- Castalia/src/helpStructures/CastaliaModule.h | 4 ++-- Castalia/src/helpStructures/DebugInfoWriter.cc | 2 +- Castalia/src/helpStructures/TimerService.cc | 2 +- Castalia/src/helpStructures/TimerService.h | 2 +- .../src/node/application/VirtualApplication.cc | 2 +- Castalia/src/node/application/VirtualApplication.h | 14 +++++++------- .../src/node/application/bridgeTest/BridgeTest.cc | 2 +- .../src/node/application/bridgeTest/BridgeTest.h | 2 +- .../application/connectivityMap/ConnectivityMap.cc | 2 +- .../application/connectivityMap/ConnectivityMap.h | 2 +- .../simpleAggregation/SimpleAggregation.cc | 2 +- .../simpleAggregation/SimpleAggregation.h | 2 +- .../application/throughputTest/ThroughputTest.cc | 2 +- .../application/throughputTest/ThroughputTest.h | 2 +- .../valuePropagation/ValuePropagation.cc | 2 +- .../valuePropagation/ValuePropagation.h | 2 +- .../application/valueReporting/ValueReporting.cc | 2 +- .../application/valueReporting/ValueReporting.h | 4 ++-- .../valueReporting/ValueReportingPacket.msg | 2 +- Castalia/src/node/communication/mac/VirtualMac.cc | 2 +- Castalia/src/node/communication/mac/VirtualMac.h | 14 +++++++------- .../mac/baselineBanMac/BaselineBANMac.cc | 2 +- .../mac/baselineBanMac/BaselineBANMac.h | 4 ++-- .../mac/baselineBanMac/BaselineMacPacket.msg | 2 +- .../node/communication/mac/bypassMac/BypassMAC.cc | 2 +- .../node/communication/mac/bypassMac/BypassMAC.h | 2 +- .../communication/mac/mac802154/Basic802154.cc | 2 +- .../node/communication/mac/mac802154/Basic802154.h | 4 ++-- .../mac/mac802154/Basic802154Packet.msg | 2 +- .../mac802154/staticGTS802154/StaticGTS802154.cc | 2 +- .../mac802154/staticGTS802154/StaticGTS802154.h | 4 ++-- Castalia/src/node/communication/mac/tMac/TMAC.cc | 2 +- Castalia/src/node/communication/mac/tMac/TMAC.h | 4 ++-- .../src/node/communication/mac/tMac/TMacPacket.msg | 2 +- .../communication/mac/tunableMac/TunableMAC.cc | 2 +- .../node/communication/mac/tunableMac/TunableMAC.h | 6 +++--- .../mac/tunableMac/TunableMacPacket.msg | 2 +- Castalia/src/node/communication/radio/Radio.cc | 2 +- Castalia/src/node/communication/radio/Radio.h | 12 ++++++------ .../communication/radio/RadioSupportFunctions.cc | 2 +- .../communication/radio/RadioSupportFunctions.h | 2 +- .../node/communication/routing/VirtualRouting.cc | 2 +- .../node/communication/routing/VirtualRouting.h | 12 ++++++------ .../routing/bypassRouting/BypassRouting.cc | 2 +- .../routing/bypassRouting/BypassRouting.h | 4 ++-- .../routing/bypassRouting/BypassRoutingPacket.msg | 2 +- .../multipathRingsRouting/MultipathRingsRouting.cc | 2 +- .../multipathRingsRouting/MultipathRingsRouting.h | 6 +++--- .../MultipathRingsRoutingPacket.msg | 2 +- .../node/mobilityManager/VirtualMobilityManager.cc | 2 +- .../node/mobilityManager/VirtualMobilityManager.h | 4 ++-- .../lineMobilityManager/LineMobilityManager.cc | 2 +- .../lineMobilityManager/LineMobilityManager.h | 4 ++-- .../noMobilityManager/NoMobilityManager.cc | 2 +- .../noMobilityManager/NoMobilityManager.h | 4 ++-- .../src/node/resourceManager/ResourceManager.cc | 2 +- .../src/node/resourceManager/ResourceManager.h | 4 ++-- Castalia/src/node/sensorManager/SensorManager.cc | 2 +- Castalia/src/node/sensorManager/SensorManager.h | 8 ++++---- .../carsPhysicalProcess/CarsPhysicalProcess.cc | 2 +- .../carsPhysicalProcess/CarsPhysicalProcess.h | 4 ++-- .../CustomizablePhysicalProcess.cc | 2 +- .../CustomizablePhysicalProcess.h | 4 ++-- .../defaultChannel/WirelessChannel.cc | 2 +- .../defaultChannel/WirelessChannel.h | 8 ++++---- .../defaultChannel/WirelessChannelTemporal.cc | 2 +- .../wirelessChannel/traceChannel/TraceChannel.cc | 2 +- .../wirelessChannel/traceChannel/TraceChannel.h | 6 +++--- 71 files changed, 126 insertions(+), 117 deletions(-) create mode 100644 Castalia/.gitignore diff --git a/Castalia/.gitignore b/Castalia/.gitignore new file mode 100644 index 00000000..c3b12053 --- /dev/null +++ b/Castalia/.gitignore @@ -0,0 +1,9 @@ +/CastaliaBin +/CastaliaBin_dbg +/out +*_m.h +*_m.cc +Makefile +.cmdenv-log +.qtenvrc +Castalia-Trace.txt \ No newline at end of file diff --git a/Castalia/makemake b/Castalia/makemake index 16b3ffe1..8fbc2c10 100755 --- a/Castalia/makemake +++ b/Castalia/makemake @@ -16,7 +16,7 @@ ROOT=`pwd` # The following options are used by OMNeT's opp_makemake tool # For explanation and a complete list of options run: opp_makemake -h -OPTS=" -f -r --deep -o CastaliaBin -u Cmdenv -P $ROOT -M release" +OPTS=" -f -r --deep -o CastaliaBin -P $ROOT -M release -Isrc -DAUTOIMPORT_OMNETPP_NAMESPACE" # -X excludes a directory from being considered EXCLUDEDIRS=" -X Simulations -X out -X bin" diff --git a/Castalia/src/helpStructures/CastaliaModule.cc b/Castalia/src/helpStructures/CastaliaModule.cc index 3392f013..171bff70 100644 --- a/Castalia/src/helpStructures/CastaliaModule.cc +++ b/Castalia/src/helpStructures/CastaliaModule.cc @@ -10,7 +10,7 @@ * * ****************************************************************************/ -#include "CastaliaModule.h" +#include "helpStructures/CastaliaModule.h" #define CASTALIA_PREFIX "Castalia|\t" diff --git a/Castalia/src/helpStructures/CastaliaModule.h b/Castalia/src/helpStructures/CastaliaModule.h index 79f55fdd..d54e3fc6 100644 --- a/Castalia/src/helpStructures/CastaliaModule.h +++ b/Castalia/src/helpStructures/CastaliaModule.h @@ -19,9 +19,9 @@ #include #include -#include "DebugInfoWriter.h" +#include "helpStructures/DebugInfoWriter.h" #include "CastaliaMessages.h" -#include "ResourceManagerMessage_m.h" +#include "node/resourceManager/ResourceManagerMessage_m.h" using namespace std; diff --git a/Castalia/src/helpStructures/DebugInfoWriter.cc b/Castalia/src/helpStructures/DebugInfoWriter.cc index fb9a7e32..4e31b59b 100644 --- a/Castalia/src/helpStructures/DebugInfoWriter.cc +++ b/Castalia/src/helpStructures/DebugInfoWriter.cc @@ -10,7 +10,7 @@ * * ****************************************************************************/ -#include "DebugInfoWriter.h" +#include "helpStructures/DebugInfoWriter.h" ofstream DebugInfoWriter::theFile; string DebugInfoWriter::fileName; diff --git a/Castalia/src/helpStructures/TimerService.cc b/Castalia/src/helpStructures/TimerService.cc index 3fce82b8..903f7cdb 100644 --- a/Castalia/src/helpStructures/TimerService.cc +++ b/Castalia/src/helpStructures/TimerService.cc @@ -10,7 +10,7 @@ * * ****************************************************************************/ -#include "TimerService.h" +#include "helpStructures/TimerService.h" void TimerService::setTimerDrift(double new_drift) { diff --git a/Castalia/src/helpStructures/TimerService.h b/Castalia/src/helpStructures/TimerService.h index 7babb44c..c5215ba7 100644 --- a/Castalia/src/helpStructures/TimerService.h +++ b/Castalia/src/helpStructures/TimerService.h @@ -20,7 +20,7 @@ #include #include "CastaliaMessages.h" -#include "TimerServiceMessage_m.h" +#include "helpStructures/TimerServiceMessage_m.h" class TimerService: public virtual cSimpleModule { private: diff --git a/Castalia/src/node/application/VirtualApplication.cc b/Castalia/src/node/application/VirtualApplication.cc index 7f8ef4f2..bbed0c13 100644 --- a/Castalia/src/node/application/VirtualApplication.cc +++ b/Castalia/src/node/application/VirtualApplication.cc @@ -10,7 +10,7 @@ * * ****************************************************************************/ -#include "VirtualApplication.h" +#include "node/application/VirtualApplication.h" void VirtualApplication::initialize() { diff --git a/Castalia/src/node/application/VirtualApplication.h b/Castalia/src/node/application/VirtualApplication.h index e03f5b3f..86bd9d1c 100644 --- a/Castalia/src/node/application/VirtualApplication.h +++ b/Castalia/src/node/application/VirtualApplication.h @@ -17,13 +17,13 @@ #include #include #include -#include "ApplicationPacket_m.h" -#include "SensorManagerMessage_m.h" -#include "ResourceManager.h" -#include "Radio.h" -#include "VirtualMobilityManager.h" -#include "CastaliaModule.h" -#include "TimerService.h" +#include "node/application/ApplicationPacket_m.h" +#include "node/sensorManager/SensorManagerMessage_m.h" +#include "node/resourceManager/ResourceManager.h" +#include "node/communication/radio/Radio.h" +#include "node/mobilityManager/VirtualMobilityManager.h" +#include "helpStructures/CastaliaModule.h" +#include "helpStructures/TimerService.h" #define SELF_NETWORK_ADDRESS selfAddress.c_str() diff --git a/Castalia/src/node/application/bridgeTest/BridgeTest.cc b/Castalia/src/node/application/bridgeTest/BridgeTest.cc index 5cfad92b..8b9da91d 100644 --- a/Castalia/src/node/application/bridgeTest/BridgeTest.cc +++ b/Castalia/src/node/application/bridgeTest/BridgeTest.cc @@ -10,7 +10,7 @@ * * ****************************************************************************/ -#include "BridgeTest.h" +#include "node/application/bridgeTest/BridgeTest.h" Define_Module(BridgeTest); diff --git a/Castalia/src/node/application/bridgeTest/BridgeTest.h b/Castalia/src/node/application/bridgeTest/BridgeTest.h index 5d2e4bf1..d68501ff 100644 --- a/Castalia/src/node/application/bridgeTest/BridgeTest.h +++ b/Castalia/src/node/application/bridgeTest/BridgeTest.h @@ -13,7 +13,7 @@ #ifndef _BridgeTest_H_ #define _BridgeTest_H_ -#include "VirtualApplication.h" +#include "node/application/VirtualApplication.h" #define REPROGRAM_PACKET_NAME "Bridge test reprogram packet" #define REPORT_PACKET_NAME "Bridge test report packet" diff --git a/Castalia/src/node/application/connectivityMap/ConnectivityMap.cc b/Castalia/src/node/application/connectivityMap/ConnectivityMap.cc index 2fefca0b..f03ea6e1 100644 --- a/Castalia/src/node/application/connectivityMap/ConnectivityMap.cc +++ b/Castalia/src/node/application/connectivityMap/ConnectivityMap.cc @@ -10,7 +10,7 @@ * * *******************************************************************************/ -#include "ConnectivityMap.h" +#include "node/application/connectivityMap/ConnectivityMap.h" Define_Module(ConnectivityMap); diff --git a/Castalia/src/node/application/connectivityMap/ConnectivityMap.h b/Castalia/src/node/application/connectivityMap/ConnectivityMap.h index 0acfcf49..91efcec7 100644 --- a/Castalia/src/node/application/connectivityMap/ConnectivityMap.h +++ b/Castalia/src/node/application/connectivityMap/ConnectivityMap.h @@ -13,7 +13,7 @@ #ifndef _CONNECTIVITYMAP_H_ #define _CONNECTIVITYMAP_H_ -#include "VirtualApplication.h" +#include "node/application/VirtualApplication.h" using namespace std; diff --git a/Castalia/src/node/application/simpleAggregation/SimpleAggregation.cc b/Castalia/src/node/application/simpleAggregation/SimpleAggregation.cc index 3910bb5f..ad58d062 100644 --- a/Castalia/src/node/application/simpleAggregation/SimpleAggregation.cc +++ b/Castalia/src/node/application/simpleAggregation/SimpleAggregation.cc @@ -10,7 +10,7 @@ * * ****************************************************************************/ -#include "SimpleAggregation.h" +#include "node/application/simpleAggregation/SimpleAggregation.h" Define_Module(SimpleAggregation); diff --git a/Castalia/src/node/application/simpleAggregation/SimpleAggregation.h b/Castalia/src/node/application/simpleAggregation/SimpleAggregation.h index 3b6d2f51..984d1a35 100644 --- a/Castalia/src/node/application/simpleAggregation/SimpleAggregation.h +++ b/Castalia/src/node/application/simpleAggregation/SimpleAggregation.h @@ -13,7 +13,7 @@ #ifndef _SIMPLEAGGREGATION_H_ #define _SIMPLEAGGREGATION_H_ -#include "VirtualApplication.h" +#include "node/application/VirtualApplication.h" using namespace std; diff --git a/Castalia/src/node/application/throughputTest/ThroughputTest.cc b/Castalia/src/node/application/throughputTest/ThroughputTest.cc index 00823b95..5b232b36 100644 --- a/Castalia/src/node/application/throughputTest/ThroughputTest.cc +++ b/Castalia/src/node/application/throughputTest/ThroughputTest.cc @@ -10,7 +10,7 @@ * * ****************************************************************************/ -#include "ThroughputTest.h" +#include "node/application/throughputTest/ThroughputTest.h" Define_Module(ThroughputTest); diff --git a/Castalia/src/node/application/throughputTest/ThroughputTest.h b/Castalia/src/node/application/throughputTest/ThroughputTest.h index 4aef0af9..9800d7c4 100644 --- a/Castalia/src/node/application/throughputTest/ThroughputTest.h +++ b/Castalia/src/node/application/throughputTest/ThroughputTest.h @@ -13,7 +13,7 @@ #ifndef _THROUGHPUTTEST_H_ #define _THROUGHPUTTEST_H_ -#include "VirtualApplication.h" +#include "node/application/VirtualApplication.h" #include using namespace std; diff --git a/Castalia/src/node/application/valuePropagation/ValuePropagation.cc b/Castalia/src/node/application/valuePropagation/ValuePropagation.cc index 83af1719..9d660f72 100644 --- a/Castalia/src/node/application/valuePropagation/ValuePropagation.cc +++ b/Castalia/src/node/application/valuePropagation/ValuePropagation.cc @@ -10,7 +10,7 @@ * * *******************************************************************************/ -#include "ValuePropagation.h" +#include "node/application/valuePropagation/ValuePropagation.h" Define_Module(ValuePropagation); diff --git a/Castalia/src/node/application/valuePropagation/ValuePropagation.h b/Castalia/src/node/application/valuePropagation/ValuePropagation.h index b1c5d1f8..f2493609 100644 --- a/Castalia/src/node/application/valuePropagation/ValuePropagation.h +++ b/Castalia/src/node/application/valuePropagation/ValuePropagation.h @@ -13,7 +13,7 @@ #ifndef _VALUEPROPAGATION_H_ #define _VALUEPROPAGATION_H_ -#include "VirtualApplication.h" +#include "node/application/VirtualApplication.h" using namespace std; diff --git a/Castalia/src/node/application/valueReporting/ValueReporting.cc b/Castalia/src/node/application/valueReporting/ValueReporting.cc index f316cb6d..fe27cf4f 100644 --- a/Castalia/src/node/application/valueReporting/ValueReporting.cc +++ b/Castalia/src/node/application/valueReporting/ValueReporting.cc @@ -10,7 +10,7 @@ * * ****************************************************************************/ -#include "ValueReporting.h" +#include "node/application/valueReporting/ValueReporting.h" Define_Module(ValueReporting); diff --git a/Castalia/src/node/application/valueReporting/ValueReporting.h b/Castalia/src/node/application/valueReporting/ValueReporting.h index f0f5998a..c521bceb 100644 --- a/Castalia/src/node/application/valueReporting/ValueReporting.h +++ b/Castalia/src/node/application/valueReporting/ValueReporting.h @@ -13,8 +13,8 @@ #ifndef _VALUEREPORTING_H_ #define _VALUEREPORTING_H_ -#include "VirtualApplication.h" -#include "ValueReportingPacket_m.h" +#include "node/application/VirtualApplication.h" +#include "node/application/valueReporting/ValueReportingPacket_m.h" using namespace std; diff --git a/Castalia/src/node/application/valueReporting/ValueReportingPacket.msg b/Castalia/src/node/application/valueReporting/ValueReportingPacket.msg index 7d614381..b9925aa2 100644 --- a/Castalia/src/node/application/valueReporting/ValueReportingPacket.msg +++ b/Castalia/src/node/application/valueReporting/ValueReportingPacket.msg @@ -11,7 +11,7 @@ //*************************************************************************************** cplusplus {{ -#include "ApplicationPacket_m.h" +#include "node/application/ApplicationPacket_m.h" }} class ApplicationPacket; diff --git a/Castalia/src/node/communication/mac/VirtualMac.cc b/Castalia/src/node/communication/mac/VirtualMac.cc index 4af882a9..3a693181 100644 --- a/Castalia/src/node/communication/mac/VirtualMac.cc +++ b/Castalia/src/node/communication/mac/VirtualMac.cc @@ -10,7 +10,7 @@ * * ****************************************************************************/ -#include "VirtualMac.h" +#include "node/communication/mac/VirtualMac.h" void VirtualMac::initialize() { diff --git a/Castalia/src/node/communication/mac/VirtualMac.h b/Castalia/src/node/communication/mac/VirtualMac.h index e18a2060..cb90ecb0 100644 --- a/Castalia/src/node/communication/mac/VirtualMac.h +++ b/Castalia/src/node/communication/mac/VirtualMac.h @@ -19,14 +19,14 @@ #include #include -#include "RoutingPacket_m.h" -#include "MacPacket_m.h" -#include "RadioControlMessage_m.h" +#include "node/communication/routing/RoutingPacket_m.h" +#include "node/communication/mac/MacPacket_m.h" +#include "node/communication/radio/RadioControlMessage_m.h" -#include "ResourceManager.h" -#include "Radio.h" -#include "TimerService.h" -#include "CastaliaModule.h" +#include "node/resourceManager/ResourceManager.h" +#include "node/communication/radio/Radio.h" +#include "helpStructures/TimerService.h" +#include "helpStructures/CastaliaModule.h" using namespace std; diff --git a/Castalia/src/node/communication/mac/baselineBanMac/BaselineBANMac.cc b/Castalia/src/node/communication/mac/baselineBanMac/BaselineBANMac.cc index 463016b8..c8490b6f 100644 --- a/Castalia/src/node/communication/mac/baselineBanMac/BaselineBANMac.cc +++ b/Castalia/src/node/communication/mac/baselineBanMac/BaselineBANMac.cc @@ -10,7 +10,7 @@ * * ****************************************************************************/ -#include "BaselineBANMac.h" +#include "node/communication/mac/baselineBanMac/BaselineBANMac.h" Define_Module(BaselineBANMac); diff --git a/Castalia/src/node/communication/mac/baselineBanMac/BaselineBANMac.h b/Castalia/src/node/communication/mac/baselineBanMac/BaselineBANMac.h index 173e8125..c870fa72 100644 --- a/Castalia/src/node/communication/mac/baselineBanMac/BaselineBANMac.h +++ b/Castalia/src/node/communication/mac/baselineBanMac/BaselineBANMac.h @@ -13,8 +13,8 @@ #ifndef BaselineBAN_MAC_MODULE_H #define BaselineBAN_MAC_MODULE_H -#include "VirtualMac.h" -#include "BaselineMacPacket_m.h" +#include "node/communication/mac/VirtualMac.h" +#include "node/communication/mac/baselineBanMac/BaselineMacPacket_m.h" #define TX_TIME(x) (phyLayerOverhead + x)*1/(1000*phyDataRate/8.0) //x are in BYTES #define UNCONNECTED -1 diff --git a/Castalia/src/node/communication/mac/baselineBanMac/BaselineMacPacket.msg b/Castalia/src/node/communication/mac/baselineBanMac/BaselineMacPacket.msg index 87ce6e80..6335e25d 100644 --- a/Castalia/src/node/communication/mac/baselineBanMac/BaselineMacPacket.msg +++ b/Castalia/src/node/communication/mac/baselineBanMac/BaselineMacPacket.msg @@ -11,7 +11,7 @@ //****************************************************************************/ cplusplus {{ -#include "MacPacket_m.h" +#include "node/communication/mac/MacPacket_m.h" #define BASELINEBAN_HEADER_SIZE 7 #define BASELINEBAN_BEACON_SIZE 17 + 7 diff --git a/Castalia/src/node/communication/mac/bypassMac/BypassMAC.cc b/Castalia/src/node/communication/mac/bypassMac/BypassMAC.cc index e8c06bf9..fbfd1f20 100644 --- a/Castalia/src/node/communication/mac/bypassMac/BypassMAC.cc +++ b/Castalia/src/node/communication/mac/bypassMac/BypassMAC.cc @@ -10,7 +10,7 @@ * * ****************************************************************************/ -#include "BypassMAC.h" +#include "node/communication/mac/bypassMac/BypassMAC.h" Define_Module(BypassMAC); diff --git a/Castalia/src/node/communication/mac/bypassMac/BypassMAC.h b/Castalia/src/node/communication/mac/bypassMac/BypassMAC.h index fef91ea3..553c317c 100644 --- a/Castalia/src/node/communication/mac/bypassMac/BypassMAC.h +++ b/Castalia/src/node/communication/mac/bypassMac/BypassMAC.h @@ -14,7 +14,7 @@ #define _BYPASSMAC_H_ #include -#include "VirtualMac.h" +#include "node/communication/mac/VirtualMac.h" using namespace std; diff --git a/Castalia/src/node/communication/mac/mac802154/Basic802154.cc b/Castalia/src/node/communication/mac/mac802154/Basic802154.cc index 6a21332b..5d584501 100644 --- a/Castalia/src/node/communication/mac/mac802154/Basic802154.cc +++ b/Castalia/src/node/communication/mac/mac802154/Basic802154.cc @@ -10,7 +10,7 @@ * * ****************************************************************************/ -#include "Basic802154.h" +#include "node/communication/mac/mac802154/Basic802154.h" // This module is virtual and can not be used directly Define_Module(Basic802154); diff --git a/Castalia/src/node/communication/mac/mac802154/Basic802154.h b/Castalia/src/node/communication/mac/mac802154/Basic802154.h index 9fbc3732..2c97ce58 100644 --- a/Castalia/src/node/communication/mac/mac802154/Basic802154.h +++ b/Castalia/src/node/communication/mac/mac802154/Basic802154.h @@ -16,8 +16,8 @@ #include #include -#include "VirtualMac.h" -#include "Basic802154Packet_m.h" +#include "node/communication/mac/VirtualMac.h" +#include "node/communication/mac/mac802154/Basic802154Packet_m.h" #define ACK_PKT_SIZE 6 #define COMMAND_PKT_SIZE 10 diff --git a/Castalia/src/node/communication/mac/mac802154/Basic802154Packet.msg b/Castalia/src/node/communication/mac/mac802154/Basic802154Packet.msg index 289c1503..64c44b42 100644 --- a/Castalia/src/node/communication/mac/mac802154/Basic802154Packet.msg +++ b/Castalia/src/node/communication/mac/mac802154/Basic802154Packet.msg @@ -11,7 +11,7 @@ //****************************************************************************/ cplusplus {{ -#include "MacPacket_m.h" +#include "node/communication/mac/MacPacket_m.h" }} class MacPacket; diff --git a/Castalia/src/node/communication/mac/mac802154/staticGTS802154/StaticGTS802154.cc b/Castalia/src/node/communication/mac/mac802154/staticGTS802154/StaticGTS802154.cc index 68fddbaa..f85a710d 100644 --- a/Castalia/src/node/communication/mac/mac802154/staticGTS802154/StaticGTS802154.cc +++ b/Castalia/src/node/communication/mac/mac802154/staticGTS802154/StaticGTS802154.cc @@ -10,7 +10,7 @@ * * ****************************************************************************/ -#include "StaticGTS802154.h" +#include "node/communication/mac/mac802154/staticGTS802154/StaticGTS802154.h" Define_Module(StaticGTS802154); diff --git a/Castalia/src/node/communication/mac/mac802154/staticGTS802154/StaticGTS802154.h b/Castalia/src/node/communication/mac/mac802154/staticGTS802154/StaticGTS802154.h index 15a4fd49..1b279fb0 100644 --- a/Castalia/src/node/communication/mac/mac802154/staticGTS802154/StaticGTS802154.h +++ b/Castalia/src/node/communication/mac/mac802154/staticGTS802154/StaticGTS802154.h @@ -16,8 +16,8 @@ #include #include -#include "Basic802154.h" -#include "Basic802154Packet_m.h" +#include "node/communication/mac/mac802154/Basic802154.h" +#include "node/communication/mac/mac802154/Basic802154Packet_m.h" class StaticGTS802154: public Basic802154 { protected: diff --git a/Castalia/src/node/communication/mac/tMac/TMAC.cc b/Castalia/src/node/communication/mac/tMac/TMAC.cc index fa37d25f..b355f388 100644 --- a/Castalia/src/node/communication/mac/tMac/TMAC.cc +++ b/Castalia/src/node/communication/mac/tMac/TMAC.cc @@ -11,7 +11,7 @@ ****************************************************************************/ #include -#include "TMAC.h" +#include "node/communication/mac/tMac/TMAC.h" Define_Module(TMAC); diff --git a/Castalia/src/node/communication/mac/tMac/TMAC.h b/Castalia/src/node/communication/mac/tMac/TMAC.h index dd85fc90..342dee34 100644 --- a/Castalia/src/node/communication/mac/tMac/TMAC.h +++ b/Castalia/src/node/communication/mac/tMac/TMAC.h @@ -13,8 +13,8 @@ #ifndef _TMAC_H_ #define _TMAC_H_ -#include "VirtualMac.h" -#include "TMacPacket_m.h" +#include "node/communication/mac/VirtualMac.h" +#include "node/communication/mac/tMac/TMacPacket_m.h" #define TX_TIME(x) (phyLayerOverhead + x)*1/(1000*phyDataRate/8.0) //x are in BYTES diff --git a/Castalia/src/node/communication/mac/tMac/TMacPacket.msg b/Castalia/src/node/communication/mac/tMac/TMacPacket.msg index aec609ed..5ec7d79f 100644 --- a/Castalia/src/node/communication/mac/tMac/TMacPacket.msg +++ b/Castalia/src/node/communication/mac/tMac/TMacPacket.msg @@ -11,7 +11,7 @@ //****************************************************************************/ cplusplus {{ -#include "MacPacket_m.h" +#include "node/communication/mac/MacPacket_m.h" }} class MacPacket; diff --git a/Castalia/src/node/communication/mac/tunableMac/TunableMAC.cc b/Castalia/src/node/communication/mac/tunableMac/TunableMAC.cc index ea0be9c1..65775879 100644 --- a/Castalia/src/node/communication/mac/tunableMac/TunableMAC.cc +++ b/Castalia/src/node/communication/mac/tunableMac/TunableMAC.cc @@ -9,7 +9,7 @@ * Attention: License Inquiry. * ***************************************************************************/ -#include "TunableMAC.h" +#include "node/communication/mac/tunableMac/TunableMAC.h" Define_Module(TunableMAC); diff --git a/Castalia/src/node/communication/mac/tunableMac/TunableMAC.h b/Castalia/src/node/communication/mac/tunableMac/TunableMAC.h index 87104af7..14948fd9 100644 --- a/Castalia/src/node/communication/mac/tunableMac/TunableMAC.h +++ b/Castalia/src/node/communication/mac/tunableMac/TunableMAC.h @@ -13,9 +13,9 @@ #ifndef TUNABLEMACMODULE #define TUNABLEMACMODULE -#include "VirtualMac.h" -#include "TunableMacControl_m.h" -#include "TunableMacPacket_m.h" +#include "node/communication/mac/VirtualMac.h" +#include "node/communication/mac/tunableMac/TunableMacControl_m.h" +#include "node/communication/mac/tunableMac/TunableMacPacket_m.h" using namespace std; diff --git a/Castalia/src/node/communication/mac/tunableMac/TunableMacPacket.msg b/Castalia/src/node/communication/mac/tunableMac/TunableMacPacket.msg index 8a929e8d..3145ea09 100644 --- a/Castalia/src/node/communication/mac/tunableMac/TunableMacPacket.msg +++ b/Castalia/src/node/communication/mac/tunableMac/TunableMacPacket.msg @@ -11,7 +11,7 @@ //****************************************************************************/ cplusplus {{ -#include "MacPacket_m.h" +#include "node/communication/mac/MacPacket_m.h" }} class MacPacket; diff --git a/Castalia/src/node/communication/radio/Radio.cc b/Castalia/src/node/communication/radio/Radio.cc index 572b1d4a..745c2cc8 100644 --- a/Castalia/src/node/communication/radio/Radio.cc +++ b/Castalia/src/node/communication/radio/Radio.cc @@ -10,7 +10,7 @@ * * ****************************************************************************/ -#include "Radio.h" +#include "node/communication/radio/Radio.h" Define_Module(Radio); diff --git a/Castalia/src/node/communication/radio/Radio.h b/Castalia/src/node/communication/radio/Radio.h index 88032ccb..16ccc44b 100644 --- a/Castalia/src/node/communication/radio/Radio.h +++ b/Castalia/src/node/communication/radio/Radio.h @@ -20,12 +20,12 @@ #include #include -#include "RadioSupportFunctions.h" -#include "WirelessChannelMessages_m.h" -#include "RadioControlMessage_m.h" -#include "MacPacket_m.h" -#include "ResourceManager.h" -#include "CastaliaModule.h" +#include "node/communication/radio/RadioSupportFunctions.h" +#include "wirelessChannel/WirelessChannelMessages_m.h" +#include "node/communication/radio/RadioControlMessage_m.h" +#include "node/communication/mac/MacPacket_m.h" +#include "node/resourceManager/ResourceManager.h" +#include "helpStructures/CastaliaModule.h" #define ALL_ERRORS -1 #define IDEAL_MODULATION_THRESHOLD 5.0 diff --git a/Castalia/src/node/communication/radio/RadioSupportFunctions.cc b/Castalia/src/node/communication/radio/RadioSupportFunctions.cc index 22095ae3..b77f07cb 100644 --- a/Castalia/src/node/communication/radio/RadioSupportFunctions.cc +++ b/Castalia/src/node/communication/radio/RadioSupportFunctions.cc @@ -10,7 +10,7 @@ * * ****************************************************************************/ -#include "RadioSupportFunctions.h" +#include "node/communication/radio/RadioSupportFunctions.h" #define ERFINV_ERROR 100000.0 diff --git a/Castalia/src/node/communication/radio/RadioSupportFunctions.h b/Castalia/src/node/communication/radio/RadioSupportFunctions.h index e5a5b849..eede81fb 100644 --- a/Castalia/src/node/communication/radio/RadioSupportFunctions.h +++ b/Castalia/src/node/communication/radio/RadioSupportFunctions.h @@ -14,7 +14,7 @@ #define SUPPORTFUNCTIONS_H_ #include -#include "RadioControlMessage_m.h" +#include "node/communication/radio/RadioControlMessage_m.h" #include "CastaliaMessages.h" float addPower_dBm(float a, float b); diff --git a/Castalia/src/node/communication/routing/VirtualRouting.cc b/Castalia/src/node/communication/routing/VirtualRouting.cc index ed59e5bc..7998d3c3 100644 --- a/Castalia/src/node/communication/routing/VirtualRouting.cc +++ b/Castalia/src/node/communication/routing/VirtualRouting.cc @@ -10,7 +10,7 @@ * * ****************************************************************************/ -#include "VirtualRouting.h" +#include "node/communication/routing/VirtualRouting.h" void VirtualRouting::initialize() { maxNetFrameSize = par("maxNetFrameSize"); diff --git a/Castalia/src/node/communication/routing/VirtualRouting.h b/Castalia/src/node/communication/routing/VirtualRouting.h index 068b4297..8f6016cc 100644 --- a/Castalia/src/node/communication/routing/VirtualRouting.h +++ b/Castalia/src/node/communication/routing/VirtualRouting.h @@ -17,13 +17,13 @@ #include #include -#include "CastaliaModule.h" -#include "TimerService.h" +#include "helpStructures/CastaliaModule.h" +#include "helpStructures/TimerService.h" #include "CastaliaMessages.h" -#include "Radio.h" -#include "ResourceManager.h" -#include "RoutingPacket_m.h" -#include "ApplicationPacket_m.h" +#include "node/communication/radio/Radio.h" +#include "node/resourceManager/ResourceManager.h" +#include "node/communication/routing/RoutingPacket_m.h" +#include "node/application/ApplicationPacket_m.h" #define SELF_NETWORK_ADDRESS selfAddress.c_str() #define ROUTE_DEST_DELIMITER "#" diff --git a/Castalia/src/node/communication/routing/bypassRouting/BypassRouting.cc b/Castalia/src/node/communication/routing/bypassRouting/BypassRouting.cc index 3547bab7..00d1e54b 100644 --- a/Castalia/src/node/communication/routing/bypassRouting/BypassRouting.cc +++ b/Castalia/src/node/communication/routing/bypassRouting/BypassRouting.cc @@ -10,7 +10,7 @@ * * *******************************************************************************/ -#include "BypassRouting.h" +#include "node/communication/routing/bypassRouting/BypassRouting.h" Define_Module(BypassRouting); diff --git a/Castalia/src/node/communication/routing/bypassRouting/BypassRouting.h b/Castalia/src/node/communication/routing/bypassRouting/BypassRouting.h index 0e1dec54..15d73a86 100644 --- a/Castalia/src/node/communication/routing/bypassRouting/BypassRouting.h +++ b/Castalia/src/node/communication/routing/bypassRouting/BypassRouting.h @@ -13,8 +13,8 @@ #ifndef _BYPASSROUTING_H_ #define _BYPASSROUTING_H_ -#include "VirtualRouting.h" -#include "BypassRoutingPacket_m.h" +#include "node/communication/routing/VirtualRouting.h" +#include "node/communication/routing/bypassRouting/BypassRoutingPacket_m.h" using namespace std; diff --git a/Castalia/src/node/communication/routing/bypassRouting/BypassRoutingPacket.msg b/Castalia/src/node/communication/routing/bypassRouting/BypassRoutingPacket.msg index ccabb93e..ff3a2455 100644 --- a/Castalia/src/node/communication/routing/bypassRouting/BypassRoutingPacket.msg +++ b/Castalia/src/node/communication/routing/bypassRouting/BypassRoutingPacket.msg @@ -11,7 +11,7 @@ //****************************************************************************/ cplusplus {{ -#include "RoutingPacket_m.h" +#include "node/communication/routing/RoutingPacket_m.h" }} class RoutingPacket; diff --git a/Castalia/src/node/communication/routing/multipathRingsRouting/MultipathRingsRouting.cc b/Castalia/src/node/communication/routing/multipathRingsRouting/MultipathRingsRouting.cc index 7fec77d6..60e183de 100644 --- a/Castalia/src/node/communication/routing/multipathRingsRouting/MultipathRingsRouting.cc +++ b/Castalia/src/node/communication/routing/multipathRingsRouting/MultipathRingsRouting.cc @@ -10,7 +10,7 @@ * * *******************************************************************************/ -#include "MultipathRingsRouting.h" +#include "node/communication/routing/multipathRingsRouting/MultipathRingsRouting.h" Define_Module(MultipathRingsRouting); diff --git a/Castalia/src/node/communication/routing/multipathRingsRouting/MultipathRingsRouting.h b/Castalia/src/node/communication/routing/multipathRingsRouting/MultipathRingsRouting.h index 519c8204..d59dd99b 100644 --- a/Castalia/src/node/communication/routing/multipathRingsRouting/MultipathRingsRouting.h +++ b/Castalia/src/node/communication/routing/multipathRingsRouting/MultipathRingsRouting.h @@ -14,9 +14,9 @@ #define _MULTIPATHRINGSROUTING_H_ #include -#include "VirtualRouting.h" -#include "MultipathRingsRoutingPacket_m.h" -#include "MultipathRingsRoutingControl_m.h" +#include "node/communication/routing/VirtualRouting.h" +#include "node/communication/routing/multipathRingsRouting/MultipathRingsRoutingPacket_m.h" +#include "node/communication/routing/multipathRingsRouting/MultipathRingsRoutingControl_m.h" #define NO_LEVEL -110 #define NO_SINK -120 diff --git a/Castalia/src/node/communication/routing/multipathRingsRouting/MultipathRingsRoutingPacket.msg b/Castalia/src/node/communication/routing/multipathRingsRouting/MultipathRingsRoutingPacket.msg index cc139d3f..9b3a9a34 100644 --- a/Castalia/src/node/communication/routing/multipathRingsRouting/MultipathRingsRoutingPacket.msg +++ b/Castalia/src/node/communication/routing/multipathRingsRouting/MultipathRingsRoutingPacket.msg @@ -11,7 +11,7 @@ //****************************************************************************/ cplusplus {{ -#include "RoutingPacket_m.h" +#include "node/communication/routing/RoutingPacket_m.h" }} class RoutingPacket; diff --git a/Castalia/src/node/mobilityManager/VirtualMobilityManager.cc b/Castalia/src/node/mobilityManager/VirtualMobilityManager.cc index 397d9d39..ad7ce769 100644 --- a/Castalia/src/node/mobilityManager/VirtualMobilityManager.cc +++ b/Castalia/src/node/mobilityManager/VirtualMobilityManager.cc @@ -10,7 +10,7 @@ * * ****************************************************************************/ -#include "VirtualMobilityManager.h" +#include "node/mobilityManager/VirtualMobilityManager.h" Define_Module(VirtualMobilityManager); diff --git a/Castalia/src/node/mobilityManager/VirtualMobilityManager.h b/Castalia/src/node/mobilityManager/VirtualMobilityManager.h index 93ed2e3e..0b12be02 100644 --- a/Castalia/src/node/mobilityManager/VirtualMobilityManager.h +++ b/Castalia/src/node/mobilityManager/VirtualMobilityManager.h @@ -13,8 +13,8 @@ #ifndef _VIRTUALBILITYMANAGER_H_ #define _VIRTUALBILITYMANAGER_H_ -#include "WirelessChannelMessages_m.h" -#include "CastaliaModule.h" +#include "wirelessChannel/WirelessChannelMessages_m.h" +#include "helpStructures/CastaliaModule.h" using namespace std; diff --git a/Castalia/src/node/mobilityManager/lineMobilityManager/LineMobilityManager.cc b/Castalia/src/node/mobilityManager/lineMobilityManager/LineMobilityManager.cc index 646bc1fb..4f01e301 100644 --- a/Castalia/src/node/mobilityManager/lineMobilityManager/LineMobilityManager.cc +++ b/Castalia/src/node/mobilityManager/lineMobilityManager/LineMobilityManager.cc @@ -10,7 +10,7 @@ * * ****************************************************************************/ -#include "LineMobilityManager.h" +#include "node/mobilityManager/lineMobilityManager/LineMobilityManager.h" Define_Module(LineMobilityManager); diff --git a/Castalia/src/node/mobilityManager/lineMobilityManager/LineMobilityManager.h b/Castalia/src/node/mobilityManager/lineMobilityManager/LineMobilityManager.h index c3958b44..59142891 100644 --- a/Castalia/src/node/mobilityManager/lineMobilityManager/LineMobilityManager.h +++ b/Castalia/src/node/mobilityManager/lineMobilityManager/LineMobilityManager.h @@ -13,8 +13,8 @@ #ifndef _MOBILITYMODULE_H_ #define _MOBILITYMODULE_H_ -#include "MobilityManagerMessage_m.h" -#include "VirtualMobilityManager.h" +#include "node/mobilityManager/MobilityManagerMessage_m.h" +#include "node/mobilityManager/VirtualMobilityManager.h" using namespace std; diff --git a/Castalia/src/node/mobilityManager/noMobilityManager/NoMobilityManager.cc b/Castalia/src/node/mobilityManager/noMobilityManager/NoMobilityManager.cc index a46ed1a4..1668e09e 100644 --- a/Castalia/src/node/mobilityManager/noMobilityManager/NoMobilityManager.cc +++ b/Castalia/src/node/mobilityManager/noMobilityManager/NoMobilityManager.cc @@ -10,7 +10,7 @@ * * ****************************************************************************/ -#include "NoMobilityManager.h" +" Define_Module(NoMobilityManager); diff --git a/Castalia/src/node/mobilityManager/noMobilityManager/NoMobilityManager.h b/Castalia/src/node/mobilityManager/noMobilityManager/NoMobilityManager.h index b3300fba..39e16c9f 100644 --- a/Castalia/src/node/mobilityManager/noMobilityManager/NoMobilityManager.h +++ b/Castalia/src/node/mobilityManager/noMobilityManager/NoMobilityManager.h @@ -14,8 +14,8 @@ #define _NOMOBILITYMANAGER_H_ #include -#include "DebugInfoWriter.h" -#include "VirtualMobilityManager.h" +#include "helpStructures/DebugInfoWriter.h" +#include "node/mobilityManager/VirtualMobilityManager.h" using namespace std; diff --git a/Castalia/src/node/resourceManager/ResourceManager.cc b/Castalia/src/node/resourceManager/ResourceManager.cc index c840b447..13533475 100644 --- a/Castalia/src/node/resourceManager/ResourceManager.cc +++ b/Castalia/src/node/resourceManager/ResourceManager.cc @@ -10,7 +10,7 @@ * * *******************************************************************************/ -#include "ResourceManager.h" +#include "node/resourceManager/ResourceManager.h" Define_Module(ResourceManager); diff --git a/Castalia/src/node/resourceManager/ResourceManager.h b/Castalia/src/node/resourceManager/ResourceManager.h index 0fe621f7..91a63046 100644 --- a/Castalia/src/node/resourceManager/ResourceManager.h +++ b/Castalia/src/node/resourceManager/ResourceManager.h @@ -14,8 +14,8 @@ #define _RESOURCEMANAGER_H_ #include -#include "CastaliaModule.h" -#include "ResourceManagerMessage_m.h" +#include "helpStructures/CastaliaModule.h" +#include "node/resourceManager/ResourceManagerMessage_m.h" using namespace std; diff --git a/Castalia/src/node/sensorManager/SensorManager.cc b/Castalia/src/node/sensorManager/SensorManager.cc index 02dfa3ed..b012235c 100644 --- a/Castalia/src/node/sensorManager/SensorManager.cc +++ b/Castalia/src/node/sensorManager/SensorManager.cc @@ -10,7 +10,7 @@ * * *******************************************************************************/ -#include "SensorManager.h" +#include "node/sensorManager/SensorManager.h" Define_Module(SensorManager); diff --git a/Castalia/src/node/sensorManager/SensorManager.h b/Castalia/src/node/sensorManager/SensorManager.h index 821a66cd..73590a35 100644 --- a/Castalia/src/node/sensorManager/SensorManager.h +++ b/Castalia/src/node/sensorManager/SensorManager.h @@ -13,11 +13,11 @@ #ifndef _APPLICATIONMODULESIMPLE_H_ #define _APPLICATIONMODULESIMPLE_H_ -#include "SensorManagerMessage_m.h" -#include "PhysicalProcessMessage_m.h" +#include "node/sensorManager/SensorManagerMessage_m.h" +#include "physicalProcess/PhysicalProcessMessage_m.h" -#include "VirtualMobilityManager.h" -#include "CastaliaModule.h" +#include "node/mobilityManager/VirtualMobilityManager.h" +#include "helpStructures/CastaliaModule.h" using namespace std; diff --git a/Castalia/src/physicalProcess/carsPhysicalProcess/CarsPhysicalProcess.cc b/Castalia/src/physicalProcess/carsPhysicalProcess/CarsPhysicalProcess.cc index fb1d0dc3..1275d5f1 100644 --- a/Castalia/src/physicalProcess/carsPhysicalProcess/CarsPhysicalProcess.cc +++ b/Castalia/src/physicalProcess/carsPhysicalProcess/CarsPhysicalProcess.cc @@ -10,7 +10,7 @@ * * ****************************************************************************/ -#include "CarsPhysicalProcess.h" +#include "physicalProcess/carsPhysicalProcess/CarsPhysicalProcess.h" #define K_PARAM 0.1 #define A_PARAM 1 diff --git a/Castalia/src/physicalProcess/carsPhysicalProcess/CarsPhysicalProcess.h b/Castalia/src/physicalProcess/carsPhysicalProcess/CarsPhysicalProcess.h index f136c5d4..3b2cfa7f 100644 --- a/Castalia/src/physicalProcess/carsPhysicalProcess/CarsPhysicalProcess.h +++ b/Castalia/src/physicalProcess/carsPhysicalProcess/CarsPhysicalProcess.h @@ -15,8 +15,8 @@ #define SIMTIME_STEP 0.01 -#include "CastaliaModule.h" -#include "PhysicalProcessMessage_m.h" +#include "helpStructures/CastaliaModule.h" +#include "physicalProcess/PhysicalProcessMessage_m.h" using namespace std; diff --git a/Castalia/src/physicalProcess/customizablePhysicalProcess/CustomizablePhysicalProcess.cc b/Castalia/src/physicalProcess/customizablePhysicalProcess/CustomizablePhysicalProcess.cc index 6b8cfc76..23ca06f5 100644 --- a/Castalia/src/physicalProcess/customizablePhysicalProcess/CustomizablePhysicalProcess.cc +++ b/Castalia/src/physicalProcess/customizablePhysicalProcess/CustomizablePhysicalProcess.cc @@ -10,7 +10,7 @@ * * ****************************************************************************/ -#include "CustomizablePhysicalProcess.h" +#include "physicalProcess/customizablePhysicalProcess/CustomizablePhysicalProcess.h" Define_Module(CustomizablePhysicalProcess); diff --git a/Castalia/src/physicalProcess/customizablePhysicalProcess/CustomizablePhysicalProcess.h b/Castalia/src/physicalProcess/customizablePhysicalProcess/CustomizablePhysicalProcess.h index 0c95f88b..c9f0dd7f 100644 --- a/Castalia/src/physicalProcess/customizablePhysicalProcess/CustomizablePhysicalProcess.h +++ b/Castalia/src/physicalProcess/customizablePhysicalProcess/CustomizablePhysicalProcess.h @@ -15,8 +15,8 @@ #define SIMTIME_STEP 0.01 -#include "CastaliaModule.h" -#include "PhysicalProcessMessage_m.h" +#include "helpStructures/CastaliaModule.h" +#include "physicalProcess/PhysicalProcessMessage_m.h" using namespace std; diff --git a/Castalia/src/wirelessChannel/defaultChannel/WirelessChannel.cc b/Castalia/src/wirelessChannel/defaultChannel/WirelessChannel.cc index 2c8eea86..2835ec14 100644 --- a/Castalia/src/wirelessChannel/defaultChannel/WirelessChannel.cc +++ b/Castalia/src/wirelessChannel/defaultChannel/WirelessChannel.cc @@ -10,7 +10,7 @@ * * ****************************************************************************/ -#include "WirelessChannel.h" +#include "wirelessChannel/defaultChannel/WirelessChannel.h" Define_Module(WirelessChannel); diff --git a/Castalia/src/wirelessChannel/defaultChannel/WirelessChannel.h b/Castalia/src/wirelessChannel/defaultChannel/WirelessChannel.h index 1ac37cbe..2cfb1df6 100644 --- a/Castalia/src/wirelessChannel/defaultChannel/WirelessChannel.h +++ b/Castalia/src/wirelessChannel/defaultChannel/WirelessChannel.h @@ -13,10 +13,10 @@ #ifndef _WIRELESSCHANNEL_H #define _WIRELESSCHANNEL_H -#include "WirelessChannelMessages_m.h" -#include "WirelessChannelTemporal.h" -#include "VirtualMobilityManager.h" -#include "CastaliaModule.h" +#include "wirelessChannel/WirelessChannelMessages_m.h" +#include "wirelessChannel/defaultChannel/WirelessChannelTemporal.h" +#include "node/mobilityManager/VirtualMobilityManager.h" +#include "helpStructures/CastaliaModule.h" #include "time.h" #include diff --git a/Castalia/src/wirelessChannel/defaultChannel/WirelessChannelTemporal.cc b/Castalia/src/wirelessChannel/defaultChannel/WirelessChannelTemporal.cc index cfd1ce43..bba7db9b 100644 --- a/Castalia/src/wirelessChannel/defaultChannel/WirelessChannelTemporal.cc +++ b/Castalia/src/wirelessChannel/defaultChannel/WirelessChannelTemporal.cc @@ -10,7 +10,7 @@ * * ****************************************************************************/ -#include "WirelessChannelTemporal.h" +#include "wirelessChannel/defaultChannel/WirelessChannelTemporal.h" //Constructor for channelTemporalModel, the key parameter here is the input file to read the //model data from. Whole parsing of the file is done here diff --git a/Castalia/src/wirelessChannel/traceChannel/TraceChannel.cc b/Castalia/src/wirelessChannel/traceChannel/TraceChannel.cc index 90970ee8..b5a067b3 100644 --- a/Castalia/src/wirelessChannel/traceChannel/TraceChannel.cc +++ b/Castalia/src/wirelessChannel/traceChannel/TraceChannel.cc @@ -10,7 +10,7 @@ * * ****************************************************************************/ -#include "TraceChannel.h" +#include "wirelessChannel/traceChannel/TraceChannel.h" Define_Module(TraceChannel); diff --git a/Castalia/src/wirelessChannel/traceChannel/TraceChannel.h b/Castalia/src/wirelessChannel/traceChannel/TraceChannel.h index a2964de3..c8e4909c 100644 --- a/Castalia/src/wirelessChannel/traceChannel/TraceChannel.h +++ b/Castalia/src/wirelessChannel/traceChannel/TraceChannel.h @@ -13,9 +13,9 @@ #ifndef _TRACECHANNEL_H #define _TRACECHANNEL_H -#include "WirelessChannelMessages_m.h" -#include "CastaliaModule.h" -#include "WirelessChannelTemporal.h" +#include "wirelessChannel/WirelessChannelMessages_m.h" +#include "helpStructures/CastaliaModule.h" +#include "wirelessChannel/defaultChannel/WirelessChannelTemporal.h" #include #include From c06eddbb177cbf48ef9975c09ce75d4e1f129564 Mon Sep 17 00:00:00 2001 From: Rudolf Hornig Date: Thu, 25 Apr 2019 11:33:00 +0200 Subject: [PATCH 02/10] updated for API changes --- Castalia/src/helpStructures/CastaliaModule.cc | 14 ++-- Castalia/src/helpStructures/TimerService.cc | 12 +-- .../node/application/VirtualApplication.cc | 8 +- .../connectivityMap/ConnectivityMap.cc | 4 +- .../valueReporting/ValueReporting.cc | 2 +- .../src/node/communication/mac/VirtualMac.cc | 4 +- .../mac/baselineBanMac/BaselineBANMac.cc | 8 +- .../mac/mac802154/Basic802154.cc | 10 +-- .../src/node/communication/mac/tMac/TMAC.cc | 4 +- .../mac/tunableMac/TunableMAC.cc | 10 +-- .../src/node/communication/radio/Radio.cc | 84 +++++++++---------- .../radio/RadioSupportFunctions.cc | 8 +- .../communication/routing/VirtualRouting.cc | 6 +- .../MultipathRingsRouting.cc | 2 +- .../mobilityManager/VirtualMobilityManager.cc | 20 ++--- .../noMobilityManager/NoMobilityManager.cc | 2 +- .../node/resourceManager/ResourceManager.cc | 4 +- .../src/node/sensorManager/SensorManager.cc | 2 +- .../CarsPhysicalProcess.cc | 8 +- .../CustomizablePhysicalProcess.cc | 24 +++--- .../defaultChannel/WirelessChannel.cc | 28 +++---- .../defaultChannel/WirelessChannelTemporal.cc | 6 +- .../defaultChannel/WirelessChannelTemporal.h | 5 +- .../traceChannel/TraceChannel.cc | 26 +++--- 24 files changed, 150 insertions(+), 151 deletions(-) diff --git a/Castalia/src/helpStructures/CastaliaModule.cc b/Castalia/src/helpStructures/CastaliaModule.cc index 171bff70..758f9bd3 100644 --- a/Castalia/src/helpStructures/CastaliaModule.cc +++ b/Castalia/src/helpStructures/CastaliaModule.cc @@ -98,7 +98,7 @@ void CastaliaModule::declareOutput(const char *descr) void CastaliaModule::collectOutput(const char *descr, int index) { if (index < 0) - opp_error("Negative output index not permitted"); + throw cRuntimeError("Negative output index not permitted"); collectOutputNocheck(descr, index, "", 1); } @@ -106,7 +106,7 @@ void CastaliaModule::collectOutput(const char *descr, int index, const char *label, double amt) { if (index < 0) - opp_error("Negative output index not permitted"); + throw cRuntimeError("Negative output index not permitted"); collectOutputNocheck(descr, index, label, amt); } @@ -122,7 +122,7 @@ void CastaliaModule::collectOutputNocheck(const char *descr, int index, void CastaliaModule::collectOutput(const char *descr, int index, const char *label) { if (index < 0) - opp_error("Negative output index not permitted"); + throw cRuntimeError("Negative output index not permitted"); collectOutputNocheck(descr, index, label, 1); } @@ -130,7 +130,7 @@ void CastaliaModule::declareHistogram(const char *descr, double min, double max, int buckets) { if (min >= max || buckets < 1) - opp_error("ERROR: declareHistogram failed, bad parameters"); + throw cRuntimeError("ERROR: declareHistogram failed, bad parameters"); histogramOutputByIndex hist; hist.min = min; @@ -144,7 +144,7 @@ void CastaliaModule::declareHistogram(const char *descr, double min, void CastaliaModule::collectHistogram(const char *descr, int index, double value) { if (index < 0) - opp_error("Negative output index not permitted"); + throw cRuntimeError("Negative output index not permitted"); collectHistogramNocheck(descr, index, value); } @@ -181,9 +181,9 @@ void CastaliaModule::powerDrawn(double power) else if (name.compare("SensorManager") == 0) classPointers.resourceManager = getParentModule()->getSubmodule("ResourceManager"); else - opp_error("%s module has no rights to call drawPower() function", getFullPath().c_str()); + throw cRuntimeError("%s module has no rights to call drawPower() function", getFullPath().c_str()); if (!classPointers.resourceManager) - opp_error("Unable to find pointer to resource manager module"); + throw cRuntimeError("Unable to find pointer to resource manager module"); } ResourceManagerMessage *drawPowerMsg = diff --git a/Castalia/src/helpStructures/TimerService.cc b/Castalia/src/helpStructures/TimerService.cc index 903f7cdb..412a4014 100644 --- a/Castalia/src/helpStructures/TimerService.cc +++ b/Castalia/src/helpStructures/TimerService.cc @@ -24,9 +24,9 @@ void TimerService::timerFiredCallback(int timerIndex) void TimerService::cancelTimer(int timerIndex) { if (timerIndex < 0) - opp_error("cancelTimer(): timerIndex=%i negative index is not allowed",timerIndex); + throw cRuntimeError("cancelTimer(): timerIndex=%i negative index is not allowed",timerIndex); if (timerIndex >= TIMER_MAX_SIZE) - opp_error("cancelTimer(): timerIndex=%i is too large",timerIndex); + throw cRuntimeError("cancelTimer(): timerIndex=%i is too large",timerIndex); if (timerIndex >= timerMessages.size()) return; TimerServiceMessage* tmp = timerMessages[timerIndex]; @@ -38,9 +38,9 @@ void TimerService::cancelTimer(int timerIndex) void TimerService::setTimer(int timerIndex, simtime_t time) { if (timerIndex < 0) - opp_error("setTimer(): timerIndex=%i negative index is not allowed",timerIndex); + throw cRuntimeError("setTimer(): timerIndex=%i negative index is not allowed",timerIndex); if (timerIndex >= TIMER_MAX_SIZE) - opp_error("setTimer(): timerIndex=%i is too large",timerIndex); + throw cRuntimeError("setTimer(): timerIndex=%i is too large",timerIndex); cancelTimer(timerIndex); if (timerIndex >= timerMessages.size()) { int newSize = timerMessages.size() + TIMER_MIN_SIZE; @@ -73,9 +73,9 @@ void TimerService::handleTimerMessage(cMessage * msg) simtime_t TimerService::getTimer(int timerIndex) { if (timerIndex < 0) - opp_error("getTimer(): timerIndex=%i negative index is not allowed",timerIndex); + throw cRuntimeError("getTimer(): timerIndex=%i negative index is not allowed",timerIndex); if (timerIndex >= TIMER_MAX_SIZE) - opp_error("getTimer(): timerIndex=%i is too large",timerIndex); + throw cRuntimeError("getTimer(): timerIndex=%i is too large",timerIndex); if (timerIndex >= timerMessages.size()) return -1; if (timerMessages[timerIndex] == NULL) diff --git a/Castalia/src/node/application/VirtualApplication.cc b/Castalia/src/node/application/VirtualApplication.cc index bbed0c13..b38fcd72 100644 --- a/Castalia/src/node/application/VirtualApplication.cc +++ b/Castalia/src/node/application/VirtualApplication.cc @@ -24,7 +24,7 @@ void VirtualApplication::initialize() radioModule = check_and_cast (parent->getSubmodule("Communication")->getSubmodule("Radio")); // check that all the pointers are valid if (!resMgrModule || !mobilityModule || !radioModule) - opp_error("\n Virtual App init: Error in geting a valid reference module(s)."); + throw cRuntimeError("\n Virtual App init: Error in geting a valid reference module(s)."); self = parent->getIndex(); // create the routing level address using self @@ -42,7 +42,7 @@ void VirtualApplication::initialize() double startup_delay = parent->par("startupOffset"); // Randomize the delay if the startupRandomization is non-zero - startup_delay += genk_dblrand(0) * (double)parent->par("startupRandomization"); + startup_delay += getRNG(0)->doubleRand() * (double)parent->par("startupRandomization"); /* Send the STARTUP message to 1)Sensor_Manager, 2)Commmunication module, * 3) Resource Manager, and $)APP (self message) so that the node starts @@ -146,7 +146,7 @@ void VirtualApplication::handleMessage(cMessage * msg) default: { - opp_error("Application module received unexpected message"); + throw cRuntimeError("Application module received unexpected message"); } } @@ -185,7 +185,7 @@ void VirtualApplication::requestSensorReading(int index) void VirtualApplication::toNetworkLayer(cMessage * msg) { if (msg->getKind() == APPLICATION_PACKET) - opp_error("toNetworkLayer() function used incorrectly to send APPLICATION_PACKET without destination Network address"); + throw cRuntimeError("toNetworkLayer() function used incorrectly to send APPLICATION_PACKET without destination Network address"); send(msg, "toCommunicationModule"); } diff --git a/Castalia/src/node/application/connectivityMap/ConnectivityMap.cc b/Castalia/src/node/application/connectivityMap/ConnectivityMap.cc index f03ea6e1..708c1903 100644 --- a/Castalia/src/node/application/connectivityMap/ConnectivityMap.cc +++ b/Castalia/src/node/application/connectivityMap/ConnectivityMap.cc @@ -27,9 +27,9 @@ void ConnectivityMap::startup() txInterval_perNode = packetsPerNode * packetSpacing; txInterval_total = (txInterval_perNode * totalSNnodes); - if (strtod(ev.getConfig()->getConfigValue("sim-time-limit"), NULL) < txInterval_total) { + if (strtod(cSimulation::getActiveEnvir()->getConfig()->getConfigValue("sim-time-limit"), NULL) < txInterval_total) { trace() << "ERROR: Total sim time should be at least = " << txInterval_total; - opp_error("\nError: simulation time not large enough for the conectivity map application\n"); + throw cRuntimeError("\nError: simulation time not large enough for the conectivity map application\n"); } double startTxTime = txInterval_perNode * self; diff --git a/Castalia/src/node/application/valueReporting/ValueReporting.cc b/Castalia/src/node/application/valueReporting/ValueReporting.cc index fe27cf4f..a5b4e28e 100644 --- a/Castalia/src/node/application/valueReporting/ValueReporting.cc +++ b/Castalia/src/node/application/valueReporting/ValueReporting.cc @@ -19,7 +19,7 @@ void ValueReporting::startup() maxSampleInterval = ((double)par("maxSampleInterval")) / 1000.0; minSampleInterval = ((double)par("minSampleInterval")) / 1000.0; currSentSampleSN = 0; - randomBackoffIntervalFraction = genk_dblrand(0); + randomBackoffIntervalFraction = getRNG(0)->doubleRand(); sentOnce = false; setTimer(REQUEST_SAMPLE, maxSampleInterval * randomBackoffIntervalFraction); } diff --git a/Castalia/src/node/communication/mac/VirtualMac.cc b/Castalia/src/node/communication/mac/VirtualMac.cc index 3a693181..bf360d8a 100644 --- a/Castalia/src/node/communication/mac/VirtualMac.cc +++ b/Castalia/src/node/communication/mac/VirtualMac.cc @@ -27,7 +27,7 @@ void VirtualMac::initialize() resMgrModule = check_and_cast (getParentModule()->getParentModule()->getSubmodule("ResourceManager")); if (!resMgrModule || !radioModule) - opp_error("\n Virtual Mac init: Error in geting a valid reference module(s)."); + throw cRuntimeError("\n Virtual Mac init: Error in geting a valid reference module(s)."); setTimerDrift(resMgrModule->getCPUClockDrift()); pktHistory.clear(); @@ -147,7 +147,7 @@ void VirtualMac::handleMessage(cMessage * msg) } default:{ - opp_error("MAC module received message of unknown kind %i", msgKind); + throw cRuntimeError("MAC module received message of unknown kind %i", msgKind); } } diff --git a/Castalia/src/node/communication/mac/baselineBanMac/BaselineBANMac.cc b/Castalia/src/node/communication/mac/baselineBanMac/BaselineBANMac.cc index c8490b6f..ceba03d7 100644 --- a/Castalia/src/node/communication/mac/baselineBanMac/BaselineBANMac.cc +++ b/Castalia/src/node/communication/mac/baselineBanMac/BaselineBANMac.cc @@ -31,7 +31,7 @@ void BaselineBANMac::startup() { } else { connectedHID = UNCONNECTED; connectedNID = UNCONNECTED; - unconnectedNID = 1 + genk_intrand(0,14); //we select random unconnected NID + unconnectedNID = 1 + getRNG(0)->intRand(14); //we select random unconnected NID trace() << "Selected random unconnected NID " << unconnectedNID; scheduledAccessLength = par("scheduledAccessLength"); scheduledAccessPeriod = par("scheduledAccessPeriod"); @@ -708,7 +708,7 @@ bool BaselineBANMac::isPacketForMe(BaselineMacPacket *pkt) { BaselineConnectionAssignmentPacket *connAssignment = check_and_cast(pkt); if (connAssignment->getRecipientAddress() != SELF_MAC_ADDRESS) { // the packet is not for us, but the NID is the same, so we need to choose a new one. - unconnectedNID = 1 + genk_intrand(0,14); + unconnectedNID = 1 + getRNG(0)->intRand(14); if (packetToBeSent) packetToBeSent->setNID(unconnectedNID); trace() << "Choosing NEW unconnectedNID = " << unconnectedNID; return false; @@ -722,7 +722,7 @@ bool BaselineBANMac::isPacketForMe(BaselineMacPacket *pkt) { pkt->getFrameSubtype() == B_ACK || pkt->getFrameSubtype() == B_ACK_POLL)) { if (packetToBeSent == NULL || currentPacketTransmissions == 0) { trace() << "While unconnected: ACK packet received with no packet to ack, renewing NID"; - unconnectedNID = 1 + genk_intrand(0,14); + unconnectedNID = 1 + getRNG(0)->intRand(14); if (packetToBeSent) packetToBeSent->setNID(unconnectedNID); trace() << "Choosing NEW unconnectedNID = " << unconnectedNID; return false; @@ -774,7 +774,7 @@ void BaselineBANMac::setHeaderFields(BaselineMacPacket * pkt, AcknowledgementPol */ void BaselineBANMac::attemptTxInRAP() { if (backoffCounter == 0) { - backoffCounter = 1 + genk_intrand(0,CW); + backoffCounter = 1 + getRNG(0)->intRand(CW); } trace() << "Starting to transmit " << packetToBeSent->getName() << " in RAP, backoffCounter " << backoffCounter; attemptingToTX = true; diff --git a/Castalia/src/node/communication/mac/mac802154/Basic802154.cc b/Castalia/src/node/communication/mac/mac802154/Basic802154.cc index 5d584501..4670e43b 100644 --- a/Castalia/src/node/communication/mac/mac802154/Basic802154.cc +++ b/Castalia/src/node/communication/mac/mac802154/Basic802154.cc @@ -83,18 +83,18 @@ void Basic802154::startup() // Coordinator initialisation if (isPANCoordinator) { if (!isFFD) { - opp_error("Only full-function devices (isFFD=true) can be PAN coordinators"); + throw cRuntimeError("Only full-function devices (isFFD=true) can be PAN coordinators"); } associatedPAN = SELF_MAC_ADDRESS; - macBSN = genk_intrand(0, 255) + 1; + macBSN = getRNG(0)->intRand( 255) + 1; //initialise frameOrder and beaconOrder frameOrder = par("frameOrder"); beaconOrder = par("beaconOrder"); if (frameOrder < 0 || beaconOrder < 0 || beaconOrder > 14 || frameOrder > 14 || beaconOrder < frameOrder) { - opp_error("Invalid combination of frameOrder and beaconOrder parameters. Must be 0 <= frameOrder <= beaconOrder <= 14"); + throw cRuntimeError("Invalid combination of frameOrder and beaconOrder parameters. Must be 0 <= frameOrder <= beaconOrder <= 14"); } beaconInterval = baseSuperframeDuration * (1 << beaconOrder); @@ -102,7 +102,7 @@ void Basic802154::startup() CAPlength = numSuperframeSlots; if (beaconInterval <= 0 || frameInterval <= 0) { - opp_error("Invalid parameter combination of baseSlotDuration and numSuperframeSlots"); + throw cRuntimeError("Invalid parameter combination of baseSlotDuration and numSuperframeSlots"); } setTimer(FRAME_START, 0); //frame start is NOW @@ -670,7 +670,7 @@ void Basic802154::attemptTransmission(const char * descr) void Basic802154::performCSMACA() { //generate a random delay, multiply it by backoff period length - int rnd = genk_intrand(1, (1 << BE) - 1) + 1; + int rnd = getRNG(1)->intRand( (1 << BE) - 1) + 1; simtime_t CCAtime = rnd * (unitBackoffPeriod * symbolLen); //if using slotted CSMA - need to locate backoff period boundary diff --git a/Castalia/src/node/communication/mac/tMac/TMAC.cc b/Castalia/src/node/communication/mac/tMac/TMAC.cc index b355f388..a3cba2ab 100644 --- a/Castalia/src/node/communication/mac/tMac/TMAC.cc +++ b/Castalia/src/node/communication/mac/tMac/TMAC.cc @@ -99,7 +99,7 @@ void TMAC::timerFiredCallback(int timer) * within the duration of 1 frame */ if (macState == MAC_STATE_SETUP) - setTimer(SYNC_CREATE, genk_dblrand(1) * frameTime); + setTimer(SYNC_CREATE, getRNG(1)->doubleRand() * frameTime); break; } @@ -326,7 +326,7 @@ void TMAC::resetDefaultState(const char *descr) performCarrierSense(MAC_CARRIER_SENSE_BEFORE_SLEEP); } } else if (primaryWakeup) { - simtime_t randomContentionInterval = genk_dblrand(1) * contentionPeriod; + simtime_t randomContentionInterval = getRNG(1)->doubleRand() * contentionPeriod; if (needResync) { if (syncPacket) cancelAndDelete(syncPacket); diff --git a/Castalia/src/node/communication/mac/tunableMac/TunableMAC.cc b/Castalia/src/node/communication/mac/tunableMac/TunableMAC.cc index 65775879..42de32fa 100644 --- a/Castalia/src/node/communication/mac/tunableMac/TunableMAC.cc +++ b/Castalia/src/node/communication/mac/tunableMac/TunableMAC.cc @@ -56,7 +56,7 @@ void TunableMAC::startup() break; } default:{ - opp_error("\n[TunableMAC]:\n Illegal value of parameter \"backoffType\" in omnetpp.ini."); + throw cRuntimeError("\n[TunableMAC]:\n Illegal value of parameter \"backoffType\" in omnetpp.ini."); break; } } @@ -128,7 +128,7 @@ void TunableMAC::handleCarrierSenseResult(int returnCode) * bigger than p (=CSMApersistence) then we do not * transmit but instead we carrier sense yet again. */ - if (CSMApersistance > 0 && CSMApersistance < genk_dblrand(1)){ + if (CSMApersistance > 0 && CSMApersistance < getRNG(1)->doubleRand()){ setTimer(START_CARRIER_SENSING, phyDelayForValidCS); break; } @@ -198,7 +198,7 @@ void TunableMAC::handleCarrierSenseResult(int returnCode) } } - backoffTimer = genk_dblrand(1) * backoffTimer; + backoffTimer = getRNG(1)->doubleRand() * backoffTimer; setTimer(START_CARRIER_SENSING, backoffTimer); trace() << "Channel busy, backing off for " << backoffTimer << " secs"; @@ -300,9 +300,9 @@ void TunableMAC::attemptTx() macState = MAC_STATE_CONTENDING; - if (genk_dblrand(0) < probTx) { + if (getRNG(0)->doubleRand() < probTx) { // This transmission attempt will happen after random offset - setTimer(START_CARRIER_SENSING, genk_dblrand(1) * randomTxOffset); + setTimer(START_CARRIER_SENSING, getRNG(1)->doubleRand() * randomTxOffset); trace() << "MAC_STATE_CONTENDING, attempt " << numTx - numTxTries +1 << "/" << numTx << " contending"; } else { // Move on to the next attempt after reTxInterval diff --git a/Castalia/src/node/communication/radio/Radio.cc b/Castalia/src/node/communication/radio/Radio.cc index 745c2cc8..a6f48144 100644 --- a/Castalia/src/node/communication/radio/Radio.cc +++ b/Castalia/src/node/communication/radio/Radio.cc @@ -366,7 +366,7 @@ void Radio::handleMessage(cMessage * msg) } default:{ - opp_error("\n[Radio_%d] t= %f: ERROR: received message [%s] of unknown type.\n", + throw cRuntimeError("\n[Radio_%d] t= %f: ERROR: received message [%s] of unknown type.\n", self, SIMTIME_DBL(simTime()), msg->getName()); break; } @@ -588,7 +588,7 @@ void Radio::completeStateTransition() } default:{ - opp_error("Internal Radio module error: bad state transition requested\n"); + throw cRuntimeError("Internal Radio module error: bad state transition requested\n"); } } } @@ -916,7 +916,7 @@ double Radio::SNR2BER(double SNR_dB) return (SNR_dB < IDEAL_MODULATION_THRESHOLD ? 1.0 : 0.0); default: - opp_error("Modulation type not defined"); + throw cRuntimeError("Modulation type not defined"); } return 1.0; } @@ -953,7 +953,7 @@ int Radio::bitErrors(double BER, int numOfBits, int maxBitErrorsAllowed) for (bitErrors = 0; bitErrors <= maxBitErrorsAllowed; bitErrors++) { double prob = probabilityOfExactly_N_Errors(BER, bitErrors, numOfBits); - if (genk_dblrand(0) <= prob / (1.0 - cumulativeProbabilityOfUnrealizedEvents)) + if (getRNG(0)->doubleRand() <= prob / (1.0 - cumulativeProbabilityOfUnrealizedEvents)) break; cumulativeProbabilityOfUnrealizedEvents += prob; if (bitErrors == maxBitErrorsAllowed) { @@ -998,7 +998,7 @@ void Radio::readIniFileParameters(void) else if (startingState.compare("SLEEP") == 0) changingToState = SLEEP; else - opp_error("Unknown basic state name '%s'\n", startingState.c_str()); + throw cRuntimeError("Unknown basic state name '%s'\n", startingState.c_str()); completeStateTransition(); // this will complete initialisation of the radio according to startingState parameter } @@ -1006,10 +1006,10 @@ void Radio::readIniFileParameters(void) void Radio::parseRadioParameterFile(const char *fileName) { if (strlen(fileName) == 0) - opp_error("Radio parameters file not specified"); + throw cRuntimeError("Radio parameters file not specified"); ifstream f(fileName); if (!f.is_open()) - opp_error("Error reading from radio parameters file %s\n", fileName); + throw cRuntimeError("Error reading from radio parameters file %s\n", fileName); string s; const char *ct; @@ -1051,7 +1051,7 @@ void Radio::parseRadioParameterFile(const char *fileName) visited[section] = 1; section = 5; } else if (section == -1 || visited[section] == 1) - opp_error("Bad syntax of radio parameters file, expecting label:\n%s", ct); + throw cRuntimeError("Bad syntax of radio parameters file, expecting label:\n%s", ct); else { if (section == 1) { // parsing lines in the following format: @@ -1062,50 +1062,50 @@ void Radio::parseRadioParameterFile(const char *fileName) cStringTokenizer t(s.c_str(), ", \t"); ct = t.nextToken(); //break the string with ',' delimiter if (ct == NULL) - opp_error("Bad syntax of radio parameters file, expecting rx mode name:\n%s", ct); + throw cRuntimeError("Bad syntax of radio parameters file, expecting rx mode name:\n%s", ct); rxmode.name = string(ct); ct = t.nextToken(); if (parseFloat(ct, &rxmode.datarate)) - opp_error("Bad syntax of radio parameters file, expecting data rate for rx mode %s:\n%s", + throw cRuntimeError("Bad syntax of radio parameters file, expecting data rate for rx mode %s:\n%s", rxmode.name.c_str(), ct); rxmode.datarate *= 1000.0; //convert kbps to bps ct = t.nextToken(); rxmode.modulation = parseModulationType(ct); ct = t.nextToken(); if (parseInt(ct, &rxmode.bitsPerSymbol)) - opp_error("Bad syntax of radio parameters file, expecting bits per symbol for rx mode %s:\n%s", + throw cRuntimeError("Bad syntax of radio parameters file, expecting bits per symbol for rx mode %s:\n%s", rxmode.name.c_str(), ct); ct = t.nextToken(); if (parseFloat(ct, &rxmode.bandwidth)) - opp_error("Bad syntax of radio parameters file, expecting bandwidth for rx mode %s:\n%s", + throw cRuntimeError("Bad syntax of radio parameters file, expecting bandwidth for rx mode %s:\n%s", rxmode.name.c_str(), ct); ct = t.nextToken(); if (parseFloat(ct, &rxmode.noiseBandwidth)) - opp_error("Bad syntax of radio parameters file, expecting noise bandwidth for rx mode %s:\n%s", + throw cRuntimeError("Bad syntax of radio parameters file, expecting noise bandwidth for rx mode %s:\n%s", rxmode.name.c_str(), ct); rxmode.noiseBandwidth *= 1000.0; //convert kHz to Hz ct = t.nextToken(); if (parseFloat(ct, &rxmode.noiseFloor)) - opp_error("Bad syntax of radio parameters file, expecting noise floor for rx mode %s:\n%s", + throw cRuntimeError("Bad syntax of radio parameters file, expecting noise floor for rx mode %s:\n%s", rxmode.name.c_str(), ct); ct = t.nextToken(); if (parseFloat(ct, &rxmode.sensitivity)) - opp_error("Bad syntax of radio parameters file, expecting sensitivity for rx mode %s:\n%s", + throw cRuntimeError("Bad syntax of radio parameters file, expecting sensitivity for rx mode %s:\n%s", rxmode.name.c_str(), ct); ct = t.nextToken(); if (parseFloat(ct, &rxmode.power)) - opp_error("Bad syntax of radio parameters file, expecting power for rx mode %s:\n%s", + throw cRuntimeError("Bad syntax of radio parameters file, expecting power for rx mode %s:\n%s", rxmode.name.c_str(), ct); ct = t.nextToken(); if (ct != NULL) - opp_error("Bad syntax of radio parameters file, unexpected input for rx mode %s:\n%s", + throw cRuntimeError("Bad syntax of radio parameters file, unexpected input for rx mode %s:\n%s", rxmode.name.c_str(), ct); list::iterator it1; for (it1 = RXmodeList.begin(); it1 != RXmodeList.end(); it1++) { if (rxmode.name.compare(it1->name) == 0) - opp_error("Bad syntax of radio parameters file, duplicate RX mode %s", + throw cRuntimeError("Bad syntax of radio parameters file, duplicate RX mode %s", rxmode.name.c_str()); } RXmodeList.push_back(rxmode); @@ -1118,7 +1118,7 @@ void Radio::parseRadioParameterFile(const char *fileName) cStringTokenizer t(s.c_str(), ", \t"); ct = t.nextToken(); if (ct == NULL) - opp_error("Bad syntax of radio parameters file, expecting Tx_dBm or Tx_mW label"); + throw cRuntimeError("Bad syntax of radio parameters file, expecting Tx_dBm or Tx_mW label"); int type = 0; //1->dbM, 2->mW if (strncmp(ct, "Tx_dBm", strlen("Tx_dBm")) == 0) @@ -1126,14 +1126,14 @@ void Radio::parseRadioParameterFile(const char *fileName) else if (strncmp(ct, "Tx_mW", strlen("Tx_mW")) == 0) type = 2; else - opp_error("Bad syntax of radio parameters file, expecting Tx_dBm or Tx_mW label:\n%s", ct); + throw cRuntimeError("Bad syntax of radio parameters file, expecting Tx_dBm or Tx_mW label:\n%s", ct); if (TxLevelList.empty()) { // will insert new elements while ((ct = t.nextToken())) { TxLevel_type txlevel; double tmp; if (parseFloat(ct, &tmp)) - opp_error("Bad syntax of radio parameters file, expecting power value for tx level:\n%s", ct); + throw cRuntimeError("Bad syntax of radio parameters file, expecting power value for tx level:\n%s", ct); if (type == 1) txlevel.txOutputPower = tmp; else @@ -1146,16 +1146,16 @@ void Radio::parseRadioParameterFile(const char *fileName) ct = t.nextToken(); double tmp; if (ct == NULL) - opp_error("Bad syntax of radio parameters file, expecting number of elements in Tx_dBm list and tx_mW list must be equal"); + throw cRuntimeError("Bad syntax of radio parameters file, expecting number of elements in Tx_dBm list and tx_mW list must be equal"); if (parseFloat(ct, &tmp)) - opp_error("Bad syntax of radio parameters file, expecting power value for tx level:\n%s", ct); + throw cRuntimeError("Bad syntax of radio parameters file, expecting power value for tx level:\n%s", ct); if (type == 1) it1->txOutputPower = tmp; else it1->txPowerConsumed = tmp; } if (t.nextToken() != NULL) - opp_error("Bad syntax of radio parameters file, expecting number of elements in Tx_dBm list and tx_mW list must be equal"); + throw cRuntimeError("Bad syntax of radio parameters file, expecting number of elements in Tx_dBm list and tx_mW list must be equal"); } } else if (section == 3) { @@ -1169,28 +1169,28 @@ void Radio::parseRadioParameterFile(const char *fileName) ct = t.nextToken(); if (parseFloat(ct, &sleeplvl.power)) - opp_error("Bad syntax of radio parameters file, expecting power for sleep level %s:\n%s", + throw cRuntimeError("Bad syntax of radio parameters file, expecting power for sleep level %s:\n%s", sleeplvl.name.c_str(), ct); ct = t.nextToken(); if (sleepLevelList.empty()) { //this is the first element, to txUp should be '-' if (ct[0] != '-' || ct[1]) - opp_error("Bad syntax of radio parameters file, expecting '-' as transition up delay for sleep level %s:\n%s", + throw cRuntimeError("Bad syntax of radio parameters file, expecting '-' as transition up delay for sleep level %s:\n%s", sleeplvl.name.c_str(), ct); ct = t.nextToken(); if (ct[0] != '-' || ct[1]) - opp_error("Bad syntax of radio parameters file, expecting '-' as transition up power for sleep level %s:\n%s", + throw cRuntimeError("Bad syntax of radio parameters file, expecting '-' as transition up power for sleep level %s:\n%s", sleeplvl.name.c_str(), ct); sleeplvl.transitionUp.delay = 0.0; sleeplvl.transitionUp.power = 0.0; } else { //this is not the first element, so parse txUp if (parseFloat(ct, &sleeplvl.transitionUp.delay)) - opp_error("Bad syntax of radio parameters file, expecting transition up delay for sleep level %s:\n%s", + throw cRuntimeError("Bad syntax of radio parameters file, expecting transition up delay for sleep level %s:\n%s", sleeplvl.name.c_str(), ct); sleeplvl.transitionUp.delay /= 1000.0; // convert msec to sec ct = t.nextToken(); if (parseFloat(ct, &sleeplvl.transitionUp.power)) - opp_error("Bad syntax of radio parameters file, expecting transition up power for sleep level %s:\n%s", + throw cRuntimeError("Bad syntax of radio parameters file, expecting transition up power for sleep level %s:\n%s", sleeplvl.name.c_str(), ct); } @@ -1199,24 +1199,24 @@ void Radio::parseRadioParameterFile(const char *fileName) visited[section] = 1; ct = t.nextToken(); if (ct[0] != '-' || ct[1]) - opp_error("Bad syntax of radio parameters file, expecting '-' as transition down power for sleep level %s:\n%s", + throw cRuntimeError("Bad syntax of radio parameters file, expecting '-' as transition down power for sleep level %s:\n%s", sleeplvl.name.c_str(), ct); sleeplvl.transitionDown.delay = 0.0; sleeplvl.transitionDown.power = 0.0; } else { if (parseFloat(ct, &sleeplvl.transitionDown.delay)) - opp_error("Bad syntax of radio parameters file, expecting transition down delay for sleep level %s:\n%s", + throw cRuntimeError("Bad syntax of radio parameters file, expecting transition down delay for sleep level %s:\n%s", sleeplvl.name.c_str(), ct); sleeplvl.transitionDown.delay /= 1000.0; // convert msec to sec ct = t.nextToken(); if (parseFloat(ct, &sleeplvl.transitionDown.power)) - opp_error("Bad syntax of radio parameters file, expecting transition down power for sleep level %s:\n%s", + throw cRuntimeError("Bad syntax of radio parameters file, expecting transition down power for sleep level %s:\n%s", sleeplvl.name.c_str(), ct); } ct = t.nextToken(); if (ct != NULL) - opp_error("Bad syntax of radio parameters file, unexpected input for sleep level %s:\n%s", + throw cRuntimeError("Bad syntax of radio parameters file, unexpected input for sleep level %s:\n%s", sleeplvl.name.c_str(), ct); sleepLevelList.push_back(sleeplvl); @@ -1239,12 +1239,12 @@ void Radio::parseRadioParameterFile(const char *fileName) while (stateFrom < 3) { if (stateTo == stateFrom) { if (ct[0] != '-' || ct[1]) - opp_error("Bad syntax of radio parameters file, expecting '-' as state transition value from %i to %i:\n%s", + throw cRuntimeError("Bad syntax of radio parameters file, expecting '-' as state transition value from %i to %i:\n%s", stateFrom, stateTo, ct); } else { double tmp; if (parseFloat(ct, &tmp)) - opp_error("Bad syntax of radio parameters file, expecting state transition value from %i to %i:\n%s", + throw cRuntimeError("Bad syntax of radio parameters file, expecting state transition value from %i to %i:\n%s", stateFrom, stateTo, ct); if (section == 4) transition[stateFrom][stateTo].delay = tmp / 1000.0; //convert msec to sec @@ -1255,7 +1255,7 @@ void Radio::parseRadioParameterFile(const char *fileName) ct = t.nextToken(); } if (ct != NULL) - opp_error("Bad syntax of radio parameters file, unexpected input for transition matrix:\n%s", ct); + throw cRuntimeError("Bad syntax of radio parameters file, unexpected input for transition matrix:\n%s", ct); } } } @@ -1276,7 +1276,7 @@ Modulation_type Radio::parseModulationType(const char *c) return DIFFBPSK; if (modulation.compare("DIFFQPSK") == 0) return DIFFQPSK; - opp_error("Unknown modulation type parameter: '%s'\n", c); + throw cRuntimeError("Unknown modulation type parameter: '%s'\n", c); return CUSTOM; } @@ -1293,7 +1293,7 @@ Encoding_type Radio::parseEncodingType(const char *c) return MANCHESTER; if (encodingStr.compare("SECDEC")) return SECDEC; - opp_error("Unknown encoding type parameter: '%s'\n", c); + throw cRuntimeError("Unknown encoding type parameter: '%s'\n", c); return NRZ; } @@ -1308,7 +1308,7 @@ list::iterator Radio::parseRxMode(string modeName) if (modeName.compare(it1->name) == 0) return it1; } - opp_error("Unknown radio RX mode %s", modeName.c_str()); + throw cRuntimeError("Unknown radio RX mode %s", modeName.c_str()); return RXmodeList.end(); } @@ -1318,7 +1318,7 @@ list::iterator Radio::parseTxLevel(string txPower) return TxLevelList.begin(); double txPower_dBm; if (parseFloat(txPower.c_str(), &txPower_dBm)) - opp_error("Unable to parse TxOutputPower %s", txPower.c_str()); + throw cRuntimeError("Unable to parse TxOutputPower %s", txPower.c_str()); return parseTxLevel(txPower_dBm); } @@ -1329,7 +1329,7 @@ list::iterator Radio::parseTxLevel(double txPower) if (it1->txOutputPower == txPower) return it1; } - opp_error("Unknown Tx Output Power Level %f", txPower); + throw cRuntimeError("Unknown Tx Output Power Level %f", txPower); return TxLevelList.end(); } @@ -1343,7 +1343,7 @@ list::iterator Radio::parseSleepLevel(string sleepLevelName) if (sleepLevelName.compare(it1->name) == 0) return it1; } - opp_error("Unknown radio sleep level %s", sleepLevelName.c_str()); + throw cRuntimeError("Unknown radio sleep level %s", sleepLevelName.c_str()); return sleepLevelList.end(); } diff --git a/Castalia/src/node/communication/radio/RadioSupportFunctions.cc b/Castalia/src/node/communication/radio/RadioSupportFunctions.cc index b77f07cb..f2e116e1 100644 --- a/Castalia/src/node/communication/radio/RadioSupportFunctions.cc +++ b/Castalia/src/node/communication/radio/RadioSupportFunctions.cc @@ -288,7 +288,7 @@ double probabilityOfExactly_N_Errors(double BER, int errors, int numOfBits) RadioControlCommand *createRadioCommand(RadioControlCommand_type kind, double value) { if (kind != SET_TX_OUTPUT && kind != SET_CARRIER_FREQ && kind != SET_CCA_THRESHOLD) - opp_error("incorrect usage of createRadioCommand, double argument is only compatible with SET_TX_OUTPUT, SET_CCA_THRESHOLD or SET_CARRIER_FREQ"); + throw cRuntimeError("incorrect usage of createRadioCommand, double argument is only compatible with SET_TX_OUTPUT, SET_CCA_THRESHOLD or SET_CARRIER_FREQ"); RadioControlCommand *cmd = new RadioControlCommand("Radio control command", RADIO_CONTROL_COMMAND); cmd->setRadioControlCommandKind(kind); cmd->setParameter(value); @@ -298,7 +298,7 @@ RadioControlCommand *createRadioCommand(RadioControlCommand_type kind, double va RadioControlCommand *createRadioCommand(RadioControlCommand_type kind,const char *name) { if (kind != SET_MODE && kind != SET_SLEEP_LEVEL) - opp_error("incorrect usage of createRadioCommand, string argument is only compatible with SET_MODE or SET_SLEEP_LEVEL"); + throw cRuntimeError("incorrect usage of createRadioCommand, string argument is only compatible with SET_MODE or SET_SLEEP_LEVEL"); RadioControlCommand *cmd = new RadioControlCommand("Radio control command", RADIO_CONTROL_COMMAND); cmd->setRadioControlCommandKind(kind); cmd->setName(name); @@ -308,7 +308,7 @@ RadioControlCommand *createRadioCommand(RadioControlCommand_type kind,const char RadioControlCommand *createRadioCommand(RadioControlCommand_type kind, BasicState_type state) { if (kind != SET_STATE) - opp_error("incorrect usage of createRadioCommand, double argument is only compatible with SET_TX_OUTPUT or SET_CARRIER_FREQ"); + throw cRuntimeError("incorrect usage of createRadioCommand, double argument is only compatible with SET_TX_OUTPUT or SET_CARRIER_FREQ"); RadioControlCommand *cmd = new RadioControlCommand("Radio control command", RADIO_CONTROL_COMMAND); cmd->setRadioControlCommandKind(kind); cmd->setState(state); @@ -318,7 +318,7 @@ RadioControlCommand *createRadioCommand(RadioControlCommand_type kind, BasicStat RadioControlCommand *createRadioCommand(RadioControlCommand_type kind) { if (kind != SET_CS_INTERRUPT_ON && kind != SET_CS_INTERRUPT_OFF) - opp_error("incorrect usage of createRadioCommand, no argument is only compatible with SET_CS_INTERRUPT_OFF or SET_CS_INTERRUPT_ON"); + throw cRuntimeError("incorrect usage of createRadioCommand, no argument is only compatible with SET_CS_INTERRUPT_OFF or SET_CS_INTERRUPT_ON"); RadioControlCommand *cmd = new RadioControlCommand("Radio control command", RADIO_CONTROL_COMMAND); cmd->setRadioControlCommandKind(kind); return cmd; diff --git a/Castalia/src/node/communication/routing/VirtualRouting.cc b/Castalia/src/node/communication/routing/VirtualRouting.cc index 7998d3c3..deb757f8 100644 --- a/Castalia/src/node/communication/routing/VirtualRouting.cc +++ b/Castalia/src/node/communication/routing/VirtualRouting.cc @@ -24,7 +24,7 @@ void VirtualRouting::initialize() resMgrModule = check_and_cast (getParentModule()->getParentModule()->getSubmodule("ResourceManager")); if (!resMgrModule || !radioModule) - opp_error("\n Virtual Routing init: Error in geting a valid reference module(s)."); + throw cRuntimeError("\n Virtual Routing init: Error in geting a valid reference module(s)."); self = getParentModule()->getParentModule()->getIndex(); // create the routing level address using self @@ -44,7 +44,7 @@ void VirtualRouting::initialize() void VirtualRouting::toMacLayer(cMessage * msg) { if (msg->getKind() == NETWORK_LAYER_PACKET) - opp_error("toMacLayer() function used incorrectly to send NETWORK_LAYER_PACKET without destination MAC address"); + throw cRuntimeError("toMacLayer() function used incorrectly to send NETWORK_LAYER_PACKET without destination MAC address"); send(msg, "toMacModule"); } @@ -181,7 +181,7 @@ void VirtualRouting::handleMessage(cMessage * msg) } default:{ - opp_error("Network module recieved unexpected message: [%s]", msg->getName()); + throw cRuntimeError("Network module recieved unexpected message: [%s]", msg->getName()); } } diff --git a/Castalia/src/node/communication/routing/multipathRingsRouting/MultipathRingsRouting.cc b/Castalia/src/node/communication/routing/multipathRingsRouting/MultipathRingsRouting.cc index 60e183de..9b6b908c 100644 --- a/Castalia/src/node/communication/routing/multipathRingsRouting/MultipathRingsRouting.cc +++ b/Castalia/src/node/communication/routing/multipathRingsRouting/MultipathRingsRouting.cc @@ -24,7 +24,7 @@ void MultipathRingsRouting::startup() if (appModule->hasPar("isSink")) isSink = appModule->par("isSink"); else - opp_error("\nMultiPathRings routing has to be used with an application that defines the parameter isSink"); + throw cRuntimeError("\nMultiPathRings routing has to be used with an application that defines the parameter isSink"); currentLevel = tmpLevel = isSink ? 0 : NO_LEVEL; currentSinkID = tmpSinkID = isSink ? self : NO_SINK; diff --git a/Castalia/src/node/mobilityManager/VirtualMobilityManager.cc b/Castalia/src/node/mobilityManager/VirtualMobilityManager.cc index ad7ce769..517c627a 100644 --- a/Castalia/src/node/mobilityManager/VirtualMobilityManager.cc +++ b/Castalia/src/node/mobilityManager/VirtualMobilityManager.cc @@ -22,10 +22,10 @@ void VirtualMobilityManager::initialize() wchannel = network->getSubmodule("wirelessChannel"); if (!network) - opp_error("Unable to obtain SN pointer for deployment parameter"); + throw cRuntimeError("Unable to obtain SN pointer for deployment parameter"); if (!wchannel) - opp_error("Unable to obtain wchannel pointer"); + throw cRuntimeError("Unable to obtain wchannel pointer"); parseDeployment(); trace() << "initial location(x:y:z) is " << nodeLocation.x << ":" << @@ -53,17 +53,17 @@ void VirtualMobilityManager::parseDeployment() { if (c[0] && c[0] == '[') { c++; if (!c[0] || c[0] < '0' || c[0] > '9') - opp_error("Bad syntax of SN.deployment parameter: expecing a digit at\n%s", c); + throw cRuntimeError("Bad syntax of SN.deployment parameter: expecing a digit at\n%s", c); start_range = strtol(c, &c, 10); if (!c[0] || (c[0] != ']' && c[0] != '.')) - opp_error("Bad syntax of SN.deployment parameter: expecing a ']' or '.' at\n%s", c); + throw cRuntimeError("Bad syntax of SN.deployment parameter: expecing a ']' or '.' at\n%s", c); if (c[0] == ']' && start_range != index) { ct = t.nextToken(); continue; } else if (c[0] == '.' && c[1] && c[1] == '.') { c += 2; if (c[0] < '0' || c[0] > '9') - opp_error("Bad syntax of SN.deployment parameter: expecing a digit at\n%s", c); + throw cRuntimeError("Bad syntax of SN.deployment parameter: expecing a digit at\n%s", c); end_range = strtol(c, &c, 10); if (index > end_range || index < start_range) { ct = t.nextToken(); @@ -71,10 +71,10 @@ void VirtualMobilityManager::parseDeployment() { } } if (!c[0] || c[0] != ']') - opp_error("Bad syntax of SN.deployment parameter: expecing a ']' at\n%s", c); + throw cRuntimeError("Bad syntax of SN.deployment parameter: expecing a ']' at\n%s", c); c++; if (c[0] != '-' || !c[1] || c[1] != '>') - opp_error("Bad syntax of SN.deployment parameter: expecing a '->' at\n%s", c); + throw cRuntimeError("Bad syntax of SN.deployment parameter: expecing a '->' at\n%s", c); c += 2; } else { start_range = 0; @@ -99,15 +99,15 @@ void VirtualMobilityManager::parseDeployment() { int gridx, gridy, gridz, gridi; gridi = index - start_range; if (c[0] < '0' || c[0] > '9') - opp_error("Bad syntax of SN.deployment parameter: expecing 'uniform', 'center', 'NxN[xN]' or 'randomized_NxN[xN]' at\n%s", c); + throw cRuntimeError("Bad syntax of SN.deployment parameter: expecing 'uniform', 'center', 'NxN[xN]' or 'randomized_NxN[xN]' at\n%s", c); gridx = strtol(c, &c, 10); if (c[0] != 'x' || !c[1] || c[1] < '0' || c[1] > '9') - opp_error("Bad syntax of SN.deployment parameter: expecing 'x' followed by a digit at\n%s", c); + throw cRuntimeError("Bad syntax of SN.deployment parameter: expecing 'x' followed by a digit at\n%s", c); c++; gridy = strtol(c, &c, 10); if (c[0]) { if (c[0] != 'x' || !c[1] || c[1] < '0' || c[1] > '9') { - opp_error("Bad syntax of SN.deployment parameter: expecing 'x' followed by a digit at\n%s", c); + throw cRuntimeError("Bad syntax of SN.deployment parameter: expecing 'x' followed by a digit at\n%s", c); } else { c++; gridz = strtol(c, &c, 10); diff --git a/Castalia/src/node/mobilityManager/noMobilityManager/NoMobilityManager.cc b/Castalia/src/node/mobilityManager/noMobilityManager/NoMobilityManager.cc index 1668e09e..23c85f37 100644 --- a/Castalia/src/node/mobilityManager/noMobilityManager/NoMobilityManager.cc +++ b/Castalia/src/node/mobilityManager/noMobilityManager/NoMobilityManager.cc @@ -10,7 +10,7 @@ * * ****************************************************************************/ -" +#include "node/mobilityManager/noMobilityManager/NoMobilityManager.h" Define_Module(NoMobilityManager); diff --git a/Castalia/src/node/resourceManager/ResourceManager.cc b/Castalia/src/node/resourceManager/ResourceManager.cc index 13533475..6f8a71c3 100644 --- a/Castalia/src/node/resourceManager/ResourceManager.cc +++ b/Castalia/src/node/resourceManager/ResourceManager.cc @@ -37,7 +37,7 @@ void ResourceManager::initialize() periodicEnergyCalculationInterval = (double)par("periodicEnergyCalculationInterval") / 1000; if (baselineNodePower < 0 || periodicEnergyCalculationInterval < 0) - opp_error("Illegal values for baselineNodePower and/or periodicEnergyCalculationInterval in resource manager module"); + throw cRuntimeError("Illegal values for baselineNodePower and/or periodicEnergyCalculationInterval in resource manager module"); currentNodePower = baselineNodePower; remainingEnergy = initialEnergy; @@ -96,7 +96,7 @@ void ResourceManager::handleMessage(cMessage * msg) } default:{ - opp_error("ERROR: Unexpected message received by resource manager: %s", msg->getKind()); + throw cRuntimeError("ERROR: Unexpected message received by resource manager: %s", msg->getKind()); } } delete msg; diff --git a/Castalia/src/node/sensorManager/SensorManager.cc b/Castalia/src/node/sensorManager/SensorManager.cc index b012235c..90ab0e7a 100644 --- a/Castalia/src/node/sensorManager/SensorManager.cc +++ b/Castalia/src/node/sensorManager/SensorManager.cc @@ -257,7 +257,7 @@ void SensorManager::parseStringParams(void) || (dSz != totalSensors) || (eSz != totalSensors) || (fSz != totalSensors) || (mSz != totalSensors) || (rSz != totalSensors) || (sSz != totalSensors)) - opp_error("\n[Sensor Device Manager]: The parameters of the sensor device manager are not initialized correctly in omnet.ini file."); + throw cRuntimeError("\n[Sensor Device Manager]: The parameters of the sensor device manager are not initialized correctly in omnet.ini file."); } double SensorManager::getSensorDeviceBias(int index) diff --git a/Castalia/src/physicalProcess/carsPhysicalProcess/CarsPhysicalProcess.cc b/Castalia/src/physicalProcess/carsPhysicalProcess/CarsPhysicalProcess.cc index 1275d5f1..47b9bd8f 100644 --- a/Castalia/src/physicalProcess/carsPhysicalProcess/CarsPhysicalProcess.cc +++ b/Castalia/src/physicalProcess/carsPhysicalProcess/CarsPhysicalProcess.cc @@ -34,7 +34,7 @@ void CarsPhysicalProcess::initialize() } } - double arrival = genk_dblrand(0) * car_interarrival + car_interarrival / 2; + double arrival = getRNG(0)->doubleRand() * car_interarrival + car_interarrival / 2; trace() << "First car arrival at " << arrival; scheduleAt(arrival, new cMessage("New car arrival message", TIMER_SERVICE)); @@ -66,7 +66,7 @@ void CarsPhysicalProcess::handleMessage(cMessage * msg) if (pos != -1) { trace() << "New car arrives on the bridge, index " << pos; - if (genk_dblrand(0) > 0.5) { + if (getRNG(0)->doubleRand() > 0.5) { sources_snapshots[pos][0].x = point1_x_coord; sources_snapshots[pos][0].y = point1_y_coord; sources_snapshots[pos][1].x = point2_x_coord; @@ -82,13 +82,13 @@ void CarsPhysicalProcess::handleMessage(cMessage * msg) collectOutput("Cars generated on the road"); } - double arrival = genk_dblrand(0) * car_interarrival + car_interarrival / 2; + double arrival = getRNG(0)->doubleRand() * car_interarrival + car_interarrival / 2; scheduleAt(simTime() + arrival, msg); return; } default: { - opp_error(":\n Physical Process received message other than PHYSICAL_PROCESS_SAMPLING"); + throw cRuntimeError(":\n Physical Process received message other than PHYSICAL_PROCESS_SAMPLING"); } } } diff --git a/Castalia/src/physicalProcess/customizablePhysicalProcess/CustomizablePhysicalProcess.cc b/Castalia/src/physicalProcess/customizablePhysicalProcess/CustomizablePhysicalProcess.cc index 23ca06f5..4c931bf6 100644 --- a/Castalia/src/physicalProcess/customizablePhysicalProcess/CustomizablePhysicalProcess.cc +++ b/Castalia/src/physicalProcess/customizablePhysicalProcess/CustomizablePhysicalProcess.cc @@ -27,7 +27,7 @@ void CustomizablePhysicalProcess::initialize() void CustomizablePhysicalProcess::handleMessage(cMessage * msg) { if (msg->getKind() != PHYSICAL_PROCESS_SAMPLING) - opp_error("Physical Process received message other than PHYSICAL_PROCESS_SAMPLING"); + throw cRuntimeError("Physical Process received message other than PHYSICAL_PROCESS_SAMPLING"); PhysicalProcessMessage *receivedMsg = check_and_cast < PhysicalProcessMessage * >(msg); int nodeIndex = receivedMsg->getSrcID(); @@ -98,7 +98,7 @@ void CustomizablePhysicalProcess::readIniFileParameters(void) } default: { - opp_error("\nError! Illegal value of parameter \"inputType\" of CustomizablePhysicalProcess module.\n"); + throw cRuntimeError("\nError! Illegal value of parameter \"inputType\" of CustomizablePhysicalProcess module.\n"); } } @@ -116,12 +116,12 @@ void CustomizablePhysicalProcess::readIniFileParameters(void) string::size_type posB = token.find(")", 0); if ((posA != 0) || (posB == string::npos)) - opp_error("\nError!(A) Illegal parameter format \"directNodeValueAssignment\" of CustomizablePhysicalProcess module.\n"); + throw cRuntimeError("\nError!(A) Illegal parameter format \"directNodeValueAssignment\" of CustomizablePhysicalProcess module.\n"); token = token.substr(1, token.size() - 1); if (token.size() < 1) - opp_error("\nError!(B) Illegal parameter format \"directNodeValueAssignment\" of CustomizablePhysicalProcess module.\n"); + throw cRuntimeError("\nError!(B) Illegal parameter format \"directNodeValueAssignment\" of CustomizablePhysicalProcess module.\n"); defaultValue = atof(token.c_str()); valuesTable = new double[numNodes]; @@ -134,7 +134,7 @@ void CustomizablePhysicalProcess::readIniFileParameters(void) if (tokenSize >= 3) { if ((posA == string::npos) || (posA == 0) || (posA == tokenSize - 1)) - opp_error("\nError! Illegal parameter format \"directNodeValueAssignment\" of CustomizablePhysicalProcess module.\n"); + throw cRuntimeError("\nError! Illegal parameter format \"directNodeValueAssignment\" of CustomizablePhysicalProcess module.\n"); string tokA; string tokB; @@ -145,7 +145,7 @@ void CustomizablePhysicalProcess::readIniFileParameters(void) double nodeVal = atof(tokB.c_str()); if (nodeId < 0 || nodeId > numNodes - 1) - opp_error("\nError! Illegal parameter format \"directNodeValueAssignment\" of CustomizablePhysicalProcess module.\n"); + throw cRuntimeError("\nError! Illegal parameter format \"directNodeValueAssignment\" of CustomizablePhysicalProcess module.\n"); valuesTable[nodeId] = nodeVal; } @@ -159,7 +159,7 @@ void CustomizablePhysicalProcess::readIniFileParameters(void) description = par("description"); numSources = par("numSources"); if (numSources > 5) - opp_error("Physical Process parameter \"numSources\" has been initialized with invalid value \"%d\"", + throw cRuntimeError("Physical Process parameter \"numSources\" has been initialized with invalid value \"%d\"", numSources); /* @@ -202,25 +202,25 @@ void CustomizablePhysicalProcess::readScenariosFromIniFile(void) if (valuesTokenizer.hasMoreTokens()) { //get each one of the snapshot parameters sources_snapshots[i][j].time = (simtime_t) atof(valuesTokenizer.nextToken()); if (!valuesTokenizer.hasMoreTokens()) - opp_error("\nPhysical Process parameter error. Malformed parameter : source_%d\n", i); + throw cRuntimeError("\nPhysical Process parameter error. Malformed parameter : source_%d\n", i); sources_snapshots[i][j].x = atof(valuesTokenizer.nextToken()); if (!valuesTokenizer.hasMoreTokens()) - opp_error("\nPhysical Process parameter error. Malformed parameter : source_%d\n", i); + throw cRuntimeError("\nPhysical Process parameter error. Malformed parameter : source_%d\n", i); sources_snapshots[i][j].y = atof(valuesTokenizer.nextToken()); if (!valuesTokenizer.hasMoreTokens()) - opp_error("\nPhysical Process parameter error. Malformed parameter : source_%d\n", i); + throw cRuntimeError("\nPhysical Process parameter error. Malformed parameter : source_%d\n", i); sources_snapshots[i][j].value = atof(valuesTokenizer.nextToken()); if (valuesTokenizer.hasMoreTokens()) - opp_error("\nPhysical Process parameter error. Malformed parameter : source_%d\n", i); + throw cRuntimeError("\nPhysical Process parameter error. Malformed parameter : source_%d\n", i); } j++; } if (j > max_num_snapshots) - opp_error("\nPhysical Process intialization ERROR! You tried to pass more snapshots than the parameter \"max_num_snapshots\" specifies."); + throw cRuntimeError("\nPhysical Process intialization ERROR! You tried to pass more snapshots than the parameter \"max_num_snapshots\" specifies."); } } diff --git a/Castalia/src/wirelessChannel/defaultChannel/WirelessChannel.cc b/Castalia/src/wirelessChannel/defaultChannel/WirelessChannel.cc index 2835ec14..45e0dd54 100644 --- a/Castalia/src/wirelessChannel/defaultChannel/WirelessChannel.cc +++ b/Castalia/src/wirelessChannel/defaultChannel/WirelessChannel.cc @@ -94,11 +94,11 @@ void WirelessChannel::initialize(int stage) **************************************************************/ nodeLocation = new NodeLocation_type[numOfNodes]; if (nodeLocation == NULL) - opp_error("Could not allocate array nodeLocation\n"); + throw cRuntimeError("Could not allocate array nodeLocation\n"); cellOccupation = new list[numOfSpaceCells]; if (cellOccupation == NULL) - opp_error("Could not allocate array cellOccupation\n"); + throw cRuntimeError("Could not allocate array cellOccupation\n"); cTopology *topo; // temp variable to access initial location of the nodes topo = new cTopology("topo"); @@ -151,7 +151,7 @@ void WirelessChannel::initialize(int stage) int cell = zIndex * zIndexIncrement + yIndex * yIndexIncrement + xIndex * xIndexIncrement; if (cell < 0 || cell >= numOfSpaceCells) { - opp_error("Cell out of bounds for node %i, please check your mobility module settings\n", i); + throw cRuntimeError("Cell out of bounds for node %i, please check your mobility module settings\n", i); } nodeLocation[i].cell = cell; @@ -171,7 +171,7 @@ void WirelessChannel::initialize(int stage) **********************************************/ pathLoss = new list[numOfSpaceCells]; if (pathLoss == NULL) - opp_error("Could not allocate array pathLoss\n"); + throw cRuntimeError("Could not allocate array pathLoss\n"); int elementSize = sizeof(PathLossElement) + 3 * sizeof(PathLossElement *); int totalElements = 0; //keep track of pathLoss size for reporting purposes @@ -270,7 +270,7 @@ void WirelessChannel::initialize(int stage) *********************************************************************/ nodesAffectedByTransmitter = new list[numOfNodes]; if (nodesAffectedByTransmitter == NULL) - opp_error("Could not allocate array nodesAffectedByTransmitter\n"); + throw cRuntimeError("Could not allocate array nodesAffectedByTransmitter\n"); /************************************************************ * If direct assignment of link qualities is given at the @@ -281,7 +281,7 @@ void WirelessChannel::initialize(int stage) /* Create temporal model object from parameters file (if given) */ if (strlen(temporalModelParametersFile) > 0) { - temporalModel = new channelTemporalModel(temporalModelParametersFile, 2); + temporalModel = new channelTemporalModel(temporalModelParametersFile, getRNG(2)); temporalModelDefined = true; } else { temporalModelDefined = false; @@ -314,7 +314,7 @@ void WirelessChannel::handleMessage(cMessage * msg) *****************************************************/ if (onlyStaticNodes) - opp_error("Error: Rerceived WS_NODE_MOVEMENT msg, while onlyStaticNodes is TRUE"); + throw cRuntimeError("Error: Rerceived WS_NODE_MOVEMENT msg, while onlyStaticNodes is TRUE"); int oldCell = nodeLocation[srcAddr].cell; nodeLocation[srcAddr].x = mobilityMsg->getX(); @@ -325,7 +325,7 @@ void WirelessChannel::handleMessage(cMessage * msg) if ((nodeLocation[srcAddr].x < 0.0) || (nodeLocation[srcAddr].y < 0.0) || (nodeLocation[srcAddr].z < 0.0)) - opp_error("Wireless channel received faulty WC_NODE_MOVEMENT msg. We cannot have negative node coordinates"); + throw cRuntimeError("Wireless channel received faulty WC_NODE_MOVEMENT msg. We cannot have negative node coordinates"); int xIndex = (int)floor(nodeLocation[srcAddr].x / xFieldSize * numOfXCells); if (((xIndex - 1) * xCellSize) >= nodeLocation[srcAddr].x) @@ -454,7 +454,7 @@ void WirelessChannel::handleMessage(cMessage * msg) } default:{ - opp_error("ERROR: Wireless Channel received unknown message kind=%i", msg->getKind()); + throw cRuntimeError("ERROR: Wireless Channel received unknown message kind=%i", msg->getKind()); break; } } @@ -532,7 +532,7 @@ void WirelessChannel::parsePathLossMap(void) return; ifstream f(pathLossMapFile); if (!f.is_open()) - opp_error("\n[Wireless Channel]:\n Error reading from pathLossMapFile %s\n", pathLossMapFile); + throw cRuntimeError("\n[Wireless Channel]:\n Error reading from pathLossMapFile %s\n", pathLossMapFile); string s; const char *ct; @@ -551,19 +551,19 @@ void WirelessChannel::parsePathLossMap(void) if (!ct[0] || ct[0] == '#') continue; // skip comments if (parseInt(ct, &source)) - opp_error("\n[Wireless Channel]:\n Bad syntax in pathLossMapFile, expecting source identifier\n"); + throw cRuntimeError("\n[Wireless Channel]:\n Bad syntax in pathLossMapFile, expecting source identifier\n"); while (ct[0] && ct[0] != '>') ct++; //skip untill '>' character if (!ct[0]) - opp_error("\n[Wireless Channel]:\n Bad syntax in pathLossMapFile, expecting comma separated list of values\n"); + throw cRuntimeError("\n[Wireless Channel]:\n Bad syntax in pathLossMapFile, expecting comma separated list of values\n"); cStringTokenizer t(++ct, ","); //divide the rest of the strig with comma delimiter while ((ct = t.nextToken())) { if (parseInt(ct, &destination)) - opp_error("\n[Wireless Channel]:\n Bad syntax in pathLossMapFile, expecting target identifier\n"); + throw cRuntimeError("\n[Wireless Channel]:\n Bad syntax in pathLossMapFile, expecting target identifier\n"); while (ct[0] && ct[0] != ':') ct++; //skip untill ':' character if (parseFloat(++ct, &pathloss_db)) - opp_error("\n[Wireless Channel]:\n Bad syntax in pathLossMapFile, expecting dB value for path loss\n"); + throw cRuntimeError("\n[Wireless Channel]:\n Bad syntax in pathLossMapFile, expecting dB value for path loss\n"); updatePathLossElement(source, destination, pathloss_db); } } diff --git a/Castalia/src/wirelessChannel/defaultChannel/WirelessChannelTemporal.cc b/Castalia/src/wirelessChannel/defaultChannel/WirelessChannelTemporal.cc index bba7db9b..b8dff991 100644 --- a/Castalia/src/wirelessChannel/defaultChannel/WirelessChannelTemporal.cc +++ b/Castalia/src/wirelessChannel/defaultChannel/WirelessChannelTemporal.cc @@ -14,11 +14,11 @@ //Constructor for channelTemporalModel, the key parameter here is the input file to read the //model data from. Whole parsing of the file is done here -channelTemporalModel::channelTemporalModel(const char *file, int rng) +channelTemporalModel::channelTemporalModel(const char *file, cRNG *rng) { correlationTime = NULL; coherencePDF = NULL; - rngNum = rng; + rngGen = rng; std::string s; std::ifstream f(file); @@ -312,7 +312,7 @@ float channelTemporalModel::drawFromPDF(PDFType * pdf) //avoid infinite recursion if a PDF has been defined carelessly guard++; layer = &pdf->layers[currentLayer]; - index = genk_intrand(rngNum, layer->numOfTotalElements); + index = rngGen->intRand( layer->numOfTotalElements); if (index < layer->numOfValues) { return layer->values[index]; } else { diff --git a/Castalia/src/wirelessChannel/defaultChannel/WirelessChannelTemporal.h b/Castalia/src/wirelessChannel/defaultChannel/WirelessChannelTemporal.h index 53cc715f..7b6bcddf 100644 --- a/Castalia/src/wirelessChannel/defaultChannel/WirelessChannelTemporal.h +++ b/Castalia/src/wirelessChannel/defaultChannel/WirelessChannelTemporal.h @@ -14,7 +14,6 @@ #define __CHANNELMODEL_H #include -#include "random.h" #include #include @@ -58,7 +57,7 @@ class channelTemporalModel { int numOfSignalVariationValues; //this value is calculated based on 'Signal Variability' parameter int numOfCorrelationTimes; //this is taken directly from 'Correlation times' parameter - int rngNum; //random number generator to use + cRNG* rngGen; //random number generator to use double coherenceTime; //value of time that needs to be exceeded in order to draw from coherencePDF @@ -74,7 +73,7 @@ class channelTemporalModel { int isValidLayer(const char *); public: - channelTemporalModel(const char *, int); + channelTemporalModel(const char *, cRNG * ); ~channelTemporalModel(); double runTemporalModel(double, float *); }; diff --git a/Castalia/src/wirelessChannel/traceChannel/TraceChannel.cc b/Castalia/src/wirelessChannel/traceChannel/TraceChannel.cc index b5a067b3..5ddb1253 100644 --- a/Castalia/src/wirelessChannel/traceChannel/TraceChannel.cc +++ b/Castalia/src/wirelessChannel/traceChannel/TraceChannel.cc @@ -23,18 +23,18 @@ void TraceChannel::initialize() coordinator = par("coordinator"); if (coordinator >= numNodes || coordinator < 0) - opp_error("Invalid value of coordinator parameter in TraceChannel module\n"); + throw cRuntimeError("Invalid value of coordinator parameter in TraceChannel module\n"); nodesAffectedByTransmitter = new list[numNodes]; if (nodesAffectedByTransmitter == NULL) - opp_error("Could not allocate nodesAffectedByTransmitter array\n"); + throw cRuntimeError("Could not allocate nodesAffectedByTransmitter array\n"); traceStep = (double)par("traceStep")/1000.0; nextLine = 0; traceFile.open((const char *)par("traceFile")); if (!traceFile.is_open()) - opp_error("Could not open trace file for reading\n"); + throw cRuntimeError("Could not open trace file for reading\n"); signalDeliveryThreshold = par("signalDeliveryThreshold"); pathlossMapFile = par("pathlossMapFile"); @@ -46,7 +46,7 @@ void TraceChannel::initialize() parsePathLossMap(par("pathlossMapOffset")); /* Create temporal model object from parameters file (if given) */ if (strlen(temporalModelParametersFile) > 0) { - temporalModel = new channelTemporalModel(temporalModelParametersFile, 2); + temporalModel = new channelTemporalModel(temporalModelParametersFile, getRNG(2)); } } else { for (int i = 0; i < numNodes; i++) { @@ -69,7 +69,7 @@ void TraceChannel::parsePathLossMap(double offset) ifstream f(pathlossMapFile); if (!f.is_open()) - opp_error("\n[Wireless Channel]:\n Error reading from pathLossMapFile %s\n", pathlossMapFile); + throw cRuntimeError("\n[Wireless Channel]:\n Error reading from pathLossMapFile %s\n", pathlossMapFile); string s; const char *ct; @@ -88,19 +88,19 @@ void TraceChannel::parsePathLossMap(double offset) if (!ct[0] || ct[0] == '#') continue; // skip comments if (parseInt(ct, &source)) - opp_error("\n[Wireless Channel]:\n Bad syntax in pathLossMapFile, expecting source identifier\n"); + throw cRuntimeError("\n[Wireless Channel]:\n Bad syntax in pathLossMapFile, expecting source identifier\n"); while (ct[0] && ct[0] != '>') ct++; //skip untill '>' character if (!ct[0]) - opp_error("\n[Wireless Channel]:\n Bad syntax in pathLossMapFile, expecting comma separated list of values\n"); + throw cRuntimeError("\n[Wireless Channel]:\n Bad syntax in pathLossMapFile, expecting comma separated list of values\n"); cStringTokenizer t(++ct, ","); //divide the rest of the strig with comma delimiter while ((ct = t.nextToken())) { if (parseInt(ct, &destination)) - opp_error("\n[Wireless Channel]:\n Bad syntax in pathLossMapFile, expecting target identifier\n"); + throw cRuntimeError("\n[Wireless Channel]:\n Bad syntax in pathLossMapFile, expecting target identifier\n"); while (ct[0] && ct[0] != ':') ct++; //skip untill ':' character if (parseFloat(++ct, &pathloss_db)) - opp_error("\n[Wireless Channel]:\n Bad syntax in pathLossMapFile, expecting dB value for path loss\n"); + throw cRuntimeError("\n[Wireless Channel]:\n Bad syntax in pathLossMapFile, expecting dB value for path loss\n"); pathlossMap[source][destination] = new PathLossElement(pathloss_db + offset); } } @@ -115,7 +115,7 @@ void TraceChannel::handleMessage(cMessage * msg) switch (msg->getKind()) { case WC_NODE_MOVEMENT:{ - opp_error("Error: Trace channel does not support WC_NODE_MOVEMENT message"); + throw cRuntimeError("Error: Trace channel does not support WC_NODE_MOVEMENT message"); break; } @@ -194,7 +194,7 @@ void TraceChannel::handleMessage(cMessage * msg) } default:{ - opp_error("ERROR: Wireless Channel received unknown message kind=%i", msg->getKind()); + throw cRuntimeError("ERROR: Wireless Channel received unknown message kind=%i", msg->getKind()); break; } @@ -228,7 +228,7 @@ float TraceChannel::currentPathloss(int nodeId) { if (nodeId > coordinator) nodeId--; if (nodeId >= (int)traceValues.size()) { - opp_error("trace file does not provide information for node %i (%i columns)", + throw cRuntimeError("trace file does not provide information for node %i (%i columns)", nodeId,(int)traceValues.size()); } return traceValues[nodeId] > 0 ? traceValues[nodeId] : -traceValues[nodeId]; @@ -242,7 +242,7 @@ float TraceChannel::parseFloat(const char *str) float result = strtof(str, &tmp); if (str != tmp) return result; } - opp_error("ERROR: TraceChannel unable to parse traceFile at '%s'",str); + throw cRuntimeError("ERROR: TraceChannel unable to parse traceFile at '%s'",str); } //wrapper function for atoi(...) call. returns 1 on error, 0 on success From 37dc24f455fb65f1c92cf524dba515697068dccc Mon Sep 17 00:00:00 2001 From: Rudolf Hornig Date: Thu, 25 Apr 2019 13:09:38 +0200 Subject: [PATCH 03/10] fixed incorrect assignement, unnecessary overrides in msg files --- Castalia/src/node/communication/mac/mac802154/Basic802154.cc | 2 +- Castalia/src/node/communication/radio/RadioControlMessage.msg | 1 - .../communication/routing/bypassRouting/BypassRoutingPacket.msg | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Castalia/src/node/communication/mac/mac802154/Basic802154.cc b/Castalia/src/node/communication/mac/mac802154/Basic802154.cc index 4670e43b..5adf88e9 100644 --- a/Castalia/src/node/communication/mac/mac802154/Basic802154.cc +++ b/Castalia/src/node/communication/mac/mac802154/Basic802154.cc @@ -272,7 +272,7 @@ void Basic802154::fromNetworkLayer(cPacket * pkt, int dstMacAddress) macPacket->setDstID(dstMacAddress); macPacket->setMac802154PacketType(MAC_802154_DATA_PACKET); macPacket->setSeqNum(seqNum++); - if (seqNum > 255) seqNum == 0; + if (seqNum > 255) seqNum = 0; if (!acceptNewPacket(macPacket)) packetoverflow++; } diff --git a/Castalia/src/node/communication/radio/RadioControlMessage.msg b/Castalia/src/node/communication/radio/RadioControlMessage.msg index 53480fe5..01efc1e1 100644 --- a/Castalia/src/node/communication/radio/RadioControlMessage.msg +++ b/Castalia/src/node/communication/radio/RadioControlMessage.msg @@ -43,5 +43,4 @@ message RadioControlCommand { int radioControlCommandKind enum (RadioControlCommand_type); int state enum (BasicState_type) = RX; //to be used with SET_STATE double parameter = 0.0; //to be used with SET_TX_OUTPUT, SET_CARRIER_FREQ, SET_CCA_THRESHOLD - string name = ""; //to be used with SET_MODE, SET_SLEEP_LEVEL and SET_ENCODING } diff --git a/Castalia/src/node/communication/routing/bypassRouting/BypassRoutingPacket.msg b/Castalia/src/node/communication/routing/bypassRouting/BypassRoutingPacket.msg index ff3a2455..67cea515 100644 --- a/Castalia/src/node/communication/routing/bypassRouting/BypassRoutingPacket.msg +++ b/Castalia/src/node/communication/routing/bypassRouting/BypassRoutingPacket.msg @@ -17,7 +17,5 @@ cplusplus {{ class RoutingPacket; packet BypassRoutingPacket extends RoutingPacket { - string source; - string destination; } From 4732bd698bd9eb72da0e053dd27ee2ca089dfe42 Mon Sep 17 00:00:00 2001 From: Rudolf Hornig Date: Thu, 25 Apr 2019 13:34:10 +0200 Subject: [PATCH 04/10] double vs. integer mismatch fixes --- Castalia/Simulations/BridgeTest/omnetpp.ini | 6 +++--- Castalia/Simulations/Parameters/Castalia.ini | 1 - Castalia/src/SensorNetwork.ned | 6 +++--- Castalia/src/node/application/VirtualApplication.cc | 2 +- Castalia/src/node/application/bridgeTest/BridgeTest.h | 2 +- Castalia/src/node/application/bridgeTest/BridgeTest.ned | 4 ++-- .../node/application/connectivityMap/ConnectivityMap.ned | 2 +- .../application/simpleAggregation/SimpleAggregation.ned | 2 +- .../src/node/application/throughputTest/ThroughputTest.ned | 2 +- .../src/node/application/valueReporting/ValueReporting.ned | 4 ++-- Castalia/src/node/communication/mac/tMac/TMAC.ned | 2 +- .../src/node/communication/mac/tunableMac/TunableMAC.ned | 4 ++-- .../routing/multipathRingsRouting/MultipathRingsRouting.ned | 2 +- Castalia/src/node/mobilityManager/VirtualMobilityManager.cc | 6 +++--- .../CustomizablePhysicalProcess.ned | 6 +++--- .../src/wirelessChannel/defaultChannel/WirelessChannel.ned | 6 +++--- 16 files changed, 28 insertions(+), 29 deletions(-) diff --git a/Castalia/Simulations/BridgeTest/omnetpp.ini b/Castalia/Simulations/BridgeTest/omnetpp.ini index 6346ed38..8b200f39 100644 --- a/Castalia/Simulations/BridgeTest/omnetpp.ini +++ b/Castalia/Simulations/BridgeTest/omnetpp.ini @@ -29,7 +29,7 @@ SN.node[*].Application.reportDestination = "SINK" SN.node[*].Communication.RoutingProtocolName = "MultipathRingsRouting" -[Config 40mBridge] +[Config _40mBridge] SN.field_x = 40 SN.field_y = 10 SN.deployment = "[0]->center;[1..6]->3x2" @@ -40,7 +40,7 @@ SN.physicalProcess[0].point1_y_coord = 5 SN.physicalProcess[0].point2_x_coord = 40 SN.physicalProcess[0].point2_y_coord = 5 -[Config 100mBridge] +[Config _100mBridge] SN.field_x = 100 SN.field_y = 20 SN.deployment = "[0]->center;[1..18]->6x3" @@ -51,7 +51,7 @@ SN.physicalProcess[0].point1_y_coord = 10 SN.physicalProcess[0].point2_x_coord = 100 SN.physicalProcess[0].point2_y_coord = 10 -[Config 200mBridge] +[Config _200mBridge] SN.field_x = 200 SN.field_y = 20 SN.deployment = "[0]->center;[1..34]->11x3" diff --git a/Castalia/Simulations/Parameters/Castalia.ini b/Castalia/Simulations/Parameters/Castalia.ini index 429e27b9..59d03143 100644 --- a/Castalia/Simulations/Parameters/Castalia.ini +++ b/Castalia/Simulations/Parameters/Castalia.ini @@ -18,7 +18,6 @@ # =========================================================== cmdenv-express-mode = true -cmdenv-module-messages = true cmdenv-event-banners = false cmdenv-performance-display = false cmdenv-interactive = false diff --git a/Castalia/src/SensorNetwork.ned b/Castalia/src/SensorNetwork.ned index cafaf8ce..b53b1715 100644 --- a/Castalia/src/SensorNetwork.ned +++ b/Castalia/src/SensorNetwork.ned @@ -17,9 +17,9 @@ import node; network SN { parameters: - int field_x = default (30); // the length of the deployment field - int field_y = default (30); // the width of the deployment field - int field_z = default (0); // the height of the deployment field (2-D field by default) + double field_x = default (30); // the length of the deployment field + double field_y = default (30); // the width of the deployment field + double field_z = default (0); // the height of the deployment field (2-D field by default) int numNodes; // the number of nodes diff --git a/Castalia/src/node/application/VirtualApplication.cc b/Castalia/src/node/application/VirtualApplication.cc index b38fcd72..894e5bcb 100644 --- a/Castalia/src/node/application/VirtualApplication.cc +++ b/Castalia/src/node/application/VirtualApplication.cc @@ -61,7 +61,7 @@ void VirtualApplication::initialize() * following two parameters. If they are not defined then the * declareHistogram and collectHistogram statement are not called. */ - latencyMax = hasPar("latencyHistogramMax") ? par("latencyHistogramMax") : 0; + latencyMax = hasPar("latencyHistogramMax") ? par("latencyHistogramMax") : 0.0; latencyBuckets = hasPar("latencyHistogramBuckets") ? par("latencyHistogramBuckets") : 0; if (latencyMax > 0 && latencyBuckets > 0) declareHistogram("Application level latency, in ms", 0, latencyMax, latencyBuckets); diff --git a/Castalia/src/node/application/bridgeTest/BridgeTest.h b/Castalia/src/node/application/bridgeTest/BridgeTest.h index d68501ff..edf1c433 100644 --- a/Castalia/src/node/application/bridgeTest/BridgeTest.h +++ b/Castalia/src/node/application/bridgeTest/BridgeTest.h @@ -40,7 +40,7 @@ enum BridgeTestTimers { class BridgeTest:public VirtualApplication { private: - int reportTreshold; + double reportTreshold; double sampleInterval; simtime_t reprogramInterval; simtime_t reprogramPacketDelay; diff --git a/Castalia/src/node/application/bridgeTest/BridgeTest.ned b/Castalia/src/node/application/bridgeTest/BridgeTest.ned index 8c3a671d..300a99f6 100644 --- a/Castalia/src/node/application/bridgeTest/BridgeTest.ned +++ b/Castalia/src/node/application/bridgeTest/BridgeTest.ned @@ -32,8 +32,8 @@ simple BridgeTest like node.application.iApplication { double reportTreshold = default (10); double sampleInterval = default (100); // in ms int sampleSize = default (12); // in bytes - int reprogramInterval = default (86400); // in seconds - int reprogramPacketDelay = default (500); // in ms + double reprogramInterval = default (86400); // in seconds + double reprogramPacketDelay = default (500); // in ms int reprogramPayload = default (5120); // in bytes int maxPayloadPacketSize = default (128); // in bytes diff --git a/Castalia/src/node/application/connectivityMap/ConnectivityMap.ned b/Castalia/src/node/application/connectivityMap/ConnectivityMap.ned index 9cd6ac53..6edd4f22 100644 --- a/Castalia/src/node/application/connectivityMap/ConnectivityMap.ned +++ b/Castalia/src/node/application/connectivityMap/ConnectivityMap.ned @@ -23,7 +23,7 @@ simple ConnectivityMap like node.application.iApplication { int priority = default (1); int constantDataPayload = default (8); - int packetSpacing = default (100); // in ms + double packetSpacing = default (100); // in ms int packetsPerNode = default (100); int packetSize = default (32); // in bytes diff --git a/Castalia/src/node/application/simpleAggregation/SimpleAggregation.ned b/Castalia/src/node/application/simpleAggregation/SimpleAggregation.ned index ea9c379e..e0fd021f 100644 --- a/Castalia/src/node/application/simpleAggregation/SimpleAggregation.ned +++ b/Castalia/src/node/application/simpleAggregation/SimpleAggregation.ned @@ -22,7 +22,7 @@ simple SimpleAggregation like node.application.iApplication { int priority = default (1); int packetHeaderOverhead = default (8); // in bytes int constantDataPayload = default (2); // in bytes - int sampleInterval = default (1000); // in ms + double sampleInterval = default (1000); // in ms bool isSink = default (false); gates: diff --git a/Castalia/src/node/application/throughputTest/ThroughputTest.ned b/Castalia/src/node/application/throughputTest/ThroughputTest.ned index 0c3b2d39..b40c718a 100644 --- a/Castalia/src/node/application/throughputTest/ThroughputTest.ned +++ b/Castalia/src/node/application/throughputTest/ThroughputTest.ned @@ -33,7 +33,7 @@ simple ThroughputTest like node.application.iApplication { double packet_rate = default (0); // packets per second, by default we transmit no packets double startupDelay = default (0); // delay in seconds before the app stars producing packets - double latencyHistogramMax = default (200); + double latencyHistogramMax = default (200.0); int latencyHistogramBuckets = default (10); gates: diff --git a/Castalia/src/node/application/valueReporting/ValueReporting.ned b/Castalia/src/node/application/valueReporting/ValueReporting.ned index bc5d442e..8d1652fe 100644 --- a/Castalia/src/node/application/valueReporting/ValueReporting.ned +++ b/Castalia/src/node/application/valueReporting/ValueReporting.ned @@ -22,8 +22,8 @@ simple ValueReporting like node.application.iApplication { int priority = default (1); int packetHeaderOverhead = default (8); // in bytes int constantDataPayload = default (12); // in bytes - int maxSampleInterval = default (60000);// in msec - int minSampleInterval = default (1000); // in msec + double maxSampleInterval = default (60000);// in msec + double minSampleInterval = default (1000); // in msec bool isSink = default (false); gates: diff --git a/Castalia/src/node/communication/mac/tMac/TMAC.ned b/Castalia/src/node/communication/mac/tMac/TMAC.ned index 7a480cc2..b6b1f2f0 100644 --- a/Castalia/src/node/communication/mac/tMac/TMAC.ned +++ b/Castalia/src/node/communication/mac/tMac/TMAC.ned @@ -38,7 +38,7 @@ simple TMAC like node.communication.mac.iMac { bool conservativeTA = default (true); //conservative activation timeout - will always stay awake for //atleast 15 ms after any activity on the radio - double resyncTime = default (6); // timer for re-sending SYNC msg, in seconds + int resyncTime = default (6); // timer for re-sending SYNC msg, in seconds double contentionPeriod = default (10); // 10 ms double listenTimeout = default (15); // 15 ms, is the timeout TA (Activation event) double waitTimeout = default (5); // timeout for expecting a reply to DATA or RTS packet diff --git a/Castalia/src/node/communication/mac/tunableMac/TunableMAC.ned b/Castalia/src/node/communication/mac/tunableMac/TunableMAC.ned index 8e5e5e18..78b30fc2 100644 --- a/Castalia/src/node/communication/mac/tunableMac/TunableMAC.ned +++ b/Castalia/src/node/communication/mac/tunableMac/TunableMAC.ned @@ -31,11 +31,11 @@ simple TunableMAC like node.communication.mac.iMac { int numTx = default (1); // when we have something to Tx, how many times we try double randomTxOffset = default (0.0); // Tx after time chosen randomly from interval [0..randomTxOffset] double reTxInterval = default (0.0); // Interval between retransmissions in ms, (numTx-1) retransmissions - double backoffType = default (1); // 0-->(backoff = sleepinterval), + int backoffType = default (1); // 0-->(backoff = sleepinterval), // 1-->(backoff = constant value), // 2-->(backoff = multiplying value - e.g. 1*a, 2*a, 3*a, 4*a ...), // 3-->(backoff = exponential value - e.g. 2, 4, 8, 16, 32...) - int backoffBaseValue = default (16); // the backoff base value in ms + double backoffBaseValue = default (16); // the backoff base value in ms double CSMApersistance = default (0); // value in [0..1], is CSMA non-persistent, p-persistent, or 1-persistent? bool txAllPacketsInFreeChannel = default (true); // if you find the channel free, tx all packets in buffer? bool sleepDuringBackoff = default (false); // for no dutyCycle case: sleep when backing off? diff --git a/Castalia/src/node/communication/routing/multipathRingsRouting/MultipathRingsRouting.ned b/Castalia/src/node/communication/routing/multipathRingsRouting/MultipathRingsRouting.ned index a8090c32..231cb6fa 100644 --- a/Castalia/src/node/communication/routing/multipathRingsRouting/MultipathRingsRouting.ned +++ b/Castalia/src/node/communication/routing/multipathRingsRouting/MultipathRingsRouting.ned @@ -19,7 +19,7 @@ simple MultipathRingsRouting like node.communication.routing.iRouting { int netBufferSize = default (32); // number of messages int netDataFrameOverhead = default (14); // bytes int mpathRingsSetupFrameOverhead = default (13); // bytes - int netSetupTimeout = default (50); // msec + double netSetupTimeout = default (50.0); // msec gates: output toCommunicationModule; diff --git a/Castalia/src/node/mobilityManager/VirtualMobilityManager.cc b/Castalia/src/node/mobilityManager/VirtualMobilityManager.cc index 517c627a..5be621fd 100644 --- a/Castalia/src/node/mobilityManager/VirtualMobilityManager.cc +++ b/Castalia/src/node/mobilityManager/VirtualMobilityManager.cc @@ -35,9 +35,9 @@ void VirtualMobilityManager::initialize() void VirtualMobilityManager::parseDeployment() { const char *ct; char *c; - int xlen = network->par("field_x"); - int ylen = network->par("field_y"); - int zlen = network->par("field_z"); + double xlen = network->par("field_x"); + double ylen = network->par("field_y"); + double zlen = network->par("field_z"); nodeLocation.phi = node->par("phi"); nodeLocation.theta = node->par("theta"); diff --git a/Castalia/src/physicalProcess/customizablePhysicalProcess/CustomizablePhysicalProcess.ned b/Castalia/src/physicalProcess/customizablePhysicalProcess/CustomizablePhysicalProcess.ned index 8cffa717..a53b8270 100644 --- a/Castalia/src/physicalProcess/customizablePhysicalProcess/CustomizablePhysicalProcess.ned +++ b/Castalia/src/physicalProcess/customizablePhysicalProcess/CustomizablePhysicalProcess.ned @@ -24,7 +24,7 @@ package physicalProcess.customizablePhysicalProcess; simple CustomizablePhysicalProcess like physicalProcess.iPhysicalProcess { parameters: bool collectTraceInfo = default (false); - double inputType = default (1); // 0 --> values are dictated by "directNodeValueAssignment" parameter + int inputType = default (1); // 0 --> values are dictated by "directNodeValueAssignment" parameter // 1 --> values are generated by the additive diffused sources // 2 --> values read by the tracefile (not yet ipmlemented) @@ -36,9 +36,9 @@ simple CustomizablePhysicalProcess like physicalProcess.iPhysicalProcess { double multiplicative_k = default (0.25); // multiplicative parameter (k) double attenuation_exp_a = default (1.0); // attenuation exponent (a) double sigma = default (0.2); // standart deviation to the zero-mean additive gaussian noise (sigma) - double max_num_snapshots = default (10); // the maximum number of descrete states/snapshots that can + int max_num_snapshots = default (10); // the maximum number of descrete states/snapshots that can // be specified in source_X params below - double numSources = default (1); // how many points in space will return this value, + int numSources = default (1); // how many points in space will return this value, // up to 5 sources supported // strings showing how sources evolve over time (change in location and value) diff --git a/Castalia/src/wirelessChannel/defaultChannel/WirelessChannel.ned b/Castalia/src/wirelessChannel/defaultChannel/WirelessChannel.ned index 7ba2461b..ec1d8c42 100644 --- a/Castalia/src/wirelessChannel/defaultChannel/WirelessChannel.ned +++ b/Castalia/src/wirelessChannel/defaultChannel/WirelessChannel.ned @@ -21,9 +21,9 @@ simple WirelessChannel like wirelessChannel.iWirelessChannel { bool collectTraceInfo = default (false); bool onlyStaticNodes = default (true); // if NO mobility, set it to true for greater efficiency - int xCellSize = default (5); // if we define cells (to handle mobility) - int yCellSize = default (5); // how big are the cells in each dimension - int zCellSize = default (1); + double xCellSize = default (5); // if we define cells (to handle mobility) + double yCellSize = default (5); // how big are the cells in each dimension + double zCellSize = default (1); double pathLossExponent = default (2.4); // how fast is the signal strength fading double PLd0 = default (55); // path loss at reference distance d0 (in dBm) From 413f598237636dfad5134ebdd19c08dd76b7fd45 Mon Sep 17 00:00:00 2001 From: Rudolf Hornig Date: Thu, 25 Apr 2019 14:29:28 +0200 Subject: [PATCH 05/10] updated top level makefile to build inside the src folder. added IDE project files. --- Castalia/.cproject | 112 ++++++++++++++++++++++++++++++++++++++ Castalia/.gitignore | 6 +- Castalia/.nedexclusions | 0 Castalia/.nedfolders | 1 + Castalia/.oppbuildspec | 5 ++ Castalia/.oppfeaturestate | 2 + Castalia/.project | 38 +++++++++++++ Castalia/Makefile | 36 ++++++++++++ Castalia/makemake | 31 +---------- 9 files changed, 199 insertions(+), 32 deletions(-) create mode 100644 Castalia/.cproject create mode 100644 Castalia/.nedexclusions create mode 100644 Castalia/.nedfolders create mode 100644 Castalia/.oppbuildspec create mode 100644 Castalia/.oppfeaturestate create mode 100644 Castalia/.project create mode 100644 Castalia/Makefile diff --git a/Castalia/.cproject b/Castalia/.cproject new file mode 100644 index 00000000..45124c37 --- /dev/null +++ b/Castalia/.cproject @@ -0,0 +1,112 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Castalia/.gitignore b/Castalia/.gitignore index c3b12053..f29b5556 100644 --- a/Castalia/.gitignore +++ b/Castalia/.gitignore @@ -1,9 +1,9 @@ -/CastaliaBin -/CastaliaBin_dbg +/src/CastaliaBin +/src/CastaliaBin_dbg /out *_m.h *_m.cc -Makefile +src/Makefile .cmdenv-log .qtenvrc Castalia-Trace.txt \ No newline at end of file diff --git a/Castalia/.nedexclusions b/Castalia/.nedexclusions new file mode 100644 index 00000000..e69de29b diff --git a/Castalia/.nedfolders b/Castalia/.nedfolders new file mode 100644 index 00000000..85de9cf9 --- /dev/null +++ b/Castalia/.nedfolders @@ -0,0 +1 @@ +src diff --git a/Castalia/.oppbuildspec b/Castalia/.oppbuildspec new file mode 100644 index 00000000..252aae37 --- /dev/null +++ b/Castalia/.oppbuildspec @@ -0,0 +1,5 @@ + + + + + diff --git a/Castalia/.oppfeaturestate b/Castalia/.oppfeaturestate new file mode 100644 index 00000000..5b7b1d12 --- /dev/null +++ b/Castalia/.oppfeaturestate @@ -0,0 +1,2 @@ + + diff --git a/Castalia/.project b/Castalia/.project new file mode 100644 index 00000000..f619080d --- /dev/null +++ b/Castalia/.project @@ -0,0 +1,38 @@ + + + castalia + + + + + + org.omnetpp.cdt.MakefileBuilder + + + + + org.omnetpp.scave.builder.vectorfileindexer + + + + + org.eclipse.cdt.managedbuilder.core.genmakebuilder + clean,full,incremental, + + + + + org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder + full,incremental, + + + + + + org.eclipse.cdt.core.cnature + org.eclipse.cdt.core.ccnature + org.eclipse.cdt.managedbuilder.core.managedBuildNature + org.eclipse.cdt.managedbuilder.core.ScannerConfigNature + org.omnetpp.main.omnetppnature + + diff --git a/Castalia/Makefile b/Castalia/Makefile new file mode 100644 index 00000000..38193010 --- /dev/null +++ b/Castalia/Makefile @@ -0,0 +1,36 @@ + +.PHONY: all clean cleanall makefiles makefiles-so makefiles-lib makefiles-exe checkmakefiles + +all: checkmakefiles + @cd src && $(MAKE) + +clean: checkmakefiles + @cd src && $(MAKE) clean + +cleanall: checkmakefiles + @cd src && $(MAKE) MODE=release clean + @cd src && $(MAKE) MODE=debug clean + @rm -f src/Makefile + +MAKEMAKE_OPTIONS := -f --deep -o CastaliaBin -O out -I. -DAUTOIMPORT_OMNETPP_NAMESPACE + +makefiles: makefiles-exe + +makefiles-so: + @cd src && opp_makemake --make-so $(MAKEMAKE_OPTIONS) + +makefiles-lib: + @cd src && opp_makemake --make-lib $(MAKEMAKE_OPTIONS) + +makefiles-exe: + @cd src && opp_makemake $(MAKEMAKE_OPTIONS) + +checkmakefiles: + @if [ ! -f src/Makefile ]; then \ + echo; \ + echo '========================================================================'; \ + echo 'src/Makefile does not exist. Please use "make makefiles" to generate it!'; \ + echo '========================================================================'; \ + echo; \ + exit 1; \ + fi diff --git a/Castalia/makemake b/Castalia/makemake index 8fbc2c10..60d29327 100755 --- a/Castalia/makemake +++ b/Castalia/makemake @@ -1,29 +1,2 @@ -# **************************************************************************** -# * Copyright: National ICT Australia, 2007 - 2010 * -# * Developed at the ATP lab, Networked Systems research theme * -# * Author(s): Athanassios Boulis, Yuriy Tselishchev * -# * This file is distributed under the terms in the attached LICENSE file. * -# * If you do not find this file, copies can be found by writing to: * -# * * -# * NICTA, Locked Bag 9013, Alexandria, NSW 1435, Australia * -# * Attention: License Inquiry. * -# * * -# ***************************************************************************/ - -#!/bin/bash - -ROOT=`pwd` - -# The following options are used by OMNeT's opp_makemake tool -# For explanation and a complete list of options run: opp_makemake -h -OPTS=" -f -r --deep -o CastaliaBin -P $ROOT -M release -Isrc -DAUTOIMPORT_OMNETPP_NAMESPACE" - -# -X excludes a directory from being considered -EXCLUDEDIRS=" -X Simulations -X out -X bin" - -# Use options -I -L -l to include external header files or libraries -EXTOPTS="" - -# Run OMNeT's opp_makemake tool with the above options -opp_makemake $OPTS $EXCLUDEDIRS $EXTOPTS - +#! /bin/sh +make makefiles \ No newline at end of file From b4a46f89fc4ee3d59c985a58f2e52c706c9f46d3 Mon Sep 17 00:00:00 2001 From: Rudolf Hornig Date: Thu, 25 Apr 2019 15:47:26 +0200 Subject: [PATCH 06/10] make it compatible with OMNeT++ 6.0 pre3 version --- Castalia/src/makefrag | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 Castalia/src/makefrag diff --git a/Castalia/src/makefrag b/Castalia/src/makefrag new file mode 100644 index 00000000..47eaa094 --- /dev/null +++ b/Castalia/src/makefrag @@ -0,0 +1,4 @@ +# +# Use the older message compiler. New compiler was introduced in OMNeT++ 5.3 +# +MSGC:=$(MSGC) --msg4 \ No newline at end of file From 5a3893a377f67fcc9fb1c64a5327c10d3dc75a00 Mon Sep 17 00:00:00 2001 From: Rudolf Hornig Date: Thu, 25 Apr 2019 14:56:24 +0200 Subject: [PATCH 07/10] warning fix: removed unused private member variables. --- .../src/node/application/connectivityMap/ConnectivityMap.h | 5 ----- .../node/application/simpleAggregation/SimpleAggregation.h | 1 - .../src/node/application/valueReporting/ValueReporting.h | 2 -- .../node/communication/mac/baselineBanMac/BaselineBANMac.h | 1 - Castalia/src/node/communication/radio/Radio.h | 3 --- Castalia/src/node/sensorManager/SensorManager.h | 1 - .../carsPhysicalProcess/CarsPhysicalProcess.h | 5 ----- .../CustomizablePhysicalProcess.cc | 1 + .../CustomizablePhysicalProcess.h | 7 +++---- Castalia/src/wirelessChannel/traceChannel/TraceChannel.h | 4 +--- 10 files changed, 5 insertions(+), 25 deletions(-) diff --git a/Castalia/src/node/application/connectivityMap/ConnectivityMap.h b/Castalia/src/node/application/connectivityMap/ConnectivityMap.h index 91efcec7..5bae35f3 100644 --- a/Castalia/src/node/application/connectivityMap/ConnectivityMap.h +++ b/Castalia/src/node/application/connectivityMap/ConnectivityMap.h @@ -30,17 +30,12 @@ enum ConnectivityMapTimers { class ConnectivityMap: public VirtualApplication { private: // parameters and variables - int priority; - int packetHeaderOverhead; - bool printConnMap; - int constantDataPayload; double packetSpacing; int packetsPerNode; int packetSize; vector neighborTable; int packetsSent; - int serialNumber; int totalSNnodes; double txInterval_perNode; double txInterval_total; diff --git a/Castalia/src/node/application/simpleAggregation/SimpleAggregation.h b/Castalia/src/node/application/simpleAggregation/SimpleAggregation.h index 984d1a35..a35b925b 100644 --- a/Castalia/src/node/application/simpleAggregation/SimpleAggregation.h +++ b/Castalia/src/node/application/simpleAggregation/SimpleAggregation.h @@ -25,7 +25,6 @@ enum SimpleAggregationTimers { class SimpleAggregation: public VirtualApplication { private: double aggregatedValue; - int routingLevel; double waitingTimeForLowerLevelData; double lastSensedValue; double sampleInterval; diff --git a/Castalia/src/node/application/valueReporting/ValueReporting.h b/Castalia/src/node/application/valueReporting/ValueReporting.h index c521bceb..58872104 100644 --- a/Castalia/src/node/application/valueReporting/ValueReporting.h +++ b/Castalia/src/node/application/valueReporting/ValueReporting.h @@ -28,8 +28,6 @@ class ValueReporting: public VirtualApplication { double maxSampleInterval; double minSampleInterval; - int routingLevel; - double lastSensedValue; int currSentSampleSN; double randomBackoffIntervalFraction; diff --git a/Castalia/src/node/communication/mac/baselineBanMac/BaselineBANMac.h b/Castalia/src/node/communication/mac/baselineBanMac/BaselineBANMac.h index c870fa72..73d06305 100644 --- a/Castalia/src/node/communication/mac/baselineBanMac/BaselineBANMac.h +++ b/Castalia/src/node/communication/mac/baselineBanMac/BaselineBANMac.h @@ -100,7 +100,6 @@ class BaselineBANMac : public VirtualMac { int scheduledRxAccessStart; int scheduledRxAccessEnd; - int polledAccessEnd; int postedAccessEnd; double pTIFS; diff --git a/Castalia/src/node/communication/radio/Radio.h b/Castalia/src/node/communication/radio/Radio.h index 16ccc44b..651b00ef 100644 --- a/Castalia/src/node/communication/radio/Radio.h +++ b/Castalia/src/node/communication/radio/Radio.h @@ -178,9 +178,6 @@ class Radio: public CastaliaModule { // a history of recent changes in total received power to help calculate RSSI list totalPowerReceived; - // a pointer to the object of the Radio Module (used for direct method calls) - ResourceManager *resMgrModule; - int changingToState; // indicates that the Radio is in the middle of changing from one state (A) // to another (B). It also holds the value for state B diff --git a/Castalia/src/node/sensorManager/SensorManager.h b/Castalia/src/node/sensorManager/SensorManager.h index 73590a35..21e62b48 100644 --- a/Castalia/src/node/sensorManager/SensorManager.h +++ b/Castalia/src/node/sensorManager/SensorManager.h @@ -24,7 +24,6 @@ using namespace std; class SensorManager: public CastaliaModule { private: /*--- The .ned file's parameters ---*/ - bool printDebugInfo; vector corrPhyProcess; vector pwrConsumptionPerDevice; vector minSamplingIntervals; diff --git a/Castalia/src/physicalProcess/carsPhysicalProcess/CarsPhysicalProcess.h b/Castalia/src/physicalProcess/carsPhysicalProcess/CarsPhysicalProcess.h index 3b2cfa7f..ec15c95c 100644 --- a/Castalia/src/physicalProcess/carsPhysicalProcess/CarsPhysicalProcess.h +++ b/Castalia/src/physicalProcess/carsPhysicalProcess/CarsPhysicalProcess.h @@ -28,8 +28,6 @@ typedef struct { class CarsPhysicalProcess: public CastaliaModule { private: - bool printDebugInfo; - int max_num_cars; double car_speed; double car_value; @@ -45,9 +43,6 @@ class CarsPhysicalProcess: public CastaliaModule { // snapshot is a tuple (time, x, y, value) const char *description; - double defaultValue; - double *valuesTable; - protected: virtual void initialize(); virtual void handleMessage(cMessage * msg); diff --git a/Castalia/src/physicalProcess/customizablePhysicalProcess/CustomizablePhysicalProcess.cc b/Castalia/src/physicalProcess/customizablePhysicalProcess/CustomizablePhysicalProcess.cc index 4c931bf6..789a1ea0 100644 --- a/Castalia/src/physicalProcess/customizablePhysicalProcess/CustomizablePhysicalProcess.cc +++ b/Castalia/src/physicalProcess/customizablePhysicalProcess/CustomizablePhysicalProcess.cc @@ -52,6 +52,7 @@ void CustomizablePhysicalProcess::handleMessage(cMessage * msg) /* * TODO: add this functionality in the future */ + throw cRuntimeError("TRACE_FILE: Not implemented."); break; } } diff --git a/Castalia/src/physicalProcess/customizablePhysicalProcess/CustomizablePhysicalProcess.h b/Castalia/src/physicalProcess/customizablePhysicalProcess/CustomizablePhysicalProcess.h index c9f0dd7f..54ca1481 100644 --- a/Castalia/src/physicalProcess/customizablePhysicalProcess/CustomizablePhysicalProcess.h +++ b/Castalia/src/physicalProcess/customizablePhysicalProcess/CustomizablePhysicalProcess.h @@ -7,7 +7,7 @@ * * * NICTA, Locked Bag 9013, Alexandria, NSW 1435, Australia * * Attention: License Inquiry. * - * * + * * ****************************************************************************/ #ifndef _CUSTOMIZABLEPHYSICALPROCESS_H_ @@ -36,7 +36,6 @@ typedef struct { class CustomizablePhysicalProcess: public CastaliaModule { private: /*--- The .ned file's parameters ---*/ - bool printDebugInfo; int numSources; double k; double a; @@ -46,8 +45,8 @@ class CustomizablePhysicalProcess: public CastaliaModule { /*--- Custom class member variables ---*/ int numNodes; - sourceSnapshot **sources_snapshots; // N by M array, where N is numSources and, M is the - // maximum number of source snapshots. A source snapshot + sourceSnapshot **sources_snapshots; // N by M array, where N is numSources and, M is the + // maximum number of source snapshots. A source snapshot // is a tuple (time, x, y, value) sourceSnapshot *curr_source_state; int *source_index; diff --git a/Castalia/src/wirelessChannel/traceChannel/TraceChannel.h b/Castalia/src/wirelessChannel/traceChannel/TraceChannel.h index c8e4909c..41d86541 100644 --- a/Castalia/src/wirelessChannel/traceChannel/TraceChannel.h +++ b/Castalia/src/wirelessChannel/traceChannel/TraceChannel.h @@ -7,7 +7,7 @@ * * * NICTA, Locked Bag 9013, Alexandria, NSW 1435, Australia * * Attention: License Inquiry. * - * * + * * ****************************************************************************/ #ifndef _TRACECHANNEL_H @@ -49,8 +49,6 @@ class TraceChannel: public CastaliaModule { int coordinator; double traceStep; double leafLinkProbability; - double leafPathloss; - double pathlossMapOffset; double signalDeliveryThreshold; const char *pathlossMapFile; const char *temporalModelParametersFile; From cb99d3e25dc4c48b1f07986e75b60d31740a5f4a Mon Sep 17 00:00:00 2001 From: Rudolf Hornig Date: Thu, 25 Apr 2019 14:57:33 +0200 Subject: [PATCH 08/10] fix for python script to run on Windows --- Castalia/.gitignore | 1 + Castalia/bin/Castalia | 94 ++++++++++++++++++++++++++++++------------- 2 files changed, 68 insertions(+), 27 deletions(-) diff --git a/Castalia/.gitignore b/Castalia/.gitignore index f29b5556..10b0ded3 100644 --- a/Castalia/.gitignore +++ b/Castalia/.gitignore @@ -6,4 +6,5 @@ src/Makefile .cmdenv-log .qtenvrc +.vscode Castalia-Trace.txt \ No newline at end of file diff --git a/Castalia/bin/Castalia b/Castalia/bin/Castalia index a99f1c1c..5882bc12 100755 --- a/Castalia/bin/Castalia +++ b/Castalia/bin/Castalia @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python2 # **************************************************************************** # * Copyright: National ICT Australia, 2009 - 2010 * # * Developed at the ATP lab, Networked Systems research theme * @@ -17,18 +17,22 @@ from optparse import OptionParser #initialise important paths pathToBin = sys.path[0] -pathToCastalia = os.path.abspath(pathToBin + "/../") +pathToCastalia = os.path.abspath(pathToBin + "/../src") pathToCastaliaBin = pathToCastalia + "/CastaliaBin"; -pathToExtract = pathToBin + "/extractOmnetppINI" +pathToCastaliaBinExe = pathToCastaliaBin + ".exe"; +pathToExtract = "python2 "+pathToBin + "/extractOmnetppINI" if len(sys.argv) == 1: has_header = 0 for file in os.listdir('./'): if not os.path.isfile(file): continue if not re.search(r"\.ini$",file): continue - lines = commands.getoutput(pathToExtract + " " + file).split("\n") + print (pathToExtract) + #lines = commands.getoutput(pathToExtract + " " + file).split("\n") + lines = subprocess.check_output(pathToExtract + " " + file, shell=True).split("\n") if len(lines) < 2: continue has_general = 0; + print ("\n File \n"+ file + " Lines ") list = [] for line in lines: m = re.match(r"\[General\]", line) @@ -41,12 +45,12 @@ if len(sys.argv) == 1: if has_general: if not has_header: has_header = 1 - print "\nList of available input files and configurations:" - print "\n* "+file - print "\t"+"\n\t".join(list) + print ("\nList of available input files and configurations:") + print ("\n* "+file) + print ("\t"+"\n\t".join(list)) if not has_header: - print "\nNo castalia input files found in this directory\n" - else: print "" + print ("\nNo castalia input files found in this directory\n") + else: print ("") quit() parser = OptionParser(usage="usage: %prog [options]") @@ -55,6 +59,7 @@ parser.add_option("-i","--input", dest="input", type="string", default="omnetpp. parser.add_option("-d","--debug", dest="debug", default=False, action="store_true", help="Debug mode, will display results from each CastaliaBin execution") parser.add_option("-o","--output", dest="output", type="string", metavar="FILE", help="Select output file for writing results, generated from current date by default") parser.add_option("-r","--repeat", dest="repeat", type="int", metavar="N", default=1, help="Number of repetitions for each unique scenario") +parser.add_option("-u","--userinterface", dest="interface", type="string", default="Cmdenv", help="Select the interface type, values Cmdenv, Qtenv and Tkenv, default Cmdenv") (options,args) = parser.parse_args() if len(args): @@ -126,16 +131,27 @@ def detectCPUs(): return ncpus return 1 # Default -ini = commands.getoutput(pathToExtract + " " + options.input).split("\n") +ini = subprocess.check_output(pathToExtract + " " + options.input, shell=True).split("\n") +#ini = commands.getoutput(pathToExtract + " " + options.input).split("\n") if len(ini) < 2: quit("\nERROR: Unable to read configuration") + +isExec = 0 if not os.path.exists(pathToCastaliaBin) or not os.path.isfile(pathToCastaliaBin): - quit("\nERROR: CastaliaBin not found (need to run make?)") + if not os.path.exists(pathToCastaliaBinExe) or not os.path.isfile(pathToCastaliaBinExe): # check exect + quit("\nERROR: CastaliaBin not found (need to run make?)") + else: + isExec = 1 section = "" configDictionary = {} configIterations = {} +ind = 0 + for line in ini: + ind = ind+1 + if "\r" in line: + line = line[:-1] if (line == "[General]"): section = "General" continue @@ -146,9 +162,13 @@ for line in ini: continue k = re.split("\s=\s",line,1) + if (len(k) != 2 and len(ini) == ind): + continue if (len(k) != 2): + print ("Line " + str(ind)) quit("\nERROR: Unexpected line in configuration file:\n" + line) + currentConfig = {} if (configDictionary.has_key(section)): currentConfig = configDictionary[section] @@ -291,13 +311,23 @@ if options.output: fr = open(options.output,"w") else: fr = open(datetime.now().strftime("%y%m%d-%H%M%S")+".txt","w") fr.write("Castalia| what:" + options.config + " (" + str(options.repeat) + ")\n") fr.write("Castalia| when:" + datetime.now().strftime("%Y-%m-%d %H:%M") + "\n") +if(options.config == "General"): + fr.write("Castalia| label:General\n") # If missing -r_castalia = re.compile("^Castalia\|\s+(.+)$") +r_castalia = re.compile('^((?!Castalia\|).)*$') #re.compile("^Castalia\|\s+(.+)$") r_scenario = re.compile("Scenario:\s(.*)\$repetition=(\d+)$") -r_progress = re.compile("^\*\* Event \#\d+\s+T=(\S+)\s+Elapsed: (\S+)s.+\s(\d+)\% completed") +r_progress = re.compile("^\*\* Event \#\d+\s+t=(\S+)\s+Elapsed: (\S+)s.+\s(\d+)\% completed") #re.compile("^\*\* Event \#\d+\s+T=(\S+)\s+Elapsed: (\S+)s.+\s(\d+)\% completed") r_newrun = re.compile("Preparing for running configuration General, run #(\d+)") r_totalrun = re.compile("Number of runs: (\d+)") + +interface = "Cmdenv" +if options.interface: + if options.interface == "Qtenv": + interface = "Qtenv" + elif options.interface == "Tkenv": + interface = "Tkenv" + for ini in iniList: ini_num += 1 baselabel = label = labelList.pop(0) @@ -308,34 +338,44 @@ for ini in iniList: f.write(k + " = " + ini[k] + "\n") f.close(); has_output = 0 + if sys.version_info > (2,7): - data = subprocess.check_output([pathToCastaliaBin, '-f', 'omnetpp.tmp', '-x', 'General']).split("\n") + if not isExec: + data = subprocess.check_output([pathToCastaliaBin,'-f', 'omnetpp.tmp', '-c', 'General','-q', 'runs']).split("\n") + else: + data = subprocess.check_output([pathToCastaliaBinExe, '-f','omnetpp.tmp', '-c', 'General','-q', 'runs']).split("\n") else: - data = subprocess.Popen([pathToCastaliaBin, '-f', 'omnetpp.tmp', '-x', 'General'], stdout=subprocess.PIPE).communicate()[0].split("\n") + if not isExec: + data = subprocess.Popen([pathToCastaliaBin,'-f', 'omnetpp.tmp','-c', 'General','-q', 'runs'], stdout=subprocess.PIPE).communicate()[0].split("\n") + else: + data = subprocess.Popen([pathToCastaliaBinExe,'-f', 'omnetpp.tmp','-c', 'General','-q', 'runs'], stdout=subprocess.PIPE).communicate()[0].split("\n") - if len(data) > 6: data = data[6] + if len(data) > 7: data = data[7] else: data = "" m = r_totalrun.match(data) if (m): runs = "/" + m.group(1) else: - print "WARNING: unable to determine total simulation runs" + print ("WARNING: unable to determine total simulation runs") runs = "" - - CastaliaProcess = subprocess.Popen([pathToCastaliaBin, '-f', 'omnetpp.tmp'], stdout = subprocess.PIPE) + if not isExec: + CastaliaProcess = subprocess.Popen([pathToCastaliaBin,'-u', interface, '-f', 'omnetpp.tmp'], stdout = subprocess.PIPE) + else: + CastaliaProcess = subprocess.Popen([pathToCastaliaBinExe,'-u', interface, '-f', 'omnetpp.tmp'], stdout = subprocess.PIPE) raw_output = [] + while 1: line = CastaliaProcess.stdout.readline() if not line: break m = r_castalia.match(line) - if (m): #this is an output line, starting with 'Castalia |' prefix - fr.write(line) + if (not m): #this is an output line, starting with 'Castalia |' prefix + fr.write(line[7:]) has_output = 1 continue - if options.debug: print line, + if options.debug: print (line), m = r_progress.match(line) if (m): #this is simulation progress line @@ -343,13 +383,13 @@ for ini in iniList: elapsed = float(m.group(2)) percent = int(m.group(3)) if not options.debug: - print "\rRunning Castalia:\tConfiguration", str(ini_num) + "/" + str(len(iniList)), - print "\tRun", str(run) + runs, - print "\tComplete", str(percent) + "%", + print ("\rRunning Castalia:\tConfiguration", str(ini_num) + "/" + str(len(iniList))), + print ("\tRun", str(run) + runs), + print ("\tComplete", str(percent) + "%"), if percent == 100: #end of this run, record execution time in the results file if not options.debug: - print "\tTime taken", str(timedelta(0,elapsed)) + print ("\tTime taken", str(timedelta(0,elapsed))) fr.write("Castalia| module:SN.Simulation\n") fr.write("Castalia| simple output name:Execution time, seconds\n") fr.write("Castalia| " + str(elapsed) + "\n") @@ -381,7 +421,7 @@ for ini in iniList: if not has_output: fr.write("\n".join(raw_output)) - print "\n".join(raw_output) + print ("\n".join(raw_output)) if not options.debug: commands.getoutput("rm omnetpp.tmp") fr.close() From 1ada3b9824b153baba9c28cbe00db17066e594d8 Mon Sep 17 00:00:00 2001 From: Rudolf Hornig Date: Thu, 25 Apr 2019 15:07:25 +0200 Subject: [PATCH 09/10] version update / changelog update --- Castalia/CHANGES.txt | 434 ++++++++++++++++++++++--------------------- Castalia/Readme.txt | 18 +- Castalia/VERSION | 6 +- 3 files changed, 231 insertions(+), 227 deletions(-) diff --git a/Castalia/CHANGES.txt b/Castalia/CHANGES.txt index c3c38036..511d2138 100644 --- a/Castalia/CHANGES.txt +++ b/Castalia/CHANGES.txt @@ -1,214 +1,220 @@ -Castalia 3.3: Changes from 3.2 ------------------------------------------- -- Redesigned 802.15.4 MAC module. Modular to allow expansion. - Several bug fixes due to the redesign. Now there is a base - module to implement the basis of the protocol and then further - modules can be developed to take decisions not specified by the - protocol. An an example we offer StaticGTS which is a module - that assigns statically GTS slots. - -- Wireless channel interface created. Base module moved to - defaultChannel. SensorNetwork.ned changed accordignly. - TraceChannel added - -- Castalia script offers new progress output - CastaliaResults supports better averaging - CastaliaPlot offers new labels to handle legends - -- New output by several modules - ThroughputTest: Packet success and loss rate, maximum delay - Resource manager: Remaining energy, network lifetime, dead nodes - Simulation: execution time, sim/exec time ratio - -- Bug fixes in BaselineBanMac (pastSyncInterval flag and - transmitting when UNCONNECTED). Some output renaming to - match 802.15.4 outputs (for easy comparison) - -- Bug fixes in TMAC TunableMAC bug fixes regarding decapsulate, - and TMAC using own seqNum - - - -Castalia 3.2: Changes from 3.1 ------------------------------------------- -- Bug fixes: - -sleeping bug in 802.15.4 MAC - -possible segfault in TimerService code - -bugs with DESTROY_NODE and OUT_OF_ENERGY msgs - -bug with NODE_STARTUP. Now the Radio and - Resource Mgr receive and are affected by - the node startup msg - -readRSSI was returning -197dBm when no signal - was received. Now the noiseFloor is returned - -error accumulating in rare cases due to - subtract_dBm(). Now this method is not used. - -- TunableMAC: changed the beacon TX to not leave - gaps. Collect richer output - -- Better structured and cleaned the Virtual app/ - rouring/MAC classes and associated generic packets. - -- VirtualApp: empty appID means no filtering of packets - -- Added --title and --scale flags to CastaliaPlot, - added check for valid gnuplot executable - -- Images (png, gif, jpg) produced with CastaliaPlot - contain in the header metadata the full command - that produced them. - - -Castalia 3.1: Changes from 3.0 ------------------------------------------- -- Introduction of CastaliaPlot to create graphs - automatically based on CastaliaResults output - -- Features added to CastaliaResults - e.g., options --all --sum -v - -- Enhanced Tunable MAC with CSMA persistence - options, and TX options - -- Dublicate packets handled in virtual routing - and virtual MAC modules - -- Radio module enhanced to handle TXing without - interruption - -- Minor cleanup and bug fixes: - Cleaned up throughput app, - bugs in GTS 802.15.4MAC - bug in multipathRings - - - -Castalia 3.0: Major changes from 2.3 ------------------------------------------- -- Porting to OMNeT++ 4.x - -- Major restructuring of input and output - 1) Standard way to create output and trace files - 2) Introduced Castalia script to assist in - creating complex simulation scenarios without - the need for custom scripting solutions - 3) Introduced CastaliaResults script to assist - in processing the output easily without the - need for custom scripting solutions - -- Created virtual classes for app, net, and MAC. - New apps or protocols can be easily derived - from these classes, which provide considerable - abstraction tools and services. - -- Independent service of timers to be used with - the app routing and MAC modules - -- Complete redefinition of Radio module - 1) Radio receives signals from the channel. - Reception/interference calculations done - in radio now (instead of channel) - 2) More accurate interference calculation - (dynamic intereference accounted not just max) - 3) Ability to calculate number of bit errors - in a packet (not just 0/1) - 4) Multiple RX modes (with different power consumed, - datarate, modulation) that can change dynamically - 5) Multiple sleep levels. - 6) Transition times and power easily defined - 7) Multiple carrier frequencies, than ca change dynamically - 8) RSSI calculation is modeled more accurately taking - into account the history of signals a radio experiences - -- Implementation of the Baseline BAN MAC as described - in the IEEE 802.15 Task Group 6 proposal. - - -Castalia 2.3: Changes from ver 2.2 ------------------------------------------- -- Implemented GTS mode in 802.15.4 MAC, - fixed several bugs. -- TMAC enhanced to select mechanisms for TA - extension and collision resolution -- Minor modifications in bridgeTestRun script - added average energy consumption -- Batch script for running BAN simulations added - - -Castalia 2.2: Changes from ver 2.1 ------------------------------------------- -- Implementation of 802.15.4 MAC (CAP, beacon mode) -- added modulation types diffBPSK, diffQPSK -- throughtputTest application measuring latency -- throughtputTest app supporting multihop traffic - with nextRecipient parameter -- Bug with TMAC sending many RTS packets fixed - - - -Castalia 2.1: Changes from ver 2.0 ------------------------------------------- -- T-MAC fully tested and debugged -- S-MAC implemented as variant of T-MAC -- Replaced buffer implementations with std -- parsePRRMap() debugged and complete functionality -- Automated test suite implemented, look in Tests/ -- 3 more parameters for sensing devices - - - -Castalia 2.0: Major changes from ver 1.3 ------------------------------------------- - -== Wireless channel module -1. Mobility support (!) -2. Time-varying links (!) -3. 3D coordinates and orientation -4. the 2 directions of a link correlated - with a dedicated parameter - -== Radio Module -1. Custom modulation allowed by defining - a SNR->BER array. -2. variance in TX power introduced. The radio - now sends explicit TxPower to the channel, - instead of a power level index. - - -== MAC module -1. TMAC implemented - - -== Application modules -1. Test throughput app introduced - - - -Castalia 1.3: Changes from ver 1.2 ------------------------------------------- -- Implementation of 2 routing protocols -- Implementation of 2 new example applications (using routing protocols) -- Advanced ability to define various degrees of simpler channel and radio models -- Bug fixes with the TunableMAC and routing modules - - - - -Castalia 1.2: Changes from ver 1.1 ------------------------------------------- -- Creation of a network/routing module. -- Ability to modify several radio and MAC parameters - through the application code at run-time. -- Minor bug fixes relating with EV. -- Richer debug messages - (awaiting for the visualization tool) - - - -Castalia 1.1: Changes from ver 1.0 ------------------------------------------- --Restructuring of the input (omnetpp.ini parameter file) - to be more modular. --Restructuring of the output to be clearer. --Changes to the run scripts to accomodate the above changes. --Minor bug fixes relating building problems under Cygwin. +Catalia 3.4: Changes from 3.3 +------------------------------------------ +- Ported to use OMNeT++ 5.4.1. No other functional changes. + + + +Castalia 3.3: Changes from 3.2 +------------------------------------------ +- Redesigned 802.15.4 MAC module. Modular to allow expansion. + Several bug fixes due to the redesign. Now there is a base + module to implement the basis of the protocol and then further + modules can be developed to take decisions not specified by the + protocol. An an example we offer StaticGTS which is a module + that assigns statically GTS slots. + +- Wireless channel interface created. Base module moved to + defaultChannel. SensorNetwork.ned changed accordignly. + TraceChannel added + +- Castalia script offers new progress output + CastaliaResults supports better averaging + CastaliaPlot offers new labels to handle legends + +- New output by several modules + ThroughputTest: Packet success and loss rate, maximum delay + Resource manager: Remaining energy, network lifetime, dead nodes + Simulation: execution time, sim/exec time ratio + +- Bug fixes in BaselineBanMac (pastSyncInterval flag and + transmitting when UNCONNECTED). Some output renaming to + match 802.15.4 outputs (for easy comparison) + +- Bug fixes in TMAC TunableMAC bug fixes regarding decapsulate, + and TMAC using own seqNum + + + +Castalia 3.2: Changes from 3.1 +------------------------------------------ +- Bug fixes: + -sleeping bug in 802.15.4 MAC + -possible segfault in TimerService code + -bugs with DESTROY_NODE and OUT_OF_ENERGY msgs + -bug with NODE_STARTUP. Now the Radio and + Resource Mgr receive and are affected by + the node startup msg + -readRSSI was returning -197dBm when no signal + was received. Now the noiseFloor is returned + -error accumulating in rare cases due to + subtract_dBm(). Now this method is not used. + +- TunableMAC: changed the beacon TX to not leave + gaps. Collect richer output + +- Better structured and cleaned the Virtual app/ + rouring/MAC classes and associated generic packets. + +- VirtualApp: empty appID means no filtering of packets + +- Added --title and --scale flags to CastaliaPlot, + added check for valid gnuplot executable + +- Images (png, gif, jpg) produced with CastaliaPlot + contain in the header metadata the full command + that produced them. + + +Castalia 3.1: Changes from 3.0 +------------------------------------------ +- Introduction of CastaliaPlot to create graphs + automatically based on CastaliaResults output + +- Features added to CastaliaResults + e.g., options --all --sum -v + +- Enhanced Tunable MAC with CSMA persistence + options, and TX options + +- Dublicate packets handled in virtual routing + and virtual MAC modules + +- Radio module enhanced to handle TXing without + interruption + +- Minor cleanup and bug fixes: + Cleaned up throughput app, + bugs in GTS 802.15.4MAC + bug in multipathRings + + + +Castalia 3.0: Major changes from 2.3 +------------------------------------------ +- Porting to OMNeT++ 4.x + +- Major restructuring of input and output + 1) Standard way to create output and trace files + 2) Introduced Castalia script to assist in + creating complex simulation scenarios without + the need for custom scripting solutions + 3) Introduced CastaliaResults script to assist + in processing the output easily without the + need for custom scripting solutions + +- Created virtual classes for app, net, and MAC. + New apps or protocols can be easily derived + from these classes, which provide considerable + abstraction tools and services. + +- Independent service of timers to be used with + the app routing and MAC modules + +- Complete redefinition of Radio module + 1) Radio receives signals from the channel. + Reception/interference calculations done + in radio now (instead of channel) + 2) More accurate interference calculation + (dynamic intereference accounted not just max) + 3) Ability to calculate number of bit errors + in a packet (not just 0/1) + 4) Multiple RX modes (with different power consumed, + datarate, modulation) that can change dynamically + 5) Multiple sleep levels. + 6) Transition times and power easily defined + 7) Multiple carrier frequencies, than ca change dynamically + 8) RSSI calculation is modeled more accurately taking + into account the history of signals a radio experiences + +- Implementation of the Baseline BAN MAC as described + in the IEEE 802.15 Task Group 6 proposal. + + +Castalia 2.3: Changes from ver 2.2 +------------------------------------------ +- Implemented GTS mode in 802.15.4 MAC, + fixed several bugs. +- TMAC enhanced to select mechanisms for TA + extension and collision resolution +- Minor modifications in bridgeTestRun script + added average energy consumption +- Batch script for running BAN simulations added + + +Castalia 2.2: Changes from ver 2.1 +------------------------------------------ +- Implementation of 802.15.4 MAC (CAP, beacon mode) +- added modulation types diffBPSK, diffQPSK +- throughtputTest application measuring latency +- throughtputTest app supporting multihop traffic + with nextRecipient parameter +- Bug with TMAC sending many RTS packets fixed + + + +Castalia 2.1: Changes from ver 2.0 +------------------------------------------ +- T-MAC fully tested and debugged +- S-MAC implemented as variant of T-MAC +- Replaced buffer implementations with std +- parsePRRMap() debugged and complete functionality +- Automated test suite implemented, look in Tests/ +- 3 more parameters for sensing devices + + + +Castalia 2.0: Major changes from ver 1.3 +------------------------------------------ + +== Wireless channel module +1. Mobility support (!) +2. Time-varying links (!) +3. 3D coordinates and orientation +4. the 2 directions of a link correlated + with a dedicated parameter + +== Radio Module +1. Custom modulation allowed by defining + a SNR->BER array. +2. variance in TX power introduced. The radio + now sends explicit TxPower to the channel, + instead of a power level index. + + +== MAC module +1. TMAC implemented + + +== Application modules +1. Test throughput app introduced + + + +Castalia 1.3: Changes from ver 1.2 +------------------------------------------ +- Implementation of 2 routing protocols +- Implementation of 2 new example applications (using routing protocols) +- Advanced ability to define various degrees of simpler channel and radio models +- Bug fixes with the TunableMAC and routing modules + + + + +Castalia 1.2: Changes from ver 1.1 +------------------------------------------ +- Creation of a network/routing module. +- Ability to modify several radio and MAC parameters + through the application code at run-time. +- Minor bug fixes relating with EV. +- Richer debug messages + (awaiting for the visualization tool) + + + +Castalia 1.1: Changes from ver 1.0 +------------------------------------------ +-Restructuring of the input (omnetpp.ini parameter file) + to be more modular. +-Restructuring of the output to be clearer. +-Changes to the run scripts to accomodate the above changes. +-Minor bug fixes relating building problems under Cygwin. diff --git a/Castalia/Readme.txt b/Castalia/Readme.txt index fc9b5535..44980421 100644 --- a/Castalia/Readme.txt +++ b/Castalia/Readme.txt @@ -12,7 +12,7 @@ TO INSTALL Castalia type: -> ./makemake +> make makefiles > make READ the Instalation guide for more details. @@ -22,29 +22,27 @@ In the Root directory there are the following contents : bin --> Dir containing the Castalia and CastaliaResults scripts -config --> Dir containing the configuration file used by makemake - out --> Dir produced by the build process. Contains all interediate - built files, as well as the Castalia executable. + built files, as well as the Castalia executable. Simulations --> Dir containing various simulation configuration files - Simulations can easily be run from its sub dirs. + Simulations can easily be run from its sub dirs. src --> The source code of Castalia (*.cc, *.h, *.msg, *.ned files) The directory's structure corresponds to the structure of the - compound modules and submodules that Castalia has. + compound modules and submodules that Castalia has. -Makefile --> File created after the invocation of the makemake script. +src/Makefile --> File created after the invocation of the makemake script. -makemake --> The script to generate the appropriate Makefiles. It uses +makemake --> The script to generate the appropriate Makefiles. It uses OMNeT's opp_makemake tool. -CastaliaBin --> The Castalia executable. A soft link to out/gcc-debug/CastaliaBin +src/CastaliaBin --> The Castalia executable. (or CataliaBin_dbg for the debug version) CHANGES.txt --> The change log. LICENSE --> The License in plain text -VERSION --> File with the current version/build info +VERSION --> File with the current version/build info =============== READ THE INSTALATION GUIDE AND THE USER'S MANUAL ============== diff --git a/Castalia/VERSION b/Castalia/VERSION index 805eb40a..3d75d156 100644 --- a/Castalia/VERSION +++ b/Castalia/VERSION @@ -1,3 +1,3 @@ -Castalia 3.3 -This version released on 15-05-2013 -[http://castalia.research.nicta.com.au] +Castalia 3.4 +This version released on 25-04-2019 +[https://github.com/boulis/Castalia] From 332902b2cb0eefaf8fd8499839991c0393bef6f7 Mon Sep 17 00:00:00 2001 From: Rudolf Hornig Date: Thu, 25 Apr 2019 16:36:34 +0200 Subject: [PATCH 10/10] rearranged folders. Everything moved to the top level. --- Castalia/.cproject => .cproject | 0 Castalia/.gitignore => .gitignore | 0 Castalia/.nedexclusions => .nedexclusions | 0 Castalia/.nedfolders => .nedfolders | 0 Castalia/.oppbuildspec => .oppbuildspec | 0 Castalia/.oppfeaturestate => .oppfeaturestate | 0 Castalia/.project => .project | 0 Castalia/CHANGES.txt => CHANGES.txt | 0 Castalia/LICENSE => LICENSE | 0 Castalia/Makefile => Makefile | 0 Castalia/Readme.txt => Readme.txt | 2 ++ .../Simulations => Simulations}/BANtest/omnetpp.ini | 0 .../BridgeTest/omnetpp.ini | 0 .../Parameters/Castalia.ini | 0 .../Parameters/MAC/CSMA.ini | 0 .../Parameters/MAC/SMAC.ini | 0 .../PhysicalProcess/node0_asssignedValue40.ini | 0 .../PhysicalProcess/node6_asssignedValue40.ini | 0 .../Parameters/Radio/BANRadio.txt | 0 .../Parameters/Radio/CC1000.txt | 0 .../Parameters/Radio/CC2420.txt | 0 .../Parameters/SensorDevice/Accelerometer.ini | 0 .../WirelessChannel/BANmodels/TemporalModel.txt | 0 .../WirelessChannel/BANmodels/pathLossMap.txt | 0 .../Parameters/WirelessChannel/Ideal.ini | 0 .../connectivityMap/omnetpp.ini | 0 .../radioTest/omnetpp.ini | 0 .../simpleAggregation/omnetpp.ini | 0 .../valuePropagation/omnetpp.ini | 0 .../valueReporting/omnetpp.ini | 0 Castalia/VERSION => VERSION | 0 {Castalia/bin => bin}/Castalia | 0 {Castalia/bin => bin}/CastaliaPlot | 0 {Castalia/bin => bin}/CastaliaResults | 0 {Castalia/bin => bin}/extractOmnetppINI | 0 .../Castalia - Installation.docx | Bin .../Castalia - User Manual.docx | Bin Castalia/makemake => makemake | 0 {Castalia/src => src}/CastaliaMessages.h | 0 {Castalia/src => src}/SensorNetwork.ned | 0 .../src => src}/helpStructures/CastaliaModule.cc | 0 .../src => src}/helpStructures/CastaliaModule.h | 0 .../src => src}/helpStructures/DebugInfoWriter.cc | 0 .../src => src}/helpStructures/DebugInfoWriter.h | 0 .../src => src}/helpStructures/TimerService.cc | 0 {Castalia/src => src}/helpStructures/TimerService.h | 0 .../helpStructures/TimerServiceMessage.msg | 0 {Castalia/src => src}/makefrag | 0 {Castalia/src => src}/node/Node.ned | 0 .../node/application/ApplicationPacket.msg | 0 .../node/application/VirtualApplication.cc | 0 .../node/application/VirtualApplication.h | 0 .../node/application/bridgeTest/BridgeTest.cc | 0 .../node/application/bridgeTest/BridgeTest.h | 0 .../node/application/bridgeTest/BridgeTest.ned | 0 .../application/connectivityMap/ConnectivityMap.cc | 0 .../application/connectivityMap/ConnectivityMap.h | 0 .../application/connectivityMap/ConnectivityMap.ned | 0 .../src => src}/node/application/iApplication.ned | 0 .../simpleAggregation/SimpleAggregation.cc | 0 .../simpleAggregation/SimpleAggregation.h | 0 .../simpleAggregation/SimpleAggregation.ned | 0 .../application/throughputTest/ThroughputTest.cc | 0 .../application/throughputTest/ThroughputTest.h | 0 .../application/throughputTest/ThroughputTest.ned | 0 .../valuePropagation/ValuePropagation.cc | 0 .../application/valuePropagation/ValuePropagation.h | 0 .../valuePropagation/ValuePropagation.ned | 0 .../application/valueReporting/ValueReporting.cc | 0 .../application/valueReporting/ValueReporting.h | 0 .../application/valueReporting/ValueReporting.ned | 0 .../valueReporting/ValueReportingPacket.msg | 0 .../node/communication/CommunicationModule.ned | 0 .../node/communication/mac/MacPacket.msg | 0 .../node/communication/mac/VirtualMac.cc | 0 .../src => src}/node/communication/mac/VirtualMac.h | 0 .../mac/baselineBanMac/BaselineBANMac.cc | 0 .../mac/baselineBanMac/BaselineBANMac.h | 0 .../mac/baselineBanMac/BaselineBANMac.ned | 0 .../mac/baselineBanMac/BaselineMacPacket.msg | 0 .../node/communication/mac/bypassMac/BypassMAC.cc | 0 .../node/communication/mac/bypassMac/BypassMAC.h | 0 .../node/communication/mac/bypassMac/BypassMAC.ned | 0 .../src => src}/node/communication/mac/iMac.ned | 0 .../node/communication/mac/mac802154/Basic802154.cc | 0 .../node/communication/mac/mac802154/Basic802154.h | 0 .../communication/mac/mac802154/Basic802154.ned | 0 .../mac/mac802154/Basic802154Packet.msg | 0 .../mac802154/staticGTS802154/StaticGTS802154.cc | 0 .../mac/mac802154/staticGTS802154/StaticGTS802154.h | 0 .../mac802154/staticGTS802154/StaticGTS802154.ned | 0 .../src => src}/node/communication/mac/tMac/TMAC.cc | 0 .../src => src}/node/communication/mac/tMac/TMAC.h | 0 .../node/communication/mac/tMac/TMAC.ned | 0 .../node/communication/mac/tMac/TMacPacket.msg | 0 .../node/communication/mac/tunableMac/TunableMAC.cc | 0 .../node/communication/mac/tunableMac/TunableMAC.h | 0 .../communication/mac/tunableMac/TunableMAC.ned | 0 .../mac/tunableMac/TunableMacControl.msg | 0 .../mac/tunableMac/TunableMacPacket.msg | 0 .../src => src}/node/communication/radio/Radio.cc | 0 .../src => src}/node/communication/radio/Radio.h | 0 .../src => src}/node/communication/radio/Radio.ned | 0 .../communication/radio/RadioControlMessage.msg | 0 .../communication/radio/RadioSupportFunctions.cc | 0 .../communication/radio/RadioSupportFunctions.h | 0 .../node/communication/routing/RoutingPacket.msg | 0 .../node/communication/routing/VirtualRouting.cc | 0 .../node/communication/routing/VirtualRouting.h | 0 .../routing/bypassRouting/BypassRouting.cc | 0 .../routing/bypassRouting/BypassRouting.h | 0 .../routing/bypassRouting/BypassRouting.ned | 0 .../routing/bypassRouting/BypassRoutingPacket.msg | 0 .../node/communication/routing/iRouting.ned | 0 .../multipathRingsRouting/MultipathRingsRouting.cc | 0 .../multipathRingsRouting/MultipathRingsRouting.h | 0 .../multipathRingsRouting/MultipathRingsRouting.ned | 0 .../MultipathRingsRoutingControl.msg | 0 .../MultipathRingsRoutingPacket.msg | 0 .../node/mobilityManager/MobilityManagerMessage.msg | 0 .../node/mobilityManager/VirtualMobilityManager.cc | 0 .../node/mobilityManager/VirtualMobilityManager.h | 0 .../node/mobilityManager/iMobilityManager.ned | 0 .../lineMobilityManager/LineMobilityManager.cc | 0 .../lineMobilityManager/LineMobilityManager.h | 0 .../lineMobilityManager/LineMobilityManager.ned | 0 .../noMobilityManager/NoMobilityManager.cc | 0 .../noMobilityManager/NoMobilityManager.h | 0 .../noMobilityManager/NoMobilityManager.ned | 0 .../node/resourceManager/ResourceManager.cc | 0 .../node/resourceManager/ResourceManager.h | 0 .../node/resourceManager/ResourceManager.ned | 0 .../node/resourceManager/ResourceManagerMessage.msg | 0 .../src => src}/node/sensorManager/SensorManager.cc | 0 .../src => src}/node/sensorManager/SensorManager.h | 0 .../node/sensorManager/SensorManager.ned | 0 .../node/sensorManager/SensorManagerMessage.msg | 0 .../physicalProcess/PhysicalProcessMessage.msg | 0 .../carsPhysicalProcess/CarsPhysicalProcess.cc | 0 .../carsPhysicalProcess/CarsPhysicalProcess.h | 0 .../carsPhysicalProcess/CarsPhysicalProcess.ned | 0 .../CustomizablePhysicalProcess.cc | 0 .../CustomizablePhysicalProcess.h | 0 .../CustomizablePhysicalProcess.ned | 0 .../physicalProcess/iPhysicalProcess.ned | 0 .../wirelessChannel/WirelessChannelMessages.msg | 0 .../defaultChannel/WirelessChannel.cc | 0 .../defaultChannel/WirelessChannel.h | 0 .../defaultChannel/WirelessChannel.ned | 0 .../defaultChannel/WirelessChannelTemporal.cc | 0 .../defaultChannel/WirelessChannelTemporal.h | 0 .../wirelessChannel/iWirelessChannel.ned | 0 .../wirelessChannel/traceChannel/TraceChannel.cc | 0 .../wirelessChannel/traceChannel/TraceChannel.h | 0 .../wirelessChannel/traceChannel/TraceChannel.ned | 0 155 files changed, 2 insertions(+) rename Castalia/.cproject => .cproject (100%) rename Castalia/.gitignore => .gitignore (100%) rename Castalia/.nedexclusions => .nedexclusions (100%) rename Castalia/.nedfolders => .nedfolders (100%) rename Castalia/.oppbuildspec => .oppbuildspec (100%) rename Castalia/.oppfeaturestate => .oppfeaturestate (100%) rename Castalia/.project => .project (100%) rename Castalia/CHANGES.txt => CHANGES.txt (100%) rename Castalia/LICENSE => LICENSE (100%) rename Castalia/Makefile => Makefile (100%) rename Castalia/Readme.txt => Readme.txt (96%) rename {Castalia/Simulations => Simulations}/BANtest/omnetpp.ini (100%) rename {Castalia/Simulations => Simulations}/BridgeTest/omnetpp.ini (100%) rename {Castalia/Simulations => Simulations}/Parameters/Castalia.ini (100%) rename {Castalia/Simulations => Simulations}/Parameters/MAC/CSMA.ini (100%) rename {Castalia/Simulations => Simulations}/Parameters/MAC/SMAC.ini (100%) rename {Castalia/Simulations => Simulations}/Parameters/PhysicalProcess/node0_asssignedValue40.ini (100%) rename {Castalia/Simulations => Simulations}/Parameters/PhysicalProcess/node6_asssignedValue40.ini (100%) rename {Castalia/Simulations => Simulations}/Parameters/Radio/BANRadio.txt (100%) rename {Castalia/Simulations => Simulations}/Parameters/Radio/CC1000.txt (100%) rename {Castalia/Simulations => Simulations}/Parameters/Radio/CC2420.txt (100%) rename {Castalia/Simulations => Simulations}/Parameters/SensorDevice/Accelerometer.ini (100%) rename {Castalia/Simulations => Simulations}/Parameters/WirelessChannel/BANmodels/TemporalModel.txt (100%) rename {Castalia/Simulations => Simulations}/Parameters/WirelessChannel/BANmodels/pathLossMap.txt (100%) rename {Castalia/Simulations => Simulations}/Parameters/WirelessChannel/Ideal.ini (100%) rename {Castalia/Simulations => Simulations}/connectivityMap/omnetpp.ini (100%) rename {Castalia/Simulations => Simulations}/radioTest/omnetpp.ini (100%) rename {Castalia/Simulations => Simulations}/simpleAggregation/omnetpp.ini (100%) rename {Castalia/Simulations => Simulations}/valuePropagation/omnetpp.ini (100%) rename {Castalia/Simulations => Simulations}/valueReporting/omnetpp.ini (100%) rename Castalia/VERSION => VERSION (100%) rename {Castalia/bin => bin}/Castalia (100%) rename {Castalia/bin => bin}/CastaliaPlot (100%) rename {Castalia/bin => bin}/CastaliaResults (100%) rename {Castalia/bin => bin}/extractOmnetppINI (100%) rename Castalia - Installation.docx => doc/Castalia - Installation.docx (100%) rename Castalia - User Manual.docx => doc/Castalia - User Manual.docx (100%) rename Castalia/makemake => makemake (100%) rename {Castalia/src => src}/CastaliaMessages.h (100%) rename {Castalia/src => src}/SensorNetwork.ned (100%) rename {Castalia/src => src}/helpStructures/CastaliaModule.cc (100%) rename {Castalia/src => src}/helpStructures/CastaliaModule.h (100%) rename {Castalia/src => src}/helpStructures/DebugInfoWriter.cc (100%) rename {Castalia/src => src}/helpStructures/DebugInfoWriter.h (100%) rename {Castalia/src => src}/helpStructures/TimerService.cc (100%) rename {Castalia/src => src}/helpStructures/TimerService.h (100%) rename {Castalia/src => src}/helpStructures/TimerServiceMessage.msg (100%) rename {Castalia/src => src}/makefrag (100%) rename {Castalia/src => src}/node/Node.ned (100%) rename {Castalia/src => src}/node/application/ApplicationPacket.msg (100%) rename {Castalia/src => src}/node/application/VirtualApplication.cc (100%) rename {Castalia/src => src}/node/application/VirtualApplication.h (100%) rename {Castalia/src => src}/node/application/bridgeTest/BridgeTest.cc (100%) rename {Castalia/src => src}/node/application/bridgeTest/BridgeTest.h (100%) rename {Castalia/src => src}/node/application/bridgeTest/BridgeTest.ned (100%) rename {Castalia/src => src}/node/application/connectivityMap/ConnectivityMap.cc (100%) rename {Castalia/src => src}/node/application/connectivityMap/ConnectivityMap.h (100%) rename {Castalia/src => src}/node/application/connectivityMap/ConnectivityMap.ned (100%) rename {Castalia/src => src}/node/application/iApplication.ned (100%) rename {Castalia/src => src}/node/application/simpleAggregation/SimpleAggregation.cc (100%) rename {Castalia/src => src}/node/application/simpleAggregation/SimpleAggregation.h (100%) rename {Castalia/src => src}/node/application/simpleAggregation/SimpleAggregation.ned (100%) rename {Castalia/src => src}/node/application/throughputTest/ThroughputTest.cc (100%) rename {Castalia/src => src}/node/application/throughputTest/ThroughputTest.h (100%) rename {Castalia/src => src}/node/application/throughputTest/ThroughputTest.ned (100%) rename {Castalia/src => src}/node/application/valuePropagation/ValuePropagation.cc (100%) rename {Castalia/src => src}/node/application/valuePropagation/ValuePropagation.h (100%) rename {Castalia/src => src}/node/application/valuePropagation/ValuePropagation.ned (100%) rename {Castalia/src => src}/node/application/valueReporting/ValueReporting.cc (100%) rename {Castalia/src => src}/node/application/valueReporting/ValueReporting.h (100%) rename {Castalia/src => src}/node/application/valueReporting/ValueReporting.ned (100%) rename {Castalia/src => src}/node/application/valueReporting/ValueReportingPacket.msg (100%) rename {Castalia/src => src}/node/communication/CommunicationModule.ned (100%) rename {Castalia/src => src}/node/communication/mac/MacPacket.msg (100%) rename {Castalia/src => src}/node/communication/mac/VirtualMac.cc (100%) rename {Castalia/src => src}/node/communication/mac/VirtualMac.h (100%) rename {Castalia/src => src}/node/communication/mac/baselineBanMac/BaselineBANMac.cc (100%) rename {Castalia/src => src}/node/communication/mac/baselineBanMac/BaselineBANMac.h (100%) rename {Castalia/src => src}/node/communication/mac/baselineBanMac/BaselineBANMac.ned (100%) rename {Castalia/src => src}/node/communication/mac/baselineBanMac/BaselineMacPacket.msg (100%) rename {Castalia/src => src}/node/communication/mac/bypassMac/BypassMAC.cc (100%) rename {Castalia/src => src}/node/communication/mac/bypassMac/BypassMAC.h (100%) rename {Castalia/src => src}/node/communication/mac/bypassMac/BypassMAC.ned (100%) rename {Castalia/src => src}/node/communication/mac/iMac.ned (100%) rename {Castalia/src => src}/node/communication/mac/mac802154/Basic802154.cc (100%) rename {Castalia/src => src}/node/communication/mac/mac802154/Basic802154.h (100%) rename {Castalia/src => src}/node/communication/mac/mac802154/Basic802154.ned (100%) rename {Castalia/src => src}/node/communication/mac/mac802154/Basic802154Packet.msg (100%) rename {Castalia/src => src}/node/communication/mac/mac802154/staticGTS802154/StaticGTS802154.cc (100%) rename {Castalia/src => src}/node/communication/mac/mac802154/staticGTS802154/StaticGTS802154.h (100%) rename {Castalia/src => src}/node/communication/mac/mac802154/staticGTS802154/StaticGTS802154.ned (100%) rename {Castalia/src => src}/node/communication/mac/tMac/TMAC.cc (100%) rename {Castalia/src => src}/node/communication/mac/tMac/TMAC.h (100%) rename {Castalia/src => src}/node/communication/mac/tMac/TMAC.ned (100%) rename {Castalia/src => src}/node/communication/mac/tMac/TMacPacket.msg (100%) rename {Castalia/src => src}/node/communication/mac/tunableMac/TunableMAC.cc (100%) rename {Castalia/src => src}/node/communication/mac/tunableMac/TunableMAC.h (100%) rename {Castalia/src => src}/node/communication/mac/tunableMac/TunableMAC.ned (100%) rename {Castalia/src => src}/node/communication/mac/tunableMac/TunableMacControl.msg (100%) rename {Castalia/src => src}/node/communication/mac/tunableMac/TunableMacPacket.msg (100%) rename {Castalia/src => src}/node/communication/radio/Radio.cc (100%) rename {Castalia/src => src}/node/communication/radio/Radio.h (100%) rename {Castalia/src => src}/node/communication/radio/Radio.ned (100%) rename {Castalia/src => src}/node/communication/radio/RadioControlMessage.msg (100%) rename {Castalia/src => src}/node/communication/radio/RadioSupportFunctions.cc (100%) rename {Castalia/src => src}/node/communication/radio/RadioSupportFunctions.h (100%) rename {Castalia/src => src}/node/communication/routing/RoutingPacket.msg (100%) rename {Castalia/src => src}/node/communication/routing/VirtualRouting.cc (100%) rename {Castalia/src => src}/node/communication/routing/VirtualRouting.h (100%) rename {Castalia/src => src}/node/communication/routing/bypassRouting/BypassRouting.cc (100%) rename {Castalia/src => src}/node/communication/routing/bypassRouting/BypassRouting.h (100%) rename {Castalia/src => src}/node/communication/routing/bypassRouting/BypassRouting.ned (100%) rename {Castalia/src => src}/node/communication/routing/bypassRouting/BypassRoutingPacket.msg (100%) rename {Castalia/src => src}/node/communication/routing/iRouting.ned (100%) rename {Castalia/src => src}/node/communication/routing/multipathRingsRouting/MultipathRingsRouting.cc (100%) rename {Castalia/src => src}/node/communication/routing/multipathRingsRouting/MultipathRingsRouting.h (100%) rename {Castalia/src => src}/node/communication/routing/multipathRingsRouting/MultipathRingsRouting.ned (100%) rename {Castalia/src => src}/node/communication/routing/multipathRingsRouting/MultipathRingsRoutingControl.msg (100%) rename {Castalia/src => src}/node/communication/routing/multipathRingsRouting/MultipathRingsRoutingPacket.msg (100%) rename {Castalia/src => src}/node/mobilityManager/MobilityManagerMessage.msg (100%) rename {Castalia/src => src}/node/mobilityManager/VirtualMobilityManager.cc (100%) rename {Castalia/src => src}/node/mobilityManager/VirtualMobilityManager.h (100%) rename {Castalia/src => src}/node/mobilityManager/iMobilityManager.ned (100%) rename {Castalia/src => src}/node/mobilityManager/lineMobilityManager/LineMobilityManager.cc (100%) rename {Castalia/src => src}/node/mobilityManager/lineMobilityManager/LineMobilityManager.h (100%) rename {Castalia/src => src}/node/mobilityManager/lineMobilityManager/LineMobilityManager.ned (100%) rename {Castalia/src => src}/node/mobilityManager/noMobilityManager/NoMobilityManager.cc (100%) rename {Castalia/src => src}/node/mobilityManager/noMobilityManager/NoMobilityManager.h (100%) rename {Castalia/src => src}/node/mobilityManager/noMobilityManager/NoMobilityManager.ned (100%) rename {Castalia/src => src}/node/resourceManager/ResourceManager.cc (100%) rename {Castalia/src => src}/node/resourceManager/ResourceManager.h (100%) rename {Castalia/src => src}/node/resourceManager/ResourceManager.ned (100%) rename {Castalia/src => src}/node/resourceManager/ResourceManagerMessage.msg (100%) rename {Castalia/src => src}/node/sensorManager/SensorManager.cc (100%) rename {Castalia/src => src}/node/sensorManager/SensorManager.h (100%) rename {Castalia/src => src}/node/sensorManager/SensorManager.ned (100%) rename {Castalia/src => src}/node/sensorManager/SensorManagerMessage.msg (100%) rename {Castalia/src => src}/physicalProcess/PhysicalProcessMessage.msg (100%) rename {Castalia/src => src}/physicalProcess/carsPhysicalProcess/CarsPhysicalProcess.cc (100%) rename {Castalia/src => src}/physicalProcess/carsPhysicalProcess/CarsPhysicalProcess.h (100%) rename {Castalia/src => src}/physicalProcess/carsPhysicalProcess/CarsPhysicalProcess.ned (100%) rename {Castalia/src => src}/physicalProcess/customizablePhysicalProcess/CustomizablePhysicalProcess.cc (100%) rename {Castalia/src => src}/physicalProcess/customizablePhysicalProcess/CustomizablePhysicalProcess.h (100%) rename {Castalia/src => src}/physicalProcess/customizablePhysicalProcess/CustomizablePhysicalProcess.ned (100%) rename {Castalia/src => src}/physicalProcess/iPhysicalProcess.ned (100%) rename {Castalia/src => src}/wirelessChannel/WirelessChannelMessages.msg (100%) rename {Castalia/src => src}/wirelessChannel/defaultChannel/WirelessChannel.cc (100%) rename {Castalia/src => src}/wirelessChannel/defaultChannel/WirelessChannel.h (100%) rename {Castalia/src => src}/wirelessChannel/defaultChannel/WirelessChannel.ned (100%) rename {Castalia/src => src}/wirelessChannel/defaultChannel/WirelessChannelTemporal.cc (100%) rename {Castalia/src => src}/wirelessChannel/defaultChannel/WirelessChannelTemporal.h (100%) rename {Castalia/src => src}/wirelessChannel/iWirelessChannel.ned (100%) rename {Castalia/src => src}/wirelessChannel/traceChannel/TraceChannel.cc (100%) rename {Castalia/src => src}/wirelessChannel/traceChannel/TraceChannel.h (100%) rename {Castalia/src => src}/wirelessChannel/traceChannel/TraceChannel.ned (100%) diff --git a/Castalia/.cproject b/.cproject similarity index 100% rename from Castalia/.cproject rename to .cproject diff --git a/Castalia/.gitignore b/.gitignore similarity index 100% rename from Castalia/.gitignore rename to .gitignore diff --git a/Castalia/.nedexclusions b/.nedexclusions similarity index 100% rename from Castalia/.nedexclusions rename to .nedexclusions diff --git a/Castalia/.nedfolders b/.nedfolders similarity index 100% rename from Castalia/.nedfolders rename to .nedfolders diff --git a/Castalia/.oppbuildspec b/.oppbuildspec similarity index 100% rename from Castalia/.oppbuildspec rename to .oppbuildspec diff --git a/Castalia/.oppfeaturestate b/.oppfeaturestate similarity index 100% rename from Castalia/.oppfeaturestate rename to .oppfeaturestate diff --git a/Castalia/.project b/.project similarity index 100% rename from Castalia/.project rename to .project diff --git a/Castalia/CHANGES.txt b/CHANGES.txt similarity index 100% rename from Castalia/CHANGES.txt rename to CHANGES.txt diff --git a/Castalia/LICENSE b/LICENSE similarity index 100% rename from Castalia/LICENSE rename to LICENSE diff --git a/Castalia/Makefile b/Makefile similarity index 100% rename from Castalia/Makefile rename to Makefile diff --git a/Castalia/Readme.txt b/Readme.txt similarity index 96% rename from Castalia/Readme.txt rename to Readme.txt index 44980421..9d88d935 100644 --- a/Castalia/Readme.txt +++ b/Readme.txt @@ -22,6 +22,8 @@ In the Root directory there are the following contents : bin --> Dir containing the Castalia and CastaliaResults scripts +doc --> Directory containing installation manual and user guide. + out --> Dir produced by the build process. Contains all interediate built files, as well as the Castalia executable. diff --git a/Castalia/Simulations/BANtest/omnetpp.ini b/Simulations/BANtest/omnetpp.ini similarity index 100% rename from Castalia/Simulations/BANtest/omnetpp.ini rename to Simulations/BANtest/omnetpp.ini diff --git a/Castalia/Simulations/BridgeTest/omnetpp.ini b/Simulations/BridgeTest/omnetpp.ini similarity index 100% rename from Castalia/Simulations/BridgeTest/omnetpp.ini rename to Simulations/BridgeTest/omnetpp.ini diff --git a/Castalia/Simulations/Parameters/Castalia.ini b/Simulations/Parameters/Castalia.ini similarity index 100% rename from Castalia/Simulations/Parameters/Castalia.ini rename to Simulations/Parameters/Castalia.ini diff --git a/Castalia/Simulations/Parameters/MAC/CSMA.ini b/Simulations/Parameters/MAC/CSMA.ini similarity index 100% rename from Castalia/Simulations/Parameters/MAC/CSMA.ini rename to Simulations/Parameters/MAC/CSMA.ini diff --git a/Castalia/Simulations/Parameters/MAC/SMAC.ini b/Simulations/Parameters/MAC/SMAC.ini similarity index 100% rename from Castalia/Simulations/Parameters/MAC/SMAC.ini rename to Simulations/Parameters/MAC/SMAC.ini diff --git a/Castalia/Simulations/Parameters/PhysicalProcess/node0_asssignedValue40.ini b/Simulations/Parameters/PhysicalProcess/node0_asssignedValue40.ini similarity index 100% rename from Castalia/Simulations/Parameters/PhysicalProcess/node0_asssignedValue40.ini rename to Simulations/Parameters/PhysicalProcess/node0_asssignedValue40.ini diff --git a/Castalia/Simulations/Parameters/PhysicalProcess/node6_asssignedValue40.ini b/Simulations/Parameters/PhysicalProcess/node6_asssignedValue40.ini similarity index 100% rename from Castalia/Simulations/Parameters/PhysicalProcess/node6_asssignedValue40.ini rename to Simulations/Parameters/PhysicalProcess/node6_asssignedValue40.ini diff --git a/Castalia/Simulations/Parameters/Radio/BANRadio.txt b/Simulations/Parameters/Radio/BANRadio.txt similarity index 100% rename from Castalia/Simulations/Parameters/Radio/BANRadio.txt rename to Simulations/Parameters/Radio/BANRadio.txt diff --git a/Castalia/Simulations/Parameters/Radio/CC1000.txt b/Simulations/Parameters/Radio/CC1000.txt similarity index 100% rename from Castalia/Simulations/Parameters/Radio/CC1000.txt rename to Simulations/Parameters/Radio/CC1000.txt diff --git a/Castalia/Simulations/Parameters/Radio/CC2420.txt b/Simulations/Parameters/Radio/CC2420.txt similarity index 100% rename from Castalia/Simulations/Parameters/Radio/CC2420.txt rename to Simulations/Parameters/Radio/CC2420.txt diff --git a/Castalia/Simulations/Parameters/SensorDevice/Accelerometer.ini b/Simulations/Parameters/SensorDevice/Accelerometer.ini similarity index 100% rename from Castalia/Simulations/Parameters/SensorDevice/Accelerometer.ini rename to Simulations/Parameters/SensorDevice/Accelerometer.ini diff --git a/Castalia/Simulations/Parameters/WirelessChannel/BANmodels/TemporalModel.txt b/Simulations/Parameters/WirelessChannel/BANmodels/TemporalModel.txt similarity index 100% rename from Castalia/Simulations/Parameters/WirelessChannel/BANmodels/TemporalModel.txt rename to Simulations/Parameters/WirelessChannel/BANmodels/TemporalModel.txt diff --git a/Castalia/Simulations/Parameters/WirelessChannel/BANmodels/pathLossMap.txt b/Simulations/Parameters/WirelessChannel/BANmodels/pathLossMap.txt similarity index 100% rename from Castalia/Simulations/Parameters/WirelessChannel/BANmodels/pathLossMap.txt rename to Simulations/Parameters/WirelessChannel/BANmodels/pathLossMap.txt diff --git a/Castalia/Simulations/Parameters/WirelessChannel/Ideal.ini b/Simulations/Parameters/WirelessChannel/Ideal.ini similarity index 100% rename from Castalia/Simulations/Parameters/WirelessChannel/Ideal.ini rename to Simulations/Parameters/WirelessChannel/Ideal.ini diff --git a/Castalia/Simulations/connectivityMap/omnetpp.ini b/Simulations/connectivityMap/omnetpp.ini similarity index 100% rename from Castalia/Simulations/connectivityMap/omnetpp.ini rename to Simulations/connectivityMap/omnetpp.ini diff --git a/Castalia/Simulations/radioTest/omnetpp.ini b/Simulations/radioTest/omnetpp.ini similarity index 100% rename from Castalia/Simulations/radioTest/omnetpp.ini rename to Simulations/radioTest/omnetpp.ini diff --git a/Castalia/Simulations/simpleAggregation/omnetpp.ini b/Simulations/simpleAggregation/omnetpp.ini similarity index 100% rename from Castalia/Simulations/simpleAggregation/omnetpp.ini rename to Simulations/simpleAggregation/omnetpp.ini diff --git a/Castalia/Simulations/valuePropagation/omnetpp.ini b/Simulations/valuePropagation/omnetpp.ini similarity index 100% rename from Castalia/Simulations/valuePropagation/omnetpp.ini rename to Simulations/valuePropagation/omnetpp.ini diff --git a/Castalia/Simulations/valueReporting/omnetpp.ini b/Simulations/valueReporting/omnetpp.ini similarity index 100% rename from Castalia/Simulations/valueReporting/omnetpp.ini rename to Simulations/valueReporting/omnetpp.ini diff --git a/Castalia/VERSION b/VERSION similarity index 100% rename from Castalia/VERSION rename to VERSION diff --git a/Castalia/bin/Castalia b/bin/Castalia similarity index 100% rename from Castalia/bin/Castalia rename to bin/Castalia diff --git a/Castalia/bin/CastaliaPlot b/bin/CastaliaPlot similarity index 100% rename from Castalia/bin/CastaliaPlot rename to bin/CastaliaPlot diff --git a/Castalia/bin/CastaliaResults b/bin/CastaliaResults similarity index 100% rename from Castalia/bin/CastaliaResults rename to bin/CastaliaResults diff --git a/Castalia/bin/extractOmnetppINI b/bin/extractOmnetppINI similarity index 100% rename from Castalia/bin/extractOmnetppINI rename to bin/extractOmnetppINI diff --git a/Castalia - Installation.docx b/doc/Castalia - Installation.docx similarity index 100% rename from Castalia - Installation.docx rename to doc/Castalia - Installation.docx diff --git a/Castalia - User Manual.docx b/doc/Castalia - User Manual.docx similarity index 100% rename from Castalia - User Manual.docx rename to doc/Castalia - User Manual.docx diff --git a/Castalia/makemake b/makemake similarity index 100% rename from Castalia/makemake rename to makemake diff --git a/Castalia/src/CastaliaMessages.h b/src/CastaliaMessages.h similarity index 100% rename from Castalia/src/CastaliaMessages.h rename to src/CastaliaMessages.h diff --git a/Castalia/src/SensorNetwork.ned b/src/SensorNetwork.ned similarity index 100% rename from Castalia/src/SensorNetwork.ned rename to src/SensorNetwork.ned diff --git a/Castalia/src/helpStructures/CastaliaModule.cc b/src/helpStructures/CastaliaModule.cc similarity index 100% rename from Castalia/src/helpStructures/CastaliaModule.cc rename to src/helpStructures/CastaliaModule.cc diff --git a/Castalia/src/helpStructures/CastaliaModule.h b/src/helpStructures/CastaliaModule.h similarity index 100% rename from Castalia/src/helpStructures/CastaliaModule.h rename to src/helpStructures/CastaliaModule.h diff --git a/Castalia/src/helpStructures/DebugInfoWriter.cc b/src/helpStructures/DebugInfoWriter.cc similarity index 100% rename from Castalia/src/helpStructures/DebugInfoWriter.cc rename to src/helpStructures/DebugInfoWriter.cc diff --git a/Castalia/src/helpStructures/DebugInfoWriter.h b/src/helpStructures/DebugInfoWriter.h similarity index 100% rename from Castalia/src/helpStructures/DebugInfoWriter.h rename to src/helpStructures/DebugInfoWriter.h diff --git a/Castalia/src/helpStructures/TimerService.cc b/src/helpStructures/TimerService.cc similarity index 100% rename from Castalia/src/helpStructures/TimerService.cc rename to src/helpStructures/TimerService.cc diff --git a/Castalia/src/helpStructures/TimerService.h b/src/helpStructures/TimerService.h similarity index 100% rename from Castalia/src/helpStructures/TimerService.h rename to src/helpStructures/TimerService.h diff --git a/Castalia/src/helpStructures/TimerServiceMessage.msg b/src/helpStructures/TimerServiceMessage.msg similarity index 100% rename from Castalia/src/helpStructures/TimerServiceMessage.msg rename to src/helpStructures/TimerServiceMessage.msg diff --git a/Castalia/src/makefrag b/src/makefrag similarity index 100% rename from Castalia/src/makefrag rename to src/makefrag diff --git a/Castalia/src/node/Node.ned b/src/node/Node.ned similarity index 100% rename from Castalia/src/node/Node.ned rename to src/node/Node.ned diff --git a/Castalia/src/node/application/ApplicationPacket.msg b/src/node/application/ApplicationPacket.msg similarity index 100% rename from Castalia/src/node/application/ApplicationPacket.msg rename to src/node/application/ApplicationPacket.msg diff --git a/Castalia/src/node/application/VirtualApplication.cc b/src/node/application/VirtualApplication.cc similarity index 100% rename from Castalia/src/node/application/VirtualApplication.cc rename to src/node/application/VirtualApplication.cc diff --git a/Castalia/src/node/application/VirtualApplication.h b/src/node/application/VirtualApplication.h similarity index 100% rename from Castalia/src/node/application/VirtualApplication.h rename to src/node/application/VirtualApplication.h diff --git a/Castalia/src/node/application/bridgeTest/BridgeTest.cc b/src/node/application/bridgeTest/BridgeTest.cc similarity index 100% rename from Castalia/src/node/application/bridgeTest/BridgeTest.cc rename to src/node/application/bridgeTest/BridgeTest.cc diff --git a/Castalia/src/node/application/bridgeTest/BridgeTest.h b/src/node/application/bridgeTest/BridgeTest.h similarity index 100% rename from Castalia/src/node/application/bridgeTest/BridgeTest.h rename to src/node/application/bridgeTest/BridgeTest.h diff --git a/Castalia/src/node/application/bridgeTest/BridgeTest.ned b/src/node/application/bridgeTest/BridgeTest.ned similarity index 100% rename from Castalia/src/node/application/bridgeTest/BridgeTest.ned rename to src/node/application/bridgeTest/BridgeTest.ned diff --git a/Castalia/src/node/application/connectivityMap/ConnectivityMap.cc b/src/node/application/connectivityMap/ConnectivityMap.cc similarity index 100% rename from Castalia/src/node/application/connectivityMap/ConnectivityMap.cc rename to src/node/application/connectivityMap/ConnectivityMap.cc diff --git a/Castalia/src/node/application/connectivityMap/ConnectivityMap.h b/src/node/application/connectivityMap/ConnectivityMap.h similarity index 100% rename from Castalia/src/node/application/connectivityMap/ConnectivityMap.h rename to src/node/application/connectivityMap/ConnectivityMap.h diff --git a/Castalia/src/node/application/connectivityMap/ConnectivityMap.ned b/src/node/application/connectivityMap/ConnectivityMap.ned similarity index 100% rename from Castalia/src/node/application/connectivityMap/ConnectivityMap.ned rename to src/node/application/connectivityMap/ConnectivityMap.ned diff --git a/Castalia/src/node/application/iApplication.ned b/src/node/application/iApplication.ned similarity index 100% rename from Castalia/src/node/application/iApplication.ned rename to src/node/application/iApplication.ned diff --git a/Castalia/src/node/application/simpleAggregation/SimpleAggregation.cc b/src/node/application/simpleAggregation/SimpleAggregation.cc similarity index 100% rename from Castalia/src/node/application/simpleAggregation/SimpleAggregation.cc rename to src/node/application/simpleAggregation/SimpleAggregation.cc diff --git a/Castalia/src/node/application/simpleAggregation/SimpleAggregation.h b/src/node/application/simpleAggregation/SimpleAggregation.h similarity index 100% rename from Castalia/src/node/application/simpleAggregation/SimpleAggregation.h rename to src/node/application/simpleAggregation/SimpleAggregation.h diff --git a/Castalia/src/node/application/simpleAggregation/SimpleAggregation.ned b/src/node/application/simpleAggregation/SimpleAggregation.ned similarity index 100% rename from Castalia/src/node/application/simpleAggregation/SimpleAggregation.ned rename to src/node/application/simpleAggregation/SimpleAggregation.ned diff --git a/Castalia/src/node/application/throughputTest/ThroughputTest.cc b/src/node/application/throughputTest/ThroughputTest.cc similarity index 100% rename from Castalia/src/node/application/throughputTest/ThroughputTest.cc rename to src/node/application/throughputTest/ThroughputTest.cc diff --git a/Castalia/src/node/application/throughputTest/ThroughputTest.h b/src/node/application/throughputTest/ThroughputTest.h similarity index 100% rename from Castalia/src/node/application/throughputTest/ThroughputTest.h rename to src/node/application/throughputTest/ThroughputTest.h diff --git a/Castalia/src/node/application/throughputTest/ThroughputTest.ned b/src/node/application/throughputTest/ThroughputTest.ned similarity index 100% rename from Castalia/src/node/application/throughputTest/ThroughputTest.ned rename to src/node/application/throughputTest/ThroughputTest.ned diff --git a/Castalia/src/node/application/valuePropagation/ValuePropagation.cc b/src/node/application/valuePropagation/ValuePropagation.cc similarity index 100% rename from Castalia/src/node/application/valuePropagation/ValuePropagation.cc rename to src/node/application/valuePropagation/ValuePropagation.cc diff --git a/Castalia/src/node/application/valuePropagation/ValuePropagation.h b/src/node/application/valuePropagation/ValuePropagation.h similarity index 100% rename from Castalia/src/node/application/valuePropagation/ValuePropagation.h rename to src/node/application/valuePropagation/ValuePropagation.h diff --git a/Castalia/src/node/application/valuePropagation/ValuePropagation.ned b/src/node/application/valuePropagation/ValuePropagation.ned similarity index 100% rename from Castalia/src/node/application/valuePropagation/ValuePropagation.ned rename to src/node/application/valuePropagation/ValuePropagation.ned diff --git a/Castalia/src/node/application/valueReporting/ValueReporting.cc b/src/node/application/valueReporting/ValueReporting.cc similarity index 100% rename from Castalia/src/node/application/valueReporting/ValueReporting.cc rename to src/node/application/valueReporting/ValueReporting.cc diff --git a/Castalia/src/node/application/valueReporting/ValueReporting.h b/src/node/application/valueReporting/ValueReporting.h similarity index 100% rename from Castalia/src/node/application/valueReporting/ValueReporting.h rename to src/node/application/valueReporting/ValueReporting.h diff --git a/Castalia/src/node/application/valueReporting/ValueReporting.ned b/src/node/application/valueReporting/ValueReporting.ned similarity index 100% rename from Castalia/src/node/application/valueReporting/ValueReporting.ned rename to src/node/application/valueReporting/ValueReporting.ned diff --git a/Castalia/src/node/application/valueReporting/ValueReportingPacket.msg b/src/node/application/valueReporting/ValueReportingPacket.msg similarity index 100% rename from Castalia/src/node/application/valueReporting/ValueReportingPacket.msg rename to src/node/application/valueReporting/ValueReportingPacket.msg diff --git a/Castalia/src/node/communication/CommunicationModule.ned b/src/node/communication/CommunicationModule.ned similarity index 100% rename from Castalia/src/node/communication/CommunicationModule.ned rename to src/node/communication/CommunicationModule.ned diff --git a/Castalia/src/node/communication/mac/MacPacket.msg b/src/node/communication/mac/MacPacket.msg similarity index 100% rename from Castalia/src/node/communication/mac/MacPacket.msg rename to src/node/communication/mac/MacPacket.msg diff --git a/Castalia/src/node/communication/mac/VirtualMac.cc b/src/node/communication/mac/VirtualMac.cc similarity index 100% rename from Castalia/src/node/communication/mac/VirtualMac.cc rename to src/node/communication/mac/VirtualMac.cc diff --git a/Castalia/src/node/communication/mac/VirtualMac.h b/src/node/communication/mac/VirtualMac.h similarity index 100% rename from Castalia/src/node/communication/mac/VirtualMac.h rename to src/node/communication/mac/VirtualMac.h diff --git a/Castalia/src/node/communication/mac/baselineBanMac/BaselineBANMac.cc b/src/node/communication/mac/baselineBanMac/BaselineBANMac.cc similarity index 100% rename from Castalia/src/node/communication/mac/baselineBanMac/BaselineBANMac.cc rename to src/node/communication/mac/baselineBanMac/BaselineBANMac.cc diff --git a/Castalia/src/node/communication/mac/baselineBanMac/BaselineBANMac.h b/src/node/communication/mac/baselineBanMac/BaselineBANMac.h similarity index 100% rename from Castalia/src/node/communication/mac/baselineBanMac/BaselineBANMac.h rename to src/node/communication/mac/baselineBanMac/BaselineBANMac.h diff --git a/Castalia/src/node/communication/mac/baselineBanMac/BaselineBANMac.ned b/src/node/communication/mac/baselineBanMac/BaselineBANMac.ned similarity index 100% rename from Castalia/src/node/communication/mac/baselineBanMac/BaselineBANMac.ned rename to src/node/communication/mac/baselineBanMac/BaselineBANMac.ned diff --git a/Castalia/src/node/communication/mac/baselineBanMac/BaselineMacPacket.msg b/src/node/communication/mac/baselineBanMac/BaselineMacPacket.msg similarity index 100% rename from Castalia/src/node/communication/mac/baselineBanMac/BaselineMacPacket.msg rename to src/node/communication/mac/baselineBanMac/BaselineMacPacket.msg diff --git a/Castalia/src/node/communication/mac/bypassMac/BypassMAC.cc b/src/node/communication/mac/bypassMac/BypassMAC.cc similarity index 100% rename from Castalia/src/node/communication/mac/bypassMac/BypassMAC.cc rename to src/node/communication/mac/bypassMac/BypassMAC.cc diff --git a/Castalia/src/node/communication/mac/bypassMac/BypassMAC.h b/src/node/communication/mac/bypassMac/BypassMAC.h similarity index 100% rename from Castalia/src/node/communication/mac/bypassMac/BypassMAC.h rename to src/node/communication/mac/bypassMac/BypassMAC.h diff --git a/Castalia/src/node/communication/mac/bypassMac/BypassMAC.ned b/src/node/communication/mac/bypassMac/BypassMAC.ned similarity index 100% rename from Castalia/src/node/communication/mac/bypassMac/BypassMAC.ned rename to src/node/communication/mac/bypassMac/BypassMAC.ned diff --git a/Castalia/src/node/communication/mac/iMac.ned b/src/node/communication/mac/iMac.ned similarity index 100% rename from Castalia/src/node/communication/mac/iMac.ned rename to src/node/communication/mac/iMac.ned diff --git a/Castalia/src/node/communication/mac/mac802154/Basic802154.cc b/src/node/communication/mac/mac802154/Basic802154.cc similarity index 100% rename from Castalia/src/node/communication/mac/mac802154/Basic802154.cc rename to src/node/communication/mac/mac802154/Basic802154.cc diff --git a/Castalia/src/node/communication/mac/mac802154/Basic802154.h b/src/node/communication/mac/mac802154/Basic802154.h similarity index 100% rename from Castalia/src/node/communication/mac/mac802154/Basic802154.h rename to src/node/communication/mac/mac802154/Basic802154.h diff --git a/Castalia/src/node/communication/mac/mac802154/Basic802154.ned b/src/node/communication/mac/mac802154/Basic802154.ned similarity index 100% rename from Castalia/src/node/communication/mac/mac802154/Basic802154.ned rename to src/node/communication/mac/mac802154/Basic802154.ned diff --git a/Castalia/src/node/communication/mac/mac802154/Basic802154Packet.msg b/src/node/communication/mac/mac802154/Basic802154Packet.msg similarity index 100% rename from Castalia/src/node/communication/mac/mac802154/Basic802154Packet.msg rename to src/node/communication/mac/mac802154/Basic802154Packet.msg diff --git a/Castalia/src/node/communication/mac/mac802154/staticGTS802154/StaticGTS802154.cc b/src/node/communication/mac/mac802154/staticGTS802154/StaticGTS802154.cc similarity index 100% rename from Castalia/src/node/communication/mac/mac802154/staticGTS802154/StaticGTS802154.cc rename to src/node/communication/mac/mac802154/staticGTS802154/StaticGTS802154.cc diff --git a/Castalia/src/node/communication/mac/mac802154/staticGTS802154/StaticGTS802154.h b/src/node/communication/mac/mac802154/staticGTS802154/StaticGTS802154.h similarity index 100% rename from Castalia/src/node/communication/mac/mac802154/staticGTS802154/StaticGTS802154.h rename to src/node/communication/mac/mac802154/staticGTS802154/StaticGTS802154.h diff --git a/Castalia/src/node/communication/mac/mac802154/staticGTS802154/StaticGTS802154.ned b/src/node/communication/mac/mac802154/staticGTS802154/StaticGTS802154.ned similarity index 100% rename from Castalia/src/node/communication/mac/mac802154/staticGTS802154/StaticGTS802154.ned rename to src/node/communication/mac/mac802154/staticGTS802154/StaticGTS802154.ned diff --git a/Castalia/src/node/communication/mac/tMac/TMAC.cc b/src/node/communication/mac/tMac/TMAC.cc similarity index 100% rename from Castalia/src/node/communication/mac/tMac/TMAC.cc rename to src/node/communication/mac/tMac/TMAC.cc diff --git a/Castalia/src/node/communication/mac/tMac/TMAC.h b/src/node/communication/mac/tMac/TMAC.h similarity index 100% rename from Castalia/src/node/communication/mac/tMac/TMAC.h rename to src/node/communication/mac/tMac/TMAC.h diff --git a/Castalia/src/node/communication/mac/tMac/TMAC.ned b/src/node/communication/mac/tMac/TMAC.ned similarity index 100% rename from Castalia/src/node/communication/mac/tMac/TMAC.ned rename to src/node/communication/mac/tMac/TMAC.ned diff --git a/Castalia/src/node/communication/mac/tMac/TMacPacket.msg b/src/node/communication/mac/tMac/TMacPacket.msg similarity index 100% rename from Castalia/src/node/communication/mac/tMac/TMacPacket.msg rename to src/node/communication/mac/tMac/TMacPacket.msg diff --git a/Castalia/src/node/communication/mac/tunableMac/TunableMAC.cc b/src/node/communication/mac/tunableMac/TunableMAC.cc similarity index 100% rename from Castalia/src/node/communication/mac/tunableMac/TunableMAC.cc rename to src/node/communication/mac/tunableMac/TunableMAC.cc diff --git a/Castalia/src/node/communication/mac/tunableMac/TunableMAC.h b/src/node/communication/mac/tunableMac/TunableMAC.h similarity index 100% rename from Castalia/src/node/communication/mac/tunableMac/TunableMAC.h rename to src/node/communication/mac/tunableMac/TunableMAC.h diff --git a/Castalia/src/node/communication/mac/tunableMac/TunableMAC.ned b/src/node/communication/mac/tunableMac/TunableMAC.ned similarity index 100% rename from Castalia/src/node/communication/mac/tunableMac/TunableMAC.ned rename to src/node/communication/mac/tunableMac/TunableMAC.ned diff --git a/Castalia/src/node/communication/mac/tunableMac/TunableMacControl.msg b/src/node/communication/mac/tunableMac/TunableMacControl.msg similarity index 100% rename from Castalia/src/node/communication/mac/tunableMac/TunableMacControl.msg rename to src/node/communication/mac/tunableMac/TunableMacControl.msg diff --git a/Castalia/src/node/communication/mac/tunableMac/TunableMacPacket.msg b/src/node/communication/mac/tunableMac/TunableMacPacket.msg similarity index 100% rename from Castalia/src/node/communication/mac/tunableMac/TunableMacPacket.msg rename to src/node/communication/mac/tunableMac/TunableMacPacket.msg diff --git a/Castalia/src/node/communication/radio/Radio.cc b/src/node/communication/radio/Radio.cc similarity index 100% rename from Castalia/src/node/communication/radio/Radio.cc rename to src/node/communication/radio/Radio.cc diff --git a/Castalia/src/node/communication/radio/Radio.h b/src/node/communication/radio/Radio.h similarity index 100% rename from Castalia/src/node/communication/radio/Radio.h rename to src/node/communication/radio/Radio.h diff --git a/Castalia/src/node/communication/radio/Radio.ned b/src/node/communication/radio/Radio.ned similarity index 100% rename from Castalia/src/node/communication/radio/Radio.ned rename to src/node/communication/radio/Radio.ned diff --git a/Castalia/src/node/communication/radio/RadioControlMessage.msg b/src/node/communication/radio/RadioControlMessage.msg similarity index 100% rename from Castalia/src/node/communication/radio/RadioControlMessage.msg rename to src/node/communication/radio/RadioControlMessage.msg diff --git a/Castalia/src/node/communication/radio/RadioSupportFunctions.cc b/src/node/communication/radio/RadioSupportFunctions.cc similarity index 100% rename from Castalia/src/node/communication/radio/RadioSupportFunctions.cc rename to src/node/communication/radio/RadioSupportFunctions.cc diff --git a/Castalia/src/node/communication/radio/RadioSupportFunctions.h b/src/node/communication/radio/RadioSupportFunctions.h similarity index 100% rename from Castalia/src/node/communication/radio/RadioSupportFunctions.h rename to src/node/communication/radio/RadioSupportFunctions.h diff --git a/Castalia/src/node/communication/routing/RoutingPacket.msg b/src/node/communication/routing/RoutingPacket.msg similarity index 100% rename from Castalia/src/node/communication/routing/RoutingPacket.msg rename to src/node/communication/routing/RoutingPacket.msg diff --git a/Castalia/src/node/communication/routing/VirtualRouting.cc b/src/node/communication/routing/VirtualRouting.cc similarity index 100% rename from Castalia/src/node/communication/routing/VirtualRouting.cc rename to src/node/communication/routing/VirtualRouting.cc diff --git a/Castalia/src/node/communication/routing/VirtualRouting.h b/src/node/communication/routing/VirtualRouting.h similarity index 100% rename from Castalia/src/node/communication/routing/VirtualRouting.h rename to src/node/communication/routing/VirtualRouting.h diff --git a/Castalia/src/node/communication/routing/bypassRouting/BypassRouting.cc b/src/node/communication/routing/bypassRouting/BypassRouting.cc similarity index 100% rename from Castalia/src/node/communication/routing/bypassRouting/BypassRouting.cc rename to src/node/communication/routing/bypassRouting/BypassRouting.cc diff --git a/Castalia/src/node/communication/routing/bypassRouting/BypassRouting.h b/src/node/communication/routing/bypassRouting/BypassRouting.h similarity index 100% rename from Castalia/src/node/communication/routing/bypassRouting/BypassRouting.h rename to src/node/communication/routing/bypassRouting/BypassRouting.h diff --git a/Castalia/src/node/communication/routing/bypassRouting/BypassRouting.ned b/src/node/communication/routing/bypassRouting/BypassRouting.ned similarity index 100% rename from Castalia/src/node/communication/routing/bypassRouting/BypassRouting.ned rename to src/node/communication/routing/bypassRouting/BypassRouting.ned diff --git a/Castalia/src/node/communication/routing/bypassRouting/BypassRoutingPacket.msg b/src/node/communication/routing/bypassRouting/BypassRoutingPacket.msg similarity index 100% rename from Castalia/src/node/communication/routing/bypassRouting/BypassRoutingPacket.msg rename to src/node/communication/routing/bypassRouting/BypassRoutingPacket.msg diff --git a/Castalia/src/node/communication/routing/iRouting.ned b/src/node/communication/routing/iRouting.ned similarity index 100% rename from Castalia/src/node/communication/routing/iRouting.ned rename to src/node/communication/routing/iRouting.ned diff --git a/Castalia/src/node/communication/routing/multipathRingsRouting/MultipathRingsRouting.cc b/src/node/communication/routing/multipathRingsRouting/MultipathRingsRouting.cc similarity index 100% rename from Castalia/src/node/communication/routing/multipathRingsRouting/MultipathRingsRouting.cc rename to src/node/communication/routing/multipathRingsRouting/MultipathRingsRouting.cc diff --git a/Castalia/src/node/communication/routing/multipathRingsRouting/MultipathRingsRouting.h b/src/node/communication/routing/multipathRingsRouting/MultipathRingsRouting.h similarity index 100% rename from Castalia/src/node/communication/routing/multipathRingsRouting/MultipathRingsRouting.h rename to src/node/communication/routing/multipathRingsRouting/MultipathRingsRouting.h diff --git a/Castalia/src/node/communication/routing/multipathRingsRouting/MultipathRingsRouting.ned b/src/node/communication/routing/multipathRingsRouting/MultipathRingsRouting.ned similarity index 100% rename from Castalia/src/node/communication/routing/multipathRingsRouting/MultipathRingsRouting.ned rename to src/node/communication/routing/multipathRingsRouting/MultipathRingsRouting.ned diff --git a/Castalia/src/node/communication/routing/multipathRingsRouting/MultipathRingsRoutingControl.msg b/src/node/communication/routing/multipathRingsRouting/MultipathRingsRoutingControl.msg similarity index 100% rename from Castalia/src/node/communication/routing/multipathRingsRouting/MultipathRingsRoutingControl.msg rename to src/node/communication/routing/multipathRingsRouting/MultipathRingsRoutingControl.msg diff --git a/Castalia/src/node/communication/routing/multipathRingsRouting/MultipathRingsRoutingPacket.msg b/src/node/communication/routing/multipathRingsRouting/MultipathRingsRoutingPacket.msg similarity index 100% rename from Castalia/src/node/communication/routing/multipathRingsRouting/MultipathRingsRoutingPacket.msg rename to src/node/communication/routing/multipathRingsRouting/MultipathRingsRoutingPacket.msg diff --git a/Castalia/src/node/mobilityManager/MobilityManagerMessage.msg b/src/node/mobilityManager/MobilityManagerMessage.msg similarity index 100% rename from Castalia/src/node/mobilityManager/MobilityManagerMessage.msg rename to src/node/mobilityManager/MobilityManagerMessage.msg diff --git a/Castalia/src/node/mobilityManager/VirtualMobilityManager.cc b/src/node/mobilityManager/VirtualMobilityManager.cc similarity index 100% rename from Castalia/src/node/mobilityManager/VirtualMobilityManager.cc rename to src/node/mobilityManager/VirtualMobilityManager.cc diff --git a/Castalia/src/node/mobilityManager/VirtualMobilityManager.h b/src/node/mobilityManager/VirtualMobilityManager.h similarity index 100% rename from Castalia/src/node/mobilityManager/VirtualMobilityManager.h rename to src/node/mobilityManager/VirtualMobilityManager.h diff --git a/Castalia/src/node/mobilityManager/iMobilityManager.ned b/src/node/mobilityManager/iMobilityManager.ned similarity index 100% rename from Castalia/src/node/mobilityManager/iMobilityManager.ned rename to src/node/mobilityManager/iMobilityManager.ned diff --git a/Castalia/src/node/mobilityManager/lineMobilityManager/LineMobilityManager.cc b/src/node/mobilityManager/lineMobilityManager/LineMobilityManager.cc similarity index 100% rename from Castalia/src/node/mobilityManager/lineMobilityManager/LineMobilityManager.cc rename to src/node/mobilityManager/lineMobilityManager/LineMobilityManager.cc diff --git a/Castalia/src/node/mobilityManager/lineMobilityManager/LineMobilityManager.h b/src/node/mobilityManager/lineMobilityManager/LineMobilityManager.h similarity index 100% rename from Castalia/src/node/mobilityManager/lineMobilityManager/LineMobilityManager.h rename to src/node/mobilityManager/lineMobilityManager/LineMobilityManager.h diff --git a/Castalia/src/node/mobilityManager/lineMobilityManager/LineMobilityManager.ned b/src/node/mobilityManager/lineMobilityManager/LineMobilityManager.ned similarity index 100% rename from Castalia/src/node/mobilityManager/lineMobilityManager/LineMobilityManager.ned rename to src/node/mobilityManager/lineMobilityManager/LineMobilityManager.ned diff --git a/Castalia/src/node/mobilityManager/noMobilityManager/NoMobilityManager.cc b/src/node/mobilityManager/noMobilityManager/NoMobilityManager.cc similarity index 100% rename from Castalia/src/node/mobilityManager/noMobilityManager/NoMobilityManager.cc rename to src/node/mobilityManager/noMobilityManager/NoMobilityManager.cc diff --git a/Castalia/src/node/mobilityManager/noMobilityManager/NoMobilityManager.h b/src/node/mobilityManager/noMobilityManager/NoMobilityManager.h similarity index 100% rename from Castalia/src/node/mobilityManager/noMobilityManager/NoMobilityManager.h rename to src/node/mobilityManager/noMobilityManager/NoMobilityManager.h diff --git a/Castalia/src/node/mobilityManager/noMobilityManager/NoMobilityManager.ned b/src/node/mobilityManager/noMobilityManager/NoMobilityManager.ned similarity index 100% rename from Castalia/src/node/mobilityManager/noMobilityManager/NoMobilityManager.ned rename to src/node/mobilityManager/noMobilityManager/NoMobilityManager.ned diff --git a/Castalia/src/node/resourceManager/ResourceManager.cc b/src/node/resourceManager/ResourceManager.cc similarity index 100% rename from Castalia/src/node/resourceManager/ResourceManager.cc rename to src/node/resourceManager/ResourceManager.cc diff --git a/Castalia/src/node/resourceManager/ResourceManager.h b/src/node/resourceManager/ResourceManager.h similarity index 100% rename from Castalia/src/node/resourceManager/ResourceManager.h rename to src/node/resourceManager/ResourceManager.h diff --git a/Castalia/src/node/resourceManager/ResourceManager.ned b/src/node/resourceManager/ResourceManager.ned similarity index 100% rename from Castalia/src/node/resourceManager/ResourceManager.ned rename to src/node/resourceManager/ResourceManager.ned diff --git a/Castalia/src/node/resourceManager/ResourceManagerMessage.msg b/src/node/resourceManager/ResourceManagerMessage.msg similarity index 100% rename from Castalia/src/node/resourceManager/ResourceManagerMessage.msg rename to src/node/resourceManager/ResourceManagerMessage.msg diff --git a/Castalia/src/node/sensorManager/SensorManager.cc b/src/node/sensorManager/SensorManager.cc similarity index 100% rename from Castalia/src/node/sensorManager/SensorManager.cc rename to src/node/sensorManager/SensorManager.cc diff --git a/Castalia/src/node/sensorManager/SensorManager.h b/src/node/sensorManager/SensorManager.h similarity index 100% rename from Castalia/src/node/sensorManager/SensorManager.h rename to src/node/sensorManager/SensorManager.h diff --git a/Castalia/src/node/sensorManager/SensorManager.ned b/src/node/sensorManager/SensorManager.ned similarity index 100% rename from Castalia/src/node/sensorManager/SensorManager.ned rename to src/node/sensorManager/SensorManager.ned diff --git a/Castalia/src/node/sensorManager/SensorManagerMessage.msg b/src/node/sensorManager/SensorManagerMessage.msg similarity index 100% rename from Castalia/src/node/sensorManager/SensorManagerMessage.msg rename to src/node/sensorManager/SensorManagerMessage.msg diff --git a/Castalia/src/physicalProcess/PhysicalProcessMessage.msg b/src/physicalProcess/PhysicalProcessMessage.msg similarity index 100% rename from Castalia/src/physicalProcess/PhysicalProcessMessage.msg rename to src/physicalProcess/PhysicalProcessMessage.msg diff --git a/Castalia/src/physicalProcess/carsPhysicalProcess/CarsPhysicalProcess.cc b/src/physicalProcess/carsPhysicalProcess/CarsPhysicalProcess.cc similarity index 100% rename from Castalia/src/physicalProcess/carsPhysicalProcess/CarsPhysicalProcess.cc rename to src/physicalProcess/carsPhysicalProcess/CarsPhysicalProcess.cc diff --git a/Castalia/src/physicalProcess/carsPhysicalProcess/CarsPhysicalProcess.h b/src/physicalProcess/carsPhysicalProcess/CarsPhysicalProcess.h similarity index 100% rename from Castalia/src/physicalProcess/carsPhysicalProcess/CarsPhysicalProcess.h rename to src/physicalProcess/carsPhysicalProcess/CarsPhysicalProcess.h diff --git a/Castalia/src/physicalProcess/carsPhysicalProcess/CarsPhysicalProcess.ned b/src/physicalProcess/carsPhysicalProcess/CarsPhysicalProcess.ned similarity index 100% rename from Castalia/src/physicalProcess/carsPhysicalProcess/CarsPhysicalProcess.ned rename to src/physicalProcess/carsPhysicalProcess/CarsPhysicalProcess.ned diff --git a/Castalia/src/physicalProcess/customizablePhysicalProcess/CustomizablePhysicalProcess.cc b/src/physicalProcess/customizablePhysicalProcess/CustomizablePhysicalProcess.cc similarity index 100% rename from Castalia/src/physicalProcess/customizablePhysicalProcess/CustomizablePhysicalProcess.cc rename to src/physicalProcess/customizablePhysicalProcess/CustomizablePhysicalProcess.cc diff --git a/Castalia/src/physicalProcess/customizablePhysicalProcess/CustomizablePhysicalProcess.h b/src/physicalProcess/customizablePhysicalProcess/CustomizablePhysicalProcess.h similarity index 100% rename from Castalia/src/physicalProcess/customizablePhysicalProcess/CustomizablePhysicalProcess.h rename to src/physicalProcess/customizablePhysicalProcess/CustomizablePhysicalProcess.h diff --git a/Castalia/src/physicalProcess/customizablePhysicalProcess/CustomizablePhysicalProcess.ned b/src/physicalProcess/customizablePhysicalProcess/CustomizablePhysicalProcess.ned similarity index 100% rename from Castalia/src/physicalProcess/customizablePhysicalProcess/CustomizablePhysicalProcess.ned rename to src/physicalProcess/customizablePhysicalProcess/CustomizablePhysicalProcess.ned diff --git a/Castalia/src/physicalProcess/iPhysicalProcess.ned b/src/physicalProcess/iPhysicalProcess.ned similarity index 100% rename from Castalia/src/physicalProcess/iPhysicalProcess.ned rename to src/physicalProcess/iPhysicalProcess.ned diff --git a/Castalia/src/wirelessChannel/WirelessChannelMessages.msg b/src/wirelessChannel/WirelessChannelMessages.msg similarity index 100% rename from Castalia/src/wirelessChannel/WirelessChannelMessages.msg rename to src/wirelessChannel/WirelessChannelMessages.msg diff --git a/Castalia/src/wirelessChannel/defaultChannel/WirelessChannel.cc b/src/wirelessChannel/defaultChannel/WirelessChannel.cc similarity index 100% rename from Castalia/src/wirelessChannel/defaultChannel/WirelessChannel.cc rename to src/wirelessChannel/defaultChannel/WirelessChannel.cc diff --git a/Castalia/src/wirelessChannel/defaultChannel/WirelessChannel.h b/src/wirelessChannel/defaultChannel/WirelessChannel.h similarity index 100% rename from Castalia/src/wirelessChannel/defaultChannel/WirelessChannel.h rename to src/wirelessChannel/defaultChannel/WirelessChannel.h diff --git a/Castalia/src/wirelessChannel/defaultChannel/WirelessChannel.ned b/src/wirelessChannel/defaultChannel/WirelessChannel.ned similarity index 100% rename from Castalia/src/wirelessChannel/defaultChannel/WirelessChannel.ned rename to src/wirelessChannel/defaultChannel/WirelessChannel.ned diff --git a/Castalia/src/wirelessChannel/defaultChannel/WirelessChannelTemporal.cc b/src/wirelessChannel/defaultChannel/WirelessChannelTemporal.cc similarity index 100% rename from Castalia/src/wirelessChannel/defaultChannel/WirelessChannelTemporal.cc rename to src/wirelessChannel/defaultChannel/WirelessChannelTemporal.cc diff --git a/Castalia/src/wirelessChannel/defaultChannel/WirelessChannelTemporal.h b/src/wirelessChannel/defaultChannel/WirelessChannelTemporal.h similarity index 100% rename from Castalia/src/wirelessChannel/defaultChannel/WirelessChannelTemporal.h rename to src/wirelessChannel/defaultChannel/WirelessChannelTemporal.h diff --git a/Castalia/src/wirelessChannel/iWirelessChannel.ned b/src/wirelessChannel/iWirelessChannel.ned similarity index 100% rename from Castalia/src/wirelessChannel/iWirelessChannel.ned rename to src/wirelessChannel/iWirelessChannel.ned diff --git a/Castalia/src/wirelessChannel/traceChannel/TraceChannel.cc b/src/wirelessChannel/traceChannel/TraceChannel.cc similarity index 100% rename from Castalia/src/wirelessChannel/traceChannel/TraceChannel.cc rename to src/wirelessChannel/traceChannel/TraceChannel.cc diff --git a/Castalia/src/wirelessChannel/traceChannel/TraceChannel.h b/src/wirelessChannel/traceChannel/TraceChannel.h similarity index 100% rename from Castalia/src/wirelessChannel/traceChannel/TraceChannel.h rename to src/wirelessChannel/traceChannel/TraceChannel.h diff --git a/Castalia/src/wirelessChannel/traceChannel/TraceChannel.ned b/src/wirelessChannel/traceChannel/TraceChannel.ned similarity index 100% rename from Castalia/src/wirelessChannel/traceChannel/TraceChannel.ned rename to src/wirelessChannel/traceChannel/TraceChannel.ned