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

Fixed bug of RuleSet generations #272

Merged
merged 4 commits into from
Sep 2, 2021
Merged

Fixed bug of RuleSet generations #272

merged 4 commits into from
Sep 2, 2021

Conversation

Chibikuri
Copy link
Member

@Chibikuri Chibikuri commented Sep 2, 2021

Related issue #271

Problem

Currently, the order of rules is important for later processing. To point out the next rules properly, this order is required when these Rules are added to RuleSet.

Solution

In general, the distance from swapper and partners is getting larger from start to the end. To make the order of swapping proper, the swapping should be done from small distance swapping.


This change is Reviewable

Copy link
Contributor

@zigen zigen left a comment

Choose a reason for hiding this comment

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

could you write a test for this quickly?

Reviewed 2 of 2 files at r1, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @Chibikuri)

Copy link
Member Author

@Chibikuri Chibikuri left a comment

Choose a reason for hiding this comment

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

OK, let me write it.

Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @Chibikuri)

Copy link
Contributor

@zigen zigen left a comment

Choose a reason for hiding this comment

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

could you run clang-format?

Reviewed 1 of 1 files at r2, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @Chibikuri)

Copy link
Contributor

@zigen zigen left a comment

Choose a reason for hiding this comment

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

Reviewed all commit messages.
Reviewable status: 1 of 3 files reviewed, 1 unresolved discussion (waiting on @Chibikuri and @zigen)


quisp/modules/QRSA/ConnectionManager/ConnectionManager.cc, line 944 at r3 (raw file):

  auto rule_entanglement_swapping = std::make_unique<Rule>(ruleset_id, rule_id, rule_name, partners);
  Condition *condition = new Condition();
  Clause *resource_clause_left = new EnoughResourceClause(conf.left_partner, 1);

why you set this 1?

Copy link
Member Author

@Chibikuri Chibikuri left a comment

Choose a reason for hiding this comment

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

Reviewable status: 1 of 3 files reviewed, 1 unresolved discussion (waiting on @zigen)


quisp/modules/QRSA/ConnectionManager/ConnectionManager.cc, line 944 at r3 (raw file):

Previously, zigen (Kentaro "zigen" Teramoto) wrote…

why you set this 1?

Oh, I mistakenly pushed this change. But I found lres represents index (==0), but enough resource clause should have the number of required resource at second argument. So this should be fixed at 1, but let me fix it in different branch.

Copy link
Contributor

@zigen zigen left a comment

Choose a reason for hiding this comment

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

Reviewed 1 of 2 files at r3, 1 of 1 files at r4, all commit messages.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @Chibikuri)


quisp/modules/QRSA/ConnectionManager/ConnectionManager.cc, line 944 at r3 (raw file):

Previously, Chibikuri (Ryosuke Satoh) wrote…

Oh, I mistakenly pushed this change. But I found lres represents index (==0), but enough resource clause should have the number of required resource at second argument. So this should be fixed at 1, but let me fix it in different branch.

ah, that's right.

Copy link
Contributor

@zigen zigen left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @Chibikuri)

Copy link
Member Author

@Chibikuri Chibikuri left a comment

Choose a reason for hiding this comment

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

Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @zigen)


quisp/modules/QRSA/ConnectionManager/ConnectionManager.cc, line 944 at r3 (raw file):

Previously, zigen (Kentaro "zigen" Teramoto) wrote…

ah, that's right.

Done.

@Chibikuri Chibikuri merged commit 5800398 into master Sep 2, 2021
@Chibikuri Chibikuri deleted the fix_rule_generation branch August 30, 2022 07:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants