Simplify and restructure manager classes

cppcheck.conf

@@ -7,7 +7,6 @@ incorrectLogicOperator:daisi/src/cpps/model/ability.cpp # Due to implementation
 oppositeExpression:daisi/src/cpps/model/ability.cpp # Due to implementation of comparison operator
 knownConditionTrueFalse:minhton/src/algorithms/esearch/minhton_entity_search_algorithm.cpp
 negativeContainerIndex:daisi/src/cpps/negotiation/utils/kmeans.h
-assertWithSideEffect:daisi/src/cpps/common/cpps_manager.cpp
 assertWithSideEffect:daisi/src/path_planning/path_planning_manager.cpp
 
 # false-positives with structured bindings.

daisi/scenarios/cpps/default.yml

@@ -4,11 +4,6 @@ stop_time: 5000s
 random_seed: 42
 default_delay: 5s
 
-# outdated/unused fields
-# only present until Manager switches to new scenariofile parser as well
-randomSeed: 42
-stoptime: 5000000
-
 topology:
     width:  50
     height: 20
@@ -18,12 +13,12 @@ initial_number_of_amrs: 12
 number_of_material_flows: 5
 number_of_material_flow_agents: 5
 do_material_flow_agents_leave_after_finish: false
-  
+
 algorithm:
   assignment_strategy: iterated_auction
 
 autonomous_mobile_robots:
-  - description:  
+  - description:
     properties:
       device_type: amr
       manufacturer: ManufacturerA
@@ -41,7 +36,7 @@ autonomous_mobile_robots:
       load_carrier: package
       max_payload: 30
 
-  - description:  
+  - description:
     properties:
       device_type: amr
       manufacturer: ManufacturerB
@@ -59,7 +54,7 @@ autonomous_mobile_robots:
       load_carrier: package
       max_payload: 45
 
-  - description:  
+  - description:
     properties:
       device_type: amr
       manufacturer: ManufacturerA
@@ -77,7 +72,7 @@ autonomous_mobile_robots:
       load_carrier: eurobox
       max_payload: 30
 
-  - description:  
+  - description:
     properties:
       device_type: amr
       manufacturer: ManufacturerA

daisi/scenarios/entity_search/example.yml

@@ -5,11 +5,6 @@ stop_time: 1h
 random_seed: 2
 default_delay: 5s
 
-# outdated/unused fields
-# only present until Manager switches to new scenariofile parser as well
-randomSeed: 2
-stoptime: 3600000 # 1 hour
-
 fanout: 2
 
 timeouts:

daisi/scenarios/minhton/default.yml

@@ -4,11 +4,6 @@ stop_time: 10000s
 random_seed: 1
 default_delay: 5s
 
-# outdated/unused fields
-# only present until Manager switches to new scenariofile parser as well
-randomSeed: 1
-stoptime: 5000000
-
 fanout: 2
 
 timeouts:

daisi/scenarios/natter/default.yml

@@ -4,11 +4,6 @@ stop_time: 5000s
 random_seed: 1
 default_delay: 0.5s
 
-# outdated/unused fields
-# only present until Manager switches to new scenariofile parser as well
-randomSeed: 1
-stoptime: 5000000
-
 fanout: 2
 number_nodes: 20
 mode: minhcast # minhcast

daisi/scenarios/sola/default.yml

@@ -4,11 +4,6 @@ stop_time: 4294967296ms
 random_seed: 1
 default_delay: 0.5s
 
-# outdated/unused fields
-# only present until Manager switches to new scenariofile parser as well
-stoptime: 4294967296
-randomSeed: 1
-
 fanout: 2
 number_nodes: 3
 

daisi/src/cpps/common/CMakeLists.txt

@@ -47,26 +47,27 @@ target_sources(daisi_cpps_common_cpps_manager
         cpps_manager.h
 )
 target_link_libraries(daisi_cpps_common_cpps_manager
+        PUBLIC
+              daisi_cpps_amr_amr_topology
+              daisi_manager_core_network
+              daisi_manager
+              ns3::libnetwork
+              daisi_cpps_common_scenariofile_cpps_scenariofile
         PRIVATE
-        daisi_manager
-        daisi_cpps_common_cpps_logger_ns3
-        daisi_cpps_common_cpps_application
-        daisi_cpps_amr_physical_amr_mobility_model_ns3
-        daisi_cpps_amr_physical_amr_physical_asset
-        daisi_cpps_logical_amr_amr_logical_agent
-        daisi_cpps_logical_material_flow_material_flow_logical_agent
-        daisi_cpps_logical_algorithms_algorithm_config
-        solanet_serializer
-        daisi_structure_helpers
-        ns3::libcore
-        ns3::libwifi
-        ns3::libmobility
-        ns3::libbridge
-        ns3::libcsma
-        ns3::libinternet
-        daisi_utils
-        daisi_random_engine
-        daisi_cpps_common_scenariofile_cpps_scenariofile
+                daisi_cpps_amr_model_amr_fleet
+                daisi_cpps_amr_physical_amr_mobility_model_ns3
+                daisi_cpps_amr_physical_amr_physical_asset
+                daisi_cpps_amr_model_amr_static_ability
+                daisi_cpps_logical_amr_amr_logical_agent
+                daisi_cpps_common_cpps_application
+                daisi_cpps_logical_material_flow_material_flow_logical_agent
+                daisi_manager_sola_helper
+                ns3::libcore
+                ns3::libmobility
+                ns3::libinternet
+                daisi_utils
+                daisi_random_engine
+                daisi_logger_manager
 )
 
 if(DAISI_DISABLE_NETWORK_SIMULATION)