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

Add LTLf syntax support. #2

Merged
merged 9 commits into from
Aug 6, 2021
Merged

Add LTLf syntax support. #2

merged 9 commits into from
Aug 6, 2021

Conversation

marcofavorito
Copy link
Member

@marcofavorito marcofavorito commented Jul 12, 2021

Types of changes

Add support for LTLf syntax and parsing:

  • tt and ff
  • atomic formula
  • negation
  • and
  • or
  • implies
  • equivalence
  • xor
  • next
  • weak next
  • until
  • release
  • eventually
  • always

Type of changes:

  • Bug fix (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 change)
  • I have read the CONTRIBUTING document.
  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have added tests to cover my changes.
  • All new and existing tests passed.

@codecov
Copy link

codecov bot commented Jul 12, 2021

Codecov Report

Merging #2 (48eee5e) into develop (8212620) will increase coverage by 0.87%.
The diff coverage is 37.68%.

❗ Current head 48eee5e differs from pull request most recent head 4cf2daf. Consider uploading reports for the commit 4cf2daf to get more accurate results
Impacted file tree graph

@@             Coverage Diff             @@
##           develop       #2      +/-   ##
===========================================
+ Coverage    41.46%   42.33%   +0.87%     
===========================================
  Files           16       23       +7     
  Lines          123     1729    +1606     
  Branches        52      675     +623     
===========================================
+ Hits            51      732     +681     
- Misses          40      478     +438     
- Partials        32      519     +487     
Flag Coverage Δ
cynthia-core ?
cynthia-logic 38.20% <36.21%> (-17.48%) ⬇️
cynthia-parser 42.33% <37.68%> (+1.01%) ⬆️
cynthia-utils 42.30% <38.09%> (-24.36%) ⬇️

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

Impacted Files Coverage Δ
libs/logic/include/cynthia/logic/comparable.hpp 45.45% <ø> (-54.55%) ⬇️
libs/parser/include/cynthia/parser/parser_stype.h 100.00% <ø> (ø)
libs/parser/include/cynthia/parser/parser.yy 8.33% <9.52%> (ø)
libs/logic/src/ltlf.cpp 16.90% <18.03%> (-12.52%) ⬇️
libs/logic/tests/unit/test_ltlf.cpp 19.28% <19.15%> (-2.94%) ⬇️
libs/parser/tests/unit/main.cpp 37.24% <37.24%> (-62.76%) ⬇️
libs/utils/tests/unit/main.cpp 37.50% <38.46%> (-12.50%) ⬇️
libs/utils/include/cynthia/utils.hpp 46.42% <42.30%> (-53.58%) ⬇️
libs/logic/src/base.cpp 48.23% <48.14%> (+8.23%) ⬆️
libs/parser/include/cynthia/parser/driver.hpp 50.00% <50.00%> (ø)
... and 22 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 8212620...4cf2daf. Read the comment docs.

@marcofavorito marcofavorito changed the base branch from main to develop July 21, 2021 13:54
@marcofavorito marcofavorito added this to In progress in Development Jul 27, 2021
@marcofavorito marcofavorito marked this pull request as ready for review July 27, 2021 19:53
input: ltlf_formula { $$ = $1; };
//d.result = $$; };
input: ltlf_formula { $$ = $1;
d.result = $$; };

ltlf_formula: ltlf_formula EQUIVALENCE ltlf_formula { }
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

need to complete these!!

Copy link
Member

@Shufang-Zhu Shufang-Zhu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have a question about tt and true.
I guess make_tt if for tt, what about true? Are we considering it as an atom?


ff = std::make_shared<const LTLfFalse>(*this);
table_->insert_if_not_available(ff);
}

symbol_ptr Context::make_symbol(const std::string& name) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I have asked this question.
How do we define symbol?

@marcofavorito marcofavorito merged commit 3838c3a into develop Aug 6, 2021
Development automation moved this from In progress to Done Aug 6, 2021
@marcofavorito marcofavorito deleted the feat/ltlf branch August 6, 2021 17:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Development

Successfully merging this pull request may close these issues.

None yet

2 participants