Merge pull request #17 from baggepinnen/master

Fix bug in increment!(::History)

src/history.jl

@@ -51,9 +51,15 @@ end
 Increments the value for a given iteration if it exists, otherwise adds the iteration with an ordinary push.
 """
 function increment!(trace::History{I,V}, iter::Number, val)  where {I,V}
-    if !isempty(trace.iterations) && (trace.lastiter == iter || iter ∈ trace.iterations) # First check is most common case and makes it faster
-        trace.values[trace.iterations[iter]] += val
-    else
-        push!(trace, iter, val)
+    if !isempty(trace.iterations)
+        if trace.lastiter == iter # Check most common case to make it faster
+            i = length(trace.iterations)
+        else
+            i = findfirst(trace.iterations, iter)
+        end
+        if i >= 1
+            return (trace.values[i] += val)
+        end
     end
+    push!(trace, iter, val)
 end

test/tst_history.jl

@@ -67,8 +67,8 @@ end
 @testset "History: increment!" begin
     _history = History(Float64)
     val = 1.
-    @test increment!(_history, 1, val) == val
-    @test increment!(_history, 1, val) == 2val
+    @test increment!(_history, 0, val) == val
+    @test increment!(_history, 0, val) == 2val
     @test increment!(_history, 2, 4val) == 4val
     @test increment!(_history, 10, 5val) == 5val
     _history2 = QHistory(Float64)