Skip to content

Commit cc1d7b2

Browse files
committed
Merge branch 'update-nauty' into 'v9-minor'
update Nauty to 2.8.8 See merge request integer/scip!3418
2 parents 3f3cd02 + 91a3224 commit cc1d7b2

File tree

149 files changed

+115
-198548
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

149 files changed

+115
-198548
lines changed

CHANGELOG

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,11 @@ Build system
6969
Testing
7070
-------
7171

72+
Miscellaneous
73+
-------------
74+
75+
- updated nauty to version 2.8.8
76+
7277
@section RN902 SCIP 9.0.2
7378
*************************
7479

Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,6 @@ LIBOBJSUBDIRS += $(LIBOBJDIR)/nauty
387387
NAUTYOBJ = nauty/nauty.o
388388
NAUTYOBJ += nauty/nautil.o
389389
NAUTYOBJ += nauty/nausparse.o
390-
NAUTYOBJ += nauty/naugraph.o
391390
NAUTYOBJ += nauty/schreier.o
392391
NAUTYOBJ += nauty/naurng.o
393392
SYMOBJFILES += $(addprefix $(LIBOBJDIR)/,$(NAUTYOBJ))
@@ -418,7 +417,6 @@ LIBOBJSUBDIRS += $(LIBOBJDIR)/nauty
418417
NAUTYOBJ = nauty/nauty.o
419418
NAUTYOBJ += nauty/nautil.o
420419
NAUTYOBJ += nauty/nausparse.o
421-
NAUTYOBJ += nauty/naugraph.o
422420
NAUTYOBJ += nauty/schreier.o
423421
NAUTYOBJ += nauty/naurng.o
424422
SYMOBJFILES += $(addprefix $(LIBOBJDIR)/,$(NAUTYOBJ))

src/nauty/CMakeLists.txt

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,11 @@ project(nauty)
55

66
# Add the source files
77
set(SOURCE_FILES
8-
gtools.c
9-
naugroup.c
10-
naurng.c
11-
nausparse.c
128
nauty.c
13-
nautycliquer.c
14-
schreier.c
159
nautil.c
10+
nausparse.c
11+
schreier.c
12+
naurng.c
1613
)
1714

1815
# fPIC

src/nauty/COPYRIGHT

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,12 @@ C. File watercluster2.c and genposetg.c, copyright Gunnar Brinkmann (2009-)
88
D. Files planarity.h and planarity.c, copyright Magma project.
99
E. Files nautycliquer.h and nautycliquer.c, copyright to Sampo
1010
Niskanen and Patric Östergård.
11+
F. Much of file nauchromatic.c, copyright Gordon Royle.
1112

1213
Licensed under the Apache License, Version 2.0 (the "License");
1314
you may not use this software except in compliance with the License.
14-
You may obtain a copy of the License at
15+
A copy of the License is included in the package and can also
16+
be viewed at
1517

1618
https://www.apache.org/licenses/LICENSE-2.0
1719

src/nauty/NRswitchg.c

Lines changed: 0 additions & 198 deletions
This file was deleted.

src/nauty/README

Lines changed: 0 additions & 107 deletions
This file was deleted.

0 commit comments

Comments
 (0)