Skip to content
Snippets Groups Projects
Commit 07381cfc authored by Theo Steininger's avatar Theo Steininger
Browse files

Removed blank lines and dead code.

parent a07ff248
Branches
Tags
2 merge requests!69Master,!64Martin's monster merge part 1/N: (hopefully) uncontroversial bits
Pipeline #
...@@ -31,10 +31,8 @@ def _math_helper(x, function): ...@@ -31,10 +31,8 @@ def _math_helper(x, function):
result_val = x.val.apply_scalar_function(function) result_val = x.val.apply_scalar_function(function)
result = x.copy_empty(dtype=result_val.dtype) result = x.copy_empty(dtype=result_val.dtype)
result.val = result_val result.val = result_val
elif isinstance(x, distributed_data_object): elif isinstance(x, distributed_data_object):
result = x.apply_scalar_function(function, inplace=False) result = x.apply_scalar_function(function, inplace=False)
else: else:
result = function(np.asarray(x)) result = function(np.asarray(x))
......
...@@ -77,8 +77,6 @@ class InformationStore(object): ...@@ -77,8 +77,6 @@ class InformationStore(object):
self._sy_store = {} self._sy_store = {}
self._yy_store = {} self._yy_store = {}
# self.dot_matrix = {}
@property @property
def history_length(self): def history_length(self):
return min(self.k, self.max_history_length) return min(self.k, self.max_history_length)
...@@ -193,48 +191,6 @@ class InformationStore(object): ...@@ -193,48 +191,6 @@ class InformationStore(object):
self.last_x = x.copy() self.last_x = x.copy()
self.last_gradient = gradient.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): class LimitedList(object):
def __init__(self, history_length): def __init__(self, history_length):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment