some updates

Author: peacekeeper228

data/wind.csv

@@ -1,6 +1,10 @@
-0,5.000000,1.000000
-1,5.000000,0.093164
-2,5.000000,0.000717
+0,2.000000,1.000000
+1,2.000000,0.386990
+2,2.000000,0.055236
+4,2.000000,0.040888
+3,2.000000,0.018460
 3,5.000000,0.000046
-4,5.000000,0.000338
-5,5.000000,0.042282
+2,5.000000,0.000717
+1,5.000000,0.093164
+0,5.000000,1.000000
+4,5.000000,0.000338

include/CellStorage.h

@@ -84,6 +84,8 @@ class CellStorage
 
     void saveFiresToJson();
 
+    void uploadFromTxt();
+
     CellStorage* CopySquare(int xMin, int yMin, int xMax, int yMax) const;
 
 };

include/Math.h

@@ -80,6 +80,7 @@ class Math1 final : public Math
 {
 private:
     mutable std::unordered_map<SlopeMetaData, int> slope_counter_;
+    mutable std::map<double, int> result_slope_;
     mutable std::unordered_map<SlopeMetaData, double> slope_result_;
     mutable std::map<double, int> result_wind_;
     mutable std::map<int, int> result_overall;

include/Metric.h

@@ -11,6 +11,7 @@ class Metric
     Metric(const Metric& m) = default;
     ~Metric();
     void calculateVariables(const CellStorage& cellStorage, std::vector<std::pair<int, int>>& realFirePoints, std::vector<std::pair<int, int>>& burntPoints);
+    void calculateVariablesFrom2Storages(const CellStorage& cellStorage, const CellStorage& other);
     virtual double compute() const = 0;
 };
 

include/ProfilingDecorator.h

@@ -38,6 +38,7 @@ class ProfilingDecorator final : public Math
     Math *primary_class_;
     mutable int positive_counter_;
     mutable int counter_;
+    mutable clock_t overall_timer_; 
     mutable std::unordered_map<metaData, int> results_;
     mutable std::unordered_map<directions, int> results_directions_;
 

include/Wind.h

@@ -26,4 +26,6 @@ class Wind
     /// @return angle in degrees
     int angleBetweenDirections(directions d) const;
 
+    int directionDifference(directions d) const;
+
 };

src/CellStorage.cpp

@@ -202,6 +202,26 @@ void CellStorage::saveFiresToJson()
     //     std::cout << event << std::endl;
 }
 
+void CellStorage::uploadFromTxt()
+{
+    std::ifstream txt_file{"previous.txt"};
+    if (!txt_file.is_open()) {
+        std::cerr << "Не удалось открыть файл с предыдущими данными" << std::endl;
+        return;
+    }
+    std::string line;
+    size_t currentLine = 0;
+
+    while (std::getline(txt_file, line)) {
+        for (size_t i = 0; i < line.size(); i++)
+        {
+            terrain_[currentLine][i].get()->setState(static_cast<cellState>(line[i]-'0'));
+        }
+        currentLine++;
+        
+    }
+    txt_file.close();
+}
 std::vector<std::pair<int, int>> CellStorage::getRelativeFirePoints() const
 {
     // important note that result must be sorted!

src/Math.cpp

@@ -30,7 +30,8 @@ double Math1::calculateWindKoef(const cell *c, directions InvestigatedDirection)
     {
         return double(1);
     }
-    WindMetaData meta = {abs(static_cast<int>(wind->getWindDirection()) - static_cast<int>(InvestigatedDirection)), wind->getWindSpeed()};
+
+    WindMetaData meta = {wind->directionDifference(InvestigatedDirection), wind->getWindSpeed()};
     auto a = wind_result_[meta];
     if (a != 0){
         clock_t per_iteration = clock() - start;
@@ -56,14 +57,17 @@ double Math1::calculateGroundSlopeKoef(directions InvestigatedDirection, int alt
 
     SlopeMetaData meta = {bool(static_cast<int>(InvestigatedDirection) / int(2)), altitudeDifference};
 
-    // auto a = slope_result_[meta];
-    // if (a != 0)
-    // {
-    //     clock_t per_iteration = clock() - start;
-    //     slope_timer = per_iteration+slope_timer;
-    //     slope_counter++;
-    //     return a;
-    // }
+    auto a = slope_result_[meta];
+    if (a != 0)
+    {
+        clock_t per_iteration = clock() - start;
+        slope_timer = per_iteration+slope_timer;
+        slope_counter++;
+        slope_counter_[meta]++;
+        slope_result_[meta] = a;
+        result_slope_[a]++;
+        return a;
+    }
 
     double coef = 0;
     if (InvestigatedDirection == directions::North || InvestigatedDirection == directions::West ||
@@ -133,9 +137,9 @@ bool Math1::willSpread(const cell *c, directions InvestigatedDirection, int alti
     double slopeKoeff = calculateGroundSlopeKoef(InvestigatedDirection, altitudeDifference);
     double biomassKoeff = calculateBiomassKoef(c);
     double moistureKoeff = calculateMoistureKoeff(c->getWind().get()->getMoistureCoeff());
-    int result = fireKoeff * slopeKoeff * biomassKoeff * moistureKoeff * 100 - 40;
+    int result = fireKoeff * slopeKoeff * biomassKoeff * moistureKoeff * 100 / 2;
     result_overall[result]++;
-    return result + (rand() % 100) > ignitionPercentage();
+    return result > (rand() % 100);
 }
 
 bool Math1::willSpreadThroughOne(const cell *c, directions InvestigatedDirection, int altitudeDifference) const

src/Metric.cpp

@@ -38,6 +38,34 @@ void Metric::calculateVariables(const CellStorage &cellStorage, std::vector<std:
     d = allArea - a - b - c - d;
 }
 
+void Metric::calculateVariablesFrom2Storages(const CellStorage &cellStorage, const CellStorage &other)
+{
+    for (size_t i = 0; i < getXArea(); i++)
+    {
+        for (size_t j = 0; j < getYArea(); j++)
+        {
+            auto state = cellStorage.getState(i, j);
+            auto other_state = other.getState(i, j);
+            if ((state == cellState::Fire and other_state == cellState::Fire) or (state == cellState::Burnt and other_state == cellState::Burnt))
+            {
+                ++a;
+            }
+            else if (state == cellState::Fire or state == cellState::Burnt)
+            {
+                ++b;
+            }
+            else if (other_state == cellState::Fire or other_state == cellState::Burnt)
+            {
+                ++c;
+            }
+            else
+            {
+                ++d;
+            }
+        }
+    }
+}
+
 double SimpsonMetric::compute() const
 {
     return double(a) / double(std::min(a + b, a + c));

src/ProfilingDecorator.cpp

@@ -9,7 +9,14 @@ ProfilingDecorator::ProfilingDecorator(Math *formula)
 
 bool ProfilingDecorator::willSpread(const cell *c, directions InvestigatedDirection, int altitudeDifference) const
 {
+    clock_t start = clock();
+    int direction_difference = c->getWind().get()->directionDifference(InvestigatedDirection);
+    if (direction_difference > 1){
+        return false;
+    }
     auto result = this->primary_class_->willSpread(c, InvestigatedDirection, altitudeDifference);
+    clock_t per_iteration = clock() - start;
+    overall_timer_ = per_iteration+overall_timer_;
     metaData key = {InvestigatedDirection, altitudeDifference, c->getWind().get()->getWindDirection(), c->getWind().get()->getWindSpeed()};
     results_[key]++;
     this->counter_++;