From cfb953d82489066eab7d41e8c3913a42f3485e90 Mon Sep 17 00:00:00 2001 From: Mark Abraham Date: Fri, 26 May 2017 01:59:34 +0200 Subject: [PATCH] Test invsixthroot function as intended Change-Id: I33fab8d4b8e848eb5d0bebec8e0f60f213bfd77d --- src/gromacs/math/tests/functions.cpp | 8 ++++---- .../tests/refdata/FunctionTest_InvsixthrootDouble.xml | 16 ++++++++-------- .../tests/refdata/FunctionTest_InvsixthrootFloat.xml | 16 ++++++++-------- .../tests/refdata/FunctionTest_InvsixthrootInteger.xml | 16 ++++++++-------- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/gromacs/math/tests/functions.cpp b/src/gromacs/math/tests/functions.cpp index 488a9bc80f..b5306392a6 100644 --- a/src/gromacs/math/tests/functions.cpp +++ b/src/gromacs/math/tests/functions.cpp @@ -1,7 +1,7 @@ /* * This file is part of the GROMACS molecular simulation package. * - * Copyright (c) 2015,2016, by the GROMACS development team, led by + * Copyright (c) 2015,2016,2017, by the GROMACS development team, led by * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl, * and including many others, as listed in the AUTHORS file in the * top-level source directory and at http://www.gromacs.org. @@ -251,7 +251,7 @@ TEST(FunctionTest, InvsixthrootFloat) for (float f = 1.0; f < 10.0; f += 1.0) { - result.push_back(gmx::sixthroot(f)); + result.push_back(gmx::invsixthroot(f)); } checker.checkSequence(result.begin(), result.end(), "InvsixthrootFloat"); } @@ -264,7 +264,7 @@ TEST(FunctionTest, InvsixthrootDouble) for (double d = 1.0; d < 10.0; d += 1.0) { - result.push_back(gmx::sixthroot(d)); + result.push_back(gmx::invsixthroot(d)); } checker.checkSequence(result.begin(), result.end(), "InvsixthrootDouble"); } @@ -277,7 +277,7 @@ TEST(FunctionTest, InvsixthrootInteger) for (int i = 1; i < 10; i++) { - result.push_back(gmx::sixthroot(i)); + result.push_back(gmx::invsixthroot(i)); } checker.checkSequence(result.begin(), result.end(), "InvsixthrootInteger"); } diff --git a/src/gromacs/math/tests/refdata/FunctionTest_InvsixthrootDouble.xml b/src/gromacs/math/tests/refdata/FunctionTest_InvsixthrootDouble.xml index 953643a0f3..e3bef69cfa 100644 --- a/src/gromacs/math/tests/refdata/FunctionTest_InvsixthrootDouble.xml +++ b/src/gromacs/math/tests/refdata/FunctionTest_InvsixthrootDouble.xml @@ -4,13 +4,13 @@ 9 1 - 1.122462048309373 - 1.2009369551760027 - 1.2599210498948732 - 1.3076604860118306 - 1.3480061545972777 - 1.3830875542684886 - 1.4142135623730951 - 1.4422495703074083 + 0.89089871814033927 + 0.83268317765560429 + 0.79370052598409968 + 0.76472449133173004 + 0.74183637559040227 + 0.72302002639948371 + 0.70710678118654746 + 0.69336127435063477 diff --git a/src/gromacs/math/tests/refdata/FunctionTest_InvsixthrootFloat.xml b/src/gromacs/math/tests/refdata/FunctionTest_InvsixthrootFloat.xml index cbae418a2e..c3f377dce8 100644 --- a/src/gromacs/math/tests/refdata/FunctionTest_InvsixthrootFloat.xml +++ b/src/gromacs/math/tests/refdata/FunctionTest_InvsixthrootFloat.xml @@ -4,13 +4,13 @@ 9 1 - 1.122462 - 1.2009369 - 1.2599211 - 1.3076605 - 1.3480061 - 1.3830875 - 1.4142135 - 1.4422495 + 0.8908987 + 0.83268321 + 0.79370052 + 0.76472449 + 0.74183637 + 0.72302002 + 0.70710677 + 0.69336128 diff --git a/src/gromacs/math/tests/refdata/FunctionTest_InvsixthrootInteger.xml b/src/gromacs/math/tests/refdata/FunctionTest_InvsixthrootInteger.xml index 34d0ec5985..b7ac89dacd 100644 --- a/src/gromacs/math/tests/refdata/FunctionTest_InvsixthrootInteger.xml +++ b/src/gromacs/math/tests/refdata/FunctionTest_InvsixthrootInteger.xml @@ -4,13 +4,13 @@ 9 1 - 1.122462048309373 - 1.2009369551760027 - 1.2599210498948732 - 1.3076604860118306 - 1.3480061545972777 - 1.3830875542684886 - 1.4142135623730951 - 1.4422495703074083 + 0.89089871814033927 + 0.83268317765560429 + 0.79370052598409968 + 0.76472449133173004 + 0.74183637559040227 + 0.72302002639948371 + 0.70710678118654746 + 0.69336127435063477 -- 2.11.4.GIT