change default to coord ascent

Author: terhorst

smcpp/analysis/analysis.py

@@ -53,7 +53,7 @@ def __init__(self, files, args):
             args.xtol,
             args.ftol,
             learn_rho=args.r is None,
-            single=args.no_multi,
+            single=not args.multi,
         )
         self._init_regularization(args)
 

smcpp/commands/command.py

@@ -78,8 +78,8 @@ def add_common_estimation_args(parser):
                            default="L-BFGS-B", help="optimization algorithm. Powell's method "
                                    "is used by {P,MS}MC and does not require gradients. It may "
                                    "be faster in some cases.")
-    optimizer.add_argument('--no-multi', default=False, action="store_true",
-                           help="do not update multiple blocks of coordinates at once")
+    optimizer.add_argument('--multi', default=False, action="store_true",
+                           help="update multiple blocks of coordinates at once")
     optimizer.add_argument("--ftol", type=float,
                            default=smcpp.defaults.ftol,
                            help="stopping criterion for relative improvement in loglik "

smcpp/optimize/optimizers.py

@@ -237,9 +237,10 @@ def __init__(self, analysis, algorithm, xtol, ftol, single):
 
     def _coordinates(self):
         model = self._analysis.model
+        ret = [range(model.K)]
         if self._single:
-            return [[k] for k in range(model.K)][::-1]  # + [list(range(K // 3))]
-        return [range(model.K)]
+            ret = [[k] for k in range(model.K)][::-1]  # + [list(range(K // 3))]
+        return ret
 
 
 class TwoPopulationOptimizer(SMCPPOptimizer):