mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-25 11:40:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update on the class. Edited tests and samples.

Browse Source
This commit is contained in:
Daniel Angelov 2013-07-22 00:55:29 +03:00
parent 6f3d6ded47
commit 6fa4834f31
3 changed files with 108 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/imgproc/include/opencv2/imgproc.hpp
View File

@ -883,18 +883,11 @@ public:
*/ */
virtual int compareSegments(const Size& size, const InputArray lines1, const InputArray lines2, Mat* image = 0) = 0; virtual int compareSegments(const Size& size, const InputArray lines1, const InputArray lines2, Mat* image = 0) = 0;
~LineSegmentDetector() {}; virtual ~LineSegmentDetector() {};
protected:
LineSegmentDetector() {};
}; };
//! Returns a pointer to a LineSegmentDetector class. //! Returns a pointer to a LineSegmentDetector class.
CV_EXPORTS Ptr<LineSegmentDetector> createLineSegmentDetectorSmrtPtr( CV_EXPORTS Ptr<LineSegmentDetector> createLineSegmentDetectorPtr(
int _refine = LSD_REFINE_STD, double _scale = 0.8,
double _sigma_scale = 0.6, double _quant = 2.0, double _ang_th = 22.5,
double _log_eps = 0, double _density_th = 0.7, int _n_bins = 1024);
CV_EXPORTS LineSegmentDetector* createLineSegmentDetectorPtr(
int _refine = LSD_REFINE_STD, double _scale = 0.8, int _refine = LSD_REFINE_STD, double _scale = 0.8,
double _sigma_scale = 0.6, double _quant = 2.0, double _ang_th = 22.5, double _sigma_scale = 0.6, double _quant = 2.0, double _ang_th = 22.5,
double _log_eps = 0, double _density_th = 0.7, int _n_bins = 1024); double _log_eps = 0, double _density_th = 0.7, int _n_bins = 1024);

11
modules/imgproc/src/lsd.cpp
View File

@ -389,7 +389,7 @@ private:
///////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////
CV_EXPORTS Ptr<LineSegmentDetector> createLineSegmentDetectorSmrtPtr( CV_EXPORTS Ptr<LineSegmentDetector> createLineSegmentDetectorPtr(
int _refine, double _scale, double _sigma_scale, double _quant, double _ang_th, int _refine, double _scale, double _sigma_scale, double _quant, double _ang_th,
double _log_eps, double _density_th, int _n_bins) double _log_eps, double _density_th, int _n_bins)
{ {
@ -398,15 +398,6 @@ CV_EXPORTS Ptr<LineSegmentDetector> createLineSegmentDetectorSmrtPtr(
_log_eps, _density_th, _n_bins)); _log_eps, _density_th, _n_bins));
} }
CV_EXPORTS LineSegmentDetector* createLineSegmentDetectorPtr(
int _refine, double _scale, double _sigma_scale, double _quant, double _ang_th,
double _log_eps, double _density_th, int _n_bins)
{
return new LineSegmentDetectorImpl(
_refine, _scale, _sigma_scale, _quant, _ang_th,
_log_eps, _density_th, _n_bins);
}
///////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////
LineSegmentDetectorImpl::LineSegmentDetectorImpl(int _refine, double _scale, double _sigma_scale, double _quant, LineSegmentDetectorImpl::LineSegmentDetectorImpl(int _refine, double _scale, double _sigma_scale, double _quant,

160
modules/imgproc/test/test_lsd.cpp
View File

@ -6,6 +6,8 @@ using namespace cv;
using namespace std; using namespace std;
const Size img_size(640, 480); const Size img_size(640, 480);
const int LSD_TEST_SEED = 0x134679;
const int EPOCHS = 20;
class LSDBase : public testing::Test class LSDBase : public testing::Test
{ {
@ -15,6 +17,8 @@ public:
protected: protected:
Mat test_image; Mat test_image;
vector<Vec4i> lines; vector<Vec4i> lines;
RNG rng;
int passedtests;
void GenerateWhiteNoise(Mat& image); void GenerateWhiteNoise(Mat& image);
void GenerateConstColor(Mat& image); void GenerateConstColor(Mat& image);
@ -50,19 +54,16 @@ protected:
void LSDBase::GenerateWhiteNoise(Mat& image) void LSDBase::GenerateWhiteNoise(Mat& image)
{ {
image = Mat(img_size, CV_8UC1); image = Mat(img_size, CV_8UC1);
RNG rng(getTickCount());
rng.fill(image, RNG::UNIFORM, 0, 256); rng.fill(image, RNG::UNIFORM, 0, 256);
} }
void LSDBase::GenerateConstColor(Mat& image) void LSDBase::GenerateConstColor(Mat& image)
{ {
RNG rng(getTickCount());
image = Mat(img_size, CV_8UC1, Scalar::all(rng.uniform(0, 256))); image = Mat(img_size, CV_8UC1, Scalar::all(rng.uniform(0, 256)));
} }
void LSDBase::GenerateLines(Mat& image, const unsigned int numLines) void LSDBase::GenerateLines(Mat& image, const unsigned int numLines)
{ {
RNG rng(getTickCount());
image = Mat(img_size, CV_8UC1, Scalar::all(rng.uniform(0, 128))); image = Mat(img_size, CV_8UC1, Scalar::all(rng.uniform(0, 128)));
for(unsigned int i = 0; i < numLines; ++i) for(unsigned int i = 0; i < numLines; ++i)
@ -76,7 +77,6 @@ void LSDBase::GenerateLines(Mat& image, const unsigned int numLines)
void LSDBase::GenerateRotatedRect(Mat& image) void LSDBase::GenerateRotatedRect(Mat& image)
{ {
RNG rng(getTickCount());
image = Mat::zeros(img_size, CV_8UC1); image = Mat::zeros(img_size, CV_8UC1);
Point center(rng.uniform(img_size.width/4, img_size.width*3/4), Point center(rng.uniform(img_size.width/4, img_size.width*3/4),
@ -100,116 +100,166 @@ void LSDBase::SetUp()
{ {
lines.clear(); lines.clear();
test_image = Mat(); test_image = Mat();
rng = RNG(LSD_TEST_SEED);
passedtests = 0;
} }
TEST_F(Imgproc_LSD_ADV, whiteNoise) TEST_F(Imgproc_LSD_ADV, whiteNoise)
{ {
GenerateWhiteNoise(test_image); for (int i = 0; i < EPOCHS; ++i)
LineSegmentDetector* detector = createLineSegmentDetectorPtr(LSD_REFINE_ADV); {
detector->detect(test_image, lines); GenerateWhiteNoise(test_image);
Ptr<LineSegmentDetector> detector = createLineSegmentDetectorPtr(LSD_REFINE_ADV);
detector->detect(test_image, lines);
ASSERT_GE((unsigned int)(40), lines.size()); if(uint(40) >= lines.size()) ++passedtests;
}
ASSERT_EQ(EPOCHS, passedtests);
} }
TEST_F(Imgproc_LSD_ADV, constColor) TEST_F(Imgproc_LSD_ADV, constColor)
{ {
GenerateConstColor(test_image); for (int i = 0; i < EPOCHS; ++i)
LineSegmentDetector* detector = createLineSegmentDetectorPtr(LSD_REFINE_ADV); {
detector->detect(test_image, lines); GenerateConstColor(test_image);
Ptr<LineSegmentDetector> detector = createLineSegmentDetectorPtr(LSD_REFINE_ADV);
detector->detect(test_image, lines);
ASSERT_EQ((unsigned int)(0), lines.size()); if(uint(0) == lines.size()) ++passedtests;
}
ASSERT_EQ(EPOCHS, passedtests);
} }
TEST_F(Imgproc_LSD_ADV, lines) TEST_F(Imgproc_LSD_ADV, lines)
{ {
const unsigned int numOfLines = 1; for (int i = 0; i < EPOCHS; ++i)
GenerateLines(test_image, numOfLines); {
LineSegmentDetector* detector = createLineSegmentDetectorPtr(LSD_REFINE_ADV); const unsigned int numOfLines = 1;
detector->detect(test_image, lines); GenerateLines(test_image, numOfLines);
Ptr<LineSegmentDetector> detector = createLineSegmentDetectorPtr(LSD_REFINE_ADV);
detector->detect(test_image, lines);
ASSERT_EQ(numOfLines * 2, lines.size()); // * 2 because of Gibbs effect if(numOfLines * 2 == lines.size()) ++passedtests; // * 2 because of Gibbs effect
}
ASSERT_EQ(EPOCHS, passedtests);
} }
TEST_F(Imgproc_LSD_ADV, rotatedRect) TEST_F(Imgproc_LSD_ADV, rotatedRect)
{ {
GenerateRotatedRect(test_image); for (int i = 0; i < EPOCHS; ++i)
LineSegmentDetector* detector = createLineSegmentDetectorPtr(LSD_REFINE_ADV); {
detector->detect(test_image, lines); GenerateRotatedRect(test_image);
Ptr<LineSegmentDetector> detector = createLineSegmentDetectorPtr(LSD_REFINE_ADV);
detector->detect(test_image, lines);
ASSERT_LE((unsigned int)(2), lines.size()); if(uint(2) <= lines.size()) ++passedtests;
}
ASSERT_EQ(EPOCHS, passedtests);
} }
TEST_F(Imgproc_LSD_STD, whiteNoise) TEST_F(Imgproc_LSD_STD, whiteNoise)
{ {
GenerateWhiteNoise(test_image); for (int i = 0; i < EPOCHS; ++i)
LineSegmentDetector* detector = createLineSegmentDetectorPtr(LSD_REFINE_STD); {
detector->detect(test_image, lines); GenerateWhiteNoise(test_image);
Ptr<LineSegmentDetector> detector = createLineSegmentDetectorPtr(LSD_REFINE_STD);
detector->detect(test_image, lines);
ASSERT_GE((unsigned int)(50), lines.size()); if(uint(50) >= lines.size()) ++passedtests;
}
ASSERT_EQ(EPOCHS, passedtests);
} }
TEST_F(Imgproc_LSD_STD, constColor) TEST_F(Imgproc_LSD_STD, constColor)
{ {
GenerateConstColor(test_image); for (int i = 0; i < EPOCHS; ++i)
LineSegmentDetector* detector = createLineSegmentDetectorPtr(LSD_REFINE_STD); {
detector->detect(test_image, lines); GenerateConstColor(test_image);
Ptr<LineSegmentDetector> detector = createLineSegmentDetectorPtr(LSD_REFINE_STD);
detector->detect(test_image, lines);
ASSERT_EQ((unsigned int)(0), lines.size()); if(uint(0) == lines.size()) ++passedtests;
}
ASSERT_EQ(EPOCHS, passedtests);
} }
TEST_F(Imgproc_LSD_STD, lines) TEST_F(Imgproc_LSD_STD, lines)
{ {
const unsigned int numOfLines = 1; for (int i = 0; i < EPOCHS; ++i)
GenerateLines(test_image, numOfLines); {
LineSegmentDetector* detector = createLineSegmentDetectorPtr(LSD_REFINE_STD); const unsigned int numOfLines = 1;
detector->detect(test_image, lines); GenerateLines(test_image, numOfLines);
Ptr<LineSegmentDetector> detector = createLineSegmentDetectorPtr(LSD_REFINE_STD);
detector->detect(test_image, lines);
ASSERT_EQ(numOfLines * 2, lines.size()); // * 2 because of Gibbs effect if(numOfLines * 2 == lines.size()) ++passedtests; // * 2 because of Gibbs effect
}
ASSERT_EQ(EPOCHS, passedtests);
} }
TEST_F(Imgproc_LSD_STD, rotatedRect) TEST_F(Imgproc_LSD_STD, rotatedRect)
{ {
GenerateRotatedRect(test_image); for (int i = 0; i < EPOCHS; ++i)
LineSegmentDetector* detector = createLineSegmentDetectorPtr(LSD_REFINE_STD); {
detector->detect(test_image, lines); GenerateRotatedRect(test_image);
Ptr<LineSegmentDetector> detector = createLineSegmentDetectorPtr(LSD_REFINE_STD);
detector->detect(test_image, lines);
ASSERT_LE((unsigned int)(4), lines.size()); if(uint(4) <= lines.size()) ++passedtests;
}
ASSERT_EQ(EPOCHS, passedtests);
} }
TEST_F(Imgproc_LSD_NONE, whiteNoise) TEST_F(Imgproc_LSD_NONE, whiteNoise)
{ {
GenerateWhiteNoise(test_image); for (int i = 0; i < EPOCHS; ++i)
LineSegmentDetector* detector = createLineSegmentDetectorPtr(LSD_REFINE_STD); {
detector->detect(test_image, lines); GenerateWhiteNoise(test_image);
Ptr<LineSegmentDetector> detector = createLineSegmentDetectorPtr(LSD_REFINE_STD);
detector->detect(test_image, lines);
ASSERT_GE((unsigned int)(50), lines.size()); if(uint(50) >= lines.size()) ++passedtests;
}
ASSERT_EQ(EPOCHS, passedtests);
} }
TEST_F(Imgproc_LSD_NONE, constColor) TEST_F(Imgproc_LSD_NONE, constColor)
{ {
GenerateConstColor(test_image); for (int i = 0; i < EPOCHS; ++i)
LineSegmentDetector* detector = createLineSegmentDetectorPtr(LSD_REFINE_NONE); {
detector->detect(test_image, lines); GenerateConstColor(test_image);
Ptr<LineSegmentDetector> detector = createLineSegmentDetectorPtr(LSD_REFINE_NONE);
detector->detect(test_image, lines);
ASSERT_EQ((unsigned int)(0), lines.size()); if(uint(0) == lines.size()) ++passedtests;
}
ASSERT_EQ(EPOCHS, passedtests);
} }
TEST_F(Imgproc_LSD_NONE, lines) TEST_F(Imgproc_LSD_NONE, lines)
{ {
const unsigned int numOfLines = 1; for (int i = 0; i < EPOCHS; ++i)
GenerateLines(test_image, numOfLines); {
LineSegmentDetector* detector = createLineSegmentDetectorPtr(LSD_REFINE_NONE); const unsigned int numOfLines = 1;
detector->detect(test_image, lines); GenerateLines(test_image, numOfLines);
Ptr<LineSegmentDetector> detector = createLineSegmentDetectorPtr(LSD_REFINE_NONE);
detector->detect(test_image, lines);
ASSERT_EQ(numOfLines * 2, lines.size()); // * 2 because of Gibbs effect if(numOfLines * 2 == lines.size()) ++passedtests; // * 2 because of Gibbs effect
}
ASSERT_EQ(EPOCHS, passedtests);
} }
TEST_F(Imgproc_LSD_NONE, rotatedRect) TEST_F(Imgproc_LSD_NONE, rotatedRect)
{ {
GenerateRotatedRect(test_image); for (int i = 0; i < EPOCHS; ++i)
LineSegmentDetector* detector = createLineSegmentDetectorPtr(LSD_REFINE_NONE); {
detector->detect(test_image, lines); GenerateRotatedRect(test_image);
Ptr<LineSegmentDetector> detector = createLineSegmentDetectorPtr(LSD_REFINE_NONE);
detector->detect(test_image, lines);
ASSERT_LE((unsigned int)(8), lines.size()); if(uint(8) <= lines.size()) ++passedtests;
}
ASSERT_EQ(EPOCHS, passedtests);
} }