Run of fresh-snapshots for edge-addition-planarity-suite

Try this locally (using silver-platter):

debian-svp new-upstream --snapshot edge-addition-planarity-suite 

Merge these changes:

git pull https://janitor.debian.net/git/edge-addition-planarity-suite new-upstream-snapshot

Summary

Merged new upstream version: 3.0.0.5+git20161204.79dcfcc (was: 3.0.0.5).

Diff

=== modified file 'c/planarity.c'
--- a/c/planarity.c	2016-05-16 15:50:15 +0000
+++ b/c/planarity.c	2019-05-10 05:42:41 +0000
@@ -74,7 +74,6 @@
 	    Message(
             "'planarity': if no command-line, then menu-driven\n"
             "'planarity (-h|-help)': this message\n"
-            "'planarity (-h|-help) -gen': more help with graph generator command line\n"
             "'planarity (-h|-help) -menu': more help with menu-based command line\n"
 	        "'planarity (-i|-info): copyright and license information\n"
     	    "'planarity -test [-q] [C]': runs tests (optional quiet mode, single test)\n"

=== modified file 'c/planarityCommandLine.c'
--- a/c/planarityCommandLine.c	2016-05-16 15:50:15 +0000
+++ b/c/planarityCommandLine.c	2019-05-10 05:42:41 +0000
@@ -109,52 +109,6 @@
 }
 
 /****************************************************************************
- WriteTestFiles()
- A one-time-run piece of code that generates batch files which perform the
- incremental tests of all 12 vertex graphs.
-
- The format of the command line is:
- planarity -gen -q -a n j j 12 i > TestResult_n_j_j_12_i.txt
-
- The n is for the number of vertices.
- The j j is the number of edges, between 0 and n(n-1)/2.
- The mod divides the problem into partitions that can be run on separate threads.
- The i is a partition number between 0 and mod-1. Each test batch file receives
- a number i, and within it are all the command lines for that partition to test
- each number of edges.
- The numbers of edges are tested separately because the implementation makes
- a smaller data structure for graphs that are of a guaranteed maximum size.
- ****************************************************************************/
-
-void WriteTestFiles(int n, int mod)
-{
-	char filename[64];
-	FILE *outfile;
-	int k, e;
-	int maxe=n*(n-1)/2;
-
-	for (k = 0; k < mod; k++)
-	{
-		sprintf(filename, "test_n%02d\\test_n%02d_mod%02d.bat", n, n, k);
-		outfile = fopen(filename, "wt");
-		if (outfile == NULL)
-		{
-			printf("Error creating test file %s\nRemember to create directory Test_n%02d\n", filename, n);
-			return;
-		}
-
-		for (e = 0; e <= maxe; e++)
-		{
-			sprintf(filename, "results\\result_%02d_%02d_%02d_%02d_%02d.txt", n, e, e, mod, k);
-			fprintf(outfile, "..\\planarity -gen -a %d %d %d %d %d > %s\n", n, e, e, mod, k, filename);
-		}
-		fclose(outfile);
-	}
-
-	printf("Created test files. Remember to create 'results' in test subdirectory\n");
-}
-
-/****************************************************************************
  Quick regression test
  ****************************************************************************/
 

=== modified file 'c/planarityUtils.c'
--- a/c/planarityUtils.c	2016-05-16 15:50:15 +0000
+++ b/c/planarityUtils.c	2019-05-10 05:42:41 +0000
@@ -105,20 +105,30 @@
 
 void SaveAsciiGraph(graphP theGraph, char *filename)
 {
-	int  e, EsizeOccupied;
+	int  e, EsizeOccupied, vertexLabelFix;
 	FILE *outfile = fopen(filename, "wt");
 	fprintf(outfile, "%s\n", filename);
 
+	// This edge list file format uses 1-based vertex numbering, and the current code
+	// internally uses 1-based indexing by default, so this vertex label 'fix' adds zero
+	// But earlier code used 0-based indexing and added one on output, so we replicate
+	// that behavior in case the current code has been compiled with zero-based indexing.
+	vertexLabelFix = 1 - gp_GetFirstVertex(theGraph);
+
+	// Iterate over the edges of the graph
 	EsizeOccupied = gp_EdgeInUseIndexBound(theGraph);
 	for (e = gp_GetFirstEdge(theGraph); e < EsizeOccupied; e+=2)
 	{
-		// Skip the edge holes
+		// Only output edges that haven't been deleted (i.e. skip the edge holes)
 		if (gp_EdgeInUse(theGraph, e))
 		{
-			fprintf(outfile, "%d %d\n", gp_GetNeighbor(theGraph, e)+1, gp_GetNeighbor(theGraph, e+1)+1);
+			fprintf(outfile, "%d %d\n",
+					gp_GetNeighbor(theGraph, e) + vertexLabelFix,
+					gp_GetNeighbor(theGraph, e+1) + vertexLabelFix);
 		}
 	}
 
+	// Since vertex numbers are at least 1, this indicates the end of the edge list
 	fprintf(outfile, "0 0\n");
 
 	fclose(outfile);

=== modified file 'debian/changelog'
--- a/debian/changelog	2018-10-20 20:25:40 +0000
+++ b/debian/changelog	2019-05-10 05:42:41 +0000
@@ -1,9 +1,13 @@
-edge-addition-planarity-suite (3.0.0.5-4) UNRELEASED; urgency=medium
+edge-addition-planarity-suite (3.0.0.5+git20161204.79dcfcc-1) UNRELEASED; urgency=medium
 
+  [ Jelmer Vernooij ]
   * Trim trailing whitespace.
   * Use secure copyright file specification URI.
 
- -- Jelmer Vernooij <jelmer@debian.org>  Sat, 20 Oct 2018 20:25:40 +0000
+  [ Debian Janitor ]
+  * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Fri, 10 May 2019 05:42:41 +0000
 
 edge-addition-planarity-suite (3.0.0.5-3) unstable; urgency=medium
 

Debdiff

[The following lists of changes regard files as different if they have different names, permissions or owners.]

Files in second set of .debs but not in first

-rw-r--r--  root/root   /usr/lib/debug/.build-id/79/fb76c035e20cd01ee082a8721fc25a2d71622e.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/cb/f147e18059232c94fc04fb79afcfb98f43a8c4.debug

Files in first set of .debs but not in second

-rw-r--r--  root/root   /usr/lib/debug/.build-id/e6/9bf1676072fe75d7571467246bc22541e0b950.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/e6/e565d3910d68b3d7d63fcd82ffa26c081487bc.debug

No differences were encountered between the control files of package libplanarity-dev

No differences were encountered between the control files of package libplanarity0

Control files of package libplanarity0-dbgsym: lines which differ (wdiff format)

  • Build-Ids: e69bf1676072fe75d7571467246bc22541e0b950 79fb76c035e20cd01ee082a8721fc25a2d71622e

No differences were encountered between the control files of package planarity

Control files of package planarity-dbgsym: lines which differ (wdiff format)

  • Build-Ids: e6e565d3910d68b3d7d63fcd82ffa26c081487bc cbf147e18059232c94fc04fb79afcfb98f43a8c4

Full build log Full worker log