Changes for 40 release (#139)

* Update copyright year in all files. * Chnages to increase version number * Refactor how version numbering is expressed and maintained * Eliminate commented out includes that are no longer needed.
graph-algorithms · Feb 10, 2025 · 518283f · 518283f
1 parent 0045e21
commit 518283f
Show file tree

Hide file tree

Showing 64 changed files with 145 additions and 88 deletions.
diff --git a/LICENSE.TXT b/LICENSE.TXT
@@ -1,5 +1,5 @@
 The Edge Addition Planarity Suite
-Copyright (c) 1997-2022, John M. Boyer
+Copyright (c) 1997-2025, John M. Boyer
 All rights reserved. Includes a reference implementation of the following:
 
 * John M. Boyer. "Subgraph Homeomorphism via the Edge Addition Planarity Algorithm".

diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ The primary purpose of this repository is to provide implementations of the edge
 
 * [Simplified O(n) Algorithms for Planar Graph Embedding, Kuratowski Subgraph Isolation, and Related Problems](https://dspace.library.uvic.ca/handle/1828/9918)
 
-As secondary purpose of this repository is to provide a generalized graph API that enables implementation of a very wide range of in-memory graph algorithms including basic methods for reading, writing, depth first search, and lowpoint as well as advanced methods for solving planarity, outerplanarity, drawing, and selected subgraph homeomorphism problems. An extension mechanism is also provided to enable implementation of planarity-related algorithms by overriding and augmenting data structures and methods of the core planarity algorithm.
+A secondary purpose of this repository is to provide a generalized graph API that enables implementation of a very wide range of in-memory graph algorithms including basic methods for reading, writing, depth first search, and lowpoint as well as advanced methods for solving planarity, outerplanarity, drawing, and selected subgraph homeomorphism problems. An extension mechanism is also provided to enable implementation of planarity-related algorithms by overriding and augmenting data structures and methods of the core planarity algorithm.
 
 ## Getting Started
 
@@ -60,9 +60,9 @@ On Linux, the planarity program can also be installed by entering `sudo make ins
 
 ## Versioning
 
-The APIs for the graph library and the planarity algorithm implementations are versioned using the method documented in [`configure.ac`](configure.ac).
+The overall project and the APIs for the graph library and the planarity-related algorithm implementations are versioned using the methods documented in [`configure.ac`](configure.ac) and [`graphLib.h`](c/graphLib/graphLib.h). The overall project version adheres to a `Major.Minor.Maintenance.Tweak` numbering system, and the `libPlanarity` shared library, which contains the graph library and planarity-related algorithm implementations, is versioned using the _current:revision:age_ system from `LibTool`.
 
-The `planarity.exe` application, which provides command-line and menu-driven interfaces for the graph library and planarity algorithms, is versioned according to the `Major.Minor.Maintenance.Tweak` numbering system documented in the comments in [`planarity.c`](c/planarity.c). 
+The `planarity.exe` application, which provides command-line and menu-driven interfaces for the graph library and planarity-related algorithms, is versioned using the overall project version defined in [`graphLib.h`](c/graphLib/graphLib.h) (see [`planarityHelp.c`](c/planarityApp/planarityHelp.c)). 
 
 ## License
 

diff --git a/c/graph.h b/c/graph.h
@@ -2,7 +2,7 @@
 #define HELPERSTUB_GRAPH_H
 
 /*
-Copyright (c) 1997-2024, John M. Boyer
+Copyright (c) 1997-2025, John M. Boyer
 All rights reserved.
 See the LICENSE.TXT file for licensing information.
 */

diff --git a/c/graphLib.h b/c/graphLib.h
@@ -2,7 +2,7 @@
 #define HELPERSTUB_GRAPHLIB_H
 
 /*
-Copyright (c) 1997-2024, John M. Boyer
+Copyright (c) 1997-2025, John M. Boyer
 All rights reserved.
 See the LICENSE.TXT file for licensing information.
 */

diff --git a/c/graphLib/extensionSystem/graphExtensions.c b/c/graphLib/extensionSystem/graphExtensions.c
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 1997-2022, John M. Boyer
+Copyright (c) 1997-2025, John M. Boyer
 All rights reserved.
 See the LICENSE.TXT file for licensing information.
 */

diff --git a/c/graphLib/extensionSystem/graphExtensions.h b/c/graphLib/extensionSystem/graphExtensions.h
@@ -2,7 +2,7 @@
 #define GRAPH_EXTENSIONS_H
 
 /*
-Copyright (c) 1997-2022, John M. Boyer
+Copyright (c) 1997-2025, John M. Boyer
 All rights reserved.
 See the LICENSE.TXT file for licensing information.
 */

diff --git a/c/graphLib/extensionSystem/graphExtensions.private.h b/c/graphLib/extensionSystem/graphExtensions.private.h
@@ -2,7 +2,7 @@
 #define GRAPH_EXTENSIONS_PRIVATE_H
 
 /*
-Copyright (c) 1997-2022, John M. Boyer
+Copyright (c) 1997-2025, John M. Boyer
 All rights reserved.
 See the LICENSE.TXT file for licensing information.
 */

diff --git a/c/graphLib/extensionSystem/graphFunctionTable.h b/c/graphLib/extensionSystem/graphFunctionTable.h
@@ -2,7 +2,7 @@
 #define GRAPHFUNCTIONTABLE_H
 
 /*
-Copyright (c) 1997-2022, John M. Boyer
+Copyright (c) 1997-2025, John M. Boyer
 All rights reserved.
 See the LICENSE.TXT file for licensing information.
 */

diff --git a/c/graphLib/graph.h b/c/graphLib/graph.h
@@ -2,7 +2,7 @@
 #define GRAPH_H
 
 /*
-Copyright (c) 1997-2024, John M. Boyer
+Copyright (c) 1997-2025, John M. Boyer
 All rights reserved.
 See the LICENSE.TXT file for licensing information.
 */

diff --git a/c/graphLib/graphDFSUtils.c b/c/graphLib/graphDFSUtils.c
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 1997-2022, John M. Boyer
+Copyright (c) 1997-2025, John M. Boyer
 All rights reserved.
 See the LICENSE.TXT file for licensing information.
 */

diff --git a/c/graphLib/graphLib.h b/c/graphLib/graphLib.h
@@ -2,7 +2,7 @@
 #define GRAPHLIB_H
 
 /*
-Copyright (c) 1997-2024, John M. Boyer
+Copyright (c) 1997-2025, John M. Boyer
 All rights reserved.
 See the LICENSE.TXT file for licensing information.
 */
@@ -26,6 +26,32 @@ extern "C"
 #include "homeomorphSearch/graphK4Search.h"
 #include "planarityRelated/graphDrawPlanar.h"
 
+    // This is the main location for the project and shared library version numbering.
+    // Changes here must be mirrored in configure.ac
+    //
+    // The overall project version numbering format is major.minor.maintenance.tweak
+    // Major is for an overhaul (e.g. many features, data structure change, change of backward compatibility)
+    // Minor is for feature addition (e.g. a new algorithm implementation added, new interface)
+    // Maintenance is for functional revision (e.g. bug fix to existing algorithm implementation)
+    // Tweak is for a non-functional revision (e.g. change of build scripts or testing code, user-facing string changes)
+
+#define GP_PROJECTVERSION_MAJOR 4
+#define GP_PROJECTVERSION_MINOR 0
+#define GP_PROJECTVERSION_MAINT 0
+#define GP_PROJECTVERSION_TWEAK 0
+
+    char *gp_GetProjectVersionFull(void);
+
+// Any change to the project version numbers should also affect the
+// shared library version numbers below.
+//
+// See configure.ac for how to update these version numbers
+#define GP_LIBPLANARITYVERSION_CURRENT 2
+#define GP_LIBPLANARITYVERSION_REVISION 0
+#define GP_LIBPLANARITYVERSION_AGE 0
+
+    char *gp_GetLibPlanarityVersionFull(void);
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/c/graphLib/graphStructures.h b/c/graphLib/graphStructures.h
@@ -2,7 +2,7 @@
 #define GRAPHSTRUCTURE_H
 
 /*
-Copyright (c) 1997-2022, John M. Boyer
+Copyright (c) 1997-2025, John M. Boyer
 All rights reserved.
 See the LICENSE.TXT file for licensing information.
 */

diff --git a/c/graphLib/graphUtils.c b/c/graphLib/graphUtils.c
@@ -1,13 +1,12 @@
 /*
-Copyright (c) 1997-2022, John M. Boyer
+Copyright (c) 1997-2025, John M. Boyer
 All rights reserved.
 See the LICENSE.TXT file for licensing information.
 */
 
 #include <stdlib.h>
 
-#include "graphStructures.h"
-#include "graph.h"
+#include "graphLib.h"
 
 /* Imported functions for FUNCTION POINTERS */
 
@@ -81,6 +80,37 @@ int _InitGraph(graphP theGraph, int N);
 void _ReinitializeGraph(graphP theGraph);
 int _EnsureArcCapacity(graphP theGraph, int requiredArcCapacity);
 
+/********************************************************************
+ gp_GetProjectVersionFull()
+ Return full major.minor.maint.tweak version string for the graph planarity project
+ ********************************************************************/
+
+char *gp_GetProjectVersionFull(void)
+{
+    static char projectVersionStr[MAXLINE + 1];
+    sprintf(projectVersionStr, "%d.%d.%d.%d",
+            GP_PROJECTVERSION_MAJOR,
+            GP_PROJECTVERSION_MINOR,
+            GP_PROJECTVERSION_MAINT,
+            GP_PROJECTVERSION_TWEAK);
+    return projectVersionStr;
+}
+
+/********************************************************************
+ gp_GetLibPlanarityVersionFull()
+ Returns full current:revision:age version string for the graph planarity shared library
+ ********************************************************************/
+
+char *gp_GetLibPlanarityVersionFull(void)
+{
+    static char libPlanarityVersionStr[MAXLINE + 1];
+    sprintf(libPlanarityVersionStr, "%d:%d:%d",
+            GP_LIBPLANARITYVERSION_CURRENT,
+            GP_LIBPLANARITYVERSION_REVISION,
+            GP_LIBPLANARITYVERSION_AGE);
+    return libPlanarityVersionStr;
+}
+
 /********************************************************************
  gp_New()
  Constructor for graph object.

diff --git a/c/graphLib/homeomorphSearch/graphK23Search.c b/c/graphLib/homeomorphSearch/graphK23Search.c
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 1997-2022, John M. Boyer
+Copyright (c) 1997-2025, John M. Boyer
 All rights reserved.
 See the LICENSE.TXT file for licensing information.
 */

diff --git a/c/graphLib/homeomorphSearch/graphK23Search.h b/c/graphLib/homeomorphSearch/graphK23Search.h
@@ -2,7 +2,7 @@
 #define GRAPH_K23SEARCH_H
 
 /*
-Copyright (c) 1997-2022, John M. Boyer
+Copyright (c) 1997-2025, John M. Boyer
 All rights reserved.
 See the LICENSE.TXT file for licensing information.
 */

diff --git a/c/graphLib/homeomorphSearch/graphK23Search.private.h b/c/graphLib/homeomorphSearch/graphK23Search.private.h
@@ -2,7 +2,7 @@
 #define GRAPH_K23SEARCH_PRIVATE_H
 
 /*
-Copyright (c) 1997-2022, John M. Boyer
+Copyright (c) 1997-2025, John M. Boyer
 All rights reserved.
 See the LICENSE.TXT file for licensing information.
 */

diff --git a/c/graphLib/homeomorphSearch/graphK23Search_Extensions.c b/c/graphLib/homeomorphSearch/graphK23Search_Extensions.c
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 1997-2022, John M. Boyer
+Copyright (c) 1997-2025, John M. Boyer
 All rights reserved.
 See the LICENSE.TXT file for licensing information.
 */

diff --git a/c/graphLib/homeomorphSearch/graphK33Search.c b/c/graphLib/homeomorphSearch/graphK33Search.c
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 1997-2022, John M. Boyer
+Copyright (c) 1997-2025, John M. Boyer
 All rights reserved.
 See the LICENSE.TXT file for licensing information.
 */

diff --git a/c/graphLib/homeomorphSearch/graphK33Search.h b/c/graphLib/homeomorphSearch/graphK33Search.h
@@ -2,7 +2,7 @@
 #define GRAPH_K33SEARCH_H
 
 /*
-Copyright (c) 1997-2022, John M. Boyer
+Copyright (c) 1997-2025, John M. Boyer
 All rights reserved.
 See the LICENSE.TXT file for licensing information.
 */

diff --git a/c/graphLib/homeomorphSearch/graphK33Search.private.h b/c/graphLib/homeomorphSearch/graphK33Search.private.h
@@ -2,7 +2,7 @@
 #define GRAPH_K33SEARCH_PRIVATE_H
 
 /*
-Copyright (c) 1997-2022, John M. Boyer
+Copyright (c) 1997-2025, John M. Boyer
 All rights reserved.
 See the LICENSE.TXT file for licensing information.
 */

diff --git a/c/graphLib/homeomorphSearch/graphK33Search_Extensions.c b/c/graphLib/homeomorphSearch/graphK33Search_Extensions.c
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 1997-2022, John M. Boyer
+Copyright (c) 1997-2025, John M. Boyer
 All rights reserved.
 See the LICENSE.TXT file for licensing information.
 */

diff --git a/c/graphLib/homeomorphSearch/graphK4Search.c b/c/graphLib/homeomorphSearch/graphK4Search.c
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 1997-2022, John M. Boyer
+Copyright (c) 1997-2025, John M. Boyer
 All rights reserved.
 See the LICENSE.TXT file for licensing information.
 */

diff --git a/c/graphLib/homeomorphSearch/graphK4Search.h b/c/graphLib/homeomorphSearch/graphK4Search.h
@@ -2,7 +2,7 @@
 #define GRAPH_K4SEARCH_H
 
 /*
-Copyright (c) 1997-2022, John M. Boyer
+Copyright (c) 1997-2025, John M. Boyer
 All rights reserved.
 See the LICENSE.TXT file for licensing information.
 */

diff --git a/c/graphLib/homeomorphSearch/graphK4Search.private.h b/c/graphLib/homeomorphSearch/graphK4Search.private.h
@@ -2,7 +2,7 @@
 #define GRAPH_K4SEARCH_PRIVATE_H
 
 /*
-Copyright (c) 1997-2022, John M. Boyer
+Copyright (c) 1997-2025, John M. Boyer
 All rights reserved.
 See the LICENSE.TXT file for licensing information.
 */

diff --git a/c/graphLib/homeomorphSearch/graphK4Search_Extensions.c b/c/graphLib/homeomorphSearch/graphK4Search_Extensions.c
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 1997-2022, John M. Boyer
+Copyright (c) 1997-2025, John M. Boyer
 All rights reserved.
 See the LICENSE.TXT file for licensing information.
 */

diff --git a/c/graphLib/io/g6-api-utilities.c b/c/graphLib/io/g6-api-utilities.c
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 1997-2024, John M. Boyer
+Copyright (c) 1997-2025, John M. Boyer
 All rights reserved.
 See the LICENSE.TXT file for licensing information.
 */

diff --git a/c/graphLib/io/g6-api-utilities.h b/c/graphLib/io/g6-api-utilities.h
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 1997-2024, John M. Boyer
+Copyright (c) 1997-2025, John M. Boyer
 All rights reserved.
 See the LICENSE.TXT file for licensing information.
 */

diff --git a/c/graphLib/io/g6-read-iterator.c b/c/graphLib/io/g6-read-iterator.c
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 1997-2024, John M. Boyer
+Copyright (c) 1997-2025, John M. Boyer
 All rights reserved.
 See the LICENSE.TXT file for licensing information.
 */

diff --git a/c/graphLib/io/g6-read-iterator.h b/c/graphLib/io/g6-read-iterator.h
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 1997-2024, John M. Boyer
+Copyright (c) 1997-2025, John M. Boyer
 All rights reserved.
 See the LICENSE.TXT file for licensing information.
 */

diff --git a/c/graphLib/io/g6-write-iterator.c b/c/graphLib/io/g6-write-iterator.c
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 1997-2024, John M. Boyer
+Copyright (c) 1997-2025, John M. Boyer
 All rights reserved.
 See the LICENSE.TXT file for licensing information.
 */

diff --git a/c/graphLib/io/g6-write-iterator.h b/c/graphLib/io/g6-write-iterator.h
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 1997-2024, John M. Boyer
+Copyright (c) 1997-2025, John M. Boyer
 All rights reserved.
 See the LICENSE.TXT file for licensing information.
 */

diff --git a/c/graphLib/io/graphIO.c b/c/graphLib/io/graphIO.c
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 1997-2022, John M. Boyer
+Copyright (c) 1997-2025, John M. Boyer
 All rights reserved.
 See the LICENSE.TXT file for licensing information.
 */
@@ -1016,7 +1016,7 @@ void _LogLine(char *Str)
     _Log("\n");
 }
 
-static char LogStr[512];
+static char LogStr[MAXLINE + 1];
 
 char *_MakeLogStr1(char *format, int one)
 {

diff --git a/c/graphLib/io/strOrFile.c b/c/graphLib/io/strOrFile.c
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 1997-2024, John M. Boyer
+Copyright (c) 1997-2025, John M. Boyer
 All rights reserved.
 See the LICENSE.TXT file for licensing information.
 */

diff --git a/c/graphLib/io/strOrFile.h b/c/graphLib/io/strOrFile.h
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 1997-2024, John M. Boyer
+Copyright (c) 1997-2025, John M. Boyer
 All rights reserved.
 See the LICENSE.TXT file for licensing information.
 */

diff --git a/c/graphLib/io/strbuf.c b/c/graphLib/io/strbuf.c
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 1997-2022, John M. Boyer
+Copyright (c) 1997-2025, John M. Boyer
 All rights reserved.
 See the LICENSE.TXT file for licensing information.
 */

diff --git a/c/graphLib/io/strbuf.h b/c/graphLib/io/strbuf.h
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 1997-2022, John M. Boyer
+Copyright (c) 1997-2025, John M. Boyer
 All rights reserved.
 See the LICENSE.TXT file for licensing information.
 */

diff --git a/c/graphLib/lowLevelUtils/apiutils.c b/c/graphLib/lowLevelUtils/apiutils.c
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 1997-2024, John M. Boyer
+Copyright (c) 1997-2025, John M. Boyer
 All rights reserved.
 See the LICENSE.TXT file for licensing information.
 */

diff --git a/c/graphLib/lowLevelUtils/apiutils.h b/c/graphLib/lowLevelUtils/apiutils.h
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 1997-2024, John M. Boyer
+Copyright (c) 1997-2025, John M. Boyer
 All rights reserved.
 See the LICENSE.TXT file for licensing information.
 */