From 07381cfc1a296ac239ff2a90f9a2720fb865d6b7 Mon Sep 17 00:00:00 2001
From: Theo Steininger <theos@mpa-garching.mpg.de>
Date: Fri, 21 Apr 2017 04:57:01 +0200
Subject: [PATCH] Removed blank lines and dead code.
---
nifty/basic_arithmetics.py | 2 --
nifty/minimization/vl_bfgs.py | 44 -----------------------------------
2 files changed, 46 deletions(-)
diff --git a/nifty/basic_arithmetics.py b/nifty/basic_arithmetics.py
index e26a66d6d..30735f6b6 100644
--- a/nifty/basic_arithmetics.py
+++ b/nifty/basic_arithmetics.py
@@ -31,10 +31,8 @@ def _math_helper(x, function):
result_val = x.val.apply_scalar_function(function)
result = x.copy_empty(dtype=result_val.dtype)
result.val = result_val
-
elif isinstance(x, distributed_data_object):
result = x.apply_scalar_function(function, inplace=False)
-
else:
result = function(np.asarray(x))
diff --git a/nifty/minimization/vl_bfgs.py b/nifty/minimization/vl_bfgs.py
index 423f3a503..db47d5797 100644
--- a/nifty/minimization/vl_bfgs.py
+++ b/nifty/minimization/vl_bfgs.py
@@ -77,8 +77,6 @@ class InformationStore(object):
self._sy_store = {}
self._yy_store = {}
-# self.dot_matrix = {}
-
@property
def history_length(self):
return min(self.k, self.max_history_length)
@@ -193,48 +191,6 @@ class InformationStore(object):
self.last_x = x.copy()
self.last_gradient = gradient.copy()
-#
-# k = self.k
-# m = self.actual_history_length
-# big_m = self.history_length
-#
-# # compute dot products
-# for i in xrange(k-1, k-m-1, -1):
-# # new_s with s
-# key = (big_m+m, big_m+1+i)
-# self.dot_matrix[key] = new_s.dot(self.s[i])
-#
-# # new_s with y
-# key = (big_m+m, i+1)
-# self.dot_matrix[key] = new_s.dot(self.y[i])
-#
-# # new_y with s
-# if i != k-1:
-# key = (big_m+1+i, k)
-# self.dot_matrix[key] = new_y.dot(self.s[i])
-#
-# # new_y with y
-# # actually key = (i+1, k) but the convention is that the first
-# # index is larger than the second one
-# key = (k, i+1)
-# self.dot_matrix[key] = new_y.dot(self.y[i])
-#
-# # gradient with s
-# key = (big_m+1+i, 0)
-# self.dot_matrix[key] = gradient.dot(self.s[i])
-#
-# # gradient with y
-# key = (i+1, 0)
-# self.dot_matrix[key] = gradient.dot(self.y[i])
-#
-# # gradient with gradient
-# key = (0, 0)
-# self.dot_matrix[key] = gradient.dot(gradient)
-#
-# self.last_x = x
-# self.last_gradient = gradient
-#
-
class LimitedList(object):
def __init__(self, history_length):
--
GitLab