From 1518e5ac5d969d2642243f4429c353d70c473db8 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 16 May 2014 19:16:36 +0200 Subject: [PATCH] Update Armadillo version and other minor cleaning --- CMakeLists.txt | 6 +++--- src/core/system_parameters/MATH_CONSTANTS.h | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 65fe38e73..ebd10fea9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -622,8 +622,8 @@ if(NOT ARMADILLO_FOUND) INSTALL_COMMAND "" ) else(OLD_GCC) - set(armadillo_RELEASE 4.300.2) - set(armadillo_MD5 "16c8bf27e989b2eaf6e4096a4c056269") + set(armadillo_RELEASE 4.300.3) + set(armadillo_MD5 "cdcd41961c3b06ac8cef9645c38bdf50") # cdcd41961c3b06ac8cef9645c38bdf50 if(EXISTS ${CMAKE_CURRENT_BINARY_DIR}/download/armadillo-${armadillo_RELEASE}/armadillo-${armadillo_RELEASE}.tar.gz) set(ARMADILLO_PATCH_FILE ${CMAKE_CURRENT_BINARY_DIR}/armadillo-${armadillo_RELEASE}/armadillo_no.patch) file(WRITE ${ARMADILLO_PATCH_FILE} "") @@ -641,7 +641,7 @@ if(NOT ARMADILLO_FOUND) < set(ARMA_USE_WRAPPER true ) --- > set(ARMA_USE_WRAPPER false) -310c310 +312c312 < add_library( armadillo SHARED \${PROJECT_SOURCE_DIR}/src/wrapper.cpp ) --- > add_library( armadillo STATIC \${PROJECT_SOURCE_DIR}/src/wrapper.cpp ) diff --git a/src/core/system_parameters/MATH_CONSTANTS.h b/src/core/system_parameters/MATH_CONSTANTS.h index 8e106b084..83a27c9b8 100644 --- a/src/core/system_parameters/MATH_CONSTANTS.h +++ b/src/core/system_parameters/MATH_CONSTANTS.h @@ -5,7 +5,7 @@ * * ------------------------------------------------------------------------- * - * Copyright (C) 2010-2013 (see AUTHORS file for a list of contributors) + * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors) * * GNSS-SDR is a software defined Global Navigation * Satellite Systems receiver @@ -15,7 +15,7 @@ * GNSS-SDR 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 3 of the License, or - * at your option) any later version. + * (at your option) any later version. * * GNSS-SDR is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -51,14 +51,14 @@ const double TWO_P32 = (4294967296.0); //!< 2^32 this is too big for const double TWO_P56 = (7.205759403792794e+016); //!< 2^56 const double TWO_P57 = (1.441151880758559e+017); //!< 2^57 -const double TWO_N2 = (0.25); //!< 2^-2 +const double TWO_N2 = (0.25); //!< 2^-2 const double TWO_N5 = (0.03125); //!< 2^-5 -const double TWO_N8 = (0.00390625); //!< 2^-8 -const double TWO_N9 = (0.001953125); //!< 2^-9 +const double TWO_N8 = (0.00390625); //!< 2^-8 +const double TWO_N9 = (0.001953125); //!< 2^-9 const double TWO_N11 = (4.882812500000000e-004); //!< 2^-11 -const double TWO_N14 = (0.00006103515625); //!< 2^-14 -const double TWO_N15 = (0.00003051757813); //!< 2^-15 +const double TWO_N14 = (0.00006103515625); //!< 2^-14 +const double TWO_N15 = (0.00003051757813); //!< 2^-15 const double TWO_N16 = (0.0000152587890625); //!< 2^-16 const double TWO_N19 = (1.907348632812500e-006); //!< 2^-19 const double TWO_N20 = (9.536743164062500e-007); //!< 2^-20