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

Pyex Optimisations Iteration 2 #113

Merged
merged 7 commits into from
Jan 24, 2024
Merged

Pyex Optimisations Iteration 2 #113

merged 7 commits into from
Jan 24, 2024

Conversation

vhavlena
Copy link
Collaborator

No description provided.

@vhavlena
Copy link
Collaborator Author

Comparison with devel:

image

# of formulae: 82972
###################################################################################
####                                   Table 1                                 ####
###################################################################################
| method                     |    max |     mean |   median |   std. dev |   TO+MO+ERR |   unknowns |
|----------------------------|--------|----------|----------|------------|-------------|------------|
| z3-noodler-8de5f2c-387babd | 110.62 | 0.122372 |     0.02 |    1.73889 |         542 |       2012 |
| cvc5-1.0.8                 | 119.36 | 0.515113 |     0.02 |    5.2351  |        1723 |          2 |
| z3-4.12.2                  | 119.29 | 1.49018  |     0.04 |    8.17615 |        2623 |        123 |
| z3-noodler-feada45-a57f582 | 116.1  | 0.494545 |     0.02 |    3.67665 |        2198 |       2011 |

@vhavlena vhavlena marked this pull request as ready for review January 17, 2024 12:05
@vhavlena vhavlena requested review from jurajsic and Adda0 January 17, 2024 12:05
Adda0
Adda0 approved these changes Jan 18, 2024
View reviewed changes
Copy link
Collaborator

@Adda0 Adda0 left a comment

Choose a reason for hiding this comment

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

I do not see any problems. The function descriptions read great.

jurajsic
jurajsic approved these changes Jan 22, 2024
View reviewed changes
Copy link
Member

@jurajsic jurajsic left a comment

Choose a reason for hiding this comment

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

Looks ok

src/smt/theory_str_noodler/theory_str_noodler.cpp Outdated

expr* num_val, *ind_val;
rational num_val_rat;
if(r.get_int32() == 0 && expr_cases::is_indexof_add(l, s, m, m_util_s, m_util_a, num_val, ind_val) && m_util_a.is_numeral(num_val, num_val_rat) && num_val_rat.get_int32() == 1) {
Copy link
Member

Choose a reason for hiding this comment

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

It is probably safer to use r.is_zero() and num_val_rat.is_one().

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

ok, fixed

@vhavlena vhavlena merged commit 8f010fa into devel Jan 24, 2024
@vhavlena vhavlena deleted the pyex-opt-it2 branch January 24, 2024 08:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Adda0 Adda0 Adda0 approved these changes

@jurajsic jurajsic jurajsic approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@vhavlena @jurajsic @Adda0