[ruff] fix some ruff errors and warnings

Author: nikohansen

comocma/como_logger.py

@@ -202,9 +202,9 @@ def store(self, moes):
         # update the number of times this function have been called
         self.num_calls += 1
         # update the maximum and minimum stepsize of the current run
-        if not "max_stepsize" in self._data:
+        if "max_stepsize" not in self._data:
             self._data["max_stepsize"] = - float('inf')
-        if not "min_stepsize" in self._data:
+        if "min_stepsize" not in self._data:
             self._data["min_stepsize"] = float('inf')
         if moes.kernels[-1].countevals > 0 or len(moes.kernels) < 1:
             self._data["max_stepsize"] = max(self._data["max_stepsize"], moes.kernels[-1].sigma)

comocma/hv.py

@@ -108,7 +108,7 @@ def hvRecursive(self, dimIndex, length, bounds):
             hvRecursive = self.hvRecursive
             p = sentinel
             q = p.prev[dimIndex]
-            while q.cargo != None:
+            while q.cargo is not None:
                 if q.ignore < dimIndex:
                     q.ignore = 0
                 q = q.prev[dimIndex]

comocma/sofomore_logger.py

@@ -120,11 +120,6 @@ def initialize(self, modulo=None):
         """reset logger, overwrite original files, `modulo`: log only every modulo call"""
         if modulo is not None:
             self.modulo = modulo
-        try:
-            es = self.es  # must have been registered
-        except AttributeError:
-            pass  # TODO: revise usage of es... that this can pass
-            raise AttributeError('call register() before initialize()')
 
         self.counter = 0  # number of calls of add
         self.last_iteration = 0  # some lines are only written if iteration>last_iteration
@@ -295,18 +290,21 @@ def add(self, es=None, more_data=(), modulo=None):
                     1 + len(kernel._last_offspring_f_values) )
 
 
-        first_quartile_ratio_offspring_incumbent = np.percentile(es._ratio_nondom_offspring_incumbent, 25);
-        median_ratio_offspring_incumbent = np.percentile(es._ratio_nondom_offspring_incumbent, 50);
-        last_quartile_ratio_offspring_incumbent = np.percentile(es._ratio_nondom_offspring_incumbent, 75);
+        first_quartile_ratio_offspring_incumbent = np.percentile(
+                            es._ratio_nondom_offspring_incumbent, 25)
+        median_ratio_offspring_incumbent = np.percentile(
+                            es._ratio_nondom_offspring_incumbent, 50)
+        last_quartile_ratio_offspring_incumbent = np.percentile(
+                            es._ratio_nondom_offspring_incumbent, 75)
 
 
-        median_axis_ratios = np.median([kernel.D.max() / kernel.D.min() \
-        if not kernel.opts['CMA_diagonal'] or kernel.countiter > kernel.opts['CMA_diagonal']
-        else max(kernel.sigma_vec*1) / min(kernel.sigma_vec*1) for kernel in es.kernels])
+        median_axis_ratios = np.median([kernel.D.max() / kernel.D.min()
+            if not kernel.opts['CMA_diagonal'] or kernel.countiter > kernel.opts['CMA_diagonal']
+            else max(kernel.sigma_vec*1) / min(kernel.sigma_vec*1) for kernel in es.kernels])
         median_sigmas = np.median([kernel.sigma for kernel in es.kernels])
-        median_min_stds = np.median([kernel.sigma * min(kernel.sigma_vec * kernel.dC**0.5) \
+        median_min_stds = np.median([kernel.sigma * min(kernel.sigma_vec * kernel.dC**0.5)
                                      for kernel in es.kernels])
-        median_max_stds = np.median([kernel.sigma * max(kernel.sigma_vec * kernel.dC**0.5) \
+        median_max_stds = np.median([kernel.sigma * max(kernel.sigma_vec * kernel.dC**0.5)
                                      for kernel in es.kernels])
         median_stds = self.es.median_stds
 
@@ -444,6 +442,7 @@ def plot(self, filename=None, x_iteration = False):
 
         Otherwise, plot all.
         """
+        from matplotlib import pyplot as plt
         if filename:
             iteration, countevals, res = self.load(filename)
             for i in range(len(res)):   
@@ -452,7 +451,6 @@ def plot(self, filename=None, x_iteration = False):
                 else:
                     plt.plot(iteration, res)
         else:
-            from matplotlib import pyplot as plt
             plt.figure(np.random.randint(9999999))
             self.plot_divers()
             plt.figure(np.random.randint(9999999))
@@ -608,14 +606,14 @@ def plot_stds(self, iabscissa=1):
         iteration, countevals, res = self.load(filename)
         absciss = countevals if iabscissa else iteration
         self._enter_plotting()
-  #      color = iter(pyplot.cm.plasma_r(np.linspace(0.35, 1, 3)))
+    #      color = iter(pyplot.cm.plasma_r(np.linspace(0.35, 1, 3)))
         self._xlabel(iabscissa)
 
         pyplot.semilogy(absciss, res[0])
           #  pyplot.plot(absciss, res[i],
            #             '-', color=next(color), label = mylabel[i])
     #        pyplot.semilogy(absciss, res[i],
-     #                       '-', color=next(color), label = mylabel[i])
+    #                       '-', color=next(color), label = mylabel[i])
         # pyplot.hold(True)
         pyplot.grid(True)
         ax = np.array(pyplot.axis())