Added tests for submatrix algorithm for TU.

CMakeLists.txt

@@ -8,6 +8,7 @@ set(CMAKE_C_STANDARD 99)
 option(SHARED "Build shared libraries" ON)
 set(BUILD_SHARED_LIBS ${SHARED})
 message(STATUS "Build shared libraries: " ${SHARED})
+option(GMP "Compile with GMP" ON)
 option(GENERATORS "Compile matrix generators" OFF)
 option(TESTS "Compile tests" ON)
 message(STATUS "Build tests: " ${TESTS})
@@ -33,57 +34,63 @@ else()
  add_compile_options(-Wall -Wextra -Wunused)
 endif()
 
-find_package(GMP)
-set(CMR_WITH_GMP ${GMP_FOUND})
+if(GMP)
+ find_package(GMP)
+ set(CMR_WITH_GMP ${GMP_FOUND})
+else()
+ set(CMR_WITH_GMP FALSE)
+endif()
 
 # Target for the CMR library.
 add_library(cmr
+ src/cmr/balanced.c
  src/cmr/camion.c
  src/cmr/ctu.c
- src/cmr/dec.c
  src/cmr/densematrix.c
  src/cmr/element.c
  src/cmr/env.c
  src/cmr/hereditary_property.c
  src/cmr/matrix.c
- src/cmr/one_sum.c
+ src/cmr/block_decomposition.c
  src/cmr/tu.c
- #src/cmr/determinant.cpp
- #src/cmr/ghouila_houri.cpp
  src/cmr/graph.c
  src/cmr/graphic.c
  src/cmr/hashtable.c
  src/cmr/heap.c
  src/cmr/equimodular.c
  src/cmr/linear_algebra.c
  src/cmr/listmatrix.c
- #src/cmr/logger.cpp
- #src/cmr/matrix.cpp
  src/cmr/matroid.c
- #src/cmr/matroid_decomposition.cpp
- #src/cmr/matroid_graph.cpp
- #src/cmr/nested_minor_sequence.cpp
- src/cmr/regular_nested_minor_sequence.c
  src/cmr/network.c
  src/cmr/regular.c
- src/cmr/regular_enumerate.c
- src/cmr/regular_graphic.c
- src/cmr/regular_onesum.c
- src/cmr/regular_r10.c
- src/cmr/regular_series_parallel.c
- #src/cmr/separation.cpp
+ src/cmr/regularity.c
+ src/cmr/regularity_partition.c
+ src/cmr/regularity_graphic.c
+ src/cmr/regularity_nested_minor_sequence.c
+ src/cmr/regularity_onesum.c
+ src/cmr/regularity_threesum.c
+ src/cmr/regularity_r10.c
+ src/cmr/regularity_series_parallel.c
  src/cmr/separation.c
  src/cmr/series_parallel.c
  src/cmr/sort.c
- #src/cmr/total_unimodularity.cpp
- #src/cmr/unimodularity.cpp
- #src/cmr/zero_plus_minus_one.cpp
 )
 
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
  target_compile_options(cmr PRIVATE -Wall -Wextra -pedantic)
 endif()
 
+# Target for the cmr-balanced executable.
+add_executable(cmr_balanced
+ src/main/balanced_main.c)
+
+target_link_libraries(cmr_balanced
+ PRIVATE
+ CMR::cmr
+ m
+)
+set_target_properties(cmr_balanced PROPERTIES OUTPUT_NAME cmr-balanced)
+
 # Target for the cmr-camion executable.
 add_executable(cmr_camion
  src/main/camion_main.c) 
@@ -286,9 +293,6 @@ target_include_directories(cmr
  ${CMAKE_CURRENT_SOURCE_DIR}/src/cmr/
 )
 
-target_compile_features(cmr PRIVATE cxx_auto_type)
-target_compile_options(cmr PRIVATE $<$<CXX_COMPILER_ID:GNU>:-Wall>)
-
 if(Threads_FOUND)
  target_link_libraries(cmr
  PRIVATE
@@ -307,6 +311,7 @@ endif()
 include(GNUInstallDirs)
 
 install(TARGETS
+ cmr_balanced
  cmr_camion
  cmr_ctu
  cmr_graphic

doc/balanced.md

@@ -3,3 +3,39 @@
 A ternary matrix \f$ M \in \{-1,0,+1\}^{m \times n} \f$ is called **balanced** if it does not contain a square submatrix with two nonzero entries per row and per column in which the sum of all entries is 2 modulo 4.
 A binary matrix \f$ M \in \{0,1\}^{m \times n} \f$ is called **balanceable** if and its nonzero entries can be signed so that the resulting matrix is balanced.
 
+## Recognizing Balanced Matrices ##
+
+The command
+
+ cmr-balanced IN-MAT [OPTION...]
+
+determines whether the matrix given in file `IN-MAT` is balanced.
+
+**Options:**
+ - `-i FORMAT` Format of file `IN-MAT`, among `dense` for \ref dense-matrix and `sparse` for \ref sparse-matrix; default: dense.
+ - `-N NON-SUB` Write a minimal non-balanced submatrix to file `NON-SUB`; default: skip computation.
+ - `-s` Print statistics about the computation to stderr.
+
+**Advanced options:**
+ - `--time-limit LIMIT` Allow at most LIMIT seconds for the computation.
+ - `--algorithm ALGO` Algorithm to use, among `enumerate` and `graph`; default: choose best.
+
+If `IN-MAT` is `-` then the matrix is read from stdin.
+If `NON-SUB` is `-` then the submatrix is written to stdout.
+
+## Algorithm ##
+
+Two types of algorithms are implemented for both, the binary and the ternary case.
+The first algorithm types enumerate subsets of rows and then finds subsets of columns such that the resulting submatrix defines an odd cycle.
+Its running time is exponential in the size of the matrix.
+The second algorithm types are the [polynomial-time algorithms](https://doi.org/10.1016/j.jctb.2005.02.006) by Giacomo Zambelli (Journal of Combinatorial Theory, Series B, 2005).
+They run in \f$ \mathcal{O}( (m+n)^9 ) \f$ time for binary matrices and in \f$ \mathcal{O}( (m+n)^{11} ) \f$ time for ternary matrices.
+
+## C Interface ##
+
+The corresponding function in the library is
+
+ - CMRtestBalanced() tests a matrix for balancedness.
+
+and is defined in \ref balanced.h.
+

doc/camion.md

@@ -35,7 +35,7 @@ For a matrix \f$ M \in \{-1,0,1\}^{m \times n} \f$ it runs in \f$ \mathcal{O}( \
 
 The corresponding function in the library is
 
- - CMRtestCamionSigned() tests a matrix for being Camion-signed.
+ - CMRcamionTestSigns() tests a matrix for being Camion-signed.
 
 and is defined in \ref camion.h.
 
@@ -65,6 +65,6 @@ For a matrix \f$ M \in \{-1,0,1\}^{m \times n} \f$ it runs in \f$ \mathcal{O}( \
 
 The corresponding function in the library is
 
- - CMRcomputeCamionSigned() Computes a Camion-signed version of a given ternary matrix.
+ - CMRcamionComputeSigns() Computes a Camion-signed version of a given ternary matrix.
 
 and is defined in \ref camion.h.

doc/changes.md

@@ -1,5 +1,6 @@
 # Change Log # {#changes}
 
+ - Revised the matroid decomposition structure.
  - Fixed a bug in the code for printing dot-files for transposed graphic/network matrices; reported by Christopher Hojny.
  - Added a `timeLimit` parameter to all potentially time intensive functions.
  - Bugfix for the `timeLimit` parameter.

doc/equimodular.md

@@ -6,10 +6,10 @@ The matrix \f$ M \f$ is called **equimodular** *with determinant gcd* \f$ k \in
  - for some column basis \f$ B \subseteq \{1,2,\dotsc,n\} \f$ of \f$ M \f$, the greatest common divisor of the determinants of all \f$r \f$-by-\f$ r \f$ submatrices of \f$ M_{\star,B} \f$ is equal to \f$ k \f$.
  - The matrix \f$ X \f$ such that \f$ M = M_{\star,B} X \f$ is [totally unimodular](\ref tu).
 
-In case \f$ M \f$ has full row-rank, the first property requires that the determinant of any basis matrix shall be \f$ k \f$, while the second property requires that \f$ M_{\star,B}^{-1} M \f$ is [totally unimodular](\ref tu).
-Otherwise, \f$ M_{\star,B} \f$ is singular, and hence the property is more technical.
+In case \f$ M \f$ has full row-rank, the first property requires that the determinant of any basis matrix shall be \f$ \pm k \f$, while the second property requires that \f$ M_{\star,B}^{-1} M \f$ is [totally unimodular](\ref tu).
+Otherwise, \f$ M_{\star,B} \f$ is not square, and hence the property is more technical.
 
-\note equimodularity is independent of the choice of the column basis \f$ B \f$.
+\note Equimodularity is independent of the choice of the column basis \f$ B \f$.
 
 Additionally, \f$ M \f$ is called **strongly equimodular** if \f$ M \f$ and \f$ M^{\textsf{T}} \f$ are both equimodular, which implies that they are equimodular for the same gcd determinants.
 The special cases with \f$ k = 1 \f$ are called **unimodular** and **strongly unimodular**, respectively.
@@ -34,7 +34,7 @@ If FILE is `-`, then the input will be read from stdin.
 The functionality is defined in \ref equimodular.h.
 The main functions are:
 
- - CMRtestEquimodularity() tests a matrix for being equimodular.
- - CMRtestStrongEquimodularity() tests a matrix for being strongly equimodular.
- - CMRtestUnimodularity() tests a matrix for being unimodular.
- - CMRtestStrongUnimodularity() tests a matrix for being strongly unimodular.
+ - CMRequimodularTest() tests a matrix for being equimodular.
+ - CMRequimodularTestStrong() tests a matrix for being strongly equimodular.
+ - CMRunimodularTest() tests a matrix for being unimodular.
+ - CMRunimodularTestStrong() tests a matrix for being strongly unimodular.

doc/graphic.md

@@ -43,8 +43,8 @@ For a matrix \f$ M \in \{0,1\}^{m \times n}\f$ with \f$ k \f$ nonzeros it runs i
 
 The corresponding functions in the library are
 
- - CMRtestGraphicMatrix() tests a matrix for being graphic.
- - CMRtestCographicMatrix() tests a matrix for being cographic.
+ - CMRgraphicTestMatrix() tests a matrix for being graphic.
+ - CMRgraphicTestTranspose() tests a matrix for being cographic.
 
 and are defined in \ref network.h.
 
@@ -70,6 +70,6 @@ If `OUT-MAT` is `-` then the matrix is written to stdout.
 
 The corresponding function in the library is
 
- - CMRcomputeGraphicMatrix() constructs a graphic matrix for a given graph.
+ - CMRgraphicComputeMatrix() constructs a graphic matrix for a given graph.
 
 and is defined in \ref network.h.

doc/index.md

@@ -49,6 +49,7 @@ Please cite the paper(s) corresponding to the respective tools.
 # Authors #
 
 - [Rolf van der Hulst](https://people.utwente.nl/r.p.vanderhulst)
+- Henk Kraaij
 - [Klaus Truemper](https://personal.utdallas.edu/~klaus/)
 - [Matthias Walter](https://people.utwente.nl/m.walter) (maintainer)