Merge pull request #104 from shahriariravanian/main

Adding TermInterface and updating compat

Project.toml

@@ -1,7 +1,7 @@
 name = "SymbolicNumericIntegration"
 uuid = "78aadeae-fbc0-11eb-17b6-c7ec0477ba9e"
 authors = ["Shahriar Iravanian <siravan@svtsim.com>"]
-version = "1.8.0"
+version = "1.9.0"
 
 [deps]
 DataDrivenDiffEq = "2445eb08-9709-466a-b3fc-47e12bd697a2"
@@ -12,6 +12,7 @@ SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"
 Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 SymbolicUtils = "d1185830-fcd6-423d-90d6-eec64667417b"
 Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7"
+TermInterface = "8ea1fca8-c5ef-4a55-8b96-4e9afe9c9a3c"
 
 [compat]
 DataDrivenDiffEq = "1.5"
@@ -22,6 +23,7 @@ SpecialFunctions = "2"
 Statistics = "<0.0.1, 1"
 SymbolicUtils = "2.1, 3"
 Symbolics = "6"
+TermInterface = "2"
 julia = "1.9"
 
 [extras]

src/SymbolicNumericIntegration.jl

@@ -1,7 +1,8 @@
 module SymbolicNumericIntegration
 
+using TermInterface: iscall
 using SymbolicUtils
-using SymbolicUtils: iscall, operation, arguments
+using SymbolicUtils: operation, arguments
 using Symbolics
 using Symbolics: value, get_variables, expand_derivatives, coeff, Equation
 using SymbolicUtils.Rewriters
@@ -33,7 +34,6 @@ export Ei, Si, Ci, Li
 
 include("numeric_utils.jl")
 include("sparse.jl")
-# include("optim.jl")
 include("integral.jl")
 
 export integrate, generate_basis, best_hints

src/integral.jl

@@ -226,14 +226,7 @@ function integrate_term(eq, x; kwargs...)
  end
 
  if symbolic
- y = integrate_symbolic(eq, x; plan)
- if y == nothing
- if has_sym_consts
- @info("Symbolic integration failed. Try changing constant parameters ([$(join(params, ", "))]) to numerical values.")
- end
-
- return 0, eq, Inf
- end
+ return try_symbolic(eq, x, has_sym_consts, params)
  end
 
  eq = cache(eq)
@@ -308,6 +301,20 @@ function try_integrate(eq, x, basis; plan = default_plan())
  return solve_sparse(eq, x, basis; plan)
 end
 
+function try_symbolic(eq, x, has_sym_consts = false, params = []; plan = default_plan())
+ y = integrate_symbolic(eq, x; plan)
+
+ if y == nothing
+ if has_sym_consts && !isempty(params)
+ @info("Symbolic integration failed. Try changing constant parameters ([$(join(params, ", "))]) to numerical values.")
+ end
+
+ return 0, eq, Inf
+ else
+ return y, 0, 0
+ end
+end
+
 function deprecation_warnings(; use_optim = false, homotopy = true)
  if use_optim
  @warn("use_optim is deprecated and will be removed in a future version")