remove old pairwise generators (#494)

Summary: Pull Request resolved: #494 These generators have been deprecated for a while. Getting rid of them. Reviewed By: JasonKChow Differential Revision: D67725465 fbshipit-source-id: c024213748bbb9f414d9f484f22cc52bd3b73091
facebookresearch · Jan 3, 2025 · e0a14b5 · e0a14b5
1 parent 5a1dd24
commit e0a14b5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 83 deletions.
diff --git a/aepsych/generators/__init__.py b/aepsych/generators/__init__.py
@@ -14,8 +14,6 @@
 from .monotonic_rejection_generator import MonotonicRejectionGenerator
 from .monotonic_thompson_sampler_generator import MonotonicThompsonSamplerGenerator
 from .optimize_acqf_generator import OptimizeAcqfGenerator
-from .pairwise_optimize_acqf_generator import PairwiseOptimizeAcqfGenerator
-from .pairwise_sobol_generator import PairwiseSobolGenerator
 from .random_generator import RandomGenerator
 from .semi_p import IntensityAwareSemiPGenerator
 from .sobol_generator import SobolGenerator
@@ -29,8 +27,6 @@
     "EpsilonGreedyGenerator",
     "ManualGenerator",
     "SampleAroundPointsGenerator",
-    "PairwiseOptimizeAcqfGenerator",
-    "PairwiseSobolGenerator",
     "IntensityAwareSemiPGenerator",
     "AcqfThompsonSamplerGenerator",
 ]

diff --git a/aepsych/generators/pairwise_optimize_acqf_generator.py b/aepsych/generators/pairwise_optimize_acqf_generator.py
diff --git a/aepsych/generators/pairwise_sobol_generator.py b/aepsych/generators/pairwise_sobol_generator.py
diff --git a/tests/models/test_pairwise_probit.py b/tests/models/test_pairwise_probit.py
@@ -525,7 +525,7 @@ def test_1d_pairwise_server(self):
 
             [init_strat]
             min_asks = {n_init}
-            generator = PairwiseSobolGenerator
+            generator = SobolGenerator
 
             [opt_strat]
             model = PairwiseProbitModel
@@ -579,7 +579,7 @@ def test_2d_pairwise_server(self):
 
             [init_strat]
             min_asks = {n_init}
-            generator = PairwiseSobolGenerator
+            generator = SobolGenerator
 
             [opt_strat]
             min_asks = {n_opt}
@@ -635,7 +635,7 @@ def test_serialization_1d(self):
 
             [init_strat]
             min_asks = {n_init}
-            generator = PairwiseSobolGenerator
+            generator = SobolGenerator
 
             [opt_strat]
             model = PairwiseProbitModel
@@ -700,20 +700,20 @@ def test_serialization_2d(self):
 
             [init_strat]
             min_asks = {n_init}
-            generator = PairwiseSobolGenerator
+            generator = SobolGenerator
 
             [opt_strat]
             model = PairwiseProbitModel
             min_asks = {n_opt}
-            generator = PairwiseOptimizeAcqfGenerator
+            generator = OptimizeAcqfGenerator
 
             [PairwiseProbitModel]
             mean_covar_factory = default_mean_covar_factory
 
             [PairwiseMCPosteriorVariance]
             objective = ProbitObjective
 
-            [PairwiseOptimizeAcqfGenerator]
+            [OptimizeAcqfGenerator]
             restarts = 10
             samps = 1000
             """
@@ -760,7 +760,7 @@ def test_config_to_tensor(self):
 
             [init_strat]
             min_asks = 1
-            generator = PairwiseSobolGenerator
+            generator = SobolGenerator
 
             [opt_strat]
             model = PairwiseProbitModel
@@ -797,7 +797,7 @@ def test_config_to_tensor(self):
 
             [init_strat]
             min_asks = 1
-            generator = PairwiseSobolGenerator
+            generator = SobolGenerator
 
             [opt_strat]
             model = PairwiseProbitModel
@@ -833,7 +833,7 @@ def test_config_to_tensor(self):
 
             [init_strat]
             min_asks = 1
-            generator = PairwiseSobolGenerator
+            generator = SobolGenerator
 
             [opt_strat]
             model = PairwiseProbitModel