Fixed ML module build after merge

This commit is contained in:
Maksim Shabunin 2014-08-14 17:19:21 +04:00
parent a23836231f
commit 71770eb790
4 changed files with 3 additions and 5 deletions

View File

@ -571,8 +571,6 @@ public:
/****************************************************************************************\
* Logistic Regression *
\****************************************************************************************/
namespace cv
{
struct CV_EXPORTS LogisticRegressionParams
{
double alpha;
@ -624,7 +622,6 @@ protected:
virtual bool set_label_map(const cv::Mat& labels);
static cv::Mat remap_labels(const cv::Mat& labels, const std::map<int, int>& lmap);
};
}// namespace cv
/****************************************************************************************\
* Auxilary functions declarations *

View File

@ -57,6 +57,7 @@
using namespace cv;
using namespace cv::ml;
using namespace std;
LogisticRegressionParams::LogisticRegressionParams()

View File

@ -60,7 +60,7 @@
using namespace std;
using namespace cv;
using namespace cv::ml;
static bool calculateError( const Mat& _p_labels, const Mat& _o_labels, float& error)
{

View File

@ -65,7 +65,7 @@
using namespace std;
using namespace cv;
using namespace cv::ml;
int main()
{