[merge] merge master into devel

This commit is contained in:
Max Zwiessele 2015-09-08 17:25:44 +01:00
commit cf2673632b
12 changed files with 257 additions and 314 deletions

View file

@ -157,7 +157,7 @@ def trace_dot(a, b):
"""
Efficiently compute the trace of the matrix product of a and b
"""
return np.sum(a * b)
return np.einsum('ij,ji->', a, b)
def mdot(*args):
"""