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

v0.3 #102

Merged
merged 94 commits into from
May 15, 2024
Merged

v0.3 #102

merged 94 commits into from
May 15, 2024

Conversation

ReubenJ
Copy link
Member

@ReubenJ ReubenJ commented May 15, 2024

No description provided.

Whebon and others added 30 commits February 25, 2024 21:02
@Whebon
Add the Solver as an optional argument to the program iterator
d26d98d
@Whebon
Update heuristics to only search for VariableShapedHoles
c2f5225
@Whebon
Rewrite TopDownIteration for the Solver
4ad771f
@Whebon
Move the creation of the Solver outside the iterator
a35ea2d
@Whebon
Add basic implementation of a FixedShapedIterator
696c54e
@Whebon
Add a test for the new Forbidden constraint
50cc556
@Whebon
check if the solver state is still feasible after a tree manipulation
211e517
@Whebon
Reduce the number of save_state! calls
c45e9ce
@Whebon
Track the number of fixed shaped trees
6e8f6f9
@Whebon
Add tests for searches with the Ordered constraint
6386396
@Whebon
Add tests for Forbidden
51aa284
@Whebon
Enable old tests
5f0b17f
@Whebon
Remove test_context_sensitive_iterators
4a5dfec
@Whebon
Rename Solver to GenericSolver
ef2b51b
@Whebon
Add the FixedShapedSolver to the top down iterator
6639d3c
@Whebon
Pass the SolverStatistics object to the inner solver
1d8296f
@Whebon
Add a test for a DomainRuleNode in a Forbidden Constraint
f44eb0f
@Whebon
Add a test for a DomainRuleNode in an Ordered constraint
7f9a199
@Whebon
Add a test for the Contains constraint
74592e4
@Whebon
Rename is_feasible
fcf8adc
@THinnerichs
Grammar -> AbstractGrammar; Update version
50238da
@Whebon @THinnerichs
Add the Solver as an optional argument to the program iterator
213c816
@Whebon @THinnerichs
Update heuristics to only search for VariableShapedHoles
3c69357
@Whebon @THinnerichs
Rewrite TopDownIteration for the Solver
774c096
@Whebon @THinnerichs
Move the creation of the Solver outside the iterator
3aee905
@Whebon @THinnerichs
Add basic implementation of a FixedShapedIterator
6ba598d
@Whebon @THinnerichs
Add a test for the new Forbidden constraint
db6ec8a
@Whebon @THinnerichs
check if the solver state is still feasible after a tree manipulation
c58227c
@Whebon @THinnerichs
Reduce the number of save_state! calls
c962dc7
@Whebon @THinnerichs
Track the number of fixed shaped trees
9652a00
Whebon and others added 17 commits May 6, 2024 13:59
@Whebon @ReubenJ
Remove imports in test 2
563a8ca 
Co-authored-by: Reuben Gardos Reid <[email protected]>
@Whebon
Remove TODOs
ec160f5
@Whebon
Merge branch 'forbidden-path' of https://github.com/Herb-AI/HerbSearc…
bd5f8a5 
…h.jl into forbidden-path
@ReubenJ
Merge branch 'dev' into forbidden-path
5bc6094
@ReubenJ
Merge pull request #93 from Herb-AI/forbidden-path
a807386 
Two new constraints (dependent on PR #47 of HerbConstraints)
@Whebon
Add tests for ContainsSubtree
95e32ab
@Whebon
Rewrite test for the ordered constraint with the test_constraint! h…
39d7203 
…elper function
@Whebon
Add tests for interaction between multiple constraints
83f0cf1
@Whebon
Fix a bug related to nesting different propagate functions
cf1da81
@Whebon
Merge branch 'dev' into contains-subtree
d5f1cde
@Whebon
Fix tests to work with the new @programiterator macro
98b4249
@ReubenJ
Update Project.toml
c858944
@ReubenJ
Update Project.toml
40d91c5
@ReubenJ
Merge pull request #99 from Herb-AI/deps/bump-constraints
4fe8ca8 
Bump `HerbConstraints` to `v0.3.0`
@ReubenJ
Fix Constraints version number
6378cae 
Jumped to v0.3 prematurely
@ReubenJ
Merge branch 'dev' into contains-subtree
c372f80
@ReubenJ
Merge pull request #95 from Herb-AI/contains-subtree
5651e49 
Add tests for changes in HerbConstraints
@ReubenJ ReubenJ added the enhancement New feature or request label May 15, 2024
@ReubenJ ReubenJ self-assigned this May 15, 2024
@codecov Codecov
Copy link

codecov bot commented May 15, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 66.29213% with 120 lines in your changes are missing coverage. Please review.

Project coverage is 67.35%. Comparing base (e08f886) to head (a43eb05).
Report is 4 commits behind head on master.

Files Patch % Lines
src/fixed_shaped_iterator.jl 0.00% 38 Missing ⚠️
src/top_down_iterator.jl 66.66% 25 Missing ⚠️
src/heuristics.jl 5.55% 17 Missing ⚠️
src/sampling_grammar.jl 40.74% 16 Missing ⚠️
src/random_iterator.jl 68.08% 15 Missing ⚠️
src/uniform_iterator.jl 89.70% 7 Missing ⚠️
src/program_iterator.jl 92.59% 2 Missing ⚠️
Additional details and impacted files 
@@            Coverage Diff             @@
##           master     #102      +/-   ##
==========================================
- Coverage   75.04%   67.35%   -7.70%     
==========================================
  Files          19       21       +2     
  Lines         573      729     +156     
==========================================
+ Hits          430      491      +61     
- Misses        143      238      +95

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@ReubenJ ReubenJ requested a review from THinnerichs May 15, 2024 11:53
@ReubenJ ReubenJ marked this pull request as ready for review May 15, 2024 11:53
THinnerichs
THinnerichs reviewed May 15, 2024
View reviewed changes
Project.toml Outdated Show resolved Hide resolved
@THinnerichs THinnerichs merged commit 24c3600 into master May 15, 2024
3 of 5 checks passed
@ReubenJ ReubenJ mentioned this pull request May 15, 2024
Merged
1 task
@ReubenJ ReubenJ deleted the dev branch May 24, 2024 09:17
@ReubenJ ReubenJ restored the dev branch May 24, 2024 09:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@THinnerichs THinnerichs THinnerichs approved these changes

Assignees

@ReubenJ ReubenJ

Labels
enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ReubenJ @THinnerichs @Whebon @nicolaefilat