modified mltests log

git-svn-id: https://code.ros.org/svn/opencv/trunk@2937 73c94f0f-984f-4a5f-82bc-2d8db8d8ee08

diff --git a/opencv/tests/ml/src/amltests.cpp b/opencv/tests/ml/src/amltests.cpp
index 073ad90ddf24f9eac8486d5c5b29bd828b3520da..c4bd3f7fa03041f42439468cca48f80a8e3a9974 100644 (file)
--- a/opencv/tests/ml/src/amltests.cpp
+++ b/opencv/tests/ml/src/amltests.cpp
@@ -49,7 +49,7 @@ CV_AMLTest::CV_AMLTest( const char* _modelName, const char* _testName ) :
 \r
 int CV_AMLTest::run_test_case( int testCaseIdx )\r
 {\r
-    int code = CvTS::OK;
+    int code = CvTS::OK;\r
     code = prepare_test_case( testCaseIdx );\r
 \r
     if (code == CvTS::OK)\r
@@ -89,27 +89,29 @@ int CV_AMLTest::run_test_case( int testCaseIdx )
 \r
 int CV_AMLTest::validate_test_results( int testCaseIdx )\r
 {\r
-    int iters;
-    float mean, sigma;
-    // read validation params
-    FileNode resultNode = 
-        validationFS.getFirstTopLevelNode()["validation"][modelName][dataSetNames[testCaseIdx]]["result"];
-    resultNode["iter_count"] >> iters; 
-    if ( iters > 0)
-    {
-        resultNode["mean"] >> mean;
-        resultNode["sigma"] >> sigma;
-        if ( abs(get_error( testCaseIdx, CV_TEST_ERROR ) - mean) > 6*sigma )
-        {
-            ts->printf( CvTS::LOG, "in test case %d test error is out of range", testCaseIdx );
-            return CvTS::FAIL_BAD_ACCURACY;
-        }
-    }
+    int iters;\r
+    float mean, sigma;\r
+    // read validation params\r
+    FileNode resultNode = \r
+        validationFS.getFirstTopLevelNode()["validation"][modelName][dataSetNames[testCaseIdx]]["result"];\r
+    resultNode["iter_count"] >> iters; \r
+    if ( iters > 0)\r
+    {\r
+        resultNode["mean"] >> mean;\r
+        resultNode["sigma"] >> sigma;\r
+        float curErr = get_error( testCaseIdx, CV_TEST_ERROR );\r
+        if ( abs( curErr - mean) > 6*sigma )\r
+        {\r
+            ts->printf( CvTS::LOG, "in test case %d test error is out of range:\n"\r
+                                    "abs(%f/*curEr*/ - %f/*mean*/ > %f/*6*sigma*/", testCaseIdx, curErr, mean, 6*sigma );\r
+            return CvTS::FAIL_BAD_ACCURACY;\r
+        }\r
+    }\r
     else\r
     {\r
-        ts->printf( CvTS::LOG, "validation info is not suitable" );
+        ts->printf( CvTS::LOG, "validation info is not suitable" );\r
         return CvTS::FAIL_INVALID_TEST_DATA;\r
-    }
+    }\r
     return CvTS::OK;\r
 }\r
 \r