Merge pull request #7 from ModiaSim/mo_move_ast_to_modia

Mo move ast to modia

Project.toml

@@ -1,18 +1,15 @@
 name = "ModiaBase"
 uuid = "ec7bf1ca-419d-4510-bbab-199861c55244"
 authors = ["Hilding Elmqvist <[email protected]>", "Martin Otter <[email protected]>"]
-version = "0.9.2"
+version = "0.10.0"
 
 [deps]
 DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
 DiffRules = "b552c78f-8df3-52c6-915a-8e097449b14b"
-LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 Measurements = "eff96d63-e80a-5855-80a2-b1b0885c5ab7"
 MonteCarloMeasurements = "0987c9cc-fe09-11e8-30f0-b96dd679fdca"
 OrderedCollections = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
-RecursiveFactorization = "f2c3362d-daeb-58d1-803e-2bc74f2840b4"
 StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
-TimerOutputs = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f"
 Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
 
 [compat]
@@ -21,8 +18,6 @@ DiffRules = "1"
 Measurements = "2"
 MonteCarloMeasurements = "1"
 OrderedCollections = "1"
-RecursiveFactorization = "0.2"
 StaticArrays = "1"
-TimerOutputs = "0.5"
 Unitful = "1"
 julia = "1.7"

docs/src/index.md

@@ -77,6 +77,16 @@ julia> ]add ModiaBase
 
 ## Release Notes
 
+### Version 0.10.0
+
+**Non-backwards** compatible changes
+
+- EquationAndStateInfo.jl and StateSelection.jl moved to Modia (ModiaLang is merged into Modia), because
+  the AST generation in these files depends on details of CodeGeneration.jl of Modia/ModiaLang.
+
+- TestLinearEquations.jl also moved to Modia/ModiaLang.
+
+
 ### Version 0.9.2
 
 - Minor (efficiency) improvement of linear equation system if iteration variables are SVectors. 

src/ModiaBase.jl

@@ -9,18 +9,13 @@ Main module of ModiaBase.
 module ModiaBase
 
 const path    = dirname(dirname(@__FILE__))   # Absolute path of package directory
-const Version = "0.9.2"
-const Date    = "2022-02-23"
+const Version = "0.10.0"
+const Date    = "2022-03-01"
 
 #println("\nImporting ModiaBase Version $Version ($Date)")
 
-using Unitful
-using StaticArrays
-
-
-# append! as needed in EquationAndStateInfo.jl and in ModiaLang/src/CodeGeneration.jl
-appendVariable!(v1::Vector{FloatType}, s::FloatType) where {FloatType} = push!(v1,s)
-appendVariable!(v1::Vector{FloatType}, v2)           where {FloatType} = append!(v1,v2)
+using  Unitful
+using  StaticArrays
 
 include("LinearIntegerEquations.jl")
 
@@ -41,7 +36,4 @@ using .Simplify
 include("Symbolic.jl")
 using .Symbolic
 
-include("EquationAndStateInfo.jl")
-include("StateSelection.jl")
-
 end