Improve performance by reducing redundant dictionary fetches.

Author: PaulStahr

cma/evolution_strategy.py

@@ -283,8 +283,6 @@ def __init__(self, *args, **kwargs):
         super(_CMASolutionDict_functional, self).__init__(*args, **kwargs)
         self.last_solution_index = 0
 
-    # TODO: insert takes 30% of the overall CPU time, mostly in def key()
-    #       with about 15% of the overall CPU time
     def insert(self, key, geno=None, iteration=None, fitness=None,
                 value=None, cma_norm=None):
         """insert an entry with key ``key`` and value
@@ -301,36 +299,35 @@ def insert(self, key, geno=None, iteration=None, fitness=None,
         # archive returned solutions, first clean up archive
         if iteration is not None and iteration > self.last_iteration and (iteration % 10) < 1:
             self.truncate(300, iteration - 3)
-        elif value is not None and value.get('iteration'):
-            iteration = value['iteration']
-            if (iteration % 10) < 1:
-                self.truncate(300, iteration - 3)
+        elif value is not None:
+            iteration_tmp = value.get('iteration')
+            if iteration_tmp:
+                iteration = iteration_tmp
+                if (iteration % 10) < 1:
+                    self.truncate(300, iteration - 3)
 
         self.last_solution_index += 1
         if value is not None:
-            try:
-                iteration = value['iteration']
-            except:
-                pass
+            iteration = value.get('iteration', iteration)
         if iteration is not None:
             if iteration > self.last_iteration:
                 self.last_solution_index = 0
             self.last_iteration = iteration
         else:
             iteration = self.last_iteration + 0.5  # a hack to get a somewhat reasonable value
         if value is not None:
-            self[key] = value
+            entry = value
         else:
-            self[key] = {'pheno': key}
+            entry = {'pheno': key}
         if geno is not None:
-            self[key]['geno'] = geno
-        if iteration is not None:
-            self[key]['iteration'] = iteration
+            entry['geno'] = geno
+        entry['iteration'] = iteration
         if fitness is not None:
-            self[key]['fitness'] = fitness
+            entry['fitness'] = fitness
         if cma_norm is not None:
-            self[key]['cma_norm'] = cma_norm
-        return self[key]
+            entry['cma_norm'] = cma_norm
+        self[key] = entry
+        return entry
 
 class _CMASolutionDict_empty(dict):
     """a hack to get most code examples running"""

cma/transformations.py

@@ -1122,12 +1122,13 @@ def from_bounds(x, copy=False):
                 return x  # not change, no copy
 
         if archive is not None:
+            archive_y = archive[y]
             try:
-                x = archive[y]['geno']
+                x = archive_y['geno']
             except (KeyError, TypeError):
                 x = None
             if x is not None:
-                if archive[y]['iteration'] < archive.last_iteration:
+                if archive_y['iteration'] < archive.last_iteration:
                     # no current archived genotype was found!?
                     x = repair_and_flag_change(self, repair, x, copy)
                     # x = repair(x, copy_if_changed=copy)

cma/utilities/utils.py

@@ -675,7 +675,7 @@ def __setitem__(self, key, value):
                 self.data_with_same_key[key].insert(0, value)
         else:
             if key in self.data_with_same_key:
-                self.data_with_same_key[key] += [self.data[key]]
+                self.data_with_same_key[key].append(self.data[key])
             elif key in self.data:
                 self.data_with_same_key[key] = [self.data[key]]
             self.data[key] = value