Skip to content

Merge branch develop into main #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SuPaRuC merged 18 commits into from
Apr 14, 2023
Merged

Merge branch develop into main #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
01c8d97
Added some sorting algorithms on how the data have to be sent from th…
Apr 2, 2023
fc92565
Modified load balancing function to use the sorting algorithm specified
Apr 2, 2023
d0003d7
Modified app to use the sorting algorithm specified in .ini file
Apr 2, 2023
5ecac66
Auto-generated src files
Apr 2, 2023
6b7b399
Modified omnetpp.ini in which you now can specify the sorting algorithm
Apr 2, 2023
ae39c6f
Added sorting algorithm to NED file
Apr 2, 2023
164509c
Auto-generated out files
Apr 2, 2023
0c9d309
Introduced new base class for sorting algorithm to simplify parameter…
Apr 3, 2023
515ecc9
Simplified algorithm typename in .ini file
Apr 3, 2023
be69a44
Auto generated out files
Apr 3, 2023
77742ca
Auto generated src files
Apr 3, 2023
d71863e
Fixed behavior and corrected issues with piggybacking
Apr 5, 2023
b8005c8
Auto-generated src files
Apr 5, 2023
2265f24
Auto-generated out files
Apr 5, 2023
83a9707
Corrected object creation
Apr 14, 2023
0d9131f
Fixed debug messages
Apr 14, 2023
af25329
Auto-generated src files
Apr 14, 2023
4b64116
Auto-generated out files
Apr 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified out/clang-debug/src/app/VeinsApp.o
View file
Open in desktop
Binary file not shown.
3 changes: 3 additions & 0 deletions out/clang-debug/src/app/VeinsApp.o.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
../../veins-5.2/src/veins/modules/mobility/traci/TraCIRegionOfInterest.h \
../../veins-5.2/src/veins/modules/mobility/traci/TraCICommandInterface.h \
../../veins-5.2/src/veins/modules/world/traci/trafficLight/TraCITrafficLightProgram.h \
app/loadBalancing/sortingAlgorithm/BaseSorting.h \
app/messages/AckMessage_m.h app/messages/AckTimerMessage_m.h \
app/messages/LoadBalanceTimerMessage_m.h \
app/messages/ComputationTimerMessage_m.h \
Expand Down Expand Up @@ -178,6 +179,8 @@ app/vehiclesHandling/HelperVehicleInfo.h:

../../veins-5.2/src/veins/modules/world/traci/trafficLight/TraCITrafficLightProgram.h:

app/loadBalancing/sortingAlgorithm/BaseSorting.h:

app/messages/AckMessage_m.h:

app/messages/AckTimerMessage_m.h:
Expand Down
Binary file modified out/clang-debug/src/app/loadBalancing/LoadBalancing.o
View file
Open in desktop
Binary file not shown.
3 changes: 3 additions & 0 deletions out/clang-debug/src/app/loadBalancing/LoadBalancing.o.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
../../veins-5.2/src/veins/modules/mobility/traci/TraCIRegionOfInterest.h \
../../veins-5.2/src/veins/modules/mobility/traci/TraCICommandInterface.h \
../../veins-5.2/src/veins/modules/world/traci/trafficLight/TraCITrafficLightProgram.h \
app/loadBalancing/sortingAlgorithm/BaseSorting.h \
app/messages/ComputationTimerMessage_m.h

app/VeinsApp.h:
Expand Down Expand Up @@ -176,4 +177,6 @@ app/vehiclesHandling/HelperVehicleInfo.h:

../../veins-5.2/src/veins/modules/world/traci/trafficLight/TraCITrafficLightProgram.h:

app/loadBalancing/sortingAlgorithm/BaseSorting.h:

app/messages/ComputationTimerMessage_m.h:
Binary file added out/clang-debug/src/app/loadBalancing/sortingAlgorithm/BaseSorting.o
View file
Open in desktop
Binary file not shown.
163 changes: 163 additions & 0 deletions out/clang-debug/src/app/loadBalancing/sortingAlgorithm/BaseSorting.o.d
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,163 @@
../out/clang-debug/src/app/loadBalancing/sortingAlgorithm/BaseSorting.o: \
app/loadBalancing/sortingAlgorithm/BaseSorting.cc \
app/loadBalancing/sortingAlgorithm/BaseSorting.h \
../../veins-5.2/src/veins/veins.h /opt/omnetpp-6.0.1/include/omnetpp.h \
app/vehiclesHandling/HelperVehicleInfo.h \
../../veins-5.2/src/veins/modules/application/ieee80211p/DemoBaseApplLayer.h \
../../veins-5.2/src/veins/base/modules/BaseApplLayer.h \
../../veins-5.2/src/veins/base/modules/BaseLayer.h \
../../veins-5.2/src/veins/base/modules/BatteryAccess.h \
../../veins-5.2/src/veins/base/modules/BaseModule.h \
../../veins-5.2/src/veins/base/utils/HostState.h \
../../veins-5.2/src/veins/base/modules/BaseBattery.h \
../../veins-5.2/src/veins/base/utils/PassedMessage.h \
../../veins-5.2/src/veins/base/utils/SimpleAddress.h \
../../veins-5.2/src/veins/modules/utility/Consts80211p.h \
../../veins-5.2/src/veins/modules/utility/ConstsPhy.h \
../../veins-5.2/src/veins/modules/messages/BaseFrame1609_4_m.h \
../../veins-5.2/src/veins/base/utils/SimpleAddress_m.h \
../../veins-5.2/src/veins/common_m.h \
../../veins-5.2/src/veins/modules/messages/DemoServiceAdvertisement_m.h \
../../veins-5.2/src/veins/base/utils/Coord_m.h \
../../veins-5.2/src/veins/base/utils/Coord.h \
../../veins-5.2/src/veins/base/utils/FWMath.h \
../../veins-5.2/src/veins/modules/messages/DemoSafetyMessage_m.h \
../../veins-5.2/src/veins/base/connectionManager/ChannelAccess.h \
../../veins-5.2/src/veins/base/utils/AntennaPosition.h \
../../veins-5.2/src/veins/base/utils/FindModule.h \
../../veins-5.2/src/veins/base/modules/BaseMobility.h \
../../veins-5.2/src/veins/base/utils/Move.h \
../../veins-5.2/src/veins/base/modules/BaseWorldUtility.h \
../../veins-5.2/src/veins/base/utils/Heading.h \
../../veins-5.2/src/veins/modules/mac/ieee80211p/DemoBaseApplLayerToMac1609_4Interface.h \
../../veins-5.2/src/veins/base/utils/NetwToMacControlInfo.h \
../../veins-5.2/src/veins/modules/mobility/traci/TraCIMobility.h \
../../veins-5.2/src/veins/modules/mobility/traci/TraCIScenarioManager.h \
../../veins-5.2/src/veins/base/connectionManager/BaseConnectionManager.h \
../../veins-5.2/src/veins/base/connectionManager/NicEntry.h \
../../veins-5.2/src/veins/modules/utility/HasLogProxy.h \
../../veins-5.2/src/veins/modules/obstacle/ObstacleControl.h \
../../veins-5.2/src/veins/modules/obstacle/Obstacle.h \
../../veins-5.2/src/veins/modules/world/annotations/AnnotationManager.h \
../../veins-5.2/src/veins/modules/utility/BBoxLookup.h \
../../veins-5.2/src/veins/modules/obstacle/VehicleObstacleControl.h \
../../veins-5.2/src/veins/modules/obstacle/MobileHostObstacle.h \
../../veins-5.2/src/veins/modules/mobility/traci/TraCIBuffer.h \
../../veins-5.2/src/veins/modules/mobility/traci/TraCIConstants.h \
../../veins-5.2/src/veins/modules/mobility/traci/TraCIColor.h \
../../veins-5.2/src/veins/modules/mobility/traci/TraCIConnection.h \
../../veins-5.2/src/veins/modules/mobility/traci/TraCICoord.h \
../../veins-5.2/src/veins/modules/mobility/traci/TraCICoordinateTransformation.h \
../../veins-5.2/src/veins/modules/mobility/traci/VehicleSignal.h \
../../veins-5.2/src/veins/base/utils/EnumBitset.h \
../../veins-5.2/src/veins/modules/mobility/traci/TraCIRegionOfInterest.h \
../../veins-5.2/src/veins/modules/mobility/traci/TraCICommandInterface.h \
../../veins-5.2/src/veins/modules/world/traci/trafficLight/TraCITrafficLightProgram.h

app/loadBalancing/sortingAlgorithm/BaseSorting.h:

../../veins-5.2/src/veins/veins.h:

/opt/omnetpp-6.0.1/include/omnetpp.h:

app/vehiclesHandling/HelperVehicleInfo.h:

../../veins-5.2/src/veins/modules/application/ieee80211p/DemoBaseApplLayer.h:

../../veins-5.2/src/veins/base/modules/BaseApplLayer.h:

../../veins-5.2/src/veins/base/modules/BaseLayer.h:

../../veins-5.2/src/veins/base/modules/BatteryAccess.h:

../../veins-5.2/src/veins/base/modules/BaseModule.h:

../../veins-5.2/src/veins/base/utils/HostState.h:

../../veins-5.2/src/veins/base/modules/BaseBattery.h:

../../veins-5.2/src/veins/base/utils/PassedMessage.h:

../../veins-5.2/src/veins/base/utils/SimpleAddress.h:

../../veins-5.2/src/veins/modules/utility/Consts80211p.h:

../../veins-5.2/src/veins/modules/utility/ConstsPhy.h:

../../veins-5.2/src/veins/modules/messages/BaseFrame1609_4_m.h:

../../veins-5.2/src/veins/base/utils/SimpleAddress_m.h:

../../veins-5.2/src/veins/common_m.h:

../../veins-5.2/src/veins/modules/messages/DemoServiceAdvertisement_m.h:

../../veins-5.2/src/veins/base/utils/Coord_m.h:

../../veins-5.2/src/veins/base/utils/Coord.h:

../../veins-5.2/src/veins/base/utils/FWMath.h:

../../veins-5.2/src/veins/modules/messages/DemoSafetyMessage_m.h:

../../veins-5.2/src/veins/base/connectionManager/ChannelAccess.h:

../../veins-5.2/src/veins/base/utils/AntennaPosition.h:

../../veins-5.2/src/veins/base/utils/FindModule.h:

../../veins-5.2/src/veins/base/modules/BaseMobility.h:

../../veins-5.2/src/veins/base/utils/Move.h:

../../veins-5.2/src/veins/base/modules/BaseWorldUtility.h:

../../veins-5.2/src/veins/base/utils/Heading.h:

../../veins-5.2/src/veins/modules/mac/ieee80211p/DemoBaseApplLayerToMac1609_4Interface.h:

../../veins-5.2/src/veins/base/utils/NetwToMacControlInfo.h:

../../veins-5.2/src/veins/modules/mobility/traci/TraCIMobility.h:

../../veins-5.2/src/veins/modules/mobility/traci/TraCIScenarioManager.h:

../../veins-5.2/src/veins/base/connectionManager/BaseConnectionManager.h:

../../veins-5.2/src/veins/base/connectionManager/NicEntry.h:

../../veins-5.2/src/veins/modules/utility/HasLogProxy.h:

../../veins-5.2/src/veins/modules/obstacle/ObstacleControl.h:

../../veins-5.2/src/veins/modules/obstacle/Obstacle.h:

../../veins-5.2/src/veins/modules/world/annotations/AnnotationManager.h:

../../veins-5.2/src/veins/modules/utility/BBoxLookup.h:

../../veins-5.2/src/veins/modules/obstacle/VehicleObstacleControl.h:

../../veins-5.2/src/veins/modules/obstacle/MobileHostObstacle.h:

../../veins-5.2/src/veins/modules/mobility/traci/TraCIBuffer.h:

../../veins-5.2/src/veins/modules/mobility/traci/TraCIConstants.h:

../../veins-5.2/src/veins/modules/mobility/traci/TraCIColor.h:

../../veins-5.2/src/veins/modules/mobility/traci/TraCIConnection.h:

../../veins-5.2/src/veins/modules/mobility/traci/TraCICoord.h:

../../veins-5.2/src/veins/modules/mobility/traci/TraCICoordinateTransformation.h:

../../veins-5.2/src/veins/modules/mobility/traci/VehicleSignal.h:

../../veins-5.2/src/veins/base/utils/EnumBitset.h:

../../veins-5.2/src/veins/modules/mobility/traci/TraCIRegionOfInterest.h:

../../veins-5.2/src/veins/modules/mobility/traci/TraCICommandInterface.h:

../../veins-5.2/src/veins/modules/world/traci/trafficLight/TraCITrafficLightProgram.h:
Binary file added out/clang-debug/src/app/loadBalancing/sortingAlgorithm/ComputationTime.o
View file
Open in desktop
Binary file not shown.
166 changes: 166 additions & 0 deletions out/clang-debug/src/app/loadBalancing/sortingAlgorithm/ComputationTime.o.d
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,166 @@
../out/clang-debug/src/app/loadBalancing/sortingAlgorithm/ComputationTime.o: \
app/loadBalancing/sortingAlgorithm/ComputationTime.cc \
app/loadBalancing/sortingAlgorithm/ComputationTime.h \
../../veins-5.2/src/veins/veins.h /opt/omnetpp-6.0.1/include/omnetpp.h \
app/vehiclesHandling/HelperVehicleInfo.h \
../../veins-5.2/src/veins/modules/application/ieee80211p/DemoBaseApplLayer.h \
../../veins-5.2/src/veins/base/modules/BaseApplLayer.h \
../../veins-5.2/src/veins/base/modules/BaseLayer.h \
../../veins-5.2/src/veins/base/modules/BatteryAccess.h \
../../veins-5.2/src/veins/base/modules/BaseModule.h \
../../veins-5.2/src/veins/base/utils/HostState.h \
../../veins-5.2/src/veins/base/modules/BaseBattery.h \
../../veins-5.2/src/veins/base/utils/PassedMessage.h \
../../veins-5.2/src/veins/base/utils/SimpleAddress.h \
../../veins-5.2/src/veins/modules/utility/Consts80211p.h \
../../veins-5.2/src/veins/modules/utility/ConstsPhy.h \
../../veins-5.2/src/veins/modules/messages/BaseFrame1609_4_m.h \
../../veins-5.2/src/veins/base/utils/SimpleAddress_m.h \
../../veins-5.2/src/veins/common_m.h \
../../veins-5.2/src/veins/modules/messages/DemoServiceAdvertisement_m.h \
../../veins-5.2/src/veins/base/utils/Coord_m.h \
../../veins-5.2/src/veins/base/utils/Coord.h \
../../veins-5.2/src/veins/base/utils/FWMath.h \
../../veins-5.2/src/veins/modules/messages/DemoSafetyMessage_m.h \
../../veins-5.2/src/veins/base/connectionManager/ChannelAccess.h \
../../veins-5.2/src/veins/base/utils/AntennaPosition.h \
../../veins-5.2/src/veins/base/utils/FindModule.h \
../../veins-5.2/src/veins/base/modules/BaseMobility.h \
../../veins-5.2/src/veins/base/utils/Move.h \
../../veins-5.2/src/veins/base/modules/BaseWorldUtility.h \
../../veins-5.2/src/veins/base/utils/Heading.h \
../../veins-5.2/src/veins/modules/mac/ieee80211p/DemoBaseApplLayerToMac1609_4Interface.h \
../../veins-5.2/src/veins/base/utils/NetwToMacControlInfo.h \
../../veins-5.2/src/veins/modules/mobility/traci/TraCIMobility.h \
../../veins-5.2/src/veins/modules/mobility/traci/TraCIScenarioManager.h \
../../veins-5.2/src/veins/base/connectionManager/BaseConnectionManager.h \
../../veins-5.2/src/veins/base/connectionManager/NicEntry.h \
../../veins-5.2/src/veins/modules/utility/HasLogProxy.h \
../../veins-5.2/src/veins/modules/obstacle/ObstacleControl.h \
../../veins-5.2/src/veins/modules/obstacle/Obstacle.h \
../../veins-5.2/src/veins/modules/world/annotations/AnnotationManager.h \
../../veins-5.2/src/veins/modules/utility/BBoxLookup.h \
../../veins-5.2/src/veins/modules/obstacle/VehicleObstacleControl.h \
../../veins-5.2/src/veins/modules/obstacle/MobileHostObstacle.h \
../../veins-5.2/src/veins/modules/mobility/traci/TraCIBuffer.h \
../../veins-5.2/src/veins/modules/mobility/traci/TraCIConstants.h \
../../veins-5.2/src/veins/modules/mobility/traci/TraCIColor.h \
../../veins-5.2/src/veins/modules/mobility/traci/TraCIConnection.h \
../../veins-5.2/src/veins/modules/mobility/traci/TraCICoord.h \
../../veins-5.2/src/veins/modules/mobility/traci/TraCICoordinateTransformation.h \
../../veins-5.2/src/veins/modules/mobility/traci/VehicleSignal.h \
../../veins-5.2/src/veins/base/utils/EnumBitset.h \
../../veins-5.2/src/veins/modules/mobility/traci/TraCIRegionOfInterest.h \
../../veins-5.2/src/veins/modules/mobility/traci/TraCICommandInterface.h \
../../veins-5.2/src/veins/modules/world/traci/trafficLight/TraCITrafficLightProgram.h \
app/loadBalancing/sortingAlgorithm/BaseSorting.h

app/loadBalancing/sortingAlgorithm/ComputationTime.h:

../../veins-5.2/src/veins/veins.h:

/opt/omnetpp-6.0.1/include/omnetpp.h:

app/vehiclesHandling/HelperVehicleInfo.h:

../../veins-5.2/src/veins/modules/application/ieee80211p/DemoBaseApplLayer.h:

../../veins-5.2/src/veins/base/modules/BaseApplLayer.h:

../../veins-5.2/src/veins/base/modules/BaseLayer.h:

../../veins-5.2/src/veins/base/modules/BatteryAccess.h:

../../veins-5.2/src/veins/base/modules/BaseModule.h:

../../veins-5.2/src/veins/base/utils/HostState.h:

../../veins-5.2/src/veins/base/modules/BaseBattery.h:

../../veins-5.2/src/veins/base/utils/PassedMessage.h:

../../veins-5.2/src/veins/base/utils/SimpleAddress.h:

../../veins-5.2/src/veins/modules/utility/Consts80211p.h:

../../veins-5.2/src/veins/modules/utility/ConstsPhy.h:

../../veins-5.2/src/veins/modules/messages/BaseFrame1609_4_m.h:

../../veins-5.2/src/veins/base/utils/SimpleAddress_m.h:

../../veins-5.2/src/veins/common_m.h:

../../veins-5.2/src/veins/modules/messages/DemoServiceAdvertisement_m.h:

../../veins-5.2/src/veins/base/utils/Coord_m.h:

../../veins-5.2/src/veins/base/utils/Coord.h:

../../veins-5.2/src/veins/base/utils/FWMath.h:

../../veins-5.2/src/veins/modules/messages/DemoSafetyMessage_m.h:

../../veins-5.2/src/veins/base/connectionManager/ChannelAccess.h:

../../veins-5.2/src/veins/base/utils/AntennaPosition.h:

../../veins-5.2/src/veins/base/utils/FindModule.h:

../../veins-5.2/src/veins/base/modules/BaseMobility.h:

../../veins-5.2/src/veins/base/utils/Move.h:

../../veins-5.2/src/veins/base/modules/BaseWorldUtility.h:

../../veins-5.2/src/veins/base/utils/Heading.h:

../../veins-5.2/src/veins/modules/mac/ieee80211p/DemoBaseApplLayerToMac1609_4Interface.h:

../../veins-5.2/src/veins/base/utils/NetwToMacControlInfo.h:

../../veins-5.2/src/veins/modules/mobility/traci/TraCIMobility.h:

../../veins-5.2/src/veins/modules/mobility/traci/TraCIScenarioManager.h:

../../veins-5.2/src/veins/base/connectionManager/BaseConnectionManager.h:

../../veins-5.2/src/veins/base/connectionManager/NicEntry.h:

../../veins-5.2/src/veins/modules/utility/HasLogProxy.h:

../../veins-5.2/src/veins/modules/obstacle/ObstacleControl.h:

../../veins-5.2/src/veins/modules/obstacle/Obstacle.h:

../../veins-5.2/src/veins/modules/world/annotations/AnnotationManager.h:

../../veins-5.2/src/veins/modules/utility/BBoxLookup.h:

../../veins-5.2/src/veins/modules/obstacle/VehicleObstacleControl.h:

../../veins-5.2/src/veins/modules/obstacle/MobileHostObstacle.h:

../../veins-5.2/src/veins/modules/mobility/traci/TraCIBuffer.h:

../../veins-5.2/src/veins/modules/mobility/traci/TraCIConstants.h:

../../veins-5.2/src/veins/modules/mobility/traci/TraCIColor.h:

../../veins-5.2/src/veins/modules/mobility/traci/TraCIConnection.h:

../../veins-5.2/src/veins/modules/mobility/traci/TraCICoord.h:

../../veins-5.2/src/veins/modules/mobility/traci/TraCICoordinateTransformation.h:

../../veins-5.2/src/veins/modules/mobility/traci/VehicleSignal.h:

../../veins-5.2/src/veins/base/utils/EnumBitset.h:

../../veins-5.2/src/veins/modules/mobility/traci/TraCIRegionOfInterest.h:

../../veins-5.2/src/veins/modules/mobility/traci/TraCICommandInterface.h:

../../veins-5.2/src/veins/modules/world/traci/trafficLight/TraCITrafficLightProgram.h:

app/loadBalancing/sortingAlgorithm/BaseSorting.h:
Binary file added out/clang-debug/src/app/loadBalancing/sortingAlgorithm/FIFO.o
View file
Open in desktop
Binary file not shown.
Loading