Merge pull request #2535 from ivikhrev/social-distance-fix

Social distance demo fix

Author: Wovchena

demos/social_distance_demo/cpp/include/person_trackers.hpp

@@ -29,46 +29,42 @@ class PersonTrackers {
     PersonTrackers() : trackIdGenerator{0}, similarityThreshold{0.7f}, maxDisappeared{10} {}
 
     void similarity(std::list<TrackableObject> &tos) {
-        if (trackables.size() > 0) {
-            for (const auto& to : tos) {
-                std::deque<std::pair<int, float>> sim;
-                for (auto &tracker : trackables) {
-                    if (!tracker.second.updated) {
-                        float cosine = cosineSimilarity(to.reid, tracker.second.reid);
-                        if (cosine > similarityThreshold) {
-                            sim.push_back(std::make_pair(tracker.first, cosine));
-                        }
+        for (const auto& to : tos) {
+            std::deque<std::pair<int, float>> sim;
+            for (auto &tracker : trackables) {
+                if (!tracker.second.updated) {
+                    float cosine = cosineSimilarity(to.reid, tracker.second.reid);
+                    if (cosine > similarityThreshold) {
+                        sim.push_back(std::make_pair(tracker.first, cosine));
                     }
                 }
+            }
 
-                if (sim.empty()) {
-                    trackables.insert({ trackIdGenerator, to });
-                    trackables.at(trackIdGenerator).updated = true;
-                    trackables.at(trackIdGenerator).disappeared = 0;
-                    trackIdGenerator += 1;
-                } else {
-                    int maxSimilarity = std::max_element(sim.begin(), sim.end(), [](std::pair<int, float> a, std::pair<int, float> b) {
-                        return std::get<1>(a) > std::get<1>(b);
-                        })->first;
-                    trackables.at(maxSimilarity) = to;
-                    trackables.at(maxSimilarity).updated = true;
-                    trackables.at(maxSimilarity).disappeared = 0;
-                }
+            if (sim.empty()) {
+                trackables.insert({ trackIdGenerator, to });
+                trackables.at(trackIdGenerator).updated = true;
+                trackables.at(trackIdGenerator).disappeared = 0;
+                trackIdGenerator += 1;
+            } else {
+                int maxSimilarity = std::max_element(sim.begin(), sim.end(), [](std::pair<int, float> a, std::pair<int, float> b) {
+                    return std::get<1>(a) > std::get<1>(b);
+                    })->first;
+                trackables.at(maxSimilarity) = to;
+                trackables.at(maxSimilarity).updated = true;
+                trackables.at(maxSimilarity).disappeared = 0;
             }
+        }
 
-            for (auto it = trackables.begin(); it != trackables.end(); ) {
-                if (!it->second.updated) {
-                    it->second.disappeared += 1;
-                    if (it->second.disappeared > maxDisappeared) {
-                        it = trackables.erase(it);
-                        continue;
-                    }
+        for (auto it = trackables.begin(); it != trackables.end(); ) {
+            if (!it->second.updated) {
+                it->second.disappeared += 1;
+                if (it->second.disappeared > maxDisappeared) {
+                    it = trackables.erase(it);
+                    continue;
                 }
-                it->second.updated = false;
-                ++it;
             }
-        } else {
-            registerTrackables(tos);
+            it->second.updated = false;
+            ++it;
         }
     }
 
@@ -86,14 +82,6 @@ class PersonTrackers {
         return static_cast<float>(dot / (sqrt(denomA) * sqrt(denomB) + 1e-6));
     }
 
-    void registerTrackables(std::list<TrackableObject> &tos) {
-        for (auto &to : tos) {
-            to.disappeared = 0;
-            trackables.insert({trackIdGenerator, to});
-            trackIdGenerator += 1;
-        }
-    }
-
 public:
     std::unordered_map<int, TrackableObject> trackables;
 

demos/social_distance_demo/cpp/src/geodist.cpp

@@ -226,10 +226,10 @@ std::tuple<bool, bool, double> socialDistance(std::tuple<int, int> &frameShape,
     std::tie(bdA, bdK) = getLineComponent(B, D);
     std::tie(acA, acK) = getLineComponent(A, C);
 
-    double bdinf = B.x < D.x ? -9999999999. : 9999999999.;
+    double bdinf = std::lround(B.x) <= std::lround(D.x) ? -9999999999. : 9999999999.;
     Line2d BDinf = getLine(D, cv::Point2d(bdinf, getY(bdinf, bdA, bdK)));
 
-    double acinf = A.x < C.x ? -9999999999. : 9999999999.;
+    double acinf = std::lround(A.x) <= std::lround(C.x) ? -9999999999. : 9999999999.;
     Line2d ACinf = getLine(C, cv::Point2d(acinf, getY(acinf, acA, acK)));
 
     // Vanishing point