Skip to content

Commit 7f1fa21

Browse files
authored
Merge pull request #7 from ModiaSim/mo_move_ast_to_modia
Mo move ast to modia
2 parents faa4c94 + 722815d commit 7f1fa21

9 files changed

+423
-2753
lines changed

Manifest.toml

+408-32
Large diffs are not rendered by default.

Project.toml

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
11
name = "ModiaBase"
22
uuid = "ec7bf1ca-419d-4510-bbab-199861c55244"
33
authors = ["Hilding Elmqvist <[email protected]>", "Martin Otter <[email protected]>"]
4-
version = "0.9.2"
4+
version = "0.10.0"
55

66
[deps]
77
DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
88
DiffRules = "b552c78f-8df3-52c6-915a-8e097449b14b"
9-
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
109
Measurements = "eff96d63-e80a-5855-80a2-b1b0885c5ab7"
1110
MonteCarloMeasurements = "0987c9cc-fe09-11e8-30f0-b96dd679fdca"
1211
OrderedCollections = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
13-
RecursiveFactorization = "f2c3362d-daeb-58d1-803e-2bc74f2840b4"
1412
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
15-
TimerOutputs = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f"
1613
Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
1714

1815
[compat]
@@ -21,8 +18,6 @@ DiffRules = "1"
2118
Measurements = "2"
2219
MonteCarloMeasurements = "1"
2320
OrderedCollections = "1"
24-
RecursiveFactorization = "0.2"
2521
StaticArrays = "1"
26-
TimerOutputs = "0.5"
2722
Unitful = "1"
2823
julia = "1.7"

docs/src/index.md

+10
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,16 @@ julia> ]add ModiaBase
7777

7878
## Release Notes
7979

80+
### Version 0.10.0
81+
82+
**Non-backwards** compatible changes
83+
84+
- EquationAndStateInfo.jl and StateSelection.jl moved to Modia (ModiaLang is merged into Modia), because
85+
the AST generation in these files depends on details of CodeGeneration.jl of Modia/ModiaLang.
86+
87+
- TestLinearEquations.jl also moved to Modia/ModiaLang.
88+
89+
8090
### Version 0.9.2
8191

8292
- Minor (efficiency) improvement of linear equation system if iteration variables are SVectors.

src/EquationAndStateInfo.jl

-1,026
This file was deleted.

src/ModiaBase.jl

+4-12
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,13 @@ Main module of ModiaBase.
99
module ModiaBase
1010

1111
const path = dirname(dirname(@__FILE__)) # Absolute path of package directory
12-
const Version = "0.9.2"
13-
const Date = "2022-02-23"
12+
const Version = "0.10.0"
13+
const Date = "2022-03-01"
1414

1515
#println("\nImporting ModiaBase Version $Version ($Date)")
1616

17-
using Unitful
18-
using StaticArrays
19-
20-
21-
# append! as needed in EquationAndStateInfo.jl and in ModiaLang/src/CodeGeneration.jl
22-
appendVariable!(v1::Vector{FloatType}, s::FloatType) where {FloatType} = push!(v1,s)
23-
appendVariable!(v1::Vector{FloatType}, v2) where {FloatType} = append!(v1,v2)
17+
using Unitful
18+
using StaticArrays
2419

2520
include("LinearIntegerEquations.jl")
2621

@@ -41,7 +36,4 @@ using .Simplify
4136
include("Symbolic.jl")
4237
using .Symbolic
4338

44-
include("EquationAndStateInfo.jl")
45-
include("StateSelection.jl")
46-
4739
end

0 commit comments

Comments
 (0)