Skip to content

Commit 7c1a38e

Browse files
author
Matthias Koeppe
committed
1 parent 83b7a06 commit 7c1a38e

File tree

1 file changed

+144
-0
lines changed

1 file changed

+144
-0
lines changed

‎build/pkgs/nauty/patches/nauty-2.8.6-gentreeg-gentourng.patch

Lines changed: 144 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,144 @@
1+
From edb0474a4db8e69f971e4eebe18716309f5a7bb3 Mon Sep 17 00:00:00 2001
2+
From: Michael Orlitzky <[email protected]>
3+
Date: Tue, 17 Jan 2023 19:44:49 -0500
4+
Subject: [PATCH 1/1] Upstream fixes for gentreeg and gentourng.
5+
6+
https://mailman.anu.edu.au/pipermail/nauty/2023-January/000903.html
7+
---
8+
gentourng.c | 2 +-
9+
gentreeg.c | 95 ++++++++++++++++++++++++++++-------------------------
10+
2 files changed, 51 insertions(+), 46 deletions(-)
11+
12+
diff --git a/gentourng.c b/gentourng.c
13+
index 634e5e8..5c7ffff 100644
14+
--- a/gentourng.c
15+
+++ b/gentourng.c
16+
@@ -1408,7 +1408,7 @@ PLUGIN_INIT
17+
(*outproc)(outfile,g,1);
18+
}
19+
}
20+
- else
21+
+ else if (!connec || maxn != 2)
22+
{
23+
makeleveldata();
24+
25+
diff --git a/gentreeg.c b/gentreeg.c
26+
index 946d5f8..15bf87b 100644
27+
--- a/gentreeg.c
28+
+++ b/gentreeg.c
29+
@@ -1,4 +1,4 @@
30+
-/* gentree version 1.3; Brendan McKay Oct 2022 */
31+
+/* gentree version 1.4; Brendan McKay Dec 2022 */
32+
/* This program is a wrapper for the program FreeTrees.c written
33+
* by Gang Li & Frank Ruskey. See below for their original
34+
* comments. */
35+
@@ -32,49 +32,54 @@ Counts for n=1..45:
36+
1: 1
37+
2: 1
38+
3: 1
39+
- 4: 1
40+
- 5: 2
41+
- 6: 3
42+
- 7: 6
43+
- 8: 11
44+
- 9: 23
45+
-10: 47
46+
-11: 106
47+
-12: 235
48+
-13: 551
49+
-14: 1301
50+
-15: 3159
51+
-16: 7741
52+
-17: 19320
53+
-18: 48629
54+
-19: 123867
55+
-20: 317955
56+
-21: 823065
57+
-22: 2144505
58+
-23: 5623756
59+
-24: 14828074
60+
-25: 39299897
61+
-26: 104636890
62+
-27: 279793450
63+
-28: 751065460
64+
-29: 2023443032
65+
-30: 5469566585
66+
-31: 14830871802
67+
-32: 40330829030
68+
-33: 109972410221
69+
-34: 300628862480
70+
-35: 823779631721
71+
-36: 2262366343746
72+
-37: 6226306037178
73+
-38: 17169677490714
74+
-39: 47436313524262
75+
-40: 131290543779126
76+
-41: 363990257783343
77+
-42: 1010748076717151
78+
-43: 2810986483493475
79+
-44: 7828986221515605
80+
-45: 21835027912963086
81+
-********************************/
82+
+ 4: 2
83+
+ 5: 3
84+
+ 6: 6
85+
+ 7: 11
86+
+ 8: 23
87+
+ 9: 47
88+
+10: 106
89+
+11: 235
90+
+12: 551
91+
+13: 1301
92+
+14: 3159
93+
+15: 7741
94+
+16: 19320
95+
+17: 48629
96+
+18: 123867
97+
+19: 317955
98+
+20: 823065
99+
+21: 2144505
100+
+22: 5623756
101+
+23: 14828074
102+
+24: 39299897
103+
+25: 104636890
104+
+26: 279793450
105+
+27: 751065460
106+
+28: 2023443032
107+
+29: 5469566585
108+
+30: 14830871802
109+
+31: 40330829030
110+
+32: 109972410221
111+
+33: 300628862480
112+
+34: 823779631721
113+
+35: 2262366343746
114+
+36: 6226306037178
115+
+37: 17169677490714
116+
+38: 47436313524262
117+
+39: 131290543779126
118+
+40: 363990257783343
119+
+41: 1010748076717151
120+
+42: 2810986483493475
121+
+43: 7828986221515605
122+
+44: 21835027912963086
123+
+45: 60978390985918906
124+
+46: 170508699155987862
125+
+47: 477355090753926460
126+
+48: 1337946100045842285
127+
+49: 3754194185716399992
128+
+50: 10545233702911509534
129+
+*******************************/
130+
131+
/* Comments on original program by original authors */
132+
/*==============================================================*/
133+
@@ -676,7 +681,7 @@ PLUGIN_INIT
134+
}
135+
else if (nv == 2)
136+
{
137+
- if (res == 0 && maxdeg >= 1 && mindiam <= 1 && maxdiam >= 2)
138+
+ if (res == 0 && maxdeg >= 1 && mindiam <= 1 && maxdiam >= 1)
139+
{
140+
par[1] = 0;
141+
par[2] = 1;
142+
--
143+
2.38.2
144+

0 commit comments

Comments
 (0)