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

Serialize Polyhedral Objects over Oscar fields #3386

Merged
merged 50 commits into from
Feb 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
bb0f01f
some progress on serializing dicts
antonydellavecchia Feb 15, 2024
b642547
saving
antonydellavecchia Feb 15, 2024
5d079e1
serialization: add helpers to deconstruct polymake bigobject to dict
benlorenz Feb 15, 2024
5c1e5e1
updates
antonydellavecchia Feb 15, 2024
af30cf3
Merge remote-tracking branch 'origin/adv/serialize-dict' into adv/ser…
antonydellavecchia Feb 15, 2024
c51105d
starting on load
antonydellavecchia Feb 15, 2024
c9a5510
fix type string for saving
benlorenz Feb 15, 2024
0415eda
adds work around for vector{Int}
antonydellavecchia Feb 16, 2024
e99acb2
Merge remote-tracking branch 'origin/master' into adv/serialize-dict
benlorenz Feb 16, 2024
08cd473
use new qualified bigobject name
benlorenz Feb 16, 2024
03ea531
serialize dicts
antonydellavecchia Feb 16, 2024
9bd5608
Merge remote-tracking branch 'origin/adv/serialize-dict' into adv/ser…
antonydellavecchia Feb 16, 2024
1753849
still need to work out loading
antonydellavecchia Feb 16, 2024
77687a8
can load polyhedral object over different fields
antonydellavecchia Feb 19, 2024
7b4d7e3
some updates
antonydellavecchia Feb 19, 2024
12964a4
add helpers for conversion from oscar graphs back to polymake
benlorenz Feb 19, 2024
52ad96f
tiny improvement
antonydellavecchia Feb 19, 2024
aea1f6b
Merge remote-tracking branch 'origin/adv/serialize-dict' into adv/ser…
antonydellavecchia Feb 19, 2024
79c8a58
fix inner types, store coeff only once
benlorenz Feb 19, 2024
45e8295
Merge remote-tracking branch 'origin/adv/serialize-dict' into adv/ser…
antonydellavecchia Feb 19, 2024
7cce3ef
polymake: improve matrix conversion helpers, allow float in some places
benlorenz Feb 19, 2024
8bac3b1
adds serialzation for sets
antonydellavecchia Feb 19, 2024
ba781cb
Merge remote-tracking branch 'origin/adv/serialize-dict' into adv/ser…
antonydellavecchia Feb 19, 2024
f30dcdb
adds test for dicts
antonydellavecchia Feb 19, 2024
22619c9
adds test for sets
antonydellavecchia Feb 19, 2024
21f4fb4
replace johnson matrices with Johnson solids
antonydellavecchia Feb 19, 2024
a20a6aa
replace johnson matrices with solids
antonydellavecchia Feb 19, 2024
04dda3a
pretty print the rest of the Johnson Solids
antonydellavecchia Feb 19, 2024
d239187
pretty print
antonydellavecchia Feb 19, 2024
e0e73b8
resolve conflicts
antonydellavecchia Feb 20, 2024
f38a7d1
padding, + file extension and not pretty printed
antonydellavecchia Feb 20, 2024
77530cf
fixes polyhedral test
antonydellavecchia Feb 20, 2024
c16f6cb
update file version tag
antonydellavecchia Feb 20, 2024
3706af8
file version tag + add extension for surface files
antonydellavecchia Feb 20, 2024
264deb8
fix surface loading
antonydellavecchia Feb 20, 2024
5aa8b7f
fix typo
antonydellavecchia Feb 20, 2024
7592d9c
adds fix for polyhedron of floats and adds test
antonydellavecchia Feb 21, 2024
63701ef
fix typo
antonydellavecchia Feb 21, 2024
2232068
better padding implementation
antonydellavecchia Feb 21, 2024
c5c9a0a
adds catch for unsupported loading types
antonydellavecchia Feb 21, 2024
0037062
remove Nothing type for coeff inputs, and fixed vector collect
antonydellavecchia Feb 21, 2024
8bd1f64
adds tests for serializing polyhdral objects over oscar fields
antonydellavecchia Feb 21, 2024
78e99da
fixes to MILP
antonydellavecchia Feb 22, 2024
198ecc2
MILP: add missing specialization for QQ to avoid saving other fields …
benlorenz Feb 22, 2024
b488c95
polymake: change warnings to debug when saving unsupported polymake p…
benlorenz Feb 22, 2024
fe211d1
polyhedral: add missing field for loading milp
benlorenz Feb 22, 2024
14c88e9
fix for polyhedron with floats
antonydellavecchia Feb 22, 2024
945ea75
serialization: fix load distinction between different fields, fix loa…
benlorenz Feb 22, 2024
a5d5968
Update test/Serialization/PolyhedralGeometry.jl
benlorenz Feb 22, 2024
6933db9
Apply suggestions from code review
antonydellavecchia Feb 22, 2024
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
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ JSON3 = "1.13.2"
LazyArtifacts = "1.6"
Nemo = "0.42.1"
Pkg = "1.6"
Polymake = "0.11.13"
Polymake = "0.11.14"
Preferences = "1"
Random = "1.6"
RandomExtensions = "0.4.3"
Expand Down
1 change: 0 additions & 1 deletion data/JohnsonMatrices/j10.mat

This file was deleted.

1 change: 0 additions & 1 deletion data/JohnsonMatrices/j13.mat

This file was deleted.

1 change: 0 additions & 1 deletion data/JohnsonMatrices/j16.mat

This file was deleted.

1 change: 0 additions & 1 deletion data/JohnsonMatrices/j17.mat

This file was deleted.

1 change: 0 additions & 1 deletion data/JohnsonMatrices/j18.mat

This file was deleted.

1 change: 0 additions & 1 deletion data/JohnsonMatrices/j20.mat

This file was deleted.

1 change: 0 additions & 1 deletion data/JohnsonMatrices/j21.mat

This file was deleted.

Loading
Loading