Removing custom strategy and NSGA-II script

lucasroges · Jan 3, 2024 · 58cd57c · 58cd57c
1 parent f79c7b8
commit 58cd57c
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 292 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -11,7 +11,6 @@ edge-sim-py = {git = "[email protected]:lucasroges/EdgeSimPy.git"}
 scikit-learn = "^1.3.0"
 matplotlib = "^3.7.2"
 ipykernel = "^6.27.0"
-pymoo = "^0.6.1.1"
 
 
 [build-system]

diff --git a/run_nsgaii.py b/run_nsgaii.py
diff --git a/simulation/__main__.py b/simulation/__main__.py
@@ -44,7 +44,7 @@ def main(
 
     # Creating a Simulator object
     simulator = edge_sim_py.Simulator(
-        dump_interval=4000 if algorithm != "custom" else float("inf"),
+        dump_interval=4000,
         logs_directory=f"logs/algorithm={algorithm};dataset={dataset.split('/')[-1].split('.')[0]};seed={seed}" if algorithm != "resource_aware_dynamic" else f"logs/algorithm={algorithm};dataset={dataset.split('/')[-1].split('.')[0]};seed={seed};replicas={replicas};percentage={percentage_of_replicated_images}",
         resource_management_algorithm=algorithm_wrapper,
         resource_management_algorithm_parameters=algorithm_parameters,

diff --git a/simulation/strategies/__init__.py b/simulation/strategies/__init__.py
@@ -1,5 +1,4 @@
 from .p2p_registry_provisioning import p2p_registry_provisioning
 from .dynamic_registry_provisioning import dynamic_registry_provisioning
-from .custom_registry_provisioning import custom_registry_provisioning
 from .resource_aware_dynamic_registry_provisioning import resource_aware_dynamic_registry_provisioning
 from .dynamic_enhanced_registry_provisioning import dynamic_enhanced_registry_provisioning
diff --git a/simulation/strategies/custom_registry_provisioning.py b/simulation/strategies/custom_registry_provisioning.py
diff --git a/simulation/wrapper.py b/simulation/wrapper.py
@@ -1,4 +1,4 @@
-from .strategies import p2p_registry_provisioning, dynamic_registry_provisioning, custom_registry_provisioning, resource_aware_dynamic_registry_provisioning, dynamic_enhanced_registry_provisioning
+from .strategies import p2p_registry_provisioning, dynamic_registry_provisioning, resource_aware_dynamic_registry_provisioning, dynamic_enhanced_registry_provisioning
 from .utils import follow_user
 
 import random
@@ -13,7 +13,7 @@ def algorithm_wrapper(parameters: dict):
     random_state = random.getstate()
 
     # Running the custom algorithm
-    if parameters["algorithm"] not in ["p2p", "dynamic", "custom", "resource_aware_dynamic", "dynamic_enhanced"]:
+    if parameters["algorithm"] not in ["p2p", "dynamic", "resource_aware_dynamic", "dynamic_enhanced"]:
         print(f"{parameters['algorithm']} strategy does not require a custom algorithm.")
     else:
         eval(f"{parameters['algorithm']}_registry_provisioning")(parameters=parameters)