refactor: Getting ready for baseline Common

Author: gcarreno

baseline/Common/baseline.common.pas

@@ -9,217 +9,32 @@ interface
 uses
   Classes
 , SysUtils
-{$IFDEF FPC}
-  , Contnrs
-{$ELSE}
-{$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: Currency): 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;
 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;
 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: Currency): 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;
 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.

baseline/Common/baseline.console.pas

@@ -12,34 +12,44 @@ interface
 ;
 
 const
+  {$IFDEF FPC}
   cShortOptHelp: Char    = 'h';
   cLongOptHelp           = 'help';
   cShortOptVersion: Char = 'v';
   cLongOptVersion        = 'version';
   cShortOptInput: Char   = 'i';
   cLongOptInput          = 'input-file';
-  {$IFNDEF FPC}
-  cShortOptions: array of char = ['h', 'v'{, 'i', 'o', 'n'}];
-  cLongOptions: array of string = ['help', 'version'{, 'input-file', 'output-file',
-                                   'line-count'}];
+  {$ELSE}
+  cOptionHelp:    array of string = ['-h', '--help'];
+  cOptionVersion: array of string = ['-v', '--version'];
+  cOptionInput:   array of string = ['-i', '--input-file'];
   {$ENDIF}
 
 resourcestring
-  rsAppTitle = 'One Billion Row Challenge Baseline';
+  rsAppTitle         = 'One Billion Row Challenge Baseline';
   rsGeneratorVersion = 'baseline v%s';
-  rsErrorMessage = 'ERROR: %s';
+  rsErrorMessage     = 'ERROR: %s';
   rsMissingInputFlag = 'Missing input file flag.';
+  rsNoInputFile      = 'File "%s" not found.';
 
 var
   inputFilename: String = '';
-  {outputFilename: String = '';
-  lineCount: Integer = 0;}
 
 procedure WriteHelp;
+{$IFNDEF FPC}
+function ParseCmdLineParams (out aInputFile: string): Boolean;
+{$ENDIF}
 
 
 implementation
 
+{$IFNDEF FPC}
+uses
+  System.IOUtils
+;
+{$ENDIF}
+
+
 procedure WriteHelp;
 begin
   WriteLn('Generates the output for the challenge');
@@ -53,5 +63,53 @@ procedure WriteHelp;
   WriteLn('  -i|--input-file <filename>     The file containing the Weather Stations');
 end;
 
+{$IFNDEF FPC}
+function ArrayContains (const aArray: array of string; const aValue: string): Boolean;
+var
+  iValue: string;
+begin
+  Result := False;
+  for iValue in aArray do begin
+    if aValue.ToLower = iValue then begin
+      Result := True;
+      break;
+    end;
+  end;
+end;
+
+function ParseCmdLineParams (out aInputFile: string): Boolean;
+var
+  I: Integer;
+begin
+  Result := False;
+  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
+      WriteHelp;
+      exit;
+    end
+    else if ArrayContains (cOptionVersion, ParamStr(I)) then begin
+      WriteLn(Format(rsGeneratorVersion, [ cVersion ]));
+      exit;
+    end
+    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
+        Result := True;
+        exit;
+      end;
+    end
+    else
+      WriteLn(Format(rsErrorMessage, [ rsMissingInputFlag ]));
+  end;
+end;
+{$ENDIF}
+
 end.