Merge pull request #6 from anandijain/aj/updates

update datadriven

Author: ChrisRackauckas

.github/CI.yml renamed to .github/workflows/CI.yml

@@ -2,10 +2,10 @@ name: CI
 on:
   pull_request:
     branches:
-      - master
+      - main
   push:
     branches:
-      - master
+      - main
 jobs:
   test:
     runs-on: ubuntu-latest

.github/CompatHelper.yml renamed to .github/workflows/CompatHelper.yml

@@ -3,7 +3,7 @@ name: Documentation
 on:
   push:
     branches:
-      - master
+      - main
     tags: '*'
   pull_request:
 

.github/Documentation.yml renamed to .github/workflows/Documentation.yml

@@ -0,0 +1 @@
+Manifest.toml

.github/TagBot.yml renamed to .github/workflows/TagBot.yml

@@ -1,22 +1,27 @@
 name = "SymbolicNumericIntegration"
 uuid = "78aadeae-fbc0-11eb-17b6-c7ec0477ba9e"
 authors = ["Shahriar Iravanian <[email protected]>"]
-version = "0.8.2"
+version = "0.8.3"
 
 [deps]
 DataDrivenDiffEq = "2445eb08-9709-466a-b3fc-47e12bd697a2"
 DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
-PyCall = "438e738f-606a-5dbb-bf0a-cddfbfd45ab0"
 Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 SymbolicUtils = "d1185830-fcd6-423d-90d6-eec64667417b"
 Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7"
-Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [compat]
-DataDrivenDiffEq = "0.6"
+DataDrivenDiffEq = "0.8"
 DataStructures = "0.18"
 PyCall = "1"
-SymbolicUtils = "0.18"
+SymbolicUtils = "0.19"
 Symbolics = "4"
 julia = "1.6"
+
+[extras]
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+PyCall = "438e738f-606a-5dbb-bf0a-cddfbfd45ab0"
+
+[targets]
+test = ["Test", "PyCall"]

.gitignore

@@ -8,7 +8,7 @@ The basis of how it works and the theory of integration using the Symbolic-Numer
 Function `integrate` returns the integral of a univariate expression with *constant* real or complex coefficients. `integrate` returns a tuple with three values. The first one is the solved integral, the second one is the sum of the unsolved terms, and the third value is the residual error. If `integrate` is successful, the unsolved portion is reported as 0.
 
 ```julia
-using SymbolicUtils
+using Symbolics
 using SymbolicNumericIntegration
 
 @variables x

Project.toml

@@ -6,7 +6,7 @@ using Symbolics: value, get_variables, expand_derivatives
 using SymbolicUtils.Rewriters
 using Symbolics
 
-using DataDrivenDiffEq.Optimize
+using DataDrivenDiffEq
 
 include("utils.jl")
 include("roots.jl")

README.md

@@ -326,8 +326,8 @@ function sparse_fit(T, A, x, basis, Δbasis, opt; abstol=1e-6)
     try
         b = ones(n)
         # q₀ = A \ b
-        q₀ = Optimize.init(opt, A, b)
-        @views Optimize.sparse_regression!(q₀, A, permutedims(b)', opt, maxiter = 1000)
+        q₀ = DataDrivenDiffEq.init(opt, A, b)
+        @views sparse_regression!(q₀, A, permutedims(b)', opt, maxiter = 1000)
         ϵ = rms(A * q₀ - b)
         q = nice_parameter.(q₀)
         if sum(iscomplex.(q)) > 2 return nothing, Inf end   # eliminating complex coefficients

src/SymbolicNumericIntegration.jl

@@ -1,12 +1,11 @@
-# using SymbolicNumericIntegration
-using SymbolicUtils
+using SymbolicNumericIntegration
+using Symbolics
 using Test
 
 include("axiom.jl")
 
 ##############################################################################
 
-# @syms x β
 @variables x β
 
 """
@@ -220,9 +219,10 @@ function test_integrals(; kw...)
     for eq in misses
         printstyled(eq, '\n'; color=:red)
     end
-    return true
+    return n
 end
 
-@testset "integral" begin test_integrals(;
-    symbolic=false, verbose=false, homotopy=true, num_steps=2, num_trials=10)
+@testset "integral" begin 
+    n = test_integrals(;symbolic=false, verbose=false, homotopy=true, num_steps=2, num_trials=10)
+    @test n==11
 end