From 56997b4e098e1c0c759f4ec375440ea09b2eeffa Mon Sep 17 00:00:00 2001 From: "matias.vilches@usach.cl" Date: Mon, 30 Dec 2024 19:02:54 -0300 Subject: [PATCH 1/6] all --- Cell2Fire/Cell2Fire.cpp | 22 +- Cell2Fire/ReadCSV.cpp | 2 +- data/CanadianFBP/400cellsC1-asc/Ignitions.csv | 2 +- results/IgnitionsHistory/ignitions_log.csv | 21 ++ results/Messages/MessagesFile01.csv | 232 ++++++++++++++++++ results/Messages/MessagesFile02.csv | 132 ++++++++++ results/Messages/MessagesFile03.csv | 24 ++ results/Messages/MessagesFile04.csv | 193 +++++++++++++++ results/Messages/MessagesFile05.csv | 24 ++ results/Messages/MessagesFile06.csv | 24 ++ results/Messages/MessagesFile07.csv | 193 +++++++++++++++ results/Messages/MessagesFile08.csv | 193 +++++++++++++++ results/Messages/MessagesFile09.csv | 232 ++++++++++++++++++ results/Messages/MessagesFile1.csv | 193 +++++++++++++++ results/Messages/MessagesFile10.csv | 132 ++++++++++ results/Messages/MessagesFile11.csv | 232 ++++++++++++++++++ results/Messages/MessagesFile12.csv | 193 +++++++++++++++ results/Messages/MessagesFile13.csv | 132 ++++++++++ results/Messages/MessagesFile14.csv | 24 ++ results/Messages/MessagesFile15.csv | 232 ++++++++++++++++++ results/Messages/MessagesFile16.csv | 24 ++ results/Messages/MessagesFile17.csv | 132 ++++++++++ results/Messages/MessagesFile18.csv | 193 +++++++++++++++ results/Messages/MessagesFile19.csv | 132 ++++++++++ results/Messages/MessagesFile2.csv | 193 +++++++++++++++ results/Messages/MessagesFile20.csv | 24 ++ 26 files changed, 3125 insertions(+), 5 deletions(-) create mode 100644 results/IgnitionsHistory/ignitions_log.csv create mode 100644 results/Messages/MessagesFile01.csv create mode 100644 results/Messages/MessagesFile02.csv create mode 100644 results/Messages/MessagesFile03.csv create mode 100644 results/Messages/MessagesFile04.csv create mode 100644 results/Messages/MessagesFile05.csv create mode 100644 results/Messages/MessagesFile06.csv create mode 100644 results/Messages/MessagesFile07.csv create mode 100644 results/Messages/MessagesFile08.csv create mode 100644 results/Messages/MessagesFile09.csv create mode 100644 results/Messages/MessagesFile1.csv create mode 100644 results/Messages/MessagesFile10.csv create mode 100644 results/Messages/MessagesFile11.csv create mode 100644 results/Messages/MessagesFile12.csv create mode 100644 results/Messages/MessagesFile13.csv create mode 100644 results/Messages/MessagesFile14.csv create mode 100644 results/Messages/MessagesFile15.csv create mode 100644 results/Messages/MessagesFile16.csv create mode 100644 results/Messages/MessagesFile17.csv create mode 100644 results/Messages/MessagesFile18.csv create mode 100644 results/Messages/MessagesFile19.csv create mode 100644 results/Messages/MessagesFile2.csv create mode 100644 results/Messages/MessagesFile20.csv diff --git a/Cell2Fire/Cell2Fire.cpp b/Cell2Fire/Cell2Fire.cpp index d5eb2f10..c989c3d8 100644 --- a/Cell2Fire/Cell2Fire.cpp +++ b/Cell2Fire/Cell2Fire.cpp @@ -18,6 +18,7 @@ __maintainer__ = "Jaime Carrasco, Cristobal Pais, David Woodruff, David Palacios // Include libraries #include +#include #include #include #include @@ -289,7 +290,7 @@ Cell2Fire::Cell2Fire(arguments _args) : CSVWeather(_args.InFolder + "Weather.csv std::vector IgnitionPoints; if(this->args.Ignitions){ - //DEBUGstd::cout << "\nWe have specific ignition points:" << std::endl; + //DEBUG std::cout << "\nWe have specific ignition points:" << std::endl; /* Ignition points */ std::string ignitionFile = args.InFolder + "Ignitions.csv"; @@ -310,9 +311,11 @@ Cell2Fire::Cell2Fire(arguments _args) : CSVWeather(_args.InFolder + "Weather.csv // Ignition points this->IgnitionPoints = std::vector(IgnitionYears, 0); + //std::cout << this->IgnitionPoints[1] << std::endl; + CSVIgnitions.parseIgnitionDF(this->IgnitionPoints, IgnitionsDF, IgnitionYears); //this->IgnitionSets = std::vector>(this->IgnitionPoints.size()); - this->IgnitionSets = std::vector>(this->args.TotalYears); + this->IgnitionSets = std::vector>(args.TotalYears); // Ignition radius @@ -850,7 +853,20 @@ bool Cell2Fire::RunIgnition(std::default_random_engine generator, int ep){ // Ignitions with provided points from CSV else { - int temp = IgnitionPoints[this->year-1]; + + std::vector InitialIgnitionPoints; + InitialIgnitionPoints = initialPoints; // Almacena la lista inicial + IgnitionPoints = initialPoints; + + std::random_device dev; + std::mt19937 rng(dev()); + std::uniform_int_distribution dist6(1,this->IgnitionPoints.size()); + int rd = dist6(rng); + + int temp = IgnitionPoints[rd-1]; + IgnitionPoints.erase(IgnitionPoints.begin() + rd-1); + + std::cout << temp << std::endl; // If ignition Radius != 0, sample from the Radius set if (this->args.IgnitionRadius > 0){ diff --git a/Cell2Fire/ReadCSV.cpp b/Cell2Fire/ReadCSV.cpp index 61eceb4c..db6e15e7 100644 --- a/Cell2Fire/ReadCSV.cpp +++ b/Cell2Fire/ReadCSV.cpp @@ -454,7 +454,7 @@ void CSVReader::parseIgnitionDF(std::vector & ig, std::vector Date: Tue, 31 Dec 2024 12:34:56 -0300 Subject: [PATCH 2/6] working --- Cell2Fire/Cell2Fire.cpp | 19 ++- Cell2Fire/Cell2Fire.h | 1 + results/Messages/MessagesFile02.csv | 132 ---------------- results/Messages/MessagesFile03.csv | 24 --- results/Messages/MessagesFile04.csv | 193 ----------------------- results/Messages/MessagesFile05.csv | 24 --- results/Messages/MessagesFile06.csv | 24 --- results/Messages/MessagesFile07.csv | 193 ----------------------- results/Messages/MessagesFile08.csv | 193 ----------------------- results/Messages/MessagesFile09.csv | 232 ---------------------------- results/Messages/MessagesFile1.csv | 193 ----------------------- results/Messages/MessagesFile10.csv | 132 ---------------- results/Messages/MessagesFile11.csv | 232 ---------------------------- results/Messages/MessagesFile12.csv | 193 ----------------------- results/Messages/MessagesFile13.csv | 132 ---------------- results/Messages/MessagesFile14.csv | 24 --- results/Messages/MessagesFile15.csv | 232 ---------------------------- results/Messages/MessagesFile16.csv | 24 --- results/Messages/MessagesFile17.csv | 132 ---------------- results/Messages/MessagesFile18.csv | 193 ----------------------- results/Messages/MessagesFile19.csv | 132 ---------------- results/Messages/MessagesFile2.csv | 193 ----------------------- results/Messages/MessagesFile20.csv | 24 --- test/test.sh | 0 24 files changed, 10 insertions(+), 2861 deletions(-) delete mode 100644 results/Messages/MessagesFile02.csv delete mode 100644 results/Messages/MessagesFile03.csv delete mode 100644 results/Messages/MessagesFile04.csv delete mode 100644 results/Messages/MessagesFile05.csv delete mode 100644 results/Messages/MessagesFile06.csv delete mode 100644 results/Messages/MessagesFile07.csv delete mode 100644 results/Messages/MessagesFile08.csv delete mode 100644 results/Messages/MessagesFile09.csv delete mode 100644 results/Messages/MessagesFile1.csv delete mode 100644 results/Messages/MessagesFile10.csv delete mode 100644 results/Messages/MessagesFile11.csv delete mode 100644 results/Messages/MessagesFile12.csv delete mode 100644 results/Messages/MessagesFile13.csv delete mode 100644 results/Messages/MessagesFile14.csv delete mode 100644 results/Messages/MessagesFile15.csv delete mode 100644 results/Messages/MessagesFile16.csv delete mode 100644 results/Messages/MessagesFile17.csv delete mode 100644 results/Messages/MessagesFile18.csv delete mode 100644 results/Messages/MessagesFile19.csv delete mode 100644 results/Messages/MessagesFile2.csv delete mode 100644 results/Messages/MessagesFile20.csv mode change 100755 => 100644 test/test.sh diff --git a/Cell2Fire/Cell2Fire.cpp b/Cell2Fire/Cell2Fire.cpp index c989c3d8..a397a251 100644 --- a/Cell2Fire/Cell2Fire.cpp +++ b/Cell2Fire/Cell2Fire.cpp @@ -49,6 +49,7 @@ std::unordered_map> BBOFactors; std::unordered_map> HarvestedCells; std::vector NFTypesCells; std::unordered_map IgnitionHistory; +std::vector initialPoints; /****************************************************************************** Utils @@ -854,19 +855,17 @@ bool Cell2Fire::RunIgnition(std::default_random_engine generator, int ep){ // Ignitions with provided points from CSV else { - std::vector InitialIgnitionPoints; - InitialIgnitionPoints = initialPoints; // Almacena la lista inicial - IgnitionPoints = initialPoints; - + if (initialPoints.empty()) { + initialPoints = this->IgnitionPoints; + } + std::random_device dev; std::mt19937 rng(dev()); - std::uniform_int_distribution dist6(1,this->IgnitionPoints.size()); - int rd = dist6(rng); + std::uniform_int_distribution dist(1,initialPoints.size()); + int rd = dist(rng); - int temp = IgnitionPoints[rd-1]; - IgnitionPoints.erase(IgnitionPoints.begin() + rd-1); - - std::cout << temp << std::endl; + int temp = initialPoints[rd-1]; + initialPoints.erase(initialPoints.begin() + rd-1); // If ignition Radius != 0, sample from the Radius set if (this->args.IgnitionRadius > 0){ diff --git a/Cell2Fire/Cell2Fire.h b/Cell2Fire/Cell2Fire.h index 4ee04159..46e4315e 100644 --- a/Cell2Fire/Cell2Fire.h +++ b/Cell2Fire/Cell2Fire.h @@ -106,6 +106,7 @@ class Cell2Fire { std::vectorRateOfSpreads; std::vectorFlameLengths; std::vector> IgnitionSets; + std::vector initialPoints; // std::vector IgnitionHistory; // Sets diff --git a/results/Messages/MessagesFile02.csv b/results/Messages/MessagesFile02.csv deleted file mode 100644 index 54570e49..00000000 --- a/results/Messages/MessagesFile02.csv +++ /dev/null @@ -1,132 +0,0 @@ -380,360,6,15.37 -360,340,13,15.37 -340,320,20,15.37 -320,300,27,15.37 -300,280,34,15.37 -280,260,41,15.37 -260,240,48,15.37 -240,220,55,15.37 -220,200,61,33.87 -200,180,64,33.87 -180,160,67,33.87 -160,140,70,33.87 -140,120,73,33.87 -120,100,76,33.87 -100,80,79,33.87 -80,60,82,33.87 -60,40,85,33.87 -40,20,88,33.87 -380,359,123,1.8 -359,339,125,51.23 -339,319,127,51.23 -319,299,129,51.23 -299,279,131,51.23 -279,259,133,51.23 -259,239,135,51.23 -239,219,137,51.23 -219,199,139,51.23 -199,179,141,51.23 -179,159,143,51.23 -159,139,145,51.23 -139,119,147,51.23 -119,99,149,51.23 -99,79,151,51.23 -79,59,153,51.23 -59,39,155,51.23 -39,19,157,51.23 -359,338,197,2.39 -338,318,198,124.06 -339,318,198,2.39 -318,298,199,124.06 -298,278,200,124.06 -278,258,201,124.06 -258,238,202,124.06 -238,218,203,124.06 -218,198,204,124.06 -198,178,205,124.06 -178,158,206,124.06 -158,138,207,124.06 -138,118,208,124.06 -118,98,209,124.06 -98,78,210,124.06 -78,58,211,124.06 -58,38,212,124.06 -38,18,213,124.06 -380,379,218,0.71 -338,317,257,2.37 -317,297,258,160.96 -318,297,258,2.37 -297,277,259,160.96 -298,277,259,2.37 -277,257,260,160.96 -278,257,260,2.37 -257,237,261,160.96 -258,237,261,2.37 -237,217,262,160.96 -238,217,262,2.37 -217,197,263,160.96 -218,197,263,2.37 -197,177,264,160.96 -198,177,264,2.37 -177,157,265,160.96 -178,157,265,2.37 -157,137,266,160.96 -158,137,266,2.37 -137,117,267,160.96 -138,117,267,2.37 -117,97,268,160.96 -118,97,268,2.37 -97,77,269,160.96 -98,77,269,2.37 -77,57,270,160.96 -78,57,270,2.37 -57,37,271,160.96 -58,37,271,2.37 -37,17,272,160.96 -38,17,272,2.37 -379,358,278,2.37 -317,296,319,2.18 -296,276,320,159.16 -297,276,320,2.18 -276,256,321,159.16 -277,256,321,2.18 -256,236,322,159.16 -257,236,322,2.18 -236,216,323,159.16 -237,216,323,2.18 -216,196,324,159.16 -217,196,324,2.18 -196,176,325,159.16 -197,176,325,2.18 -176,156,326,159.16 -177,156,326,2.18 -156,136,327,159.16 -157,136,327,2.18 -136,116,328,159.16 -116,96,329,159.16 -96,76,330,159.16 -76,56,331,159.16 -56,36,332,159.16 -36,16,333,159.16 -358,337,342,2.18 -380,400,365,0.31 -379,378,367,0.6 -296,275,386,2.03 -275,255,387,154.19 -276,255,387,2.03 -255,235,388,154.19 -256,235,388,2.03 -235,215,389,154.19 -215,195,390,154.19 -195,175,391,154.19 -175,155,392,154.19 -155,135,393,154.19 -135,115,394,154.19 -115,95,395,154.19 -95,75,396,154.19 -75,55,397,154.19 -55,35,398,154.19 -35,15,399,154.19 -337,316,411,2.03 -380,399,459,0.13 -358,357,468,0.22 diff --git a/results/Messages/MessagesFile03.csv b/results/Messages/MessagesFile03.csv deleted file mode 100644 index 4968d33a..00000000 --- a/results/Messages/MessagesFile03.csv +++ /dev/null @@ -1,24 +0,0 @@ -100,80,6,15.37 -80,60,13,15.37 -60,40,20,15.37 -40,20,27,15.37 -100,79,123,1.8 -79,59,125,51.23 -59,39,127,51.23 -39,19,129,51.23 -79,58,197,2.39 -58,38,198,124.06 -59,38,198,2.39 -38,18,199,124.06 -100,99,218,0.71 -58,37,257,2.37 -37,17,258,160.96 -38,17,258,2.37 -99,78,278,2.37 -37,16,319,2.18 -78,57,342,2.18 -100,120,365,0.31 -99,98,367,0.6 -57,36,411,2.03 -100,119,459,0.13 -78,77,468,0.22 diff --git a/results/Messages/MessagesFile04.csv b/results/Messages/MessagesFile04.csv deleted file mode 100644 index 89dde6a8..00000000 --- a/results/Messages/MessagesFile04.csv +++ /dev/null @@ -1,193 +0,0 @@ -305,285,6,15.37 -285,265,13,15.37 -265,245,20,15.37 -245,225,27,15.37 -225,205,34,15.37 -205,185,41,15.37 -185,165,48,15.37 -165,145,55,15.37 -145,125,61,33.87 -125,105,64,33.87 -105,85,67,33.87 -85,65,70,33.87 -65,45,73,33.87 -45,25,76,33.87 -25,5,79,33.87 -305,286,123,1.8 -305,284,123,1.8 -286,266,125,51.23 -284,264,125,51.23 -266,246,127,51.23 -264,244,127,51.23 -244,224,129,51.23 -246,226,129,51.23 -224,204,131,51.23 -226,206,131,51.23 -206,186,133,51.23 -204,184,133,51.23 -186,166,135,51.23 -184,164,135,51.23 -164,144,137,51.23 -166,146,137,51.23 -144,124,139,51.23 -146,126,139,51.23 -124,104,141,51.23 -126,106,141,51.23 -104,84,143,51.23 -106,86,143,51.23 -84,64,145,51.23 -86,66,145,51.23 -64,44,147,51.23 -66,46,147,51.23 -44,24,149,51.23 -46,26,149,51.23 -24,4,151,51.23 -26,6,151,51.23 -286,267,197,2.39 -284,263,197,2.39 -267,247,198,124.06 -266,247,198,2.39 -263,243,198,124.06 -264,243,198,2.39 -247,227,199,124.06 -243,223,199,124.06 -227,207,200,124.06 -223,203,200,124.06 -207,187,201,124.06 -203,183,201,124.06 -183,163,202,124.06 -187,167,202,124.06 -163,143,203,124.06 -167,147,203,124.06 -147,127,204,124.06 -143,123,204,124.06 -127,107,205,124.06 -123,103,205,124.06 -103,83,206,124.06 -107,87,206,124.06 -83,63,207,124.06 -87,67,207,124.06 -67,47,208,124.06 -63,43,208,124.06 -47,27,209,124.06 -43,23,209,124.06 -23,3,210,124.06 -27,7,210,124.06 -305,306,218,0.71 -305,304,218,0.71 -267,248,257,2.37 -263,242,257,2.37 -248,228,258,160.96 -247,228,258,2.37 -242,222,258,160.96 -243,222,258,2.37 -228,208,259,160.96 -227,208,259,2.37 -222,202,259,160.96 -223,202,259,2.37 -208,188,260,160.96 -207,188,260,2.37 -202,182,260,160.96 -203,182,260,2.37 -188,168,261,160.96 -182,162,261,160.96 -183,162,261,2.37 -187,168,261,2.37 -162,142,262,160.96 -168,148,262,160.96 -163,142,262,2.37 -167,148,262,2.37 -147,128,263,2.37 -142,122,263,160.96 -148,128,263,160.96 -143,122,263,2.37 -127,108,264,2.37 -122,102,264,160.96 -123,102,264,2.37 -128,108,264,160.96 -108,88,265,160.96 -102,82,265,160.96 -103,82,265,2.37 -107,88,265,2.37 -88,68,266,160.96 -82,62,266,160.96 -83,62,266,2.37 -87,68,266,2.37 -62,42,267,160.96 -67,48,267,2.37 -68,48,267,160.96 -63,42,267,2.37 -42,22,268,160.96 -47,28,268,2.37 -43,22,268,2.37 -48,28,268,160.96 -22,2,269,160.96 -23,2,269,2.37 -27,8,269,2.37 -28,8,269,160.96 -304,283,278,2.37 -306,287,278,2.37 -248,229,319,2.18 -242,221,319,2.18 -229,209,320,159.16 -228,209,320,2.18 -221,201,320,159.16 -222,201,320,2.18 -209,189,321,159.16 -208,189,321,2.18 -201,181,321,159.16 -202,181,321,2.18 -189,169,322,159.16 -188,169,322,2.18 -181,161,322,159.16 -182,161,322,2.18 -169,149,323,159.16 -161,141,323,159.16 -162,141,323,2.18 -168,149,323,2.18 -141,121,324,159.16 -149,129,324,159.16 -142,121,324,2.18 -148,129,324,2.18 -121,101,325,159.16 -129,109,325,159.16 -122,101,325,2.18 -128,109,325,2.18 -101,81,326,159.16 -108,89,326,2.18 -102,81,326,2.18 -109,89,326,159.16 -89,69,327,159.16 -81,61,327,159.16 -88,69,327,2.18 -82,61,327,2.18 -61,41,328,159.16 -69,49,328,159.16 -41,21,329,159.16 -49,29,329,159.16 -21,1,330,159.16 -29,9,330,159.16 -283,262,342,2.18 -287,268,342,2.18 -305,325,365,0.31 -304,303,367,0.6 -306,307,367,0.6 -229,210,386,2.03 -210,190,387,154.19 -209,190,387,2.03 -190,170,388,154.19 -189,170,388,2.03 -170,150,389,154.19 -150,130,390,154.19 -130,110,391,154.19 -110,90,392,154.19 -90,70,393,154.19 -70,50,394,154.19 -50,30,395,154.19 -30,10,396,154.19 -262,241,411,2.03 -268,249,411,2.03 -305,326,459,0.13 -305,324,459,0.13 -283,282,468,0.22 -287,288,468,0.22 diff --git a/results/Messages/MessagesFile05.csv b/results/Messages/MessagesFile05.csv deleted file mode 100644 index 4968d33a..00000000 --- a/results/Messages/MessagesFile05.csv +++ /dev/null @@ -1,24 +0,0 @@ -100,80,6,15.37 -80,60,13,15.37 -60,40,20,15.37 -40,20,27,15.37 -100,79,123,1.8 -79,59,125,51.23 -59,39,127,51.23 -39,19,129,51.23 -79,58,197,2.39 -58,38,198,124.06 -59,38,198,2.39 -38,18,199,124.06 -100,99,218,0.71 -58,37,257,2.37 -37,17,258,160.96 -38,17,258,2.37 -99,78,278,2.37 -37,16,319,2.18 -78,57,342,2.18 -100,120,365,0.31 -99,98,367,0.6 -57,36,411,2.03 -100,119,459,0.13 -78,77,468,0.22 diff --git a/results/Messages/MessagesFile06.csv b/results/Messages/MessagesFile06.csv deleted file mode 100644 index 4968d33a..00000000 --- a/results/Messages/MessagesFile06.csv +++ /dev/null @@ -1,24 +0,0 @@ -100,80,6,15.37 -80,60,13,15.37 -60,40,20,15.37 -40,20,27,15.37 -100,79,123,1.8 -79,59,125,51.23 -59,39,127,51.23 -39,19,129,51.23 -79,58,197,2.39 -58,38,198,124.06 -59,38,198,2.39 -38,18,199,124.06 -100,99,218,0.71 -58,37,257,2.37 -37,17,258,160.96 -38,17,258,2.37 -99,78,278,2.37 -37,16,319,2.18 -78,57,342,2.18 -100,120,365,0.31 -99,98,367,0.6 -57,36,411,2.03 -100,119,459,0.13 -78,77,468,0.22 diff --git a/results/Messages/MessagesFile07.csv b/results/Messages/MessagesFile07.csv deleted file mode 100644 index 89dde6a8..00000000 --- a/results/Messages/MessagesFile07.csv +++ /dev/null @@ -1,193 +0,0 @@ -305,285,6,15.37 -285,265,13,15.37 -265,245,20,15.37 -245,225,27,15.37 -225,205,34,15.37 -205,185,41,15.37 -185,165,48,15.37 -165,145,55,15.37 -145,125,61,33.87 -125,105,64,33.87 -105,85,67,33.87 -85,65,70,33.87 -65,45,73,33.87 -45,25,76,33.87 -25,5,79,33.87 -305,286,123,1.8 -305,284,123,1.8 -286,266,125,51.23 -284,264,125,51.23 -266,246,127,51.23 -264,244,127,51.23 -244,224,129,51.23 -246,226,129,51.23 -224,204,131,51.23 -226,206,131,51.23 -206,186,133,51.23 -204,184,133,51.23 -186,166,135,51.23 -184,164,135,51.23 -164,144,137,51.23 -166,146,137,51.23 -144,124,139,51.23 -146,126,139,51.23 -124,104,141,51.23 -126,106,141,51.23 -104,84,143,51.23 -106,86,143,51.23 -84,64,145,51.23 -86,66,145,51.23 -64,44,147,51.23 -66,46,147,51.23 -44,24,149,51.23 -46,26,149,51.23 -24,4,151,51.23 -26,6,151,51.23 -286,267,197,2.39 -284,263,197,2.39 -267,247,198,124.06 -266,247,198,2.39 -263,243,198,124.06 -264,243,198,2.39 -247,227,199,124.06 -243,223,199,124.06 -227,207,200,124.06 -223,203,200,124.06 -207,187,201,124.06 -203,183,201,124.06 -183,163,202,124.06 -187,167,202,124.06 -163,143,203,124.06 -167,147,203,124.06 -147,127,204,124.06 -143,123,204,124.06 -127,107,205,124.06 -123,103,205,124.06 -103,83,206,124.06 -107,87,206,124.06 -83,63,207,124.06 -87,67,207,124.06 -67,47,208,124.06 -63,43,208,124.06 -47,27,209,124.06 -43,23,209,124.06 -23,3,210,124.06 -27,7,210,124.06 -305,306,218,0.71 -305,304,218,0.71 -267,248,257,2.37 -263,242,257,2.37 -248,228,258,160.96 -247,228,258,2.37 -242,222,258,160.96 -243,222,258,2.37 -228,208,259,160.96 -227,208,259,2.37 -222,202,259,160.96 -223,202,259,2.37 -208,188,260,160.96 -207,188,260,2.37 -202,182,260,160.96 -203,182,260,2.37 -188,168,261,160.96 -182,162,261,160.96 -183,162,261,2.37 -187,168,261,2.37 -162,142,262,160.96 -168,148,262,160.96 -163,142,262,2.37 -167,148,262,2.37 -147,128,263,2.37 -142,122,263,160.96 -148,128,263,160.96 -143,122,263,2.37 -127,108,264,2.37 -122,102,264,160.96 -123,102,264,2.37 -128,108,264,160.96 -108,88,265,160.96 -102,82,265,160.96 -103,82,265,2.37 -107,88,265,2.37 -88,68,266,160.96 -82,62,266,160.96 -83,62,266,2.37 -87,68,266,2.37 -62,42,267,160.96 -67,48,267,2.37 -68,48,267,160.96 -63,42,267,2.37 -42,22,268,160.96 -47,28,268,2.37 -43,22,268,2.37 -48,28,268,160.96 -22,2,269,160.96 -23,2,269,2.37 -27,8,269,2.37 -28,8,269,160.96 -304,283,278,2.37 -306,287,278,2.37 -248,229,319,2.18 -242,221,319,2.18 -229,209,320,159.16 -228,209,320,2.18 -221,201,320,159.16 -222,201,320,2.18 -209,189,321,159.16 -208,189,321,2.18 -201,181,321,159.16 -202,181,321,2.18 -189,169,322,159.16 -188,169,322,2.18 -181,161,322,159.16 -182,161,322,2.18 -169,149,323,159.16 -161,141,323,159.16 -162,141,323,2.18 -168,149,323,2.18 -141,121,324,159.16 -149,129,324,159.16 -142,121,324,2.18 -148,129,324,2.18 -121,101,325,159.16 -129,109,325,159.16 -122,101,325,2.18 -128,109,325,2.18 -101,81,326,159.16 -108,89,326,2.18 -102,81,326,2.18 -109,89,326,159.16 -89,69,327,159.16 -81,61,327,159.16 -88,69,327,2.18 -82,61,327,2.18 -61,41,328,159.16 -69,49,328,159.16 -41,21,329,159.16 -49,29,329,159.16 -21,1,330,159.16 -29,9,330,159.16 -283,262,342,2.18 -287,268,342,2.18 -305,325,365,0.31 -304,303,367,0.6 -306,307,367,0.6 -229,210,386,2.03 -210,190,387,154.19 -209,190,387,2.03 -190,170,388,154.19 -189,170,388,2.03 -170,150,389,154.19 -150,130,390,154.19 -130,110,391,154.19 -110,90,392,154.19 -90,70,393,154.19 -70,50,394,154.19 -50,30,395,154.19 -30,10,396,154.19 -262,241,411,2.03 -268,249,411,2.03 -305,326,459,0.13 -305,324,459,0.13 -283,282,468,0.22 -287,288,468,0.22 diff --git a/results/Messages/MessagesFile08.csv b/results/Messages/MessagesFile08.csv deleted file mode 100644 index 89dde6a8..00000000 --- a/results/Messages/MessagesFile08.csv +++ /dev/null @@ -1,193 +0,0 @@ -305,285,6,15.37 -285,265,13,15.37 -265,245,20,15.37 -245,225,27,15.37 -225,205,34,15.37 -205,185,41,15.37 -185,165,48,15.37 -165,145,55,15.37 -145,125,61,33.87 -125,105,64,33.87 -105,85,67,33.87 -85,65,70,33.87 -65,45,73,33.87 -45,25,76,33.87 -25,5,79,33.87 -305,286,123,1.8 -305,284,123,1.8 -286,266,125,51.23 -284,264,125,51.23 -266,246,127,51.23 -264,244,127,51.23 -244,224,129,51.23 -246,226,129,51.23 -224,204,131,51.23 -226,206,131,51.23 -206,186,133,51.23 -204,184,133,51.23 -186,166,135,51.23 -184,164,135,51.23 -164,144,137,51.23 -166,146,137,51.23 -144,124,139,51.23 -146,126,139,51.23 -124,104,141,51.23 -126,106,141,51.23 -104,84,143,51.23 -106,86,143,51.23 -84,64,145,51.23 -86,66,145,51.23 -64,44,147,51.23 -66,46,147,51.23 -44,24,149,51.23 -46,26,149,51.23 -24,4,151,51.23 -26,6,151,51.23 -286,267,197,2.39 -284,263,197,2.39 -267,247,198,124.06 -266,247,198,2.39 -263,243,198,124.06 -264,243,198,2.39 -247,227,199,124.06 -243,223,199,124.06 -227,207,200,124.06 -223,203,200,124.06 -207,187,201,124.06 -203,183,201,124.06 -183,163,202,124.06 -187,167,202,124.06 -163,143,203,124.06 -167,147,203,124.06 -147,127,204,124.06 -143,123,204,124.06 -127,107,205,124.06 -123,103,205,124.06 -103,83,206,124.06 -107,87,206,124.06 -83,63,207,124.06 -87,67,207,124.06 -67,47,208,124.06 -63,43,208,124.06 -47,27,209,124.06 -43,23,209,124.06 -23,3,210,124.06 -27,7,210,124.06 -305,306,218,0.71 -305,304,218,0.71 -267,248,257,2.37 -263,242,257,2.37 -248,228,258,160.96 -247,228,258,2.37 -242,222,258,160.96 -243,222,258,2.37 -228,208,259,160.96 -227,208,259,2.37 -222,202,259,160.96 -223,202,259,2.37 -208,188,260,160.96 -207,188,260,2.37 -202,182,260,160.96 -203,182,260,2.37 -188,168,261,160.96 -182,162,261,160.96 -183,162,261,2.37 -187,168,261,2.37 -162,142,262,160.96 -168,148,262,160.96 -163,142,262,2.37 -167,148,262,2.37 -147,128,263,2.37 -142,122,263,160.96 -148,128,263,160.96 -143,122,263,2.37 -127,108,264,2.37 -122,102,264,160.96 -123,102,264,2.37 -128,108,264,160.96 -108,88,265,160.96 -102,82,265,160.96 -103,82,265,2.37 -107,88,265,2.37 -88,68,266,160.96 -82,62,266,160.96 -83,62,266,2.37 -87,68,266,2.37 -62,42,267,160.96 -67,48,267,2.37 -68,48,267,160.96 -63,42,267,2.37 -42,22,268,160.96 -47,28,268,2.37 -43,22,268,2.37 -48,28,268,160.96 -22,2,269,160.96 -23,2,269,2.37 -27,8,269,2.37 -28,8,269,160.96 -304,283,278,2.37 -306,287,278,2.37 -248,229,319,2.18 -242,221,319,2.18 -229,209,320,159.16 -228,209,320,2.18 -221,201,320,159.16 -222,201,320,2.18 -209,189,321,159.16 -208,189,321,2.18 -201,181,321,159.16 -202,181,321,2.18 -189,169,322,159.16 -188,169,322,2.18 -181,161,322,159.16 -182,161,322,2.18 -169,149,323,159.16 -161,141,323,159.16 -162,141,323,2.18 -168,149,323,2.18 -141,121,324,159.16 -149,129,324,159.16 -142,121,324,2.18 -148,129,324,2.18 -121,101,325,159.16 -129,109,325,159.16 -122,101,325,2.18 -128,109,325,2.18 -101,81,326,159.16 -108,89,326,2.18 -102,81,326,2.18 -109,89,326,159.16 -89,69,327,159.16 -81,61,327,159.16 -88,69,327,2.18 -82,61,327,2.18 -61,41,328,159.16 -69,49,328,159.16 -41,21,329,159.16 -49,29,329,159.16 -21,1,330,159.16 -29,9,330,159.16 -283,262,342,2.18 -287,268,342,2.18 -305,325,365,0.31 -304,303,367,0.6 -306,307,367,0.6 -229,210,386,2.03 -210,190,387,154.19 -209,190,387,2.03 -190,170,388,154.19 -189,170,388,2.03 -170,150,389,154.19 -150,130,390,154.19 -130,110,391,154.19 -110,90,392,154.19 -90,70,393,154.19 -70,50,394,154.19 -50,30,395,154.19 -30,10,396,154.19 -262,241,411,2.03 -268,249,411,2.03 -305,326,459,0.13 -305,324,459,0.13 -283,282,468,0.22 -287,288,468,0.22 diff --git a/results/Messages/MessagesFile09.csv b/results/Messages/MessagesFile09.csv deleted file mode 100644 index 1fb8f0c4..00000000 --- a/results/Messages/MessagesFile09.csv +++ /dev/null @@ -1,232 +0,0 @@ -350,330,6,15.37 -330,310,13,15.37 -310,290,20,15.37 -290,270,27,15.37 -270,250,34,15.37 -250,230,41,15.37 -230,210,48,15.37 -210,190,55,15.37 -190,170,61,33.87 -170,150,64,33.87 -150,130,67,33.87 -130,110,70,33.87 -110,90,73,33.87 -90,70,76,33.87 -70,50,79,33.87 -50,30,82,33.87 -30,10,85,33.87 -350,331,123,1.8 -350,329,123,1.8 -331,311,125,51.23 -329,309,125,51.23 -311,291,127,51.23 -309,289,127,51.23 -289,269,129,51.23 -291,271,129,51.23 -269,249,131,51.23 -271,251,131,51.23 -251,231,133,51.23 -249,229,133,51.23 -231,211,135,51.23 -229,209,135,51.23 -209,189,137,51.23 -211,191,137,51.23 -189,169,139,51.23 -191,171,139,51.23 -169,149,141,51.23 -171,151,141,51.23 -149,129,143,51.23 -151,131,143,51.23 -129,109,145,51.23 -131,111,145,51.23 -109,89,147,51.23 -111,91,147,51.23 -89,69,149,51.23 -91,71,149,51.23 -69,49,151,51.23 -71,51,151,51.23 -49,29,153,51.23 -51,31,153,51.23 -29,9,155,51.23 -31,11,155,51.23 -331,312,197,2.39 -329,308,197,2.39 -312,292,198,124.06 -311,292,198,2.39 -308,288,198,124.06 -309,288,198,2.39 -292,272,199,124.06 -288,268,199,124.06 -272,252,200,124.06 -268,248,200,124.06 -252,232,201,124.06 -248,228,201,124.06 -228,208,202,124.06 -232,212,202,124.06 -208,188,203,124.06 -212,192,203,124.06 -192,172,204,124.06 -188,168,204,124.06 -172,152,205,124.06 -168,148,205,124.06 -148,128,206,124.06 -152,132,206,124.06 -128,108,207,124.06 -132,112,207,124.06 -112,92,208,124.06 -108,88,208,124.06 -92,72,209,124.06 -88,68,209,124.06 -68,48,210,124.06 -72,52,210,124.06 -48,28,211,124.06 -52,32,211,124.06 -28,8,212,124.06 -32,12,212,124.06 -350,351,218,0.71 -350,349,218,0.71 -312,293,257,2.37 -308,287,257,2.37 -293,273,258,160.96 -292,273,258,2.37 -287,267,258,160.96 -288,267,258,2.37 -273,253,259,160.96 -272,253,259,2.37 -267,247,259,160.96 -268,247,259,2.37 -253,233,260,160.96 -252,233,260,2.37 -247,227,260,160.96 -248,227,260,2.37 -233,213,261,160.96 -227,207,261,160.96 -228,207,261,2.37 -232,213,261,2.37 -213,193,262,160.96 -207,187,262,160.96 -208,187,262,2.37 -212,193,262,2.37 -192,173,263,2.37 -193,173,263,160.96 -187,167,263,160.96 -188,167,263,2.37 -172,153,264,2.37 -167,147,264,160.96 -168,147,264,2.37 -173,153,264,160.96 -153,133,265,160.96 -147,127,265,160.96 -148,127,265,2.37 -152,133,265,2.37 -133,113,266,160.96 -127,107,266,160.96 -128,107,266,2.37 -132,113,266,2.37 -107,87,267,160.96 -112,93,267,2.37 -113,93,267,160.96 -108,87,267,2.37 -87,67,268,160.96 -92,73,268,2.37 -88,67,268,2.37 -93,73,268,160.96 -67,47,269,160.96 -68,47,269,2.37 -72,53,269,2.37 -73,53,269,160.96 -47,27,270,160.96 -53,33,270,160.96 -48,27,270,2.37 -52,33,270,2.37 -27,7,271,160.96 -33,13,271,160.96 -28,7,271,2.37 -32,13,271,2.37 -349,328,278,2.37 -351,332,278,2.37 -293,274,319,2.18 -287,266,319,2.18 -274,254,320,159.16 -273,254,320,2.18 -266,246,320,159.16 -267,246,320,2.18 -254,234,321,159.16 -253,234,321,2.18 -246,226,321,159.16 -247,226,321,2.18 -234,214,322,159.16 -233,214,322,2.18 -226,206,322,159.16 -227,206,322,2.18 -214,194,323,159.16 -206,186,323,159.16 -213,194,323,2.18 -207,186,323,2.18 -194,174,324,159.16 -186,166,324,159.16 -193,174,324,2.18 -187,166,324,2.18 -166,146,325,159.16 -174,154,325,159.16 -167,146,325,2.18 -173,154,325,2.18 -153,134,326,2.18 -146,126,326,159.16 -147,126,326,2.18 -154,134,326,159.16 -134,114,327,159.16 -133,114,327,2.18 -126,106,327,159.16 -127,106,327,2.18 -106,86,328,159.16 -114,94,328,159.16 -94,74,329,159.16 -86,66,329,159.16 -74,54,330,159.16 -66,46,330,159.16 -46,26,331,159.16 -54,34,331,159.16 -26,6,332,159.16 -34,14,332,159.16 -328,307,342,2.18 -332,313,342,2.18 -350,370,365,0.31 -349,348,367,0.6 -351,352,367,0.6 -274,255,386,2.03 -266,245,386,2.03 -255,235,387,154.19 -254,235,387,2.03 -245,225,387,154.19 -246,225,387,2.03 -235,215,388,154.19 -234,215,388,2.03 -225,205,388,154.19 -226,205,388,2.03 -215,195,389,154.19 -205,185,389,154.19 -195,175,390,154.19 -185,165,390,154.19 -165,145,391,154.19 -175,155,391,154.19 -145,125,392,154.19 -155,135,392,154.19 -125,105,393,154.19 -135,115,393,154.19 -105,85,394,154.19 -115,95,394,154.19 -95,75,395,154.19 -85,65,395,154.19 -65,45,396,154.19 -75,55,396,154.19 -45,25,397,154.19 -55,35,397,154.19 -25,5,398,154.19 -35,15,398,154.19 -307,286,411,2.03 -313,294,411,2.03 -350,371,459,0.13 -350,369,459,0.13 -328,327,468,0.22 -332,333,468,0.22 diff --git a/results/Messages/MessagesFile1.csv b/results/Messages/MessagesFile1.csv deleted file mode 100644 index 568c7aea..00000000 --- a/results/Messages/MessagesFile1.csv +++ /dev/null @@ -1,193 +0,0 @@ -305,285,6,15.37 -285,265,13,15.37 -265,245,20,15.37 -245,225,27,15.37 -225,205,34,15.37 -205,185,41,15.37 -185,165,48,15.37 -165,145,55,15.37 -145,125,61,33.87 -125,105,64,33.87 -105,85,67,33.87 -85,65,70,33.87 -65,45,73,33.87 -45,25,76,33.87 -25,5,79,33.87 -305,286,123,1.8 -305,284,123,1.8 -284,264,125,51.23 -286,266,125,51.23 -264,244,127,51.23 -266,246,127,51.23 -244,224,129,51.23 -246,226,129,51.23 -224,204,131,51.23 -226,206,131,51.23 -204,184,133,51.23 -206,186,133,51.23 -184,164,135,51.23 -186,166,135,51.23 -164,144,137,51.23 -166,146,137,51.23 -144,124,139,51.23 -146,126,139,51.23 -124,104,141,51.23 -126,106,141,51.23 -104,84,143,51.23 -106,86,143,51.23 -84,64,145,51.23 -86,66,145,51.23 -64,44,147,51.23 -66,46,147,51.23 -44,24,149,51.23 -46,26,149,51.23 -24,4,151,51.23 -26,6,151,51.23 -286,267,197,2.39 -284,263,197,2.39 -267,247,198,124.06 -266,247,198,2.39 -264,243,198,2.39 -263,243,198,124.06 -247,227,199,124.06 -243,223,199,124.06 -227,207,200,124.06 -223,203,200,124.06 -207,187,201,124.06 -203,183,201,124.06 -187,167,202,124.06 -183,163,202,124.06 -167,147,203,124.06 -163,143,203,124.06 -147,127,204,124.06 -143,123,204,124.06 -127,107,205,124.06 -123,103,205,124.06 -103,83,206,124.06 -107,87,206,124.06 -83,63,207,124.06 -87,67,207,124.06 -67,47,208,124.06 -63,43,208,124.06 -47,27,209,124.06 -43,23,209,124.06 -23,3,210,124.06 -27,7,210,124.06 -305,306,218,0.71 -305,304,218,0.71 -267,248,257,2.37 -263,242,257,2.37 -248,228,258,160.96 -247,228,258,2.37 -243,222,258,2.37 -242,222,258,160.96 -228,208,259,160.96 -227,208,259,2.37 -223,202,259,2.37 -222,202,259,160.96 -208,188,260,160.96 -202,182,260,160.96 -207,188,260,2.37 -203,182,260,2.37 -188,168,261,160.96 -182,162,261,160.96 -187,168,261,2.37 -183,162,261,2.37 -162,142,262,160.96 -168,148,262,160.96 -167,148,262,2.37 -163,142,262,2.37 -147,128,263,2.37 -142,122,263,160.96 -143,122,263,2.37 -148,128,263,160.96 -127,108,264,2.37 -122,102,264,160.96 -123,102,264,2.37 -128,108,264,160.96 -108,88,265,160.96 -102,82,265,160.96 -103,82,265,2.37 -107,88,265,2.37 -88,68,266,160.96 -82,62,266,160.96 -83,62,266,2.37 -87,68,266,2.37 -62,42,267,160.96 -67,48,267,2.37 -68,48,267,160.96 -63,42,267,2.37 -42,22,268,160.96 -47,28,268,2.37 -43,22,268,2.37 -48,28,268,160.96 -22,2,269,160.96 -23,2,269,2.37 -28,8,269,160.96 -27,8,269,2.37 -304,283,278,2.37 -306,287,278,2.37 -248,229,319,2.18 -242,221,319,2.18 -229,209,320,159.16 -228,209,320,2.18 -221,201,320,159.16 -222,201,320,2.18 -209,189,321,159.16 -208,189,321,2.18 -201,181,321,159.16 -202,181,321,2.18 -189,169,322,159.16 -188,169,322,2.18 -181,161,322,159.16 -182,161,322,2.18 -169,149,323,159.16 -161,141,323,159.16 -162,141,323,2.18 -168,149,323,2.18 -141,121,324,159.16 -149,129,324,159.16 -142,121,324,2.18 -148,129,324,2.18 -121,101,325,159.16 -129,109,325,159.16 -122,101,325,2.18 -128,109,325,2.18 -101,81,326,159.16 -108,89,326,2.18 -102,81,326,2.18 -109,89,326,159.16 -89,69,327,159.16 -81,61,327,159.16 -88,69,327,2.18 -82,61,327,2.18 -61,41,328,159.16 -69,49,328,159.16 -41,21,329,159.16 -49,29,329,159.16 -21,1,330,159.16 -29,9,330,159.16 -283,262,342,2.18 -287,268,342,2.18 -305,325,365,0.31 -304,303,367,0.6 -306,307,367,0.6 -229,210,386,2.03 -210,190,387,154.19 -209,190,387,2.03 -190,170,388,154.19 -189,170,388,2.03 -170,150,389,154.19 -150,130,390,154.19 -130,110,391,154.19 -110,90,392,154.19 -90,70,393,154.19 -70,50,394,154.19 -50,30,395,154.19 -30,10,396,154.19 -262,241,411,2.03 -268,249,411,2.03 -305,326,459,0.13 -305,324,459,0.13 -283,282,468,0.22 -287,288,468,0.22 diff --git a/results/Messages/MessagesFile10.csv b/results/Messages/MessagesFile10.csv deleted file mode 100644 index 54570e49..00000000 --- a/results/Messages/MessagesFile10.csv +++ /dev/null @@ -1,132 +0,0 @@ -380,360,6,15.37 -360,340,13,15.37 -340,320,20,15.37 -320,300,27,15.37 -300,280,34,15.37 -280,260,41,15.37 -260,240,48,15.37 -240,220,55,15.37 -220,200,61,33.87 -200,180,64,33.87 -180,160,67,33.87 -160,140,70,33.87 -140,120,73,33.87 -120,100,76,33.87 -100,80,79,33.87 -80,60,82,33.87 -60,40,85,33.87 -40,20,88,33.87 -380,359,123,1.8 -359,339,125,51.23 -339,319,127,51.23 -319,299,129,51.23 -299,279,131,51.23 -279,259,133,51.23 -259,239,135,51.23 -239,219,137,51.23 -219,199,139,51.23 -199,179,141,51.23 -179,159,143,51.23 -159,139,145,51.23 -139,119,147,51.23 -119,99,149,51.23 -99,79,151,51.23 -79,59,153,51.23 -59,39,155,51.23 -39,19,157,51.23 -359,338,197,2.39 -338,318,198,124.06 -339,318,198,2.39 -318,298,199,124.06 -298,278,200,124.06 -278,258,201,124.06 -258,238,202,124.06 -238,218,203,124.06 -218,198,204,124.06 -198,178,205,124.06 -178,158,206,124.06 -158,138,207,124.06 -138,118,208,124.06 -118,98,209,124.06 -98,78,210,124.06 -78,58,211,124.06 -58,38,212,124.06 -38,18,213,124.06 -380,379,218,0.71 -338,317,257,2.37 -317,297,258,160.96 -318,297,258,2.37 -297,277,259,160.96 -298,277,259,2.37 -277,257,260,160.96 -278,257,260,2.37 -257,237,261,160.96 -258,237,261,2.37 -237,217,262,160.96 -238,217,262,2.37 -217,197,263,160.96 -218,197,263,2.37 -197,177,264,160.96 -198,177,264,2.37 -177,157,265,160.96 -178,157,265,2.37 -157,137,266,160.96 -158,137,266,2.37 -137,117,267,160.96 -138,117,267,2.37 -117,97,268,160.96 -118,97,268,2.37 -97,77,269,160.96 -98,77,269,2.37 -77,57,270,160.96 -78,57,270,2.37 -57,37,271,160.96 -58,37,271,2.37 -37,17,272,160.96 -38,17,272,2.37 -379,358,278,2.37 -317,296,319,2.18 -296,276,320,159.16 -297,276,320,2.18 -276,256,321,159.16 -277,256,321,2.18 -256,236,322,159.16 -257,236,322,2.18 -236,216,323,159.16 -237,216,323,2.18 -216,196,324,159.16 -217,196,324,2.18 -196,176,325,159.16 -197,176,325,2.18 -176,156,326,159.16 -177,156,326,2.18 -156,136,327,159.16 -157,136,327,2.18 -136,116,328,159.16 -116,96,329,159.16 -96,76,330,159.16 -76,56,331,159.16 -56,36,332,159.16 -36,16,333,159.16 -358,337,342,2.18 -380,400,365,0.31 -379,378,367,0.6 -296,275,386,2.03 -275,255,387,154.19 -276,255,387,2.03 -255,235,388,154.19 -256,235,388,2.03 -235,215,389,154.19 -215,195,390,154.19 -195,175,391,154.19 -175,155,392,154.19 -155,135,393,154.19 -135,115,394,154.19 -115,95,395,154.19 -95,75,396,154.19 -75,55,397,154.19 -55,35,398,154.19 -35,15,399,154.19 -337,316,411,2.03 -380,399,459,0.13 -358,357,468,0.22 diff --git a/results/Messages/MessagesFile11.csv b/results/Messages/MessagesFile11.csv deleted file mode 100644 index 1fb8f0c4..00000000 --- a/results/Messages/MessagesFile11.csv +++ /dev/null @@ -1,232 +0,0 @@ -350,330,6,15.37 -330,310,13,15.37 -310,290,20,15.37 -290,270,27,15.37 -270,250,34,15.37 -250,230,41,15.37 -230,210,48,15.37 -210,190,55,15.37 -190,170,61,33.87 -170,150,64,33.87 -150,130,67,33.87 -130,110,70,33.87 -110,90,73,33.87 -90,70,76,33.87 -70,50,79,33.87 -50,30,82,33.87 -30,10,85,33.87 -350,331,123,1.8 -350,329,123,1.8 -331,311,125,51.23 -329,309,125,51.23 -311,291,127,51.23 -309,289,127,51.23 -289,269,129,51.23 -291,271,129,51.23 -269,249,131,51.23 -271,251,131,51.23 -251,231,133,51.23 -249,229,133,51.23 -231,211,135,51.23 -229,209,135,51.23 -209,189,137,51.23 -211,191,137,51.23 -189,169,139,51.23 -191,171,139,51.23 -169,149,141,51.23 -171,151,141,51.23 -149,129,143,51.23 -151,131,143,51.23 -129,109,145,51.23 -131,111,145,51.23 -109,89,147,51.23 -111,91,147,51.23 -89,69,149,51.23 -91,71,149,51.23 -69,49,151,51.23 -71,51,151,51.23 -49,29,153,51.23 -51,31,153,51.23 -29,9,155,51.23 -31,11,155,51.23 -331,312,197,2.39 -329,308,197,2.39 -312,292,198,124.06 -311,292,198,2.39 -308,288,198,124.06 -309,288,198,2.39 -292,272,199,124.06 -288,268,199,124.06 -272,252,200,124.06 -268,248,200,124.06 -252,232,201,124.06 -248,228,201,124.06 -228,208,202,124.06 -232,212,202,124.06 -208,188,203,124.06 -212,192,203,124.06 -192,172,204,124.06 -188,168,204,124.06 -172,152,205,124.06 -168,148,205,124.06 -148,128,206,124.06 -152,132,206,124.06 -128,108,207,124.06 -132,112,207,124.06 -112,92,208,124.06 -108,88,208,124.06 -92,72,209,124.06 -88,68,209,124.06 -68,48,210,124.06 -72,52,210,124.06 -48,28,211,124.06 -52,32,211,124.06 -28,8,212,124.06 -32,12,212,124.06 -350,351,218,0.71 -350,349,218,0.71 -312,293,257,2.37 -308,287,257,2.37 -293,273,258,160.96 -292,273,258,2.37 -287,267,258,160.96 -288,267,258,2.37 -273,253,259,160.96 -272,253,259,2.37 -267,247,259,160.96 -268,247,259,2.37 -253,233,260,160.96 -252,233,260,2.37 -247,227,260,160.96 -248,227,260,2.37 -233,213,261,160.96 -227,207,261,160.96 -228,207,261,2.37 -232,213,261,2.37 -213,193,262,160.96 -207,187,262,160.96 -208,187,262,2.37 -212,193,262,2.37 -192,173,263,2.37 -193,173,263,160.96 -187,167,263,160.96 -188,167,263,2.37 -172,153,264,2.37 -167,147,264,160.96 -168,147,264,2.37 -173,153,264,160.96 -153,133,265,160.96 -147,127,265,160.96 -148,127,265,2.37 -152,133,265,2.37 -133,113,266,160.96 -127,107,266,160.96 -128,107,266,2.37 -132,113,266,2.37 -107,87,267,160.96 -112,93,267,2.37 -113,93,267,160.96 -108,87,267,2.37 -87,67,268,160.96 -92,73,268,2.37 -88,67,268,2.37 -93,73,268,160.96 -67,47,269,160.96 -68,47,269,2.37 -72,53,269,2.37 -73,53,269,160.96 -47,27,270,160.96 -53,33,270,160.96 -48,27,270,2.37 -52,33,270,2.37 -27,7,271,160.96 -33,13,271,160.96 -28,7,271,2.37 -32,13,271,2.37 -349,328,278,2.37 -351,332,278,2.37 -293,274,319,2.18 -287,266,319,2.18 -274,254,320,159.16 -273,254,320,2.18 -266,246,320,159.16 -267,246,320,2.18 -254,234,321,159.16 -253,234,321,2.18 -246,226,321,159.16 -247,226,321,2.18 -234,214,322,159.16 -233,214,322,2.18 -226,206,322,159.16 -227,206,322,2.18 -214,194,323,159.16 -206,186,323,159.16 -213,194,323,2.18 -207,186,323,2.18 -194,174,324,159.16 -186,166,324,159.16 -193,174,324,2.18 -187,166,324,2.18 -166,146,325,159.16 -174,154,325,159.16 -167,146,325,2.18 -173,154,325,2.18 -153,134,326,2.18 -146,126,326,159.16 -147,126,326,2.18 -154,134,326,159.16 -134,114,327,159.16 -133,114,327,2.18 -126,106,327,159.16 -127,106,327,2.18 -106,86,328,159.16 -114,94,328,159.16 -94,74,329,159.16 -86,66,329,159.16 -74,54,330,159.16 -66,46,330,159.16 -46,26,331,159.16 -54,34,331,159.16 -26,6,332,159.16 -34,14,332,159.16 -328,307,342,2.18 -332,313,342,2.18 -350,370,365,0.31 -349,348,367,0.6 -351,352,367,0.6 -274,255,386,2.03 -266,245,386,2.03 -255,235,387,154.19 -254,235,387,2.03 -245,225,387,154.19 -246,225,387,2.03 -235,215,388,154.19 -234,215,388,2.03 -225,205,388,154.19 -226,205,388,2.03 -215,195,389,154.19 -205,185,389,154.19 -195,175,390,154.19 -185,165,390,154.19 -165,145,391,154.19 -175,155,391,154.19 -145,125,392,154.19 -155,135,392,154.19 -125,105,393,154.19 -135,115,393,154.19 -105,85,394,154.19 -115,95,394,154.19 -95,75,395,154.19 -85,65,395,154.19 -65,45,396,154.19 -75,55,396,154.19 -45,25,397,154.19 -55,35,397,154.19 -25,5,398,154.19 -35,15,398,154.19 -307,286,411,2.03 -313,294,411,2.03 -350,371,459,0.13 -350,369,459,0.13 -328,327,468,0.22 -332,333,468,0.22 diff --git a/results/Messages/MessagesFile12.csv b/results/Messages/MessagesFile12.csv deleted file mode 100644 index 89dde6a8..00000000 --- a/results/Messages/MessagesFile12.csv +++ /dev/null @@ -1,193 +0,0 @@ -305,285,6,15.37 -285,265,13,15.37 -265,245,20,15.37 -245,225,27,15.37 -225,205,34,15.37 -205,185,41,15.37 -185,165,48,15.37 -165,145,55,15.37 -145,125,61,33.87 -125,105,64,33.87 -105,85,67,33.87 -85,65,70,33.87 -65,45,73,33.87 -45,25,76,33.87 -25,5,79,33.87 -305,286,123,1.8 -305,284,123,1.8 -286,266,125,51.23 -284,264,125,51.23 -266,246,127,51.23 -264,244,127,51.23 -244,224,129,51.23 -246,226,129,51.23 -224,204,131,51.23 -226,206,131,51.23 -206,186,133,51.23 -204,184,133,51.23 -186,166,135,51.23 -184,164,135,51.23 -164,144,137,51.23 -166,146,137,51.23 -144,124,139,51.23 -146,126,139,51.23 -124,104,141,51.23 -126,106,141,51.23 -104,84,143,51.23 -106,86,143,51.23 -84,64,145,51.23 -86,66,145,51.23 -64,44,147,51.23 -66,46,147,51.23 -44,24,149,51.23 -46,26,149,51.23 -24,4,151,51.23 -26,6,151,51.23 -286,267,197,2.39 -284,263,197,2.39 -267,247,198,124.06 -266,247,198,2.39 -263,243,198,124.06 -264,243,198,2.39 -247,227,199,124.06 -243,223,199,124.06 -227,207,200,124.06 -223,203,200,124.06 -207,187,201,124.06 -203,183,201,124.06 -183,163,202,124.06 -187,167,202,124.06 -163,143,203,124.06 -167,147,203,124.06 -147,127,204,124.06 -143,123,204,124.06 -127,107,205,124.06 -123,103,205,124.06 -103,83,206,124.06 -107,87,206,124.06 -83,63,207,124.06 -87,67,207,124.06 -67,47,208,124.06 -63,43,208,124.06 -47,27,209,124.06 -43,23,209,124.06 -23,3,210,124.06 -27,7,210,124.06 -305,306,218,0.71 -305,304,218,0.71 -267,248,257,2.37 -263,242,257,2.37 -248,228,258,160.96 -247,228,258,2.37 -242,222,258,160.96 -243,222,258,2.37 -228,208,259,160.96 -227,208,259,2.37 -222,202,259,160.96 -223,202,259,2.37 -208,188,260,160.96 -207,188,260,2.37 -202,182,260,160.96 -203,182,260,2.37 -188,168,261,160.96 -182,162,261,160.96 -183,162,261,2.37 -187,168,261,2.37 -162,142,262,160.96 -168,148,262,160.96 -163,142,262,2.37 -167,148,262,2.37 -147,128,263,2.37 -142,122,263,160.96 -148,128,263,160.96 -143,122,263,2.37 -127,108,264,2.37 -122,102,264,160.96 -123,102,264,2.37 -128,108,264,160.96 -108,88,265,160.96 -102,82,265,160.96 -103,82,265,2.37 -107,88,265,2.37 -88,68,266,160.96 -82,62,266,160.96 -83,62,266,2.37 -87,68,266,2.37 -62,42,267,160.96 -67,48,267,2.37 -68,48,267,160.96 -63,42,267,2.37 -42,22,268,160.96 -47,28,268,2.37 -43,22,268,2.37 -48,28,268,160.96 -22,2,269,160.96 -23,2,269,2.37 -27,8,269,2.37 -28,8,269,160.96 -304,283,278,2.37 -306,287,278,2.37 -248,229,319,2.18 -242,221,319,2.18 -229,209,320,159.16 -228,209,320,2.18 -221,201,320,159.16 -222,201,320,2.18 -209,189,321,159.16 -208,189,321,2.18 -201,181,321,159.16 -202,181,321,2.18 -189,169,322,159.16 -188,169,322,2.18 -181,161,322,159.16 -182,161,322,2.18 -169,149,323,159.16 -161,141,323,159.16 -162,141,323,2.18 -168,149,323,2.18 -141,121,324,159.16 -149,129,324,159.16 -142,121,324,2.18 -148,129,324,2.18 -121,101,325,159.16 -129,109,325,159.16 -122,101,325,2.18 -128,109,325,2.18 -101,81,326,159.16 -108,89,326,2.18 -102,81,326,2.18 -109,89,326,159.16 -89,69,327,159.16 -81,61,327,159.16 -88,69,327,2.18 -82,61,327,2.18 -61,41,328,159.16 -69,49,328,159.16 -41,21,329,159.16 -49,29,329,159.16 -21,1,330,159.16 -29,9,330,159.16 -283,262,342,2.18 -287,268,342,2.18 -305,325,365,0.31 -304,303,367,0.6 -306,307,367,0.6 -229,210,386,2.03 -210,190,387,154.19 -209,190,387,2.03 -190,170,388,154.19 -189,170,388,2.03 -170,150,389,154.19 -150,130,390,154.19 -130,110,391,154.19 -110,90,392,154.19 -90,70,393,154.19 -70,50,394,154.19 -50,30,395,154.19 -30,10,396,154.19 -262,241,411,2.03 -268,249,411,2.03 -305,326,459,0.13 -305,324,459,0.13 -283,282,468,0.22 -287,288,468,0.22 diff --git a/results/Messages/MessagesFile13.csv b/results/Messages/MessagesFile13.csv deleted file mode 100644 index 54570e49..00000000 --- a/results/Messages/MessagesFile13.csv +++ /dev/null @@ -1,132 +0,0 @@ -380,360,6,15.37 -360,340,13,15.37 -340,320,20,15.37 -320,300,27,15.37 -300,280,34,15.37 -280,260,41,15.37 -260,240,48,15.37 -240,220,55,15.37 -220,200,61,33.87 -200,180,64,33.87 -180,160,67,33.87 -160,140,70,33.87 -140,120,73,33.87 -120,100,76,33.87 -100,80,79,33.87 -80,60,82,33.87 -60,40,85,33.87 -40,20,88,33.87 -380,359,123,1.8 -359,339,125,51.23 -339,319,127,51.23 -319,299,129,51.23 -299,279,131,51.23 -279,259,133,51.23 -259,239,135,51.23 -239,219,137,51.23 -219,199,139,51.23 -199,179,141,51.23 -179,159,143,51.23 -159,139,145,51.23 -139,119,147,51.23 -119,99,149,51.23 -99,79,151,51.23 -79,59,153,51.23 -59,39,155,51.23 -39,19,157,51.23 -359,338,197,2.39 -338,318,198,124.06 -339,318,198,2.39 -318,298,199,124.06 -298,278,200,124.06 -278,258,201,124.06 -258,238,202,124.06 -238,218,203,124.06 -218,198,204,124.06 -198,178,205,124.06 -178,158,206,124.06 -158,138,207,124.06 -138,118,208,124.06 -118,98,209,124.06 -98,78,210,124.06 -78,58,211,124.06 -58,38,212,124.06 -38,18,213,124.06 -380,379,218,0.71 -338,317,257,2.37 -317,297,258,160.96 -318,297,258,2.37 -297,277,259,160.96 -298,277,259,2.37 -277,257,260,160.96 -278,257,260,2.37 -257,237,261,160.96 -258,237,261,2.37 -237,217,262,160.96 -238,217,262,2.37 -217,197,263,160.96 -218,197,263,2.37 -197,177,264,160.96 -198,177,264,2.37 -177,157,265,160.96 -178,157,265,2.37 -157,137,266,160.96 -158,137,266,2.37 -137,117,267,160.96 -138,117,267,2.37 -117,97,268,160.96 -118,97,268,2.37 -97,77,269,160.96 -98,77,269,2.37 -77,57,270,160.96 -78,57,270,2.37 -57,37,271,160.96 -58,37,271,2.37 -37,17,272,160.96 -38,17,272,2.37 -379,358,278,2.37 -317,296,319,2.18 -296,276,320,159.16 -297,276,320,2.18 -276,256,321,159.16 -277,256,321,2.18 -256,236,322,159.16 -257,236,322,2.18 -236,216,323,159.16 -237,216,323,2.18 -216,196,324,159.16 -217,196,324,2.18 -196,176,325,159.16 -197,176,325,2.18 -176,156,326,159.16 -177,156,326,2.18 -156,136,327,159.16 -157,136,327,2.18 -136,116,328,159.16 -116,96,329,159.16 -96,76,330,159.16 -76,56,331,159.16 -56,36,332,159.16 -36,16,333,159.16 -358,337,342,2.18 -380,400,365,0.31 -379,378,367,0.6 -296,275,386,2.03 -275,255,387,154.19 -276,255,387,2.03 -255,235,388,154.19 -256,235,388,2.03 -235,215,389,154.19 -215,195,390,154.19 -195,175,391,154.19 -175,155,392,154.19 -155,135,393,154.19 -135,115,394,154.19 -115,95,395,154.19 -95,75,396,154.19 -75,55,397,154.19 -55,35,398,154.19 -35,15,399,154.19 -337,316,411,2.03 -380,399,459,0.13 -358,357,468,0.22 diff --git a/results/Messages/MessagesFile14.csv b/results/Messages/MessagesFile14.csv deleted file mode 100644 index 4968d33a..00000000 --- a/results/Messages/MessagesFile14.csv +++ /dev/null @@ -1,24 +0,0 @@ -100,80,6,15.37 -80,60,13,15.37 -60,40,20,15.37 -40,20,27,15.37 -100,79,123,1.8 -79,59,125,51.23 -59,39,127,51.23 -39,19,129,51.23 -79,58,197,2.39 -58,38,198,124.06 -59,38,198,2.39 -38,18,199,124.06 -100,99,218,0.71 -58,37,257,2.37 -37,17,258,160.96 -38,17,258,2.37 -99,78,278,2.37 -37,16,319,2.18 -78,57,342,2.18 -100,120,365,0.31 -99,98,367,0.6 -57,36,411,2.03 -100,119,459,0.13 -78,77,468,0.22 diff --git a/results/Messages/MessagesFile15.csv b/results/Messages/MessagesFile15.csv deleted file mode 100644 index 1fb8f0c4..00000000 --- a/results/Messages/MessagesFile15.csv +++ /dev/null @@ -1,232 +0,0 @@ -350,330,6,15.37 -330,310,13,15.37 -310,290,20,15.37 -290,270,27,15.37 -270,250,34,15.37 -250,230,41,15.37 -230,210,48,15.37 -210,190,55,15.37 -190,170,61,33.87 -170,150,64,33.87 -150,130,67,33.87 -130,110,70,33.87 -110,90,73,33.87 -90,70,76,33.87 -70,50,79,33.87 -50,30,82,33.87 -30,10,85,33.87 -350,331,123,1.8 -350,329,123,1.8 -331,311,125,51.23 -329,309,125,51.23 -311,291,127,51.23 -309,289,127,51.23 -289,269,129,51.23 -291,271,129,51.23 -269,249,131,51.23 -271,251,131,51.23 -251,231,133,51.23 -249,229,133,51.23 -231,211,135,51.23 -229,209,135,51.23 -209,189,137,51.23 -211,191,137,51.23 -189,169,139,51.23 -191,171,139,51.23 -169,149,141,51.23 -171,151,141,51.23 -149,129,143,51.23 -151,131,143,51.23 -129,109,145,51.23 -131,111,145,51.23 -109,89,147,51.23 -111,91,147,51.23 -89,69,149,51.23 -91,71,149,51.23 -69,49,151,51.23 -71,51,151,51.23 -49,29,153,51.23 -51,31,153,51.23 -29,9,155,51.23 -31,11,155,51.23 -331,312,197,2.39 -329,308,197,2.39 -312,292,198,124.06 -311,292,198,2.39 -308,288,198,124.06 -309,288,198,2.39 -292,272,199,124.06 -288,268,199,124.06 -272,252,200,124.06 -268,248,200,124.06 -252,232,201,124.06 -248,228,201,124.06 -228,208,202,124.06 -232,212,202,124.06 -208,188,203,124.06 -212,192,203,124.06 -192,172,204,124.06 -188,168,204,124.06 -172,152,205,124.06 -168,148,205,124.06 -148,128,206,124.06 -152,132,206,124.06 -128,108,207,124.06 -132,112,207,124.06 -112,92,208,124.06 -108,88,208,124.06 -92,72,209,124.06 -88,68,209,124.06 -68,48,210,124.06 -72,52,210,124.06 -48,28,211,124.06 -52,32,211,124.06 -28,8,212,124.06 -32,12,212,124.06 -350,351,218,0.71 -350,349,218,0.71 -312,293,257,2.37 -308,287,257,2.37 -293,273,258,160.96 -292,273,258,2.37 -287,267,258,160.96 -288,267,258,2.37 -273,253,259,160.96 -272,253,259,2.37 -267,247,259,160.96 -268,247,259,2.37 -253,233,260,160.96 -252,233,260,2.37 -247,227,260,160.96 -248,227,260,2.37 -233,213,261,160.96 -227,207,261,160.96 -228,207,261,2.37 -232,213,261,2.37 -213,193,262,160.96 -207,187,262,160.96 -208,187,262,2.37 -212,193,262,2.37 -192,173,263,2.37 -193,173,263,160.96 -187,167,263,160.96 -188,167,263,2.37 -172,153,264,2.37 -167,147,264,160.96 -168,147,264,2.37 -173,153,264,160.96 -153,133,265,160.96 -147,127,265,160.96 -148,127,265,2.37 -152,133,265,2.37 -133,113,266,160.96 -127,107,266,160.96 -128,107,266,2.37 -132,113,266,2.37 -107,87,267,160.96 -112,93,267,2.37 -113,93,267,160.96 -108,87,267,2.37 -87,67,268,160.96 -92,73,268,2.37 -88,67,268,2.37 -93,73,268,160.96 -67,47,269,160.96 -68,47,269,2.37 -72,53,269,2.37 -73,53,269,160.96 -47,27,270,160.96 -53,33,270,160.96 -48,27,270,2.37 -52,33,270,2.37 -27,7,271,160.96 -33,13,271,160.96 -28,7,271,2.37 -32,13,271,2.37 -349,328,278,2.37 -351,332,278,2.37 -293,274,319,2.18 -287,266,319,2.18 -274,254,320,159.16 -273,254,320,2.18 -266,246,320,159.16 -267,246,320,2.18 -254,234,321,159.16 -253,234,321,2.18 -246,226,321,159.16 -247,226,321,2.18 -234,214,322,159.16 -233,214,322,2.18 -226,206,322,159.16 -227,206,322,2.18 -214,194,323,159.16 -206,186,323,159.16 -213,194,323,2.18 -207,186,323,2.18 -194,174,324,159.16 -186,166,324,159.16 -193,174,324,2.18 -187,166,324,2.18 -166,146,325,159.16 -174,154,325,159.16 -167,146,325,2.18 -173,154,325,2.18 -153,134,326,2.18 -146,126,326,159.16 -147,126,326,2.18 -154,134,326,159.16 -134,114,327,159.16 -133,114,327,2.18 -126,106,327,159.16 -127,106,327,2.18 -106,86,328,159.16 -114,94,328,159.16 -94,74,329,159.16 -86,66,329,159.16 -74,54,330,159.16 -66,46,330,159.16 -46,26,331,159.16 -54,34,331,159.16 -26,6,332,159.16 -34,14,332,159.16 -328,307,342,2.18 -332,313,342,2.18 -350,370,365,0.31 -349,348,367,0.6 -351,352,367,0.6 -274,255,386,2.03 -266,245,386,2.03 -255,235,387,154.19 -254,235,387,2.03 -245,225,387,154.19 -246,225,387,2.03 -235,215,388,154.19 -234,215,388,2.03 -225,205,388,154.19 -226,205,388,2.03 -215,195,389,154.19 -205,185,389,154.19 -195,175,390,154.19 -185,165,390,154.19 -165,145,391,154.19 -175,155,391,154.19 -145,125,392,154.19 -155,135,392,154.19 -125,105,393,154.19 -135,115,393,154.19 -105,85,394,154.19 -115,95,394,154.19 -95,75,395,154.19 -85,65,395,154.19 -65,45,396,154.19 -75,55,396,154.19 -45,25,397,154.19 -55,35,397,154.19 -25,5,398,154.19 -35,15,398,154.19 -307,286,411,2.03 -313,294,411,2.03 -350,371,459,0.13 -350,369,459,0.13 -328,327,468,0.22 -332,333,468,0.22 diff --git a/results/Messages/MessagesFile16.csv b/results/Messages/MessagesFile16.csv deleted file mode 100644 index 4968d33a..00000000 --- a/results/Messages/MessagesFile16.csv +++ /dev/null @@ -1,24 +0,0 @@ -100,80,6,15.37 -80,60,13,15.37 -60,40,20,15.37 -40,20,27,15.37 -100,79,123,1.8 -79,59,125,51.23 -59,39,127,51.23 -39,19,129,51.23 -79,58,197,2.39 -58,38,198,124.06 -59,38,198,2.39 -38,18,199,124.06 -100,99,218,0.71 -58,37,257,2.37 -37,17,258,160.96 -38,17,258,2.37 -99,78,278,2.37 -37,16,319,2.18 -78,57,342,2.18 -100,120,365,0.31 -99,98,367,0.6 -57,36,411,2.03 -100,119,459,0.13 -78,77,468,0.22 diff --git a/results/Messages/MessagesFile17.csv b/results/Messages/MessagesFile17.csv deleted file mode 100644 index 54570e49..00000000 --- a/results/Messages/MessagesFile17.csv +++ /dev/null @@ -1,132 +0,0 @@ -380,360,6,15.37 -360,340,13,15.37 -340,320,20,15.37 -320,300,27,15.37 -300,280,34,15.37 -280,260,41,15.37 -260,240,48,15.37 -240,220,55,15.37 -220,200,61,33.87 -200,180,64,33.87 -180,160,67,33.87 -160,140,70,33.87 -140,120,73,33.87 -120,100,76,33.87 -100,80,79,33.87 -80,60,82,33.87 -60,40,85,33.87 -40,20,88,33.87 -380,359,123,1.8 -359,339,125,51.23 -339,319,127,51.23 -319,299,129,51.23 -299,279,131,51.23 -279,259,133,51.23 -259,239,135,51.23 -239,219,137,51.23 -219,199,139,51.23 -199,179,141,51.23 -179,159,143,51.23 -159,139,145,51.23 -139,119,147,51.23 -119,99,149,51.23 -99,79,151,51.23 -79,59,153,51.23 -59,39,155,51.23 -39,19,157,51.23 -359,338,197,2.39 -338,318,198,124.06 -339,318,198,2.39 -318,298,199,124.06 -298,278,200,124.06 -278,258,201,124.06 -258,238,202,124.06 -238,218,203,124.06 -218,198,204,124.06 -198,178,205,124.06 -178,158,206,124.06 -158,138,207,124.06 -138,118,208,124.06 -118,98,209,124.06 -98,78,210,124.06 -78,58,211,124.06 -58,38,212,124.06 -38,18,213,124.06 -380,379,218,0.71 -338,317,257,2.37 -317,297,258,160.96 -318,297,258,2.37 -297,277,259,160.96 -298,277,259,2.37 -277,257,260,160.96 -278,257,260,2.37 -257,237,261,160.96 -258,237,261,2.37 -237,217,262,160.96 -238,217,262,2.37 -217,197,263,160.96 -218,197,263,2.37 -197,177,264,160.96 -198,177,264,2.37 -177,157,265,160.96 -178,157,265,2.37 -157,137,266,160.96 -158,137,266,2.37 -137,117,267,160.96 -138,117,267,2.37 -117,97,268,160.96 -118,97,268,2.37 -97,77,269,160.96 -98,77,269,2.37 -77,57,270,160.96 -78,57,270,2.37 -57,37,271,160.96 -58,37,271,2.37 -37,17,272,160.96 -38,17,272,2.37 -379,358,278,2.37 -317,296,319,2.18 -296,276,320,159.16 -297,276,320,2.18 -276,256,321,159.16 -277,256,321,2.18 -256,236,322,159.16 -257,236,322,2.18 -236,216,323,159.16 -237,216,323,2.18 -216,196,324,159.16 -217,196,324,2.18 -196,176,325,159.16 -197,176,325,2.18 -176,156,326,159.16 -177,156,326,2.18 -156,136,327,159.16 -157,136,327,2.18 -136,116,328,159.16 -116,96,329,159.16 -96,76,330,159.16 -76,56,331,159.16 -56,36,332,159.16 -36,16,333,159.16 -358,337,342,2.18 -380,400,365,0.31 -379,378,367,0.6 -296,275,386,2.03 -275,255,387,154.19 -276,255,387,2.03 -255,235,388,154.19 -256,235,388,2.03 -235,215,389,154.19 -215,195,390,154.19 -195,175,391,154.19 -175,155,392,154.19 -155,135,393,154.19 -135,115,394,154.19 -115,95,395,154.19 -95,75,396,154.19 -75,55,397,154.19 -55,35,398,154.19 -35,15,399,154.19 -337,316,411,2.03 -380,399,459,0.13 -358,357,468,0.22 diff --git a/results/Messages/MessagesFile18.csv b/results/Messages/MessagesFile18.csv deleted file mode 100644 index 89dde6a8..00000000 --- a/results/Messages/MessagesFile18.csv +++ /dev/null @@ -1,193 +0,0 @@ -305,285,6,15.37 -285,265,13,15.37 -265,245,20,15.37 -245,225,27,15.37 -225,205,34,15.37 -205,185,41,15.37 -185,165,48,15.37 -165,145,55,15.37 -145,125,61,33.87 -125,105,64,33.87 -105,85,67,33.87 -85,65,70,33.87 -65,45,73,33.87 -45,25,76,33.87 -25,5,79,33.87 -305,286,123,1.8 -305,284,123,1.8 -286,266,125,51.23 -284,264,125,51.23 -266,246,127,51.23 -264,244,127,51.23 -244,224,129,51.23 -246,226,129,51.23 -224,204,131,51.23 -226,206,131,51.23 -206,186,133,51.23 -204,184,133,51.23 -186,166,135,51.23 -184,164,135,51.23 -164,144,137,51.23 -166,146,137,51.23 -144,124,139,51.23 -146,126,139,51.23 -124,104,141,51.23 -126,106,141,51.23 -104,84,143,51.23 -106,86,143,51.23 -84,64,145,51.23 -86,66,145,51.23 -64,44,147,51.23 -66,46,147,51.23 -44,24,149,51.23 -46,26,149,51.23 -24,4,151,51.23 -26,6,151,51.23 -286,267,197,2.39 -284,263,197,2.39 -267,247,198,124.06 -266,247,198,2.39 -263,243,198,124.06 -264,243,198,2.39 -247,227,199,124.06 -243,223,199,124.06 -227,207,200,124.06 -223,203,200,124.06 -207,187,201,124.06 -203,183,201,124.06 -183,163,202,124.06 -187,167,202,124.06 -163,143,203,124.06 -167,147,203,124.06 -147,127,204,124.06 -143,123,204,124.06 -127,107,205,124.06 -123,103,205,124.06 -103,83,206,124.06 -107,87,206,124.06 -83,63,207,124.06 -87,67,207,124.06 -67,47,208,124.06 -63,43,208,124.06 -47,27,209,124.06 -43,23,209,124.06 -23,3,210,124.06 -27,7,210,124.06 -305,306,218,0.71 -305,304,218,0.71 -267,248,257,2.37 -263,242,257,2.37 -248,228,258,160.96 -247,228,258,2.37 -242,222,258,160.96 -243,222,258,2.37 -228,208,259,160.96 -227,208,259,2.37 -222,202,259,160.96 -223,202,259,2.37 -208,188,260,160.96 -207,188,260,2.37 -202,182,260,160.96 -203,182,260,2.37 -188,168,261,160.96 -182,162,261,160.96 -183,162,261,2.37 -187,168,261,2.37 -162,142,262,160.96 -168,148,262,160.96 -163,142,262,2.37 -167,148,262,2.37 -147,128,263,2.37 -142,122,263,160.96 -148,128,263,160.96 -143,122,263,2.37 -127,108,264,2.37 -122,102,264,160.96 -123,102,264,2.37 -128,108,264,160.96 -108,88,265,160.96 -102,82,265,160.96 -103,82,265,2.37 -107,88,265,2.37 -88,68,266,160.96 -82,62,266,160.96 -83,62,266,2.37 -87,68,266,2.37 -62,42,267,160.96 -67,48,267,2.37 -68,48,267,160.96 -63,42,267,2.37 -42,22,268,160.96 -47,28,268,2.37 -43,22,268,2.37 -48,28,268,160.96 -22,2,269,160.96 -23,2,269,2.37 -27,8,269,2.37 -28,8,269,160.96 -304,283,278,2.37 -306,287,278,2.37 -248,229,319,2.18 -242,221,319,2.18 -229,209,320,159.16 -228,209,320,2.18 -221,201,320,159.16 -222,201,320,2.18 -209,189,321,159.16 -208,189,321,2.18 -201,181,321,159.16 -202,181,321,2.18 -189,169,322,159.16 -188,169,322,2.18 -181,161,322,159.16 -182,161,322,2.18 -169,149,323,159.16 -161,141,323,159.16 -162,141,323,2.18 -168,149,323,2.18 -141,121,324,159.16 -149,129,324,159.16 -142,121,324,2.18 -148,129,324,2.18 -121,101,325,159.16 -129,109,325,159.16 -122,101,325,2.18 -128,109,325,2.18 -101,81,326,159.16 -108,89,326,2.18 -102,81,326,2.18 -109,89,326,159.16 -89,69,327,159.16 -81,61,327,159.16 -88,69,327,2.18 -82,61,327,2.18 -61,41,328,159.16 -69,49,328,159.16 -41,21,329,159.16 -49,29,329,159.16 -21,1,330,159.16 -29,9,330,159.16 -283,262,342,2.18 -287,268,342,2.18 -305,325,365,0.31 -304,303,367,0.6 -306,307,367,0.6 -229,210,386,2.03 -210,190,387,154.19 -209,190,387,2.03 -190,170,388,154.19 -189,170,388,2.03 -170,150,389,154.19 -150,130,390,154.19 -130,110,391,154.19 -110,90,392,154.19 -90,70,393,154.19 -70,50,394,154.19 -50,30,395,154.19 -30,10,396,154.19 -262,241,411,2.03 -268,249,411,2.03 -305,326,459,0.13 -305,324,459,0.13 -283,282,468,0.22 -287,288,468,0.22 diff --git a/results/Messages/MessagesFile19.csv b/results/Messages/MessagesFile19.csv deleted file mode 100644 index 54570e49..00000000 --- a/results/Messages/MessagesFile19.csv +++ /dev/null @@ -1,132 +0,0 @@ -380,360,6,15.37 -360,340,13,15.37 -340,320,20,15.37 -320,300,27,15.37 -300,280,34,15.37 -280,260,41,15.37 -260,240,48,15.37 -240,220,55,15.37 -220,200,61,33.87 -200,180,64,33.87 -180,160,67,33.87 -160,140,70,33.87 -140,120,73,33.87 -120,100,76,33.87 -100,80,79,33.87 -80,60,82,33.87 -60,40,85,33.87 -40,20,88,33.87 -380,359,123,1.8 -359,339,125,51.23 -339,319,127,51.23 -319,299,129,51.23 -299,279,131,51.23 -279,259,133,51.23 -259,239,135,51.23 -239,219,137,51.23 -219,199,139,51.23 -199,179,141,51.23 -179,159,143,51.23 -159,139,145,51.23 -139,119,147,51.23 -119,99,149,51.23 -99,79,151,51.23 -79,59,153,51.23 -59,39,155,51.23 -39,19,157,51.23 -359,338,197,2.39 -338,318,198,124.06 -339,318,198,2.39 -318,298,199,124.06 -298,278,200,124.06 -278,258,201,124.06 -258,238,202,124.06 -238,218,203,124.06 -218,198,204,124.06 -198,178,205,124.06 -178,158,206,124.06 -158,138,207,124.06 -138,118,208,124.06 -118,98,209,124.06 -98,78,210,124.06 -78,58,211,124.06 -58,38,212,124.06 -38,18,213,124.06 -380,379,218,0.71 -338,317,257,2.37 -317,297,258,160.96 -318,297,258,2.37 -297,277,259,160.96 -298,277,259,2.37 -277,257,260,160.96 -278,257,260,2.37 -257,237,261,160.96 -258,237,261,2.37 -237,217,262,160.96 -238,217,262,2.37 -217,197,263,160.96 -218,197,263,2.37 -197,177,264,160.96 -198,177,264,2.37 -177,157,265,160.96 -178,157,265,2.37 -157,137,266,160.96 -158,137,266,2.37 -137,117,267,160.96 -138,117,267,2.37 -117,97,268,160.96 -118,97,268,2.37 -97,77,269,160.96 -98,77,269,2.37 -77,57,270,160.96 -78,57,270,2.37 -57,37,271,160.96 -58,37,271,2.37 -37,17,272,160.96 -38,17,272,2.37 -379,358,278,2.37 -317,296,319,2.18 -296,276,320,159.16 -297,276,320,2.18 -276,256,321,159.16 -277,256,321,2.18 -256,236,322,159.16 -257,236,322,2.18 -236,216,323,159.16 -237,216,323,2.18 -216,196,324,159.16 -217,196,324,2.18 -196,176,325,159.16 -197,176,325,2.18 -176,156,326,159.16 -177,156,326,2.18 -156,136,327,159.16 -157,136,327,2.18 -136,116,328,159.16 -116,96,329,159.16 -96,76,330,159.16 -76,56,331,159.16 -56,36,332,159.16 -36,16,333,159.16 -358,337,342,2.18 -380,400,365,0.31 -379,378,367,0.6 -296,275,386,2.03 -275,255,387,154.19 -276,255,387,2.03 -255,235,388,154.19 -256,235,388,2.03 -235,215,389,154.19 -215,195,390,154.19 -195,175,391,154.19 -175,155,392,154.19 -155,135,393,154.19 -135,115,394,154.19 -115,95,395,154.19 -95,75,396,154.19 -75,55,397,154.19 -55,35,398,154.19 -35,15,399,154.19 -337,316,411,2.03 -380,399,459,0.13 -358,357,468,0.22 diff --git a/results/Messages/MessagesFile2.csv b/results/Messages/MessagesFile2.csv deleted file mode 100644 index 89dde6a8..00000000 --- a/results/Messages/MessagesFile2.csv +++ /dev/null @@ -1,193 +0,0 @@ -305,285,6,15.37 -285,265,13,15.37 -265,245,20,15.37 -245,225,27,15.37 -225,205,34,15.37 -205,185,41,15.37 -185,165,48,15.37 -165,145,55,15.37 -145,125,61,33.87 -125,105,64,33.87 -105,85,67,33.87 -85,65,70,33.87 -65,45,73,33.87 -45,25,76,33.87 -25,5,79,33.87 -305,286,123,1.8 -305,284,123,1.8 -286,266,125,51.23 -284,264,125,51.23 -266,246,127,51.23 -264,244,127,51.23 -244,224,129,51.23 -246,226,129,51.23 -224,204,131,51.23 -226,206,131,51.23 -206,186,133,51.23 -204,184,133,51.23 -186,166,135,51.23 -184,164,135,51.23 -164,144,137,51.23 -166,146,137,51.23 -144,124,139,51.23 -146,126,139,51.23 -124,104,141,51.23 -126,106,141,51.23 -104,84,143,51.23 -106,86,143,51.23 -84,64,145,51.23 -86,66,145,51.23 -64,44,147,51.23 -66,46,147,51.23 -44,24,149,51.23 -46,26,149,51.23 -24,4,151,51.23 -26,6,151,51.23 -286,267,197,2.39 -284,263,197,2.39 -267,247,198,124.06 -266,247,198,2.39 -263,243,198,124.06 -264,243,198,2.39 -247,227,199,124.06 -243,223,199,124.06 -227,207,200,124.06 -223,203,200,124.06 -207,187,201,124.06 -203,183,201,124.06 -183,163,202,124.06 -187,167,202,124.06 -163,143,203,124.06 -167,147,203,124.06 -147,127,204,124.06 -143,123,204,124.06 -127,107,205,124.06 -123,103,205,124.06 -103,83,206,124.06 -107,87,206,124.06 -83,63,207,124.06 -87,67,207,124.06 -67,47,208,124.06 -63,43,208,124.06 -47,27,209,124.06 -43,23,209,124.06 -23,3,210,124.06 -27,7,210,124.06 -305,306,218,0.71 -305,304,218,0.71 -267,248,257,2.37 -263,242,257,2.37 -248,228,258,160.96 -247,228,258,2.37 -242,222,258,160.96 -243,222,258,2.37 -228,208,259,160.96 -227,208,259,2.37 -222,202,259,160.96 -223,202,259,2.37 -208,188,260,160.96 -207,188,260,2.37 -202,182,260,160.96 -203,182,260,2.37 -188,168,261,160.96 -182,162,261,160.96 -183,162,261,2.37 -187,168,261,2.37 -162,142,262,160.96 -168,148,262,160.96 -163,142,262,2.37 -167,148,262,2.37 -147,128,263,2.37 -142,122,263,160.96 -148,128,263,160.96 -143,122,263,2.37 -127,108,264,2.37 -122,102,264,160.96 -123,102,264,2.37 -128,108,264,160.96 -108,88,265,160.96 -102,82,265,160.96 -103,82,265,2.37 -107,88,265,2.37 -88,68,266,160.96 -82,62,266,160.96 -83,62,266,2.37 -87,68,266,2.37 -62,42,267,160.96 -67,48,267,2.37 -68,48,267,160.96 -63,42,267,2.37 -42,22,268,160.96 -47,28,268,2.37 -43,22,268,2.37 -48,28,268,160.96 -22,2,269,160.96 -23,2,269,2.37 -27,8,269,2.37 -28,8,269,160.96 -304,283,278,2.37 -306,287,278,2.37 -248,229,319,2.18 -242,221,319,2.18 -229,209,320,159.16 -228,209,320,2.18 -221,201,320,159.16 -222,201,320,2.18 -209,189,321,159.16 -208,189,321,2.18 -201,181,321,159.16 -202,181,321,2.18 -189,169,322,159.16 -188,169,322,2.18 -181,161,322,159.16 -182,161,322,2.18 -169,149,323,159.16 -161,141,323,159.16 -162,141,323,2.18 -168,149,323,2.18 -141,121,324,159.16 -149,129,324,159.16 -142,121,324,2.18 -148,129,324,2.18 -121,101,325,159.16 -129,109,325,159.16 -122,101,325,2.18 -128,109,325,2.18 -101,81,326,159.16 -108,89,326,2.18 -102,81,326,2.18 -109,89,326,159.16 -89,69,327,159.16 -81,61,327,159.16 -88,69,327,2.18 -82,61,327,2.18 -61,41,328,159.16 -69,49,328,159.16 -41,21,329,159.16 -49,29,329,159.16 -21,1,330,159.16 -29,9,330,159.16 -283,262,342,2.18 -287,268,342,2.18 -305,325,365,0.31 -304,303,367,0.6 -306,307,367,0.6 -229,210,386,2.03 -210,190,387,154.19 -209,190,387,2.03 -190,170,388,154.19 -189,170,388,2.03 -170,150,389,154.19 -150,130,390,154.19 -130,110,391,154.19 -110,90,392,154.19 -90,70,393,154.19 -70,50,394,154.19 -50,30,395,154.19 -30,10,396,154.19 -262,241,411,2.03 -268,249,411,2.03 -305,326,459,0.13 -305,324,459,0.13 -283,282,468,0.22 -287,288,468,0.22 diff --git a/results/Messages/MessagesFile20.csv b/results/Messages/MessagesFile20.csv deleted file mode 100644 index 4968d33a..00000000 --- a/results/Messages/MessagesFile20.csv +++ /dev/null @@ -1,24 +0,0 @@ -100,80,6,15.37 -80,60,13,15.37 -60,40,20,15.37 -40,20,27,15.37 -100,79,123,1.8 -79,59,125,51.23 -59,39,127,51.23 -39,19,129,51.23 -79,58,197,2.39 -58,38,198,124.06 -59,38,198,2.39 -38,18,199,124.06 -100,99,218,0.71 -58,37,257,2.37 -37,17,258,160.96 -38,17,258,2.37 -99,78,278,2.37 -37,16,319,2.18 -78,57,342,2.18 -100,120,365,0.31 -99,98,367,0.6 -57,36,411,2.03 -100,119,459,0.13 -78,77,468,0.22 diff --git a/test/test.sh b/test/test.sh old mode 100755 new mode 100644 From 1a47b2f77b8f2ad7b4dd1a347df8725403bc924f Mon Sep 17 00:00:00 2001 From: matiasuno Date: Tue, 31 Dec 2024 12:36:05 -0300 Subject: [PATCH 3/6] delete messages --- results/IgnitionsHistory/ignitions_log.csv | 21 -- results/Messages/MessagesFile01.csv | 232 --------------------- 2 files changed, 253 deletions(-) delete mode 100644 results/IgnitionsHistory/ignitions_log.csv delete mode 100644 results/Messages/MessagesFile01.csv diff --git a/results/IgnitionsHistory/ignitions_log.csv b/results/IgnitionsHistory/ignitions_log.csv deleted file mode 100644 index 99efbcc0..00000000 --- a/results/IgnitionsHistory/ignitions_log.csv +++ /dev/null @@ -1,21 +0,0 @@ -sim,point -1,305 -2,100 -3,350 -4,305 -5,100 -6,100 -7,305 -8,305 -9,350 -10,380 -11,350 -12,305 -13,380 -14,100 -15,350 -16,100 -17,380 -18,305 -19,380 -20,100 diff --git a/results/Messages/MessagesFile01.csv b/results/Messages/MessagesFile01.csv deleted file mode 100644 index d59ded8e..00000000 --- a/results/Messages/MessagesFile01.csv +++ /dev/null @@ -1,232 +0,0 @@ -350,330,6,15.37 -330,310,13,15.37 -310,290,20,15.37 -290,270,27,15.37 -270,250,34,15.37 -250,230,41,15.37 -230,210,48,15.37 -210,190,55,15.37 -190,170,61,33.87 -170,150,64,33.87 -150,130,67,33.87 -130,110,70,33.87 -110,90,73,33.87 -90,70,76,33.87 -70,50,79,33.87 -50,30,82,33.87 -30,10,85,33.87 -350,331,123,1.8 -350,329,123,1.8 -329,309,125,51.23 -331,311,125,51.23 -309,289,127,51.23 -311,291,127,51.23 -289,269,129,51.23 -291,271,129,51.23 -269,249,131,51.23 -271,251,131,51.23 -249,229,133,51.23 -251,231,133,51.23 -229,209,135,51.23 -231,211,135,51.23 -209,189,137,51.23 -211,191,137,51.23 -189,169,139,51.23 -191,171,139,51.23 -169,149,141,51.23 -171,151,141,51.23 -149,129,143,51.23 -151,131,143,51.23 -129,109,145,51.23 -131,111,145,51.23 -109,89,147,51.23 -111,91,147,51.23 -89,69,149,51.23 -91,71,149,51.23 -69,49,151,51.23 -71,51,151,51.23 -49,29,153,51.23 -51,31,153,51.23 -29,9,155,51.23 -31,11,155,51.23 -331,312,197,2.39 -329,308,197,2.39 -312,292,198,124.06 -311,292,198,2.39 -308,288,198,124.06 -309,288,198,2.39 -292,272,199,124.06 -288,268,199,124.06 -272,252,200,124.06 -268,248,200,124.06 -252,232,201,124.06 -248,228,201,124.06 -228,208,202,124.06 -232,212,202,124.06 -208,188,203,124.06 -212,192,203,124.06 -192,172,204,124.06 -188,168,204,124.06 -172,152,205,124.06 -168,148,205,124.06 -148,128,206,124.06 -152,132,206,124.06 -128,108,207,124.06 -132,112,207,124.06 -112,92,208,124.06 -108,88,208,124.06 -92,72,209,124.06 -88,68,209,124.06 -68,48,210,124.06 -72,52,210,124.06 -48,28,211,124.06 -52,32,211,124.06 -28,8,212,124.06 -32,12,212,124.06 -350,351,218,0.71 -350,349,218,0.71 -312,293,257,2.37 -308,287,257,2.37 -293,273,258,160.96 -292,273,258,2.37 -287,267,258,160.96 -288,267,258,2.37 -273,253,259,160.96 -267,247,259,160.96 -272,253,259,2.37 -268,247,259,2.37 -253,233,260,160.96 -247,227,260,160.96 -252,233,260,2.37 -248,227,260,2.37 -233,213,261,160.96 -228,207,261,2.37 -227,207,261,160.96 -232,213,261,2.37 -208,187,262,2.37 -213,193,262,160.96 -207,187,262,160.96 -212,193,262,2.37 -192,173,263,2.37 -188,167,263,2.37 -193,173,263,160.96 -187,167,263,160.96 -172,153,264,2.37 -167,147,264,160.96 -168,147,264,2.37 -173,153,264,160.96 -153,133,265,160.96 -147,127,265,160.96 -148,127,265,2.37 -152,133,265,2.37 -133,113,266,160.96 -127,107,266,160.96 -128,107,266,2.37 -132,113,266,2.37 -107,87,267,160.96 -112,93,267,2.37 -113,93,267,160.96 -108,87,267,2.37 -87,67,268,160.96 -92,73,268,2.37 -88,67,268,2.37 -93,73,268,160.96 -67,47,269,160.96 -68,47,269,2.37 -72,53,269,2.37 -73,53,269,160.96 -47,27,270,160.96 -53,33,270,160.96 -48,27,270,2.37 -52,33,270,2.37 -27,7,271,160.96 -33,13,271,160.96 -28,7,271,2.37 -32,13,271,2.37 -349,328,278,2.37 -351,332,278,2.37 -293,274,319,2.18 -287,266,319,2.18 -274,254,320,159.16 -273,254,320,2.18 -267,246,320,2.18 -266,246,320,159.16 -254,234,321,159.16 -253,234,321,2.18 -247,226,321,2.18 -246,226,321,159.16 -234,214,322,159.16 -233,214,322,2.18 -226,206,322,159.16 -227,206,322,2.18 -214,194,323,159.16 -206,186,323,159.16 -213,194,323,2.18 -207,186,323,2.18 -194,174,324,159.16 -186,166,324,159.16 -193,174,324,2.18 -187,166,324,2.18 -166,146,325,159.16 -174,154,325,159.16 -167,146,325,2.18 -173,154,325,2.18 -153,134,326,2.18 -146,126,326,159.16 -147,126,326,2.18 -154,134,326,159.16 -134,114,327,159.16 -133,114,327,2.18 -126,106,327,159.16 -127,106,327,2.18 -106,86,328,159.16 -114,94,328,159.16 -94,74,329,159.16 -86,66,329,159.16 -74,54,330,159.16 -66,46,330,159.16 -46,26,331,159.16 -54,34,331,159.16 -26,6,332,159.16 -34,14,332,159.16 -328,307,342,2.18 -332,313,342,2.18 -350,370,365,0.31 -349,348,367,0.6 -351,352,367,0.6 -274,255,386,2.03 -266,245,386,2.03 -255,235,387,154.19 -254,235,387,2.03 -245,225,387,154.19 -246,225,387,2.03 -235,215,388,154.19 -234,215,388,2.03 -225,205,388,154.19 -226,205,388,2.03 -215,195,389,154.19 -205,185,389,154.19 -195,175,390,154.19 -185,165,390,154.19 -165,145,391,154.19 -175,155,391,154.19 -145,125,392,154.19 -155,135,392,154.19 -125,105,393,154.19 -135,115,393,154.19 -105,85,394,154.19 -115,95,394,154.19 -95,75,395,154.19 -85,65,395,154.19 -65,45,396,154.19 -75,55,396,154.19 -45,25,397,154.19 -55,35,397,154.19 -25,5,398,154.19 -35,15,398,154.19 -307,286,411,2.03 -313,294,411,2.03 -350,371,459,0.13 -350,369,459,0.13 -328,327,468,0.22 -332,333,468,0.22 From 9b2a44733845b37771c17afd56b9984ced050758 Mon Sep 17 00:00:00 2001 From: "matias.vilches@usach.cl" Date: Thu, 2 Jan 2025 13:24:31 -0300 Subject: [PATCH 4/6] raster option --- Cell2Fire/Cell2Fire.cpp | 11 +++++++---- test/test.sh | 31 ++++++++++++++++--------------- 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/Cell2Fire/Cell2Fire.cpp b/Cell2Fire/Cell2Fire.cpp index a397a251..1fb4c339 100644 --- a/Cell2Fire/Cell2Fire.cpp +++ b/Cell2Fire/Cell2Fire.cpp @@ -784,7 +784,7 @@ bool Cell2Fire::RunIgnition(std::default_random_engine generator, int ep){ std::uniform_int_distribution distribution(1, this->nCells); // No Ignitions provided - if (this->args.Ignitions == 0) { + if (this->args.Ignitions == "random" || this->args.Ignitions == 0) { while (true) { microloops = 0; while (true) { @@ -797,7 +797,7 @@ bool Cell2Fire::RunIgnition(std::default_random_engine generator, int ep){ if (this->ignProb[selected - 1] > rd_number) { aux = selected; //DEBUSstd::cout << "selected_point" << std::endl; - break; + break;ss } microloops++; if (microloops > this->nCells * 100) { @@ -853,7 +853,7 @@ bool Cell2Fire::RunIgnition(std::default_random_engine generator, int ep){ } // Ignitions with provided points from CSV - else { + else if (args.Ignitions == "raster") { if (initialPoints.empty()) { initialPoints = this->IgnitionPoints; @@ -923,7 +923,10 @@ bool Cell2Fire::RunIgnition(std::default_random_engine generator, int ep){ } - + else { + std::cerr << "Error: ignition mode not found" << std::endl; + return; + } // If ignition occurs, we update the forest status diff --git a/test/test.sh b/test/test.sh index 02c4dbd3..1dfe710c 100644 --- a/test/test.sh +++ b/test/test.sh @@ -18,21 +18,22 @@ set -x # enable debug tracing # run for format in asc tif; do for model in fbp kitral sb; do - echo running $model-$format - output_folder=test_results/$model-$format - mkdir -p $output_folder - rm -rf $output_folder/* - if [ "$model" == "fbp" ]; then - additional_args="--cros" - sim_code="C" - elif [ "$model" == "sb" ]; then - additional_args="--scenario 1" - sim_code="S" - elif [ "$model" == "kitral" ]; then - additional_args="" - sim_code="K" - fi - Cell2Fire$1 --input-instance-folder model/$model-$format --output-folder $output_folder --nsims 113 --output-messages --grids --out-ros --out-intensity --sim ${sim_code} --seed 123 --ignitionsLog $additional_args > test_results/$model-$format/log.txt + for ignition_mode in random raster; do + echo running $model-$format + output_folder=test_results/$model-$format + mkdir -p $output_folder + rm -rf $output_folder/* + if [ "$model" == "fbp" ]; then + additional_args="--cros" + sim_code="C" + elif [ "$model" == "sb" ]; then + additional_args="--scenario 1" + sim_code="S" + elif [ "$model" == "kitral" ]; then + additional_args="" + sim_code="K" + fi + Cell2Fire$1 --input-instance-folder model/$model-$format --output-folder $output_folder --nsims 113 --ignitions-$ignition_mode --output-messages --grids --out-ros --out-intensity --sim ${sim_code} --seed 123 --ignitionsLog $additional_args > test_results/$model-$format-$ignition_mode/log.txt done done set +x # disable debug tracing From ee2c3908b2bdee9b5be8d5c73b63c9c4f0026273 Mon Sep 17 00:00:00 2001 From: "matias.vilches@usach.cl" Date: Thu, 2 Jan 2025 15:00:15 -0300 Subject: [PATCH 5/6] type error --- Cell2Fire/Cell2Fire.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cell2Fire/Cell2Fire.cpp b/Cell2Fire/Cell2Fire.cpp index 1fb4c339..bff4341d 100644 --- a/Cell2Fire/Cell2Fire.cpp +++ b/Cell2Fire/Cell2Fire.cpp @@ -797,7 +797,7 @@ bool Cell2Fire::RunIgnition(std::default_random_engine generator, int ep){ if (this->ignProb[selected - 1] > rd_number) { aux = selected; //DEBUSstd::cout << "selected_point" << std::endl; - break;ss + break; } microloops++; if (microloops > this->nCells * 100) { From 509313e455288cb8df81bb8f6aa3f674f1b36243 Mon Sep 17 00:00:00 2001 From: "matias.vilches@usach.cl" Date: Wed, 8 Jan 2025 17:11:00 -0300 Subject: [PATCH 6/6] INCLUDED KITRAL FIX --- Cell2Fire/Cell2Fire.cpp | 9 ++------- Cell2Fire/FuelModelKitral.cpp | 4 +++- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Cell2Fire/Cell2Fire.cpp b/Cell2Fire/Cell2Fire.cpp index bff4341d..501a6090 100644 --- a/Cell2Fire/Cell2Fire.cpp +++ b/Cell2Fire/Cell2Fire.cpp @@ -784,7 +784,7 @@ bool Cell2Fire::RunIgnition(std::default_random_engine generator, int ep){ std::uniform_int_distribution distribution(1, this->nCells); // No Ignitions provided - if (this->args.Ignitions == "random" || this->args.Ignitions == 0) { + if (this->args.Ignitions == 0) { while (true) { microloops = 0; while (true) { @@ -853,7 +853,7 @@ bool Cell2Fire::RunIgnition(std::default_random_engine generator, int ep){ } // Ignitions with provided points from CSV - else if (args.Ignitions == "raster") { + else { if (initialPoints.empty()) { initialPoints = this->IgnitionPoints; @@ -923,11 +923,6 @@ bool Cell2Fire::RunIgnition(std::default_random_engine generator, int ep){ } - else { - std::cerr << "Error: ignition mode not found" << std::endl; - return; - } - // If ignition occurs, we update the forest status if (!this->noIgnition) { diff --git a/Cell2Fire/FuelModelKitral.cpp b/Cell2Fire/FuelModelKitral.cpp index fbc181d9..713b9121 100644 --- a/Cell2Fire/FuelModelKitral.cpp +++ b/Cell2Fire/FuelModelKitral.cpp @@ -587,8 +587,10 @@ float rate_of_spread_k(inputs *data, fuel_coefs *ptr, main_outs *at) //incluir e p2 = 0.04316; p3 = 13.8; ch = (-2.97374 + 0.262 * rh - 0.00982 * tmp); + // ch = max(1.0, -2.97374 + 0.262 * rh - 0.00982 * tmp); fmc = fmcs[data->nftype][0]*60; //factor de propagacion en m/min - fch = (389.1624 + 14.3 * ch + 0.02 * pow(ch, 2.0)) / (3.559 + 1.6615 * ch + 2.62392 * pow(ch, 2.0)); //es -14.3 segun el libro + // fch = (389.1624 + 14.3 * ch + 0.02 * pow(ch, 2.0)) / (3.559 + 1.6615 * ch + 2.62392 * pow(ch, 2.0)); //es -14.3 segun el libro + fch = min(51.43, 52.3342 * pow(ch, -1.3035)); fv = p1 * exp(-p2 * ws) + p3; if (ps==0){ at->rss = fmc*fch*(fv);