Rationalise organisation of core directory

Improve organisation of code in core/:
* Remove header dependency on game classes
* Update file paths in copyright notice
* Update #include guards to match file paths

Author: tturocy

Makefile.am

@@ -245,6 +245,8 @@ EXTRA_DIST = \
 	src/README.rst
 
 core_SOURCES = \
+    src/core/core.h \
+    src/core/util.h \
 	src/core/array.h \
 	src/core/list.h \
 	src/core/vector.h \

src/core/array.h

@@ -2,7 +2,7 @@
 // This file is part of Gambit
 // Copyright (c) 1994-2025, The Gambit Project (https://www.gambit-project.org)
 //
-// FILE: src/libgambit/array.h
+// FILE: src/core/array.h
 // A basic bounds-checked array type
 //
 // This program is free software; you can redistribute it and/or modify
@@ -20,12 +20,14 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
 
-#ifndef LIBGAMBIT_ARRAY_H
-#define LIBGAMBIT_ARRAY_H
+#ifndef GAMBIT_CORE_ARRAY_H
+#define GAMBIT_CORE_ARRAY_H
 
 #include <vector>
 #include <iterator>
 
+#include "util.h"
+
 namespace Gambit {
 
 /// \brief An extension of std::vector to have arbitrary offset index
@@ -282,4 +284,4 @@ template <class T> void erase_atindex(Array<T> &p_array, int p_index)
 
 } // end namespace Gambit
 
-#endif // LIBGAMBIT_ARRAY_H
+#endif // GAMBIT_CORE_ARRAY_H

src/core/core.h

@@ -0,0 +1,34 @@
+//
+// This file is part of Gambit
+// Copyright (c) 1994-2025, The Gambit Project (https://www.gambit-project.org)
+//
+// FILE: src/core/core.h
+// Core (game theory-independent) declarations and utilities for Gambit
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+
+#ifndef GAMBIT_CORE_CORE_H
+#define GAMBIT_CORE_CORE_H
+
+#include "util.h"
+#include "array.h"
+#include "list.h"
+#include "recarray.h"
+#include "vector.h"
+#include "matrix.h"
+#include "rational.h"
+
+#endif // GAMBIT_CORE_CORE_H

src/core/function.cc

@@ -2,7 +2,7 @@
 // This file is part of Gambit
 // Copyright (c) 1994-2025, The Gambit Project (https://www.gambit-project.org)
 //
-// FILE: src/libgambit/function.cc
+// FILE: src/core/function.cc
 // Implementation of function and function minimization routines
 //
 // These routines derive from the N-dimensional function minimization
@@ -28,7 +28,7 @@
 //
 
 #include <cmath>
-#include "gambit.h"
+
 #include "function.h"
 
 using namespace Gambit;

src/core/function.h

@@ -2,7 +2,7 @@
 // This file is part of Gambit
 // Copyright (c) 1994-2025, The Gambit Project (https://www.gambit-project.org)
 //
-// FILE: src/libgambit/function.h
+// FILE: src/core/function.h
 // Interface to function and function minimization routines
 //
 // This program is free software; you can redistribute it and/or modify
@@ -20,10 +20,10 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
 
-#ifndef LIBGAMBIT_FUNCTION_H
-#define LIBGAMBIT_FUNCTION_H
+#ifndef GAMBIT_CORE_FUNCTION_H
+#define GAMBIT_CORE_FUNCTION_H
 
-#include "core/vector.h"
+#include "vector.h"
 
 namespace Gambit {
 
@@ -106,4 +106,4 @@ class ConjugatePRMinimizer : public FunctionMinimizer {
 
 } // end namespace Gambit
 
-#endif // LIBGAMBIT_FUNCTION_H
+#endif // GAMBIT_CORE_FUNCTION_H

src/core/integer.cc

@@ -2,7 +2,7 @@
 // This file is part of Gambit
 // Copyright (c) 1994-2025, The Gambit Project (https://www.gambit-project.org)
 //
-// FILE: src/libgambit/integer.cc
+// FILE: src/core/integer.cc
 // Implementation of an arbitrary-length integer class
 //
 // The original copyright and license are included below.
@@ -35,14 +35,14 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
 #include <iostream>
-
-#include "integer.h"
 #include <cctype>
 #include <cfloat>
 #include <climits>
 #include <cmath>
 #include <cstring>
-#include "gambit.h"
+
+#include "integer.h"
+#include "util.h"
 
 namespace Gambit {
 

src/core/integer.h

@@ -2,7 +2,7 @@
 // This file is part of Gambit
 // Copyright (c) 1994-2025, The Gambit Project (https://www.gambit-project.org)
 //
-// FILE: src/libgambit/integer.h
+// FILE: src/core/integer.h
 // Interface to an arbitrary-length integer class
 //
 // The original copyright and license are included below.
@@ -25,8 +25,8 @@ License along with this library; if not, write to the Free Software
 Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#ifndef LIBGAMBIT_INTEGER_H
-#define LIBGAMBIT_INTEGER_H
+#ifndef GAMBIT_CORE_INTEGER_H
+#define GAMBIT_CORE_INTEGER_H
 
 #include <string>
 
@@ -249,4 +249,4 @@ extern Integer lcm(const Integer &x, const Integer &y); // least common mult
 
 } // end namespace Gambit
 
-#endif // LIBGAMBIT_INTEGER_H
+#endif // GAMBIT_CORE_INTEGER_H

src/core/list.h

@@ -2,7 +2,7 @@
 // This file is part of Gambit
 // Copyright (c) 1994-2025, The Gambit Project (https://www.gambit-project.org)
 //
-// FILE: src/libgambit/list.h
+// FILE: src/core/list.h
 // A generic linked-list container class
 //
 // This program is free software; you can redistribute it and/or modify
@@ -20,8 +20,8 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
 
-#ifndef LIBGAMBIT_LIST_H
-#define LIBGAMBIT_LIST_H
+#ifndef GAMBIT_CORE_LIST_H
+#define GAMBIT_CORE_LIST_H
 
 #include <list>
 
@@ -129,4 +129,4 @@ template <class T> class List {
 
 } // namespace Gambit
 
-#endif // LIBGAMBIT_LIST_H
+#endif // GAMBIT_CORE_LIST_H

src/core/matrix.cc

@@ -2,7 +2,7 @@
 // This file is part of Gambit
 // Copyright (c) 1994-2025, The Gambit Project (https://www.gambit-project.org)
 //
-// FILE: src/libgambit/matrix.cc
+// FILE: src/core/matrix.cc
 // Instantiation of common matrix types
 //
 // This program is free software; you can redistribute it and/or modify
@@ -20,7 +20,7 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
 
-#include "gambit.h"
+#include "core.h"
 #include "matrix.imp"
 
 namespace Gambit {

src/core/matrix.h

@@ -2,7 +2,7 @@
 // This file is part of Gambit
 // Copyright (c) 1994-2025, The Gambit Project (https://www.gambit-project.org)
 //
-// FILE: src/libgambit/matrix.h
+// FILE: src/core/matrix.h
 // Interface to a matrix class
 //
 // This program is free software; you can redistribute it and/or modify
@@ -20,8 +20,8 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
 
-#ifndef LIBGAMBIT_MATRIX_H
-#define LIBGAMBIT_MATRIX_H
+#ifndef GAMBIT_CORE_MATRIX_H
+#define GAMBIT_CORE_MATRIX_H
 
 #include "recarray.h"
 #include "vector.h"
@@ -99,4 +99,4 @@ template <class T> Vector<T> operator*(const Vector<T> &, const Matrix<T> &);
 
 } // end namespace Gambit
 
-#endif // LIBGAMBIT_MATRIX_H
+#endif // GAMBIT_CORE_MATRIX_H