2martens/uni
1
0
Fork 0
mirror of https://github.com/2martens/uni.git synced 2026-05-06 11:26:25 +02:00
Code Releases Activity

[CCV] Fixed overwriting of matrices

Browse Source 
Signed-off-by: Jim Martens <github@2martens>
This commit is contained in:
Jim Martens
2017-05-04 13:16:59 +02:00
parent 72a06519ac
commit a98fc12db2
1 changed files with 35 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
ccv/sheet4/lab_pyramid.cpp
View File

@ -59,51 +59,56 @@ void lab_pyramid::compute_dog(lab_pyramid center, lab_pyramid surround, int numb
for (int layer = 0; layer < number_of_layers; layer++) { for (int layer = 0; layer < number_of_layers; layer++) {
// L channel // L channel
cv::Mat center_layer_mat = center_l.get(layer); cv::Mat center_layer_mat_L = center_l.get(layer);
cv::Mat surround_layer_mat = surround_l.get(layer); cv::Mat surround_layer_mat_L = surround_l.get(layer);
cv::Mat dog_raw = center_layer_mat - surround_layer_mat; cv::Mat dog_raw_cs_L = center_layer_mat_L - surround_layer_mat_L;
cv::Mat dog_final; cv::Mat dog_final_cs_L;
cv::threshold(dog_raw, dog_final, 0, 1, cv::THRESH_TOZERO); cv::Mat dog_final_sc_L;
_cs_contrast_l.push_back(dog_final); cv::threshold(dog_raw_cs_L, dog_final_cs_L, 0, 1, cv::THRESH_TOZERO);
dog_raw = surround_layer_mat - center_layer_mat; _cs_contrast_l.push_back(dog_final_cs_L);
cv::threshold(dog_raw, dog_final, 0, 1, cv::THRESH_TOZERO); cv::Mat dog_raw_sc = surround_layer_mat_L - center_layer_mat_L;
_sc_contrast_l.push_back(dog_final); cv::threshold(dog_raw_sc, dog_final_sc_L, 0, 1, cv::THRESH_TOZERO);
_sc_contrast_l.push_back(dog_final_sc_L);
// A channel // A channel
center_layer_mat = center_a.get(layer); cv::Mat center_layer_mat_a = center_a.get(layer);
surround_layer_mat = surround_a.get(layer); cv::Mat surround_layer_mat_a = surround_a.get(layer);
dog_raw = center_layer_mat - surround_layer_mat; cv::Mat dog_raw_cs_a = center_layer_mat_a - surround_layer_mat_a;
cv::threshold(dog_raw, dog_final, 0, 1, cv::THRESH_TOZERO); cv::Mat dog_final_cs_a;
_cs_contrast_a.push_back(dog_final); cv::Mat dog_final_sc_a;
dog_raw = surround_layer_mat - center_layer_mat; cv::threshold(dog_raw_cs_a, dog_final_cs_a, 0, 1, cv::THRESH_TOZERO);
cv::threshold(dog_raw, dog_final, 0, 1, cv::THRESH_TOZERO); _cs_contrast_a.push_back(dog_final_cs_a);
_sc_contrast_a.push_back(dog_final); cv::Mat dog_raw_sc_a = surround_layer_mat_a - center_layer_mat_a;
cv::threshold(dog_raw_sc_a, dog_final_sc_a, 0, 1, cv::THRESH_TOZERO);
_sc_contrast_a.push_back(dog_final_sc_a);
// B channel // B channel
center_layer_mat = center_b.get(layer); cv::Mat center_layer_mat_b = center_b.get(layer);
surround_layer_mat = surround_b.get(layer); cv::Mat surround_layer_mat_b = surround_b.get(layer);
dog_raw = center_layer_mat - surround_layer_mat; cv::Mat dog_raw_cs_b = center_layer_mat_b - surround_layer_mat_b;
cv::threshold(dog_raw, dog_final, 0, 1, cv::THRESH_TOZERO); cv::Mat dog_final_cs_b;
_cs_contrast_b.push_back(dog_final); cv::Mat dog_final_sc_b;
dog_raw = surround_layer_mat - center_layer_mat; cv::threshold(dog_raw_cs_b, dog_final_cs_b, 0, 1, cv::THRESH_TOZERO);
cv::threshold(dog_raw, dog_final, 0, 1, cv::THRESH_TOZERO); _cs_contrast_b.push_back(dog_final_cs_b);
_sc_contrast_b.push_back(dog_final); cv::Mat dog_raw_sc_b = surround_layer_mat_b - center_layer_mat_b;
cv::threshold(dog_raw_cs_b, dog_final_sc_b, 0, 1, cv::THRESH_TOZERO);
_sc_contrast_b.push_back(dog_final_sc_b);
} }
} }
void lab_pyramid::visualize_dog() { void lab_pyramid::visualize_dog() {
for (unsigned long layer = 0; layer < _number_of_layers; layer++) { for (unsigned long layer = 0; layer < _number_of_layers; layer++) {
cv::namedWindow("CS L"); cv::namedWindow("CS L");
cv::namedWindow("SC L");
cv::namedWindow("CS A");
cv::namedWindow("SC A");
cv::namedWindow("CS B");
cv::namedWindow("SC B");
cv::imshow("CS L", _cs_contrast_l.at(layer)); cv::imshow("CS L", _cs_contrast_l.at(layer));
cv::namedWindow("SC L");
cv::imshow("SC L", _sc_contrast_l.at(layer)); cv::imshow("SC L", _sc_contrast_l.at(layer));
cv::namedWindow("CS A");
cv::imshow("CS A", _cs_contrast_a.at(layer)); cv::imshow("CS A", _cs_contrast_a.at(layer));
cv::namedWindow("SC A");
cv::imshow("SC A", _cs_contrast_a.at(layer)); cv::imshow("SC A", _cs_contrast_a.at(layer));
cv::namedWindow("CS B");
cv::imshow("CS B", _cs_contrast_b.at(layer)); cv::imshow("CS B", _cs_contrast_b.at(layer));
cv::namedWindow("SC B");
cv::imshow("SC B", _cs_contrast_b.at(layer)); cv::imshow("SC B", _cs_contrast_b.at(layer));
cv::waitKey(0); cv::waitKey(0);
} }