[nauty] 04/04: Imported Debian patch 2.6r3+ds-1
Jerome Benoit
calculus-guest at moszumanska.debian.org
Sat Mar 19 16:53:42 UTC 2016
This is an automated email from the git hooks/post-receive script.
calculus-guest pushed a commit to branch master
in repository nauty.
commit 68363dae09074a46f382927e87c0cb32352452b5
Author: Jerome BENOIT <calculus at rezozer.net>
Date: Sat Mar 19 17:23:37 2016 +0100
Imported Debian patch 2.6r3+ds-1
---
debian/adhoc/examples/Makefile | 40 ++++
debian/adhoc/examples/build.sh | 78 --------
debian/changelog | 24 ++-
debian/control | 39 +---
debian/copyright | 81 +++-----
debian/libnauty2-dbg.links | 2 -
debian/libnauty2.symbols | 248 +++++++++++++++++++++++++
debian/nauty-doc.doc-base | 4 +-
debian/nauty-doc.docs | 2 +-
debian/nauty-doc.examples | 2 +-
debian/nauty-doc.links | 1 -
debian/patches/debianization-prefix.patch | 238 +++++++++++++++++++-----
debian/patches/debianization.patch | 6 +-
debian/patches/upstream-C2help2man.patch | 223 +++++++++++++++++++---
debian/patches/upstream-autotoolization.patch | 247 +++++++++++++++---------
debian/patches/upstream-fix-gt_numorbits.patch | 6 +-
debian/patches/upstream-zlib-blisstog_c.patch | 123 ++++++------
debian/rules | 9 +-
debian/tests/build-examples | 11 ++
debian/tests/control | 2 +
20 files changed, 990 insertions(+), 396 deletions(-)
diff --git a/debian/adhoc/examples/Makefile b/debian/adhoc/examples/Makefile
new file mode 100644
index 0000000..e94e050
--- /dev/null
+++ b/debian/adhoc/examples/Makefile
@@ -0,0 +1,40 @@
+# /usr/share/doc/nauty-doc/examples/Makefile
+#
+# Ad hoc Makefile for building and playing with the sample sources
+# distributed within the debian package nauty-doc.
+#
+# Recommended usage:
+# create a dedicated folder somewhere in your HOME directory;
+# link all the files in /usr/share/doc/nauty-doc/examples in the dedicated folder;
+# launch this Makefile in the dedicated folder:
+# $ make ;
+# for a basic cleanup, consider the clean target:
+# $ make clean ;
+# for an entire cleanup, the maintainer-clean target:
+# $ make maintainer-clean ;
+# for other targets, just read the Makefile.
+#
+# written for Debian by Jerome Benoit <calculus at rezozer.net>
+# on behalf of the Debian Science Team
+# copyright: 2016 Jerome Benoit <calculus at rezozer.net>
+# distributed under the terms and conditions of Apache 2.0
+#
+
+PROGRAMS = $(patsubst %.c,%,$(wildcard *.c))
+
+default: all
+
+CFLAGS = $(shell pkg-config nauty --cflags)
+LDLIBS = $(shell pkg-config nauty --libs)
+
+all: build
+
+build: $(PROGRAMS)
+
+check: build
+ @true
+
+clean:
+ $(RM) $(PROGRAMS)
+
+maintainer-clean: clean
diff --git a/debian/adhoc/examples/build.sh b/debian/adhoc/examples/build.sh
deleted file mode 100755
index 5473690..0000000
--- a/debian/adhoc/examples/build.sh
+++ /dev/null
@@ -1,78 +0,0 @@
-#! /bin/sh
-# /usr/share/doc/nauty-doc/examples/build.sh
-#
-# ad hoc script for building the example sources distributed
-# within the debian package nauty-doc.
-#
-# Recommended usage:
-# create a dedicated folder somewhere in your HOME directory;
-# link all the files in /usr/share/doc/nauty-doc/examples in the dedicated folder;
-# launch this script in the dedicated folder;
-# to cleanup, if not yet done, create a link clean.sh to this script, and run this link.
-#
-# written for Debian by Jerome Benoit <calculus at rezozer.net>
-# copyright: 2013 Jerome Benoit <calculus at rezozer.net>
-# distributed under the terms and conditions of GPL version 3 or later
-#
-
-CC="gcc $(pkg-config nauty --cflags --libs)"
-
-listof_zsource=$(find . -maxdepth 1 -regextype posix-egrep -regex '.*\.c(\.gz|\.bz2|\.xz)?' -printf '%f\n')
-
-for zsource in $listof_zsource ; do
- executable=${zsource%%.*}
- for extension in gz bz2 xz ; do
- if [ -f ${zsource}.${extension} ]; then
- rm -rf ${zsource}
- fi
- done
- if [ -f ${executable}.o ]; then
- rm -f ${executable}.o
- fi
- if [ -x ${executable} ]; then
- rm -f ${executable}
- fi
-done
-
-if [ "${0##*/}" = "clean.sh" ]; then exit 0 ; fi
-
-listof_zsource=$(find . -maxdepth 1 -regextype posix-egrep -regex '.*\.c(\.gz|\.bz2|\.xz)?' -printf '%f\n' | sort)
-
-for zsource in $listof_zsource ; do
- zextension=${zsource##*.}
- executable=${zsource%%.*}
- printf "%-35s -> %-25s\n" ${zsource} ${executable}
- case ${zextension} in
- gz)
- source=${zsource%.*}
- zcat ${zsource} > ${source}
- ;;
- bz2)
- source=${zsource%.*}
- bzcat ${zsource} > ${source}
- ;;
- xz)
- source=${zsource%.*}
- xzcat ${zsource} > ${source}
- ;;
- *)
- source=${zsource}
- ;;
- esac
- extension=${source#*.}
- case ${extension} in
- c)
- $CC -o ${executable} ${source}
- ;;
- *)
- ;;
- esac
- if [ "${source}" != "${zsource}" ]; then
- rm -f ${source}
- fi
- rm -f ${executable}.o
-done
-
-exit 0
-##
-## eos
diff --git a/debian/changelog b/debian/changelog
index e4e3899..4b928ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,18 +1,32 @@
-nauty (2.6r3+ds-0) UNRELEASED; urgency=medium
+nauty (2.6r3+ds-1) unstable; urgency=medium
- * New upstream version.
+ * New upstream minor version:
+ - new copyright notice, move from an ad-hoc license to Apache-2.0.
* Debianization:
- debian/copyright:
- repack by using the Files-Excluded machinery instead of the ad-hoc
script debian/repack;
- - refresh;
+ - move from non-free to main;
+ - license, fellow the upstream move by adopting Apache-2.0;
+ - debian/control:
+ - Standards Version, bump to 3.9.7;
+ - Vcs-* fileds, secure;
+ - debug symbol package, drop off in favour of automatic generation;
+ - debian/patches/*, refresh;
- debian/repack, discard (see above);
- debian/watch:
- revisit (see above);
- debian/rules:
- - get-orig-source target, revisit (see above).
+ - get-orig-source target, revisit (see above);
+ - debug symbol package, drop off (see above);
+ - refresh;
+ - debian/tests:
+ - initiate;
+ - debian/adhoc/examples:
+ - d/a/e/build.sh, discard;
+ - d/a/e/Makefile, introduce.
- -- Jerome Benoit <calculus at rezozer.net> Fri, 18 Mar 2016 20:45:37 +0000
+ -- Jerome Benoit <calculus at rezozer.net> Sat, 19 Mar 2016 16:22:51 +0000
nauty (2.5r9+ds-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index d923da0..e542554 100644
--- a/debian/control
+++ b/debian/control
@@ -1,20 +1,19 @@
Source: nauty
-Section: non-free/math
+Section: math
Priority: extra
Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Jerome Benoit <calculus at rezozer.net>
Build-Depends:
debhelper (>= 9), autotools-dev, libtool, dh-autoreconf, pkg-config, help2man,
zlib1g-dev, libgmp-dev
-Standards-Version: 3.9.5
+Standards-Version: 3.9.7
Homepage: http://pallini.di.uniroma1.it
-Vcs-Git: git://anonscm.debian.org/debian-science/packages/nauty.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/nauty.git
-XS-Autobuild: yes
+Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/nauty.git
+Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/nauty.git
Package: libnauty2
Provides: libnauty
-Section: non-free/libs
+Section: libs
Architecture: any
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -40,7 +39,7 @@ Description: library for graph automorphisms -- library package
Package: nauty
Architecture: any
Depends: libnauty2 (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Suggests: nauty-doc
+Suggests: graphviz, nauty-doc
Description: library for graph automorphisms -- interface and tools
nauty (No AUTomorphisms, Yes?) is a set of procedures for computing
automorphism groups of graphs and digraphs. This mathematical software
@@ -58,7 +57,7 @@ Description: library for graph automorphisms -- interface and tools
Package: libnauty2-dev
Provides: libnauty-dev
-Section: non-free/libdevel
+Section: libdevel
Architecture: any
Depends: libnauty2 (= ${binary:Version}), ${misc:Depends}
Conflicts: libnauty-dev
@@ -79,30 +78,8 @@ Description: library for graph automorphisms -- development package
This package contains the header files, static libraries and symbolic
links that developers using the nauty API will need.
-Package: libnauty2-dbg
-Provides: libnauty-dbg
-Section: non-free/debug
-Architecture: any
-Depends: libnauty2 (=${binary:Version}), ${misc:Depends}
-Conflicts: libnauty-dbg
-Multi-Arch: same
-Description: library for graph automorphisms -- debug symbols package
- nauty (No AUTomorphisms, Yes?) is a set of procedures for computing
- automorphism groups of graphs and digraphs. This mathematical software
- suite is developed by Brendan McKay and Adolfo Piperno:
- http://pallini.di.uniroma1.it
- .
- nauty computes graph information in the form of a set of generators,
- the size of the group, and the orbits of the group; it can also
- produce a canonical label. The nauty suite is written in C and comes
- with a command-line interface, a collection of command-line tools,
- and an Application Programming Interface (API).
- .
- This package provides debugging symbols for the libraries from
- the libnauty2-dev package.
-
Package: nauty-doc
-Section: non-free/doc
+Section: doc
Architecture: all
Depends: ${misc:Depends}
Suggests: libnauty2 (=${binary:Version}), nauty (=${binary:Version}), libnauty2-dev (=${binary:Version}), pdf-viewer
diff --git a/debian/copyright b/debian/copyright
index b9c69bd..151041c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,15 +1,9 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
Upstream-Name: nauty
Upstream-Contact:
- Brendan McKay <bdm at cs.anu.edu.au>
+ Brendan McKay <brendan.mckay at anu.edu.au>
Adolfo Piperno <piperno at di.uniroma1.it>
-Source: http://pallini.di.uniroma1.it
-Disclaimer:
- This program is not part of Debian, because the license discriminates
- against forbids selling for profit fields of endeavour, which violates
- the Debian Free Software Guidelines part 1 and 6 respectively
- (see www.debian.org/social_contract ). Neither of these conditions
- impedes the autobuilding of the package.
+Source: http://pallini.di.uniroma1.it/
Comment:
The upstream source tarball is repacked to drop off some weight
by cleaning up material either generated or upgraded by autotools.
@@ -25,67 +19,42 @@ Files-Excluded:
Files: *
Copyright:
- 1984-2016 Brendan McKay <bdm at cs.anu.edu.au>
-License: BDM-adhoc
+ 1984-2016 Brendan McKay (Australian National University) <brendan.mckay at anu.edu.au>
+License: Apache-2.0
-Files: traces.c
+Files: traces.h traces.c dretodot.c
Copyright:
- 2008-2016 Adolfo Piperno <piperno at di.uniroma1.it>
-License: BDM-adhoc
+ 2008-2016 Adolfo Piperno (University of Rome "Sapienza") <piperno at di.uniroma1.it>
+License: Apache-2.0
Files: watercluster2.c
Copyright:
- 2009-2016 Gunnar Brinkmann <gunnar.brinkmann at ugent.be>
-License: BDM-adhoc
+ 2009-2016 Gunnar Brinkmann (University of Ghent) <gunnar.brinkmann at ugent.be>
+License: Apache-2.0
-Files: planarity.c
+Files: planarity.h planarity.c
Copyright:
- 2001-2016 Magna project
-License: ad-hoc
- planarity.c - code for planarity testing of undirected graphs.
- Method of Boyer and Myrvold, programmed by Paulette Lieby.
- The copyright of this program is owned by the Magma project.
- Distributed with nauty by permission.
+ 2001-2016 Magna project (University of Sydney) <admin at maths.usyd.edu.au>
+License: Apache-2.0
Files: debian/*
Copyright:
2013-2016 Jerome Benoit <calculus at rezozer.net>
2009-2012 David Bremner <bremner at unb.ca>
-License: MIT
+License: Apache-2.0
-License: BDM-adhoc
- All rights reserved.
+License: Apache-2.0
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
.
- Permission is hereby given for use and/or distribution with the exception
- of sale for profit or application with nontrivial military significance.
- You must not remove this copyright notice, and you must document any
- changes that you make to this program.
- This software is subject to this copyright only, irrespective of any
- copyright attached to any package of which this is a part.
+ http://www.apache.org/licenses/LICENSE-2.0
.
- This program is only provided "as is". No responsibility will be taken
- by the author, his employer or his pet rabbit* for any misfortune which
- befalls you because of its use. I don't think it will delete all your
- files, burn down your computer room or turn your children against you,
- but if it does: stiff cheddar. On the other hand, I very much welcome
- bug reports, or at least I would if there were any bugs.
-
-License: MIT
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
- .
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
.
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ On Debian systems, the complete text of the Apache version 2.0 license
+ can be found in "/usr/share/common-licenses/Apache-2.0".
diff --git a/debian/libnauty2-dbg.links b/debian/libnauty2-dbg.links
deleted file mode 100644
index 7d8a83a..0000000
--- a/debian/libnauty2-dbg.links
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/doc/libnauty2/README usr/share/doc/libnauty2-dbg/README
-usr/share/doc/libnauty2/README_24.gz usr/share/doc/libnauty2-dbg/README_24.gz
diff --git a/debian/libnauty2.symbols b/debian/libnauty2.symbols
index e906387..d243485 100644
--- a/debian/libnauty2.symbols
+++ b/debian/libnauty2.symbols
@@ -7,12 +7,17 @@ libnauty.so.2 libnauty2 #MINVER#
adjacencies_sg at LIBNAUTY_2.5 2.5r6
adjtriang at LIBNAUTY_2.5 2.5r6
allgroup2 at LIBNAUTY_2.5 2.5r6
+ allgroup3 at LIBNAUTY_2.5 2.6r2
allgroup at LIBNAUTY_2.5 2.5r6
alloc_error at LIBNAUTY_2.5 2.5r6
aresame_sg at LIBNAUTY_2.5 2.5r6
+ arg_double at LIBNAUTY_2.5 2.6r2
+ arg_doublerange at LIBNAUTY_2.5 2.6r2
arg_int at LIBNAUTY_2.5 2.5r6
arg_long at LIBNAUTY_2.5 2.5r6
arg_range at LIBNAUTY_2.5 2.5r6
+ arg_sequence at LIBNAUTY_2.5 2.6r2
+ bipartiteside at LIBNAUTY_2.5 2.6r2
breakout at LIBNAUTY_2.5 2.5r6
cellcliq at LIBNAUTY_2.5 2.5r6
cellfano2 at LIBNAUTY_2.5 2.5r6
@@ -24,6 +29,7 @@ libnauty.so.2 libnauty2 #MINVER#
celltrips at LIBNAUTY_2.5 2.5r6
cheapautom at LIBNAUTY_2.5 2.5r6
cheapautom_sg at LIBNAUTY_2.5 2.5r6
+ checkgline at LIBNAUTY_2.5 2.6r2
cliques at LIBNAUTY_2.5 2.5r6
commonnbrs at LIBNAUTY_2.5 2.5r6
comparelab_tr at LIBNAUTY_2.5 2.5r6
@@ -38,6 +44,7 @@ libnauty.so.2 libnauty2 #MINVER#
copycomment at LIBNAUTY_2.5 2.5r6
cyclecount1 at LIBNAUTY_2.5 2.5r6
cyclecount at LIBNAUTY_2.5 2.5r6
+ degstats2 at LIBNAUTY_2.5 2.6r2
degstats at LIBNAUTY_2.5 2.5r6
delete1 at LIBNAUTY_2.5 2.5r6
deleteunmarked at LIBNAUTY_2.5 2.5r6
@@ -49,7 +56,9 @@ libnauty.so.2 libnauty2 #MINVER#
distances_sg at LIBNAUTY_2.5 2.5r6
distvals at LIBNAUTY_2.5 2.5r6
doref at LIBNAUTY_2.5 2.5r6
+ doublevalue at LIBNAUTY_2.5 2.6r2
dumpschreier at LIBNAUTY_2.5 2.5r6
+ encodegraphsize at LIBNAUTY_2.5 2.6r2
expandschreier at LIBNAUTY_2.5 2.5r6
extra_autom at LIBNAUTY_2.5 2.5r6
extra_level at LIBNAUTY_2.5 2.5r6
@@ -65,11 +74,13 @@ libnauty.so.2 libnauty2 #MINVER#
flushline at LIBNAUTY_2.5 2.5r6
fmperm at LIBNAUTY_2.5 2.5r6
fmptn at LIBNAUTY_2.5 2.5r6
+ freegroup at LIBNAUTY_2.5 2.6r2
freepermrec at LIBNAUTY_2.5 2.5r6
freeschreier at LIBNAUTY_2.5 2.5r6
getbigcells at LIBNAUTY_2.5 2.5r6
getecline at LIBNAUTY_2.5 2.5r6
getint at LIBNAUTY_2.5 2.5r6
+ getint_sl at LIBNAUTY_2.5 2.6r2
getorbits at LIBNAUTY_2.5 2.5r6
getorbitsmin at LIBNAUTY_2.5 2.5r6
girth at LIBNAUTY_2.5 2.5r6
@@ -124,12 +135,16 @@ libnauty.so.2 libnauty2 #MINVER#
nauty at LIBNAUTY_2.5 2.5r6
nauty_check at LIBNAUTY_2.5 2.5r6
nauty_freedyn at LIBNAUTY_2.5 2.5r6
+ nauty_kill_request at LIBNAUTY_2.5 2.6r2
nauty_to_sg at LIBNAUTY_2.5 2.5r6
newgroup at LIBNAUTY_2.5 2.5r6
newpermrec at LIBNAUTY_2.5 2.5r6
nextelement at LIBNAUTY_2.5 2.5r6
+ ntod6 at LIBNAUTY_2.5 2.6r2
ntog6 at LIBNAUTY_2.5 2.5r6
+ ntois6 at LIBNAUTY_2.5 2.6r2
ntos6 at LIBNAUTY_2.5 2.5r6
+ numdirtriangles at LIBNAUTY_2.5 2.6r2
numtriangles1 at LIBNAUTY_2.5 2.5r6
numtriangles at LIBNAUTY_2.5 2.5r6
ogf_linelen at LIBNAUTY_2.5 2.5r6
@@ -144,6 +159,8 @@ libnauty.so.2 libnauty2 #MINVER#
putcanon_sg at LIBNAUTY_2.5 2.5r6
putdegs at LIBNAUTY_2.5 2.5r6
putdegs_sg at LIBNAUTY_2.5 2.5r6
+ putdegseq at LIBNAUTY_2.5 2.6r2
+ putdegseq_sg at LIBNAUTY_2.5 2.6r2
putgraph at LIBNAUTY_2.5 2.5r6
putgraph_sg at LIBNAUTY_2.5 2.5r6
putmapping at LIBNAUTY_2.5 2.5r6
@@ -165,12 +182,18 @@ libnauty.so.2 libnauty2 #MINVER#
ranreg_sg at LIBNAUTY_2.5 2.5r6
read_sg at LIBNAUTY_2.5 2.5r6
read_sg_loops at LIBNAUTY_2.5 2.5r6
+ read_sgg_loops at LIBNAUTY_2.5 2.6r2
readg at LIBNAUTY_2.5 2.5r6
readg_code at LIBNAUTY_2.5 2.5r6
+ readg_inc at LIBNAUTY_2.5 2.6r2
readg_line at LIBNAUTY_2.5 2.5r6
+ readgg at LIBNAUTY_2.5 2.6r2
+ readgg_inc at LIBNAUTY_2.5 2.6r2
readgraph at LIBNAUTY_2.5 2.5r6
readgraph_sg at LIBNAUTY_2.5 2.5r6
+ readgraph_swg at LIBNAUTY_2.5 2.6r2
readinteger at LIBNAUTY_2.5 2.5r6
+ readinteger_sl at LIBNAUTY_2.5 2.6r2
readpc_sg at LIBNAUTY_2.5 2.5r6
readpcle_sg at LIBNAUTY_2.5 2.5r6
readperm at LIBNAUTY_2.5 2.5r6
@@ -190,9 +213,11 @@ libnauty.so.2 libnauty2 #MINVER#
schreier_gens at LIBNAUTY_2.5 2.5r6
sethash at LIBNAUTY_2.5 2.5r6
setinter at LIBNAUTY_2.5 2.5r6
+ setlabptn at LIBNAUTY_2.5 2.6r2
setnbhd at LIBNAUTY_2.5 2.5r6
setsize at LIBNAUTY_2.5 2.5r6
sg_to_nauty at LIBNAUTY_2.5 2.5r6
+ sgtod6 at LIBNAUTY_2.5 2.6r2
sgtog6 at LIBNAUTY_2.5 2.5r6
sgtos6 at LIBNAUTY_2.5 2.5r6
shortprune at LIBNAUTY_2.5 2.5r6
@@ -202,9 +227,12 @@ libnauty.so.2 libnauty2 #MINVER#
stringcopy at LIBNAUTY_2.5 2.5r6
stringcounts at LIBNAUTY_2.5 2.5r6
stringtograph at LIBNAUTY_2.5 2.5r6
+ stringtograph_inc at LIBNAUTY_2.5 2.6r2
stringtosparsegraph at LIBNAUTY_2.5 2.5r6
+ stronglyconnected at LIBNAUTY_2.5 2.6r2
sublabel at LIBNAUTY_2.5 2.5r6
sublabel_sg at LIBNAUTY_2.5 2.5r6
+ subpartition at LIBNAUTY_2.5 2.6r2
targetcell at LIBNAUTY_2.5 2.5r6
targetcell_sg at LIBNAUTY_2.5 2.5r6
testcanlab at LIBNAUTY_2.5 2.5r6
@@ -219,9 +247,12 @@ libnauty.so.2 libnauty2 #MINVER#
updatecan at LIBNAUTY_2.5 2.5r6
updatecan_sg at LIBNAUTY_2.5 2.5r6
updatecan_tr at LIBNAUTY_2.5 2.5r6
+ writed6 at LIBNAUTY_2.5 2.6r2
+ writed6_sg at LIBNAUTY_2.5 2.6r2
writeg6 at LIBNAUTY_2.5 2.5r6
writeg6_sg at LIBNAUTY_2.5 2.5r6
writegroupsize at LIBNAUTY_2.5 2.5r6
+ writeis6 at LIBNAUTY_2.5 2.6r2
writelast at LIBNAUTY_2.5 2.5r6
writeline at LIBNAUTY_2.5 2.5r6
writepc_sg at LIBNAUTY_2.5 2.5r6
@@ -238,12 +269,17 @@ libnautyA1.so.2 libnauty2 #MINVER#
adjacencies_sg at LIBNAUTYA1_2.5 2.5r6
adjtriang at LIBNAUTYA1_2.5 2.5r6
allgroup2 at LIBNAUTYA1_2.5 2.5r6
+ allgroup3 at LIBNAUTYA1_2.5 2.6r2
allgroup at LIBNAUTYA1_2.5 2.5r6
alloc_error at LIBNAUTYA1_2.5 2.5r6
aresame_sg at LIBNAUTYA1_2.5 2.5r6
+ arg_double at LIBNAUTYA1_2.5 2.6r2
+ arg_doublerange at LIBNAUTYA1_2.5 2.6r2
arg_int at LIBNAUTYA1_2.5 2.5r6
arg_long at LIBNAUTYA1_2.5 2.5r6
arg_range at LIBNAUTYA1_2.5 2.5r6
+ arg_sequence at LIBNAUTYA1_2.5 2.6r2
+ bipartiteside at LIBNAUTYA1_2.5 2.6r2
breakout at LIBNAUTYA1_2.5 2.5r6
cellcliq at LIBNAUTYA1_2.5 2.5r6
cellfano2 at LIBNAUTYA1_2.5 2.5r6
@@ -255,6 +291,7 @@ libnautyA1.so.2 libnauty2 #MINVER#
celltrips at LIBNAUTYA1_2.5 2.5r6
cheapautom at LIBNAUTYA1_2.5 2.5r6
cheapautom_sg at LIBNAUTYA1_2.5 2.5r6
+ checkgline at LIBNAUTYA1_2.5 2.6r2
cliques at LIBNAUTYA1_2.5 2.5r6
commonnbrs at LIBNAUTYA1_2.5 2.5r6
comparelab_tr at LIBNAUTYA1_2.5 2.5r6
@@ -269,6 +306,7 @@ libnautyA1.so.2 libnauty2 #MINVER#
copycomment at LIBNAUTYA1_2.5 2.5r6
cyclecount1 at LIBNAUTYA1_2.5 2.5r6
cyclecount at LIBNAUTYA1_2.5 2.5r6
+ degstats2 at LIBNAUTYA1_2.5 2.6r2
degstats at LIBNAUTYA1_2.5 2.5r6
delete1 at LIBNAUTYA1_2.5 2.5r6
deleteunmarked at LIBNAUTYA1_2.5 2.5r6
@@ -280,7 +318,9 @@ libnautyA1.so.2 libnauty2 #MINVER#
distances_sg at LIBNAUTYA1_2.5 2.5r6
distvals at LIBNAUTYA1_2.5 2.5r6
doref at LIBNAUTYA1_2.5 2.5r6
+ doublevalue at LIBNAUTYA1_2.5 2.6r2
dumpschreier at LIBNAUTYA1_2.5 2.5r6
+ encodegraphsize at LIBNAUTYA1_2.5 2.6r2
expandschreier at LIBNAUTYA1_2.5 2.5r6
extra_autom at LIBNAUTYA1_2.5 2.5r6
extra_level at LIBNAUTYA1_2.5 2.5r6
@@ -296,11 +336,13 @@ libnautyA1.so.2 libnauty2 #MINVER#
flushline at LIBNAUTYA1_2.5 2.5r6
fmperm at LIBNAUTYA1_2.5 2.5r6
fmptn at LIBNAUTYA1_2.5 2.5r6
+ freegroup at LIBNAUTYA1_2.5 2.6r2
freepermrec at LIBNAUTYA1_2.5 2.5r6
freeschreier at LIBNAUTYA1_2.5 2.5r6
getbigcells at LIBNAUTYA1_2.5 2.5r6
getecline at LIBNAUTYA1_2.5 2.5r6
getint at LIBNAUTYA1_2.5 2.5r6
+ getint_sl at LIBNAUTYA1_2.5 2.6r2
getorbits at LIBNAUTYA1_2.5 2.5r6
getorbitsmin at LIBNAUTYA1_2.5 2.5r6
girth at LIBNAUTYA1_2.5 2.5r6
@@ -355,12 +397,16 @@ libnautyA1.so.2 libnauty2 #MINVER#
nauty at LIBNAUTYA1_2.5 2.5r6
nauty_check at LIBNAUTYA1_2.5 2.5r6
nauty_freedyn at LIBNAUTYA1_2.5 2.5r6
+ nauty_kill_request at LIBNAUTYA1_2.5 2.6r2
nauty_to_sg at LIBNAUTYA1_2.5 2.5r6
newgroup at LIBNAUTYA1_2.5 2.5r6
newpermrec at LIBNAUTYA1_2.5 2.5r6
nextelement at LIBNAUTYA1_2.5 2.5r6
+ ntod6 at LIBNAUTYA1_2.5 2.6r2
ntog6 at LIBNAUTYA1_2.5 2.5r6
+ ntois6 at LIBNAUTYA1_2.5 2.6r2
ntos6 at LIBNAUTYA1_2.5 2.5r6
+ numdirtriangles at LIBNAUTYA1_2.5 2.6r2
numtriangles1 at LIBNAUTYA1_2.5 2.5r6
numtriangles at LIBNAUTYA1_2.5 2.5r6
ogf_linelen at LIBNAUTYA1_2.5 2.5r6
@@ -375,6 +421,8 @@ libnautyA1.so.2 libnauty2 #MINVER#
putcanon_sg at LIBNAUTYA1_2.5 2.5r6
putdegs at LIBNAUTYA1_2.5 2.5r6
putdegs_sg at LIBNAUTYA1_2.5 2.5r6
+ putdegseq at LIBNAUTYA1_2.5 2.6r2
+ putdegseq_sg at LIBNAUTYA1_2.5 2.6r2
putgraph at LIBNAUTYA1_2.5 2.5r6
putgraph_sg at LIBNAUTYA1_2.5 2.5r6
putmapping at LIBNAUTYA1_2.5 2.5r6
@@ -396,12 +444,18 @@ libnautyA1.so.2 libnauty2 #MINVER#
ranreg_sg at LIBNAUTYA1_2.5 2.5r6
read_sg at LIBNAUTYA1_2.5 2.5r6
read_sg_loops at LIBNAUTYA1_2.5 2.5r6
+ read_sgg_loops at LIBNAUTYA1_2.5 2.6r2
readg at LIBNAUTYA1_2.5 2.5r6
readg_code at LIBNAUTYA1_2.5 2.5r6
+ readg_inc at LIBNAUTYA1_2.5 2.6r2
readg_line at LIBNAUTYA1_2.5 2.5r6
+ readgg at LIBNAUTYA1_2.5 2.6r2
+ readgg_inc at LIBNAUTYA1_2.5 2.6r2
readgraph at LIBNAUTYA1_2.5 2.5r6
readgraph_sg at LIBNAUTYA1_2.5 2.5r6
+ readgraph_swg at LIBNAUTYA1_2.5 2.6r2
readinteger at LIBNAUTYA1_2.5 2.5r6
+ readinteger_sl at LIBNAUTYA1_2.5 2.6r2
readpc_sg at LIBNAUTYA1_2.5 2.5r6
readpcle_sg at LIBNAUTYA1_2.5 2.5r6
readperm at LIBNAUTYA1_2.5 2.5r6
@@ -421,9 +475,11 @@ libnautyA1.so.2 libnauty2 #MINVER#
schreier_gens at LIBNAUTYA1_2.5 2.5r6
sethash at LIBNAUTYA1_2.5 2.5r6
setinter at LIBNAUTYA1_2.5 2.5r6
+ setlabptn at LIBNAUTYA1_2.5 2.6r2
setnbhd at LIBNAUTYA1_2.5 2.5r6
setsize at LIBNAUTYA1_2.5 2.5r6
sg_to_nauty at LIBNAUTYA1_2.5 2.5r6
+ sgtod6 at LIBNAUTYA1_2.5 2.6r2
sgtog6 at LIBNAUTYA1_2.5 2.5r6
sgtos6 at LIBNAUTYA1_2.5 2.5r6
shortprune at LIBNAUTYA1_2.5 2.5r6
@@ -433,9 +489,12 @@ libnautyA1.so.2 libnauty2 #MINVER#
stringcopy at LIBNAUTYA1_2.5 2.5r6
stringcounts at LIBNAUTYA1_2.5 2.5r6
stringtograph at LIBNAUTYA1_2.5 2.5r6
+ stringtograph_inc at LIBNAUTYA1_2.5 2.6r2
stringtosparsegraph at LIBNAUTYA1_2.5 2.5r6
+ stronglyconnected at LIBNAUTYA1_2.5 2.6r2
sublabel at LIBNAUTYA1_2.5 2.5r6
sublabel_sg at LIBNAUTYA1_2.5 2.5r6
+ subpartition at LIBNAUTYA1_2.5 2.6r2
targetcell at LIBNAUTYA1_2.5 2.5r6
targetcell_sg at LIBNAUTYA1_2.5 2.5r6
testcanlab at LIBNAUTYA1_2.5 2.5r6
@@ -450,9 +509,12 @@ libnautyA1.so.2 libnauty2 #MINVER#
updatecan at LIBNAUTYA1_2.5 2.5r6
updatecan_sg at LIBNAUTYA1_2.5 2.5r6
updatecan_tr at LIBNAUTYA1_2.5 2.5r6
+ writed6 at LIBNAUTYA1_2.5 2.6r2
+ writed6_sg at LIBNAUTYA1_2.5 2.6r2
writeg6 at LIBNAUTYA1_2.5 2.5r6
writeg6_sg at LIBNAUTYA1_2.5 2.5r6
writegroupsize at LIBNAUTYA1_2.5 2.5r6
+ writeis6 at LIBNAUTYA1_2.5 2.6r2
writelast at LIBNAUTYA1_2.5 2.5r6
writeline at LIBNAUTYA1_2.5 2.5r6
writepc_sg at LIBNAUTYA1_2.5 2.5r6
@@ -469,12 +531,17 @@ libnautyL0.so.2 libnauty2 #MINVER#
adjacencies_sg at LIBNAUTYL0_2.5 2.5r6
adjtriang at LIBNAUTYL0_2.5 2.5r6
allgroup2 at LIBNAUTYL0_2.5 2.5r6
+ allgroup3 at LIBNAUTYL0_2.5 2.6r2
allgroup at LIBNAUTYL0_2.5 2.5r6
alloc_error at LIBNAUTYL0_2.5 2.5r6
aresame_sg at LIBNAUTYL0_2.5 2.5r6
+ arg_double at LIBNAUTYL0_2.5 2.6r2
+ arg_doublerange at LIBNAUTYL0_2.5 2.6r2
arg_int at LIBNAUTYL0_2.5 2.5r6
arg_long at LIBNAUTYL0_2.5 2.5r6
arg_range at LIBNAUTYL0_2.5 2.5r6
+ arg_sequence at LIBNAUTYL0_2.5 2.6r2
+ bipartiteside at LIBNAUTYL0_2.5 2.6r2
breakout at LIBNAUTYL0_2.5 2.5r6
cellcliq at LIBNAUTYL0_2.5 2.5r6
cellfano2 at LIBNAUTYL0_2.5 2.5r6
@@ -486,6 +553,7 @@ libnautyL0.so.2 libnauty2 #MINVER#
celltrips at LIBNAUTYL0_2.5 2.5r6
cheapautom at LIBNAUTYL0_2.5 2.5r6
cheapautom_sg at LIBNAUTYL0_2.5 2.5r6
+ checkgline at LIBNAUTYL0_2.5 2.6r2
cliques at LIBNAUTYL0_2.5 2.5r6
commonnbrs at LIBNAUTYL0_2.5 2.5r6
comparelab_tr at LIBNAUTYL0_2.5 2.5r6
@@ -500,6 +568,7 @@ libnautyL0.so.2 libnauty2 #MINVER#
copycomment at LIBNAUTYL0_2.5 2.5r6
cyclecount1 at LIBNAUTYL0_2.5 2.5r6
cyclecount at LIBNAUTYL0_2.5 2.5r6
+ degstats2 at LIBNAUTYL0_2.5 2.6r2
degstats at LIBNAUTYL0_2.5 2.5r6
delete1 at LIBNAUTYL0_2.5 2.5r6
deleteunmarked at LIBNAUTYL0_2.5 2.5r6
@@ -511,7 +580,9 @@ libnautyL0.so.2 libnauty2 #MINVER#
distances_sg at LIBNAUTYL0_2.5 2.5r6
distvals at LIBNAUTYL0_2.5 2.5r6
doref at LIBNAUTYL0_2.5 2.5r6
+ doublevalue at LIBNAUTYL0_2.5 2.6r2
dumpschreier at LIBNAUTYL0_2.5 2.5r6
+ encodegraphsize at LIBNAUTYL0_2.5 2.6r2
expandschreier at LIBNAUTYL0_2.5 2.5r6
extra_autom at LIBNAUTYL0_2.5 2.5r6
extra_level at LIBNAUTYL0_2.5 2.5r6
@@ -527,11 +598,13 @@ libnautyL0.so.2 libnauty2 #MINVER#
flushline at LIBNAUTYL0_2.5 2.5r6
fmperm at LIBNAUTYL0_2.5 2.5r6
fmptn at LIBNAUTYL0_2.5 2.5r6
+ freegroup at LIBNAUTYL0_2.5 2.6r2
freepermrec at LIBNAUTYL0_2.5 2.5r6
freeschreier at LIBNAUTYL0_2.5 2.5r6
getbigcells at LIBNAUTYL0_2.5 2.5r6
getecline at LIBNAUTYL0_2.5 2.5r6
getint at LIBNAUTYL0_2.5 2.5r6
+ getint_sl at LIBNAUTYL0_2.5 2.6r2
getorbits at LIBNAUTYL0_2.5 2.5r6
getorbitsmin at LIBNAUTYL0_2.5 2.5r6
girth at LIBNAUTYL0_2.5 2.5r6
@@ -586,12 +659,16 @@ libnautyL0.so.2 libnauty2 #MINVER#
nauty at LIBNAUTYL0_2.5 2.5r6
nauty_check at LIBNAUTYL0_2.5 2.5r6
nauty_freedyn at LIBNAUTYL0_2.5 2.5r6
+ nauty_kill_request at LIBNAUTYL0_2.5 2.6r2
nauty_to_sg at LIBNAUTYL0_2.5 2.5r6
newgroup at LIBNAUTYL0_2.5 2.5r6
newpermrec at LIBNAUTYL0_2.5 2.5r6
nextelement at LIBNAUTYL0_2.5 2.5r6
+ ntod6 at LIBNAUTYL0_2.5 2.6r2
ntog6 at LIBNAUTYL0_2.5 2.5r6
+ ntois6 at LIBNAUTYL0_2.5 2.6r2
ntos6 at LIBNAUTYL0_2.5 2.5r6
+ numdirtriangles at LIBNAUTYL0_2.5 2.6r2
numtriangles1 at LIBNAUTYL0_2.5 2.5r6
numtriangles at LIBNAUTYL0_2.5 2.5r6
ogf_linelen at LIBNAUTYL0_2.5 2.5r6
@@ -606,6 +683,8 @@ libnautyL0.so.2 libnauty2 #MINVER#
putcanon_sg at LIBNAUTYL0_2.5 2.5r6
putdegs at LIBNAUTYL0_2.5 2.5r6
putdegs_sg at LIBNAUTYL0_2.5 2.5r6
+ putdegseq at LIBNAUTYL0_2.5 2.6r2
+ putdegseq_sg at LIBNAUTYL0_2.5 2.6r2
putgraph at LIBNAUTYL0_2.5 2.5r6
putgraph_sg at LIBNAUTYL0_2.5 2.5r6
putmapping at LIBNAUTYL0_2.5 2.5r6
@@ -627,12 +706,18 @@ libnautyL0.so.2 libnauty2 #MINVER#
ranreg_sg at LIBNAUTYL0_2.5 2.5r6
read_sg at LIBNAUTYL0_2.5 2.5r6
read_sg_loops at LIBNAUTYL0_2.5 2.5r6
+ read_sgg_loops at LIBNAUTYL0_2.5 2.6r2
readg at LIBNAUTYL0_2.5 2.5r6
readg_code at LIBNAUTYL0_2.5 2.5r6
+ readg_inc at LIBNAUTYL0_2.5 2.6r2
readg_line at LIBNAUTYL0_2.5 2.5r6
+ readgg at LIBNAUTYL0_2.5 2.6r2
+ readgg_inc at LIBNAUTYL0_2.5 2.6r2
readgraph at LIBNAUTYL0_2.5 2.5r6
readgraph_sg at LIBNAUTYL0_2.5 2.5r6
+ readgraph_swg at LIBNAUTYL0_2.5 2.6r2
readinteger at LIBNAUTYL0_2.5 2.5r6
+ readinteger_sl at LIBNAUTYL0_2.5 2.6r2
readpc_sg at LIBNAUTYL0_2.5 2.5r6
readpcle_sg at LIBNAUTYL0_2.5 2.5r6
readperm at LIBNAUTYL0_2.5 2.5r6
@@ -652,9 +737,11 @@ libnautyL0.so.2 libnauty2 #MINVER#
schreier_gens at LIBNAUTYL0_2.5 2.5r6
sethash at LIBNAUTYL0_2.5 2.5r6
setinter at LIBNAUTYL0_2.5 2.5r6
+ setlabptn at LIBNAUTYL0_2.5 2.6r2
setnbhd at LIBNAUTYL0_2.5 2.5r6
setsize at LIBNAUTYL0_2.5 2.5r6
sg_to_nauty at LIBNAUTYL0_2.5 2.5r6
+ sgtod6 at LIBNAUTYL0_2.5 2.6r2
sgtog6 at LIBNAUTYL0_2.5 2.5r6
sgtos6 at LIBNAUTYL0_2.5 2.5r6
shortprune at LIBNAUTYL0_2.5 2.5r6
@@ -664,9 +751,12 @@ libnautyL0.so.2 libnauty2 #MINVER#
stringcopy at LIBNAUTYL0_2.5 2.5r6
stringcounts at LIBNAUTYL0_2.5 2.5r6
stringtograph at LIBNAUTYL0_2.5 2.5r6
+ stringtograph_inc at LIBNAUTYL0_2.5 2.6r2
stringtosparsegraph at LIBNAUTYL0_2.5 2.5r6
+ stronglyconnected at LIBNAUTYL0_2.5 2.6r2
sublabel at LIBNAUTYL0_2.5 2.5r6
sublabel_sg at LIBNAUTYL0_2.5 2.5r6
+ subpartition at LIBNAUTYL0_2.5 2.6r2
targetcell at LIBNAUTYL0_2.5 2.5r6
targetcell_sg at LIBNAUTYL0_2.5 2.5r6
testcanlab at LIBNAUTYL0_2.5 2.5r6
@@ -681,9 +771,12 @@ libnautyL0.so.2 libnauty2 #MINVER#
updatecan at LIBNAUTYL0_2.5 2.5r6
updatecan_sg at LIBNAUTYL0_2.5 2.5r6
updatecan_tr at LIBNAUTYL0_2.5 2.5r6
+ writed6 at LIBNAUTYL0_2.5 2.6r2
+ writed6_sg at LIBNAUTYL0_2.5 2.6r2
writeg6 at LIBNAUTYL0_2.5 2.5r6
writeg6_sg at LIBNAUTYL0_2.5 2.5r6
writegroupsize at LIBNAUTYL0_2.5 2.5r6
+ writeis6 at LIBNAUTYL0_2.5 2.6r2
writelast at LIBNAUTYL0_2.5 2.5r6
writeline at LIBNAUTYL0_2.5 2.5r6
writepc_sg at LIBNAUTYL0_2.5 2.5r6
@@ -700,12 +793,17 @@ libnautyL1.so.2 libnauty2 #MINVER#
adjacencies_sg at LIBNAUTYL1_2.5 2.5r6
adjtriang at LIBNAUTYL1_2.5 2.5r6
allgroup2 at LIBNAUTYL1_2.5 2.5r6
+ allgroup3 at LIBNAUTYL1_2.5 2.6r2
allgroup at LIBNAUTYL1_2.5 2.5r6
alloc_error at LIBNAUTYL1_2.5 2.5r6
aresame_sg at LIBNAUTYL1_2.5 2.5r6
+ arg_double at LIBNAUTYL1_2.5 2.6r2
+ arg_doublerange at LIBNAUTYL1_2.5 2.6r2
arg_int at LIBNAUTYL1_2.5 2.5r6
arg_long at LIBNAUTYL1_2.5 2.5r6
arg_range at LIBNAUTYL1_2.5 2.5r6
+ arg_sequence at LIBNAUTYL1_2.5 2.6r2
+ bipartiteside at LIBNAUTYL1_2.5 2.6r2
breakout at LIBNAUTYL1_2.5 2.5r6
cellcliq at LIBNAUTYL1_2.5 2.5r6
cellfano2 at LIBNAUTYL1_2.5 2.5r6
@@ -717,6 +815,7 @@ libnautyL1.so.2 libnauty2 #MINVER#
celltrips at LIBNAUTYL1_2.5 2.5r6
cheapautom at LIBNAUTYL1_2.5 2.5r6
cheapautom_sg at LIBNAUTYL1_2.5 2.5r6
+ checkgline at LIBNAUTYL1_2.5 2.6r2
cliques at LIBNAUTYL1_2.5 2.5r6
commonnbrs at LIBNAUTYL1_2.5 2.5r6
comparelab_tr at LIBNAUTYL1_2.5 2.5r6
@@ -731,6 +830,7 @@ libnautyL1.so.2 libnauty2 #MINVER#
copycomment at LIBNAUTYL1_2.5 2.5r6
cyclecount1 at LIBNAUTYL1_2.5 2.5r6
cyclecount at LIBNAUTYL1_2.5 2.5r6
+ degstats2 at LIBNAUTYL1_2.5 2.6r2
degstats at LIBNAUTYL1_2.5 2.5r6
delete1 at LIBNAUTYL1_2.5 2.5r6
deleteunmarked at LIBNAUTYL1_2.5 2.5r6
@@ -742,7 +842,9 @@ libnautyL1.so.2 libnauty2 #MINVER#
distances_sg at LIBNAUTYL1_2.5 2.5r6
distvals at LIBNAUTYL1_2.5 2.5r6
doref at LIBNAUTYL1_2.5 2.5r6
+ doublevalue at LIBNAUTYL1_2.5 2.6r2
dumpschreier at LIBNAUTYL1_2.5 2.5r6
+ encodegraphsize at LIBNAUTYL1_2.5 2.6r2
expandschreier at LIBNAUTYL1_2.5 2.5r6
extra_autom at LIBNAUTYL1_2.5 2.5r6
extra_level at LIBNAUTYL1_2.5 2.5r6
@@ -758,11 +860,13 @@ libnautyL1.so.2 libnauty2 #MINVER#
flushline at LIBNAUTYL1_2.5 2.5r6
fmperm at LIBNAUTYL1_2.5 2.5r6
fmptn at LIBNAUTYL1_2.5 2.5r6
+ freegroup at LIBNAUTYL1_2.5 2.6r2
freepermrec at LIBNAUTYL1_2.5 2.5r6
freeschreier at LIBNAUTYL1_2.5 2.5r6
getbigcells at LIBNAUTYL1_2.5 2.5r6
getecline at LIBNAUTYL1_2.5 2.5r6
getint at LIBNAUTYL1_2.5 2.5r6
+ getint_sl at LIBNAUTYL1_2.5 2.6r2
getorbits at LIBNAUTYL1_2.5 2.5r6
getorbitsmin at LIBNAUTYL1_2.5 2.5r6
girth at LIBNAUTYL1_2.5 2.5r6
@@ -817,12 +921,16 @@ libnautyL1.so.2 libnauty2 #MINVER#
nauty at LIBNAUTYL1_2.5 2.5r6
nauty_check at LIBNAUTYL1_2.5 2.5r6
nauty_freedyn at LIBNAUTYL1_2.5 2.5r6
+ nauty_kill_request at LIBNAUTYL1_2.5 2.6r2
nauty_to_sg at LIBNAUTYL1_2.5 2.5r6
newgroup at LIBNAUTYL1_2.5 2.5r6
newpermrec at LIBNAUTYL1_2.5 2.5r6
nextelement at LIBNAUTYL1_2.5 2.5r6
+ ntod6 at LIBNAUTYL1_2.5 2.6r2
ntog6 at LIBNAUTYL1_2.5 2.5r6
+ ntois6 at LIBNAUTYL1_2.5 2.6r2
ntos6 at LIBNAUTYL1_2.5 2.5r6
+ numdirtriangles at LIBNAUTYL1_2.5 2.6r2
numtriangles1 at LIBNAUTYL1_2.5 2.5r6
numtriangles at LIBNAUTYL1_2.5 2.5r6
ogf_linelen at LIBNAUTYL1_2.5 2.5r6
@@ -837,6 +945,8 @@ libnautyL1.so.2 libnauty2 #MINVER#
putcanon_sg at LIBNAUTYL1_2.5 2.5r6
putdegs at LIBNAUTYL1_2.5 2.5r6
putdegs_sg at LIBNAUTYL1_2.5 2.5r6
+ putdegseq at LIBNAUTYL1_2.5 2.6r2
+ putdegseq_sg at LIBNAUTYL1_2.5 2.6r2
putgraph at LIBNAUTYL1_2.5 2.5r6
putgraph_sg at LIBNAUTYL1_2.5 2.5r6
putmapping at LIBNAUTYL1_2.5 2.5r6
@@ -858,12 +968,18 @@ libnautyL1.so.2 libnauty2 #MINVER#
ranreg_sg at LIBNAUTYL1_2.5 2.5r6
read_sg at LIBNAUTYL1_2.5 2.5r6
read_sg_loops at LIBNAUTYL1_2.5 2.5r6
+ read_sgg_loops at LIBNAUTYL1_2.5 2.6r2
readg at LIBNAUTYL1_2.5 2.5r6
readg_code at LIBNAUTYL1_2.5 2.5r6
+ readg_inc at LIBNAUTYL1_2.5 2.6r2
readg_line at LIBNAUTYL1_2.5 2.5r6
+ readgg at LIBNAUTYL1_2.5 2.6r2
+ readgg_inc at LIBNAUTYL1_2.5 2.6r2
readgraph at LIBNAUTYL1_2.5 2.5r6
readgraph_sg at LIBNAUTYL1_2.5 2.5r6
+ readgraph_swg at LIBNAUTYL1_2.5 2.6r2
readinteger at LIBNAUTYL1_2.5 2.5r6
+ readinteger_sl at LIBNAUTYL1_2.5 2.6r2
readpc_sg at LIBNAUTYL1_2.5 2.5r6
readpcle_sg at LIBNAUTYL1_2.5 2.5r6
readperm at LIBNAUTYL1_2.5 2.5r6
@@ -883,9 +999,11 @@ libnautyL1.so.2 libnauty2 #MINVER#
schreier_gens at LIBNAUTYL1_2.5 2.5r6
sethash at LIBNAUTYL1_2.5 2.5r6
setinter at LIBNAUTYL1_2.5 2.5r6
+ setlabptn at LIBNAUTYL1_2.5 2.6r2
setnbhd at LIBNAUTYL1_2.5 2.5r6
setsize at LIBNAUTYL1_2.5 2.5r6
sg_to_nauty at LIBNAUTYL1_2.5 2.5r6
+ sgtod6 at LIBNAUTYL1_2.5 2.6r2
sgtog6 at LIBNAUTYL1_2.5 2.5r6
sgtos6 at LIBNAUTYL1_2.5 2.5r6
shortprune at LIBNAUTYL1_2.5 2.5r6
@@ -895,9 +1013,12 @@ libnautyL1.so.2 libnauty2 #MINVER#
stringcopy at LIBNAUTYL1_2.5 2.5r6
stringcounts at LIBNAUTYL1_2.5 2.5r6
stringtograph at LIBNAUTYL1_2.5 2.5r6
+ stringtograph_inc at LIBNAUTYL1_2.5 2.6r2
stringtosparsegraph at LIBNAUTYL1_2.5 2.5r6
+ stronglyconnected at LIBNAUTYL1_2.5 2.6r2
sublabel at LIBNAUTYL1_2.5 2.5r6
sublabel_sg at LIBNAUTYL1_2.5 2.5r6
+ subpartition at LIBNAUTYL1_2.5 2.6r2
targetcell at LIBNAUTYL1_2.5 2.5r6
targetcell_sg at LIBNAUTYL1_2.5 2.5r6
testcanlab at LIBNAUTYL1_2.5 2.5r6
@@ -912,9 +1033,12 @@ libnautyL1.so.2 libnauty2 #MINVER#
updatecan at LIBNAUTYL1_2.5 2.5r6
updatecan_sg at LIBNAUTYL1_2.5 2.5r6
updatecan_tr at LIBNAUTYL1_2.5 2.5r6
+ writed6 at LIBNAUTYL1_2.5 2.6r2
+ writed6_sg at LIBNAUTYL1_2.5 2.6r2
writeg6 at LIBNAUTYL1_2.5 2.5r6
writeg6_sg at LIBNAUTYL1_2.5 2.5r6
writegroupsize at LIBNAUTYL1_2.5 2.5r6
+ writeis6 at LIBNAUTYL1_2.5 2.6r2
writelast at LIBNAUTYL1_2.5 2.5r6
writeline at LIBNAUTYL1_2.5 2.5r6
writepc_sg at LIBNAUTYL1_2.5 2.5r6
@@ -931,12 +1055,17 @@ libnautyS0.so.2 libnauty2 #MINVER#
adjacencies_sg at LIBNAUTYS0_2.5 2.5r6
adjtriang at LIBNAUTYS0_2.5 2.5r6
allgroup2 at LIBNAUTYS0_2.5 2.5r6
+ allgroup3 at LIBNAUTYS0_2.5 2.6r2
allgroup at LIBNAUTYS0_2.5 2.5r6
alloc_error at LIBNAUTYS0_2.5 2.5r6
aresame_sg at LIBNAUTYS0_2.5 2.5r6
+ arg_double at LIBNAUTYS0_2.5 2.6r2
+ arg_doublerange at LIBNAUTYS0_2.5 2.6r2
arg_int at LIBNAUTYS0_2.5 2.5r6
arg_long at LIBNAUTYS0_2.5 2.5r6
arg_range at LIBNAUTYS0_2.5 2.5r6
+ arg_sequence at LIBNAUTYS0_2.5 2.6r2
+ bipartiteside at LIBNAUTYS0_2.5 2.6r2
breakout at LIBNAUTYS0_2.5 2.5r6
cellcliq at LIBNAUTYS0_2.5 2.5r6
cellfano2 at LIBNAUTYS0_2.5 2.5r6
@@ -948,6 +1077,7 @@ libnautyS0.so.2 libnauty2 #MINVER#
celltrips at LIBNAUTYS0_2.5 2.5r6
cheapautom at LIBNAUTYS0_2.5 2.5r6
cheapautom_sg at LIBNAUTYS0_2.5 2.5r6
+ checkgline at LIBNAUTYS0_2.5 2.6r2
cliques at LIBNAUTYS0_2.5 2.5r6
commonnbrs at LIBNAUTYS0_2.5 2.5r6
comparelab_tr at LIBNAUTYS0_2.5 2.5r6
@@ -962,6 +1092,7 @@ libnautyS0.so.2 libnauty2 #MINVER#
copycomment at LIBNAUTYS0_2.5 2.5r6
cyclecount1 at LIBNAUTYS0_2.5 2.5r6
cyclecount at LIBNAUTYS0_2.5 2.5r6
+ degstats2 at LIBNAUTYS0_2.5 2.6r2
degstats at LIBNAUTYS0_2.5 2.5r6
delete1 at LIBNAUTYS0_2.5 2.5r6
deleteunmarked at LIBNAUTYS0_2.5 2.5r6
@@ -973,7 +1104,9 @@ libnautyS0.so.2 libnauty2 #MINVER#
distances_sg at LIBNAUTYS0_2.5 2.5r6
distvals at LIBNAUTYS0_2.5 2.5r6
doref at LIBNAUTYS0_2.5 2.5r6
+ doublevalue at LIBNAUTYS0_2.5 2.6r2
dumpschreier at LIBNAUTYS0_2.5 2.5r6
+ encodegraphsize at LIBNAUTYS0_2.5 2.6r2
expandschreier at LIBNAUTYS0_2.5 2.5r6
extra_autom at LIBNAUTYS0_2.5 2.5r6
extra_level at LIBNAUTYS0_2.5 2.5r6
@@ -989,11 +1122,13 @@ libnautyS0.so.2 libnauty2 #MINVER#
flushline at LIBNAUTYS0_2.5 2.5r6
fmperm at LIBNAUTYS0_2.5 2.5r6
fmptn at LIBNAUTYS0_2.5 2.5r6
+ freegroup at LIBNAUTYS0_2.5 2.6r2
freepermrec at LIBNAUTYS0_2.5 2.5r6
freeschreier at LIBNAUTYS0_2.5 2.5r6
getbigcells at LIBNAUTYS0_2.5 2.5r6
getecline at LIBNAUTYS0_2.5 2.5r6
getint at LIBNAUTYS0_2.5 2.5r6
+ getint_sl at LIBNAUTYS0_2.5 2.6r2
getorbits at LIBNAUTYS0_2.5 2.5r6
getorbitsmin at LIBNAUTYS0_2.5 2.5r6
girth at LIBNAUTYS0_2.5 2.5r6
@@ -1048,12 +1183,16 @@ libnautyS0.so.2 libnauty2 #MINVER#
nauty at LIBNAUTYS0_2.5 2.5r6
nauty_check at LIBNAUTYS0_2.5 2.5r6
nauty_freedyn at LIBNAUTYS0_2.5 2.5r6
+ nauty_kill_request at LIBNAUTYS0_2.5 2.6r2
nauty_to_sg at LIBNAUTYS0_2.5 2.5r6
newgroup at LIBNAUTYS0_2.5 2.5r6
newpermrec at LIBNAUTYS0_2.5 2.5r6
nextelement at LIBNAUTYS0_2.5 2.5r6
+ ntod6 at LIBNAUTYS0_2.5 2.6r2
ntog6 at LIBNAUTYS0_2.5 2.5r6
+ ntois6 at LIBNAUTYS0_2.5 2.6r2
ntos6 at LIBNAUTYS0_2.5 2.5r6
+ numdirtriangles at LIBNAUTYS0_2.5 2.6r2
numtriangles1 at LIBNAUTYS0_2.5 2.5r6
numtriangles at LIBNAUTYS0_2.5 2.5r6
ogf_linelen at LIBNAUTYS0_2.5 2.5r6
@@ -1068,6 +1207,8 @@ libnautyS0.so.2 libnauty2 #MINVER#
putcanon_sg at LIBNAUTYS0_2.5 2.5r6
putdegs at LIBNAUTYS0_2.5 2.5r6
putdegs_sg at LIBNAUTYS0_2.5 2.5r6
+ putdegseq at LIBNAUTYS0_2.5 2.6r2
+ putdegseq_sg at LIBNAUTYS0_2.5 2.6r2
putgraph at LIBNAUTYS0_2.5 2.5r6
putgraph_sg at LIBNAUTYS0_2.5 2.5r6
putmapping at LIBNAUTYS0_2.5 2.5r6
@@ -1089,12 +1230,18 @@ libnautyS0.so.2 libnauty2 #MINVER#
ranreg_sg at LIBNAUTYS0_2.5 2.5r6
read_sg at LIBNAUTYS0_2.5 2.5r6
read_sg_loops at LIBNAUTYS0_2.5 2.5r6
+ read_sgg_loops at LIBNAUTYS0_2.5 2.6r2
readg at LIBNAUTYS0_2.5 2.5r6
readg_code at LIBNAUTYS0_2.5 2.5r6
+ readg_inc at LIBNAUTYS0_2.5 2.6r2
readg_line at LIBNAUTYS0_2.5 2.5r6
+ readgg at LIBNAUTYS0_2.5 2.6r2
+ readgg_inc at LIBNAUTYS0_2.5 2.6r2
readgraph at LIBNAUTYS0_2.5 2.5r6
readgraph_sg at LIBNAUTYS0_2.5 2.5r6
+ readgraph_swg at LIBNAUTYS0_2.5 2.6r2
readinteger at LIBNAUTYS0_2.5 2.5r6
+ readinteger_sl at LIBNAUTYS0_2.5 2.6r2
readpc_sg at LIBNAUTYS0_2.5 2.5r6
readpcle_sg at LIBNAUTYS0_2.5 2.5r6
readperm at LIBNAUTYS0_2.5 2.5r6
@@ -1114,9 +1261,11 @@ libnautyS0.so.2 libnauty2 #MINVER#
schreier_gens at LIBNAUTYS0_2.5 2.5r6
sethash at LIBNAUTYS0_2.5 2.5r6
setinter at LIBNAUTYS0_2.5 2.5r6
+ setlabptn at LIBNAUTYS0_2.5 2.6r2
setnbhd at LIBNAUTYS0_2.5 2.5r6
setsize at LIBNAUTYS0_2.5 2.5r6
sg_to_nauty at LIBNAUTYS0_2.5 2.5r6
+ sgtod6 at LIBNAUTYS0_2.5 2.6r2
sgtog6 at LIBNAUTYS0_2.5 2.5r6
sgtos6 at LIBNAUTYS0_2.5 2.5r6
shortprune at LIBNAUTYS0_2.5 2.5r6
@@ -1126,9 +1275,12 @@ libnautyS0.so.2 libnauty2 #MINVER#
stringcopy at LIBNAUTYS0_2.5 2.5r6
stringcounts at LIBNAUTYS0_2.5 2.5r6
stringtograph at LIBNAUTYS0_2.5 2.5r6
+ stringtograph_inc at LIBNAUTYS0_2.5 2.6r2
stringtosparsegraph at LIBNAUTYS0_2.5 2.5r6
+ stronglyconnected at LIBNAUTYS0_2.5 2.6r2
sublabel at LIBNAUTYS0_2.5 2.5r6
sublabel_sg at LIBNAUTYS0_2.5 2.5r6
+ subpartition at LIBNAUTYS0_2.5 2.6r2
targetcell at LIBNAUTYS0_2.5 2.5r6
targetcell_sg at LIBNAUTYS0_2.5 2.5r6
testcanlab at LIBNAUTYS0_2.5 2.5r6
@@ -1143,9 +1295,12 @@ libnautyS0.so.2 libnauty2 #MINVER#
updatecan at LIBNAUTYS0_2.5 2.5r6
updatecan_sg at LIBNAUTYS0_2.5 2.5r6
updatecan_tr at LIBNAUTYS0_2.5 2.5r6
+ writed6 at LIBNAUTYS0_2.5 2.6r2
+ writed6_sg at LIBNAUTYS0_2.5 2.6r2
writeg6 at LIBNAUTYS0_2.5 2.5r6
writeg6_sg at LIBNAUTYS0_2.5 2.5r6
writegroupsize at LIBNAUTYS0_2.5 2.5r6
+ writeis6 at LIBNAUTYS0_2.5 2.6r2
writelast at LIBNAUTYS0_2.5 2.5r6
writeline at LIBNAUTYS0_2.5 2.5r6
writepc_sg at LIBNAUTYS0_2.5 2.5r6
@@ -1162,12 +1317,17 @@ libnautyS1.so.2 libnauty2 #MINVER#
adjacencies_sg at LIBNAUTYS1_2.5 2.5r6
adjtriang at LIBNAUTYS1_2.5 2.5r6
allgroup2 at LIBNAUTYS1_2.5 2.5r6
+ allgroup3 at LIBNAUTYS1_2.5 2.6r2
allgroup at LIBNAUTYS1_2.5 2.5r6
alloc_error at LIBNAUTYS1_2.5 2.5r6
aresame_sg at LIBNAUTYS1_2.5 2.5r6
+ arg_double at LIBNAUTYS1_2.5 2.6r2
+ arg_doublerange at LIBNAUTYS1_2.5 2.6r2
arg_int at LIBNAUTYS1_2.5 2.5r6
arg_long at LIBNAUTYS1_2.5 2.5r6
arg_range at LIBNAUTYS1_2.5 2.5r6
+ arg_sequence at LIBNAUTYS1_2.5 2.6r2
+ bipartiteside at LIBNAUTYS1_2.5 2.6r2
breakout at LIBNAUTYS1_2.5 2.5r6
cellcliq at LIBNAUTYS1_2.5 2.5r6
cellfano2 at LIBNAUTYS1_2.5 2.5r6
@@ -1179,6 +1339,7 @@ libnautyS1.so.2 libnauty2 #MINVER#
celltrips at LIBNAUTYS1_2.5 2.5r6
cheapautom at LIBNAUTYS1_2.5 2.5r6
cheapautom_sg at LIBNAUTYS1_2.5 2.5r6
+ checkgline at LIBNAUTYS1_2.5 2.6r2
cliques at LIBNAUTYS1_2.5 2.5r6
commonnbrs at LIBNAUTYS1_2.5 2.5r6
comparelab_tr at LIBNAUTYS1_2.5 2.5r6
@@ -1193,6 +1354,7 @@ libnautyS1.so.2 libnauty2 #MINVER#
copycomment at LIBNAUTYS1_2.5 2.5r6
cyclecount1 at LIBNAUTYS1_2.5 2.5r6
cyclecount at LIBNAUTYS1_2.5 2.5r6
+ degstats2 at LIBNAUTYS1_2.5 2.6r2
degstats at LIBNAUTYS1_2.5 2.5r6
delete1 at LIBNAUTYS1_2.5 2.5r6
deleteunmarked at LIBNAUTYS1_2.5 2.5r6
@@ -1204,7 +1366,9 @@ libnautyS1.so.2 libnauty2 #MINVER#
distances_sg at LIBNAUTYS1_2.5 2.5r6
distvals at LIBNAUTYS1_2.5 2.5r6
doref at LIBNAUTYS1_2.5 2.5r6
+ doublevalue at LIBNAUTYS1_2.5 2.6r2
dumpschreier at LIBNAUTYS1_2.5 2.5r6
+ encodegraphsize at LIBNAUTYS1_2.5 2.6r2
expandschreier at LIBNAUTYS1_2.5 2.5r6
extra_autom at LIBNAUTYS1_2.5 2.5r6
extra_level at LIBNAUTYS1_2.5 2.5r6
@@ -1220,11 +1384,13 @@ libnautyS1.so.2 libnauty2 #MINVER#
flushline at LIBNAUTYS1_2.5 2.5r6
fmperm at LIBNAUTYS1_2.5 2.5r6
fmptn at LIBNAUTYS1_2.5 2.5r6
+ freegroup at LIBNAUTYS1_2.5 2.6r2
freepermrec at LIBNAUTYS1_2.5 2.5r6
freeschreier at LIBNAUTYS1_2.5 2.5r6
getbigcells at LIBNAUTYS1_2.5 2.5r6
getecline at LIBNAUTYS1_2.5 2.5r6
getint at LIBNAUTYS1_2.5 2.5r6
+ getint_sl at LIBNAUTYS1_2.5 2.6r2
getorbits at LIBNAUTYS1_2.5 2.5r6
getorbitsmin at LIBNAUTYS1_2.5 2.5r6
girth at LIBNAUTYS1_2.5 2.5r6
@@ -1279,12 +1445,16 @@ libnautyS1.so.2 libnauty2 #MINVER#
nauty at LIBNAUTYS1_2.5 2.5r6
nauty_check at LIBNAUTYS1_2.5 2.5r6
nauty_freedyn at LIBNAUTYS1_2.5 2.5r6
+ nauty_kill_request at LIBNAUTYS1_2.5 2.6r2
nauty_to_sg at LIBNAUTYS1_2.5 2.5r6
newgroup at LIBNAUTYS1_2.5 2.5r6
newpermrec at LIBNAUTYS1_2.5 2.5r6
nextelement at LIBNAUTYS1_2.5 2.5r6
+ ntod6 at LIBNAUTYS1_2.5 2.6r2
ntog6 at LIBNAUTYS1_2.5 2.5r6
+ ntois6 at LIBNAUTYS1_2.5 2.6r2
ntos6 at LIBNAUTYS1_2.5 2.5r6
+ numdirtriangles at LIBNAUTYS1_2.5 2.6r2
numtriangles1 at LIBNAUTYS1_2.5 2.5r6
numtriangles at LIBNAUTYS1_2.5 2.5r6
ogf_linelen at LIBNAUTYS1_2.5 2.5r6
@@ -1299,6 +1469,8 @@ libnautyS1.so.2 libnauty2 #MINVER#
putcanon_sg at LIBNAUTYS1_2.5 2.5r6
putdegs at LIBNAUTYS1_2.5 2.5r6
putdegs_sg at LIBNAUTYS1_2.5 2.5r6
+ putdegseq at LIBNAUTYS1_2.5 2.6r2
+ putdegseq_sg at LIBNAUTYS1_2.5 2.6r2
putgraph at LIBNAUTYS1_2.5 2.5r6
putgraph_sg at LIBNAUTYS1_2.5 2.5r6
putmapping at LIBNAUTYS1_2.5 2.5r6
@@ -1320,12 +1492,18 @@ libnautyS1.so.2 libnauty2 #MINVER#
ranreg_sg at LIBNAUTYS1_2.5 2.5r6
read_sg at LIBNAUTYS1_2.5 2.5r6
read_sg_loops at LIBNAUTYS1_2.5 2.5r6
+ read_sgg_loops at LIBNAUTYS1_2.5 2.6r2
readg at LIBNAUTYS1_2.5 2.5r6
readg_code at LIBNAUTYS1_2.5 2.5r6
+ readg_inc at LIBNAUTYS1_2.5 2.6r2
readg_line at LIBNAUTYS1_2.5 2.5r6
+ readgg at LIBNAUTYS1_2.5 2.6r2
+ readgg_inc at LIBNAUTYS1_2.5 2.6r2
readgraph at LIBNAUTYS1_2.5 2.5r6
readgraph_sg at LIBNAUTYS1_2.5 2.5r6
+ readgraph_swg at LIBNAUTYS1_2.5 2.6r2
readinteger at LIBNAUTYS1_2.5 2.5r6
+ readinteger_sl at LIBNAUTYS1_2.5 2.6r2
readpc_sg at LIBNAUTYS1_2.5 2.5r6
readpcle_sg at LIBNAUTYS1_2.5 2.5r6
readperm at LIBNAUTYS1_2.5 2.5r6
@@ -1345,9 +1523,11 @@ libnautyS1.so.2 libnauty2 #MINVER#
schreier_gens at LIBNAUTYS1_2.5 2.5r6
sethash at LIBNAUTYS1_2.5 2.5r6
setinter at LIBNAUTYS1_2.5 2.5r6
+ setlabptn at LIBNAUTYS1_2.5 2.6r2
setnbhd at LIBNAUTYS1_2.5 2.5r6
setsize at LIBNAUTYS1_2.5 2.5r6
sg_to_nauty at LIBNAUTYS1_2.5 2.5r6
+ sgtod6 at LIBNAUTYS1_2.5 2.6r2
sgtog6 at LIBNAUTYS1_2.5 2.5r6
sgtos6 at LIBNAUTYS1_2.5 2.5r6
shortprune at LIBNAUTYS1_2.5 2.5r6
@@ -1357,9 +1537,12 @@ libnautyS1.so.2 libnauty2 #MINVER#
stringcopy at LIBNAUTYS1_2.5 2.5r6
stringcounts at LIBNAUTYS1_2.5 2.5r6
stringtograph at LIBNAUTYS1_2.5 2.5r6
+ stringtograph_inc at LIBNAUTYS1_2.5 2.6r2
stringtosparsegraph at LIBNAUTYS1_2.5 2.5r6
+ stronglyconnected at LIBNAUTYS1_2.5 2.6r2
sublabel at LIBNAUTYS1_2.5 2.5r6
sublabel_sg at LIBNAUTYS1_2.5 2.5r6
+ subpartition at LIBNAUTYS1_2.5 2.6r2
targetcell at LIBNAUTYS1_2.5 2.5r6
targetcell_sg at LIBNAUTYS1_2.5 2.5r6
testcanlab at LIBNAUTYS1_2.5 2.5r6
@@ -1374,9 +1557,12 @@ libnautyS1.so.2 libnauty2 #MINVER#
updatecan at LIBNAUTYS1_2.5 2.5r6
updatecan_sg at LIBNAUTYS1_2.5 2.5r6
updatecan_tr at LIBNAUTYS1_2.5 2.5r6
+ writed6 at LIBNAUTYS1_2.5 2.6r2
+ writed6_sg at LIBNAUTYS1_2.5 2.6r2
writeg6 at LIBNAUTYS1_2.5 2.5r6
writeg6_sg at LIBNAUTYS1_2.5 2.5r6
writegroupsize at LIBNAUTYS1_2.5 2.5r6
+ writeis6 at LIBNAUTYS1_2.5 2.6r2
writelast at LIBNAUTYS1_2.5 2.5r6
writeline at LIBNAUTYS1_2.5 2.5r6
writepc_sg at LIBNAUTYS1_2.5 2.5r6
@@ -1393,12 +1579,17 @@ libnautyW0.so.2 libnauty2 #MINVER#
adjacencies_sg at LIBNAUTYW0_2.5 2.5r6
adjtriang at LIBNAUTYW0_2.5 2.5r6
allgroup2 at LIBNAUTYW0_2.5 2.5r6
+ allgroup3 at LIBNAUTYW0_2.5 2.6r2
allgroup at LIBNAUTYW0_2.5 2.5r6
alloc_error at LIBNAUTYW0_2.5 2.5r6
aresame_sg at LIBNAUTYW0_2.5 2.5r6
+ arg_double at LIBNAUTYW0_2.5 2.6r2
+ arg_doublerange at LIBNAUTYW0_2.5 2.6r2
arg_int at LIBNAUTYW0_2.5 2.5r6
arg_long at LIBNAUTYW0_2.5 2.5r6
arg_range at LIBNAUTYW0_2.5 2.5r6
+ arg_sequence at LIBNAUTYW0_2.5 2.6r2
+ bipartiteside at LIBNAUTYW0_2.5 2.6r2
breakout at LIBNAUTYW0_2.5 2.5r6
cellcliq at LIBNAUTYW0_2.5 2.5r6
cellfano2 at LIBNAUTYW0_2.5 2.5r6
@@ -1410,6 +1601,7 @@ libnautyW0.so.2 libnauty2 #MINVER#
celltrips at LIBNAUTYW0_2.5 2.5r6
cheapautom at LIBNAUTYW0_2.5 2.5r6
cheapautom_sg at LIBNAUTYW0_2.5 2.5r6
+ checkgline at LIBNAUTYW0_2.5 2.6r2
cliques at LIBNAUTYW0_2.5 2.5r6
commonnbrs at LIBNAUTYW0_2.5 2.5r6
comparelab_tr at LIBNAUTYW0_2.5 2.5r6
@@ -1424,6 +1616,7 @@ libnautyW0.so.2 libnauty2 #MINVER#
copycomment at LIBNAUTYW0_2.5 2.5r6
cyclecount1 at LIBNAUTYW0_2.5 2.5r6
cyclecount at LIBNAUTYW0_2.5 2.5r6
+ degstats2 at LIBNAUTYW0_2.5 2.6r2
degstats at LIBNAUTYW0_2.5 2.5r6
delete1 at LIBNAUTYW0_2.5 2.5r6
deleteunmarked at LIBNAUTYW0_2.5 2.5r6
@@ -1435,7 +1628,9 @@ libnautyW0.so.2 libnauty2 #MINVER#
distances_sg at LIBNAUTYW0_2.5 2.5r6
distvals at LIBNAUTYW0_2.5 2.5r6
doref at LIBNAUTYW0_2.5 2.5r6
+ doublevalue at LIBNAUTYW0_2.5 2.6r2
dumpschreier at LIBNAUTYW0_2.5 2.5r6
+ encodegraphsize at LIBNAUTYW0_2.5 2.6r2
expandschreier at LIBNAUTYW0_2.5 2.5r6
extra_autom at LIBNAUTYW0_2.5 2.5r6
extra_level at LIBNAUTYW0_2.5 2.5r6
@@ -1451,11 +1646,13 @@ libnautyW0.so.2 libnauty2 #MINVER#
flushline at LIBNAUTYW0_2.5 2.5r6
fmperm at LIBNAUTYW0_2.5 2.5r6
fmptn at LIBNAUTYW0_2.5 2.5r6
+ freegroup at LIBNAUTYW0_2.5 2.6r2
freepermrec at LIBNAUTYW0_2.5 2.5r6
freeschreier at LIBNAUTYW0_2.5 2.5r6
getbigcells at LIBNAUTYW0_2.5 2.5r6
getecline at LIBNAUTYW0_2.5 2.5r6
getint at LIBNAUTYW0_2.5 2.5r6
+ getint_sl at LIBNAUTYW0_2.5 2.6r2
getorbits at LIBNAUTYW0_2.5 2.5r6
getorbitsmin at LIBNAUTYW0_2.5 2.5r6
girth at LIBNAUTYW0_2.5 2.5r6
@@ -1510,12 +1707,16 @@ libnautyW0.so.2 libnauty2 #MINVER#
nauty at LIBNAUTYW0_2.5 2.5r6
nauty_check at LIBNAUTYW0_2.5 2.5r6
nauty_freedyn at LIBNAUTYW0_2.5 2.5r6
+ nauty_kill_request at LIBNAUTYW0_2.5 2.6r2
nauty_to_sg at LIBNAUTYW0_2.5 2.5r6
newgroup at LIBNAUTYW0_2.5 2.5r6
newpermrec at LIBNAUTYW0_2.5 2.5r6
nextelement at LIBNAUTYW0_2.5 2.5r6
+ ntod6 at LIBNAUTYW0_2.5 2.6r2
ntog6 at LIBNAUTYW0_2.5 2.5r6
+ ntois6 at LIBNAUTYW0_2.5 2.6r2
ntos6 at LIBNAUTYW0_2.5 2.5r6
+ numdirtriangles at LIBNAUTYW0_2.5 2.6r2
numtriangles1 at LIBNAUTYW0_2.5 2.5r6
numtriangles at LIBNAUTYW0_2.5 2.5r6
ogf_linelen at LIBNAUTYW0_2.5 2.5r6
@@ -1530,6 +1731,8 @@ libnautyW0.so.2 libnauty2 #MINVER#
putcanon_sg at LIBNAUTYW0_2.5 2.5r6
putdegs at LIBNAUTYW0_2.5 2.5r6
putdegs_sg at LIBNAUTYW0_2.5 2.5r6
+ putdegseq at LIBNAUTYW0_2.5 2.6r2
+ putdegseq_sg at LIBNAUTYW0_2.5 2.6r2
putgraph at LIBNAUTYW0_2.5 2.5r6
putgraph_sg at LIBNAUTYW0_2.5 2.5r6
putmapping at LIBNAUTYW0_2.5 2.5r6
@@ -1551,12 +1754,18 @@ libnautyW0.so.2 libnauty2 #MINVER#
ranreg_sg at LIBNAUTYW0_2.5 2.5r6
read_sg at LIBNAUTYW0_2.5 2.5r6
read_sg_loops at LIBNAUTYW0_2.5 2.5r6
+ read_sgg_loops at LIBNAUTYW0_2.5 2.6r2
readg at LIBNAUTYW0_2.5 2.5r6
readg_code at LIBNAUTYW0_2.5 2.5r6
+ readg_inc at LIBNAUTYW0_2.5 2.6r2
readg_line at LIBNAUTYW0_2.5 2.5r6
+ readgg at LIBNAUTYW0_2.5 2.6r2
+ readgg_inc at LIBNAUTYW0_2.5 2.6r2
readgraph at LIBNAUTYW0_2.5 2.5r6
readgraph_sg at LIBNAUTYW0_2.5 2.5r6
+ readgraph_swg at LIBNAUTYW0_2.5 2.6r2
readinteger at LIBNAUTYW0_2.5 2.5r6
+ readinteger_sl at LIBNAUTYW0_2.5 2.6r2
readpc_sg at LIBNAUTYW0_2.5 2.5r6
readpcle_sg at LIBNAUTYW0_2.5 2.5r6
readperm at LIBNAUTYW0_2.5 2.5r6
@@ -1576,9 +1785,11 @@ libnautyW0.so.2 libnauty2 #MINVER#
schreier_gens at LIBNAUTYW0_2.5 2.5r6
sethash at LIBNAUTYW0_2.5 2.5r6
setinter at LIBNAUTYW0_2.5 2.5r6
+ setlabptn at LIBNAUTYW0_2.5 2.6r2
setnbhd at LIBNAUTYW0_2.5 2.5r6
setsize at LIBNAUTYW0_2.5 2.5r6
sg_to_nauty at LIBNAUTYW0_2.5 2.5r6
+ sgtod6 at LIBNAUTYW0_2.5 2.6r2
sgtog6 at LIBNAUTYW0_2.5 2.5r6
sgtos6 at LIBNAUTYW0_2.5 2.5r6
shortprune at LIBNAUTYW0_2.5 2.5r6
@@ -1588,9 +1799,12 @@ libnautyW0.so.2 libnauty2 #MINVER#
stringcopy at LIBNAUTYW0_2.5 2.5r6
stringcounts at LIBNAUTYW0_2.5 2.5r6
stringtograph at LIBNAUTYW0_2.5 2.5r6
+ stringtograph_inc at LIBNAUTYW0_2.5 2.6r2
stringtosparsegraph at LIBNAUTYW0_2.5 2.5r6
+ stronglyconnected at LIBNAUTYW0_2.5 2.6r2
sublabel at LIBNAUTYW0_2.5 2.5r6
sublabel_sg at LIBNAUTYW0_2.5 2.5r6
+ subpartition at LIBNAUTYW0_2.5 2.6r2
targetcell at LIBNAUTYW0_2.5 2.5r6
targetcell_sg at LIBNAUTYW0_2.5 2.5r6
testcanlab at LIBNAUTYW0_2.5 2.5r6
@@ -1605,9 +1819,12 @@ libnautyW0.so.2 libnauty2 #MINVER#
updatecan at LIBNAUTYW0_2.5 2.5r6
updatecan_sg at LIBNAUTYW0_2.5 2.5r6
updatecan_tr at LIBNAUTYW0_2.5 2.5r6
+ writed6 at LIBNAUTYW0_2.5 2.6r2
+ writed6_sg at LIBNAUTYW0_2.5 2.6r2
writeg6 at LIBNAUTYW0_2.5 2.5r6
writeg6_sg at LIBNAUTYW0_2.5 2.5r6
writegroupsize at LIBNAUTYW0_2.5 2.5r6
+ writeis6 at LIBNAUTYW0_2.5 2.6r2
writelast at LIBNAUTYW0_2.5 2.5r6
writeline at LIBNAUTYW0_2.5 2.5r6
writepc_sg at LIBNAUTYW0_2.5 2.5r6
@@ -1624,12 +1841,17 @@ libnautyW1.so.2 libnauty2 #MINVER#
adjacencies_sg at LIBNAUTYW1_2.5 2.5r6
adjtriang at LIBNAUTYW1_2.5 2.5r6
allgroup2 at LIBNAUTYW1_2.5 2.5r6
+ allgroup3 at LIBNAUTYW1_2.5 2.6r2
allgroup at LIBNAUTYW1_2.5 2.5r6
alloc_error at LIBNAUTYW1_2.5 2.5r6
aresame_sg at LIBNAUTYW1_2.5 2.5r6
+ arg_double at LIBNAUTYW1_2.5 2.6r2
+ arg_doublerange at LIBNAUTYW1_2.5 2.6r2
arg_int at LIBNAUTYW1_2.5 2.5r6
arg_long at LIBNAUTYW1_2.5 2.5r6
arg_range at LIBNAUTYW1_2.5 2.5r6
+ arg_sequence at LIBNAUTYW1_2.5 2.6r2
+ bipartiteside at LIBNAUTYW1_2.5 2.6r2
breakout at LIBNAUTYW1_2.5 2.5r6
cellcliq at LIBNAUTYW1_2.5 2.5r6
cellfano2 at LIBNAUTYW1_2.5 2.5r6
@@ -1641,6 +1863,7 @@ libnautyW1.so.2 libnauty2 #MINVER#
celltrips at LIBNAUTYW1_2.5 2.5r6
cheapautom at LIBNAUTYW1_2.5 2.5r6
cheapautom_sg at LIBNAUTYW1_2.5 2.5r6
+ checkgline at LIBNAUTYW1_2.5 2.6r2
cliques at LIBNAUTYW1_2.5 2.5r6
commonnbrs at LIBNAUTYW1_2.5 2.5r6
comparelab_tr at LIBNAUTYW1_2.5 2.5r6
@@ -1655,6 +1878,7 @@ libnautyW1.so.2 libnauty2 #MINVER#
copycomment at LIBNAUTYW1_2.5 2.5r6
cyclecount1 at LIBNAUTYW1_2.5 2.5r6
cyclecount at LIBNAUTYW1_2.5 2.5r6
+ degstats2 at LIBNAUTYW1_2.5 2.6r2
degstats at LIBNAUTYW1_2.5 2.5r6
delete1 at LIBNAUTYW1_2.5 2.5r6
deleteunmarked at LIBNAUTYW1_2.5 2.5r6
@@ -1666,7 +1890,9 @@ libnautyW1.so.2 libnauty2 #MINVER#
distances_sg at LIBNAUTYW1_2.5 2.5r6
distvals at LIBNAUTYW1_2.5 2.5r6
doref at LIBNAUTYW1_2.5 2.5r6
+ doublevalue at LIBNAUTYW1_2.5 2.6r2
dumpschreier at LIBNAUTYW1_2.5 2.5r6
+ encodegraphsize at LIBNAUTYW1_2.5 2.6r2
expandschreier at LIBNAUTYW1_2.5 2.5r6
extra_autom at LIBNAUTYW1_2.5 2.5r6
extra_level at LIBNAUTYW1_2.5 2.5r6
@@ -1682,11 +1908,13 @@ libnautyW1.so.2 libnauty2 #MINVER#
flushline at LIBNAUTYW1_2.5 2.5r6
fmperm at LIBNAUTYW1_2.5 2.5r6
fmptn at LIBNAUTYW1_2.5 2.5r6
+ freegroup at LIBNAUTYW1_2.5 2.6r2
freepermrec at LIBNAUTYW1_2.5 2.5r6
freeschreier at LIBNAUTYW1_2.5 2.5r6
getbigcells at LIBNAUTYW1_2.5 2.5r6
getecline at LIBNAUTYW1_2.5 2.5r6
getint at LIBNAUTYW1_2.5 2.5r6
+ getint_sl at LIBNAUTYW1_2.5 2.6r2
getorbits at LIBNAUTYW1_2.5 2.5r6
getorbitsmin at LIBNAUTYW1_2.5 2.5r6
girth at LIBNAUTYW1_2.5 2.5r6
@@ -1741,12 +1969,16 @@ libnautyW1.so.2 libnauty2 #MINVER#
nauty at LIBNAUTYW1_2.5 2.5r6
nauty_check at LIBNAUTYW1_2.5 2.5r6
nauty_freedyn at LIBNAUTYW1_2.5 2.5r6
+ nauty_kill_request at LIBNAUTYW1_2.5 2.6r2
nauty_to_sg at LIBNAUTYW1_2.5 2.5r6
newgroup at LIBNAUTYW1_2.5 2.5r6
newpermrec at LIBNAUTYW1_2.5 2.5r6
nextelement at LIBNAUTYW1_2.5 2.5r6
+ ntod6 at LIBNAUTYW1_2.5 2.6r2
ntog6 at LIBNAUTYW1_2.5 2.5r6
+ ntois6 at LIBNAUTYW1_2.5 2.6r2
ntos6 at LIBNAUTYW1_2.5 2.5r6
+ numdirtriangles at LIBNAUTYW1_2.5 2.6r2
numtriangles1 at LIBNAUTYW1_2.5 2.5r6
numtriangles at LIBNAUTYW1_2.5 2.5r6
ogf_linelen at LIBNAUTYW1_2.5 2.5r6
@@ -1761,6 +1993,8 @@ libnautyW1.so.2 libnauty2 #MINVER#
putcanon_sg at LIBNAUTYW1_2.5 2.5r6
putdegs at LIBNAUTYW1_2.5 2.5r6
putdegs_sg at LIBNAUTYW1_2.5 2.5r6
+ putdegseq at LIBNAUTYW1_2.5 2.6r2
+ putdegseq_sg at LIBNAUTYW1_2.5 2.6r2
putgraph at LIBNAUTYW1_2.5 2.5r6
putgraph_sg at LIBNAUTYW1_2.5 2.5r6
putmapping at LIBNAUTYW1_2.5 2.5r6
@@ -1782,12 +2016,18 @@ libnautyW1.so.2 libnauty2 #MINVER#
ranreg_sg at LIBNAUTYW1_2.5 2.5r6
read_sg at LIBNAUTYW1_2.5 2.5r6
read_sg_loops at LIBNAUTYW1_2.5 2.5r6
+ read_sgg_loops at LIBNAUTYW1_2.5 2.6r2
readg at LIBNAUTYW1_2.5 2.5r6
readg_code at LIBNAUTYW1_2.5 2.5r6
+ readg_inc at LIBNAUTYW1_2.5 2.6r2
readg_line at LIBNAUTYW1_2.5 2.5r6
+ readgg at LIBNAUTYW1_2.5 2.6r2
+ readgg_inc at LIBNAUTYW1_2.5 2.6r2
readgraph at LIBNAUTYW1_2.5 2.5r6
readgraph_sg at LIBNAUTYW1_2.5 2.5r6
+ readgraph_swg at LIBNAUTYW1_2.5 2.6r2
readinteger at LIBNAUTYW1_2.5 2.5r6
+ readinteger_sl at LIBNAUTYW1_2.5 2.6r2
readpc_sg at LIBNAUTYW1_2.5 2.5r6
readpcle_sg at LIBNAUTYW1_2.5 2.5r6
readperm at LIBNAUTYW1_2.5 2.5r6
@@ -1807,9 +2047,11 @@ libnautyW1.so.2 libnauty2 #MINVER#
schreier_gens at LIBNAUTYW1_2.5 2.5r6
sethash at LIBNAUTYW1_2.5 2.5r6
setinter at LIBNAUTYW1_2.5 2.5r6
+ setlabptn at LIBNAUTYW1_2.5 2.6r2
setnbhd at LIBNAUTYW1_2.5 2.5r6
setsize at LIBNAUTYW1_2.5 2.5r6
sg_to_nauty at LIBNAUTYW1_2.5 2.5r6
+ sgtod6 at LIBNAUTYW1_2.5 2.6r2
sgtog6 at LIBNAUTYW1_2.5 2.5r6
sgtos6 at LIBNAUTYW1_2.5 2.5r6
shortprune at LIBNAUTYW1_2.5 2.5r6
@@ -1819,9 +2061,12 @@ libnautyW1.so.2 libnauty2 #MINVER#
stringcopy at LIBNAUTYW1_2.5 2.5r6
stringcounts at LIBNAUTYW1_2.5 2.5r6
stringtograph at LIBNAUTYW1_2.5 2.5r6
+ stringtograph_inc at LIBNAUTYW1_2.5 2.6r2
stringtosparsegraph at LIBNAUTYW1_2.5 2.5r6
+ stronglyconnected at LIBNAUTYW1_2.5 2.6r2
sublabel at LIBNAUTYW1_2.5 2.5r6
sublabel_sg at LIBNAUTYW1_2.5 2.5r6
+ subpartition at LIBNAUTYW1_2.5 2.6r2
targetcell at LIBNAUTYW1_2.5 2.5r6
targetcell_sg at LIBNAUTYW1_2.5 2.5r6
testcanlab at LIBNAUTYW1_2.5 2.5r6
@@ -1836,9 +2081,12 @@ libnautyW1.so.2 libnauty2 #MINVER#
updatecan at LIBNAUTYW1_2.5 2.5r6
updatecan_sg at LIBNAUTYW1_2.5 2.5r6
updatecan_tr at LIBNAUTYW1_2.5 2.5r6
+ writed6 at LIBNAUTYW1_2.5 2.6r2
+ writed6_sg at LIBNAUTYW1_2.5 2.6r2
writeg6 at LIBNAUTYW1_2.5 2.5r6
writeg6_sg at LIBNAUTYW1_2.5 2.5r6
writegroupsize at LIBNAUTYW1_2.5 2.5r6
+ writeis6 at LIBNAUTYW1_2.5 2.6r2
writelast at LIBNAUTYW1_2.5 2.5r6
writeline at LIBNAUTYW1_2.5 2.5r6
writepc_sg at LIBNAUTYW1_2.5 2.5r6
diff --git a/debian/nauty-doc.doc-base b/debian/nauty-doc.doc-base
index 8054b5c..bb559bf 100644
--- a/debian/nauty-doc.doc-base
+++ b/debian/nauty-doc.doc-base
@@ -1,5 +1,5 @@
Document: nauty
-Title: Nauty and Traces User's Guide (Version 2.5)
+Title: Nauty and Traces User's Guide (Version 2.6)
Author: Brendan D. McKay and Adolfo Piperno
Abstract: nauty and Traces are programs for computing
automorphism groups of graphs and digraphs; they can
@@ -9,4 +9,4 @@ Abstract: nauty and Traces are programs for computing
Section: Science/Mathematics
Format: PDF
-Files: /usr/share/doc/nauty-doc/nug25.pdf.gz
+Files: /usr/share/doc/nauty-doc/nug26.pdf
diff --git a/debian/nauty-doc.docs b/debian/nauty-doc.docs
index 44152b6..7dfcf21 100644
--- a/debian/nauty-doc.docs
+++ b/debian/nauty-doc.docs
@@ -2,4 +2,4 @@ README
README_24
formats.txt
schreier.txt
-nug25.pdf
+nug26.pdf
diff --git a/debian/nauty-doc.examples b/debian/nauty-doc.examples
index 9eeb0ba..8073689 100644
--- a/debian/nauty-doc.examples
+++ b/debian/nauty-doc.examples
@@ -1,2 +1,2 @@
-debian/adhoc/examples/build.sh
+debian/adhoc/examples/Makefile
nautyex*.c
diff --git a/debian/nauty-doc.links b/debian/nauty-doc.links
deleted file mode 100644
index 1960269..0000000
--- a/debian/nauty-doc.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/doc/nauty-doc/examples/build.sh usr/share/doc/nauty-doc/examples/clean.sh
diff --git a/debian/patches/debianization-prefix.patch b/debian/patches/debianization-prefix.patch
index a489ab7..09017ce 100644
--- a/debian/patches/debianization-prefix.patch
+++ b/debian/patches/debianization-prefix.patch
@@ -1,11 +1,11 @@
Description: debianization: nauty tools suite prefix
Prepend nauty- to the names of the nauty tools, named gtools.
Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2013-11-25
+Last-Update: 2016-03-19
--- a/Makefile.am
+++ b/Makefile.am
-@@ -24,72 +24,72 @@
+@@ -24,94 +24,94 @@
bin_PROGRAMS = \
dreadnaut \
\
@@ -14,15 +14,24 @@ Last-Update: 2013-11-25
- biplabg \
- catg \
- complg \
+- converseg \
- copyg \
- countg \
+- cubhamg \
- deledgeg \
+- delptg \
- directg \
+- dretodot \
- dretog \
- genbg \
+- genbgL \
- geng \
+- genquarticg \
- genrang \
+- genspecialg \
- gentourng \
+- gentreeg \
+- hamheuristic \
- labelg \
- linegraphg \
- listg \
@@ -35,21 +44,32 @@ Last-Update: 2013-11-25
- shortg \
- showg \
- subdivideg \
+- twohamg \
+- vcolg \
- watercluster2 \
+ nauty-addedgeg \
+ nauty-amtog \
+ nauty-biplabg \
+ nauty-catg \
+ nauty-complg \
++ nauty-converseg \
+ nauty-copyg \
+ nauty-countg \
++ nauty-cubhamg \
+ nauty-deledgeg \
++ nauty-delptg \
+ nauty-directg \
++ nauty-dretodot \
+ nauty-dretog \
+ nauty-genbg \
++ nauty-genbgL \
+ nauty-geng \
++ nauty-genquarticg \
+ nauty-genrang \
++ nauty-genspecialg \
+ nauty-gentourng \
++ nauty-gentreeg \
++ nauty-hamheuristic \
+ nauty-labelg \
+ nauty-linegraphg \
+ nauty-listg \
@@ -62,6 +82,8 @@ Last-Update: 2013-11-25
+ nauty-shortg \
+ nauty-showg \
+ nauty-subdivideg \
++ nauty-twohamg \
++ nauty-vcolg \
+ nauty-watercluster2 \
\
- blisstog \
@@ -79,15 +101,24 @@ Last-Update: 2013-11-25
- biplabg.1 \
- catg.1 \
- complg.1 \
+- converseg.1 \
- copyg.1 \
- countg.1 \
+- cubhamg.1 \
- deledgeg.1 \
+- delptg.1 \
- directg.1 \
+- dretodot.1 \
- dretog.1 \
- genbg.1 \
+- genbgL.1 \
- geng.1 \
+- genquarticg.1 \
- genrang.1 \
+- genspecialg.1 \
- gentourng.1 \
+- gentreeg.1 \
+- hamheuristic.1 \
- labelg.1 \
- linegraphg.1 \
- listg.1 \
@@ -100,21 +131,32 @@ Last-Update: 2013-11-25
- shortg.1 \
- showg.1 \
- subdivideg.1 \
+- twohamg.1 \
+- vcolg.1 \
- watercluster2.1 \
+ nauty-addedgeg.1 \
+ nauty-amtog.1 \
+ nauty-biplabg.1 \
+ nauty-catg.1 \
+ nauty-complg.1 \
++ nauty-converseg.1 \
+ nauty-copyg.1 \
+ nauty-countg.1 \
++ nauty-cubhamg.1 \
+ nauty-deledgeg.1 \
++ nauty-delptg.1 \
+ nauty-directg.1 \
++ nauty-dretodot.1 \
+ nauty-dretog.1 \
+ nauty-genbg.1 \
++ nauty-genbgL.1 \
+ nauty-geng.1 \
++ nauty-genquarticg.1 \
+ nauty-genrang.1 \
++ nauty-genspecialg.1 \
+ nauty-gentourng.1 \
++ nauty-gentreeg.1 \
++ nauty-hamheuristic.1 \
+ nauty-labelg.1 \
+ nauty-linegraphg.1 \
+ nauty-listg.1 \
@@ -127,6 +169,8 @@ Last-Update: 2013-11-25
+ nauty-shortg.1 \
+ nauty-showg.1 \
+ nauty-subdivideg.1 \
++ nauty-twohamg.1 \
++ nauty-vcolg.1 \
+ nauty-watercluster2.1 \
\
- blisstog.1 \
@@ -138,7 +182,7 @@ Last-Update: 2013-11-25
lib_LTLIBRARIES = \
libnauty.la \
-@@ -133,8 +133,8 @@
+@@ -156,8 +156,8 @@
$(HELP2MAN) \
-s 1 \
$(AM_H2MFLAGS) \
@@ -149,25 +193,34 @@ Last-Update: 2013-11-25
-o $@ \
$(top_builddir)/$<
-@@ -154,133 +154,133 @@
+@@ -177,177 +177,177 @@
## short descriptions inspired from the basic functions of the programs as described
- ## in section `Utilities' (15) of the `Nauty and Traces User's Guide' (version 2.5)
+ ## in section `Utilities' (15) of the `Nauty and Traces User's Guide' (version 2.6)
-dreadnaut_DESCRIPTION = "command line interface to nauty graph isomorphism library"
-addedgeg_DESCRIPTION = "add an edge in each possible way"
-amtog_DESCRIPTION = "read graphs in matrix format"
-biplabg_DESCRIPTION = "label bipartite graphs so the colour classes are contiguous"
-catg_DESCRIPTION = "concatenate files of graphs"
-complg_DESCRIPTION = "complement graphs"
+-converseg_DESCRIPTION = "converse digraphs"
-copyg_DESCRIPTION = "convert format and select subset"
-countg_DESCRIPTION = "count graphs according to a variety of properties"
+-cubhamg_DESCRIPTION = "find hamiltonian cycles in subcubic graphs"
-deledgeg_DESCRIPTION = "delete an edge in each possible way"
+-delptg_DESCRIPTION = "delete vertices"
-directg_DESCRIPTION = "generate small digraphs with given underlying graph"
--dretog_DESCRIPTION = "read graphs in dreadnaut form"
+-dretodot_DESCRIPTION = "read graphs and initial coloring in dreadnaut format and write in dot format"
+-dretog_DESCRIPTION = "read graphs in dreadnaut format"
-genbg_DESCRIPTION = "generate small bicoloured graphs"
+-genbgL_DESCRIPTION = "$(shell printf "%s %s" $(genbg_DESCRIPTION) "(L1 flavour)")"
-geng_DESCRIPTION = "generate small graphs"
+-genquarticg_DESCRIPTION = "generate quartic graphs"
-genrang_DESCRIPTION = "generate random graphs"
+-genspecialg_DESCRIPTION = "generate special graphs"
-gentourng_DESCRIPTION = "generate small tournaments"
+-gentreeg_DESCRIPTION = "generate trees"
+-hamheuristic_DESCRIPTION = "try to find hamiltonian cycles in any graphs"
-labelg_DESCRIPTION = "canonically label graphs"
-linegraphg_DESCRIPTION = "compute the linegraphs of a file of graphs"
-listg_DESCRIPTION = "display graphs in a variety of forms"
@@ -180,57 +233,37 @@ Last-Update: 2013-11-25
-shortg_DESCRIPTION = "remove isomorphs from a file of graphs"
-showg_DESCRIPTION = "$(shell printf "%s %s" $(listg_DESCRIPTION) "(stand-alone subset of listg)")"
-subdivideg_DESCRIPTION = "compute the subdivision graphs of a file of graphs"
+-twohamg_DESCRIPTION = "split quartic graphs into two hamiltonian cycles"
+-vcolg_DESCRIPTION = "colour the vertices of graphs in all distinct ways"
-watercluster2_DESCRIPTION = "$(shell printf "%s %s" $(directg_DESCRIPTION) "(faster alternative to directg)")"
-blisstog_DESCRIPTION = "convert files of graphs in bliss format to stdout in sparse6 format"
-checks6_DESCRIPTION = "check a file of graphs and optionally perform corrections"
-sumlines_DESCRIPTION = "sum lines matching specified graph formats"
-+dreadnaut_DESCRIPTION = "command line interface to nauty graph isomorphism library"
-+nauty_addedgeg_DESCRIPTION = "add an edge in each possible way"
-+nauty_amtog_DESCRIPTION = "read graphs in matrix format"
-+nauty_biplabg_DESCRIPTION = "label bipartite graphs so the colour classes are contiguous"
-+nauty_catg_DESCRIPTION = "concatenate files of graphs"
-+nauty_complg_DESCRIPTION = "complement graphs"
-+nauty_copyg_DESCRIPTION = "convert format and select subset"
-+nauty_countg_DESCRIPTION = "count graphs according to a variety of properties"
-+nauty_deledgeg_DESCRIPTION = "delete an edge in each possible way"
-+nauty_directg_DESCRIPTION = "generate small digraphs with given underlying graph"
-+nauty_dretog_DESCRIPTION = "read graphs in dreadnaut form"
-+nauty_genbg_DESCRIPTION = "generate small bicoloured graphs"
-+nauty_geng_DESCRIPTION = "generate small graphs"
-+nauty_genrang_DESCRIPTION = "generate random graphs"
-+nauty_gentourng_DESCRIPTION = "generate small tournaments"
-+nauty_labelg_DESCRIPTION = "canonically label graphs"
-+nauty_linegraphg_DESCRIPTION = "compute the linegraphs of a file of graphs"
-+nauty_listg_DESCRIPTION = "display graphs in a variety of forms"
-+nauty_multig_DESCRIPTION = "generate small multigraphs with given underlying graph"
-+nauty_newedgeg_DESCRIPTION = "create new edges from pairs of non-adjacent edges in each possible way"
-+nauty_NRswitchg_DESCRIPTION = "complement vertex edges"
-+nauty_pickg_DESCRIPTION = "select graphs according to a variety of properties"
-+nauty_planarg_DESCRIPTION = "test graphs for planarity and find embeddings or obstructions"
-+nauty_ranlabg_DESCRIPTION = "randomly relabel graphs"
-+nauty_shortg_DESCRIPTION = "remove isomorphs from a file of graphs"
-+nauty_showg_DESCRIPTION = "$(shell printf "%s %s" $(listg_DESCRIPTION) "(stand-alone subset of listg)")"
-+nauty_subdivideg_DESCRIPTION = "compute the subdivision graphs of a file of graphs"
-+nauty_watercluster2_DESCRIPTION = "$(shell printf "%s %s" $(directg_DESCRIPTION) "(faster alternative to directg)")"
-+nauty_blisstog_DESCRIPTION = "convert files of graphs in bliss format to stdout in sparse6 format"
-+nauty_checks6_DESCRIPTION = "check a file of graphs and optionally perform corrections"
-+nauty_sumlines_DESCRIPTION = "sum lines matching specified graph formats"
-
- dreadnaut_CPPFLAGS = -DDEBPKGVERSION=$(DEB_PKG_VERSION)
+-
+-dreadnaut_CPPFLAGS = -DDEBPKGVERSION=$(DEB_PKG_VERSION)
-addedgeg_CPPFLAGS =
-amtog_CPPFLAGS =
-biplabg_CPPFLAGS =
-catg_CPPFLAGS =
-complg_CPPFLAGS =
+-converseg_CPPFLAGS =
-copyg_CPPFLAGS =
-countg_CPPFLAGS =
+-cubhamg_CPPFLAGS =
-deledgeg_CPPFLAGS =
+-delptg_CPPFLAGS =
-directg_CPPFLAGS =
+-dretodot_CPPFLAGS =
-dretog_CPPFLAGS =
--genbg_CPPFLAGS = $(nautyW1_falvour_CPPFLAGS)
--geng_CPPFLAGS = $(nautyW1_falvour_CPPFLAGS)
+-genbg_CPPFLAGS = $(nautyW1_flavour_CPPFLAGS)
+-genbgL_CPPFLAGS = $(nautyL1_flavour_CPPFLAGS) -DMAXN1=30
+-geng_CPPFLAGS = $(nautyW1_flavour_CPPFLAGS)
+-genquarticg_CPPFLAGS = $(nautyL1_flavour_CPPFLAGS)
-genrang_CPPFLAGS =
+-genspecialg_CPPFLAGS =
-gentourng_CPPFLAGS = -DMAXN=24
+-gentreeg_CPPFLAGS =
+-hamheuristic_CPPFLAGS =
-labelg_CPPFLAGS =
-linegraphg_CPPFLAGS =
-listg_CPPFLAGS =
@@ -243,24 +276,79 @@ Last-Update: 2013-11-25
-shortg_CPPFLAGS =
-showg_CPPFLAGS =
-subdivideg_CPPFLAGS =
+-twohamg_CPPFLAGS =
+-vcolg_CPPFLAGS =
-watercluster2_CPPFLAGS = -DMAXN=32
-blisstog_CPPFLAGS = $(ZLIB_CFLAGS)
-checks6_CPPFLAGS =
-sumlines_CPPFLAGS = $(GMP_CFLAGS)
++dreadnaut_DESCRIPTION = "command line interface to nauty graph isomorphism library"
++nauty_addedgeg_DESCRIPTION = "add an edge in each possible way"
++nauty_amtog_DESCRIPTION = "read graphs in matrix format"
++nauty_biplabg_DESCRIPTION = "label bipartite graphs so the colour classes are contiguous"
++nauty_catg_DESCRIPTION = "concatenate files of graphs"
++nauty_complg_DESCRIPTION = "complement graphs"
++nauty_converseg_DESCRIPTION = "converse digraphs"
++nauty_copyg_DESCRIPTION = "convert format and select subset"
++nauty_countg_DESCRIPTION = "count graphs according to a variety of properties"
++nauty_cubhamg_DESCRIPTION = "find hamiltonian cycles in subcubic graphs"
++nauty_deledgeg_DESCRIPTION = "delete an edge in each possible way"
++nauty_delptg_DESCRIPTION = "delete vertices"
++nauty_directg_DESCRIPTION = "generate small digraphs with given underlying graph"
++nauty_dretodot_DESCRIPTION = "read graphs and initial coloring in dreadnaut format and write in dot format"
++nauty_dretog_DESCRIPTION = "read graphs in dreadnaut format"
++nauty_genbg_DESCRIPTION = "generate small bicoloured graphs"
++nauty_genbgL_DESCRIPTION = "$(shell printf "%s %s" $(nauty_genbg_DESCRIPTION) "(L1 flavour)")"
++nauty_geng_DESCRIPTION = "generate small graphs"
++nauty_genquarticg_DESCRIPTION = "generate quartic graphs"
++nauty_genrang_DESCRIPTION = "generate random graphs"
++nauty_genspecialg_DESCRIPTION = "generate special graphs"
++nauty_gentourng_DESCRIPTION = "generate small tournaments"
++nauty_gentreeg_DESCRIPTION = "generate trees"
++nauty_hamheuristic_DESCRIPTION = "try to find hamiltonian cycles in any graphs"
++nauty_labelg_DESCRIPTION = "canonically label graphs"
++nauty_linegraphg_DESCRIPTION = "compute the linegraphs of a file of graphs"
++nauty_listg_DESCRIPTION = "display graphs in a variety of forms"
++nauty_multig_DESCRIPTION = "generate small multigraphs with given underlying graph"
++nauty_newedgeg_DESCRIPTION = "create new edges from pairs of non-adjacent edges in each possible way"
++nauty_NRswitchg_DESCRIPTION = "complement vertex edges"
++nauty_pickg_DESCRIPTION = "select graphs according to a variety of properties"
++nauty_planarg_DESCRIPTION = "test graphs for planarity and find embeddings or obstructions"
++nauty_ranlabg_DESCRIPTION = "randomly relabel graphs"
++nauty_shortg_DESCRIPTION = "remove isomorphs from a file of graphs"
++nauty_showg_DESCRIPTION = "$(shell printf "%s %s" $(nauty_listg_DESCRIPTION) "(stand-alone subset of listg)")"
++nauty_subdivideg_DESCRIPTION = "compute the subdivision graphs of a file of graphs"
++nauty_twohamg_DESCRIPTION = "split quartic graphs into two hamiltonian cycles"
++nauty_vcolg_DESCRIPTION = "colour the vertices of graphs in all distinct ways"
++nauty_watercluster2_DESCRIPTION = "$(shell printf "%s %s" $(nauty_directg_DESCRIPTION) "(faster alternative to directg)")"
++nauty_blisstog_DESCRIPTION = "convert files of graphs in bliss format to stdout in sparse6 format"
++nauty_checks6_DESCRIPTION = "check a file of graphs and optionally perform corrections"
++nauty_sumlines_DESCRIPTION = "sum lines matching specified graph formats"
++
++dreadnaut_CPPFLAGS = -DDEBPKGVERSION=$(DEB_PKG_VERSION)
+nauty_addedgeg_CPPFLAGS =
+nauty_amtog_CPPFLAGS =
+nauty_biplabg_CPPFLAGS =
+nauty_catg_CPPFLAGS =
+nauty_complg_CPPFLAGS =
++nauty_converseg_CPPFLAGS =
+nauty_copyg_CPPFLAGS =
+nauty_countg_CPPFLAGS =
++nauty_cubhamg_CPPFLAGS =
+nauty_deledgeg_CPPFLAGS =
++nauty_delptg_CPPFLAGS =
+nauty_directg_CPPFLAGS =
++nauty_dretodot_CPPFLAGS =
+nauty_dretog_CPPFLAGS =
-+nauty_genbg_CPPFLAGS = $(nautyW1_falvour_CPPFLAGS)
-+nauty_geng_CPPFLAGS = $(nautyW1_falvour_CPPFLAGS)
++nauty_genbg_CPPFLAGS = $(nautyW1_flavour_CPPFLAGS)
++nauty_genbgL_CPPFLAGS = $(nautyL1_flavour_CPPFLAGS) -DMAXN1=30
++nauty_geng_CPPFLAGS = $(nautyW1_flavour_CPPFLAGS)
++nauty_genquarticg_CPPFLAGS = $(nautyL1_flavour_CPPFLAGS)
+nauty_genrang_CPPFLAGS =
++nauty_genspecialg_CPPFLAGS =
+nauty_gentourng_CPPFLAGS = -DMAXN=24
++nauty_gentreeg_CPPFLAGS =
++nauty_hamheuristic_CPPFLAGS =
+nauty_labelg_CPPFLAGS =
+nauty_linegraphg_CPPFLAGS =
+nauty_listg_CPPFLAGS =
@@ -273,6 +361,8 @@ Last-Update: 2013-11-25
+nauty_shortg_CPPFLAGS =
+nauty_showg_CPPFLAGS =
+nauty_subdivideg_CPPFLAGS =
++nauty_twohamg_CPPFLAGS =
++nauty_vcolg_CPPFLAGS =
+nauty_watercluster2_CPPFLAGS = -DMAXN=32
+nauty_blisstog_CPPFLAGS = $(ZLIB_CFLAGS)
+nauty_checks6_CPPFLAGS =
@@ -284,15 +374,24 @@ Last-Update: 2013-11-25
-biplabg_SOURCES = biplabg.c
-catg_SOURCES = catg.c
-complg_SOURCES = complg.c
+-converseg_SOURCES = converseg.c
-copyg_SOURCES = copyg.c
-countg_SOURCES = testg.c
+-cubhamg_SOURCES = cubhamg.c
-deledgeg_SOURCES = deledgeg.c
+-delptg_SOURCES = delptg.c
-directg_SOURCES = directg.c
+-dretodot_SOURCES = dretodot.c
-dretog_SOURCES = dretog.c
-genbg_SOURCES = genbg.c
+-genbgL_SOURCES = genbg.c
-geng_SOURCES = geng.c
+-genquarticg_SOURCES = genquarticg.c
-genrang_SOURCES = genrang.c
+-genspecialg_SOURCES = genspecialg.c
-gentourng_SOURCES = gentourng.c
+-gentreeg_SOURCES = gentreeg.c
+-hamheuristic_SOURCES = hamheuristic.c
-labelg_SOURCES = labelg.c
-linegraphg_SOURCES = linegraphg.c
-listg_SOURCES = listg.c
@@ -305,6 +404,8 @@ Last-Update: 2013-11-25
-shortg_SOURCES = shortg.c
-showg_SOURCES = showg.c
-subdivideg_SOURCES = subdivideg.c
+-twohamg_SOURCES = twohamg.c
+-vcolg_SOURCES = vcolg.c
-watercluster2_SOURCES = watercluster2.c
-blisstog_SOURCES = blisstog.c
-checks6_SOURCES = checks6.c
@@ -316,15 +417,24 @@ Last-Update: 2013-11-25
-biplabg_LDADD = $(NAUTY_LDADD)
-catg_LDADD = $(NAUTY_LDADD)
-complg_LDADD = $(NAUTY_LDADD)
+-converseg_LDADD = $(NAUTY_LDADD)
-copyg_LDADD = $(NAUTY_LDADD)
-countg_LDADD = $(NAUTY_LDADD)
+-cubhamg_LDADD = $(NAUTY_LDADD)
-deledgeg_LDADD = $(NAUTY_LDADD)
+-delptg_LDADD = $(NAUTY_LDADD)
-directg_LDADD = $(NAUTY_LDADD)
+-dretodot_LDADD = $(NAUTY_LDADD) $(LIBM)
-dretog_LDADD = $(NAUTY_LDADD)
-genbg_LDADD = $(NAUTYW1_LDADD)
+-genbgL_LDADD = $(NAUTYL1_LDADD)
-geng_LDADD = $(NAUTYW1_LDADD)
+-genquarticg_LDADD = $(NAUTYL1_LDADD)
-genrang_LDADD = $(NAUTY_LDADD)
+-genspecialg_LDADD = $(NAUTY_LDADD)
-gentourng_LDADD = $(NAUTY_LDADD)
+-gentreeg_LDADD = $(NAUTY_LDADD)
+-hamheuristic_LDADD = $(NAUTY_LDADD)
-labelg_LDADD = $(NAUTY_LDADD)
-linegraphg_LDADD = $(NAUTY_LDADD)
-listg_LDADD = $(NAUTY_LDADD)
@@ -337,6 +447,8 @@ Last-Update: 2013-11-25
-shortg_LDADD = $(NAUTY_LDADD)
-showg_LDADD =
-subdivideg_LDADD = $(NAUTY_LDADD)
+-twohamg_LDADD = $(NAUTY_LDADD)
+-vcolg_LDADD = $(NAUTY_LDADD)
-watercluster2_LDADD = $(NAUTY_LDADD)
-blisstog_LDADD = $(NAUTY_LDADD) $(ZLIB_LIBS)
-checks6_LDADD = $(NAUTY_LDADD)
@@ -346,15 +458,24 @@ Last-Update: 2013-11-25
+nauty_biplabg_SOURCES = biplabg.c
+nauty_catg_SOURCES = catg.c
+nauty_complg_SOURCES = complg.c
++nauty_converseg_SOURCES = converseg.c
+nauty_copyg_SOURCES = copyg.c
+nauty_countg_SOURCES = testg.c
++nauty_cubhamg_SOURCES = cubhamg.c
+nauty_deledgeg_SOURCES = deledgeg.c
++nauty_delptg_SOURCES = delptg.c
+nauty_directg_SOURCES = directg.c
++nauty_dretodot_SOURCES = dretodot.c
+nauty_dretog_SOURCES = dretog.c
+nauty_genbg_SOURCES = genbg.c
++nauty_genbgL_SOURCES = genbg.c
+nauty_geng_SOURCES = geng.c
++nauty_genquarticg_SOURCES = genquarticg.c
+nauty_genrang_SOURCES = genrang.c
++nauty_genspecialg_SOURCES = genspecialg.c
+nauty_gentourng_SOURCES = gentourng.c
++nauty_gentreeg_SOURCES = gentreeg.c
++nauty_hamheuristic_SOURCES = hamheuristic.c
+nauty_labelg_SOURCES = labelg.c
+nauty_linegraphg_SOURCES = linegraphg.c
+nauty_listg_SOURCES = listg.c
@@ -367,6 +488,8 @@ Last-Update: 2013-11-25
+nauty_shortg_SOURCES = shortg.c
+nauty_showg_SOURCES = showg.c
+nauty_subdivideg_SOURCES = subdivideg.c
++nauty_twohamg_SOURCES = twohamg.c
++nauty_vcolg_SOURCES = vcolg.c
+nauty_watercluster2_SOURCES = watercluster2.c
+nauty_blisstog_SOURCES = blisstog.c
+nauty_checks6_SOURCES = checks6.c
@@ -378,15 +501,24 @@ Last-Update: 2013-11-25
+nauty_biplabg_LDADD = $(NAUTY_LDADD)
+nauty_catg_LDADD = $(NAUTY_LDADD)
+nauty_complg_LDADD = $(NAUTY_LDADD)
++nauty_converseg_LDADD = $(NAUTY_LDADD)
+nauty_copyg_LDADD = $(NAUTY_LDADD)
+nauty_countg_LDADD = $(NAUTY_LDADD)
++nauty_cubhamg_LDADD = $(NAUTY_LDADD)
+nauty_deledgeg_LDADD = $(NAUTY_LDADD)
++nauty_delptg_LDADD = $(NAUTY_LDADD)
+nauty_directg_LDADD = $(NAUTY_LDADD)
++nauty_dretodot_LDADD = $(NAUTY_LDADD) $(LIBM)
+nauty_dretog_LDADD = $(NAUTY_LDADD)
+nauty_genbg_LDADD = $(NAUTYW1_LDADD)
++nauty_genbgL_LDADD = $(NAUTYL1_LDADD)
+nauty_geng_LDADD = $(NAUTYW1_LDADD)
++nauty_genquarticg_LDADD = $(NAUTYL1_LDADD)
+nauty_genrang_LDADD = $(NAUTY_LDADD)
++nauty_genspecialg_LDADD = $(NAUTY_LDADD)
+nauty_gentourng_LDADD = $(NAUTY_LDADD)
++nauty_gentreeg_LDADD = $(NAUTY_LDADD)
++nauty_hamheuristic_LDADD = $(NAUTY_LDADD)
+nauty_labelg_LDADD = $(NAUTY_LDADD)
+nauty_linegraphg_LDADD = $(NAUTY_LDADD)
+nauty_listg_LDADD = $(NAUTY_LDADD)
@@ -399,6 +531,8 @@ Last-Update: 2013-11-25
+nauty_shortg_LDADD = $(NAUTY_LDADD)
+nauty_showg_LDADD =
+nauty_subdivideg_LDADD = $(NAUTY_LDADD)
++nauty_twohamg_LDADD = $(NAUTY_LDADD)
++nauty_vcolg_LDADD = $(NAUTY_LDADD)
+nauty_watercluster2_LDADD = $(NAUTY_LDADD)
+nauty_blisstog_LDADD = $(NAUTY_LDADD) $(ZLIB_LIBS)
+nauty_checks6_LDADD = $(NAUTY_LDADD)
@@ -417,16 +551,24 @@ Last-Update: 2013-11-25
fi
LC_COLLATE=C sort $out2 >>$out1
-@@ -82,9 +82,9 @@
+@@ -82,13 +82,13 @@
runonetest ./dreadtest4K nautest2.dre nautest2a.ans
runonetest "./dreadtest4K -o As" nautest2.dre nautest2b.ans
-runonetest "./geng -ud1D7t 11" "" nautesta.ans
-runonetest "./geng -cd1f 10 | ./labelg -q" "" nautestb.ans
--runonetest "./genrang -r3 114 100 | ./countg --nedDr -q | sed '/^:/d'" "" nautestc.ans
+-runonetest "./genrang -r3 114 100 | ./countg --nedDr -q" "" nautestc.ans
+-runonetest "./gentourng -q -z 8 | ./pickg -T3" "" nautestd.ans
+-runonetest "./gentreeg -q -s 18 | ./countg -z6 --o" "" nauteste.ans
+-runonetest "./geng -c -q 8 8 | ./directg -q -o | ./converseg -q | ./labelg -q" "" nautestf.ans
+-runonetest "./genbg -q 4 3 10 | ./vcolg -m6 -T" "" nautestg.ans
+runonetest "./nauty-geng -ud1D7t 11" "" nautesta.ans
+runonetest "./nauty-geng -cd1f 10 | ./nauty-labelg -q" "" nautestb.ans
-+runonetest "./nauty-genrang -r3 114 100 | ./nauty-countg --nedDr -q | sed '/^:/d'" "" nautestc.ans
++runonetest "./nauty-genrang -r3 114 100 | ./nauty-countg --nedDr -q" "" nautestc.ans
++runonetest "./nauty-gentourng -q -z 8 | ./nauty-pickg -T3" "" nautestd.ans
++runonetest "./nauty-gentreeg -q -s 18 | ./nauty-countg -z6 --o" "" nauteste.ans
++runonetest "./nauty-geng -c -q 8 8 | ./nauty-directg -q -o | ./nauty-converseg -q | ./nauty-labelg -q" "" nautestf.ans
++runonetest "./nauty-genbg -q 4 3 10 | ./nauty-vcolg -m6 -T" "" nautestg.ans
+
+ echo " "
- echo
- echo "${0##*/}: $fails test(s) failed over $tdx tests"
diff --git a/debian/patches/debianization.patch b/debian/patches/debianization.patch
index 7787dd7..e505129 100644
--- a/debian/patches/debianization.patch
+++ b/debian/patches/debianization.patch
@@ -6,7 +6,7 @@ Last-Update: 2013-11-24
--- a/dreadnaut.c
+++ b/dreadnaut.c
-@@ -395,7 +395,11 @@
+@@ -476,7 +476,11 @@
if (prompt)
{
@@ -39,7 +39,7 @@ Last-Update: 2013-11-24
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA= nauty.pc
-@@ -130,7 +133,7 @@
+@@ -153,7 +156,7 @@
$(HELP2MAN) \
-s 1 \
$(AM_H2MFLAGS) \
@@ -48,7 +48,7 @@ Last-Update: 2013-11-24
-n $(if $($*_DESCRIPTION), $($*_DESCRIPTION), "manual page for $*") \
-o $@ \
$(top_builddir)/$<
-@@ -183,7 +186,7 @@
+@@ -217,7 +220,7 @@
checks6_DESCRIPTION = "check a file of graphs and optionally perform corrections"
sumlines_DESCRIPTION = "sum lines matching specified graph formats"
diff --git a/debian/patches/upstream-C2help2man.patch b/debian/patches/upstream-C2help2man.patch
index e943a0b..22de855 100644
--- a/debian/patches/upstream-C2help2man.patch
+++ b/debian/patches/upstream-C2help2man.patch
@@ -3,11 +3,11 @@ Description: format usages and helps
programs wrt to the original gtools.
Origin: debian
Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2013-11-21
+Last-Update: 2016-03-19
--- a/watercluster2.c
+++ b/watercluster2.c
-@@ -1,55 +1,59 @@
+@@ -1,54 +1,58 @@
// cc -O4 -o water2 -DWORDSIZE=32 -DMAXN=WORDSIZE nauty.c naugraph.c nautil.c gtools.c schreier.c naurng.c watercluster2.c
-/*
@@ -17,7 +17,7 @@ Last-Update: 2013-11-21
-
-ix means: the indegree of every vertex may be at most x.
-
--iy means: the outdegree of every vertex may be at most y.
+-oy means: the outdegree of every vertex may be at most y.
-
- S means: allow that for every pair of vertices x,y at most one of the edges x-->y
- and y-->x may be present. By default both of them may be present in the same graph.
@@ -28,15 +28,13 @@ Last-Update: 2013-11-21
- directed edges and then the list of directed edges with the start first
- and the end then. E.g.: 3 2 0 1 2 1 means 3 vertices, 2 directed edges:
- 0-->1 and 2-->1
-+#define GTOOL_USAGEHELP_COMPATIBILITY
-
+-
- B means: Output the directed graphs in a binary code. Every item of the code is an unsigned
- char. The first unsigned char is the number nv of vertices. The vertices are numbered 1..nv
- Then the list of vertices x for which there is a directed edge 1->x follow. This list is
- ended by a 0. Then the list of outgoing neighbours of 2 follows -- again ended with a 0, etc.
- The code is complete with the 0 ending the list of outgoing neighbours of nv.
-+#define USAGE "watercluster2 [ix] [oy] [S] [T] [B] [C] [m]"
-
+-
- C means: Do really construct all the directed graphs in memory, but don't output them. This is not
- a big difference in case of restricted in- and outdegrees, because all that is done extra is that
- edges are directed instead of just keeping track of in- and out-degrees. This option is intended only
@@ -57,19 +55,20 @@ Last-Update: 2013-11-21
-
-G. Brinkmann, Generating water clusters and other directed graphs,
-Journal of Mathematical Chemistry 46, 1112--1121 (2009)
--
++#define GTOOL_USAGEHELP_COMPATIBILITY
+
-October 10, 2011: corrected error caused by overflow of 32bit int used as hashvalue.
--
++#define USAGE "watercluster2 [ix] [oy] [S] [T] [B] [C] [m]"
+
-Sep, 2012: PROCESS feature added by BDM.
--*/
+#define HELPTEXT \
+" Reads graphs in g6 code or multicode (optional) from stdin and directs them\n\
+\n\
+ ix : the indegree of every vertex may be at most x.\n\
-+ The default maximum indegree is unlimited.\n\
++ The default maximum indegree is unlimited.\n\
+\n\
+ oy : the outdegree of every vertex may be at most y.\n\
-+ The default maximum outdegree is unlimited.\n\
++ The default maximum outdegree is unlimited.\n\
+\n\
+ S : allow that for every pair of vertices x,y at most one of the edges x-->y\n\
+ and y-->x may be present. By default both of them may be present in the same graph.\n\
@@ -101,20 +100,19 @@ Last-Update: 2013-11-21
+ case of waterclusters, where large numbers were determined. If large numbers (without output)\n\
+ for other cases shall be determined, one should think about adding the multiplication routines.\n\
+\n\
-+ m : Read multicode instead of g6 code\n\
++ m : read multicode instead of g6 code\n\
+\n\
+This program uses different labelling routines -- all based on the ideas of\n\
+\n\
+G. Brinkmann, Generating water clusters and other directed graphs,\n\
+Journal of Mathematical Chemistry 46, 1112--1121 (2009)\n"
+/*
-+ * October 10, 2011: corrected error caused by overflow of 32bit int used as hashvalue.\n\
++ * October 10, 2011: corrected error caused by overflow of 32bit int used as hashvalue.
+ *
+ * Sep, 2012: PROCESS feature added by BDM.
-+ */
+ */
/* PROCESS feature
- *
@@ -67,7 +71,7 @@
*
* If SUMMARY is defined, it must expand as the name of a procedure
@@ -188,8 +186,8 @@ Last-Update: 2013-11-21
" Find all bicoloured graphs of a specified class.\n\
--- a/geng.c
+++ b/geng.c
-@@ -5,8 +5,7 @@
- /* geng.c version 2.7; B D McKay, Jan 2013. */
+@@ -6,8 +6,7 @@
+ /* geng.c version 2.9; B D McKay, Jan 2016. */
#define USAGE \
-"geng [-cCmtfbd#D#] [-uygsnh] [-lvq] \n\
@@ -200,13 +198,192 @@ Last-Update: 2013-11-21
" Generate all graphs of a specified class.\n\
--- a/genrang.c
+++ b/genrang.c
-@@ -1,8 +1,7 @@
- /* genrang.c version 1.6; B D McKay, Mar 2, 2010 */
+@@ -2,8 +2,7 @@
+ /* TODO: Check allocs for no edges */
#define USAGE \
--"genrang [-P#|-P#/#|-e#|-r#|-R#] [-l#] [-m#] [-t] [-a] \n" \
--" [-s|-g] [-S#] [-q] n num [outfile]"
-+"genrang [-P#|-P#/#|-e#|-r#|-R#] [-l#] [-m#] [-t] [-a] [-s|-g] [-S#] [-q] n num [outfile]"
+-"genrang [-P#|-P#/#|-e#|-r#|-R#|-d#] [-l#] [-m#] [-t] [-T] [-a] \n" \
+-" [-s|-g|-z] [-S#] [-q] n|n1,n2 num [outfile]"
++"genrang [-P#|-P#/#|-e#|-r#|-R#|-d#] [-l#] [-m#] [-t] [-T] [-a] [-s|-g|-z] [-S#] [-q] n|n1,n2 num [outfile]"
#define HELPTEXT \
" Generate random graphs.\n\
+--- a/vcolg.c
++++ b/vcolg.c
+@@ -1,8 +1,7 @@
+ /* vcolg.c version 1.0; B D McKay, Aug 31, 2013 */
+
+ #define USAGE \
+-"vcolg [-q] [-u|-T|-G|-A|-B] [-e#|-e#:#] \n" \
+-" [-m#] [-f#] [-D#|-r#|-l#] [infile [outfile]]"
++"vcolg [-q] [-u|-T|-G|-A|-B] [-e#|-e#:#] [-m#] [-f#] [-D#|-r#|-l#] [infile [outfile]]"
+
+ #define HELPTEXT \
+ " Read undirected loop-free graphs and colour their vertices in\n\
+--- a/genspecialg.c
++++ b/genspecialg.c
+@@ -1,20 +1,22 @@
+ /* genspecialg.c version 1.1; B D McKay, Feb 12, 2016 */
+
+-#define USAGE "genspecialg \n\
+-[-s|-g|-z|-d] [-q] \
+-[-p#|-c#|-e#|-k#|-b#,#|-Q#|-f#|-J#,#|-P#,#|C#,#...|G#,#...|T#,#...] [outfile]"
++#define USAGE "genspecialg [-s|-g|-z|-d] [-q] [-p#|-c#|-e#|-k#|-b#,#|-Q#|-f#|-J#,#|-P#,#|C#[,#]|G#[,#]|T#[,#]] [outfile]"
+
+ #define HELPTEXT \
+ " Generate one particular graph.\n\
+- # : size parameter called n in the descriptions\n\
+ \n\
++Options:\n\
++General Options:\n\
+ -s : Write in sparse6 format (default)\n\
+ -g : Write in graph6 format\n\
+ -z : Make digraph versions and write in digraph6 format\n\
+ -d : Write in dreadnaut format (can be used with -z)\n\
+ -q : Suppress summary\n\
+ \n\
+- If defined, the digraph version is shown in parentheses:\n\
++Special Options:\n\
++ If defined, the digraph version is shown in parentheses;\n\
++ # size parameter called n in the descriptions.\n\
++\n\
+ -p# : path (directed path) on n vertices.\n\
+ -c# : cycle (directed cycle) on n vertices.\n\
+ -e# : empty graph (digraph with loops only) on n vertices.\n\
+@@ -24,9 +26,9 @@
+ -P#,# : generalized Petersen graph; usual one is -P5,2\n\
+ -Q# : hypercube on 2^n vertices and degree n.\n\
+ -J#,# : Johnson graph J(n,k), args are n and k.\n\
+- -C#,#... : circulant (di)graph.\n\
+- -T#,#... : theta (di)graph Theta(#,#,...), give path lengths.\n\
+- -G#,#... : (directed) grid, use negative values for open directions\n"
++ -C#[,#] : circulant (di)graph.\n\
++ -T#[,#] : theta (di)graph Theta(#[,#]), give path lengths.\n\
++ -G#[,#] : (directed) grid, use negative values for open directions\n"
+
+ /* Ideas: multipartite, knesser, full trees */
+
+--- a/cubhamg.c
++++ b/cubhamg.c
+@@ -1,54 +1,53 @@
+-/* cubhamg.c : pick those inputs that are nonhamiltonian and
+- have max degree <= 3.
++/* cubhamg.c : pick those inputs that are nonhamiltonian and have max degree <= 3. */
+
+- Usage:
+-cubhamg [-#] [-v|-V] [-n#-#|-y#-#|-i|-I|-o|-x|-e|-E] [-b|-t] [infile [outfile]]
++#define USAGE "cubhamg [-#] [-v|-V] [-n#-#|-y#-#|-i|-I|-o|-x|-e|-E] [-b|-t] [infile [outfile]]"
+
+- infile is the name of the input file in graph6/sparse6 format
+- outfile is the name of the output file in the same format
++#define HELPTEXT \
++" Pick those inputs that are nonhamiltonian and have max degree <= 3.\n\
++\n\
++ infile is the name of the input file in graph6/sparse6 format (default: stdin)\n\
++\n\
++ outfile is the name of the output file in the same format (default: stdout)\n\
++\n\
++ The output file will have a header >>graph6<< or >>sparse6<< if the input file does.\n\
++\n\
++Options:\n\
++ -# A parameter useful for tuning (default 100)\n\
++ -v Report nonhamiltonian graphs and noncubic graphs\n\
++ -V .. in addition give a cycle for the hamiltonian ones\n\
++ -n#-# If the two numbers are v and i, then the i-th edge\n\
++ out of vertex v is required to be not in the cycle.\n\
++ It must be that i=1..3 and v=0..n-1.\n\
++ -y#-# If the two numbers are v and i, then the i-th edge\n\
++ out of vertex v is required to be in the cycle.\n\
++ It must be that i=1..3 and v=0..n-1.\n\
++ You can use any number of -n/-y switches to force\n\
++ edges. Out of range first arguments are ignored.\n\
++ If -y and -n give same edge, -y wins.\n\
++ -i Test + property: for each edge e, there is a hamiltonian cycle using e.\n\
++ -I Test ++ property: for each pair of edges e,e', there is\n\
++ a hamiltonian cycle which uses both e and e'.\n\
++ -o Test - property: for each edge e, there is a hamiltonian cycle avoiding e.\n\
++ -x Test +- property: for each pair of edges e,e', there is\n\
++ a hamiltonian cycle which uses e but avoids e'.\n\
++ -e Test 3/4 property: for each edge e, at least 3 of the 4\n\
++ paths of length 3 passing through e lie on hamiltonian cycles.\n\
++ -E Test 3/4+ property: for each edge e failing the 3/4 property,\n\
++ all three ways of joining e to the rest of the graph are\n\
++ hamiltonian avoiding e.\n\
++ -T# Specify a timeout, being a limit on how many search tree\n\
++ nodes are made. If the timeout occurs, the graph is\n\
++ written to the output as if it is nonhamiltonian.\n\
++ -R# Specify the number of repeat attempts for each stage.\n\
++ -F Analyze covering paths from 2 or 4 vertices of degree 2.\n\
++\n\
++ -b Require biconnectivity\n\
++ -t Require triconnectivity (note: quadratic algorithm)\n\
++\n\
++Comments:\n\
++ -y, -n, -#, -R and -T are ignored for -i, -I, -x, -o, -e, -E, -F\n"
+
+- stdin and stdout are the defaults for infile and outfile
+-
+- The output file will have a header >>graph6<< or >>sparse6<<
+- if and only if the input file does.
+-
+- Optional switches:
+-
+- -# A parameter useful for tuning (default 100)
+- -v Report nonhamiltonian graphs and noncubic graphs
+- -V .. in addition give a cycle for the hamiltonian ones
+- -n#-# If the two numbers are v and i, then the i-th edge
+- out of vertex v is required to be not in the cycle.
+- It must be that i=1..3 and v=0..n-1.
+- -y#-# If the two numbers are v and i, then the i-th edge
+- out of vertex v is required to be in the cycle.
+- It must be that i=1..3 and v=0..n-1.
+- You can use any number of -n/-y switches to force
+- edges. Out of range first arguments are ignored.
+- If -y and -n give same edge, -y wins.
+- -i Test + property: for each edge e, there is a hamiltonian
+- cycle using e.
+- -I Test ++ property: for each pair of edges e,e', there is
+- a hamiltonian cycle which uses both e and e'.
+- -o Test - property: for each edge e, there is a hamiltonian
+- cycle avoiding e.
+- -x Test +- property: for each pair of edges e,e', there is
+- a hamiltonian cycle which uses e but avoids e'.
+- -e Test 3/4 property: for each edge e, at least 3 of the 4
+- paths of length 3 passing through e lie on hamiltonian cycles.
+- -E Test 3/4+ property: for each edge e failing the 3/4 property,
+- all three ways of joining e to the rest of the graph are
+- hamiltonian avoiding e.
+- -T# Specify a timeout, being a limit on how many search tree
+- nodes are made. If the timeout occurs, the graph is
+- written to the output as if it is nonhamiltonian.
+- -R# Specify the number of repeat attempts for each stage.
+- -F Analyze covering paths from 2 or 4 vertices of degree 2.
+-
+- -b Require biconnectivity
+- -t Require triconnectivity (note: quadratic algorithm)
+-
+- -y, -n, -#, -R and -T are ignored for -i, -I, -x, -o, -e, -E, -F
++/**************************************************************************
+
+ B. D. McKay, Nov 1995 + Aug 1996 + Feb 2002 + Jul 2008 + Nov 2015
+
+@@ -1611,6 +1610,8 @@
+ char *arg;
+ int codetype;
+
++ HELP;
++
+ infilename = outfilename = NULL;
+ badargs = FALSE;
+ e34plus = e34 = in = out = inin = inout = FALSE;
+@@ -1729,8 +1730,8 @@
+
+ if (badargs)
+ {
+- fprintf(stderr,
+- ">E Usage: cubhamg [-#] [-v | -V] [-n#-#] [-y#-#] [infile [outfile]]\n");
++ fprintf(stderr, ">E Usage: " USAGE "\n" );
++ GETHELP;
+ exit(1);
+ }
+
diff --git a/debian/patches/upstream-autotoolization.patch b/debian/patches/upstream-autotoolization.patch
index 097440c..5bd5476 100644
--- a/debian/patches/upstream-autotoolization.patch
+++ b/debian/patches/upstream-autotoolization.patch
@@ -2,14 +2,14 @@ Description: upstream autotoolization
Attempt to autotoolize nauty source.
Origin: debian
Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2014-02-21
+Last-Update: 2016-03-19
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,22 @@
dnl Process this file with autoconf to produce a configure script.
--AC_INIT(dreadnaut.c)
-+AC_INIT([nauty],[2.5.9],[bdm at cs.anu.edu.au],[nauty],[http://pallini.di.uniroma1.it/])
+-AC_INIT(nauty-h.in)
++AC_INIT([nauty],[2.6.3],[bdm at cs.anu.edu.au],[nauty],[http://pallini.di.uniroma1.it/])
+AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_AUX_DIR([autotool])
+AC_CONFIG_SRCDIR([dreadnaut.c])
@@ -30,7 +30,7 @@ Last-Update: 2014-02-21
AC_DEFUN([AX_TLS], [
AC_MSG_CHECKING(for thread local storage (TLS) class)
-@@ -58,10 +75,17 @@
+@@ -58,82 +75,89 @@
dnl Checks for system features
AC_CANONICAL_HOST
@@ -51,8 +51,7 @@ Last-Update: 2014-02-21
MORECFLAGS=""
dnl we need AC_SYS_LARGEFILE and AC_FUNC_FSEEKO
AC_SYS_LARGEFILE
-@@ -70,72 +94,72 @@
- fi
+ AS_IF([test x"$ac_cv_sys_file_offset_bits" = xno],[ac_cv_sys_file_offset_bits=0],[])
AC_SUBST(ac_cv_sys_file_offset_bits)
-if test x"$user_cflags" = x"" -o x"$user_cflags" = x-m32 ; then
@@ -62,7 +61,7 @@ Last-Update: 2014-02-21
- AC_TRY_CFLAGS([-O2],[CFLAGS="$CFLAGS -O2"],[CFLAGS="$CFLAGS -O"]);
- fi
- else
-- AC_TRY_CFLAGS([-O4],[CFLAGS="$CFLAGS -O4"]);
+- AC_TRY_CFLAGS([-O4 -Werror],[CFLAGS="$CFLAGS -O4"]);
- if test x"$ac_cv_try_cflags_ok" = x"no"; then
- AC_TRY_CFLAGS([-O3],[CFLAGS="$CFLAGS -O3"]);
- if test x"$ac_cv_try_cflags_ok" = x"no"; then
@@ -84,7 +83,7 @@ Last-Update: 2014-02-21
- ;;
- *pentium4*)
- AC_TRY_CFLAGS([-march=pentium4],[CFLAGS="$CFLAGS -march=pentium4"]);;
-- *pentium3*|*i686*|*athlon*|x86*)
+- *pentium3*|*i686*|*athlon*)
- AC_TRY_CFLAGS([-march=i686],[CFLAGS="$CFLAGS -march=i686"]);;
- *pentium2*|*i586*)
- AC_TRY_CFLAGS([-march=i586],[CFLAGS="$CFLAGS -march=i586"]);;
@@ -128,7 +127,7 @@ Last-Update: 2014-02-21
+dnl AC_TRY_CFLAGS([-O2],[CFLAGS="$CFLAGS -O2"],[CFLAGS="$CFLAGS -O"]);
+dnl fi
+dnl else
-+dnl AC_TRY_CFLAGS([-O4],[CFLAGS="$CFLAGS -O4"]);
++dnl AC_TRY_CFLAGS([-O4 -Werror],[CFLAGS="$CFLAGS -O4"]);
+dnl if test x"$ac_cv_try_cflags_ok" = x"no"; then
+dnl AC_TRY_CFLAGS([-O3],[CFLAGS="$CFLAGS -O3"]);
+dnl if test x"$ac_cv_try_cflags_ok" = x"no"; then
@@ -150,7 +149,7 @@ Last-Update: 2014-02-21
+dnl ;;
+dnl *pentium4*)
+dnl AC_TRY_CFLAGS([-march=pentium4],[CFLAGS="$CFLAGS -march=pentium4"]);;
-+dnl *pentium3*|*i686*|*athlon*|x86*)
++dnl *pentium3*|*i686*|*athlon*)
+dnl AC_TRY_CFLAGS([-march=i686],[CFLAGS="$CFLAGS -march=i686"]);;
+dnl *pentium2*|*i586*)
+dnl AC_TRY_CFLAGS([-march=i586],[CFLAGS="$CFLAGS -march=i586"]);;
@@ -176,21 +175,21 @@ Last-Update: 2014-02-21
+dnl AC_TRY_CFLAGS([-mpowerpc],[CFLAGS="$CFLAGS -mpowerpc"]);;
+dnl esac;;
+dnl *osf*)
-+dnl AC_TRY_CFLAGS([-fast],[CFLAGS="$CFLAGS -fast"]);;
++dnl AC_TRY_CFLAGS([-fast],[CFLAGS="$CFLAGS -fast"]);;
+dnl *sparcv8*|*sparcv9*)
-+dnl AC_TRY_CFLAGS([-msupersparc],[CFLAGS="$CFLAGS -msupersparc"])
++dnl AC_TRY_CFLAGS([-msupersparc],[CFLAGS="$CFLAGS -msupersparc"])
+dnl if test x"$ac_cv_try_cflags_ok" = x"no"; then
-+dnl AC_TRY_CFLAGS([-cg92],[CFLAGS="$CFLAGS -cg92"])
-+dnl if test x"$ac_cv_try_cflags_ok" = x"no"; then
-+dnl AC_TRY_CFLAGS([-xcg92],[CFLAGS="$CFLAGS -xcg92"])
-+dnl fi
-+dnl fi;;
-+dnl esac
++dnl AC_TRY_CFLAGS([-cg92],[CFLAGS="$CFLAGS -cg92"])
++dnl if test x"$ac_cv_try_cflags_ok" = x"no"; then
++dnl AC_TRY_CFLAGS([-xcg92],[CFLAGS="$CFLAGS -xcg92"])
++dnl fi
++dnl fi;;
++dnl esac
+dnl fi
echo CFLAGS=$CFLAGS
echo MORECFLAGS=$MORECFLAGS
-@@ -376,6 +400,24 @@
+@@ -431,6 +455,26 @@
edit_msg="++++++ This file is automatically generated, don't edit it by hand! ++++++"
AC_SUBST(edit_msg)
@@ -202,6 +201,8 @@ Last-Update: 2014-02-21
+dnl Checks for libraries
+## pkg-config
+PKG_PROG_PKG_CONFIG
++## math library
++LT_LIB_M
+## zlib Library (zlib)
+AM_PATH_ZLIB(1.2.7,[],[AC_MSG_WARN([could not find required version of zlib])])
+## GNU MultiPrecision arithmetic library (GMP)
@@ -219,7 +220,7 @@ Last-Update: 2014-02-21
+AC_OUTPUT
--- /dev/null
+++ b/Makefile.am
-@@ -0,0 +1,416 @@
+@@ -0,0 +1,483 @@
+AUTOMAKE_OPTIONS = foreign
+ACLOCAL_AMFLAGS = -I m4
+
@@ -248,15 +249,24 @@ Last-Update: 2014-02-21
+ biplabg \
+ catg \
+ complg \
++ converseg \
+ copyg \
+ countg \
++ cubhamg \
+ deledgeg \
++ delptg \
+ directg \
++ dretodot \
+ dretog \
+ genbg \
++ genbgL \
+ geng \
++ genquarticg \
+ genrang \
++ genspecialg \
+ gentourng \
++ gentreeg \
++ hamheuristic \
+ labelg \
+ linegraphg \
+ listg \
@@ -269,6 +279,8 @@ Last-Update: 2014-02-21
+ shortg \
+ showg \
+ subdivideg \
++ twohamg \
++ vcolg \
+ watercluster2 \
+ \
+ blisstog \
@@ -283,15 +295,24 @@ Last-Update: 2014-02-21
+ biplabg.1 \
+ catg.1 \
+ complg.1 \
++ converseg.1 \
+ copyg.1 \
+ countg.1 \
++ cubhamg.1 \
+ deledgeg.1 \
++ delptg.1 \
+ directg.1 \
++ dretodot.1 \
+ dretog.1 \
+ genbg.1 \
++ genbgL.1 \
+ geng.1 \
++ genquarticg.1 \
+ genrang.1 \
++ genspecialg.1 \
+ gentourng.1 \
++ gentreeg.1 \
++ hamheuristic.1 \
+ labelg.1 \
+ linegraphg.1 \
+ listg.1 \
@@ -304,6 +325,8 @@ Last-Update: 2014-02-21
+ shortg.1 \
+ showg.1 \
+ subdivideg.1 \
++ twohamg.1 \
++ vcolg.1 \
+ watercluster2.1 \
+ \
+ blisstog.1 \
@@ -341,6 +364,7 @@ Last-Update: 2014-02-21
+
+NAUTY_LDADD = $(top_builddir)/libnauty.la $(threadlib)
+NAUTYW1_LDADD = $(top_builddir)/libnautyW1.la $(threadlib)
++NAUTYL1_LDADD = $(top_builddir)/libnautyL1.la $(threadlib)
+
+AM_H2MFLAGS = \
+ --manual="Nauty Manual" \
@@ -361,33 +385,42 @@ Last-Update: 2014-02-21
+ $(SED) -e 's#LIBNAUTY_#LIBNAUTY'$(subst nauty,,$*)'_#' $< > $@
+
+##
-+#nauty_falvour_CPPFLAGS =
-+nautyA1_falvour_CPPFLAGS = -DMAXN=WORDSIZE
-+nautyS0_falvour_CPPFLAGS = -DWORDSIZE=16
-+nautyS1_falvour_CPPFLAGS = $(nautyA1_falvour_CPPFLAGS) $(nautyS0_falvour_CPPFLAGS)
-+nautyW0_falvour_CPPFLAGS = -DWORDSIZE=32
-+nautyW1_falvour_CPPFLAGS = $(nautyA1_falvour_CPPFLAGS) $(nautyW0_falvour_CPPFLAGS)
-+nautyL0_falvour_CPPFLAGS = -DWORDSIZE=64
-+nautyL1_falvour_CPPFLAGS = $(nautyA1_falvour_CPPFLAGS) $(nautyL0_falvour_CPPFLAGS)
++#nauty_flavour_CPPFLAGS =
++nautyA1_flavour_CPPFLAGS = -DMAXN=WORDSIZE
++nautyS0_flavour_CPPFLAGS = -DWORDSIZE=16
++nautyS1_flavour_CPPFLAGS = $(nautyA1_flavour_CPPFLAGS) $(nautyS0_flavour_CPPFLAGS)
++nautyW0_flavour_CPPFLAGS = -DWORDSIZE=32
++nautyW1_flavour_CPPFLAGS = $(nautyA1_flavour_CPPFLAGS) $(nautyW0_flavour_CPPFLAGS)
++nautyL0_flavour_CPPFLAGS = -DWORDSIZE=64
++nautyL1_flavour_CPPFLAGS = $(nautyA1_flavour_CPPFLAGS) $(nautyL0_flavour_CPPFLAGS)
+
+
+## short descriptions inspired from the basic functions of the programs as described
-+## in section `Utilities' (15) of the `Nauty and Traces User's Guide' (version 2.5)
++## in section `Utilities' (15) of the `Nauty and Traces User's Guide' (version 2.6)
+dreadnaut_DESCRIPTION = "command line interface to nauty graph isomorphism library"
+addedgeg_DESCRIPTION = "add an edge in each possible way"
+amtog_DESCRIPTION = "read graphs in matrix format"
+biplabg_DESCRIPTION = "label bipartite graphs so the colour classes are contiguous"
+catg_DESCRIPTION = "concatenate files of graphs"
+complg_DESCRIPTION = "complement graphs"
++converseg_DESCRIPTION = "converse digraphs"
+copyg_DESCRIPTION = "convert format and select subset"
+countg_DESCRIPTION = "count graphs according to a variety of properties"
++cubhamg_DESCRIPTION = "find hamiltonian cycles in subcubic graphs"
+deledgeg_DESCRIPTION = "delete an edge in each possible way"
++delptg_DESCRIPTION = "delete vertices"
+directg_DESCRIPTION = "generate small digraphs with given underlying graph"
-+dretog_DESCRIPTION = "read graphs in dreadnaut form"
++dretodot_DESCRIPTION = "read graphs and initial coloring in dreadnaut format and write in dot format"
++dretog_DESCRIPTION = "read graphs in dreadnaut format"
+genbg_DESCRIPTION = "generate small bicoloured graphs"
++genbgL_DESCRIPTION = "$(shell printf "%s %s" $(genbg_DESCRIPTION) "(L1 flavour)")"
+geng_DESCRIPTION = "generate small graphs"
++genquarticg_DESCRIPTION = "generate quartic graphs"
+genrang_DESCRIPTION = "generate random graphs"
++genspecialg_DESCRIPTION = "generate special graphs"
+gentourng_DESCRIPTION = "generate small tournaments"
++gentreeg_DESCRIPTION = "generate trees"
++hamheuristic_DESCRIPTION = "try to find hamiltonian cycles in any graphs"
+labelg_DESCRIPTION = "canonically label graphs"
+linegraphg_DESCRIPTION = "compute the linegraphs of a file of graphs"
+listg_DESCRIPTION = "display graphs in a variety of forms"
@@ -400,6 +433,8 @@ Last-Update: 2014-02-21
+shortg_DESCRIPTION = "remove isomorphs from a file of graphs"
+showg_DESCRIPTION = "$(shell printf "%s %s" $(listg_DESCRIPTION) "(stand-alone subset of listg)")"
+subdivideg_DESCRIPTION = "compute the subdivision graphs of a file of graphs"
++twohamg_DESCRIPTION = "split quartic graphs into two hamiltonian cycles"
++vcolg_DESCRIPTION = "colour the vertices of graphs in all distinct ways"
+watercluster2_DESCRIPTION = "$(shell printf "%s %s" $(directg_DESCRIPTION) "(faster alternative to directg)")"
+blisstog_DESCRIPTION = "convert files of graphs in bliss format to stdout in sparse6 format"
+checks6_DESCRIPTION = "check a file of graphs and optionally perform corrections"
@@ -411,15 +446,24 @@ Last-Update: 2014-02-21
+biplabg_CPPFLAGS =
+catg_CPPFLAGS =
+complg_CPPFLAGS =
++converseg_CPPFLAGS =
+copyg_CPPFLAGS =
+countg_CPPFLAGS =
++cubhamg_CPPFLAGS =
+deledgeg_CPPFLAGS =
++delptg_CPPFLAGS =
+directg_CPPFLAGS =
++dretodot_CPPFLAGS =
+dretog_CPPFLAGS =
-+genbg_CPPFLAGS = $(nautyW1_falvour_CPPFLAGS)
-+geng_CPPFLAGS = $(nautyW1_falvour_CPPFLAGS)
++genbg_CPPFLAGS = $(nautyW1_flavour_CPPFLAGS)
++genbgL_CPPFLAGS = $(nautyL1_flavour_CPPFLAGS) -DMAXN1=30
++geng_CPPFLAGS = $(nautyW1_flavour_CPPFLAGS)
++genquarticg_CPPFLAGS = $(nautyL1_flavour_CPPFLAGS)
+genrang_CPPFLAGS =
++genspecialg_CPPFLAGS =
+gentourng_CPPFLAGS = -DMAXN=24
++gentreeg_CPPFLAGS =
++hamheuristic_CPPFLAGS =
+labelg_CPPFLAGS =
+linegraphg_CPPFLAGS =
+listg_CPPFLAGS =
@@ -432,6 +476,8 @@ Last-Update: 2014-02-21
+shortg_CPPFLAGS =
+showg_CPPFLAGS =
+subdivideg_CPPFLAGS =
++twohamg_CPPFLAGS =
++vcolg_CPPFLAGS =
+watercluster2_CPPFLAGS = -DMAXN=32
+blisstog_CPPFLAGS = $(ZLIB_CFLAGS)
+checks6_CPPFLAGS =
@@ -443,15 +489,24 @@ Last-Update: 2014-02-21
+biplabg_SOURCES = biplabg.c
+catg_SOURCES = catg.c
+complg_SOURCES = complg.c
++converseg_SOURCES = converseg.c
+copyg_SOURCES = copyg.c
+countg_SOURCES = testg.c
++cubhamg_SOURCES = cubhamg.c
+deledgeg_SOURCES = deledgeg.c
++delptg_SOURCES = delptg.c
+directg_SOURCES = directg.c
++dretodot_SOURCES = dretodot.c
+dretog_SOURCES = dretog.c
+genbg_SOURCES = genbg.c
++genbgL_SOURCES = genbg.c
+geng_SOURCES = geng.c
++genquarticg_SOURCES = genquarticg.c
+genrang_SOURCES = genrang.c
++genspecialg_SOURCES = genspecialg.c
+gentourng_SOURCES = gentourng.c
++gentreeg_SOURCES = gentreeg.c
++hamheuristic_SOURCES = hamheuristic.c
+labelg_SOURCES = labelg.c
+linegraphg_SOURCES = linegraphg.c
+listg_SOURCES = listg.c
@@ -464,6 +519,8 @@ Last-Update: 2014-02-21
+shortg_SOURCES = shortg.c
+showg_SOURCES = showg.c
+subdivideg_SOURCES = subdivideg.c
++twohamg_SOURCES = twohamg.c
++vcolg_SOURCES = vcolg.c
+watercluster2_SOURCES = watercluster2.c
+blisstog_SOURCES = blisstog.c
+checks6_SOURCES = checks6.c
@@ -475,15 +532,24 @@ Last-Update: 2014-02-21
+biplabg_LDADD = $(NAUTY_LDADD)
+catg_LDADD = $(NAUTY_LDADD)
+complg_LDADD = $(NAUTY_LDADD)
++converseg_LDADD = $(NAUTY_LDADD)
+copyg_LDADD = $(NAUTY_LDADD)
+countg_LDADD = $(NAUTY_LDADD)
++cubhamg_LDADD = $(NAUTY_LDADD)
+deledgeg_LDADD = $(NAUTY_LDADD)
++delptg_LDADD = $(NAUTY_LDADD)
+directg_LDADD = $(NAUTY_LDADD)
++dretodot_LDADD = $(NAUTY_LDADD) $(LIBM)
+dretog_LDADD = $(NAUTY_LDADD)
+genbg_LDADD = $(NAUTYW1_LDADD)
++genbgL_LDADD = $(NAUTYL1_LDADD)
+geng_LDADD = $(NAUTYW1_LDADD)
++genquarticg_LDADD = $(NAUTYL1_LDADD)
+genrang_LDADD = $(NAUTY_LDADD)
++genspecialg_LDADD = $(NAUTY_LDADD)
+gentourng_LDADD = $(NAUTY_LDADD)
++gentreeg_LDADD = $(NAUTY_LDADD)
++hamheuristic_LDADD = $(NAUTY_LDADD)
+labelg_LDADD = $(NAUTY_LDADD)
+linegraphg_LDADD = $(NAUTY_LDADD)
+listg_LDADD = $(NAUTY_LDADD)
@@ -496,6 +562,8 @@ Last-Update: 2014-02-21
+shortg_LDADD = $(NAUTY_LDADD)
+showg_LDADD =
+subdivideg_LDADD = $(NAUTY_LDADD)
++twohamg_LDADD = $(NAUTY_LDADD)
++vcolg_LDADD = $(NAUTY_LDADD)
+watercluster2_LDADD = $(NAUTY_LDADD)
+blisstog_LDADD = $(NAUTY_LDADD) $(ZLIB_LIBS)
+checks6_LDADD = $(NAUTY_LDADD)
@@ -554,55 +622,55 @@ Last-Update: 2014-02-21
+ naugroup.c
+
+libnautyA1_la_DEPENDENCIES = $(libnautyA1_la_MAP)
-+libnautyA1_la_CPPFLAGS = $(nautyA1_falvour_CPPFLAGS)
++libnautyA1_la_CPPFLAGS = $(nautyA1_flavour_CPPFLAGS)
+libnautyA1_la_LIBADD = $(threadlib)
+libnautyA1_la_LDFLAGS = -version-info $(LIBNAUTY_LT_VERSION) $(libnautyA1_la_LD_VERSION_SCRIPT)
+libnautyA1_la_SOURCES =$(libnauty_la_SOURCES)
+
+libnautyS0_la_DEPENDENCIES = $(libnautyS0_la_MAP)
-+libnautyS0_la_CPPFLAGS = $(nautyS0_falvour_CPPFLAGS)
++libnautyS0_la_CPPFLAGS = $(nautyS0_flavour_CPPFLAGS)
+libnautyS0_la_LIBADD = $(threadlib)
+libnautyS0_la_LDFLAGS = -version-info $(LIBNAUTY_LT_VERSION) $(libnautyS0_la_LD_VERSION_SCRIPT)
+libnautyS0_la_SOURCES =$(libnauty_la_SOURCES)
+
+libnautyS1_la_DEPENDENCIES = $(libnautyS1_la_MAP)
-+libnautyS1_la_CPPFLAGS = $(nautyS1_falvour_CPPFLAGS)
++libnautyS1_la_CPPFLAGS = $(nautyS1_flavour_CPPFLAGS)
+libnautyS1_la_LIBADD = $(threadlib)
+libnautyS1_la_LDFLAGS = -version-info $(LIBNAUTY_LT_VERSION) $(libnautyS1_la_LD_VERSION_SCRIPT)
+libnautyS1_la_SOURCES =$(libnauty_la_SOURCES)
+
+libnautyW0_la_DEPENDENCIES = $(libnautyW0_la_MAP)
-+libnautyW0_la_CPPFLAGS = $(nautyW0_falvour_CPPFLAGS)
++libnautyW0_la_CPPFLAGS = $(nautyW0_flavour_CPPFLAGS)
+libnautyW0_la_LIBADD = $(threadlib)
+libnautyW0_la_LDFLAGS = -version-info $(LIBNAUTY_LT_VERSION) $(libnautyW0_la_LD_VERSION_SCRIPT)
+libnautyW0_la_SOURCES =$(libnauty_la_SOURCES)
+
+libnautyW1_la_DEPENDENCIES = $(libnautyW1_la_MAP)
-+libnautyW1_la_CPPFLAGS = $(nautyW1_falvour_CPPFLAGS)
++libnautyW1_la_CPPFLAGS = $(nautyW1_flavour_CPPFLAGS)
+libnautyW1_la_LIBADD = $(threadlib)
+libnautyW1_la_LDFLAGS = -version-info $(LIBNAUTY_LT_VERSION) $(libnautyW1_la_LD_VERSION_SCRIPT)
+libnautyW1_la_SOURCES =$(libnauty_la_SOURCES)
+
+libnautyL0_la_DEPENDENCIES = $(libnautyL0_la_MAP)
-+libnautyL0_la_CPPFLAGS = $(nautyL0_falvour_CPPFLAGS)
++libnautyL0_la_CPPFLAGS = $(nautyL0_flavour_CPPFLAGS)
+libnautyL0_la_LIBADD = $(threadlib)
+libnautyL0_la_LDFLAGS = -version-info $(LIBNAUTY_LT_VERSION) $(libnautyL0_la_LD_VERSION_SCRIPT)
+libnautyL0_la_SOURCES =$(libnauty_la_SOURCES)
+
+libnautyL1_la_DEPENDENCIES = $(libnautyL1_la_MAP)
-+libnautyL1_la_CPPFLAGS = $(nautyL1_falvour_CPPFLAGS)
++libnautyL1_la_CPPFLAGS = $(nautyL1_flavour_CPPFLAGS)
+libnautyL1_la_LIBADD = $(threadlib)
+libnautyL1_la_LDFLAGS = -version-info $(LIBNAUTY_LT_VERSION) $(libnautyL1_la_LD_VERSION_SCRIPT)
+libnautyL1_la_SOURCES =$(libnauty_la_SOURCES)
+
+dreadtest_CPPFLAGS = $(dreadnaut_CPPFLAGS) -DDREADTEST
-+dreadtest1_CPPFLAGS = $(dreadtest_CPPFLAGS) $(nautyA1_falvour_CPPFLAGS)
-+dreadtestS_CPPFLAGS = $(dreadtest_CPPFLAGS) $(nautyS0_falvour_CPPFLAGS)
-+dreadtestS1_CPPFLAGS = $(dreadtest_CPPFLAGS) $(nautyS1_falvour_CPPFLAGS)
-+dreadtestW_CPPFLAGS = $(dreadtest_CPPFLAGS) $(nautyW0_falvour_CPPFLAGS)
-+dreadtestW1_CPPFLAGS = $(dreadtest_CPPFLAGS) $(nautyW1_falvour_CPPFLAGS)
-+dreadtestL_CPPFLAGS = $(dreadtest_CPPFLAGS) $(nautyL0_falvour_CPPFLAGS)
-+dreadtestL1_CPPFLAGS = $(dreadtest_CPPFLAGS) $(nautyL1_falvour_CPPFLAGS)
++dreadtest1_CPPFLAGS = $(dreadtest_CPPFLAGS) $(nautyA1_flavour_CPPFLAGS)
++dreadtestS_CPPFLAGS = $(dreadtest_CPPFLAGS) $(nautyS0_flavour_CPPFLAGS)
++dreadtestS1_CPPFLAGS = $(dreadtest_CPPFLAGS) $(nautyS1_flavour_CPPFLAGS)
++dreadtestW_CPPFLAGS = $(dreadtest_CPPFLAGS) $(nautyW0_flavour_CPPFLAGS)
++dreadtestW1_CPPFLAGS = $(dreadtest_CPPFLAGS) $(nautyW1_flavour_CPPFLAGS)
++dreadtestL_CPPFLAGS = $(dreadtest_CPPFLAGS) $(nautyL0_flavour_CPPFLAGS)
++dreadtestL1_CPPFLAGS = $(dreadtest_CPPFLAGS) $(nautyL1_flavour_CPPFLAGS)
+dreadtest4K_CPPFLAGS = $(dreadtest_CPPFLAGS) -DMAXN=4096
+
+dreadtest_SOURCES = $(dreadnaut_SOURCES)
@@ -731,26 +799,14 @@ Last-Update: 2014-02-21
LC_COLLATE=C sort $out2 >>$out1
if ./naucompare "$out1" "$ok" ; then
rm $out1 $out2
-@@ -74,7 +84,9 @@
-
- runonetest "./geng -ud1D7t 11" "" nautesta.ans
- runonetest "./geng -cd1f 10 | ./labelg -q" "" nautestb.ans
--runonetest "./genrang -r3 114 100 | ./countg --nedDr -q" "" nautestc.ans
-+runonetest "./genrang -r3 114 100 | ./countg --nedDr -q | sed '/^:/d'" "" nautestc.ans
-+
-+echo
-+echo "${0##*/}: $fails test(s) failed over $tdx tests"
-
--echo " "
--echo $fails tests failed
-+exit $fails
--- /dev/null
+++ b/nauty.map
-@@ -0,0 +1,247 @@
+@@ -0,0 +1,278 @@
+LIBNAUTY_2.5 {
+global:
+## nauty.h
+labelorg;
++nauty_kill_request;
+alloc_error;
+breakout;
+cheapautom;
@@ -813,7 +869,6 @@ Last-Update: 2014-02-21
+dispatch_sparse;
+targetcell_sg;
+cheapautom_sg;
-+distvals;
+isautom_sg;
+refine_sg;
+testcanlab_sg;
@@ -830,6 +885,7 @@ Last-Update: 2014-02-21
+aresame_sg;
+put_sg;
+copy_sg;
++distvals;
+sparsenauty;
+adjacencies_sg;
+distances_sg;
@@ -842,6 +898,7 @@ Last-Update: 2014-02-21
+flushline;
+fixit;
+getint;
++getint_sl;
+hash;
+hashgraph;
+hashgraph_sg;
@@ -855,6 +912,8 @@ Last-Update: 2014-02-21
+putcanon_sg;
+putdegs;
+putdegs_sg;
++putdegseq;
++putdegseq_sg;
+putgraph;
+putgraph_sg;
+putmapping;
@@ -872,7 +931,9 @@ Last-Update: 2014-02-21
+ranperm;
+readgraph;
+readgraph_sg;
++readgraph_swg;
+readinteger;
++readinteger_sl;
+readperm;
+readptn;
+readvperm;
@@ -884,6 +945,7 @@ Last-Update: 2014-02-21
+setsize;
+sublabel;
+sublabel_sg;
++subpartition;
+unitptn;
+## naugroup.h
+freepermrec;
@@ -895,6 +957,8 @@ Last-Update: 2014-02-21
+permcycles;
+allgroup;
+allgroup2;
++allgroup3;
++freegroup;
+## schreier.h
+freeschreier;
+addpermutation;
@@ -923,22 +987,35 @@ Last-Update: 2014-02-21
+writeline;
+gtools_getline;
+graphsize;
++encodegraphsize;
+stringcounts;
+stringtograph;
++stringtograph_inc;
+edgecount;
++checkgline;
++readgg;
+readg;
++readgg_inc;
++readg_inc;
+ntog6;
+ntos6;
++ntod6;
+sgtos6;
+sgtog6;
++sgtod6;
+writeg6;
++writed6;
+writes6;
+writeg6_sg;
+writes6_sg;
++writed6_sg;
++ntois6;
++writeis6;
+writepc_sg;
+stringtosparsegraph;
+read_sg;
+read_sg_loops;
++read_sgg_loops;
+readpc_sg;
+readpcle_sg;
+getecline;
@@ -947,6 +1024,10 @@ Last-Update: 2014-02-21
+arg_int;
+arg_long;
+arg_range;
++doublevalue;
++arg_double;
++arg_doublerange;
++arg_sequence;
+writerange;
+gt_abort;
+stringcopy;
@@ -954,6 +1035,7 @@ Last-Update: 2014-02-21
+fcanonise;
+fcanonise_inv;
+fcanonise_inv_sg;
++setlabptn;
+fgroup;
+fgroup_inv;
+istransitive;
@@ -965,6 +1047,7 @@ Last-Update: 2014-02-21
+gt_numorbits;
+## gutils.h
+degstats;
++degstats2;
+diamstats;
+find_dist;
+find_dist2;
@@ -972,13 +1055,12 @@ Last-Update: 2014-02-21
+isbiconnected1;
+isbiconnected;
+isbipartite;
++bipartiteside;
+twocolouring;
+isconnected1;
+isconnected;
+issubconnected;
+maxcliques;
-+delete1;
-+conncontent;
+loopcount;
+pathcount1;
+cyclecount1;
@@ -991,6 +1073,10 @@ Last-Update: 2014-02-21
+cstarcontent;
+numtriangles1;
+numtriangles;
++numdirtriangles;
++delete1;
++conncontent;
++stronglyconnected;
+
+local: *;
+};
@@ -1167,8 +1253,8 @@ Last-Update: 2014-02-21
+])
--- a/gtools-h.in
+++ b/gtools-h.in
-@@ -50,8 +50,8 @@
- This twisted expression works up to n=227023 in 32-bit arithmetic
+@@ -60,8 +60,8 @@
+ This twisted expression works up to n=160529 in 32-bit arithmetic
and for larger n if size_t has 64 bits. */
-#include "naututil.h" /* which includes stdio.h */
@@ -1192,7 +1278,7 @@ Last-Update: 2014-02-21
typedef struct perm_struct
{
-@@ -51,3 +54,5 @@
+@@ -53,3 +56,5 @@
#ifdef __cplusplus
}
#endif
@@ -1222,7 +1308,7 @@ Last-Update: 2014-02-21
+#endif /* _NAURNG_H_ */
--- a/nausparse.h
+++ b/nausparse.h
-@@ -21,7 +21,7 @@
+@@ -23,7 +23,7 @@
#ifndef _NAUSPARSE_H_ /* only process this file once */
#define _NAUSPARSE_H_
@@ -1231,7 +1317,7 @@ Last-Update: 2014-02-21
#ifndef SG_WEIGHT
#define SG_WEIGHT int
-@@ -99,4 +99,4 @@
+@@ -125,4 +125,4 @@
}
#endif
@@ -1259,7 +1345,7 @@ Last-Update: 2014-02-21
+#endif /* _NAUTINV_H_ */
--- a/naututil-h.in
+++ b/naututil-h.in
-@@ -111,9 +111,13 @@
+@@ -114,9 +114,13 @@
* *
*****************************************************************************/
@@ -1276,7 +1362,7 @@ Last-Update: 2014-02-21
/* At this point we can assume that <sys/types.h>, <unistd.h>, <stddef.h>,
<stdlib.h>, <string.h> or <strings.h> and <malloc.h> if necessary have
been included if they exist. */
-@@ -276,3 +280,5 @@
+@@ -285,3 +289,5 @@
#endif /*NAUTY_SEED_DEFINED*/
/* @edit_msg@ */
@@ -1375,8 +1461,8 @@ Last-Update: 2014-02-21
+])
--- a/traces.h
+++ b/traces.h
-@@ -11,6 +11,9 @@
- * 28-Dec-12 : final changes for version 2.0 *
+@@ -22,6 +22,9 @@
+ * 28-Jan-16 : version ready for nauty and Traces v.2.6 distribution *
*****************************************************************************/
+#ifndef _TRACES_H_ /* only process this file once */
@@ -1385,19 +1471,10 @@ Last-Update: 2014-02-21
#include "gtools.h"
#include "schreier.h"
-@@ -48,10 +51,12 @@
- #endif
-
- extern void Traces(sparsegraph*,int*,int*,int*,TracesOptions*,
-- TracesStats*,sparsegraph*);
--extern void refine_tr(sparsegraph*,int*,int*,int*,int*,TracesOptions*);
-+ TracesStats*,sparsegraph*);
-+extern void refine_tr(sparsegraph*,int*,int*,int*,int*,TracesOptions*);
+@@ -61,3 +64,5 @@
+ TracesStats*,sparsegraph*);
+ extern void refine_tr(sparsegraph*,int*,int*,int*,int*,TracesOptions*);
extern void traces_freedyn(void);
-
- #ifdef __cplusplus
- }
- #endif
+
+#endif /* _TRACES_H_ */
--- a/gutils.h
@@ -1411,7 +1488,7 @@ Last-Update: 2014-02-21
#ifdef __cplusplus
extern "C" {
#endif
-@@ -37,3 +40,5 @@
+@@ -42,3 +45,5 @@
#ifdef __cplusplus
}
#endif
diff --git a/debian/patches/upstream-fix-gt_numorbits.patch b/debian/patches/upstream-fix-gt_numorbits.patch
index e812a24..c374523 100644
--- a/debian/patches/upstream-fix-gt_numorbits.patch
+++ b/debian/patches/upstream-fix-gt_numorbits.patch
@@ -5,7 +5,7 @@ Last-Update: 2013-11-22
--- a/labelg.c
+++ b/labelg.c
-@@ -78,7 +78,6 @@
+@@ -88,7 +88,6 @@
static nauty_counter orbtotal;
static double unorbtotal;
@@ -15,7 +15,7 @@ Last-Update: 2013-11-22
--- a/gtools-h.in
+++ b/gtools-h.in
-@@ -226,6 +226,7 @@
+@@ -267,6 +267,7 @@
extern TLS_ATTR char *readg_line;
extern TLS_ATTR size_t ogf_linelen;
extern TLS_ATTR boolean is_pipe;
@@ -25,7 +25,7 @@ Last-Update: 2013-11-22
}
--- a/gtnauty.c
+++ b/gtnauty.c
-@@ -17,7 +17,7 @@
+@@ -18,7 +18,7 @@
static int fuzz2[] = {006532,070236,035523,062437};
#define FUZZ2(x) ((x) ^ fuzz2[(x)&3])
diff --git a/debian/patches/upstream-zlib-blisstog_c.patch b/debian/patches/upstream-zlib-blisstog_c.patch
index 3f70ddd..c0d288a 100644
--- a/debian/patches/upstream-zlib-blisstog_c.patch
+++ b/debian/patches/upstream-zlib-blisstog_c.patch
@@ -3,13 +3,13 @@ Description: implement zlib support to blisstog utility
for the blisstog nauty tool.
Origin: debian
Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2013-11-25
+Last-Update: 2016-03-18
--- a/blisstog.c
+++ b/blisstog.c
-@@ -6,45 +6,39 @@
- " Read files of graphs in Bliss (Dimacs) format and write\n\
- them to stdout in sparse6 format.\n"
+@@ -9,45 +9,39 @@
+ -n#:# Specify a range of n values for output\n\
+ Input files with name *.gz are ungzipped\n"
-#define ZCAT "gunzip -c" /* name of zcat command (might be "gunzip -c") */
-
@@ -66,7 +66,7 @@ Last-Update: 2013-11-25
break;
case 'p':
-@@ -53,7 +47,7 @@
+@@ -56,7 +50,7 @@
fprintf(stderr,"Duplicate p line\n");
exit(1);
}
@@ -75,7 +75,7 @@ Last-Update: 2013-11-25
{
fprintf(stderr,"Bad p line\n");
return FALSE;
-@@ -67,8 +61,8 @@
+@@ -70,8 +64,8 @@
{
fprintf(stderr,"Missing p line\n");
return FALSE;
@@ -86,7 +86,7 @@ Last-Update: 2013-11-25
{
fprintf(stderr,"Bad n line\n");
return FALSE;
-@@ -81,7 +75,7 @@
+@@ -84,7 +78,7 @@
fprintf(stderr,"Missing p line or too many e lines\n");
return FALSE;
}
@@ -95,7 +95,7 @@ Last-Update: 2013-11-25
{
fprintf(stderr,"Bad e line\n");
return FALSE;
-@@ -91,10 +85,20 @@
+@@ -94,10 +88,20 @@
break;
default:
@@ -117,7 +117,7 @@ Last-Update: 2013-11-25
if (j != ne)
{
-@@ -107,7 +111,7 @@
+@@ -110,7 +114,7 @@
g->nde = 2*ne;
for (i = 0; i < n; ++i) g->d[i] = 0;
@@ -126,7 +126,7 @@ Last-Update: 2013-11-25
{
++(g->d[elist[j].v]);
++(g->d[elist[j].w]);
-@@ -116,7 +120,7 @@
+@@ -119,7 +123,7 @@
for (i = 1; i < n; ++i) g->v[i] = g->v[i-1] + g->d[i-1];
for (i = 0; i < n; ++i) g->d[i] = 0;
@@ -135,34 +135,68 @@ Last-Update: 2013-11-25
{
v = elist[j].v;
w = elist[j].w;
-@@ -132,63 +136,53 @@
+@@ -135,80 +139,69 @@
int
main(int argc, char *argv[])
{
- FILE *infile;
-+ gzFile infile;
- int j;
++ gzFile infile;
+ int j,firstarg;
SG_DECL(g);
- size_t flen;
- boolean ispipe;
+ int nmin,nmax;
- char zcmd[515];
HELP;
-- if (argc == 1)
+ nmax = -1;
+ if (argc >= 2 && argv[1][0] == '-' && argv[1][1] == 'n')
+ {
+- if (sscanf(argv[1]+2,"%d:%d",&nmin,&nmax) == 2) {}
++ if (sscanf(argv[1]+2,"%d:%d",&nmin,&nmax) == 2) {}
+ else if (sscanf(argv[1]+2,":%d",&nmax) == 1) { nmin = 1; }
+ else if (sscanf(argv[1]+2,"%d:",&nmin) == 1) { nmax = NAUTY_INFINITY; }
+ else gt_abort(">E blisstog: bad -n switch\n");
+-
+- firstarg = 2;
++ firstarg = 2;
+ }
+ else
+- firstarg = 1;
++ firstarg = 1;
+
+- if (argc == firstarg)
- {
- if (!readblissgraph(stdin,&g))
-- {
++ if (argc == firstarg)
+ {
- fprintf(stderr,">E Bliss error in file %s\n","stdin");
- gt_abort(NULL);
-- }
-- else
++ if ((infile = gzdopen(STDIN_FILENO,"r")) == NULL)
++ {
++ fprintf(stderr,">E Can't open stdin\n");
++ gt_abort(NULL);
++ }
++ else
++ {
++ if (!readblissgraph(infile,&g))
++ {
++ fprintf(stderr,">E Bliss error in stdin\n");
++ gt_abort(NULL);
++ }
++ else
++ writes6_sg(stdout,&g);
++ gzclose(infile);
++ }
+ }
+ else
- writes6_sg(stdout,&g);
- }
- else
- {
-- for (j = 1; j < argc; ++j)
-- {
+- for (j = firstarg; j < argc; ++j)
+ {
- flen = strlen(argv[j]);
- if (flen >= 3 && strcmp(argv[j]+flen-3,".gz") == 0)
- {
@@ -191,55 +225,40 @@ Last-Update: 2013-11-25
- fprintf(stderr,">E Bliss error in file %s\n",argv[j]);
- gt_abort(NULL);
- }
-- else
+- else if (nmax < 0 || (g.nv >= nmin && g.nv <= nmax))
+- {
+- sortlists_sg(&g);
- writes6_sg(stdout,&g);
-+ if (argc == 1)
+- }
+-
+- if (ispipe) pclose(infile); else fclose(infile);
+- }
+- }
++ for (j = firstarg; j < argc; ++j)
+ {
-+ if ((infile = gzdopen(STDIN_FILENO,"r")) == NULL)
++ if ((infile = gzopen(argv[j],"r")) == NULL)
+ {
-+ fprintf(stderr,">E Can't open stdin\n");
++ fprintf(stderr,">E Can't open file %s\n",argv[j]);
+ gt_abort(NULL);
+ }
+ else
+ {
+ if (!readblissgraph(infile,&g))
+ {
-+ fprintf(stderr,">E Bliss error in stdin\n");
++ fprintf(stderr,">E Bliss error in file %s\n",argv[j]);
+ gt_abort(NULL);
+ }
-+ else
-+ writes6_sg(stdout,&g);
-+ gzclose(infile);
-+ }
-+ }
-+ else
-+ {
-+ for (j = 1; j < argc; ++j)
-+ {
-+ if ((infile = gzopen(argv[j],"r")) == NULL)
++ else if (nmax < 0 || (g.nv >= nmin && g.nv <= nmax))
+ {
-+ fprintf(stderr,">E Can't open file %s\n",argv[j]);
-+ gt_abort(NULL);
-+ }
-+ else
-+ {
-+ if (!readblissgraph(infile,&g))
-+ {
-+ fprintf(stderr,">E Bliss error in file %s\n",argv[j]);
-+ gt_abort(NULL);
-+ }
-+ else
-+ writes6_sg(stdout,&g);
-+ gzclose(infile);
++ sortlists_sg(&g);
++ writes6_sg(stdout,&g);
+ }
++ gzclose(infile);
+ }
+ }
++ }
-- if (ispipe) pclose(infile); else fclose(infile);
-- }
-- }
--
- exit(0);
-}
-+ exit(0);
++ exit(0);
+}
diff --git a/debian/rules b/debian/rules
index ff04a98..9d40db7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,6 @@
#!/usr/bin/make -f
-DEB_PKG_DIR = $(abspath $(dir $(MAKEFILE_LIST)))
-export DEB_PKG_VERSION = "\"$(shell dpkg-parsechangelog -l$(DEB_PKG_DIR)/changelog | sed -n -e '/^Version:/s/Version: //p')\""
+export DEB_PKG_VERSION = "\"$(shell dpkg-parsechangelog -S Version)\""
export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
default:
@@ -14,10 +13,10 @@ override_dh_auto_configure:
dh_auto_configure -- --enable-clz --enable-tls --disable-ansicontrols
override_dh_installchangelogs:
- dh_installchangelogs --keep changes24-25.txt
+ dh_installchangelogs --keep changes24-26.txt
-override_dh_strip:
- dh_strip --dbg-package=libnauty2-dbg
+override_dh_compress-indep:
+ dh_compress -X.pdf -Xexamples
get-orig-source:
uscan --no-conf --download-current-version --compression xz --verbose
diff --git a/debian/tests/build-examples b/debian/tests/build-examples
new file mode 100755
index 0000000..e34e592
--- /dev/null
+++ b/debian/tests/build-examples
@@ -0,0 +1,11 @@
+#!/bin/sh
+# autopkgtest check: build [and launch] program examples
+set -ue
+cd $ADTTMP
+
+cp -prd /usr/share/doc/nauty-doc/examples .
+cd examples
+
+make check
+
+exit 0
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 0000000..d8c68dd
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,2 @@
+Tests: build-examples
+Depends: nauty-doc, libnauty2-dev, build-essential, pkg-config
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/nauty.git
More information about the debian-science-commits
mailing list