adding decorator for bird view analysis

Author: peacekeeper228

CMakeLists.txt

@@ -21,6 +21,7 @@ ADD_LIBRARY(LibsModule
     src/Wind.cpp
     src/Math.cpp
     src/Metric.cpp
+    src/ProfilingDecorator.cpp
 )
 
 target_link_libraries(LibsModule PRIVATE PostgreSQL::PostgreSQL)

Makefile

@@ -5,7 +5,7 @@ MAINFILE := src/main.cpp
 TESTMAINFILE := tests/test_main.cpp
 TARGET := bin/main
 
-SRCS := src/Cell.cpp src/CellStorage.cpp src/Coordinates.cpp src/Wind.cpp src/Fire.cpp src/Connection.cpp src/Math.cpp src/Metric.cpp
+SRCS := src/Cell.cpp src/CellStorage.cpp src/Coordinates.cpp src/Wind.cpp src/Fire.cpp src/Connection.cpp src/Math.cpp src/Metric.cpp src/ProfilingDecorator.cpp
 
 compile_run: clean compile run
 

include/Math.h

@@ -9,8 +9,8 @@ class Math
     Math();
     //virtual double calculateKoef(float windSpeed, double slopeAngleRad) const = 0;
     //virtual double calculateWindKoef(const cell* c, directions InvestigatedDirection) const = 0;
-    virtual bool willSpread(const cell* c, directions InvestigatedDirection) const = 0;
-    virtual bool willSpreadThroughOne(const cell* c, directions InvestigatedDirection) const = 0;
+    virtual bool willSpread(const cell* c, directions InvestigatedDirection, int altitudeDifference) const = 0;
+    virtual bool willSpreadThroughOne(const cell* c, directions InvestigatedDirection, int altitudeDifference) const = 0;
     ~Math();
 };
 
@@ -26,14 +26,15 @@ constexpr int throughPercentage(){
 /// "Aildland fire spread modelling using cellular 
 /// automata: evolution in large-scale spatially heterogeneous environments 
 /// under fire suppression tactics"
-class Math1 final: public Math
+class Math1 final:  public Math
 {
 private:
     double calculateKoef(float windSpeed, double slopeAngleRad) const;
     double calculateWindKoef(const cell* c, directions InvestigatedDirection) const;
+    double calculateGroundSlopeKoef(directions InvestigatedDirection, int altitudeDifference) const;
 public:
-    bool willSpread(const cell* c, directions InvestigatedDirection) const override;
-    bool willSpreadThroughOne(const cell* c, directions InvestigatedDirection) const override;
+    bool willSpread(const cell* c, directions InvestigatedDirection, int altitudeDifference) const override;
+    bool willSpreadThroughOne(const cell* c, directions InvestigatedDirection, int altitudeDifference) const override;
     Math1() = default;
     ~Math1() = default;
 };

include/ProfilingDecorator.h

@@ -0,0 +1,16 @@
+#pragma once
+#include <map>
+#include "Math.h"
+
+class ProfilingDecorator final: public Math
+{
+private:
+    Math* primary_class;
+    mutable int positiveCounter;
+    mutable int counter;
+public:
+    ProfilingDecorator(Math* formula);
+    bool willSpread(const cell* c, directions InvestigatedDirection, int altitudeDifference) const override;
+    bool willSpreadThroughOne(const cell* c, directions InvestigatedDirection, int altitudeDifference) const override;
+    ~ProfilingDecorator();
+};

src/CellStorage.cpp

@@ -97,7 +97,7 @@ void CellStorage::iterateCell(int i, int j)
             double fireKoeff = 0;
             if (nearestCell->getState() == cellState::Tree)
             {
-                if (formula->willSpread(iteratedCell, analyzedDirection))
+                if (formula->willSpread(iteratedCell, analyzedDirection, iteratedCell->getAltitude() - nearestCell->getAltitude()))
                 {
                     setNewState(cellState::Fire, i + x.first, j + x.second);
                 };
@@ -109,7 +109,7 @@ void CellStorage::iterateCell(int i, int j)
             };
             if ((throughCell->getState() == cellState::Tree) && (nearestCell->getState() != cellState::Tree) && ((nearestCell->getState() != cellState::Fire)))
             {
-                if (formula->willSpreadThroughOne(iteratedCell, analyzedDirection))
+                if (formula->willSpreadThroughOne(iteratedCell, analyzedDirection, iteratedCell->getAltitude() - throughCell->getAltitude()))
                 {
                     setNewState(cellState::Fire, i + 2 * x.first, j + 2 * x.second);
                 };

src/Math.cpp

@@ -1,5 +1,6 @@
 #include "../include/Math.h"
 #include "../include/Properties.h"
+#include <cmath>
 
 Math::Math(/* args */)
 {
@@ -19,18 +20,38 @@ 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){
+        return double(1);
+    }
     float angleRadians = wind->angleBetweenDirections(InvestigatedDirection) * pi() / 180;
     return std::exp(wind->getWindSpeed() * (cos(cos(angleRadians)) - 1));
 }
 
-bool Math1::willSpread(const cell *c, directions InvestigatedDirection) const
+double Math1::calculateGroundSlopeKoef(directions InvestigatedDirection, int altitudeDifference) const
+{
+    double coef = 0;
+    if (InvestigatedDirection == directions::North || InvestigatedDirection == directions::West ||
+        InvestigatedDirection == directions::East || InvestigatedDirection == directions::South)
+    {
+        coef = atan2(static_cast<double>(altitudeDifference), static_cast<double>(cellSizeInMeters()));
+    }
+    else
+    {
+        coef = atan2(static_cast<double>(altitudeDifference), static_cast<double>(cellSizeInMeters() * sqrt(2.0)));
+    }
+    return std::exp(0.5 * coef);
+}
+
+bool Math1::willSpread(const cell *c, directions InvestigatedDirection, int altitudeDifference) const
 {
     double fireKoeff = calculateWindKoef(c, InvestigatedDirection);
-    return int(fireKoeff * 100) + (rand() % 100) > ignitionPercentage();
+    double slopeKoeff = calculateGroundSlopeKoef(InvestigatedDirection, altitudeDifference);
+    return int(fireKoeff * slopeKoeff * 100) + (rand() % 100) > ignitionPercentage();
 }
 
-bool Math1::willSpreadThroughOne(const cell *c, directions InvestigatedDirection) const
+bool Math1::willSpreadThroughOne(const cell *c, directions InvestigatedDirection, int altitudeDifference) const
 {
     double fireKoeff = calculateWindKoef(c, InvestigatedDirection);
-    return int(fireKoeff * 100) + (rand() % 30) > throughPercentage();
+    double slopeKoeff = calculateGroundSlopeKoef(InvestigatedDirection, altitudeDifference);
+    return int(fireKoeff * slopeKoeff * 100) + (rand() % 30) > throughPercentage();
 }

src/ProfilingDecorator.cpp

@@ -0,0 +1,30 @@
+#include "../include/ProfilingDecorator.h"
+#include "ProfilingDecorator.h"
+#include <iostream>
+
+ProfilingDecorator::ProfilingDecorator(Math *formula)
+    : primary_class(formula), counter(0), positiveCounter(0)
+{
+}
+
+bool ProfilingDecorator::willSpread(const cell *c, directions InvestigatedDirection, int altitudeDifference) const
+{
+    auto result = this->primary_class->willSpread(c, InvestigatedDirection, altitudeDifference);
+    this->counter++;
+    if (result)
+    {
+        this->positiveCounter++;
+    };
+    return result;
+}
+
+bool ProfilingDecorator::willSpreadThroughOne(const cell *c, directions InvestigatedDirection, int altitudeDifference) const
+{
+    return this->primary_class->willSpread(c, InvestigatedDirection, altitudeDifference);
+}
+
+ProfilingDecorator::~ProfilingDecorator()
+{
+    std::cout << "Overall: " << this->counter << " Positive: " << this->positiveCounter << std::endl;
+    primary_class->~Math();
+}

src/main.cpp

@@ -9,6 +9,7 @@
 #include "../include/Connection.h"
 #include "../include/Math.h"
 #include "../include/Metric.h"
+#include "../include/ProfilingDecorator.h"
 
 //#include <windows.h>
 //#include <Psapi.h>
@@ -22,7 +23,8 @@ int main()
 
     Connection c = Connection();
     Math1 formula = Math1();
-    CellStorage s = CellStorage(&formula);
+    auto formulaDecorator = ProfilingDecorator(&formula);
+    CellStorage s = CellStorage(&formulaDecorator);
     s.latitudeMin = 10.0;
     s.longtitudeMin = 30.0;
     auto xRange = std::make_pair<int, int>(0, getXArea());
@@ -67,6 +69,5 @@ int main()
     m->calculateVariables(s, fired, burnt);
     std::cout <<"Simpson metric is equal to: " <<  m->compute() << std::endl;
     printf("Time taken: %.2fs\n", (double)(clock() - tStartMetrics) / CLOCKS_PER_SEC);
-    // s.printCurrentStates();
     return 0;
 }

tests/test_main.cpp

@@ -100,6 +100,15 @@ void test_Wind(){
     assert(fabs(w.CalculateWindKoef((directions::North)) - 0.63147451510646979) < tolerance());
 }
 
+void test_Math(){
+    Math1 formula = Math1();
+
+    cell c = cell();
+    c.setState(cellState::Fire);
+    c.setAltitude(100);
+    assert(formula.willSpread(&c, directions::East, 1) == false);
+}
+
 void testFire(){
     Fire fire = Fire();
     assert(fire.getState() == FireState::Cursory);
@@ -167,6 +176,8 @@ int main()
     std::cout << "fire in cell tested successfully" << std::endl;
     testMetrics();
     std::cout << "metrics tested successfully" << std::endl;
+    test_Math();
+    std::cout << "math tested successfully" << std::endl;
     std::cout << "all tests passed" << std::endl;
     return 0;
 }