Merge branch 'master' into myb/symbolics

Author: ChrisRackauckas

LICENSE.md

@@ -38,3 +38,29 @@ The ModelingToolkit.jl package is licensed under the MIT "Expat" License:
 > SOFTWARE.
 >
 >
+
+The code in `src/structural_transformation/bipartite_tearing/modia_tearing.jl`,
+which is from the [Modia.jl](https://github.com/ModiaSim/Modia.jl) project, is
+licensed as follows:
+
+MIT License
+
+Copyright (c) 2017-2018 ModiaSim developers
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

Project.toml

@@ -1,7 +1,7 @@
 name = "ModelingToolkit"
 uuid = "961ee093-0014-501f-94e3-6117800e7a78"
 authors = ["Chris Rackauckas <[email protected]>"]
-version = "5.7.1"
+version = "5.9.1"
 
 [deps]
 ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
@@ -21,6 +21,7 @@ LightGraphs = "093fc24a-ae57-5d10-9952-331d41423f4d"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 MacroTools = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
 NaNMath = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3"
+NonlinearSolve = "8913a72c-1f9b-4ce2-8d82-65094dcecaec"
 RecursiveArrayTools = "731186ca-8d62-57ce-b412-fbd966d074cd"
 Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
 Requires = "ae029012-a4dd-5104-9daa-d747884805df"
@@ -52,6 +53,7 @@ Latexify = "0.11, 0.12, 0.13, 0.14"
 LightGraphs = "1.3"
 MacroTools = "0.5"
 NaNMath = "0.3"
+NonlinearSolve = "0.3.8"
 RecursiveArrayTools = "2.3"
 Reexport = "0.2, 1"
 Requires = "1.0"
@@ -69,6 +71,7 @@ Unitful = "1.1"
 julia = "1.2"
 
 [extras]
+BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"
 ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
 GalacticOptim = "a75be94c-b780-496d-a8a9-0878b188d577"
 NonlinearSolve = "8913a72c-1f9b-4ce2-8d82-65094dcecaec"
@@ -80,4 +83,4 @@ StochasticDiffEq = "789caeaf-c7a9-5a7d-9973-96adeb23e2a0"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["ForwardDiff", "GalacticOptim", "NonlinearSolve", "OrdinaryDiffEq", "Optim", "Random", "SteadyStateDiffEq", "Test", "StochasticDiffEq"]
+test = ["BenchmarkTools", "ForwardDiff", "GalacticOptim", "NonlinearSolve", "OrdinaryDiffEq", "Optim", "Random", "SteadyStateDiffEq", "Test", "StochasticDiffEq"]

README.md

@@ -99,7 +99,7 @@ p  = [lorenz1.σ => 10.0,
 
 tspan = (0.0,100.0)
 prob = ODEProblem(connected,u0,tspan,p)
-sol = solve(prob,Rodas5())
+sol = solve(prob,Rodas4())
 
 using Plots; plot(sol,vars=(a,lorenz1.x,lorenz2.z))
 ```

docs/make.jl

@@ -11,16 +11,23 @@ makedocs(
     pages=[
         "Home" => "index.md",
         "Tutorials" => Any[
-            "tutorials/symbolic_functions.md",
             "tutorials/ode_modeling.md",
+            "tutorials/acausal_components.md",
             "tutorials/higher_order.md",
             "tutorials/nonlinear.md",
             "tutorials/modelingtoolkitize.md",
-            "tutorials/auto_parallel.md",
-            "tutorials/converting_to_C.md"
+            "tutorials/optimization.md",
+            "tutorials/stochastic_diffeq.md",
+            "tutorials/nonlinear_optimal_control.md"
         ],
-        "Systems" => Any[
-            "systems/AbstractSystem.md",
+        "Basics" => Any[
+            "basics/AbstractSystem.md",
+            "basics/ContextualVariables.md",
+            "basics/Composition.md",
+            "basics/Validation.md",
+            "basics/DependencyGraphs.md"
+        ],
+        "System Types" => Any[
             "systems/ODESystem.md",
             "systems/SDESystem.md",
             "systems/JumpSystem.md",
@@ -29,12 +36,9 @@ makedocs(
             "systems/ControlSystem.md",
             "systems/ReactionSystem.md",
             "systems/PDESystem.md",
-            "systems/DependencyGraphs.md"
         ],
-        "Comparison Against SymPy" => "comparison.md",
-        "highlevel.md",
-        "build_function.md",
-        "IR.md"
+        "comparison.md",
+        "internals.md",
     ]
 )