[estimate] make --no-multi the default

Author: terhorst

smcpp/analysis.py

@@ -231,7 +231,7 @@ def __init__(self, files, args):
         self._model.randomize()
         self._init_optimizer(args.outdir,
                              args.algorithm, args.xtol, args.ftol,
-                             learn_rho=True, single=args.no_multi)
+                             learn_rho=True, single=not args.multi)
         self._init_regularization(args)
 
 

smcpp/commands/command.py

@@ -69,8 +69,8 @@ def add_common_estimation_args(parser):
     optimizer.add_argument('--algorithm',
                            choices=["BFGS", "L-BFGS-B", "TNC", "AdaMax", "Adam"],
                            default="L-BFGS-B", help=argparse.SUPPRESS)
-    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

@@ -29,7 +29,7 @@ def __init__(self, analysis, algorithm, xtol, ftol, single):
         self._single = single
 
     @abstractmethod
-    def _coordinates(self, i):
+    def _coordinates(self):
         'Return a list of groups of coordinates to be optimized at iteration i.'
         return []
 
@@ -104,7 +104,7 @@ def _minimize(self, x0, coords):
             self._f_dict = {}
             self._last_f = None
             f0 = self._f(x0z, self._analysis, coords)[0]
-            if True or len(y) > 1:
+            if len(y) > 1:
                 res = scipy.optimize.minimize(self._f, x0z,
                         jac=True,
                         args=(self._analysis, coords),