From da574709706bdf37e72be1e356b1c7f4a37c665c Mon Sep 17 00:00:00 2001 From: Scott R Charlton Date: Thu, 6 Feb 2014 00:40:58 +0000 Subject: [PATCH] changed so that 'dist' and 'time' are always doubles for R git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8446 1feff8c3-07ed-0310-ac33-dd36852eb9cd --- unit/TestIPhreeqc.cpp | 16 ++++++++-------- unit/TestIPhreeqcLib.cpp | 12 ++++++------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/unit/TestIPhreeqc.cpp b/unit/TestIPhreeqc.cpp index 3a5d3cb3..ef20f494 100644 --- a/unit/TestIPhreeqc.cpp +++ b/unit/TestIPhreeqc.cpp @@ -636,26 +636,26 @@ EXPECTED selected.out: CPPUNIT_ASSERT_EQUAL(TT_LONG, v.type); CPPUNIT_ASSERT_EQUAL( 1L, v.lVal ); - // dist_x -- sometimes as double sometimes as long (depends on state) + // dist_x -- (always as double) // ++col; // i_soln CPPUNIT_ASSERT_EQUAL(VR_OK, obj.GetSelectedOutputValue(1, col, &v)); - CPPUNIT_ASSERT_EQUAL(TT_LONG, v.type); - CPPUNIT_ASSERT_EQUAL( -99L, v.lVal ); + CPPUNIT_ASSERT_EQUAL(TT_DOUBLE, v.type); + CPPUNIT_ASSERT_EQUAL( -99., v.dVal ); // react CPPUNIT_ASSERT_EQUAL(VR_OK, obj.GetSelectedOutputValue(2, col, &v)); - CPPUNIT_ASSERT_EQUAL(TT_LONG, v.type); - CPPUNIT_ASSERT_EQUAL( -99L, v.lVal ); + CPPUNIT_ASSERT_EQUAL(TT_DOUBLE, v.type); + CPPUNIT_ASSERT_EQUAL( -99., v.dVal ); - // time -- sometimes as double sometimes as long (depends on state) + // time -- (always as double) // ++col; // i_soln CPPUNIT_ASSERT_EQUAL(VR_OK, obj.GetSelectedOutputValue(1, col, &v)); - CPPUNIT_ASSERT_EQUAL(TT_LONG, v.type); - CPPUNIT_ASSERT_EQUAL( -99L, v.lVal ); + CPPUNIT_ASSERT_EQUAL(TT_DOUBLE, v.type); + CPPUNIT_ASSERT_EQUAL( -99., v.dVal ); // react CPPUNIT_ASSERT_EQUAL(VR_OK, obj.GetSelectedOutputValue(2, col, &v)); CPPUNIT_ASSERT_EQUAL(TT_DOUBLE, v.type); diff --git a/unit/TestIPhreeqcLib.cpp b/unit/TestIPhreeqcLib.cpp index dc0c28b6..e5de87da 100644 --- a/unit/TestIPhreeqcLib.cpp +++ b/unit/TestIPhreeqcLib.cpp @@ -760,12 +760,12 @@ void TestIPhreeqcLib::TestGetSelectedOutputValue(void) ++col; // i_soln CPPUNIT_ASSERT_EQUAL(IPQ_OK, ::GetSelectedOutputValue(n, 1, col, &v)); - CPPUNIT_ASSERT_EQUAL(TT_LONG, v.type); - CPPUNIT_ASSERT_EQUAL( -99L, v.lVal ); + CPPUNIT_ASSERT_EQUAL(TT_DOUBLE, v.type); + CPPUNIT_ASSERT_EQUAL( -99., v.dVal ); // react CPPUNIT_ASSERT_EQUAL(IPQ_OK, ::GetSelectedOutputValue(n, 2, col, &v)); - CPPUNIT_ASSERT_EQUAL(TT_LONG, v.type); - CPPUNIT_ASSERT_EQUAL( -99L, v.lVal ); + CPPUNIT_ASSERT_EQUAL(TT_DOUBLE, v.type); + CPPUNIT_ASSERT_EQUAL( -99., v.dVal ); // time -- sometimes as double sometimes as long (depends on state) @@ -773,8 +773,8 @@ void TestIPhreeqcLib::TestGetSelectedOutputValue(void) ++col; // i_soln CPPUNIT_ASSERT_EQUAL(IPQ_OK, ::GetSelectedOutputValue(n, 1, col, &v)); - CPPUNIT_ASSERT_EQUAL(TT_LONG, v.type); - CPPUNIT_ASSERT_EQUAL( -99L, v.lVal ); + CPPUNIT_ASSERT_EQUAL(TT_DOUBLE, v.type); + CPPUNIT_ASSERT_EQUAL( -99., v.dVal ); // react CPPUNIT_ASSERT_EQUAL(IPQ_OK, ::GetSelectedOutputValue(n, 2, col, &v)); CPPUNIT_ASSERT_EQUAL(TT_DOUBLE, v.type);