Merge pull request #78 from shahriariravanian/main

fixed integrate_sum

Author: shahriariravanian

Project.toml

@@ -1,7 +1,7 @@
 name = "SymbolicNumericIntegration"
 uuid = "78aadeae-fbc0-11eb-17b6-c7ec0477ba9e"
 authors = ["Shahriar Iravanian <[email protected]>"]
-version = "1.3.1"
+version = "1.3.2"
 
 [deps]
 DataDrivenDiffEq = "2445eb08-9709-466a-b3fc-47e12bd697a2"

src/integral.jl

@@ -56,20 +56,20 @@ Returns a tuple of (solved, unsolved, err) if `detailed == true`, where
 Returns the resulting integral or nothing if `detailed == false`
 """
 function integrate(eq, x = nothing;
-    abstol = 1e-6,
-    num_steps = 2,
-    num_trials = 10,
-    radius = 5.0,
-    show_basis = false,
-    opt = STLSQ(exp.(-10:1:0)),
-    bypass = false,
-    symbolic = false,
-    max_basis = 100,
-    verbose = false,
-    complex_plane = true,
-    homotopy = true,
-    use_optim = false,
-    detailed = true)
+        abstol = 1e-6,
+        num_steps = 2,
+        num_trials = 10,
+        radius = 5.0,
+        show_basis = false,
+        opt = STLSQ(exp.(-10:1:0)),
+        bypass = false,
+        symbolic = false,
+        max_basis = 100,
+        verbose = false,
+        complex_plane = true,
+        homotopy = true,
+        use_optim = false,
+        detailed = true)
     deprecation_warnings(; homotopy, use_optim)
 
     eq = expand(eq)
@@ -130,6 +130,32 @@ function integrate(eq, xx::Tuple; kwargs...)
     return nothing
 end
 
+function get_solved(p, sol)
+    if sol isa Tuple
+        s = sol[1]
+        return s == nothing ? 0 : s
+    else
+        return sol == nothing ? 0 : sol
+    end
+end
+
+function get_unsolved(p, sol)
+    if sol isa Tuple
+        u = sol[2]
+        return u == nothing ? 0 : u
+    else
+        return sol == 0 || sol == nothing ? p : 0
+    end
+end
+
+function get_err(p, sol)
+    if sol isa Tuple
+        return sol[3]
+    else
+        return sol == 0 || sol == nothing ? Inf : 0
+    end
+end
+
 # integrate_sum applies the integral summation rule ∫ Σᵢ fᵢ(x) dx = Σᵢ ∫ fᵢ(x) dx
 function integrate_sum(eq, x; bypass = false, kwargs...)
     solved = 0
@@ -138,10 +164,10 @@ function integrate_sum(eq, x; bypass = false, kwargs...)
     ts = bypass ? [eq] : terms(eq)
 
     for p in ts
-        s, u, ε = integrate_term(p, x; kwargs...)
-        solved += s
-        unsolved += u
-        ε₀ = max(ε₀, ε)
+        sol = integrate_term(p, x; kwargs...)
+        solved += get_solved(p, sol)
+        unsolved += get_unsolved(p, sol)
+        ε₀ = max(ε₀, get_err(p, sol))
     end
 
     if !isequal(unsolved, 0) && isempty(sym_consts(unsolved, x))
@@ -154,10 +180,10 @@ function integrate_sum(eq, x; bypass = false, kwargs...)
             ts = bypass ? [eq] : terms(eq)
 
             for p in ts
-                s, u, ε = integrate_term(p, x; kwargs...)
-                solved += s
-                unsolved += u
-                ε₀ = max(ε₀, ε)
+                sol = integrate_term(p, x; kwargs...)
+                solved += get_solved(p, sol)
+                unsolved += get_unsolved(p, sol)
+                ε₀ = max(ε₀, get_err(p, sol))
 
                 if !isequal(u, 0)   # premature termination on the first failure
                     return 0, eq, ε₀

src/sparse.jl

@@ -123,7 +123,7 @@ end
 
 # This is needed to fix a bug/omission in DataDrivenSparse
 function DataDrivenSparse.active_set!(idx::BitMatrix, p::SoftThreshold,
-    x::Matrix{ComplexF64}, λ::Float64)
+        x::Matrix{ComplexF64}, λ::Float64)
     DataDrivenSparse.active_set!(idx, p, abs.(x), λ)
 end
 

test/0/Stewart Problems.input

@@ -275,7 +275,8 @@ lst: '[
 [(1+x^5)/(-10*x-3*x^2+x^3),x,3,19*x+3/2*x^2+1/3*x^3+3126/35*log(5-x)-1/10*log(x)-31/14*log(2+x)],
 [1/(x*sqrt(log(x))),x,2,2*sqrt(log(x))],
 [(5+2*x)/(-3+x),x,2,2*x+11*log(3-x)],
-[%e^(%e^x+x),x,2,%e^(%e^x)],
+-- the following is changed from %e^(%e^x+x) to %e^(%e^x)*%e^(x)  (SI)
+[%e^(%e^x)*%e^(x),x,2,%e^(%e^x)],
 [cos(x)^2*sin(x)^2,x,3,1/8*x+1/8*cos(x)*sin(x)-1/4*cos(x)^3*sin(x)],
 [(-cos(x)+sin(x))/(cos(x)+sin(x)),x,1,-log(cos(x)+sin(x))],
 [x/sqrt(1-x^2),x,1,-sqrt(1-x^2)],