41 remove boost dependency

CMakeLists.txt

@@ -27,6 +27,12 @@ else()
   message(STATUS "Generators: OFF")
 endif()
 
+if (MSVC)
+  add_compile_options(/W4)
+else()
+  add_compile_options(-Wall -Wextra -Wunused)
+endif()
+
 find_package(GMP)
 set(CMR_WITH_GMP ${GMP_FOUND})
 
@@ -49,7 +55,7 @@ add_library(cmr
   src/cmr/hashtable.c
   src/cmr/heap.c
   src/cmr/equimodular.c
-  src/cmr/linalg.c
+  src/cmr/linear_algebra.c
   src/cmr/listmatrix.c
   #src/cmr/logger.cpp
   #src/cmr/matrix.cpp
@@ -75,7 +81,7 @@ add_library(cmr
 )
 
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-  target_compile_options(cmr PRIVATE -Wall -Wextra)
+  target_compile_options(cmr PRIVATE -Wall -Wextra -pedantic)
 endif()
 
 # Target for the cmr-camion executable.

doc/tu.md

@@ -26,9 +26,9 @@ determines whether the matrix given in file `IN-MAT` is totally unimodular.
 If `IN-MAT` is `-` then the matrix is read from stdin.
 If `OUT-DEC` or `NON-SUB` is `-` then the decomposition tree (resp. the submatrix) is written to stdout.
 
-## Algorithm ##
+## Algorithms ##
 
-The implemented recognition algorithm is based on [Implementation of a unimodularity test](https://doi.org/10.1007/s12532-012-0048-x) by Matthias Walter and Klaus Truemper (Mathematical Programming Computation, 2013).
+The implemented default recognition algorithm is based on [Implementation of a unimodularity test](https://doi.org/10.1007/s12532-012-0048-x) by Matthias Walter and Klaus Truemper (Mathematical Programming Computation, 2013).
 It first runs \ref camion to reduce the question to that of [recognizing regular matroids](\ref regular).
 Please cite the paper in case the implementation contributed to your research:
 
@@ -45,6 +45,11 @@ Please cite the paper in case the implementation contributed to your research:
       publisher = {Springer-Verlag},
     }
 
+In order to repeat experiments described in the paper above, the function can be parameterized as to use exponential-time algorithms.
+
+  - The first is based on the criterion of Ghouila-Houri and runs in time \f$ \mathcal{O}( (m + n) \cdot 3^{\min(m, n)}) \f$.
+  - The second enumerates square [Eulerian submatrices](https://www.ams.org/journals/proc/1965-016-05/S0002-9939-1965-0180568-2/) and runs in time \f$ \mathcal{O}( (m+n) \cdot 2^{ m + n } ) \f$.
+
 ## C Interface ##
 
 The corresponding function in the library is

include/cmr/camion.h

@@ -14,15 +14,16 @@ extern "C" {
 #endif
 
 #include <cmr/matrix.h>
+#include <stdint.h>
 
 /**
  * \brief Statistics for [Camion-signing](\ref camion) algorithm.
  */
 
 typedef struct
 {
-  size_t totalCount;      /**< Total number of invocations. */
-  double totalTime;       /**< Total time of all invocations. */
+  uint32_t totalCount;  /**< Total number of invocations. */
+  double totalTime;     /**< Total time of all invocations. */
 } CMR_CAMION_STATISTICS;
 
 /**

include/cmr/ctu.h

@@ -23,7 +23,7 @@ extern "C" {
 
 typedef struct
 {
-  size_t totalCount;    /**< Total number of invocations. */
+  uint32_t totalCount;    /**< Total number of invocations. */
   double totalTime;     /**< Total time of all invocations. */
   CMR_TU_STATISTICS tu; /**< Total unimodularity test. */
 } CMR_CTU_STATISTICS;
@@ -79,7 +79,8 @@ CMR_ERROR CMRtestComplementTotalUnimodularity(
   bool* pisComplementTotallyUnimodular, /**< Pointer for storing whether \f$ M \f$ is complement totally unimodular. */
   size_t* pcomplementRow,               /**< Pointer for storing the row to be complemented (may be \c NULL). */
   size_t* pcomplementColumn,            /**< Pointer for storing the column to be complemented (may be \c NULL). */
-  CMR_CTU_STATISTICS* stats             /**< Statistics for the computation (may be \c NULL). */
+  CMR_CTU_STATISTICS* stats,            /**< Statistics for the computation (may be \c NULL). */
+  double timeLimit                      /**< Time limit to impose. */
 );
 
 #ifdef __cplusplus

include/cmr/env.h

@@ -18,6 +18,10 @@ extern "C" {
 #include <stdbool.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <assert.h>
+
+/* Macro for intended non-use of variables. */
+#define CMR_UNUSED(x) (void)(x)
 
 /**
  * \brief Type for return codes of library functions.

include/cmr/equimodular.h

@@ -39,7 +39,7 @@ CMR_ERROR CMRparamsEquimodularityInit(
 
 typedef struct
 {
-  size_t totalCount;      /**< Total number of invocations. */
+  uint32_t totalCount;      /**< Total number of invocations. */
   double totalTime;       /**< Total time of all invocations. */
   double linalgTime;      /**< Time spent on linear algebra. */
   CMR_TU_STATISTICS tu;   /**< Camion signing. */

include/cmr/graph.h

@@ -255,6 +255,8 @@ bool CMRgraphNodesValid(
   CMR_GRAPH_NODE v   /**< Node. */
 )
 {
+  CMR_UNUSED(graph);
+
   assert(graph);
 
   return v >= 0;
@@ -308,6 +310,8 @@ bool CMRgraphIncValid(
   CMR_GRAPH_ITER i   /**< Iterator for edges incident to a node. */
 )
 {
+  CMR_UNUSED(graph);
+
   assert(graph);
 
   return i >= 0;
@@ -345,6 +349,8 @@ CMR_GRAPH_EDGE CMRgraphIncEdge(
   CMR_GRAPH_ITER i   /**< Iterator for edges incident to a node. */
 )
 {
+  CMR_UNUSED(graph);
+
   assert(graph);
 
   return i/2;
@@ -440,6 +446,8 @@ bool CMRgraphEdgesValid(
   CMR_GRAPH_ITER i   /**< Iterator for edges incident to a node. */
 )
 {
+  CMR_UNUSED(graph);
+
   assert(graph);
 
   return i >= 0;
@@ -455,6 +463,8 @@ CMR_GRAPH_EDGE CMRgraphEdgesEdge(
   CMR_GRAPH_ITER i   /**< Iterator for edges. */
 )
 {
+  CMR_UNUSED(graph);
+
   assert(graph);
 
   return i/2;

include/cmr/graphic.h

@@ -20,6 +20,7 @@
 #include <cmr/graph.h>
 
 #include <stdio.h>
+#include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -31,14 +32,14 @@ extern "C" {
 
 typedef struct
 {
-  size_t totalCount;      /**< Total number of invocations. */
-  double totalTime;       /**< Total time of all invocations. */
-  size_t checkCount;      /**< Number of calls to check algorithm. */
-  double checkTime;       /**< Time of check algorithm calls. */
-  size_t applyCount;      /**< Number of column additions. */
-  double applyTime;       /**< Time of column additions. */
-  size_t transposeCount;  /**< Number of matrix transpositions. */
-  double transposeTime;   /**< Time for matrix transpositions. */
+  uint32_t totalCount;      /**< Total number of invocations. */
+  double totalTime;         /**< Total time of all invocations. */
+  uint32_t checkCount;      /**< Number of calls to check algorithm. */
+  double checkTime;         /**< Time of check algorithm calls. */
+  uint32_t applyCount;      /**< Number of column additions. */
+  double applyTime;         /**< Time of column additions. */
+  uint32_t transposeCount;  /**< Number of matrix transpositions. */
+  double transposeTime;     /**< Time for matrix transpositions. */
 } CMR_GRAPHIC_STATISTICS;
 
 /**

include/cmr/linear_algebra.h

@@ -0,0 +1,48 @@
+#ifndef CMR_LINEAR_ALGEBRA_H
+#define CMR_LINEAR_ALGEBRA_H
+
+/**
+ * \file linear_algebra.h
+ *
+ * \author Matthias Walter
+ */
+
+#include <cmr/env.h>
+#include <cmr/matrix.h>
+
+#include <stdio.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \brief Computes the determinant of an 8-bit integer matrix.
+ */
+
+CMR_EXPORT
+CMR_ERROR CMRchrmatDeterminant(
+  CMR* cmr,               /**< \ref CMR environment. */
+  CMR_CHRMAT* matrix,     /**< Matrix. */
+  int64_t* pdeterminant   /**< Pointer for storing the determinant. */
+);
+
+/**
+ * \brief Computes the determinant of an int matrix.
+ */
+
+CMR_EXPORT
+CMR_ERROR CMRintmatDeterminant(
+  CMR* cmr,               /**< \ref CMR environment. */
+  CMR_INTMAT* matrix,     /**< Matrix. */
+  int64_t* pdeterminant   /**< Pointer for storing the determinant. */
+);
+
+
+/**@}*/
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* CMR_LINEAR_ALGEBRA_H */

include/cmr/matrix.h

@@ -1005,10 +1005,21 @@ CMR_ERROR CMRchrmatSignedSupport(
   CMR_CHRMAT** presult  /**< Pointer for storing the signed support matrix of \p matrix. */
 );
 
+/**
+ * \brief Converts a char matrix to an int matrix.
+ */
+
+CMR_EXPORT
+CMR_ERROR CMRchrmatToInt(
+  CMR* cmr,             /**< \ref CMR environment. */
+  CMR_CHRMAT* matrix,   /**< Input matrix. */
+  CMR_INTMAT** presult  /**< Pointer for storing the output matrix. */
+);
+
 /**
  * \brief Converts an int matrix to a char matrix.
  *
- * \returns \ref CMR_ERROR_INPUT in case of overflow.
+ * \returns \ref CMR_ERROR_OVERFLOW in case of overflow.
  */
 
 CMR_EXPORT

include/cmr/network.h

@@ -22,6 +22,7 @@
 #include <cmr/camion.h>
 
 #include <stdio.h>
+#include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -33,7 +34,7 @@ extern "C" {
 
 typedef struct
 {
-  size_t totalCount;              /**< Total number of invocations. */
+  uint32_t totalCount;            /**< Total number of invocations. */
   double totalTime;               /**< Total time of all invocations. */
   CMR_CAMION_STATISTICS camion;   /**< Camion signing. */
   CMR_GRAPHIC_STATISTICS graphic; /**< Graphicness test. */

include/cmr/regular.h

@@ -62,18 +62,18 @@ CMR_ERROR CMRparamsRegularInit(
 
 typedef struct
 {
-  size_t totalCount;                  /**< Total number of invocations. */
-  double totalTime;                   /**< Total time of all invocations. */
-  CMR_SP_STATISTICS seriesParallel;   /**< Statistics for series-parallel algorithm. */
-  CMR_GRAPHIC_STATISTICS graphic;     /**< Statistics for direct (co)graphic checks. */
-  CMR_NETWORK_STATISTICS network;     /**< Statistics for direct (co)network checks. */
-  size_t sequenceExtensionCount;      /**< Number of extensions of sequences of nested minors. */
-  double sequenceExtensionTime;       /**< Time of extensions of sequences of nested minors. */
-  size_t sequenceGraphicCount;        /**< Number (co)graphicness tests applied to sequence of nested minors. */
-  double sequenceGraphicTime;         /**< Time of (co)graphicness tests applied to sequence of nested minors. */
-  size_t enumerationCount;            /**< Number of calls to enumeration algorithm for candidate 3-separations. */
-  double enumerationTime;             /**< Time of enumeration of candidate 3-separations. */
-  size_t enumerationCandidatesCount;  /**< Number of enumerated candidates for 3-separations. */
+  uint32_t totalCount;                  /**< Total number of invocations. */
+  double totalTime;                     /**< Total time of all invocations. */
+  CMR_SP_STATISTICS seriesParallel;     /**< Statistics for series-parallel algorithm. */
+  CMR_GRAPHIC_STATISTICS graphic;       /**< Statistics for direct (co)graphic checks. */
+  CMR_NETWORK_STATISTICS network;       /**< Statistics for direct (co)network checks. */
+  uint32_t sequenceExtensionCount;      /**< Number of extensions of sequences of nested minors. */
+  double sequenceExtensionTime;         /**< Time of extensions of sequences of nested minors. */
+  uint32_t sequenceGraphicCount;        /**< Number (co)graphicness tests applied to sequence of nested minors. */
+  double sequenceGraphicTime;           /**< Time of (co)graphicness tests applied to sequence of nested minors. */
+  uint32_t enumerationCount;            /**< Number of calls to enumeration algorithm for candidate 3-separations. */
+  double enumerationTime;               /**< Time of enumeration of candidate 3-separations. */
+  uint32_t enumerationCandidatesCount;  /**< Number of enumerated candidates for 3-separations. */
 } CMR_REGULAR_STATISTICS;
 
 

include/cmr/series_parallel.h

@@ -23,13 +23,13 @@ extern "C" {
 
 typedef struct
 {
-  size_t totalCount;      /**< Total number of invocations. */
+  uint32_t totalCount;      /**< Total number of invocations. */
   double totalTime;       /**< Total time of all invocations. */
-  size_t reduceCount;     /**< Number of calls to reduction algorithm. */
+  uint32_t reduceCount;     /**< Number of calls to reduction algorithm. */
   double reduceTime;      /**< Time of reduction algorithm calls. */
-  size_t wheelCount;      /**< Number of wheel matrix searches. */
+  uint32_t wheelCount;      /**< Number of wheel matrix searches. */
   double wheelTime;       /**< Time of wheel matrix searches. */
-  size_t nonbinaryCount;  /**< Number of searches for \f$ M_2 \f$ matrix. */
+  uint32_t nonbinaryCount;  /**< Number of searches for \f$ M_2 \f$ matrix. */
   double nonbinaryTime;   /**< Time of searches for \f$ M_2 \f$ matrix. */
 } CMR_SP_STATISTICS;
 

include/cmr/tu.h

@@ -18,8 +18,16 @@ extern "C" {
 #include <cmr/matrix.h>
 #include <cmr/camion.h>
 
+typedef enum
+{
+  CMR_TU_ALGORITHM_DECOMPOSITION = 0, /**< \brief Algorithm based on Seymour's decomposition of regular matroids. */
+  CMR_TU_ALGORITHM_SUBMATRIX = 1,     /**< \brief Enumeration algorithm based on submatrices. */
+  CMR_TU_ALGORITHM_PARTITION = 2      /**< \brief Enumeration algorithm based on criterion of Ghouila-Houri. */
+} CMR_TU_ALGORITHM;
+
 typedef struct
 {
+  CMR_TU_ALGORITHM algorithm;     /**< \brief Algorithm to use. */
   CMR_REGULAR_PARAMETERS regular; /**< \brief Parameters for regularity test. */
 } CMR_TU_PARAMETERS;
 
@@ -40,7 +48,7 @@ CMR_ERROR CMRparamsTotalUnimodularityInit(
 
 typedef struct
 {
-  size_t totalCount;              /**< Total number of invocations. */
+  uint32_t totalCount;            /**< Total number of invocations. */
   double totalTime;               /**< Total time of all invocations. */
   CMR_CAMION_STATISTICS camion;   /**< Camion signing. */
   CMR_REGULAR_STATISTICS regular; /**< Regularity test. */
@@ -90,6 +98,7 @@ CMR_ERROR CMRtestTotalUnimodularity(
   double timeLimit            /**< Time limit to impose. */
 );
 
+
 #ifdef __cplusplus
 }
 #endif

src/cmr/camion.c

@@ -32,7 +32,7 @@ CMR_ERROR CMRstatsCamionPrint(FILE* stream, CMR_CAMION_STATISTICS* stats, const
     fprintf(stream, "Camion signing:\n");
     prefix = "  ";
   }
-  fprintf(stream, "%stotal: %ld in %f seconds\n", prefix, stats->totalCount, stats->totalTime);
+  fprintf(stream, "%stotal: %lu in %f seconds\n", prefix, (unsigned long)stats->totalCount, stats->totalTime);
 
   return CMR_OKAY;
 }