Merge 89e2ae3 into 6131b1c

qojulia · Feb 9, 2017 · bc7fae2 · bc7fae2
2 parents 6131b1c + 89e2ae3
commit bc7fae2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/operators_lazy.jl b/src/operators_lazy.jl
@@ -4,6 +4,7 @@ import Base: ==, *, /, +, -
 import ..operators: dagger, identityoperator,
                     trace, ptrace, normalize!, tensor, permutesystems
 
+using Base.Cartesian
 using ..bases, ..states, ..operators, ..operators_dense, ..operators_sparse
 
 export lazy, LazyWrapper, LazyTensor, LazySum, LazyProduct

diff --git a/src/operators_lazytensor.jl b/src/operators_lazytensor.jl
@@ -169,7 +169,7 @@ function operators.gemv!(alpha, a::LazyTensor, b::Ket, beta, result::Ket)
         _lazytensor_gemv!(rank, index, Complex(1.), a.operators[op_index], b, Complex(0.), tmp)
         b = tmp
     end
-    result.data[:] = beta*result.data[:] + b.data[:]
+    result.data[:] = beta*result.data[:] + alpha*a.factor*b.data[:]
     nothing
 end
 
@@ -206,6 +206,6 @@ function operators.gemv!(alpha, a::Bra, b::LazyTensor, beta, result::Bra)
         _lazytensor_gemv!(rank, index, Complex(1.), a, b.operators[op_index], Complex(0.), tmp)
         a = tmp
     end
-    result.data[:] = beta*result.data[:] + a.data[:]
+    result.data[:] = beta*result.data[:] + alpha*b.factor*a.data[:]
     nothing
 end