Merge branch 'master' into compathelper/new_version/2020-11-18-00-24-50-020-3385823575

YingboMa · web-flow · commit bf645cdc6db2 · 2020-11-27T15:09:17.000-05:00
diff --git a/.github/workflows/CompatHelper.yml b/.github/workflows/CompatHelper.yml
@@ -1,26 +1,16 @@
 name: CompatHelper
-
 on:
   schedule:
-    - cron: '00 * * * *'
-  issues:
-    types: [opened, reopened]
-
+    - cron: '00 00 * * *'
+  workflow_dispatch:
 jobs:
-  build:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        julia-version: [1.5.0]
-        julia-arch: [x86]
-        os: [ubuntu-latest]
+  CompatHelper:
+    runs-on: ubuntu-latest
     steps:
-      - uses: julia-actions/setup-julia@latest
-        with:
-          version: ${{ matrix.julia-version }}
       - name: Pkg.add("CompatHelper")
         run: julia -e 'using Pkg; Pkg.add("CompatHelper")'
       - name: CompatHelper.main()
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          COMPATHELPER_PRIV: ${{ secrets.COMPATHELPER_PRIV }}
         run: julia -e 'using CompatHelper; CompatHelper.main()'
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,54 @@
+name: CI
+on:
+  push:
+    branches:
+      - master
+    paths-ignore:
+      - 'LICENSE.md'
+      - 'README.md'
+      - '.github/workflows/CompatHelper.yml'
+      - '.github/workflows/TagBot.yml'
+    tags: '*'
+  pull_request:
+    branches:
+      - master
+    paths-ignore:
+      - 'LICENSE.md'
+      - 'README.md'
+      - '.github/workflows/CompatHelper.yml'
+      - '.github/workflows/TagBot.yml'
+jobs:
+  test:
+    name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        version:
+          - '1'
+        os:
+          - ubuntu-latest
+        arch:
+          - x64
+    steps:
+      - uses: actions/checkout@v2
+      - uses: julia-actions/setup-julia@v1
+        with:
+          version: ${{ matrix.version }}
+          arch: ${{ matrix.arch }}
+      - uses: actions/cache@v1
+        env:
+          cache-name: cache-artifacts
+        with:
+          path: ~/.julia/artifacts
+          key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
+          restore-keys: |
+            ${{ runner.os }}-test-${{ env.cache-name }}-
+            ${{ runner.os }}-test-
+            ${{ runner.os }}-
+      - uses: julia-actions/julia-buildpkg@v1
+      - uses: julia-actions/julia-runtest@v1
+      - uses: julia-actions/julia-processcoverage@v1
+      - uses: codecov/codecov-action@v1
+        with:
+          file: lcov.info
diff --git a/.travis.yml b/.travis.yml
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "ModelingToolkit"
 uuid = "961ee093-0014-501f-94e3-6117800e7a78"
 authors = ["Chris Rackauckas <accounts@chrisrackauckas.com>"]
-version = "4.0.5"
+version = "4.0.6"
 
 [deps]
 ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
@@ -49,7 +49,7 @@ Requires = "1.0"
 RuntimeGeneratedFunctions = "0.4"
 SafeTestsets = "0.0.1"
 SpecialFunctions = "0.7, 0.8, 0.9, 0.10, 1.0"
-StaticArrays = "0.10, 0.11, 0.12"
+StaticArrays = "0.10, 0.11, 0.12, 1.0"
 SymbolicUtils = "0.6"
 TreeViews = "0.3"
 UnPack = "0.1, 1.0"
diff --git a/README.md b/README.md
@@ -1,8 +1,7 @@
 # ModelingToolkit.jl
 
-[![Build Status](https://travis-ci.com/SciML/ModelingToolkit.jl.svg?branch=master)](https://travis-ci.com/SciML/ModelingToolkit.jl)
-[![Coverage Status](https://coveralls.io/repos/SciML/ModelingToolkit.jl/badge.svg?branch=master&service=github)](https://coveralls.io/github/JuliaDiffEq/ModelingToolkit.jl?branch=master)
-[![codecov.io](http://codecov.io/github/SciML/ModelingToolkit.jl/coverage.svg?branch=master)](http://codecov.io/github/SciML/ModelingToolkit.jl?branch=master)
+[![Github Action CI](https://github.com/SciML/ModelingToolkit.jl/workflows/CI/badge.svg)](https://github.com/SciML/ModelingToolkit.jl/actions)
+[![Coverage Status](https://coveralls.io/repos/github/SciML/ModelingToolkit.jl/badge.svg?branch=master)](https://coveralls.io/github/SciML/ModelingToolkit.jl?branch=master)
 [![Stable](https://img.shields.io/badge/docs-stable-blue.svg)](http://mtk.sciml.ai/stable/)
 [![Dev](https://img.shields.io/badge/docs-dev-blue.svg)](http://mtk.sciml.ai/dev/)
 
diff --git a/appveyor.yml b/appveyor.yml
diff --git a/docs/src/tutorials/symbolic_functions.md b/docs/src/tutorials/symbolic_functions.md
@@ -382,9 +382,9 @@ the user's code. For these cases, ModelingToolkit.jl allows for fully
 macro-free usage. For example:
 
 ```julia
-x = Sym{Float64}(:x)()
-y = Sym{Float64}(:y)()
-x+y^2.0
+x = Num(Sym{Float64}(:x))
+y = Num(Sym{Float64}(:y))
+x+y^2.0 # isa Num
 ```
 
 Does what you'd expect. The reference documentation shows how to
@@ -395,7 +395,7 @@ If we need to use this to generate new Julia code, we can simply
 convert the output to an `Expr`:
 
 ```julia
-Expr(x+y^2)
+toexpr(x+y^2)
 ```
 
 ## `Sym`s and callable `Sym`s
diff --git a/src/differentials.jl b/src/differentials.jl
@@ -45,7 +45,7 @@ function occursin_info(x, expr::Term)
         if all(_isfalse, args)
             return false
         end
-        Term(true, args)
+        Term{Real}(true, args)
     end
 end
 function occursin_info(x, expr::Sym)
diff --git a/src/direct.jl b/src/direct.jl
@@ -222,7 +222,7 @@ function toexpr(O::Term)
   end
   if O.op === (^)
       if length(O.args) > 1  && O.args[2] isa Number && O.args[2] < 0
-          return Expr(:call, :^, Expr(:call, :inv, toexpr(O.args[1])), -(O.args[2].value))
+          return Expr(:call, ^, Expr(:call, inv, toexpr(O.args[1])), -(O.args[2]))
       end
   end
   return Expr(:call, O.op, toexpr.(O.args)...)
diff --git a/src/register_function.jl b/src/register_function.jl
@@ -17,7 +17,12 @@ macro register(expr, Ts = [Num, Symbolic, Real])
     name(x::Expr) = ((@assert x.head == :(::)); :($value($(x.args[1]))))
 
     Expr(:block,
-         [:($f($(setinds(args, symbolic_args, ts)...)) = Term{Real}($f, [$(map(name, args)...)]))
+         [quote
+              function $f($(setinds(args, symbolic_args, ts)...))
+                  wrap =  any(x->typeof(x) <: Num, tuple($(setinds(args, symbolic_args, ts)...),)) ? Num : identity
+                  wrap(Term{Real}($f, [$(map(name, args)...)]))
+              end
+          end
          for ts in types]...) |> esc
 end
 
diff --git a/src/systems/abstractsystem.jl b/src/systems/abstractsystem.jl
@@ -190,9 +190,9 @@ end
 
 function namespace_expr(O::Term,name,ivname)
     if O.op isa Sym
-        Term(rename(O.op,renamespace(name,O.op.name)),namespace_expr.(O.args,name,ivname))
+        Term{Real}(rename(O.op,renamespace(name,O.op.name)),namespace_expr.(O.args,name,ivname))
     else
-        Term(O.op,namespace_expr.(O.args,name,ivname))
+        Term{Real}(O.op,namespace_expr.(O.args,name,ivname))
     end
 end
 namespace_expr(O,name,ivname) = O
diff --git a/src/utils.jl b/src/utils.jl
@@ -35,7 +35,7 @@ function detime_dvs(op::Term)
   if op.op isa Sym
       Sym{Real}(nameof(op.op))
   else
-    Term(op.op,detime_dvs.(op.args))
+      Term{Real}(op.op,detime_dvs.(op.args))
   end
 end
 detime_dvs(op) = op
@@ -232,5 +232,5 @@ function diff2term(O)
         (x, t, order) = flatten_differential(O)
         return lower_varname(x, t, order)
     end
-    return Term(O.op, diff2term.(O.args))
+    return Term{Real}(O.op, diff2term.(O.args))
 end
diff --git a/src/variables.jl b/src/variables.jl
@@ -33,15 +33,15 @@ and parameters `β₁` and `β₂`.
 
 
 ```julia
-t = Variable(:t)()  # independent variables are treated as known
-α = Variable(:α)()  # parameters are known
-σ = Variable(:σ)    # left uncalled, since it is used as a function
-w = Variable(:w)   # unknown, left uncalled
-x = Variable(:x)(t)  # unknown, depends on `t`
-y = Variable(:y)()   # unknown, no dependents
-z = Variable(:z)(t, α, x)  # unknown, multiple arguments
-β₁ = Variable(:β, 1)() # with index 1
-β₂ = Variable(:β, 2)() # with index 2
+t = Num(Variable{ModelingToolkit.Parameter{Real}}(:t))  # independent variables are treated as known
+α = Num(Variable{ModelingToolkit.Parameter{Real}}(:α))  # parameters are known
+σ = Num(Variable{ModelingToolkit.FnType{Tuple{Any},Real}}(:σ)) # left uncalled, since it is used as a function
+w = Num(Variable{ModelingToolkit.FnType{Tuple{Any},Real}}(:w)) # unknown, left uncalled
+x = Num(Variable{ModelingToolkit.FnType{Tuple{Any},Real}}(:x))(t)  # unknown, depends on `t`
+y = Num(Variable(:y))   # unknown, no dependents
+z = Num(Variable{ModelingToolkit.FnType{NTuple{3,Any},Real}}(:z))(t, α, x)  # unknown, multiple arguments
+β₁ = Num(Variable(:β, 1)) # with index 1
+β₂ = Num(Variable(:β, 2)) # with index 2
 
 expr = β₁ * x + y^α + σ(3) * (z - t) - β₂ * w(t - 1)
 ```
diff --git a/test/direct.jl b/test/direct.jl
@@ -141,6 +141,17 @@ f = eval(f2)
 f(out,[1.0,2,3])
 @test all(out .== o1)
 
+# y ^ -1 test
+g = let
+    f(x,y) = x/y
+    @variables x y
+    ex = expand_derivatives(Differential(x)(f(x, y)))
+    func_ex = build_function(ex, x, y)
+    eval(func_ex)
+end
+
+@test g(42,4) == 1/4
+
 function test_worldage()
    @variables x y z
    eqs = [(y-x)^2,
diff --git a/test/function_registration.jl b/test/function_registration.jl
@@ -110,3 +110,9 @@ function run_test()
     @test fun([0.5], [u0], 0.) == [do_something_4(u0) * 2]
 end
 run_test()
+
+using ModelingToolkit: arguments
+@variables a
+@register foo(x,y,z)
+@test 1 * foo(a,a,a) * Num(1) isa Num
+@test !any(x->x isa Num, arguments(value(1 * foo(a,a,a) * Num(1))))
