Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/amov-lab/Prometheus
Browse files Browse the repository at this point in the history
  • Loading branch information
Lee0326 committed Nov 18, 2020
2 parents bc8f3d7 + 7e08d6b commit 88a585a
Show file tree
Hide file tree
Showing 324 changed files with 80 additions and 172 deletions.
39 changes: 34 additions & 5 deletions Modules/object_detection/cpp_nodes/ellipse_det.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@ bool image_status = false;
boost::shared_mutex mutex_image_status;

EllipseDetector ellipse_detector;
HOGDescriptor hog(Size(28, 28), Size(4, 4), Size(4, 4), Size(4, 4), 9);
bool use_hog = true;


// 图像接收回调函数,接收web_cam的话题,并将图像保存在cam_image_copy中
Expand Down Expand Up @@ -204,6 +206,23 @@ vector<float> hist_feature(cv::Mat& resized_im) // 生成直方图,带入形
{
feats[i] /= total;
}

if (use_hog)
{
cv::Mat resized_im_gray;
cvtColor(resized_im, resized_im_gray, CV_BGR2GRAY);

// cout << "w, h: " << resized_im_gray.cols << ", " << resized_im_gray.rows << endl;
vector<float> descriptors; // HOG描述子向量
hog.compute(resized_im_gray, descriptors, Size(4, 4));
feats.insert(
feats.end(),
std::make_move_iterator(descriptors.begin()),
std::make_move_iterator(descriptors.end())
);
// cout << "descriptors size" << descriptors.size() << endl;
// cout << "feats size" << feats.size() << endl;
}
return feats; // 返回feats
}

Expand All @@ -222,7 +241,7 @@ Ptr<SVM> train_svm_classifier(std::string train_imlist, std::string train_imdir)
while (ifs >> im_name >> label)
{
cout << im_name << " " << label << endl;
cout << train_imdir + im_name << endl;
cout << train_imdir + "/" + im_name << endl;
Mat im_one = imread(train_imdir + "/" + im_name, 1);
all_labels.push_back(label);

Expand All @@ -234,10 +253,15 @@ Ptr<SVM> train_svm_classifier(std::string train_imlist, std::string train_imdir)
all_feats.push_back(feats);
}

Mat trainingDataMat(all_feats.size(), 30, CV_32FC1);
int feats_len = 30;
if (use_hog)
{
feats_len = 471;
}
Mat trainingDataMat(all_feats.size(), feats_len, CV_32FC1);
Mat labelsMat(all_feats.size(), 1, CV_32S);
for (int i = 0; i < all_feats.size(); i++) {
for (int t = 0; t < 30; t++) {
for (int t = 0; t < feats_len; t++) {
float tmp = all_feats[i][t]; // !!!!!!!!!!!!!!!
float* pf = trainingDataMat.ptr<float>(i, t);
*pf = tmp;
Expand Down Expand Up @@ -526,8 +550,13 @@ int main(int argc, char **argv)
cv::cvtColor(center_det, center_det, COLOR_BGR2HSV);
std::vector<float> feat = hist_feature(center_det);

cv::Mat predictDataMat(1, 30, CV_32F);
for (int i=0;i<30;i++)
int feats_len = 30;
if (use_hog)
{
feats_len = 471;
}
cv::Mat predictDataMat(1, feats_len, CV_32F);
for (int i=0; i<feats_len; i++)
{
predictDataMat.at<float>(i) = feat[i];
}
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
213 changes: 46 additions & 167 deletions Modules/object_detection/dataset/ellipse/landing_patches.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,220 +2,99 @@
0000000001.jpg 1
0000000002.jpg 1
0000000003.jpg 1
0000000004.jpg 1
0000000004.jpg 0
0000000005.jpg 1
0000000006.jpg 1
0000000007.jpg 1
0000000007.jpg 0
0000000008.jpg 1
0000000009.jpg 1
0000000010.jpg 1
0000000010.jpg 0
0000000011.jpg 1
0000000012.jpg 1
0000000013.jpg 1
0000000013.jpg 0
0000000014.jpg 1
0000000015.jpg 1
0000000016.jpg 1
0000000017.jpg 1
0000000017.jpg 0
0000000018.jpg 1
0000000019.jpg 1
0000000020.jpg 1
0000000020.jpg 0
0000000021.jpg 1
0000000022.jpg 1
0000000023.jpg 1
0000000024.jpg 1
0000000024.jpg 0
0000000025.jpg 1
0000000026.jpg 1
0000000026.jpg 0
0000000027.jpg 1
0000000028.jpg 1
0000000029.jpg 1
0000000030.jpg 1
0000000030.jpg 0
0000000031.jpg 1
0000000032.jpg 1
0000000033.jpg 1
0000000034.jpg 1
0000000035.jpg 1
0000000036.jpg 1
0000000034.jpg 0
0000000035.jpg 0
0000000036.jpg 0
0000000037.jpg 1
0000000038.jpg 1
0000000039.jpg 1
0000000040.jpg 1
0000000039.jpg 0
0000000040.jpg 0
0000000041.jpg 1
0000000042.jpg 1
0000000043.jpg 1
0000000043.jpg 0
0000000044.jpg 1
0000000045.jpg 1
0000000045.jpg 0
0000000046.jpg 1
0000000047.jpg 1
0000000047.jpg 0
0000000048.jpg 1
0000000049.jpg 1
0000000050.jpg 1
0000000050.jpg 0
0000000051.jpg 1
0000000052.jpg 1
0000000053.jpg 1
0000000054.jpg 1
0000000054.jpg 0
0000000055.jpg 1
0000000056.jpg 1
0000000057.jpg 1
0000000058.jpg 1
0000000057.jpg 0
0000000058.jpg 0
0000000059.jpg 1
0000000060.jpg 1
0000000061.jpg 1
0000000062.jpg 1
0000000063.jpg 1
0000000060.jpg 0
0000000061.jpg 0
0000000062.jpg 0
0000000063.jpg 0
0000000064.jpg 1
0000000065.jpg 1
0000000066.jpg 1
0000000065.jpg 0
0000000066.jpg 0
0000000067.jpg 1
0000000068.jpg 1
0000000069.jpg 1
0000000070.jpg 1
0000000068.jpg 0
0000000069.jpg 0
0000000070.jpg 0
0000000071.jpg 1
0000000072.jpg 1
0000000073.jpg 1
0000000074.jpg 1
0000000072.jpg 0
0000000073.jpg 0
0000000074.jpg 0
0000000075.jpg 1
0000000076.jpg 1
0000000077.jpg 1
0000000076.jpg 0
0000000077.jpg 0
0000000078.jpg 1
0000000079.jpg 1
0000000080.jpg 1
0000000081.jpg 1
0000000079.jpg 0
0000000080.jpg 0
0000000081.jpg 0
0000000082.jpg 1
0000000083.jpg 1
0000000083.jpg 0
0000000084.jpg 1
0000000085.jpg 1
0000000085.jpg 0
0000000086.jpg 1
0000000087.jpg 1
0000000088.jpg 1
0000000087.jpg 0
0000000088.jpg 0
0000000089.jpg 1
0000000090.jpg 1
0000000091.jpg 1
0000000091.jpg 0
0000000092.jpg 1
0000000093.jpg 1
0000000094.jpg 1
0000000094.jpg 0
0000000095.jpg 1
0000000096.jpg 1
0000000096.jpg 0
0000000097.jpg 1
0000000098.jpg 1
0000000098.jpg 0
0000000099.jpg 1
0000000100.jpg 1
center_area_0.jpg 0
center_area_1.jpg 0
center_area_10.jpg 0
center_area_100.jpg 0
center_area_101.jpg 0
center_area_102.jpg 0
center_area_103.jpg 0
center_area_104.jpg 0
center_area_105.jpg 0
center_area_106.jpg 0
center_area_107.jpg 0
center_area_108.jpg 0
center_area_109.jpg 0
center_area_11.jpg 0
center_area_110.jpg 0
center_area_111.jpg 0
center_area_112.jpg 0
center_area_113.jpg 0
center_area_114.jpg 0
center_area_115.jpg 0
center_area_116.jpg 0
center_area_117.jpg 0
center_area_118.jpg 0
center_area_119.jpg 0
center_area_12.jpg 0
center_area_120.jpg 0
center_area_121.jpg 0
center_area_122.jpg 0
center_area_123.jpg 0
center_area_124.jpg 0
center_area_125.jpg 0
center_area_126.jpg 0
center_area_127.jpg 0
center_area_129.jpg 0
center_area_13.jpg 0
center_area_14.jpg 0
center_area_15.jpg 0
center_area_16.jpg 0
center_area_17.jpg 0
center_area_18.jpg 0
center_area_19.jpg 0
center_area_2.jpg 0
center_area_20.jpg 0
center_area_21.jpg 0
center_area_22.jpg 0
center_area_23.jpg 0
center_area_24.jpg 0
center_area_25.jpg 0
center_area_26.jpg 0
center_area_27.jpg 0
center_area_28.jpg 0
center_area_29.jpg 0
center_area_3.jpg 0
center_area_30.jpg 0
center_area_31.jpg 0
center_area_32.jpg 0
center_area_33.jpg 0
center_area_34.jpg 0
center_area_35.jpg 0
center_area_36.jpg 0
center_area_37.jpg 0
center_area_38.jpg 0
center_area_39.jpg 0
center_area_4.jpg 0
center_area_40.jpg 0
center_area_41.jpg 0
center_area_42.jpg 0
center_area_43.jpg 0
center_area_44.jpg 0
center_area_45.jpg 0
center_area_47.jpg 0
center_area_48.jpg 0
center_area_49.jpg 0
center_area_5.jpg 0
center_area_50.jpg 0
center_area_54.jpg 0
center_area_55.jpg 0
center_area_58.jpg 0
center_area_6.jpg 0
center_area_61.jpg 0
center_area_63.jpg 0
center_area_64.jpg 0
center_area_65.jpg 0
center_area_66.jpg 0
center_area_67.jpg 0
center_area_68.jpg 0
center_area_69.jpg 0
center_area_7.jpg 0
center_area_70.jpg 0
center_area_71.jpg 0
center_area_72.jpg 0
center_area_73.jpg 0
center_area_74.jpg 0
center_area_75.jpg 0
center_area_76.jpg 0
center_area_77.jpg 0
center_area_78.jpg 0
center_area_79.jpg 0
center_area_8.jpg 0
center_area_80.jpg 0
center_area_81.jpg 0
center_area_82.jpg 0
center_area_83.jpg 0
center_area_84.jpg 0
center_area_85.jpg 0
center_area_86.jpg 0
center_area_87.jpg 0
center_area_88.jpg 0
center_area_89.jpg 0
center_area_9.jpg 0
center_area_90.jpg 0
center_area_91.jpg 0
center_area_92.jpg 0
center_area_93.jpg 0
center_area_94.jpg 0
center_area_95.jpg 0
center_area_96.jpg 0
center_area_97.jpg 0
center_area_98.jpg 0
center_area_99.jpg 0
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Loading

0 comments on commit 88a585a

Please sign in to comment.