wind analyzing

Author: peacekeeper228

data/slope.csv

@@ -1,91 +1,103 @@
--20,0,0.675232
-17,0,1.422260
--27,1,0.683119
-10,0,1.185208
-19,0,1.344144
-14,0,1.258360
-15,0,1.276099
-16,0,1.293566
-31,0,1.515261
-21,0,1.376205
--21,0,0.726636
--15,0,0.724879
-12,0,1.222165
-11,0,1.285852
--18,0,0.693220
-9,0,1.235440
--14,0,0.736856
-25,1,1.436084
-21,1,1.376205
-18,0,1.327604
-18,1,1.327604
--19,1,0.743968
-13,0,1.334008
--20,1,0.735107
-14,1,1.357118
-19,1,1.344144
-8,0,1.147771
-6,0,1.156882
--25,0,0.696338
--14,1,0.794685
--16,1,0.773057
--21,1,0.726636
-22,1,1.391711
--10,1,0.793086
-2,0,1.035927
-31,1,1.515261
-10,1,1.185208
--2,1,0.951387
-1,0,1.017827
--11,0,0.777694
--8,0,0.826750
--5,0,0.916233
--2,0,0.965319
--1,1,0.975330
-0,1,1.000000
-1,1,1.025294
--6,1,0.900760
-6,1,1.156882
--7,1,0.885763
-5,1,1.091425
-3,1,1.077286
--1,0,0.975330
+0,-23,0.652120
+0,23,1.406861
+0,-24,0.703407
+1,-23,0.652120
+1,-25,0.696338
+0,26,1.580198
+0,-22,0.718540
+1,-18,0.753236
+0,-26,0.689581
+0,-19,0.743968
+1,27,1.463874
+1,26,1.580198
+0,-20,0.675232
+0,17,1.310740
+1,-27,0.683119
+0,10,1.260898
+0,19,1.462111
+0,14,1.258360
+0,15,1.276099
+0,16,1.401258
+0,31,1.515261
+0,21,1.376205
+0,-21,0.726636
+0,-15,0.724879
+0,12,1.222165
+0,11,1.285852
+0,-18,0.693220
+0,9,1.235440
+0,-14,0.736856
+1,25,1.436084
+1,21,1.376205
+0,18,1.327604
+1,18,1.327604
+1,-19,0.743968
+0,13,1.334008
+1,-20,0.735107
+1,14,1.258360
+1,19,1.344144
+0,8,1.209556
+0,6,1.156882
+0,-25,0.696338
+1,-14,0.794685
+1,-16,0.773057
+1,-21,0.726636
+1,22,1.391711
+1,-10,0.843734
+0,2,1.035927
+1,31,1.515261
+1,10,1.185208
+1,-2,0.965319
+0,1,1.017827
+0,-8,0.871254
+0,-5,0.884715
+0,-2,0.951387
+1,-1,0.975330
+1,0,1.000000
+1,-6,0.900760
+1,6,1.110174
+1,-7,0.885763
+1,5,1.091425
+1,3,1.077286
+0,3,1.054256
+1,1,1.017827
+0,-11,0.777694
+0,-1,0.975330
 0,0,1.000000
--3,1,0.948536
-2,1,1.051097
-9,1,1.235440
-3,0,1.077286
--3,0,0.948536
-23,1,1.406861
--9,1,0.857243
-7,1,1.128971
--5,1,0.916233
-8,1,1.147771
--4,1,0.932166
-15,1,1.276099
--17,1,0.762928
--7,0,0.845069
--8,1,0.826750
-24,1,1.421652
-4,0,1.072771
-20,1,1.360347
--12,1,0.763219
-5,0,1.091425
--4,0,0.932166
--9,0,0.809428
-7,0,1.128971
-4,1,1.103733
--6,0,0.864392
--10,0,0.843734
-17,1,1.310740
--15,1,0.783638
--16,0,0.713644
--17,0,0.762928
-11,1,1.203765
-12,1,1.222165
-16,1,1.293566
-13,1,1.240373
--11,1,0.830727
--13,1,0.806209
--13,0,0.749621
--12,0,0.818220
+1,-3,0.928259
+1,2,1.051097
+1,9,1.166530
+0,-3,0.948536
+1,23,1.406861
+1,-9,0.857243
+1,7,1.128971
+1,-5,0.884715
+1,8,1.147771
+1,-4,0.932166
+1,15,1.276099
+1,-17,0.703106
+0,-7,0.885763
+1,-8,0.871254
+1,24,1.421652
+0,4,1.072771
+1,20,1.360347
+1,-12,0.763219
+0,5,1.091425
+0,-4,0.932166
+0,-9,0.857243
+0,7,1.128971
+1,4,1.072771
+0,-6,0.900760
+0,-10,0.793086
+1,17,1.310740
+1,-15,0.783638
+0,-16,0.713644
+0,-17,0.703106
+1,11,1.203765
+1,12,1.222165
+1,16,1.293566
+1,13,1.240373
+1,-11,0.777694
+1,-13,0.806209
+0,-13,0.749621
+0,-12,0.818220

data/wind.csv

@@ -0,0 +1,6 @@
+0,5.000000,1.000000
+1,5.000000,0.093164
+2,5.000000,0.000717
+3,5.000000,0.000046
+4,5.000000,0.000338
+5,5.000000,0.042282

include/Math.h

@@ -19,7 +19,7 @@ struct SlopeMetaData
 struct WindMetaData
 {
     int direction_difference_;
-    double wind_speed_;
+    float wind_speed_;
     bool operator==(const WindMetaData &rhs) const
     {
         return direction_difference_ == rhs.direction_difference_ &&
@@ -85,6 +85,11 @@ class Math1 final : public Math
     mutable std::map<int, int> result_overall;
     mutable clock_t slope_timer;
     mutable int slope_counter;
+
+    mutable clock_t wind_timer_;
+    mutable int wind_counter_;
+    mutable std::unordered_map<WindMetaData, double> wind_result_;
+    
     double calculateKoef(float windSpeed, double slopeAngleRad) const;
     double calculateWindKoef(const cell *c, directions InvestigatedDirection) const;
     double calculateGroundSlopeKoef(directions InvestigatedDirection, int altitudeDifference) const;

src/Math.cpp

@@ -5,6 +5,7 @@
 #include <fstream>
 #include <sstream>
 #include <vector>
+#include <bits/stdc++.h> 
 
 Math::Math(/* args */)
 {
@@ -23,14 +24,29 @@ double Math1::calculateKoef(float windSpeed, double slopeAngleRad) const
 
 double Math1::calculateWindKoef(const cell *c, directions InvestigatedDirection) const
 {
+    clock_t start = clock();
     auto wind = c->getWind().get();
     if (wind == nullptr)
     {
         return double(1);
     }
-    float angleRadians = wind->angleBetweenDirections(InvestigatedDirection); // * pi() / 180;
+    WindMetaData meta = {abs(static_cast<int>(wind->getWindDirection()) - static_cast<int>(InvestigatedDirection)), wind->getWindSpeed()};
+    auto a = wind_result_[meta];
+    if (a != 0){
+        clock_t per_iteration = clock() - start;
+        wind_timer_ = per_iteration+wind_timer_;
+        wind_counter_++;
+        return wind_result_[meta];
+    };
+    float angleRadians = wind->angleBetweenDirections(InvestigatedDirection);
     double result = std::exp(wind->getWindSpeed() * (cos(angleRadians) - 1));
     result_wind_[result]++;
+
+    wind_result_[meta] = result;
+    clock_t per_iteration = clock() - start;
+    wind_timer_ = per_iteration+wind_timer_;
+    wind_counter_++;
+
     return result;
 }
 
@@ -104,17 +120,35 @@ Math1::Math1()
         {
             cols.push_back(col);
         }
-        auto a = atoi(cols[0].c_str());
+        auto a = atoi(cols[1].c_str());
         slope_result_[SlopeMetaData{to_bool(cols[0].c_str()), a}] = atof(cols[2].c_str());
     }
     csvFile.close();
+    std::ifstream csvFile2{"data/wind.csv"};
+    while (std::getline(csvFile2, row))
+    {
+        std::stringstream rowStream(row);
+        std::string col;
+        std::vector<std::string> cols;
+        while (std::getline(rowStream, col, ','))
+        {
+            cols.push_back(col);
+        }
+        float a = atof(cols[1].c_str());
+
+        wind_result_[WindMetaData{atoi(cols[0].c_str()), a}] = atof(cols[2].c_str());
+    }
+    csvFile2.close();
     slope_counter = 0;
     slope_timer = 0;
+    wind_counter_ = 0;
+    wind_timer_ = 0;
 }
 
 Math1::~Math1()
 {
-    printf("total time %f, overall counts %d", (double)(slope_timer), slope_counter);
+    printf("total time %f, overall counts %d\n", (double)(slope_timer), slope_counter);
+    printf("total time %f, overall counts %d\n", (double)(wind_timer_), wind_counter_);
     // printf("slope profiling\n");
     // std::map<int, int> slope_distribution;
 

src/main.cpp

@@ -34,6 +34,9 @@ int main()
     w = std::make_shared<const Wind>(directions::SouthEast, float(2.0));
     s.setWindToArea(xRange, yRange, w);
 
+    for (size_t i = 0; i < 10; i++)
+    {
+    
     c.setStatesToStorage(s);
 
     clock_t tStart = clock();
@@ -51,6 +54,8 @@ int main()
     // std::cout << "WorkingSetSize " << memCounter.PeakWorkingSetSize << std::endl;
 
     printf("Time taken: %.2fs\n", (double)(clock() - tStart) / CLOCKS_PER_SEC);
+
+    };
     s.printCurrentStates();
     // s.saveFiresToJson();