Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Read Modelica MATv4 files #181

Closed
wants to merge 100 commits into from
Closed
Show file tree
Hide file tree
Changes from 96 commits
Commits
Show all changes
100 commits
Select commit Hold shift + click to select a range
a790958
pr132 run-able
bc0n Feb 7, 2023
f0e13a0
pr164 run-able
bc0n Feb 7, 2023
f6883c0
started reader write
bc0n Feb 7, 2023
76ec107
restore readMatrix dev file
bc0n Feb 8, 2023
42ac575
temp commit, need to get a smaller reference model
bc0n Feb 8, 2023
0c1f9c9
transpose read working
bc0n Feb 9, 2023
46565c8
can read all data in BouncingBall
bc0n Feb 9, 2023
e831784
readMatrixHeader()
bc0n Feb 9, 2023
4d6e568
moved into MAT_v4_Modelica
bc0n Feb 9, 2023
082d19c
initially useable
bc0n Feb 9, 2023
ed30247
move test files
bc0n Feb 27, 2023
38cdd9c
basic bones for reading OpenModelica MAT result files and tests
bc0n Feb 28, 2023
e821cf9
uncomment
bc0n Feb 28, 2023
decdd86
remove more dev files
bc0n Feb 28, 2023
0103c08
one more
bc0n Feb 28, 2023
2c6c04c
cleaning up
bc0n Feb 28, 2023
cd29c74
add Pkg dependency
bc0n Feb 28, 2023
334688e
remove JSON
bc0n Feb 28, 2023
0b89be6
pull out open kwarg lock=false to make Julia 1.3 happy
bc0n Feb 28, 2023
64949c9
add all-in-one readVariable()
bc0n Feb 28, 2023
8d13c78
add DataFrames dependency
bc0n Feb 28, 2023
95898f1
add testsets for more readable test results
bc0n Feb 28, 2023
0d8b527
Merge branch 'allinone' into addTestsets
bc0n Feb 28, 2023
0998bde
Added support for Dymola .mat files
May 19, 2023
c164b2a
Merge remote-tracking branch 'other/master' into feature/Dymola
May 19, 2023
40730ae
Merge pull request #1 from qnikil/feature/Dymola
bc0n Jun 9, 2023
508d164
remove DataFrames
bc0n Jun 9, 2023
b2276e6
add isMatV4Modelica()
bc0n Jun 9, 2023
7f88e9a
Added result file for FallingBodyBox_dymola2021 file and tests
Jun 10, 2023
efa6356
Removed Pkg Dependency
Jun 10, 2023
4676b4f
Fixed typo
Jun 10, 2023
f46e663
Merge pull request #2 from qnikil/feature/FallingBodyBox
bc0n Jun 15, 2023
ea31d0d
pr132 run-able
bc0n Feb 7, 2023
a08031a
pr164 run-able
bc0n Feb 7, 2023
20fd446
started reader write
bc0n Feb 7, 2023
f2a602c
restore readMatrix dev file
bc0n Feb 8, 2023
b328f38
temp commit, need to get a smaller reference model
bc0n Feb 8, 2023
58567b0
transpose read working
bc0n Feb 9, 2023
ee91236
can read all data in BouncingBall
bc0n Feb 9, 2023
e0df0c0
readMatrixHeader()
bc0n Feb 9, 2023
678c17d
moved into MAT_v4_Modelica
bc0n Feb 9, 2023
17c6a46
initially useable
bc0n Feb 9, 2023
fd49683
move test files
bc0n Feb 27, 2023
b0ab454
basic bones for reading OpenModelica MAT result files and tests
bc0n Feb 28, 2023
e91a2a9
uncomment
bc0n Feb 28, 2023
746eff1
remove more dev files
bc0n Feb 28, 2023
7f581d5
one more
bc0n Feb 28, 2023
15fa873
cleaning up
bc0n Feb 28, 2023
9ddbecf
add Pkg dependency
bc0n Feb 28, 2023
7500f9f
remove JSON
bc0n Feb 28, 2023
94232f7
pull out open kwarg lock=false to make Julia 1.3 happy
bc0n Feb 28, 2023
714314c
add all-in-one readVariable()
bc0n Feb 28, 2023
937cefa
add testsets for more readable test results
bc0n Feb 28, 2023
229c0fc
add DataFrames dependency
bc0n Feb 28, 2023
0da7b00
Added support for Dymola .mat files
May 19, 2023
3b719d3
remove DataFrames
bc0n Jun 9, 2023
46faf3b
add isMatV4Modelica()
bc0n Jun 9, 2023
73c096f
Added result file for FallingBodyBox_dymola2021 file and tests
Jun 10, 2023
56b2739
Removed Pkg Dependency
Jun 10, 2023
76b2268
Fixed typo
Jun 10, 2023
45d2996
Merge branch 'master' of github.com:mechanomy/MAT.jl
bc0n Jun 16, 2023
ab6f0bd
readwrite4.jl tests fail, removing
bc0n Jun 16, 2023
0a30a34
readwrite4.jl is not present, removing from runtests
bc0n Jun 16, 2023
ae6e906
Merge branch 'master' of github.com:mechanomy/MAT.jl
bc0n Jun 16, 2023
8bf3552
re-add readVariable(s), returning dicts instead of DataFrame
bc0n Jun 16, 2023
cd90236
readAllVarialbes requires all data to be Vector
bc0n Jun 16, 2023
50fd2a4
cleanup
bc0n Jul 3, 2023
c4d2077
remove invalid import of 'exists' from HDF5 (#184)
schillic Mar 18, 2023
59c5d73
enable dependabot for GitHub actions (#183)
ranocha Mar 18, 2023
3237cec
Bump actions/checkout from 2 to 3 (#185)
dependabot[bot] Mar 18, 2023
9940eac
Set version to 0.10.4
github-actions[bot] Mar 18, 2023
74f9149
Added read and write support for v4 mat files (#186)
qnikil7 Jun 7, 2023
c41f58d
Update Project.toml
sjkelly Jun 7, 2023
37ea934
Add Documenter documentation (#178)
JeffFessler Jun 7, 2023
39407ef
Update Documentation.yml default branch
sjkelly Jun 7, 2023
6e497bf
Fix some typos in docs/make.jl
sjkelly Jun 7, 2023
17693a6
Update Documentation.yml
sjkelly Jun 7, 2023
df380cf
Updated LTS version, 1.3 to 1.6 in ci (#187)
qnikil7 Jun 7, 2023
61648d7
Set Julia 1.6 as the new min
sjkelly Jun 7, 2023
0d52f57
parent 61648d7b10df61529408b9aaeea7626fd0b3b4af
sjkelly Jun 7, 2023
586ee2d
re-add readVariable(s), returning dicts instead of DataFrame
bc0n Jun 16, 2023
bff684f
Merge branch 'master' of github.com:mechanomy/MAT.jl
bc0n Jul 3, 2023
125b148
remove Pkg dependency
bc0n Jul 3, 2023
894d345
remove invalid import of 'exists' from HDF5 (#184)
schillic Mar 18, 2023
612d1ba
Set version to 0.10.4
github-actions[bot] Mar 18, 2023
9f7fc05
Added read and write support for v4 mat files (#186)
qnikil7 Jun 7, 2023
968d24e
Update Project.toml
sjkelly Jun 7, 2023
d2bb7d1
Add Documenter documentation (#178)
JeffFessler Jun 7, 2023
55469c5
Update Documentation.yml default branch
sjkelly Jun 7, 2023
ca41a28
Fix some typos in docs/make.jl
sjkelly Jun 7, 2023
2924e93
Update Documentation.yml
sjkelly Jun 7, 2023
39454cd
Update make.jl
sjkelly Jun 7, 2023
6a4c6da
parent 39454cd3828c9669480466ffaefd78c3a63ef823
bc0n Feb 7, 2023
fb39ed1
restore readwrite4.jl and add testset label
bc0n Jul 4, 2023
cce6334
Merge branch 'master' of github.com:mechanomy/MAT.jl
bc0n Jul 4, 2023
426ebe3
fix dropped MAT_v4.Matlabv4File type union
bc0n Jul 4, 2023
62aa93b
Merge remote-tracking branch 'upstream/master'
bc0n Aug 31, 2023
18ca0fb
ignore vscode workspace files
bc0n Aug 31, 2023
2c64031
restore small file error
bc0n Aug 31, 2023
f7fd6fb
add struct comment
bc0n Aug 31, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
*~
Manifest.toml
desktop.ini
bc0n marked this conversation as resolved.
Show resolved Hide resolved

# Build artifacts for creating documentation generated by the Documenter package
docs/build/
Expand Down
9 changes: 2 additions & 7 deletions src/MAT.jl
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,9 @@ using HDF5, SparseArrays
include("MAT_HDF5.jl")
include("MAT_v5.jl")
include("MAT_v4.jl")
include("MAT_v4_Modelica.jl")

using .MAT_HDF5, .MAT_v5, .MAT_v4
using .MAT_HDF5, .MAT_v5, .MAT_v4, .MAT_v4_Modelica

export matopen, matread, matwrite, @read, @write

Expand All @@ -53,12 +54,6 @@ function matopen(filename::AbstractString, rd::Bool, wr::Bool, cr::Bool, tr::Boo
return MAT_v4.matopen(rawfid, swap_bytes)
end

# Test whether this is a MAT file
bc0n marked this conversation as resolved.
Show resolved Hide resolved
if fs < 128
close(rawfid)
error("File \"$filename\" is too small to be a supported MAT file")
end

# Check for MAT v5 file
seek(rawfid, 124)
version = read(rawfid, UInt16)
Expand Down
Loading