Merge pull request #12 from moratodpg/remove_maven_branch

clean up maven and others
moratodpg · Sep 29, 2022 · df1b964 · df1b964
2 parents a0b8a0d + c46f214
commit df1b964
Show file tree

Hide file tree

Showing 18 changed files with 6 additions and 1,009 deletions.
diff --git a/main_run_test.py b/main_run_test.py
@@ -118,8 +118,7 @@ def run_sequential_test(args, logger):
         "reward": {"vshape": (1,)},
         "terminated": {"vshape": (1,), "dtype": th.uint8},
     }
-    if args.mac=="maven_mac":
-        scheme["noise"] = {"vshape": (args.noise_dim,)}
+
     groups = {
         "agents": args.n_agents
     }

diff --git a/pymarl/config/algs/maven.yaml b/pymarl/config/algs/maven.yaml
diff --git a/pymarl/config/default.yaml b/pymarl/config/default.yaml
@@ -45,6 +45,3 @@ obs_last_action: True # Include the agent's last action (one_hot) in the observa
 # --- Experiment running params ---
 repeat_id: 1
 label: "default_label"
-
-# maven
-noise_bandit: False
diff --git a/pymarl/controllers/__init__.py b/pymarl/controllers/__init__.py
@@ -2,8 +2,6 @@
 
 from .basic_controller import BasicMAC
 from .is_controller import ISMAC
-from .maven_controller import MavenMAC
 
 REGISTRY["basic_mac"] = BasicMAC
-REGISTRY["maven_mac"] = MavenMAC
 REGISTRY["is_mac"] = ISMAC
diff --git a/pymarl/controllers/maven_controller.py b/pymarl/controllers/maven_controller.py
diff --git a/pymarl/learners/__init__.py b/pymarl/learners/__init__.py
@@ -4,7 +4,6 @@
 from .coma_learner import COMALearner
 from .comaIS_learner import COMAISLearner
 from .ddmac_learner import DDMACLearner
-from .maven_learner import MavenLearner
 REGISTRY = {}
 
 REGISTRY["q_learner"] = QLearner