implementation of the strickler types (integer codes) for points

[modules/hydro.git] / src / HYDRO_tests / test_HYDROData_DTM.cxx

diff --git a/src/HYDRO_tests/test_HYDROData_DTM.cxx b/src/HYDRO_tests/test_HYDROData_DTM.cxx
index 175b42b8a7fbc6de46515e85eeb0ef2a3b5a90b6..66547b5e7b219dad8730e955c5684129e679c710 100644 (file)
--- a/src/HYDRO_tests/test_HYDROData_DTM.cxx
+++ b/src/HYDRO_tests/test_HYDROData_DTM.cxx
@@ -21,6 +21,7 @@
 #include <HYDROData_Profile.h>
 #include <HYDROData_DTM.h>
 #include <HYDROData_Iterator.h>
+#include <HYDROData_CalculationCase.h>
 #include <Geom2d_Curve.hxx>
 #include <Geom2d_BSplineCurve.hxx>
 #include <gp_XY.hxx>
@@ -305,7 +306,7 @@ void test_HYDROData_DTM::test_profile_properties()
   gp_Pnt lp;
   gp_Vec2d dd;
   double zmin, zmax;
-  HYDROData_DTM::GetProperties( aProfile, lp, dd, false, zmin, zmax );
+  HYDROData_DTM::GetProperties( aProfile, lp, dd, zmin, zmax );
   CPPUNIT_ASSERT_DOUBLES_EQUAL( 13.75, lp.X(), EPS );
   CPPUNIT_ASSERT_DOUBLES_EQUAL( 15.625, lp.Y(), EPS );
   CPPUNIT_ASSERT_DOUBLES_EQUAL( 0, lp.Z(), EPS );
@@ -314,14 +315,14 @@ void test_HYDROData_DTM::test_profile_properties()
   CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.0, zmin, EPS );
   CPPUNIT_ASSERT_DOUBLES_EQUAL( 5.0, zmax, EPS );
 
-  HYDROData_DTM::GetProperties( aProfile, lp, dd, true, zmin, zmax );
+ /* HYDROData_DTM::GetProperties( aProfile, lp, dd, true, zmin, zmax );
   CPPUNIT_ASSERT_DOUBLES_EQUAL( 13.75, lp.X(), EPS );
   CPPUNIT_ASSERT_DOUBLES_EQUAL( 15.625, lp.Y(), EPS );
   CPPUNIT_ASSERT_DOUBLES_EQUAL( 0, lp.Z(), EPS );
   CPPUNIT_ASSERT_DOUBLES_EQUAL( -15, dd.X(), EPS );
   CPPUNIT_ASSERT_DOUBLES_EQUAL( 10, dd.Y(), EPS );
   CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.0, zmin, EPS );
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 5.0, zmax, EPS );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL( 5.0, zmax, EPS );*/
 
   aDoc->Close();
 }
@@ -620,5 +621,36 @@ void test_HYDROData_DTM::test_garonne()
   TestViewer::showColorScale( ColorScaleIsDisp );
   delete aBathPrs;
   aDoc->Close();
+}
+
+void test_HYDROData_DTM::test_classifier_1()
+{
+  TCollection_AsciiString fname = REF_DATA_PATH.toLatin1().data();
+  fname += "/pb_1066.cbf";
+  CPPUNIT_ASSERT_EQUAL( DocError_OK, HYDROData_Document::Load( fname.ToCString(), 1 ) );
 
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  
+  Handle(HYDROData_CalculationCase) aCase = 
+    Handle(HYDROData_CalculationCase)::DownCast( aDoc->FindObjectByName( "Case_1" ) );
+  CPPUNIT_ASSERT_EQUAL( Standard_False, aCase.IsNull() ); 
+  std::vector<gp_XY> points;
+  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 ) );
+
+  std::vector<double> values = aCase->GetStricklerCoefficientForPoints( points, 0.0, true );
+  CPPUNIT_ASSERT_EQUAL( 3, (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 );
+
+  std::vector<int> types = aCase->GetStricklerTypeForPoints( points );
+  CPPUNIT_ASSERT_EQUAL( 3, (int)types.size() );
+  CPPUNIT_ASSERT_EQUAL( 123, types[0] );
+  CPPUNIT_ASSERT_EQUAL( 123, types[1] );
+  CPPUNIT_ASSERT_EQUAL( 221, types[2] );
+
+  aDoc->Close();
 }
+