update unit tests

kthohr · kthohr · commit cb02eb50de0b · 2017-08-18T18:01:39.000-04:00
diff --git a/.codecov.yml b/.codecov.yml
@@ -14,8 +14,6 @@ coverage:
   
   ignore:
     - "src/optim/"
-    - "src/lp"
-    - "src/lp/*"
 
 parsers:
   gcov:
diff --git a/include/solvers/ipfp.hpp b/include/solvers/ipfp.hpp
@@ -54,20 +54,14 @@ bool ipfp(const mfe<Tt>& market, arma::mat& mu_out, const arma::vec& by_start);
 template<typename Tt>
 bool ipfp(const mfe<Tt>& market, arma::mat& mu_out, const double err_tol_inp, const int max_iter_inp);
 
-template<typename Tt>
-bool ipfp(const mfe<Tt>& market, arma::mat& mu_out, const double err_tol_inp, const arma::vec& by_start);
-
-template<typename Tt>
-bool ipfp(const mfe<Tt>& market, arma::mat& mu_out, const int max_iter_inp, const arma::vec& by_start);
-
 template<typename Tt>
 bool ipfp(const mfe<Tt>& market, arma::mat& mu_out, const double err_tol_inp, const int max_iter_inp, const arma::vec& by_start);
 
 template<typename Tt>
 bool ipfp(const mfe<Tt>& market, arma::mat& mu_out, arma::mat& U_out, arma::mat& V_out);
 
 template<typename Tt>
-bool ipfp(const mfe<Tt>& market, arma::mat& mu_out, arma::vec& mu_x0_out, arma::vec& mu_0y_out, arma::mat& U_out, arma::mat& V_out, arma::vec& u_out, arma::vec& v_out, double* err_tol_inp, int* max_iter_inp, arma::vec* by_start);
+bool ipfp(const mfe<Tt>& market, arma::mat& mu_out, arma::vec& mu_x0_out, arma::vec& mu_0y_out, arma::mat& U_out, arma::mat& V_out, arma::vec& u_out, arma::vec& v_out, const double* err_tol_inp, const int* max_iter_inp, const arma::vec* by_start);
 
 #include "ipfp.tpp"
 
diff --git a/include/solvers/ipfp.tpp b/include/solvers/ipfp.tpp
@@ -56,7 +56,7 @@ ipfp_int(const mfe<Tt>& market, arma::mat* mu_out, arma::vec* mu_x0_out, arma::v
 
     int iter = 0;
     double err = 2*err_tol;
-    
+
     while (err > err_tol && iter < max_iter) {
         iter++;
 
@@ -77,7 +77,7 @@ ipfp_int(const mfe<Tt>& market, arma::mat* mu_out, arma::vec* mu_x0_out, arma::v
 
     //
     // Construct the equilibrium outcome based on 'ax' and 'by' obtained above
-    
+
     if (mu_out || mu_x0_out || mu_0y_out || U_out || V_out || u_out || v_out) {
 
         arma::mat mu = market.mmfs_obj.M(ax,by);
@@ -96,7 +96,7 @@ ipfp_int(const mfe<Tt>& market, arma::mat* mu_out, arma::vec* mu_x0_out, arma::v
             if (mu_0y_out) {
                 *mu_0y_out = mu_0y;
             }
-            
+
             if (U_out) {
                 //*U_out = arma::log(mu / arma::repmat(mu_x0,1,mu.n_cols));
                 *U_out = arma::log(elem_div(mu,mu_x0));
@@ -106,7 +106,7 @@ ipfp_int(const mfe<Tt>& market, arma::mat* mu_out, arma::vec* mu_x0_out, arma::v
                 *V_out = arma::trans(arma::log(elem_div(mu.t(),mu_0y)));
             }
 
-            if (u_out) { 
+            if (u_out) {
                 *u_out = - arma::log(mu_x0);
             }
             if (u_out) {
@@ -156,20 +156,6 @@ ipfp(const mfe<Tt>& market, arma::mat& mu_out, const double err_tol_inp, const i
     return ipfp_int(market,&mu_out,nullptr,nullptr,nullptr,nullptr,nullptr,nullptr,&err_tol_inp,&max_iter_inp,nullptr);
 }
 
-template<typename Tt>
-bool
-ipfp(const mfe<Tt>& market, arma::mat& mu_out, const double err_tol_inp, const arma::vec& by_start)
-{
-    return ipfp_int(market,&mu_out,nullptr,nullptr,nullptr,nullptr,nullptr,nullptr,&err_tol_inp,nullptr,&by_start);
-}
-
-template<typename Tt>
-bool
-ipfp(const mfe<Tt>& market, arma::mat& mu_out, const int max_iter_inp, const arma::vec& by_start)
-{
-    return ipfp_int(market,&mu_out,nullptr,nullptr,nullptr,nullptr,nullptr,nullptr,nullptr,&max_iter_inp,&by_start);
-}
-
 template<typename Tt>
 bool
 ipfp(const mfe<Tt>& market, arma::mat& mu_out, const double err_tol_inp, const int max_iter_inp, const arma::vec& by_start)
diff --git a/src/mmfs/mmfs_cd.cpp b/src/mmfs/mmfs_cd.cpp
@@ -29,7 +29,7 @@
  * 08/15/2016
  *
  * This version:
- * 07/24/2017
+ * 08/18/2017
  */
 
 #include "ancillary/ancillary.hpp"
diff --git a/tests/cov_setup b/tests/cov_setup
@@ -40,6 +40,11 @@ cd ../mmfs
 make
 ./cov_check
 
+cd ../solvers
+./configure -b dev -c
+make
+./cov_check
+
 cd ../transfers
 ./configure -b dev -c
 make
diff --git a/tests/solvers/ipfp.cpp b/tests/solvers/ipfp.cpp
@@ -1,12 +1,34 @@
+/*################################################################################
+  ##
+  ##   Copyright (C) 2015 - 2017 the TraME Team:
+  ##      Alfred Galichon
+  ##      Keith O'Hara
+  ##
+  ##   This file is part of TraME.
+  ##
+  ##   TraME 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.
+  ##
+  ##   TraME 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 TraME. If not, see <http://www.gnu.org/licenses/>.
+  ##
+  ################################################################################*/
+
 /*
  * ipfp test
  *
  * Keith O'Hara
  * 10/24/2016
- * 
- * cd ~/Desktop/SCM/GitHub/TraME/src/trame/tests/equilibrium
  *
- * g++-mp-5 -O2 -Wall -std=c++11 -I/opt/local/include -I./../../headers -I/usr/local/include ipfp_test.cpp -o ipfp.test -L/opt/local/lib -ltrame -framework Accelerate
+ * This version:
+ * 08/18/2017
  */
 
 #include "trame.hpp"
diff --git a/tests/unit_tests/arums/empirical.cpp b/tests/unit_tests/arums/empirical.cpp
@@ -28,7 +28,7 @@
  * 05/17/2016
  *
  * This version:
- * 07/03/2017
+ * 08/18/2017
  */
 
 #include "trame.hpp"
diff --git a/tests/unit_tests/arums/logit.cpp b/tests/unit_tests/arums/logit.cpp
@@ -28,7 +28,7 @@
  * 05/17/2016
  *
  * This version:
- * 07/03/2017
+ * 08/18/2017
  */
 
 #include "trame.hpp"
diff --git a/tests/unit_tests/arums/none.cpp b/tests/unit_tests/arums/none.cpp
@@ -28,7 +28,7 @@
  * 05/17/2016
  *
  * This version:
- * 07/03/2017
+ * 08/18/2017
  */
 
 #include "trame.hpp"
diff --git a/tests/unit_tests/arums/probit.cpp b/tests/unit_tests/arums/probit.cpp
@@ -28,7 +28,7 @@
  * 05/17/2016
  *
  * This version:
- * 07/03/2017
+ * 08/18/2017
  */
 
 #include "trame.hpp"
diff --git a/tests/unit_tests/arums/rsc.cpp b/tests/unit_tests/arums/rsc.cpp
@@ -28,7 +28,7 @@
  * 05/17/2016
  *
  * This version:
- * 07/03/2017
+ * 08/18/2017
  */
 
 #include "trame.hpp"
diff --git a/tests/unit_tests/arums/rusc.cpp b/tests/unit_tests/arums/rusc.cpp
@@ -28,7 +28,7 @@
  * 05/17/2016
  *
  * This version:
- * 07/03/2017
+ * 08/18/2017
  */
 
 #include "trame.hpp"
diff --git a/tests/unit_tests/solvers/Makefile.in b/tests/unit_tests/solvers/Makefile.in
@@ -0,0 +1,37 @@
+
+# core compiling options
+CC  = @CC@
+CXX = @CXX@
+FC  = @FC@
+
+CXX_STD = -std=c++11
+OPT_FLAGS = @TRAME_OPT_FLAGS@
+
+ARMA_INCLUDE_PATH = @ARMA_INCLUDE_PATH@
+
+# install location
+INSTALL_PATH=@TRAME_INSTALL_PATH@
+
+# source directories
+
+TRAME_HEADER_DIR = @TRAME_INCLUDE_PATH@
+TRAME_TEST_DIR = .
+
+# general flags
+CXXFLAGS = $(CXX_STD) -Wall $(OPT_FLAGS) -I$(ARMA_INCLUDE_PATH) -I$(TRAME_HEADER_DIR)
+LIBS= @TRAME_BLAS_LAPACK@ -L@TRAME_INSTALL_PATH@ -l@TRAME_SHLIB_NAME@
+
+# TraME Test Files
+SOURCES_TRAME_SLVRS= $(TRAME_TEST_DIR)/ipfp.cpp
+OBJECTS_TRAME_SLVRS= $(SOURCES_TRAME_SLVRS:.cpp=.test)
+
+all: $(OBJECTS_TRAME_SLVRS)
+
+# core TraME files
+$(TRAME_TEST_DIR)/%.test: $(TRAME_TEST_DIR)/%.cpp
+	$(CXX) $(CXXFLAGS) $< -o $@ $(LIBS)
+
+# cleanup and install
+.PHONY: clean
+clean:
+	@rm -rf *.so ./*.gcov ./*.gcno ./*.gcda ./*.dSYM ./*.test
diff --git a/tests/unit_tests/solvers/configure b/tests/unit_tests/solvers/configure
@@ -0,0 +1,117 @@
+#!/bin/bash
+## TraME tests config script
+
+while getopts :b:cm:o:p option; do
+    case "${option}" in
+        b) TRAME_BUILD=${OPTARG};;
+        c) TRAME_COVERAGE="y";;
+        m) TRAME_MATRIX_OPS=${OPTARG};;
+        o) TRAME_OPT=${OPTARG};;
+        p) TRAME_PARALLEL="y";;
+    esac
+done
+
+if [ -z ${CC+x} ]; then 
+    CC=gcc
+fi
+if [ -z ${CXX+x} ]; then 
+    CXX=g++
+fi
+if [ -z ${FC+x} ]; then 
+    FC=gfortran
+fi
+
+if [[ !(-z ${KEITH_DEV_SETTINGS+x}) ]]; then
+    CC=gcc-mp-7
+    CXX=g++-mp-7
+    FC=gfortran-mp-7
+fi
+
+WDIR=${PWD}
+
+if [ -z ${ARMA_INCLUDE_PATH+x} ]; then 
+    echo "TraME tests: ARMA_INCLUDE_PATH not set"
+    if [ -f ${WDIR}/../../../include/armadillo ]; then 
+        ARMA_INCLUDE_PATH="./../../../include"
+    elif [ -f /usr/include/armadillo ]; then
+        ARMA_INCLUDE_PATH="/usr/include"
+    elif [ -f /usr/local/include/armadillo ]; then
+        ARMA_INCLUDE_PATH="/usr/local/include"
+    elif [ -f /opt/include/armadillo ]; then
+        ARMA_INCLUDE_PATH="/opt/include"
+    elif [ -f /opt/local/include/armadillo ]; then
+        ARMA_INCLUDE_PATH="/opt/local/include"
+    else 
+        echo "TraME tests: cannot find the armadillo library."
+        echo ""
+        exit 1
+    fi
+fi
+
+echo "TraME tests: ARMA_INCLUDE_PATH set to ${ARMA_INCLUDE_PATH}"
+
+# set build and optimization flags
+
+if [[ "${TRAME_COVERAGE}" == "y" ]]; then 
+    TRAME_OPT_FLAGS="-O0 -Wall -g --coverage -fno-inline -fno-inline-small-functions -fno-default-inline"
+else
+    if [[ "${TRAME_OPT}" == "fast" ]]; then
+        echo "TraME tests: experimental optimization"
+        TRAME_OPT_FLAGS="-Ofast -DARMA_NO_DEBUG"
+    else
+        TRAME_OPT_FLAGS="-O3 -Wall"
+    fi
+
+    if [[ "${TRAME_PARALLEL}" == "y" ]]; then 
+        echo "TraME tests: using OpenMP"
+        TRAME_OPT_FLAGS="${TRAME_OPT_FLAGS} -fopenmp -DTRAME_OMP"
+    fi
+fi
+
+if [[ $OSTYPE == *cygwin* ]] ; then
+    TRAME_OPT_FLAGS="${TRAME_OPT_FLAGS} -DARMA_DONT_PRINT_CXX11_WARNING"
+fi
+
+TRAME_SHLIB_NAME="trame"
+
+# dev build
+
+if [[ "${TRAME_BUILD}" == "dev" ]]; then
+    echo "TraME tests: dev version"
+    cd ../../..
+    TRAME_INCLUDE_PATH=${PWD}/include
+    TRAME_INSTALL_PATH=${PWD}
+    cd ${WDIR}
+else
+    TRAME_INCLUDE_PATH="/usr/local/include/trame"
+    TRAME_INSTALL_PATH="/usr/local/lib"
+fi
+
+# BLAS and LAPACK settings
+
+if [[ !(-z ${TRAME_MATRIX_OPS+x}) ]]; then
+    TRAME_BLAS_LAPACK="${TRAME_MATRIX_OPS}"
+    echo ""
+    echo "TraME tests: BLAS and Lapack libraries set to ${TRAME_BLAS_LAPACK}"
+else
+    if [[ $OSTYPE == darwin* ]] ; then
+        TRAME_BLAS_LAPACK="-framework Accelerate"
+    elif [[ $OSTYPE == *linux* ]] ; then
+        TRAME_BLAS_LAPACK="-lblas -llapack"
+    elif [[ $OSTYPE == *cygwin* ]] ; then
+        TRAME_BLAS_LAPACK="-lopenblas"
+    else
+        TRAME_BLAS_LAPACK="-lblas -llapack"
+    fi
+fi
+
+sed -e "s|@CC@|${CC}|" \
+    -e "s|@CXX@|${CXX}|" \
+    -e "s|@FC@|${FC}|" \
+    -e "s|@ARMA_INCLUDE_PATH@|${ARMA_INCLUDE_PATH}|" \
+    -e "s|@TRAME_BLAS_LAPACK@|${TRAME_BLAS_LAPACK}|" \
+    -e "s|@TRAME_OPT_FLAGS@|${TRAME_OPT_FLAGS}|" \
+    -e "s|@TRAME_SHLIB_NAME@|${TRAME_SHLIB_NAME}|" \
+    -e "s|@TRAME_INCLUDE_PATH@|${TRAME_INCLUDE_PATH}|" \
+    -e "s|@TRAME_INSTALL_PATH@|${TRAME_INSTALL_PATH}|" \
+    Makefile.in > Makefile
diff --git a/tests/unit_tests/solvers/cov_check b/tests/unit_tests/solvers/cov_check
@@ -0,0 +1,16 @@
+
+if [ -z ${CXXCOV+x} ]; then 
+    CXXCOV=gcov
+fi
+
+if [[ !(-z ${KEITH_DEV_SETTINGS+x}) ]]; then
+    CXXCOV=gcov-mp-7
+fi
+
+for t in ./*.test; do
+   "$t"
+done
+
+for t in ./*.cpp; do
+   $CXXCOV "$t" > /dev/null 2>&1
+done
diff --git a/tests/unit_tests/solvers/ipfp.cpp b/tests/unit_tests/solvers/ipfp.cpp

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`	`* 08/15/2016`
`30`	`30`	`*`
`31`	`31`	`* This version:`
`32`		`- * 07/24/2017`
	`32`	`+ * 08/18/2017`
`33`	`33`	`*/`
`34`	`34`
`35`	`35`	`#include "ancillary/ancillary.hpp"`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`* 05/17/2016`
`29`	`29`	`*`
`30`	`30`	`* This version:`
`31`		`- * 07/03/2017`
	`31`	`+ * 08/18/2017`
`32`	`32`	`*/`
`33`	`33`
`34`	`34`	`#include "trame.hpp"`