Commit d199100d authored by Maria Dimashova's avatar Maria Dimashova

minor changes of detectors test

parent 60f00f9f
...@@ -1274,15 +1274,7 @@ void MserDetectorQualityTest::writeDatasetRunParams( FileStorage& fs, int datase ...@@ -1274,15 +1274,7 @@ void MserDetectorQualityTest::writeDatasetRunParams( FileStorage& fs, int datase
void MserDetectorQualityTest::setDefaultDatasetRunParams( int datasetIdx ) void MserDetectorQualityTest::setDefaultDatasetRunParams( int datasetIdx )
{ {
DetectorQualityTest::setDefaultDatasetRunParams(datasetIdx); DetectorQualityTest::setDefaultDatasetRunParams(datasetIdx);
runParams[datasetIdx].delta = 5; runParams[datasetIdx] = cvMSERParams();
runParams[datasetIdx].minArea = 60;
runParams[datasetIdx].maxArea = 14400;
runParams[datasetIdx].maxVariation = 0.25f;
runParams[datasetIdx].minDiversity = 0.2;
runParams[datasetIdx].maxEvolution = 200;
runParams[datasetIdx].areaThreshold = 1.01;
runParams[datasetIdx].minMargin = 0.003;
runParams[datasetIdx].edgeBlurSize = 5;
} }
MserDetectorQualityTest mserDetectorQuality; MserDetectorQualityTest mserDetectorQuality;
...@@ -1300,14 +1292,7 @@ protected: ...@@ -1300,14 +1292,7 @@ protected:
virtual void writeDatasetRunParams( FileStorage& fs, int datasetIdx ) const; virtual void writeDatasetRunParams( FileStorage& fs, int datasetIdx ) const;
virtual void setDefaultDatasetRunParams( int datasetIdx ); virtual void setDefaultDatasetRunParams( int datasetIdx );
struct RunParams typedef CvStarDetectorParams RunParams;
{
int maxSize;
int responseThreshold;
int lineThresholdProjected;
int lineThresholdBinarized;
int suppressNonmaxSize;
};
vector<RunParams> runParams; vector<RunParams> runParams;
}; };
...@@ -1343,11 +1328,7 @@ void StarDetectorQualityTest::writeDatasetRunParams( FileStorage& fs, int datase ...@@ -1343,11 +1328,7 @@ void StarDetectorQualityTest::writeDatasetRunParams( FileStorage& fs, int datase
void StarDetectorQualityTest::setDefaultDatasetRunParams( int datasetIdx ) void StarDetectorQualityTest::setDefaultDatasetRunParams( int datasetIdx )
{ {
DetectorQualityTest::setDefaultDatasetRunParams(datasetIdx); DetectorQualityTest::setDefaultDatasetRunParams(datasetIdx);
runParams[datasetIdx].maxSize = 16; runParams[datasetIdx] = cvStarDetectorParams();
runParams[datasetIdx].responseThreshold = 30;
runParams[datasetIdx].lineThresholdProjected = 10;
runParams[datasetIdx].lineThresholdBinarized = 8;
runParams[datasetIdx].suppressNonmaxSize = 5;
} }
StarDetectorQualityTest starDetectorQuality; StarDetectorQualityTest starDetectorQuality;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment