From e45d0e6a544415a4189eb560ff941113baa05fde Mon Sep 17 00:00:00 2001
From: Miles Lucas <mdlucas@hawaii.edu>
Date: Wed, 22 Jul 2020 13:45:14 -0500
Subject: [PATCH 1/2] add convergence file

---
 src/ProgressLogging.jl | 3 +++
 src/convergence.jl     | 2 ++
 2 files changed, 5 insertions(+)
 create mode 100644 src/convergence.jl

diff --git a/src/ProgressLogging.jl b/src/ProgressLogging.jl
index 821023c..43280b5 100644
--- a/src/ProgressLogging.jl
+++ b/src/ProgressLogging.jl
@@ -506,4 +506,7 @@ function make_count_to_frac(iterators...)
     return count_to_frac
 end
 
+# ancillary code
+include("convergence.jl")
+
 end # module
diff --git a/src/convergence.jl b/src/convergence.jl
new file mode 100644
index 0000000..139597f
--- /dev/null
+++ b/src/convergence.jl
@@ -0,0 +1,2 @@
+
+

From 04085583de6de37a82c018156522010c2338da03 Mon Sep 17 00:00:00 2001
From: Miles Lucas <mdlucas@hawaii.edu>
Date: Wed, 22 Jul 2020 15:07:39 -0500
Subject: [PATCH 2/2] set up barebones Convergence Struct and print

---
 src/convergence.jl | 71 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)

diff --git a/src/convergence.jl b/src/convergence.jl
index 139597f..f1b98aa 100644
--- a/src/convergence.jl
+++ b/src/convergence.jl
@@ -1,2 +1,73 @@
 
+export @logconvergence
 
+@enum Direction::UInt8 Descending Ascending
+
+const FN = Union{Float64,Nothing}
+const DN = Union{Direction,Nothing}
+
+struct Convergence
+    id::UUID
+    parentid::UUID
+    names::Vector{String}
+    values::Vector{FN}
+    thresholds::Vector{FN}
+    directions::Vector{DN}
+    done::Bool
+    step::Union{Int,Nothing}
+    function Convergence(id, parentid, names, values, thresholds, directions, done, step)
+        values = convert(Vector{FN}, values)
+        thresholds = convert(Vector{FN}, thresholds)
+        @. values[isnan_safe(values)] = nothing
+        @. thresholds[isnan_safe(thresholds)] = nothing
+        return new(id, parentid, names, values, thresholds, directions, done, step)
+    end
+end
+
+isnan_safe(v::Real) = isnan(v)
+isnan_safe(::Nothing) = false
+
+Convergence(;
+        id::UUID,
+        parentid::UUID = ROOTID,  # not nested by default
+        values=FN[nothing],
+        names=fill("", length(values)),
+        thresholds=Vector{FN}(nothing, length(values)),
+        directions=Vector{DN}(nothing, length(values)),
+        done::Bool = false,
+        step::Union{Int,Nothing} = nothing
+    ) = Convergence(id, parentid, names, values, thresholds, directions, done, step)
+
+Convergence(id::UUID; kwargs...) = Convergence(; id = id, kwargs...)
+
+# Define `string`/`print` so that progress log records are (somewhat)
+# readable even without specific log monitors.
+function Base.print(io::IO, c::Convergence)
+    for args in zip(c.names, c.values, c.thresholds, c.directions)
+        c.step !== nothing && print(io, "$(c.step) ")
+        _print_convergence(io, c.parentid, args...)
+        println(io)
+    end
+    return nothing
+end
+
+dir_char(d::Direction) = d === Descending ? '\u2193' : '\u2191' # ↓ : ↑
+dir_char(::Nothing) = '|'
+
+# print a single minutia of the convergence struct
+function _print_convergence(io, parentid, name, value, threshold, direction)
+    print(io, isempty(name) ? "Convergence" : name)
+    if parentid !== ROOTID
+        print(io, " (sub)")
+    end
+    print(io, ": ")
+    value === nothing ? print(io, "??") : print(io, value)
+    print(io, dir_char(direction))
+    threshold === nothing ? print(io, "??") : print(io, threshold)
+
+    return nothing
+end
+
+macro logconvergence()
+    :(nothing)
+end
\ No newline at end of file