Fixed ML module build after merge
This commit is contained in:
@@ -571,8 +571,6 @@ public:
|
|||||||
/****************************************************************************************\
|
/****************************************************************************************\
|
||||||
* Logistic Regression *
|
* Logistic Regression *
|
||||||
\****************************************************************************************/
|
\****************************************************************************************/
|
||||||
namespace cv
|
|
||||||
{
|
|
||||||
struct CV_EXPORTS LogisticRegressionParams
|
struct CV_EXPORTS LogisticRegressionParams
|
||||||
{
|
{
|
||||||
double alpha;
|
double alpha;
|
||||||
@@ -624,7 +622,6 @@ protected:
|
|||||||
virtual bool set_label_map(const cv::Mat& labels);
|
virtual bool set_label_map(const cv::Mat& labels);
|
||||||
static cv::Mat remap_labels(const cv::Mat& labels, const std::map<int, int>& lmap);
|
static cv::Mat remap_labels(const cv::Mat& labels, const std::map<int, int>& lmap);
|
||||||
};
|
};
|
||||||
}// namespace cv
|
|
||||||
|
|
||||||
/****************************************************************************************\
|
/****************************************************************************************\
|
||||||
* Auxilary functions declarations *
|
* Auxilary functions declarations *
|
||||||
|
@@ -57,6 +57,7 @@
|
|||||||
|
|
||||||
|
|
||||||
using namespace cv;
|
using namespace cv;
|
||||||
|
using namespace cv::ml;
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
LogisticRegressionParams::LogisticRegressionParams()
|
LogisticRegressionParams::LogisticRegressionParams()
|
||||||
|
@@ -60,7 +60,7 @@
|
|||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
using namespace cv;
|
using namespace cv;
|
||||||
|
using namespace cv::ml;
|
||||||
|
|
||||||
static bool calculateError( const Mat& _p_labels, const Mat& _o_labels, float& error)
|
static bool calculateError( const Mat& _p_labels, const Mat& _o_labels, float& error)
|
||||||
{
|
{
|
||||||
|
@@ -65,7 +65,7 @@
|
|||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
using namespace cv;
|
using namespace cv;
|
||||||
|
using namespace cv::ml;
|
||||||
|
|
||||||
int main()
|
int main()
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user