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

Bump version to 0.3.0 #17

Merged
merged 36 commits into from
Apr 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
fafa4e6
Add FixedShapedHole and VariableShapedHole
Whebon Feb 9, 2024
3386563
Add copy functionality to FixedShapedHoles
Whebon Feb 24, 2024
66c4c95
Make `get_node_at_location` compatible with the new hole types
Whebon Feb 26, 2024
2718bc8
Add `contains_variable_shaped_hole`
Whebon Mar 1, 2024
d1f709b
add `get_node_path`
Whebon Mar 5, 2024
64dd148
Include holes in the size and depth of a tree
Whebon Mar 7, 2024
0a79bd4
Add `number_of_holes`
Whebon Mar 8, 2024
c6e1df2
Export `get_children`
Whebon Mar 9, 2024
ba021c1
Fixed typo; throws error when path is not usable
THinnerichs Mar 19, 2024
adb1eba
Tabs to spaces
THinnerichs Mar 19, 2024
b31e5c8
Fix typo in indentation
THinnerichs Mar 19, 2024
04d3086
Resolve merge issue
THinnerichs Mar 19, 2024
fa52495
Add `isfilled`, `has_children` and `get_rule`
Whebon Mar 19, 2024
91fc288
Rename `has_children` to `isfixedshaped`
Whebon Mar 22, 2024
64b83ee
Add `have_same_shape`
Whebon Mar 28, 2024
01a3382
update comments
THinnerichs Apr 3, 2024
4c7f156
merge dfs-solver
THinnerichs Apr 3, 2024
5ccb17a
Rename `Constraint` to `AbstractConstraint`
Whebon Apr 5, 2024
f28aa79
Add hasdynamicvalue
Whebon Apr 5, 2024
6394201
Remove references in docstrings to ContextSensitiveGrammar due to cir…
pwochner Apr 10, 2024
3c149c4
Update reference.
pwochner Apr 11, 2024
52fc7fd
Add requested changes (PR)
Whebon Apr 11, 2024
aa83c44
Merge pull request #14 from Herb-AI/stochastic-using-solver
ReubenJ Apr 12, 2024
d878126
Merge pull request #16 from Herb-AI/documentation-ref-fixes
ReubenJ Apr 12, 2024
fa1b547
Bump package to v0.3.0
ReubenJ Apr 12, 2024
d1cea2a
`FixedShapedHole` -> `UniformHole`
ReubenJ Apr 12, 2024
bb94319
`Hole` -> `AbstractHole` + `VariableShapedHole` -> `Hole`
ReubenJ Apr 12, 2024
e857c9b
Merge pull request #19 from Herb-AI/renaming-holes
THinnerichs Apr 12, 2024
02be345
Reformat codebase
ReubenJ Apr 12, 2024
4287736
Add git blame ignore file for reformatting commit
ReubenJ Apr 12, 2024
2de40c2
`isfixedshaped` -> `isuniform`
ReubenJ Apr 15, 2024
8884025
`contains_variable_shaped_hole` -> `contains_nonuniform_hole`
ReubenJ Apr 15, 2024
c6e331f
Add `AbstractUniformHole`
ReubenJ Apr 15, 2024
07c52f0
Merge pull request #21 from Herb-AI/add-abstract-uniform-hole
ReubenJ Apr 15, 2024
d9e0334
`get_node_path` -> `get_path`
ReubenJ Apr 15, 2024
bd56215
Export `AbstractUniformHole`
ReubenJ Apr 15, 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: 2 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Migrate code style to SciML
02be3454903ae3d03e1b8062794d96adabbdd814
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "HerbCore"
uuid = "2b23ba43-8213-43cb-b5ea-38c12b45bd45"
authors = ["Jaap de Jong <jaapdejong15@gmail.com>", "Nicolae Filat <N.Filat@student.tudelft.nl>", "Tilman Hinnerichs <t.r.hinnerichs@tudelft.nl>", "Sebastijan Dumancic <s.dumancic@tudelft.nl>"]
version = "0.2.0"
version = "0.3.0"

[compat]
julia = "^1.8"
Expand Down
42 changes: 25 additions & 17 deletions src/HerbCore.jl
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,30 @@ include("rulenode.jl")
include("constraint.jl")
include("grammar.jl")

export
AbstractRuleNode,
RuleNode,
Hole,
HoleReference,

depth,
node_depth,
rulesoftype,
swap_node,
get_rulesequence,
rulesonleft,
get_node_at_location,
contains_hole,

Constraint,
AbstractGrammar
export
AbstractRuleNode,
RuleNode,
AbstractHole,
AbstractUniformHole,
UniformHole,
Hole,
HoleReference, depth,
node_depth,
rulesoftype,
swap_node,
get_rulesequence,
rulesonleft,
get_node_at_location,
get_path,
number_of_holes,
contains_hole,
contains_nonuniform_hole,
get_children,
get_rule,
isuniform,
isfilled,
hasdynamicvalue,
have_same_shape, AbstractConstraint,
AbstractGrammar

end # module HerbCore
4 changes: 2 additions & 2 deletions src/constraint.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Represents a constraint for a [`ContextSensitiveGrammar`](@ref).
Represents a constraint for a [`AbstractGrammar`](@ref).
Concrete implementations can be found in HerbConstraints.jl.
"""
abstract type Constraint end
abstract type AbstractConstraint end
2 changes: 1 addition & 1 deletion src/grammar.jl
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ If a rule is terminal, the corresponding list is empty.
- `log_probabilities::Union{Vector{Real}, Nothing}`: A list of probabilities for each rule.
If the grammar is non-probabilistic, the list can be `nothing`.

For concrete types, see [`ContextSensitiveGrammar`](@ref) within the `HerbGrammar` module.
For concrete types, see `ContextSensitiveGrammar` within the `HerbGrammar` module.
"""
abstract type AbstractGrammar end
Loading
Loading