undo the dict-size parameter

Author: georges-hatem

entries/ghatem-fpc/src/OneBRCproj.lpr

@@ -18,7 +18,6 @@   TOneBRCApp = class(TCustomApplication)
   private
     FFileName: string;
     FThreadCount: Integer;
-    FDictSize: Integer;
     procedure RunOneBRC;
   protected
     procedure DoRun; override;
@@ -34,7 +33,7 @@ procedure TOneBRCApp.RunOneBRC;
 var
   vOneBRC: TOneBRC;
 begin
-  vOneBRC := TOneBRC.Create (FThreadCount, FDictSize);
+  vOneBRC := TOneBRC.Create (FThreadCount);
   try
     try
       vOneBRC.mORMotMMF(FFileName);
@@ -89,17 +88,15 @@ procedure TOneBRCApp.DoRun;
   ErrorMsg: String;
 begin
   // quick check parameters
-  ErrorMsg:= CheckOptions(Format('%s%s%s%s%s:',[
+  ErrorMsg:= CheckOptions(Format('%s%s%s%s:',[
       cShortOptHelp,
       cShortOptThread,
-      cShortOptDictSize,
       cShortOptVersion,
       cShortOptInput
     ]),
     [
       cLongOptHelp,
       cLongOptThread+':',
-      cLongOptDictSize+':',
       cLongOptVersion,
       cLongOptInput+':'
     ]
@@ -129,11 +126,6 @@ procedure TOneBRCApp.DoRun;
     FThreadCount := StrToInt (GetOptionValue(cShortOptThread, cLongOptThread));
   end;
 
-  FDictSize := 45003;
-  if HasOption(cShortOptDictSize, cLongOptDictSize) then begin
-    FDictSize := StrToInt (GetOptionValue(cShortOptDictSize, cLongOptDictSize));
-  end;
-
   if HasOption(cShortOptInput, cLongOptInput) then begin
     FFileName := GetOptionValue(
       cShortOptInput,

entries/ghatem-fpc/src/baseline.console.pas

@@ -21,8 +21,6 @@ interface
   cLongOptInput          = 'input-file';
   cShortOptThread: Char  = 't';
   cLongOptThread         = 'threads';
-  cShortOptDictSize: Char = 's';
-  cLongOptDictSize        = 'size';
   {$ELSE}
   cOptionHelp:    array of string = ['-h', '--help'];
   cOptionVersion: array of string = ['-v', '--version'];

entries/ghatem-fpc/src/onebrc.pas

@@ -10,10 +10,8 @@ interface
 
 function RoundExDouble(const ATemp: Double): Double; inline;
 
-{$WRITEABLECONST ON}
 const
-  cDictSize: Integer = 45003;
-{$WRITEABLECONST OFF}
+  cDictSize: Integer = 45007;
 
 type
 
@@ -62,10 +60,10 @@   TOneBRC = class
     FThreads: array of TThread;
     FStationsDicts: array of TMyDictionary;
 
-    procedure ExtractLineData(const aStart: Int64; const aEnd: Int64; out aLength: ShortInt; out aTemp: SmallInt); inline;
+    procedure ExtractLineData(const aStart: Int64; const aEnd: Int64; out aLength: ShortInt; out aTemp: SmallInt);
 
   public
-    constructor Create (const aThreadCount: UInt16; const aDictSize: Integer);
+    constructor Create (const aThreadCount: UInt16);
     destructor Destroy; override;
     function mORMotMMF (const afilename: string): Boolean;
     procedure DispatchThreads;
@@ -251,11 +249,9 @@ procedure TOneBRC.ExtractLineData(const aStart: Int64; const aEnd: Int64; out aL
 
 //---------------------------------------------------
 
-constructor TOneBRC.Create (const aThreadCount: UInt16; const aDictSize: Integer);
+constructor TOneBRC.Create (const aThreadCount: UInt16);
 var I: UInt16;
 begin
-  cDictSize := aDictSize;
-
   FThreadCount := aThreadCount;
   SetLength (FStationsDicts, aThreadCount);
   SetLength (FThreads, aThreadCount);