Support for numeric fluents and action costs #92

francescofuggitti · 2023-10-07T23:08:49Z

Proposed changes

In this PR, we add support for numeric fluents and action costs. It is built on top of the work originally proposed in #59. However, some updates on the lark domain and problem grammars and data structures have been applied to support all features of numeric fluents.

This PR primarily addresses issues #38 and #89, but it also fixes the issues in #93 and #96.

Types of changes

What types of changes does your code introduce?
Put an x in the boxes that apply

Bugfix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to not work as expected)

Checklist

Put an x in the boxes that apply.

I have read the CONTRIBUTING doc
Lint and unit tests pass locally with my changes
I have added tests that prove my fix is effective or that my feature works

…l-fluents # Conflicts: # pddl/core.py # pddl/formatter.py # pddl/helpers/base.py # pddl/parser/domain.py # pddl/parser/symbols.py # tests/test_formatter.py

…h the domain

codecov-commenter · 2023-10-09T00:39:11Z

Codecov Report

Merging #92 (a18263c) into main (fe1013b) will decrease coverage by 2.67%.
The diff coverage is 80.00%.

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files

@@            Coverage Diff             @@
##             main      #92      +/-   ##
==========================================
- Coverage   90.77%   88.10%   -2.67%     
==========================================
  Files          24       25       +1     
  Lines        1398     1791     +393     
  Branches      247      332      +85     
==========================================
+ Hits         1269     1578     +309     
- Misses         93      154      +61     
- Partials       36       59      +23

Flag	Coverage Δ
unittests	`88.10% <80.00%> (-2.67%)`	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files	Coverage Δ
pddl/core.py	`92.64% <100.00%> (+0.52%)`	⬆️
pddl/custom_types.py	`100.00% <100.00%> (ø)`
pddl/formatter.py	`96.77% <100.00%> (+0.88%)`	⬆️
pddl/helpers/base.py	`97.46% <100.00%> (+0.06%)`	⬆️
pddl/logic/predicates.py	`94.56% <ø> (ø)`
pddl/logic/terms.py	`92.98% <100.00%> (ø)`
pddl/parser/symbols.py	`100.00% <100.00%> (ø)`
pddl/requirements.py	`89.79% <100.00%> (+2.29%)`	⬆️
pddl/logic/base.py	`92.06% <95.00%> (+0.39%)`	⬆️
pddl/parser/typed_list_parser.py	`95.06% <95.23%> (+0.12%)`	⬆️
... and 4 more

haz

Thank you so much for your efforts on this @francescofuggitti ! It's an epic addition. Especially by the diff count ;)

I suspect I'm missing some things that will come to light when we release this to the wild, but I've just made a few (mostly minor) comments/questions for you to consider.

pddl/_validation.py

pddl/logic/functions.py

pddl/parser/common.lark

pddl/parser/domain.py

pddl/parser/problem.lark

pddl/parser/problem.py

tests/test_domain.py

pddl/_validation.py

pddl/logic/functions.py

marcofavorito

This is a monumental work @francescofuggitti, thank you so much. The tests witness that the feature is working (regardless of minor issues that might pop up in the future). Thanks!! 🙏

pddl/logic/base.py

@marcofavorito

…ested duplicated elements (found by @marcofavorito, thanks!).

haz

Just some open question on what's all resolved. Rest for @marcofavorito to sign off on.

marcofavorito

LGTM

MathisFederico and others added 16 commits March 13, 2023 05:10

✅ Add simple hello-world domain & problem for numerical-fluents

8c4c724

📝 Add requirements files

044f38a

📝 Add docstring to function operators

b976080

✨ Sort imports

f47452c

📝 Add FunctionOperator __init__ docstrings

415b1bb

✨ Fix pytest warning due to 'setup'

4db9885

🔥 Remove requirements files

10e490e

🐛 Fix mypy issues

409e3a4

✅ Pass simple formatter tests for hello world

36c7f3f

Merge branch 'main' of github.com:AI-Planning/pddl into feat/numerica…

45f383e

…l-fluents # Conflicts: # pddl/core.py # pddl/formatter.py # pddl/helpers/base.py # pddl/parser/domain.py # pddl/parser/symbols.py # tests/test_formatter.py

add numeric fluents to requirements

2db7227

fix: types validation for functions

30d6b80

fix: lark domain file to parse numeric fluents and domain parser

12c676c

fix: formatting tests

850a09d

fix: domain parsing

954465d

fix: hello-world problem test

e094558

francescofuggitti changed the title ~~Support for numerical fluents and action costs~~ Support for numeric fluents and action costs Oct 8, 2023

francescofuggitti added 5 commits October 8, 2023 17:24

fix: equalto call on gd_comparison rule in domain parsing

06591d9

fix: problem grammar and parsing to support part of numeric fluents

d6ad432

fix: formatter test as predicates definition in domain is optional

fc04b29

fix: issue on problem parsing causing a failure on the type-check wit…

f60cd00

…h the domain

apply style checks

f327c19

francescofuggitti added 7 commits October 8, 2023 20:40

update: whitelist.py

5802fca

fix: copyright header

bb7ca51

add actions costs and metric specification to domain and problem

b3d9d1d

add total cost and metric classes, and fix formatting issues

004b842

update vulture whitelist.py

3e9f10e

add consistency check on actions costs and total-cost

bbcf49c

add some tests

8a215e3

francescofuggitti marked this pull request as ready for review October 13, 2023 23:30

francescofuggitti added 5 commits October 13, 2023 19:32

apply style checks

fbb0118

fix functions requirements validation

7986702

fix functions to_string

6ba1424

add rovers numeric domain and update whitelist

8a4af87

decapitalize objects types rovers

9b57554

francescofuggitti requested review from marcofavorito and haz October 14, 2023 03:34

haz requested changes Oct 15, 2023

View reviewed changes

marcofavorito reviewed Oct 15, 2023

View reviewed changes

pddl/_validation.py Outdated Show resolved Hide resolved

marcofavorito reviewed Oct 15, 2023

View reviewed changes

pddl/logic/functions.py Show resolved Hide resolved

marcofavorito reviewed Oct 15, 2023

View reviewed changes

pddl/logic/functions.py Outdated Show resolved Hide resolved

marcofavorito reviewed Oct 15, 2023

View reviewed changes

pddl/logic/functions.py Outdated Show resolved Hide resolved

marcofavorito reviewed Oct 15, 2023

View reviewed changes

pddl/logic/functions.py Outdated Show resolved Hide resolved

marcofavorito reviewed Oct 15, 2023

View reviewed changes

pddl/logic/functions.py Outdated Show resolved Hide resolved

marcofavorito approved these changes Oct 15, 2023

View reviewed changes

marcofavorito mentioned this pull request Oct 15, 2023

Update MonotoneOp to allow only flattening but not idempotency #96

Closed

francescofuggitti added 2 commits October 15, 2023 16:25

address some of the review comments on the PR

144b615

fix issue #96 (thanks @marcofavorito) and remove old comments

7eacf32

francescofuggitti force-pushed the feat/numerical-fluents branch from 0991d42 to 7eacf32 Compare October 15, 2023 20:31

marcofavorito reviewed Oct 15, 2023

View reviewed changes

pddl/logic/base.py Outdated Show resolved Hide resolved

marcofavorito reviewed Oct 15, 2023

View reviewed changes

pddl/logic/base.py Outdated Show resolved Hide resolved

francescofuggitti added 2 commits October 16, 2023 15:50

add idempotency into flattening method of operands and fix spotting n…

2682e2f

…ested duplicated elements (found by @marcofavorito, thanks!).

remove duplicated code (thanks @haz)

a18263c

francescofuggitti requested review from haz and marcofavorito October 16, 2023 22:52

haz approved these changes Oct 18, 2023

View reviewed changes

marcofavorito approved these changes Oct 18, 2023

View reviewed changes

francescofuggitti merged commit 137cb67 into main Oct 18, 2023
9 checks passed

francescofuggitti deleted the feat/numerical-fluents branch October 18, 2023 09:45

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support for numeric fluents and action costs #92

Support for numeric fluents and action costs #92

francescofuggitti commented Oct 7, 2023 •

edited

Loading

codecov-commenter commented Oct 9, 2023 •

edited

Loading

haz left a comment

marcofavorito left a comment

haz left a comment

marcofavorito left a comment

Support for numeric fluents and action costs #92

Support for numeric fluents and action costs #92

Conversation

francescofuggitti commented Oct 7, 2023 • edited Loading

Proposed changes

Types of changes

Checklist

codecov-commenter commented Oct 9, 2023 • edited Loading

Codecov Report

haz left a comment

Choose a reason for hiding this comment

marcofavorito left a comment

Choose a reason for hiding this comment

haz left a comment

Choose a reason for hiding this comment

marcofavorito left a comment

Choose a reason for hiding this comment

francescofuggitti commented Oct 7, 2023 •

edited

Loading

codecov-commenter commented Oct 9, 2023 •

edited

Loading