Skip to content

Fix multiplicity value comparison #429

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

Merged
jeremy-murphy merged 3 commits into from
May 12, 2025
+394 −1
Merged

Fix multiplicity value comparison #429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f434208
Fix multiplicity value comparison
jan-grimo May 1, 2025
4aec705
Merge branch 'develop' into fix-github-428
jan-grimo May 6, 2025
4697f3f
Update file paths
jan-grimo May 9, 2025
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: 1 addition & 1 deletion include/boost/graph/isomorphism.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ namespace detail
assert(x_multiplicity_iter != multiplicity->end());
auto y_multiplicity_iter = multiplicity->find(invariant1(y));
assert(y_multiplicity_iter != multiplicity->end());
return *x_multiplicity_iter < *y_multiplicity_iter;
return x_multiplicity_iter->second < y_multiplicity_iter->second;
}
Invariant1 invariant1;
const InvariantCountMap* multiplicity;
Expand Down
175 changes: 175 additions & 0 deletions test/github-428-0.dot
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,175 @@
digraph G {
0;
1;
2;
3;
4;
5;
6;
7;
8;
9;
10;
11;
12;
13;
14;
15;
16;
17;
18;
19;
20;
21;
22;
23;
24;
25;
26;
27;
28;
29;
30;
31;
32;
33;
34;
35;
36;
37;
38;
39;
40;
41;
42;
43;
44;
45;
46;
47;
48;
49;
50;
51;
52;
53;
54;
55;
56;
57;
58;
59;
60;
61;
62;
63;
64;
65;
66;
67;
68;
69;
70;
71;
72;
73;
74;
6->23 ;
0->23 ;
6->24 ;
0->24 ;
6->25 ;
1->25 ;
6->26 ;
1->26 ;
6->27 ;
2->27 ;
6->28 ;
2->28 ;
6->29 ;
3->29 ;
6->30 ;
3->30 ;
6->31 ;
4->31 ;
6->32 ;
4->32 ;
6->33 ;
5->33 ;
6->34 ;
5->34 ;
6->35 ;
0->35 ;
7->36 ;
1->36 ;
8->37 ;
3->37 ;
9->38 ;
3->38 ;
10->39 ;
3->39 ;
11->40 ;
3->40 ;
12->41 ;
3->41 ;
13->42 ;
3->42 ;
17->43 ;
3->43 ;
14->44 ;
3->44 ;
15->45 ;
3->45 ;
16->46 ;
3->46 ;
18->47 ;
3->47 ;
19->48 ;
3->48 ;
20->49 ;
3->49 ;
21->50 ;
3->50 ;
22->51 ;
3->51 ;
35->52 ;
69->52 ;
36->53 ;
70->53 ;
37->54 ;
72->54 ;
38->55 ;
72->55 ;
39->56 ;
72->56 ;
40->57 ;
72->57 ;
41->58 ;
72->58 ;
42->59 ;
72->59 ;
43->60 ;
72->60 ;
44->61 ;
72->61 ;
45->62 ;
72->62 ;
46->63 ;
72->63 ;
47->64 ;
72->64 ;
48->65 ;
72->65 ;
49->66 ;
72->66 ;
50->67 ;
72->67 ;
51->68 ;
72->68 ;
24->69 ;
26->70 ;
28->71 ;
30->72 ;
32->73 ;
34->74 ;
}
175 changes: 175 additions & 0 deletions test/github-428-1.dot
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,175 @@
digraph G {
0;
1;
2;
3;
4;
5;
6;
7;
8;
9;
10;
11;
12;
13;
14;
15;
16;
17;
18;
19;
20;
21;
22;
23;
24;
25;
26;
27;
28;
29;
30;
31;
32;
33;
34;
35;
36;
37;
38;
39;
40;
41;
42;
43;
44;
45;
46;
47;
48;
49;
50;
51;
52;
53;
54;
55;
56;
57;
58;
59;
60;
61;
62;
63;
64;
65;
66;
67;
68;
69;
70;
71;
72;
73;
74;
6->23 ;
0->23 ;
6->24 ;
0->24 ;
6->25 ;
1->25 ;
6->26 ;
1->26 ;
6->27 ;
2->27 ;
6->28 ;
2->28 ;
6->29 ;
3->29 ;
6->30 ;
3->30 ;
6->31 ;
4->31 ;
6->32 ;
4->32 ;
6->33 ;
5->33 ;
6->34 ;
5->34 ;
6->35 ;
0->35 ;
7->36 ;
1->36 ;
10->37 ;
3->37 ;
11->38 ;
3->38 ;
12->39 ;
3->39 ;
13->40 ;
3->40 ;
17->41 ;
3->41 ;
14->42 ;
3->42 ;
15->43 ;
3->43 ;
16->44 ;
3->44 ;
18->45 ;
3->45 ;
19->46 ;
3->46 ;
20->47 ;
3->47 ;
21->48 ;
3->48 ;
22->49 ;
3->49 ;
8->50 ;
3->50 ;
9->51 ;
3->51 ;
35->52 ;
69->52 ;
36->53 ;
70->53 ;
37->54 ;
72->54 ;
38->55 ;
72->55 ;
39->56 ;
72->56 ;
40->57 ;
72->57 ;
41->58 ;
72->58 ;
42->59 ;
72->59 ;
43->60 ;
72->60 ;
44->61 ;
72->61 ;
45->62 ;
72->62 ;
46->63 ;
72->63 ;
47->64 ;
72->64 ;
48->65 ;
72->65 ;
49->66 ;
72->66 ;
50->67 ;
72->67 ;
51->68 ;
72->68 ;
24->69 ;
26->70 ;
28->71 ;
30->72 ;
32->73 ;
34->74 ;
}
Loading
Loading