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.

Sign up for GitHub

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

Jump to bottom

Model parsing from JSON #32

Merged
merged 36 commits into from
Nov 21, 2023
Merged

Model parsing from JSON #32

Show file tree
Hide file tree
Changes from 29 commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
c132b2b
Add parsers directory
lixitrixi Oct 30, 2023
25478f7
Initial parser code
lixitrixi Nov 2, 2023
67eab45
Compact syntax and supporting Model constructor
lixitrixi Nov 3, 2023
8960e0c
Format code
lixitrixi Nov 3, 2023
9477ca4
Update crate structure and imports
lixitrixi Nov 6, 2023
63868fd
Add Conjure Error and edit crate structure (broken)
lixitrixi Nov 8, 2023
2fede22
Possible import fix (@niklasdewally)
lixitrixi Nov 8, 2023
a179204
Merge branch 'conjure-cp:main' into main
lixitrixi Nov 8, 2023
bea115d
Clearly separate packages and workspace
lixitrixi Nov 8, 2023
1c2e40f
Add default run target
lixitrixi Nov 8, 2023
dda39b0
Merge branch 'workspace-refactor' into json-parsing
lixitrixi Nov 12, 2023
e301bb1
Merge refactoring of project structure
lixitrixi Nov 13, 2023
6ae8037
Merge remote-tracking branch 'upstream/main' into main
lixitrixi Nov 13, 2023
4a5cac1
Merge branch 'main' into json-parsing
lixitrixi Nov 13, 2023
6f62229
Resolve import conflicts
lixitrixi Nov 13, 2023
fb5726c
Update Error code to use thiserror
lixitrixi Nov 14, 2023
6f5480f
Parse JSON in main
lixitrixi Nov 14, 2023
42222ff
Assert manual and parsed models are equal
lixitrixi Nov 14, 2023
a3706ae
Format model output strings
lixitrixi Nov 14, 2023
b86588b
Update output formatting
lixitrixi Nov 14, 2023
a395036
Fix format fails
lixitrixi Nov 14, 2023
4a571d1
Use thiserror to create From<> impl
lixitrixi Nov 14, 2023
98f09dc
Update gitignore
lixitrixi Nov 14, 2023
4354d92
Update error and clean parsing code
lixitrixi Nov 14, 2023
d628d20
Parse variable domains
lixitrixi Nov 14, 2023
d7da76b
Add integration test foundation
lixitrixi Nov 14, 2023
bb7b7a4
Cargo format
lixitrixi Nov 14, 2023
32b0bbf
Parser syntax tweaks
lixitrixi Nov 14, 2023
58fbcfa
Complete integration tests
lixitrixi Nov 19, 2023
2c95df3
Attempt CI fix
lixitrixi Nov 20, 2023
149229a
Silence test failures (for now)
lixitrixi Nov 20, 2023
58ba655
Cargo format
lixitrixi Nov 20, 2023
e9d0407
Merge branch 'main' into json-parsing
lixitrixi Nov 20, 2023
0c6810d
Fix i32/i64 discrepancy
lixitrixi Nov 20, 2023
dc055c1
Fix build dependency versions
lixitrixi Nov 20, 2023
7ae4d3a
Merge branch 'main' into json-parsing
lixitrixi Nov 20, 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
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
target
coverage
solvers/**/vendor/build
solvers/**/*.a
solvers/**/*.o

# python
.env
Expand All @@ -11,3 +13,4 @@ __pycache__

# IDE
.idea
.vscode
4 changes: 4 additions & 0 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
"rust": {
"editor.defaultFormatter": "rust-lang.rust-analyzer",
"editor.formatOnSave": true
}
Loading
Loading