refactor: Delphi baseline using Common

Author: gcarreno

baseline/Common/baseline.console.pas

@@ -25,6 +25,8 @@ interface
   cOptionInput:   array of string = ['-i', '--input-file'];
   {$ENDIF}
 
+{$I version.inc}
+
 resourcestring
   rsAppTitle         = 'One Billion Row Challenge Baseline';
   rsGeneratorVersion = 'baseline v%s';
@@ -69,8 +71,10 @@ function ArrayContains (const aArray: array of string; const aValue: string): Bo
   iValue: string;
 begin
   Result := False;
-  for iValue in aArray do begin
-    if aValue.ToLower = iValue then begin
+  for iValue in aArray do
+  begin
+    if aValue.ToLower = iValue then
+    begin
       Result := True;
       break;
     end;
@@ -85,22 +89,27 @@ function ParseCmdLineParams (out aInputFile: string): Boolean;
   aInputFile := '';
 
   // 0 is the exe path, so we start at 1
-  for I := 1 to ParamCount do begin
-    if ArrayContains (cOptionHelp, ParamStr(I)) then begin
+  for I := 1 to ParamCount do
+  begin
+    if ArrayContains (cOptionHelp, ParamStr(I)) then
+    begin
       WriteHelp;
       exit;
     end
-    else if ArrayContains (cOptionVersion, ParamStr(I)) then begin
+    else if ArrayContains (cOptionVersion, ParamStr(I)) then
+    begin
       WriteLn(Format(rsGeneratorVersion, [ cVersion ]));
       exit;
     end
-    else if ArrayContains (cOptionInput, ParamStr(I)) then begin
+    else if ArrayContains (cOptionInput, ParamStr(I)) then
+    begin
       // must be followed by the user's specified input file
       if (I+1) <= ParamCount then
         aInputFile := ExpandFileName (ParamStr (I+1));
       if not TFile.Exists (aInputFile) then
         WriteLn(Format(rsErrorMessage, [ Format(rsNoInputFile, [aInputFile]) ]))
-      else begin
+      else
+      begin
         Result := True;
         exit;
       end;

baseline/Delphi/src/OneBRC.pas baseline/Common/baseline.delphi.pasbaseline/Delphi/src/OneBRC.pas renamed to baseline/Common/baseline.delphi.pas

@@ -1,17 +1,19 @@
-unit OneBRC;
+unit Baseline.Delphi;
 
 interface
 
 uses
-  System.Classes, System.Generics.Collections;
+  System.Classes
+, System.Generics.Collections
+;
 
 type
-  // alias, to easily try various types (Int64, Currency, Double)
-  // due to rounding problems during the average calculation,
-  // and the mismatch between Delphi and Lazarus.
+// alias, to easily try various types (Int64, Currency, Double)
+// due to rounding problems during the average calculation,
+// and the mismatch between Delphi and Lazarus.
   TAmount = Int64;
 
-  { TWeatherStation }
+{ TWeatherStation }
   PWeatherStation = ^TWeatherStation;
   TWeatherStation = record
     FStation: string;
@@ -21,28 +23,31 @@   TWeatherStation = record
     FCnt: Integer;
   end;
 
-  { TBaseline }
+{ TBaseline }
   TBaseline = class
   private
     FInputFile: String;
     FStationNames: TStringList;
     FHashStationList: TDictionary<string, PWeatherStation>;
     procedure AddToHashList (AStation: String; ATemp: TAmount);
     procedure BuildHashList;
-    function RoundEx (x: Currency): Double;
   protected
   public
     constructor Create (AInputFile: String);
     destructor Destroy; override;
 
     procedure Generate;
-  end;
+end;
 
 
 implementation
 
 uses
-  System.SysUtils, System.StrUtils, System.Math;
+  System.SysUtils
+, System.StrUtils
+, System.Math
+, Baseline.Common
+;
 
 
 function Compare (AList: TStringList; AIndex1, AIndex2: Integer): Integer;
@@ -63,7 +68,6 @@ function Compare (AList: TStringList; AIndex1, AIndex2: Integer): Integer;
   end;
 end;
 
-//---------------------------------------------------
 { TBaseline }
 
 constructor TBaseline.Create (AInputFile: String);
@@ -81,7 +85,8 @@ destructor TBaseline.Destroy;
 var
   iStation: PWeatherStation;
 begin
-  for iStation in FHashStationList.Values do begin
+  for iStation in FHashStationList.Values do
+  begin
     Dispose(iStation);
   end;
   FStationNames.Free;
@@ -93,8 +98,8 @@ procedure TBaseline.AddToHashList(AStation: String; ATemp: TAmount);
 var
   vWeatherStation: PWeatherStation;
 begin
-  // on Delphi, the below station returns a different average from the baseline.output provided
-  // this issue was resolved after
+// on Delphi, the below station returns a different average from the baseline.output provided
+// this issue was resolved after
 //  if aStation = 'Danau Kändimarg' then begin
 //    FProblematicSum := FProblematicSum + aTemp;
 //    Inc (FProblematicCount);
@@ -156,11 +161,6 @@ procedure TBaseline.BuildHashList;
   end;
 end;
 
-function TBaseline.RoundEx(x: Currency): Double;
-begin
-  Result := Ceil(x * 10) / 10;
-end;
-
 procedure TBaseline.Generate;
 var
   index: Integer;
@@ -170,23 +170,27 @@ procedure TBaseline.Generate;
   mean: Double;
   weatherStation: PWeatherStation;
   iStation: string;
+  {$IFDEF DEBUG}
   vStream: TStringStream;
+  {$ENDIF}
 begin
   BuildHashList;
   FStationNames.BeginUpdate;
-  for iStation in FHashStationList.Keys do begin
+  for iStation in FHashStationList.Keys do
+  begin
     FHashStationList.TryGetValue(iStation, weatherStation);
     Min := weatherStation^.FMin/10;
     Max := weatherStation^.FMax/10;
-    Mean := RoundEx(weatherStation^.FTot/weatherStation^.FCnt/10);
+    Mean := RoundExDouble(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
+  for index:= 0 to FStationNames.Count - 1 do
+  begin
     strTemp:= strTemp + FStationNames[index] + ' ';
   end;
   SetLength(strTemp, Length(strTemp) - 2);

baseline/Common/baseline.lazarus.pas

@@ -20,8 +20,8 @@ TWeatherStation = record
   FMax: Int64;
   FTot: Int64;
   FCnt: Integer;
-
 end;
+
 { TBaseline }
   TBaseline = class(TObject)
   private

baseline/Delphi/src/Baseline.Console.pas

@@ -5,17 +5,19 @@
 {$R *.res}
 
 uses
-  System.SysUtils,
-  Baseline.Console in 'Baseline.Console.pas',
-  OneBRC in 'OneBRC.pas';
+  System.SysUtils
+, Baseline.Console
+, Baseline.Delphi
+;
 
 var
-  vInputFilePath: string;
+  //vInputFilePath: string;
   vBaseline: TBaseline;
 begin
   try
-    if ParseCmdLineParams (vInputFilePath) then begin
-      vBaseline := TBaseline.Create (vInputFilePath);
+    if ParseCmdLineParams (inputFilename) then
+    begin
+      vBaseline := TBaseline.Create (inputFilename);
       try
         vBaseline.Generate;
       finally
@@ -25,6 +27,6 @@ begin
 
   except
     on E: Exception do
-      Writeln(E.ClassName, ': ', E.Message);
+      Writeln(Format(rsErrorMessage, [ E.ClassName, ': ', E.Message ]));
   end;
 end.