From 2c2dd7177ee75fda54cfc726ce6dc09b44aa78ed Mon Sep 17 00:00:00 2001 From: asl Date: Fri, 9 Dec 2016 14:18:38 +0300 Subject: [PATCH] update of the test for classifier --- src/HYDRO_tests/test_HYDROData_DTM.cxx | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/HYDRO_tests/test_HYDROData_DTM.cxx b/src/HYDRO_tests/test_HYDROData_DTM.cxx index 66547b5e..136b8e5a 100644 --- a/src/HYDRO_tests/test_HYDROData_DTM.cxx +++ b/src/HYDRO_tests/test_HYDROData_DTM.cxx @@ -638,18 +638,27 @@ void test_HYDROData_DTM::test_classifier_1() points.push_back( gp_XY( 43.4842, 3.33176 ) ); points.push_back( gp_XY( -125.777, 2.24728 ) ); points.push_back( gp_XY( -60.1628, 168.262 ) ); + points.push_back( gp_XY( 21.8055587645, 154.699344457 ) ); + points.push_back( gp_XY( -84.4764138524, 79.2606012276 ) ); + points.push_back( gp_XY( -73.4132070504, 69.7096313266 ) ); std::vector values = aCase->GetStricklerCoefficientForPoints( points, 0.0, true ); - CPPUNIT_ASSERT_EQUAL( 3, (int)values.size() ); + CPPUNIT_ASSERT_EQUAL( 6, (int)values.size() ); CPPUNIT_ASSERT_DOUBLES_EQUAL( 1.0123, values[0], EPS ); CPPUNIT_ASSERT_DOUBLES_EQUAL( 1.0123, values[1], EPS ); CPPUNIT_ASSERT_DOUBLES_EQUAL( 1.0221, values[2], EPS ); + CPPUNIT_ASSERT_DOUBLES_EQUAL( 1.0123, values[3], EPS ); + CPPUNIT_ASSERT_DOUBLES_EQUAL( 1.0123, values[4], EPS ); + CPPUNIT_ASSERT_DOUBLES_EQUAL( 1.0123, values[5], EPS ); std::vector types = aCase->GetStricklerTypeForPoints( points ); - CPPUNIT_ASSERT_EQUAL( 3, (int)types.size() ); + CPPUNIT_ASSERT_EQUAL( 6, (int)types.size() ); CPPUNIT_ASSERT_EQUAL( 123, types[0] ); CPPUNIT_ASSERT_EQUAL( 123, types[1] ); CPPUNIT_ASSERT_EQUAL( 221, types[2] ); + CPPUNIT_ASSERT_EQUAL( 123, types[3] ); + CPPUNIT_ASSERT_EQUAL( 123, types[4] ); + CPPUNIT_ASSERT_EQUAL( 123, types[5] ); aDoc->Close(); } -- 2.39.2