reformatting

Author: shahriariravanian

Project.toml

@@ -6,6 +6,7 @@ version = "0.9.0"
 [deps]
 DataDrivenDiffEq = "2445eb08-9709-466a-b3fc-47e12bd697a2"
 DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
+JuliaFormatter = "98e50ef6-434e-11e9-1051-2b60c6c9e899"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 SymbolicUtils = "d1185830-fcd6-423d-90d6-eec64667417b"
@@ -14,12 +15,16 @@ Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7"
 [compat]
 DataDrivenDiffEq = "0.8"
 DataStructures = "0.18"
+PyCall = "1"
+SymPy = "1"
 SymbolicUtils = "0.19"
 Symbolics = "4"
 julia = "1.6"
 
 [extras]
+PyCall = "438e738f-606a-5dbb-bf0a-cddfbfd45ab0"
+SymPy = "24249f21-da20-56a4-8eb1-6a02cf4ae2e6"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["Test"]
+test = ["PyCall", "SymPy", "Test"]

src/integral.jl

@@ -279,17 +279,17 @@ function init_basis_matrix!(T, A, X, x, eq, Δbasis, radius, complex_plane; abst
     n = size(A, 1)
     k = 1
     i = 1
-    
-    eq_fun = build_function(eq, x; expression=false)
-    Δbasis_fun = build_function.(Δbasis, x; expression=false)
+
+    eq_fun = build_function(eq, x; expression = false)
+    Δbasis_fun = build_function.(Δbasis, x; expression = false)
 
     while k <= n
-        try            
+        try
             X[k] = test_point(complex_plane, radius)
             b₀ = eq_fun(X[k])
-            
+
             if is_proper(b₀)
-                for j in 1:n            
+                for j in 1:n
                     A[k, j] = Δbasis_fun[j](X[k]) / b₀
                 end
                 if all(is_proper, A[k, :])
@@ -305,11 +305,11 @@ end
 function modify_basis_matrix!(T, A, X, x, eq, ∂eq, Δbasis, radius; abstol = 1e-6)
     n = size(A, 1)
     k = 1
-    
-    eq_fun = build_function(eq, x; expression=false)
-    ∂eq_fun = build_function(∂eq, x; expression=false)
-    Δbasis_fun = build_function.(Δbasis, x; expression=false)
-    
+
+    eq_fun = build_function(eq, x; expression = false)
+    ∂eq_fun = build_function(∂eq, x; expression = false)
+    Δbasis_fun = build_function.(Δbasis, x; expression = false)
+
     for k in 1:n
         # One Newton iteration toward the poles
         # note the + sign instead of the usual - in Newton-Raphson's method. This is

src/numeric_utils.jl

@@ -32,20 +32,19 @@ end
     converts float to int or small rational numbers
 """
 
-function nice_parameter(u::Complex{T}; abstol = 1e-3, M = 10) where {T <: Real}
-    α = nice_parameter(real(u))
-    β = nice_parameter(imag(u))
+function nice_parameter(u::Complex{T}; abstol=1e-6) where {T <: Real}
+    α = nice_parameter(real(u); abstol)
+    β = nice_parameter(imag(u); abstol)
     return β ≈ 0 ? α : Complex(α, β)
 end
 
-nice_parameter(x; abstol=1e-7) = small_rational(x; abstol)
+nice_parameter(x; abstol=1e-6) = small_rational(x; abstol)
 
-nice_parameters(p; abstol = 1e-3) = nice_parameter.(p)
+nice_parameters(p; abstol=1e-6) = nice_parameter.(p; abstol)
 
 function small_rational(x::T; abstol=1e-6, M=20) where {T <: Real}
-    # c = lcm(collect(1:M)...)
-   	a = floor(Int, x)
-	r = x - a
+    a = floor(Int, x)
+    r = x - a
     for den in 2:M
         try
             if abs(round(r * den) - r * den) < abstol
@@ -57,7 +56,3 @@ function small_rational(x::T; abstol=1e-6, M=20) where {T <: Real}
     end
     return x
 end
-
-
-
-

src/utils.jl

@@ -4,8 +4,8 @@
 #isdependent(eq, x) = !isequal(expand_derivatives(Differential(x)(eq)), 0)
 
 function isdependent(eq, x)
-	vars = get_variables(eq)
-	return length(vars) == 1 && isequal(x, vars[1])
+    vars = get_variables(eq)
+    return length(vars) == 1 && isequal(x, vars[1])
 end
 
 """