slope profiling

Author: peacekeeper228

include/Math.h

@@ -2,6 +2,30 @@
 #include <cmath>
 #include "Cell.h"
 #include <map>
+#include <unordered_map>
+
+struct SlopeMetaData
+{
+    directions investigated_direction_;
+    int altitude_difference_;
+    bool operator==(const SlopeMetaData &rhs) const
+    {
+        return investigated_direction_ == rhs.investigated_direction_ &&
+               altitude_difference_ == rhs.altitude_difference_;
+    }
+};
+
+template <>
+struct std::hash<SlopeMetaData>
+{
+    std::size_t operator()(const SlopeMetaData &key) const
+    {
+        size_t h1 = std::hash<int>()(static_cast<int>(key.investigated_direction_));
+        size_t h2 = std::hash<int>()(key.altitude_difference_);
+        return h1 ^ (h2 << 1);
+    }
+};
+
 class Math
 {
 private:
@@ -30,7 +54,7 @@ constexpr int throughPercentage(){
 class Math1 final:  public Math
 {
 private:
-    mutable std::map<double, int> result_slope_;
+    mutable std::unordered_map<SlopeMetaData, int> result_slope_;
     mutable std::map<double, int> result_wind_;
     mutable std::map<int, int> result_overall;
     double calculateKoef(float windSpeed, double slopeAngleRad) const;

src/Math.cpp

@@ -21,10 +21,11 @@ double Math1::calculateKoef(float windSpeed, double slopeAngleRad) const
 double Math1::calculateWindKoef(const cell *c, directions InvestigatedDirection) const
 {
     auto wind = c->getWind().get();
-    if (wind == nullptr){
+    if (wind == nullptr)
+    {
         return double(1);
     }
-    float angleRadians = wind->angleBetweenDirections(InvestigatedDirection);// * pi() / 180;
+    float angleRadians = wind->angleBetweenDirections(InvestigatedDirection); // * pi() / 180;
     double result = std::exp(wind->getWindSpeed() * (cos(angleRadians) - 1));
     result_wind_[result]++;
     return result;
@@ -43,7 +44,8 @@ double Math1::calculateGroundSlopeKoef(directions InvestigatedDirection, int alt
         coef = atan2(static_cast<double>(altitudeDifference), static_cast<double>(cellSizeInMeters() * sqrt(2.0)));
     }
     double result = std::exp(0.5 * coef);
-    result_slope_[result]++;
+    SlopeMetaData meta = {InvestigatedDirection, altitudeDifference};
+    result_slope_[meta]++;
     return result;
 }
 
@@ -65,19 +67,26 @@ bool Math1::willSpreadThroughOne(const cell *c, directions InvestigatedDirection
 
 Math1::~Math1()
 {
-    printf("slope profiling\n");   
+    printf("slope profiling\n");
+    std::map<int, int> slope_distribution;
     for (auto &&i : result_slope_)
     {
-        printf("%2.2f;%d\n",i.first, i.second);   
+        printf("%d,%d;%d\n", i.first.altitude_difference_, static_cast<int>(i.first.investigated_direction_), i.second);
+        slope_distribution[i.second]++;
+    }
+    printf("slope distribution\n");
+    for (auto &&i : slope_distribution)
+    {
+        printf("%d;%d\n", i.first, i.second);
     }
-    printf("wind profiling\n");   
+    printf("wind profiling\n");
     for (auto &&i : result_wind_)
     {
-        printf("%2.2f;%d\n",i.first, i.second);   
+        printf("%2.2f;%d\n", i.first, i.second);
     }
-    printf("overall profiling\n");   
+    printf("overall profiling\n");
     for (auto &&i : result_overall)
     {
-        printf("%d;%d\n",i.first, i.second);   
+        printf("%d;%d\n", i.first, i.second);
     }
 }