Add flame length summaries

Author: matildeRivas

Cell2Fire/Cell2Fire.cpp

@@ -49,10 +49,11 @@ std::unordered_map<int, std::vector<int>> HarvestedCells;
 std::vector<int> NFTypesCells;
 std::unordered_map<int, int> IgnitionHistory;
 std::unordered_map<int, std::string> WeatherHistory;
-std::unordered_map<int, std::vector<float>> Statistics;
+std::unordered_map<int, std::vector<float>> StatisticsPerCell;
 std::unordered_map<int, float> meanSurfaceFlameLength;
 std::unordered_map<int, float> meanCrownFlameLength;
 std::unordered_map<int, float> meanMaxFlameLength;
+std::unordered_map<int, std::vector<float>> StatisticsPerSim;
 
 /******************************************************************************
                                                                                                                                 Utils
@@ -1824,37 +1825,55 @@ Cell2Fire::Results()
             this->rows, this->cols, this->xllcorner, this->yllcorner, this->cellSide, this->maxFlameLengths);
     }
 
-    // Flame Length Statistics
+    // Flame Length StatisticsPerCell
     // This will be used to store accumulated flame lengths across simulations
     if (this->args.Stats)
     {
-
+        float totalCrown = 0;
+        float totalSurface = 0;
+        float maxPerSim = 0;
+        std::vector<float> simStats;
         for (int cell : this->burntCells)
         {
-            std::vector<float> flameLengthMeans;
+            std::vector<float> cellFlameLengthMeans;
 
             float surfaceFlameLength = this->surfaceFlameLengths[cell] / args.TotalSims;
             meanSurfaceFlameLength[cell] += surfaceFlameLength;
-            flameLengthMeans.push_back(meanSurfaceFlameLength[cell]);
+            cellFlameLengthMeans.push_back(meanSurfaceFlameLength[cell]);
+            totalSurface += this->surfaceFlameLengths[cell];
+            maxPerSim = max(maxPerSim, this->surfaceFlameLengths[cell]);
 
             if ((this->args.AllowCROS) && (this->args.Simulator != "C"))
             {
                 float crownFlameLength = this->crownFlameLengths[cell] / args.TotalSims;
                 float maxFlameLength = this->maxFlameLengths[cell] / args.TotalSims;
                 meanCrownFlameLength[cell] += crownFlameLength;
                 meanMaxFlameLength[cell] += maxFlameLength;
-                flameLengthMeans.push_back(meanCrownFlameLength[cell]);
-                flameLengthMeans.push_back(meanMaxFlameLength[cell]);
+                cellFlameLengthMeans.push_back(meanCrownFlameLength[cell]);
+                cellFlameLengthMeans.push_back(meanMaxFlameLength[cell]);
+                totalCrown += this->maxFlameLengths[cell];
+                maxPerSim = max(maxPerSim, this->crownFlameLengths[cell]);
             }
-
-            Statistics[cell] = { flameLengthMeans };
+            StatisticsPerCell[cell] = { cellFlameLengthMeans };
+        }
+        simStats.push_back(totalSurface / BCells);
+        if ((this->args.AllowCROS) && (this->args.Simulator != "C"))
+        {
+            simStats.push_back(totalCrown / BCells);
         }
+        simStats.push_back(maxPerSim);
+
+        StatisticsPerSim[this->sim] = { simStats };
+        std::ostringstream oss;
+        std::string Stats = this->statsFolder + "statisticsPerSim" + oss.str() + ".csv";
+        CSVWriter simStatsFile(Stats);
+        simStatsFile.printStats(StatisticsPerSim, "sim", (this->args.AllowCROS) && (this->args.Simulator != "C"));
         if (currentSim == args.TotalSims)
         {
             std::ostringstream oss;
-            std::string Statsname = this->statsFolder + "statistics" + oss.str() + ".csv";
+            std::string Statsname = this->statsFolder + "statisticsPerCell" + oss.str() + ".csv";
             CSVWriter statsFile(Statsname);
-            statsFile.printStats(Statistics);
+            statsFile.printStats(StatisticsPerCell, "cell", (this->args.AllowCROS) && (this->args.Simulator != "C"));
         }
     }
 

Cell2Fire/ReadArgs.cpp

@@ -209,7 +209,7 @@ parseArgs(int argc, char* argv[], arguments* args_ptr)
     if (cmdOptionExists(argv, argv + argc, "--statistics"))
     {
         out_stats = true;
-        printf("Statistics: %d \n", out_stats);
+        printf("StatisticsPerCell: %d \n", out_stats);
     }
 
     //--bbo
@@ -629,7 +629,7 @@ printArgs(arguments args)
     std::cout << "FinalGrid: " << args.FinalGrid << std::endl;
     std::cout << "PromTuned: " << args.PromTuned << std::endl;
     std::cout << "BBOTuning: " << args.BBOTuning << std::endl;
-    std::cout << "Statistics: " << args.Stats << std::endl;
+    std::cout << "StatisticsPerCell: " << args.Stats << std::endl;
     std::cout << "noOutput: " << args.NoOutput << std::endl;
     std::cout << "verbose: " << args.verbose << std::endl;
     std::cout << "seed: " << args.seed << std::endl;
@@ -661,7 +661,7 @@ printArgs(arguments args)
     std::cout << "FinalGrid: " << args.FinalGrid << std::endl;
     std::cout << "PromTuned: " << args.PromTuned << std::endl;
     std::cout << "BBOTuning: " << args.BBOTuning << std::endl;
-    std::cout << "Statistics: " << args.Stats << std::endl;
+    std::cout << "StatisticsPerCell: " << args.Stats << std::endl;
     std::cout << "noOutput: " << args.NoOutput << std::endl;
     std::cout << "verbose: " << args.verbose << std::endl;
     std::cout << "Ignition Points Log: " << args.IgnitionsLog << std::endl;

Cell2Fire/WriteCSV.cpp

@@ -288,12 +288,21 @@ CSVWriter::printIgnitions(std::unordered_map<int, int> ignitionsHistory,
 }
 
 void
-CSVWriter::printStats(std::unordered_map<int, std::vector<float>> statistics)
+CSVWriter::printStats(std::unordered_map<int, std::vector<float>> statistics, std::string type, bool hasCrown)
 {
     std::ofstream ofs(fileName, std::ofstream::out);
 
     // Print column titles
-    ofs << "cell,surfaceFlameLength,crownFlameLength,maxFlameLength\n";
+    ofs << type << ",surfaceFlameLengthMean";
+    if (hasCrown)
+    {
+        ofs << type << ",crownFlameLengthMean,maxFlameLength";
+    }
+    else if (type == "sim")
+    {
+        ofs << ",maxFlameLength";
+    }
+    ofs << std::endl;
 
     // Iterate through the unordered_map using iterator
     for (auto it = statistics.begin(); it != statistics.end(); ++it)

Cell2Fire/WriteCSV.h

@@ -45,7 +45,7 @@ class CSVWriter
     void printWeather(std::vector<std::string> weatherHistory);
     void printIgnitions(std::unordered_map<int, int> ignitionsHistory,
                         std::unordered_map<int, std::string> weatherHistory);
-    void printStats(std::unordered_map<int, std::vector<float>> statistics);
+    void printStats(std::unordered_map<int, std::vector<float>> statistics, std::string type, bool hasCrown);
     void printCSV_V2(int rows, int cols, std::vector<int> statusCells);
     // Function to create a directory
     void MakeDir(std::string pathPlot);