included IterTools to use lazy mapping (imap) and generalized results

Author: tbrysiewicz

Project.toml

@@ -10,6 +10,7 @@ DynamicPolynomials = "7c1d4256-1411-5781-91ec-d7bc3513ac07"
 ElasticArrays = "fdbdab4c-e67f-52f5-8c3f-e7b388dad3d4"
 FiniteDiff = "6a86dc24-6348-571c-b903-95158fe2bd41"
 IntervalTrees = "524e6230-43b7-53ae-be76-1e9e4d08d11b"
+IterTools = "c8e1da08-722c-5040-9ed9-7db0dc04731e"
 LRUCache = "8ac3fa9e-de4c-5943-b1dc-09c6b5f20637"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 LoopVectorization = "bdcacae8-1622-11e9-2a5c-532679323890"

src/result.jl

@@ -203,7 +203,7 @@ Statistic about the number of (real) singular and non-singular solutions etc.
 """
 statistics(r; kwargs...) = ResultStatistics(r; kwargs...)
 
-const Results = Union{Result,AbstractVector{<:PathResult}}
+const Results = Union{AbstractResult,AbstractVector{<:PathResult}}
 
 """
     results(
@@ -231,13 +231,12 @@ function results(
     only_finite::Bool = true,
     multiple_results::Bool = false,
 )
-    [
-        f(r) for r in R if (!only_real || is_real(r, real_tol)) &&
-            (!only_nonsingular || is_nonsingular(r)) &&
-            (!only_singular || is_singular(r)) &&
-            (!only_finite || is_finite(r)) &&
-            (multiple_results || !is_multiple_result(r, R))
-    ]
+    filter_function = r -> (!only_real || is_real(r, real_tol)) &&
+    (!only_nonsingular || is_nonsingular(r)) &&
+    (!only_singular || is_singular(r)) &&
+    (!only_finite || is_finite(r)) &&
+    (multiple_results || !is_multiple_result(r, R))
+    imap(f,Iterators.filter(filter_function,R))
 end
 
 """

src/solve.jl

@@ -10,6 +10,9 @@ export
     bitmask,
     bitmask_filter
 
+
+using IterTools: imap
+
 struct SolveStats
     regular::Threads.Atomic{Int}
     regular_real::Threads.Atomic{Int}
@@ -109,11 +112,6 @@ end
 
 
 
-
-function nsolutions(iter::ResultIterator)
-    mapreduce(x->x.return_code==:success,+,iter,init=0)
-end
-
 function Base.length(ri::ResultIterator)
     if Base.IteratorSize(ri) == Base.SizeUnknown()
         k = 0
@@ -149,12 +147,12 @@ function trace(iter::ResultIterator)
     mapreduce(x->solution(x),+,iter,init=0.0.*s)
 end
 
-function Result(iter::ResultIterator) 
-    C = collect(iter)
+function Result(ri::ResultIterator) 
+    C = collect(ri)
     for i in 1:length(C)
         C[i].path_number = i
     end
-    Result(C; seed = iter.S.seed, start_system = iter.S.start_system)
+    Result(C; seed = ri.S.seed, start_system = ri.S.start_system)
 end