Merge branch 'main' into ikelaiah-rev05

Author: gcarreno

.gitignore

@@ -4,7 +4,7 @@
 /profiling
 /results
 /entries/entries.json
-*_all.*
+*.sh
 
 # Compiled l10n files: .mo should be ignored
 *.mo

README.md

@@ -1,7 +1,9 @@
 # 1️⃣🐝🏎️ The One Billion Row Challenge in Object Pascal
 <p>
-    <a href="https://discord.gg/c382VBk"><img src="https://img.shields.io/discord/623794270255579146?label=Delphi Community Discord" alt="Delphi Community" /></a>
-    <a href="https://discord.gg/3VdxbSFyJP"><img src="https://img.shields.io/discord/570025060312547359?label=Unofficial Free Pacal Discord" alt="Unofficial Free Pacal" /></a>
+    <a href="https://discord.gg/c382VBk"><img src="https://img.shields.io/discord/623794270255579146?label=Delphi Community&logo=discord" alt="Delphi Community" /></a>
+    <a href="https://discord.gg/3VdxbSFyJP"><img src="https://img.shields.io/discord/570025060312547359?label=Unofficial Free Pascal&logo=discord" alt="Unofficial Free Pacal" /></a>
+    <a href="https://t.me/delphidevelopers"><img src="https://img.shields.io/badge/Telegram-Delphi_Developers-blue?logo=telegram" /></a>
+    <a href="https://t.me/freepascal_en"><img src="https://img.shields.io/badge/Telegram-Free_Pascal_&_Lazarus-blue?logo=telegram" /></a>
     <a href="https://forum.lazarus.freepascal.org/index.php/topic,66571.0.html"><img src="https://img.shields.io/badge/Lazarus_Forum-1BRC_Thread-blue" /></a>
     <a href="https://en.delphipraxis.net/topic/11209-offical-launch-of-the-1-billion-row-challenge-in-object-pascal/"><img src="https://img.shields.io/badge/Delphi_Praxis_Forum-1BRC_Thread-blue" /></a>
 </p>
@@ -31,7 +33,7 @@ Conakry;31.2
 Istanbul;23.0
 ```
 
-The task is to write an Object Pascal program which reads the file, calculates the min, mean, and max temperature value per weather station, and emits the results on `STDOUT` like this (i.e., sorted alphabetically by station name, and the result values per station in the format `<min>/<mean>/<max>`, rounded to one fractional digit towards positive infinity with both `17.01` and `17.05` being rounded to `17.1`, with the decimal separator being a period `.`):
+The task is to write an Object Pascal program which reads the file, calculates the min, mean, and max temperature value per weather station, and emits the results on `STDOUT` like this (i.e., sorted alphabetically by station name, and the result values per station in the format `<min>/<mean>/<max>`, rounded to one fractional digit, with the decimal separator being a period `.`, and for that you can chose one of the options presented in the [Rounding Section](#rounding) or implement your own that is consistent with the options provided.):
 
 ```
 {Abha=-23.0/18.0/59.2, Abidjan=-16.2/26.0/67.3, Abéché=-10.0/29.4/69.0, Accra=-10.1/26.4/66.4, Addis Ababa=-23.7/16.0/67.0, Adelaide=-27.8/17.3/58.5, ...}
@@ -72,31 +74,24 @@ In a discussion with [Mr. Packman](https://pack.ac/) themselves, we came up with
 
 This will be the official way to round the output values, so pick your poison:
 ```pas
-function RoundEx(x: Double): Double; inline;
+function RoundEx(x: Currency): Double; inline;
 begin
   Result := Ceil(x * 10) / 10;
 end;
 
-function RoundExInteger(x: Double): Integer; inline;
+function RoundExInteger(x: Currency): Integer; inline;
 begin
   Result := Ceil(x * 10);
 end;
 
-function RoundExString(x: Double): String; inline;
+{ Neater version by @bytebites from Lazarus forum }
+function RoundExString(x: Currency): String; inline;
 var
   V, Q, R: Integer;
 begin
   V := RoundExInteger(x);
-  if V < 0 then
-  begin
-    Result := '-';
-    V := -V;
-  end
-  else
-    Result := '';
-  Q := V div 10;
-  R := V - (Q * 10);
-  Result := Result + IntToStr(Q) + '.' + IntToStr(R);
+  divmod(V, 10, Q, R);
+  Result := IntToStr(Q) + '.' + chr(48 + Abs(R))
 end;
 
 procedure Test;
@@ -165,7 +160,7 @@ Expected `SHA256` hash:
 >
 > We are still waiting for the Delphi version to be completed in order for us to have an official `SHA256` hash for the output.
 >
-> Until then, this is the current one: `4256d19d3e134d79cc6f160d428a1d859ce961167bd01ca528daca8705163910`
+> Until then, this is the current one: `683bb3d247f53bab96e98983771d66bc9d7dbfb38aa3fecac4c04b8ab29e3032`
 > There's also an archived version of the [baseline output](./data/baseline.output.gz)
 
 ## Differences From Original
@@ -229,7 +224,8 @@ I'd like to thank [@mobius](https://github.com/mobius1qwe) for taking the time t
 I'd like to thank [@dtpfl](https://github.com/dtpfl) for his invaluable work on maintaining the `README.md` file up to date with everything.\
 I'd like to thank Székely Balázs for providing many patches to make everything compliant with the original challenge.\
 I'd like to thank [@corneliusdavid](https://github.com/corneliusdavid) for giving some of the information files a once over and making things more legible and clear.\
-I'd like to thank Mr. **Pack**man, aka O, for clearing the fog around the rounding issues.
+I'd like to thank Mr. **Pack**man, aka O, for clearing the fog around the rounding issues.\
+I'd like to thank [Georges](https://github.com/georges-hatem) for providing us with the Delphi version of baseline.
 
 ## Links
 The original repository: https://github.com/gunnarmorling/1brc \

baseline/Common/baseline.common.pas

@@ -7,219 +7,37 @@
 interface
 
 uses
-  Classes
-, SysUtils
-{$IFDEF FPC}
-  , Contnrs
-{$ELSE}
-{$ENDIF}
-
+ {$IFDEF FPC}
+ SysUtils
+ {$ELSE}
+ System.SysUtils
+ {$ENDIF}
 ;
 
-type
-{ TWeatherStation }
-PWeatherStation = ^TWeatherStation;
-TWeatherStation = record
-  FStation: String[100];
-  FMin: Int64;
-  FMax: Int64;
-  FTot: Int64;
-  FCnt: Integer;
-
-end;
-{ TBaseline }
-  TBaseline = class(TObject)
-  private
-    FInputFile: String;
-    FStationNames: TStringList;
-    FHashStationList: TFPHashList;
-    procedure AddToHashList(AStation: String; ATemp: Int64);
-    procedure BuildHashList;
-    function RoundEx(x: Double): Double;
-  protected
-  public
-    constructor Create(AInputFile: String);
-    destructor Destroy; override;
-
-    procedure Generate;
-  published
-  end;
-
-  {$IFNDEF FPC}
-  TStringArray = array of Utf8String;
-  TWriteBufStream = TFileStream;
-  {$ENDIF}
+function RoundExDouble(const ATemp: Double): Double;
+function RoundExInteger(const ATemp: Double): Integer;
 
 implementation
 
-uses
-  Math
-{$IFDEF FPC}
-, streamex
-{$ELSE}
-, System.Diagnostics 
-{$IF defined(MSWINDOWS)}, Winapi.Windows{$ENDIF}
-{$ENDIF}
-;
-
-const
-  //lineEnding = #13#10;
-  stationsCapacity = 50000;
-
-
-function Compare(AList: TStringList; AIndex1, AIndex2: Integer): Integer;
-var
-  Pos1, Pos2: Integer;
-  Str1, Str2: String;
-begin
-  Result := 0;
-  Str1 := AList.Strings[AIndex1];
-  Str2 := AList.Strings[AIndex2];
-  Pos1 := Pos('=', Str1);
-  Pos2 := Pos('=', Str2);
-  if (Pos1 > 0) and (Pos2 > 0) then
-  begin
-    Str1 := Copy(Str1, 1, Pos1 - 1);
-    Str2 := Copy(Str2, 1, Pos2 - 1);
-    Result :=  CompareStr(Str1, Str2);
-  end;
-end;
-
-{ TBaseline }
-
-constructor TBaseline.Create(AInputFile: String);
-begin
-  FInputFile := AInputFile;
-
-  FHashStationList:= TFPHashList.Create;
-  FHashStationList.Capacity:= stationsCapacity;
-
-  FStationNames := TStringList.Create;
-  FStationNames.Capacity := stationsCapacity;
-  FStationNames.UseLocale := False;
-end;
-
-destructor TBaseline.Destroy;
-var
-  index: Integer;
-begin
-  FStationNames.Free;
-  for index:= 0 to FHashStationList.Count - 1 do
-  begin
-    Dispose(PWeatherStation(FHashStationList.Items[index]));
-  end;
-  FHashStationList.Free;
-  inherited Destroy;
-end;
-
-procedure TBaseline.AddToHashList(AStation: String; ATemp: Int64);
-var
-  weatherStation: PWeatherStation;
-  Index: Integer;
+function Ceiling(const ANumber: Double): integer; inline;
 begin
-  Index := FHashStationList.FindIndexOf(AStation);
-  if Index = -1 then
-  begin
-    New(weatherStation);
-    weatherStation^.FStation := AStation;
-    weatherStation^.FMin := ATemp;
-    weatherStation^.FMax := ATemp;
-    weatherStation^.FTot := ATemp;
-    weatherStation^.FCnt := 1;
-    FHashStationList.Add(AStation, weatherStation);
-  end
-  else
-  begin
-    weatherStation := FHashStationList.Items[Index];
-    weatherStation^.FMin := Min(weatherStation^.FMin, ATemp);
-    weatherStation^.FMax := Max(weatherStation^.FMax, ATemp);
-    weatherStation^.FTot := weatherStation^.FTot + ATemp;
-    weatherStation^.FCnt := weatherStation^.FCnt + 1;
-  end;
+  Result := Trunc(ANumber) + Ord(Frac(ANumber) > 0);
 end;
 
-procedure TBaseline.BuildHashList;
+function RoundExDouble(const ATemp: Double): Double; inline;
 var
-  inputFileStream: TFileStream;
-  streamReader: TStreamReader;
-  position, Code: Integer;
-  strLine: String;
-  strStation: String;
-  strTemp: String;
-  temparature: Int64;
-begin
-  if FileExists(FInputFile) then
-  begin
-    inputFileStream:= TFileStream.Create(FInputFile, fmOpenRead);
-    try
-      streamReader:= TStreamReader.Create(inputFileStream);
-      try
-        while not streamReader.Eof do
-        begin
-          strLine:= streamReader.ReadLine;
-          position := Pos(';', strLine);
-          if position > 0 then
-          begin
-            strStation := Copy(strLine, 1, position - 1);
-            strTemp := Copy(strLine, position + 1, Length(strLine));
-            strTemp := StringReplace(strTemp, '.', '', [rfReplaceAll]);
-            Val(strTemp, temparature, Code);
-            if Code <> 0 then
-              Continue;
-            AddToHashList(strStation, temparature);
-          end;
-        end;
-      finally
-        streamReader.Free;
-      end;
-    finally
-      inputFileStream.Free;
-    end;
-  end
-  else
-  begin
-    raise Exception.Create(Format('File "%s" not found.', [FInputFile]));
-  end;
-end;
-
-function TBaseline.RoundEx(x: Double): Double;
+  tmp: Double;
 begin
-  Result := Ceil(x * 10) / 10;
+  tmp:= ATemp * 10;
+  Result := Ceiling(tmp) / 10;
 end;
 
-procedure TBaseline.Generate;
+function RoundExInteger(const ATemp: Double): Integer; inline;
 var
-  index: Integer;
-  strTemp: String;
-  min: Double;
-  max: Double;
-  mean: Double;
-  weatherStation: PWeatherStation;
+  tmp: Double;
 begin
-
-  BuildHashList;
-
-  FStationNames.BeginUpdate;
-  for index := 0 to FHashStationList.Count - 1 do
-  begin
-    weatherStation := FHashStationList.Items[index];
-    Min := RoundEx(weatherStation^.FMin/10);
-    Max := RoundEx(weatherStation^.FMax/10);
-    Mean := RoundEx(weatherStation^.FTot/weatherStation^.FCnt/10);
-    strTemp := weatherStation^.FStation + '=' + FormatFloat('0.0', Min) + '/' + FormatFloat('0.0', Mean) + '/' + FormatFloat('0.0', Max) + ',';
-    FStationNames.Add(strTemp);
-  end;
-  FStationNames.EndUpdate;
-  FStationNames.CustomSort(@Compare);
-
-  strTemp:= '';
-  for index:= 0 to FStationNames.Count - 1 do
-  begin
-    strTemp:= strTemp + FStationNames[index] + ' ';
-  end;
-  SetLength(strTemp, Length(strTemp) - 2);
-  WriteLn('{', strTemp, '}');
-
+  tmp:= ATemp * 10;
+  Result := Ceiling(tmp);
 end;
 
 end.