Skip to content

Commit 6291a40

Browse files
author
Luca Parenti
authored
Merge pull request #13 from SuPaRuC/develop
Merge branch `develop` into `main`
2 parents d2df7de + 4b64116 commit 6291a40

65 files changed

Lines changed: 1270 additions & 93 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎out/clang-debug/src/app/VeinsApp.o‎

-20.9 KB
Binary file not shown.

‎out/clang-debug/src/app/VeinsApp.o.d‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
../../veins-5.2/src/veins/modules/mobility/traci/TraCIRegionOfInterest.h \
5656
../../veins-5.2/src/veins/modules/mobility/traci/TraCICommandInterface.h \
5757
../../veins-5.2/src/veins/modules/world/traci/trafficLight/TraCITrafficLightProgram.h \
58+
app/loadBalancing/sortingAlgorithm/BaseSorting.h \
5859
app/messages/AckMessage_m.h app/messages/AckTimerMessage_m.h \
5960
app/messages/LoadBalanceTimerMessage_m.h \
6061
app/messages/ComputationTimerMessage_m.h \
@@ -178,6 +179,8 @@ app/vehiclesHandling/HelperVehicleInfo.h:
178179

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

182+
app/loadBalancing/sortingAlgorithm/BaseSorting.h:
183+
181184
app/messages/AckMessage_m.h:
182185

183186
app/messages/AckTimerMessage_m.h:

‎out/clang-debug/src/app/loadBalancing/LoadBalancing.o‎

101 KB
Binary file not shown.

‎out/clang-debug/src/app/loadBalancing/LoadBalancing.o.d‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
../../veins-5.2/src/veins/modules/mobility/traci/TraCIRegionOfInterest.h \
5757
../../veins-5.2/src/veins/modules/mobility/traci/TraCICommandInterface.h \
5858
../../veins-5.2/src/veins/modules/world/traci/trafficLight/TraCITrafficLightProgram.h \
59+
app/loadBalancing/sortingAlgorithm/BaseSorting.h \
5960
app/messages/ComputationTimerMessage_m.h
6061

6162
app/VeinsApp.h:
@@ -176,4 +177,6 @@ app/vehiclesHandling/HelperVehicleInfo.h:
176177

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

180+
app/loadBalancing/sortingAlgorithm/BaseSorting.h:
181+
179182
app/messages/ComputationTimerMessage_m.h:

‎out/clang-debug/src/app/loadBalancing/sortingAlgorithm/BaseSorting.o‎

1.56 MB
Binary file not shown.

‎out/clang-debug/src/app/loadBalancing/sortingAlgorithm/BaseSorting.o.d‎

Lines changed: 163 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,163 @@
1+
../out/clang-debug/src/app/loadBalancing/sortingAlgorithm/BaseSorting.o: \
2+
app/loadBalancing/sortingAlgorithm/BaseSorting.cc \
3+
app/loadBalancing/sortingAlgorithm/BaseSorting.h \
4+
../../veins-5.2/src/veins/veins.h /opt/omnetpp-6.0.1/include/omnetpp.h \
5+
app/vehiclesHandling/HelperVehicleInfo.h \
6+
../../veins-5.2/src/veins/modules/application/ieee80211p/DemoBaseApplLayer.h \
7+
../../veins-5.2/src/veins/base/modules/BaseApplLayer.h \
8+
../../veins-5.2/src/veins/base/modules/BaseLayer.h \
9+
../../veins-5.2/src/veins/base/modules/BatteryAccess.h \
10+
../../veins-5.2/src/veins/base/modules/BaseModule.h \
11+
../../veins-5.2/src/veins/base/utils/HostState.h \
12+
../../veins-5.2/src/veins/base/modules/BaseBattery.h \
13+
../../veins-5.2/src/veins/base/utils/PassedMessage.h \
14+
../../veins-5.2/src/veins/base/utils/SimpleAddress.h \
15+
../../veins-5.2/src/veins/modules/utility/Consts80211p.h \
16+
../../veins-5.2/src/veins/modules/utility/ConstsPhy.h \
17+
../../veins-5.2/src/veins/modules/messages/BaseFrame1609_4_m.h \
18+
../../veins-5.2/src/veins/base/utils/SimpleAddress_m.h \
19+
../../veins-5.2/src/veins/common_m.h \
20+
../../veins-5.2/src/veins/modules/messages/DemoServiceAdvertisement_m.h \
21+
../../veins-5.2/src/veins/base/utils/Coord_m.h \
22+
../../veins-5.2/src/veins/base/utils/Coord.h \
23+
../../veins-5.2/src/veins/base/utils/FWMath.h \
24+
../../veins-5.2/src/veins/modules/messages/DemoSafetyMessage_m.h \
25+
../../veins-5.2/src/veins/base/connectionManager/ChannelAccess.h \
26+
../../veins-5.2/src/veins/base/utils/AntennaPosition.h \
27+
../../veins-5.2/src/veins/base/utils/FindModule.h \
28+
../../veins-5.2/src/veins/base/modules/BaseMobility.h \
29+
../../veins-5.2/src/veins/base/utils/Move.h \
30+
../../veins-5.2/src/veins/base/modules/BaseWorldUtility.h \
31+
../../veins-5.2/src/veins/base/utils/Heading.h \
32+
../../veins-5.2/src/veins/modules/mac/ieee80211p/DemoBaseApplLayerToMac1609_4Interface.h \
33+
../../veins-5.2/src/veins/base/utils/NetwToMacControlInfo.h \
34+
../../veins-5.2/src/veins/modules/mobility/traci/TraCIMobility.h \
35+
../../veins-5.2/src/veins/modules/mobility/traci/TraCIScenarioManager.h \
36+
../../veins-5.2/src/veins/base/connectionManager/BaseConnectionManager.h \
37+
../../veins-5.2/src/veins/base/connectionManager/NicEntry.h \
38+
../../veins-5.2/src/veins/modules/utility/HasLogProxy.h \
39+
../../veins-5.2/src/veins/modules/obstacle/ObstacleControl.h \
40+
../../veins-5.2/src/veins/modules/obstacle/Obstacle.h \
41+
../../veins-5.2/src/veins/modules/world/annotations/AnnotationManager.h \
42+
../../veins-5.2/src/veins/modules/utility/BBoxLookup.h \
43+
../../veins-5.2/src/veins/modules/obstacle/VehicleObstacleControl.h \
44+
../../veins-5.2/src/veins/modules/obstacle/MobileHostObstacle.h \
45+
../../veins-5.2/src/veins/modules/mobility/traci/TraCIBuffer.h \
46+
../../veins-5.2/src/veins/modules/mobility/traci/TraCIConstants.h \
47+
../../veins-5.2/src/veins/modules/mobility/traci/TraCIColor.h \
48+
../../veins-5.2/src/veins/modules/mobility/traci/TraCIConnection.h \
49+
../../veins-5.2/src/veins/modules/mobility/traci/TraCICoord.h \
50+
../../veins-5.2/src/veins/modules/mobility/traci/TraCICoordinateTransformation.h \
51+
../../veins-5.2/src/veins/modules/mobility/traci/VehicleSignal.h \
52+
../../veins-5.2/src/veins/base/utils/EnumBitset.h \
53+
../../veins-5.2/src/veins/modules/mobility/traci/TraCIRegionOfInterest.h \
54+
../../veins-5.2/src/veins/modules/mobility/traci/TraCICommandInterface.h \
55+
../../veins-5.2/src/veins/modules/world/traci/trafficLight/TraCITrafficLightProgram.h
56+
57+
app/loadBalancing/sortingAlgorithm/BaseSorting.h:
58+
59+
../../veins-5.2/src/veins/veins.h:
60+
61+
/opt/omnetpp-6.0.1/include/omnetpp.h:
62+
63+
app/vehiclesHandling/HelperVehicleInfo.h:
64+
65+
../../veins-5.2/src/veins/modules/application/ieee80211p/DemoBaseApplLayer.h:
66+
67+
../../veins-5.2/src/veins/base/modules/BaseApplLayer.h:
68+
69+
../../veins-5.2/src/veins/base/modules/BaseLayer.h:
70+
71+
../../veins-5.2/src/veins/base/modules/BatteryAccess.h:
72+
73+
../../veins-5.2/src/veins/base/modules/BaseModule.h:
74+
75+
../../veins-5.2/src/veins/base/utils/HostState.h:
76+
77+
../../veins-5.2/src/veins/base/modules/BaseBattery.h:
78+
79+
../../veins-5.2/src/veins/base/utils/PassedMessage.h:
80+
81+
../../veins-5.2/src/veins/base/utils/SimpleAddress.h:
82+
83+
../../veins-5.2/src/veins/modules/utility/Consts80211p.h:
84+
85+
../../veins-5.2/src/veins/modules/utility/ConstsPhy.h:
86+
87+
../../veins-5.2/src/veins/modules/messages/BaseFrame1609_4_m.h:
88+
89+
../../veins-5.2/src/veins/base/utils/SimpleAddress_m.h:
90+
91+
../../veins-5.2/src/veins/common_m.h:
92+
93+
../../veins-5.2/src/veins/modules/messages/DemoServiceAdvertisement_m.h:
94+
95+
../../veins-5.2/src/veins/base/utils/Coord_m.h:
96+
97+
../../veins-5.2/src/veins/base/utils/Coord.h:
98+
99+
../../veins-5.2/src/veins/base/utils/FWMath.h:
100+
101+
../../veins-5.2/src/veins/modules/messages/DemoSafetyMessage_m.h:
102+
103+
../../veins-5.2/src/veins/base/connectionManager/ChannelAccess.h:
104+
105+
../../veins-5.2/src/veins/base/utils/AntennaPosition.h:
106+
107+
../../veins-5.2/src/veins/base/utils/FindModule.h:
108+
109+
../../veins-5.2/src/veins/base/modules/BaseMobility.h:
110+
111+
../../veins-5.2/src/veins/base/utils/Move.h:
112+
113+
../../veins-5.2/src/veins/base/modules/BaseWorldUtility.h:
114+
115+
../../veins-5.2/src/veins/base/utils/Heading.h:
116+
117+
../../veins-5.2/src/veins/modules/mac/ieee80211p/DemoBaseApplLayerToMac1609_4Interface.h:
118+
119+
../../veins-5.2/src/veins/base/utils/NetwToMacControlInfo.h:
120+
121+
../../veins-5.2/src/veins/modules/mobility/traci/TraCIMobility.h:
122+
123+
../../veins-5.2/src/veins/modules/mobility/traci/TraCIScenarioManager.h:
124+
125+
../../veins-5.2/src/veins/base/connectionManager/BaseConnectionManager.h:
126+
127+
../../veins-5.2/src/veins/base/connectionManager/NicEntry.h:
128+
129+
../../veins-5.2/src/veins/modules/utility/HasLogProxy.h:
130+
131+
../../veins-5.2/src/veins/modules/obstacle/ObstacleControl.h:
132+
133+
../../veins-5.2/src/veins/modules/obstacle/Obstacle.h:
134+
135+
../../veins-5.2/src/veins/modules/world/annotations/AnnotationManager.h:
136+
137+
../../veins-5.2/src/veins/modules/utility/BBoxLookup.h:
138+
139+
../../veins-5.2/src/veins/modules/obstacle/VehicleObstacleControl.h:
140+
141+
../../veins-5.2/src/veins/modules/obstacle/MobileHostObstacle.h:
142+
143+
../../veins-5.2/src/veins/modules/mobility/traci/TraCIBuffer.h:
144+
145+
../../veins-5.2/src/veins/modules/mobility/traci/TraCIConstants.h:
146+
147+
../../veins-5.2/src/veins/modules/mobility/traci/TraCIColor.h:
148+
149+
../../veins-5.2/src/veins/modules/mobility/traci/TraCIConnection.h:
150+
151+
../../veins-5.2/src/veins/modules/mobility/traci/TraCICoord.h:
152+
153+
../../veins-5.2/src/veins/modules/mobility/traci/TraCICoordinateTransformation.h:
154+
155+
../../veins-5.2/src/veins/modules/mobility/traci/VehicleSignal.h:
156+
157+
../../veins-5.2/src/veins/base/utils/EnumBitset.h:
158+
159+
../../veins-5.2/src/veins/modules/mobility/traci/TraCIRegionOfInterest.h:
160+
161+
../../veins-5.2/src/veins/modules/mobility/traci/TraCICommandInterface.h:
162+
163+
../../veins-5.2/src/veins/modules/world/traci/trafficLight/TraCITrafficLightProgram.h:

‎out/clang-debug/src/app/loadBalancing/sortingAlgorithm/ComputationTime.o‎

1.79 MB
Binary file not shown.

‎out/clang-debug/src/app/loadBalancing/sortingAlgorithm/ComputationTime.o.d‎

Lines changed: 166 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,166 @@
1+
../out/clang-debug/src/app/loadBalancing/sortingAlgorithm/ComputationTime.o: \
2+
app/loadBalancing/sortingAlgorithm/ComputationTime.cc \
3+
app/loadBalancing/sortingAlgorithm/ComputationTime.h \
4+
../../veins-5.2/src/veins/veins.h /opt/omnetpp-6.0.1/include/omnetpp.h \
5+
app/vehiclesHandling/HelperVehicleInfo.h \
6+
../../veins-5.2/src/veins/modules/application/ieee80211p/DemoBaseApplLayer.h \
7+
../../veins-5.2/src/veins/base/modules/BaseApplLayer.h \
8+
../../veins-5.2/src/veins/base/modules/BaseLayer.h \
9+
../../veins-5.2/src/veins/base/modules/BatteryAccess.h \
10+
../../veins-5.2/src/veins/base/modules/BaseModule.h \
11+
../../veins-5.2/src/veins/base/utils/HostState.h \
12+
../../veins-5.2/src/veins/base/modules/BaseBattery.h \
13+
../../veins-5.2/src/veins/base/utils/PassedMessage.h \
14+
../../veins-5.2/src/veins/base/utils/SimpleAddress.h \
15+
../../veins-5.2/src/veins/modules/utility/Consts80211p.h \
16+
../../veins-5.2/src/veins/modules/utility/ConstsPhy.h \
17+
../../veins-5.2/src/veins/modules/messages/BaseFrame1609_4_m.h \
18+
../../veins-5.2/src/veins/base/utils/SimpleAddress_m.h \
19+
../../veins-5.2/src/veins/common_m.h \
20+
../../veins-5.2/src/veins/modules/messages/DemoServiceAdvertisement_m.h \
21+
../../veins-5.2/src/veins/base/utils/Coord_m.h \
22+
../../veins-5.2/src/veins/base/utils/Coord.h \
23+
../../veins-5.2/src/veins/base/utils/FWMath.h \
24+
../../veins-5.2/src/veins/modules/messages/DemoSafetyMessage_m.h \
25+
../../veins-5.2/src/veins/base/connectionManager/ChannelAccess.h \
26+
../../veins-5.2/src/veins/base/utils/AntennaPosition.h \
27+
../../veins-5.2/src/veins/base/utils/FindModule.h \
28+
../../veins-5.2/src/veins/base/modules/BaseMobility.h \
29+
../../veins-5.2/src/veins/base/utils/Move.h \
30+
../../veins-5.2/src/veins/base/modules/BaseWorldUtility.h \
31+
../../veins-5.2/src/veins/base/utils/Heading.h \
32+
../../veins-5.2/src/veins/modules/mac/ieee80211p/DemoBaseApplLayerToMac1609_4Interface.h \
33+
../../veins-5.2/src/veins/base/utils/NetwToMacControlInfo.h \
34+
../../veins-5.2/src/veins/modules/mobility/traci/TraCIMobility.h \
35+
../../veins-5.2/src/veins/modules/mobility/traci/TraCIScenarioManager.h \
36+
../../veins-5.2/src/veins/base/connectionManager/BaseConnectionManager.h \
37+
../../veins-5.2/src/veins/base/connectionManager/NicEntry.h \
38+
../../veins-5.2/src/veins/modules/utility/HasLogProxy.h \
39+
../../veins-5.2/src/veins/modules/obstacle/ObstacleControl.h \
40+
../../veins-5.2/src/veins/modules/obstacle/Obstacle.h \
41+
../../veins-5.2/src/veins/modules/world/annotations/AnnotationManager.h \
42+
../../veins-5.2/src/veins/modules/utility/BBoxLookup.h \
43+
../../veins-5.2/src/veins/modules/obstacle/VehicleObstacleControl.h \
44+
../../veins-5.2/src/veins/modules/obstacle/MobileHostObstacle.h \
45+
../../veins-5.2/src/veins/modules/mobility/traci/TraCIBuffer.h \
46+
../../veins-5.2/src/veins/modules/mobility/traci/TraCIConstants.h \
47+
../../veins-5.2/src/veins/modules/mobility/traci/TraCIColor.h \
48+
../../veins-5.2/src/veins/modules/mobility/traci/TraCIConnection.h \
49+
../../veins-5.2/src/veins/modules/mobility/traci/TraCICoord.h \
50+
../../veins-5.2/src/veins/modules/mobility/traci/TraCICoordinateTransformation.h \
51+
../../veins-5.2/src/veins/modules/mobility/traci/VehicleSignal.h \
52+
../../veins-5.2/src/veins/base/utils/EnumBitset.h \
53+
../../veins-5.2/src/veins/modules/mobility/traci/TraCIRegionOfInterest.h \
54+
../../veins-5.2/src/veins/modules/mobility/traci/TraCICommandInterface.h \
55+
../../veins-5.2/src/veins/modules/world/traci/trafficLight/TraCITrafficLightProgram.h \
56+
app/loadBalancing/sortingAlgorithm/BaseSorting.h
57+
58+
app/loadBalancing/sortingAlgorithm/ComputationTime.h:
59+
60+
../../veins-5.2/src/veins/veins.h:
61+
62+
/opt/omnetpp-6.0.1/include/omnetpp.h:
63+
64+
app/vehiclesHandling/HelperVehicleInfo.h:
65+
66+
../../veins-5.2/src/veins/modules/application/ieee80211p/DemoBaseApplLayer.h:
67+
68+
../../veins-5.2/src/veins/base/modules/BaseApplLayer.h:
69+
70+
../../veins-5.2/src/veins/base/modules/BaseLayer.h:
71+
72+
../../veins-5.2/src/veins/base/modules/BatteryAccess.h:
73+
74+
../../veins-5.2/src/veins/base/modules/BaseModule.h:
75+
76+
../../veins-5.2/src/veins/base/utils/HostState.h:
77+
78+
../../veins-5.2/src/veins/base/modules/BaseBattery.h:
79+
80+
../../veins-5.2/src/veins/base/utils/PassedMessage.h:
81+
82+
../../veins-5.2/src/veins/base/utils/SimpleAddress.h:
83+
84+
../../veins-5.2/src/veins/modules/utility/Consts80211p.h:
85+
86+
../../veins-5.2/src/veins/modules/utility/ConstsPhy.h:
87+
88+
../../veins-5.2/src/veins/modules/messages/BaseFrame1609_4_m.h:
89+
90+
../../veins-5.2/src/veins/base/utils/SimpleAddress_m.h:
91+
92+
../../veins-5.2/src/veins/common_m.h:
93+
94+
../../veins-5.2/src/veins/modules/messages/DemoServiceAdvertisement_m.h:
95+
96+
../../veins-5.2/src/veins/base/utils/Coord_m.h:
97+
98+
../../veins-5.2/src/veins/base/utils/Coord.h:
99+
100+
../../veins-5.2/src/veins/base/utils/FWMath.h:
101+
102+
../../veins-5.2/src/veins/modules/messages/DemoSafetyMessage_m.h:
103+
104+
../../veins-5.2/src/veins/base/connectionManager/ChannelAccess.h:
105+
106+
../../veins-5.2/src/veins/base/utils/AntennaPosition.h:
107+
108+
../../veins-5.2/src/veins/base/utils/FindModule.h:
109+
110+
../../veins-5.2/src/veins/base/modules/BaseMobility.h:
111+
112+
../../veins-5.2/src/veins/base/utils/Move.h:
113+
114+
../../veins-5.2/src/veins/base/modules/BaseWorldUtility.h:
115+
116+
../../veins-5.2/src/veins/base/utils/Heading.h:
117+
118+
../../veins-5.2/src/veins/modules/mac/ieee80211p/DemoBaseApplLayerToMac1609_4Interface.h:
119+
120+
../../veins-5.2/src/veins/base/utils/NetwToMacControlInfo.h:
121+
122+
../../veins-5.2/src/veins/modules/mobility/traci/TraCIMobility.h:
123+
124+
../../veins-5.2/src/veins/modules/mobility/traci/TraCIScenarioManager.h:
125+
126+
../../veins-5.2/src/veins/base/connectionManager/BaseConnectionManager.h:
127+
128+
../../veins-5.2/src/veins/base/connectionManager/NicEntry.h:
129+
130+
../../veins-5.2/src/veins/modules/utility/HasLogProxy.h:
131+
132+
../../veins-5.2/src/veins/modules/obstacle/ObstacleControl.h:
133+
134+
../../veins-5.2/src/veins/modules/obstacle/Obstacle.h:
135+
136+
../../veins-5.2/src/veins/modules/world/annotations/AnnotationManager.h:
137+
138+
../../veins-5.2/src/veins/modules/utility/BBoxLookup.h:
139+
140+
../../veins-5.2/src/veins/modules/obstacle/VehicleObstacleControl.h:
141+
142+
../../veins-5.2/src/veins/modules/obstacle/MobileHostObstacle.h:
143+
144+
../../veins-5.2/src/veins/modules/mobility/traci/TraCIBuffer.h:
145+
146+
../../veins-5.2/src/veins/modules/mobility/traci/TraCIConstants.h:
147+
148+
../../veins-5.2/src/veins/modules/mobility/traci/TraCIColor.h:
149+
150+
../../veins-5.2/src/veins/modules/mobility/traci/TraCIConnection.h:
151+
152+
../../veins-5.2/src/veins/modules/mobility/traci/TraCICoord.h:
153+
154+
../../veins-5.2/src/veins/modules/mobility/traci/TraCICoordinateTransformation.h:
155+
156+
../../veins-5.2/src/veins/modules/mobility/traci/VehicleSignal.h:
157+
158+
../../veins-5.2/src/veins/base/utils/EnumBitset.h:
159+
160+
../../veins-5.2/src/veins/modules/mobility/traci/TraCIRegionOfInterest.h:
161+
162+
../../veins-5.2/src/veins/modules/mobility/traci/TraCICommandInterface.h:
163+
164+
../../veins-5.2/src/veins/modules/world/traci/trafficLight/TraCITrafficLightProgram.h:
165+
166+
app/loadBalancing/sortingAlgorithm/BaseSorting.h:

‎out/clang-debug/src/app/loadBalancing/sortingAlgorithm/FIFO.o‎

1.79 MB
Binary file not shown.

0 commit comments

Comments
 (0)