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

Move iteration out of the UniformSolver (PR 1/2) #34

Merged
merged 6 commits into from
Apr 30, 2024
Merged

Conversation

Whebon
Copy link
Contributor

@Whebon Whebon commented Apr 24, 2024

Main Changes:

  • Splits up UniformSolver into UniformSolver and UniformIterator.
  • Adds the julianised derivation_heuristic.
  • Make sure newly posted constraints are unposted on backtrack.

@ReubenJ
Copy link
Member

ReubenJ commented Apr 25, 2024

As CI is still failing until HerbCore is published, I checked locally with the following setup, and all tests pass 👍

packages = [
    PackageSpec(name="HerbConstraints", rev="uniform-solver"),
    PackageSpec(name="HerbGrammar", rev="dev"),
    PackageSpec(name="HerbCore", rev="dev"),
    PackageSpec(name="HerbInterpret", rev="dev"),
    PackageSpec(name="HerbSearch", rev="uniform-solver"), 
    PackageSpec(name="HerbSpecification", rev="dev")
]
Manifest.toml

[1520ce14] AbstractTrees v0.4.5
[ec485272] ArnoldiMethod v0.4.0
[bbf7d656] CommonSubexpressions v0.3.0
[34da2185] Compat v4.14.0
[864edb3b] DataStructures v0.18.20
[86223c79] Graphs v1.10.0
[1fa96474] HerbConstraints v0.2.1 `https://github.com/Herb-AI/HerbConstraints.jl.git#uniform-solver`
[2b23ba43] HerbCore v0.3.0 `https://github.com/Herb-AI/HerbCore.jl.git#dev`
[4ef9e186] HerbGrammar v0.2.2 `https://github.com/Herb-AI/HerbGrammar.jl.git#dev`
[d25df0c9] Inflate v0.1.4
[692b3bcd] JLLWrappers v1.5.0
[b964fa9f] LaTeXStrings v1.3.1
[d8e11817] MLStyle v0.4.17
[1914dd2f] MacroTools v0.5.13
[bac558e1] OrderedCollections v1.6.3
[aea7be01] PrecompileTools v1.2.1
[21216c6a] Preferences v1.4.3
[ae029012] Requires v1.3.0
[699a6c99] SimpleTraits v0.9.4
[90137ffa] StaticArrays v1.9.3
[1e83bf80] StaticArraysCore v1.4.2
[b4f28e30] TikzGraphs v1.4.0
[37f6aa50] TikzPictures v3.5.0
[39424ebd] TreeView v0.5.1
[6e34b625] Bzip2_jll v1.0.8+1
[83423d85] Cairo_jll v1.18.0+1
[2e619515] Expat_jll v2.5.0+0
[a3f928ae] Fontconfig_jll v2.13.93+0
[d7e528f0] FreeType2_jll v2.13.1+0
[78b55507] Gettext_jll v0.21.0+0
[7746bdde] Glib_jll v2.80.0+0
[3b182d85] Graphite2_jll v1.3.14+0
[655565e8] HarfBuzz_ICU_jll v2.8.1+0
[2e76f6c2] HarfBuzz_jll v2.8.1+1
⌅ [a51ab1cf] ICU_jll v69.1.0+0
[aacddb02] JpegTurbo_jll v3.0.2+0
[88015f11] LERC_jll v3.0.0+1
[1d63c593] LLVMOpenMP_jll v15.0.7+0
[dd4b983a] LZO_jll v2.10.1+0
⌅ [e9f186c6] Libffi_jll v3.2.2+1
[d4300ac3] Libgcrypt_jll v1.8.7+0
[7add5ba3] Libgpg_error_jll v1.42.0+0
[94ce4f54] Libiconv_jll v1.17.0+0
[4b2f31a3] Libmount_jll v2.39.3+0
⌅ [89763e89] Libtiff_jll v4.4.0+0
[38a345b3] Libuuid_jll v2.39.3+1
⌃ [d3a379c0] LittleCMS_jll v2.12.0+0
⌃ [643b3616] OpenJpeg_jll v2.4.0+0
⌅ [458c3c95] OpenSSL_jll v1.1.23+0
[30392449] Pixman_jll v0.42.2+0
⌅ [9c32591e] Poppler_jll v21.9.0+0
[02c8fc9c] XML2_jll v2.12.6+0
[aed1982a] XSLT_jll v1.1.34+0
[4f6342f7] Xorg_libX11_jll v1.8.6+0
[0c0b7dd1] Xorg_libXau_jll v1.0.11+0
[a3789734] Xorg_libXdmcp_jll v1.1.4+0
[1082639a] Xorg_libXext_jll v1.3.4+4
[ea2f1a96] Xorg_libXrender_jll v0.9.10+4
[14d82f49] Xorg_libpthread_stubs_jll v0.1.1+0
[c7cfdc94] Xorg_libxcb_jll v1.15.0+0
[c5fb5394] Xorg_xtrans_jll v1.5.0+0
[3161d3a3] Zstd_jll v1.5.6+0
[b53b4c65] libpng_jll v1.6.43+1
⌅ [d7dd28d6] tectonic_jll v0.13.1+0
[0dad84c5] ArgTools v1.1.1
[56f22d72] Artifacts
[2a0f44e3] Base64
[ade2ca70] Dates
[8ba89e20] Distributed
[f43a241f] Downloads v1.6.0
[7b1f6079] FileWatching
[b77e0a4c] InteractiveUtils
[b27032c2] LibCURL v0.6.4
[76f85450] LibGit2
[8f399da3] Libdl
[37e2e46d] LinearAlgebra
[56ddb016] Logging
[d6f4376e] Markdown
[a63ad114] Mmap
[ca575930] NetworkOptions v1.2.0
[44cfe95a] Pkg v1.10.0
[de0858da] Printf
[3fa0cd96] REPL
[9a3f8284] Random
[ea8e919c] SHA v0.7.0
[9e88b42a] Serialization
[1a1011a3] SharedArrays
[6462fe0b] Sockets
[2f01184e] SparseArrays v1.10.0
[10745b16] Statistics v1.10.0
[fa267f1f] TOML v1.0.3
[a4e569a6] Tar v1.10.0
[8dfed614] Test
[cf7118a7] UUIDs
[4ec0a83e] Unicode
[e66e0078] CompilerSupportLibraries_jll v1.1.0+0
[deac9b47] LibCURL_jll v8.4.0+0
[e37daf67] LibGit2_jll v1.6.4+0
[29816b5a] LibSSH2_jll v1.11.0+1
[c8ffd9c3] MbedTLS_jll v2.28.2+1
[14a3606d] MozillaCACerts_jll v2023.1.10
[4536629a] OpenBLAS_jll v0.3.23+4
[efcefdf7] PCRE2_jll v10.42.0+1
[bea87d4a] SuiteSparse_jll v7.2.1+1
[83775a58] Zlib_jll v1.2.13+1
[8e850b90] libblastrampoline_jll v5.8.0+1
[8e850ede] nghttp2_jll v1.52.0+1
[3f19e933] p7zip_jll v17.4.0+2

@ReubenJ ReubenJ merged commit 8a9c001 into dev Apr 30, 2024
0 of 2 checks passed
@ReubenJ ReubenJ deleted the uniform-solver branch April 30, 2024 12:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants