Merge branch 'main' into compathelper/new_version/2023-06-09-00-23-14…

…-841-03581724947
MineralsCloud · Jun 9, 2023 · 0d314b2 · 0d314b2
2 parents 7aa6909 + 4e169a2
commit 0d314b2
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 33 deletions.
diff --git a/Project.toml b/Project.toml
@@ -15,6 +15,7 @@ Thinkers = "6d80a3f9-a943-41fa-97b3-3004c0daf7a3"
 EasyJobsBase = "0.7"
 Graphs = "1"
 MetaGraphs = "0.7"
+Thinkers = "0.2"
 julia = "1"
 
 [extras]

diff --git a/docs/src/portability.md b/docs/src/portability.md
@@ -48,12 +48,12 @@ wf = Workflow(k)
 ```
 
 To save the `Workflow` instance to disk while running in case it failed or is interrupted,
-use the `AutosaveWorkflow` type.
+use the `serialize` function.
 
 ```@repl wf
-using SimpleWorkflows: AutosaveWorkflow
-wf = AutosaveWorkflow("saved.jls", k)
-run!(wf; δt = 0, n = 1)
+using Serialization: serialize
+wf = serialize("wf.jls", wf)
+run!(wf)
 ```
 
 After the above steps are finished, a `saved.jls` file is saved to your local file system.
@@ -66,7 +66,7 @@ julia> using SimpleWorkflows
 
 julia> using Serialization: deserialize
 
-julia> deserialize("saved.jls")
+julia> deserialize("wf.jls")
 ```
 
 And voilà!
diff --git a/docs/src/public.md b/docs/src/public.md
@@ -6,7 +6,6 @@ CurrentModule = SimpleWorkflows
 
 ```@docs
 Workflow
-AutosaveWorkflow
 run!
 execute!
 getstatus

diff --git a/src/SimpleWorkflows.jl b/src/SimpleWorkflows.jl
@@ -7,7 +7,7 @@ using Graphs:
     DiGraph, add_edge!, nv, is_cyclic, is_connected, has_edge, topological_sort_by_dfs
 using Serialization: serialize
 
-export Workflow, AutosaveWorkflow
+export Workflow
 
 abstract type AbstractWorkflow end
 
@@ -77,27 +77,11 @@ function Workflow(jobs::AbstractJob...)
     return Workflow(foundjobs, graph)
 end
 
-"""
-    AutosaveWorkflow(path, jobs::AbstractJob...)
-
-Create a `AutosaveWorkflow` from a given series of `Job`s and a `path`.
-
-When running, the status of the workflow will be automatically saved to `path`.
-"""
-struct AutosaveWorkflow{T} <: AbstractWorkflow
-    path::T
-    wf::Workflow
-end
-AutosaveWorkflow(path, jobs::AbstractJob...) = AutosaveWorkflow(path, Workflow(jobs...))
-
 getjobs(wf::Workflow) = wf.jobs
-getjobs(wf::AutosaveWorkflow) = getjobs(wf.wf)
 
 getgraph(wf::Workflow) = wf.graph
-getgraph(wf::AutosaveWorkflow) = getgraph(wf.wf)
 
 save(::Workflow) = nothing
-save(wf::AutosaveWorkflow) = serialize(wf.path, wf.wf)
 
 include("eachjob.jl")
 include("operations.jl")

diff --git a/src/show.jl b/src/show.jl
@@ -37,11 +37,3 @@ function Base.show(io::IO, wf::Workflow)
         end
     end
 end
-function Base.show(io::IO, wf::AutosaveWorkflow)
-    if get(io, :compact, false) || get(io, :typeinfo, nothing) == typeof(wf)
-        Base.show_default(IOContext(io, :limit => true), wf)  # From https://github.com/mauro3/Parameters.jl/blob/ecbf8df/src/Parameters.jl#L556
-    else
-        print(io, "Autosave", wf.wf)
-        println(io, " path: ", wf.path)
-    end
-end
diff --git a/src/status.jl b/src/status.jl
@@ -30,7 +30,6 @@ function getstatus(wf::Workflow)
     end
     return graph
 end
-getstatus(wf::AutosaveWorkflow) = getstatus(wf.wf)
 
 """
     liststatus(wf::AbstractWorkflow)
@@ -62,6 +61,5 @@ for (func, adj) in zip(
         Filter only the $($adj) jobs in a `Workflow`.
         """
         $func(wf::Workflow) = $func(wf.jobs)
-        $func(wf::AutosaveWorkflow) = $func(wf.wf)
     end
 end