Merge branch 'main' into ikelaiah-rev11

Author: gcarreno

README.md

@@ -17,7 +17,7 @@ Grab all your threads, reach out to SIMD,  or pull any other trick, and create t
 <img src="img/1brc.png" alt="1BRC" style="display: block; margin-left: auto; margin-right: auto; margin-bottom:1em; width: 50%;">
 </p>
 
-The text file contains temperature values for a range of weather stations. Each row is one measurement in the format `<string: station name>;<double: measurement>`, with the measurement value having exactly one fractional digit.
+The text file contains temperature values for a range of weather stations. Each row is one measurement in the format `<string: station name>;<double: measurement>`, with the measurement value having exactly one fractional digit. Rows are separated by a single line feed equal of LF (ascii 10) for consistency with the original challenge - and not CR+LF (ascii 13+10) any more.
 The following shows ten rows as an example:
 
 ```
@@ -119,7 +119,7 @@ C:> CertUtil -hashfile .\data\measurements.txt SHA256
 Get-FileHash .\data\measurements.txt -Algorithm SHA256
 ```
 Expected `SHA256` hash:
-`ebad17b266ee9f5cb3d118531f197e6f68c9ab988abc5cb9506e6257e1a52ce6`
+`2b48bc2fa0b82d748925a820f43f75df01cc06df7447c7571e52d3962e675960`
 
 ## Verify Output File
 
@@ -154,18 +154,19 @@ These are the results from running all entries into the challenge on my personal
 
 | # | Result (m:s.ms) | Compiler | Submitter | Notes | Certificates |
 |--:|----------------:|---------:|:----------|:------|:-------------|
-| 1  | 00:01.718 | lazarus-3.0, fpc-3.2.2 | Arnaud Bouchez      | Using `mORMot2`, 32 threads | |
-| 2  | 00:02.355 | lazarus-3.0, fpc-3.2.2 | O Coddo             | Using `SCL`, 32 threads | |
-| 3  | 00:05.998 | lazarus-3.0, fpc-3.2.2 | Georges Hatem - FPC | Free Pascal: Using 32 thread | |
-| 4  | 00:09.974 | lazarus-3.0, fpc-3.2.2 | G Klark             | Using 32 threads | |
-| 5  | 00:15.873 | lazarus-3.0, fpc-3.2.2 | Székely Balázs      | Using 32 threads | |
-| 6  | 00:53.131 | lazarus-3.0, fpc-3.2.2 | Hartmut Grosser     | Using 1 thread | |
-| 7  | 01:15.640 | lazarus-3.0, fpc-3.2.2 | Richard Lawson      | Using 1 thread | |
-| 8  | 02:48.079 | lazarus-3.0, fpc-3.2.2 | Iwan Kelaiah        | Using 1 thread | |
-| 9  | 06:49.661 | delphi 12.1            | Brian Fire          | Using 1 thread | |
-| 10 | 06:58.535 | delphi 12.1            | David Cornelius     | Using 1 thread | |
-| 🟠 | 00:19.699 | lazarus-3.0, fpc-3.2.2 | Lurendrejer Aksen   | Using 32 threads **(failed hash)** | |
-| 🟠 | 14:36.808 | delphi 12.1            | Daniel Töpfl        | Using 1 thread **(failed hash)** | |
+|  1 |   0:1.651 | lazarus-3.0, fpc-3.2.2  | Arnaud Bouchez         | Using `mORMot2`, 32 threads        | |
+|  2 |   0:2.606 | lazarus-3.99, fpc-3.3.1 | O Coddo                | Using `SCL`, 32 threads            | |
+|  3 |   0:5.884 | lazarus-3.0, fpc-3.2.2  | Georges Hatem          | Free Pascal: Using 32 thread       | |
+|  4 |   0:9.808 | lazarus-3.99, fpc-3.3.1 | G Klark                | Using 32 threads                   | |
+|  5 |  0:15.059 | lazarus-3.0, fpc-3.2.2  | Székely Balázs         | Using 32 threads                   | |
+|  6 |  0:53.488 | lazarus-3.0, fpc-3.2.2  | Hartmut Grosser        | Using 1 thread                     | |
+|  7 |  1:15.706 | lazarus-3.0, fpc-3.2.2  | Richard Lawson         | Using 1 thread                     | |
+|  8 |  2:27.407 | lazarus-3.0, fpc-3.2.2  | Iwan Kelaiah           | Using 1 thread                     | |
+|  9 |  6:55.406 | delphi 12.1             | David Cornelius        | Using 1 thread                     | |
+| 10 |   7:4.147 | delphi 12.1             | Brian Fire             | Using 1 thread                     | |
+| 🟠 |  0:19.460 | lazarus-3.0, fpc-3.2.2  | Lurendrejer Aksen      | Using 32 threads **(failed hash)** | |
+| 🟠 |  15:4.100 | delphi 12.1             | Daniel Töpfl           | Using 1 thread **(failed hash)**   | |
+
 
 > **NOTE**
 >

baseline/Common/baseline.delphi.pas

@@ -5,6 +5,7 @@ interface
 uses
   System.Classes
 , System.Generics.Collections
+, System.SysUtils
 ;
 
 type
@@ -28,6 +29,7 @@   TBaseline = class
   private
     FInputFile: String;
     FStationNames: TStringList;
+    FFormatSettings: TFormatSettings;
     FHashStationList: TDictionary<string, PWeatherStation>;
     procedure AddToHashList (AStation: String; ATemp: TAmount);
     procedure BuildHashList;
@@ -43,8 +45,7 @@   TBaseline = class
 implementation
 
 uses
-  System.SysUtils
-, System.StrUtils
+  System.StrUtils
 , System.Math
 , Baseline.Common
 ;
@@ -72,6 +73,8 @@ function Compare (AList: TStringList; AIndex1, AIndex2: Integer): Integer;
 
 constructor TBaseline.Create (AInputFile: String);
 begin
+  FFormatSettings := TFormatSettings.Create;
+  FFormatSettings.DecimalSeparator := '.';
   FInputFile := AInputFile;
 
   FHashStationList := TDictionary<string, PWeatherStation>.Create;
@@ -182,7 +185,7 @@ procedure TBaseline.Generate;
     Min := weatherStation^.FMin/10;
     Max := weatherStation^.FMax/10;
     Mean := RoundExDouble(weatherStation^.FTot/weatherStation^.FCnt/10);
-    strTemp := weatherStation^.FStation + '=' + FormatFloat('0.0', Min) + '/' + FormatFloat('0.0', Mean) + '/' + FormatFloat('0.0', Max) + ',';
+    strTemp := weatherStation^.FStation + '=' + FormatFloat('0.0', Min, FFormatSettings) + '/' + FormatFloat('0.0', Mean, FFormatSettings) + '/' + FormatFloat('0.0', Max, FFormatSettings) + ',';
     FStationNames.Add(strTemp);
   end;
   FStationNames.EndUpdate;