implemented review suggestions

Author: Bumblebee00

.github/workflows/ci.yml

@@ -39,7 +39,7 @@ jobs:
       - uses: julia-actions/cache@v2
       - uses: julia-actions/julia-buildpkg@v1
       - name: Run tests julia 1.11 ubuntu-latest and count rules
-        if: matrix.version == '1.11' && matrix.os == 'ubuntu-latest'
+        if: matrix.version == '1' && matrix.os == 'ubuntu-latest'
         run: |
           julia --project=. -e "
             using SymbolicIntegration

src/SymbolicIntegration.jl

@@ -2,6 +2,9 @@ __precompile__()
 
 module SymbolicIntegration
 
+using Symbolics
+using SymbolicUtils # TODO is this import really needed?
+
 # Include Risch method algorithm components
 include("methods/risch/general.jl")
 include("methods/risch/rational_functions.jl")
@@ -15,12 +18,15 @@ include("methods/risch/algebraic_functions.jl")
 include("methods/risch/frontend.jl")
 
 # include rule based method
+include("methods/rule_based/rules_loader.jl")
+include("methods/rule_based/frontend.jl")
+include("methods/rule_based/rules_utility_functions.jl")
 include("methods/rule_based/general.jl")
 
 # Add method dispatch system
 include("methods.jl")
 
 # Export method interface and integrate function
-export AbstractIntegrationMethod, RischMethod, RuleBasedMethod, integrate
+export AbstractIntegrationMethod, RischMethod, RuleBasedMethod, integrate, reload_rules
 
 end # module

src/methods.jl

@@ -89,7 +89,8 @@ No rule found for ∫(abs(x), x)
 function integrate(f::Symbolics.Num, x::Symbolics.Num; kwargs...)
     result = integrate_risch(f.val, x.val; kwargs...)
     !contains_int(result) && return result
-
+    
+    # TODO make them verbose?
     printstyled("\n > RischMethod(use_algebraic_closure=false, catch_errors=true) failed, returning $result \n";color=:red)
     printstyled(" > Trying with RuleBasedMethod(use_gamma=false, verbose=true)...\n\n"; color=:red)
     result = integrate_rule_based(f, x; kwargs...)
@@ -203,6 +204,10 @@ function integrate(f::Symbolics.Num, x::Symbolics.Num, method::RuleBasedMethod;
         verbose=method.verbose, use_gamma=method.use_gamma, kwargs...)
 end
 
+<<<<<<< HEAD
+=======
+# integrate_rule_based(integrand::Number, x::Symbolics.Num; kwargs...) = integrand*x
+>>>>>>> 1e1e70a (implemented review suggestions)
 
 """
     method_supports_rational(method::RischMethod)

src/methods/risch/frontend.jl

@@ -1,5 +1,3 @@
-using Symbolics
-using SymbolicUtils
 using Logging
 
 """

src/methods/rule_based/frontend.jl

@@ -110,9 +110,7 @@ end
 function integrate_rule_based(integrand::Symbolics.Num, int_var::Symbolics.Num; use_gamma::Bool=false, verbose::Bool=true, kwargs...)
     global VERBOSE
     VERBOSE = verbose
-    result = simplify(repeated_prewalk(∫(integrand,int_var)))
-    println()
-    return result
+    return simplify(repeated_prewalk(∫(integrand,int_var)))
 end
 
 integrate_rule_based(integrand::SymbolicUtils.BasicSymbolic{Real}, int_var::SymbolicUtils.BasicSymbolic{Real}; kwargs...) =

src/methods/rule_based/general.jl

@@ -1,9 +1,5 @@
-using Symbolics
-
-
-
 # ===== Special functions from a lot of packages
-# TODO maybe transform all these imports to package extensions? so they dont get imported if not needed?
+# TODO extension to Symbolics?
 
 # function from SpecialFunctions.jl that are not yet registered
 @register_symbolic SymbolicUtils.expinti(x)
@@ -53,21 +49,6 @@ coshintegral(x::Any) = println("hyperbolic cosine integral Chi(z) function (http
 @register_symbolic coshintegral(x)
 
 
-
-
-
-# ===== Include and Exports
-
-include("rules_loader.jl")
-include("frontend.jl")
-include("rules_utility_functions.jl")
-
-export reload_rules
-
-
-
-
-
 # ===== Global variables
 # symbolic functions
 # ∫(intgerand, intgeration variable)

src/methods/rule_based/rules_utility_functions.jl

@@ -433,7 +433,7 @@ function int_and_subst(integrand, int_var, from, to, rule_from_identifier)
     end
 
     result = integrate_rule_based(integrand, int_var;verbose=VERBOSE)
-    push!(SILENCE, rule_from_identifier)
+    push!(SILENCE, rule_from_identifier) # this is needed to not print again rule_from_identifier after the return of this function
     if !contains_int(result)
         return substitute(result, from => to)
     end