Merge pull request #25 from ikelaiah/ikelaiah-rev02

Ikelaiah Revision 02

Author: gcarreno

baseline/Lazarus/src/baseline.lpi

@@ -112,6 +112,11 @@
       <OtherUnitFiles Value="../../Common"/>
       <UnitOutputDirectory Value="../../../bin/lib/$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
+    <Linking>
+      <Debugging>
+        <DebugInfoType Value="dsDwarf2Set"/>
+      </Debugging>
+    </Linking>
   </CompilerOptions>
   <Debugging>
     <Exceptions Count="3">

entries/ikelaiah/README.md

@@ -6,8 +6,10 @@ The approach I implemented here is simplistic.
 
 - Sequentially read the measurement file.
 - Populate a `TDictionary` with station names, min, max, count and sum; without storing all the temperature measurements.
+- Avoided [StrUtil.SplitString](https://www.freepascal.org/docs-html/rtl/strutils/splitstring.html), used [`Pos()`](https://www.freepascal.org/docs-html/rtl/system/pos.html) and [`Copy()`](https://www.freepascal.org/docs-html/rtl/system/copy.html) instead.
 - Use a custom comparer to sort the station and temperature statistics in a `TStringList`.
-- Display the sorted measurements using a simple for loop.
+- Use the rounding method as provided in the `baseline.lpr` (or the `README.md` from 1brc-ObjectPascal).
+- Display the sorted measurements using a simple `for` loop.
 
 ## Getting Started
 
@@ -17,7 +19,7 @@ The approach I implemented here is simplistic.
 
 ### Compiling
 
-* Open `OneBRC.lpi` using Lazarus. 
+* Open `OneBRC.lpi` using Lazarus.
 * Hit `Ctrl + F9` to compile.
 
 ### Running the executable

entries/ikelaiah/src/OneBRC.lpr

@@ -22,10 +22,9 @@
 {$mode objfpc}{$H+}{$J-}{$modeSwitch advancedRecords}
 {$codepage utf8}
 
-
 uses
   {$IFDEF UNIX}
-  cthreads,
+  cmem, cthreads,
   {$ENDIF}
   Classes,
   SysUtils,

entries/ikelaiah/src/stopwatch.pas

@@ -53,11 +53,10 @@ procedure DisplayTimer;
   seconds := elapsedMilliseconds div 1000;
   milliseconds := elapsedMilliseconds mod 1000;
 
-  WriteLn;
   WriteLn('------------------------------');
   WriteLn('Elapsed time: ', hours, ' hours ', minutes, ' minutes ',
     seconds, ' seconds ', milliseconds, ' milliseconds');
-  //WriteLn('Elapsed time: ', (endTime - startTime), ' ms');
+  WriteLn('------------------------------');
 end;
 
 

entries/ikelaiah/src/weatherstation.pas

@@ -1,75 +1,92 @@
 unit WeatherStation;
 
 {$mode objfpc}{$H+}{$J-}{$modeSwitch advancedRecords}
-
 interface
 
 uses
   {$IFDEF UNIX}
-  cthreads,
+  cmem, cthreads,
   {$ENDIF}
   Classes,
   SysUtils,
-  Generics.Collections
+  Generics.Collections,
+  Math
   {$IFDEF DEBUG}
 ,  Stopwatch
   {$ENDIF}
-;
+  ;
 
 type
   // Create a record of temperature stats
   TStat = record
   var
-    min: single;
-    max: single;
-    sum: single;
-    count: word;
+    min: int64; // Borrowed the concept from go's approach to improve performance, save floats as int64
+    max: int64; // This saved ~2 mins processing time.
+    sum: int64;
+    cnt: int64;
+  private
+    function RoundEx(x: double): double;     // Borrowed from the baseline program
+    function PascalRound(x: double): double; // Borrowed from the baseline program
   public
-    constructor Create(newMin: single;
-                       newMax: single;
-                       newSum: single;
-                       newCount: word);
+    constructor Create(const newMin: int64; const newMax: int64;
+      const newSum: int64; const newCount: int64);
     function ToString: string;
+
   end;
 
 type
   // Create a dictionary
   TWeatherDictionary = specialize TDictionary<string, TStat>;
 
+// The main algorithm to process the temp measurements from various weather station
+procedure ProcessTempMeasurements(const filename: string);
 
-{// A helper function to add a city temperature into the TWeatherDictionary
-procedure AddCityTemperature(cityName: string;
-                             newTemp: single;
-                             var weatherDictionary: TWeatherDictionary);
-}
+implementation
 
-// The main algorithm to process the temp measurements from various weather station
-procedure ProcessTempMeasurements(filename: string);
+function TStat.RoundEx(x: double): double;
+begin
+  Result := PascalRound(x * 10.0) / 10.0;
+end;
 
+function TStat.PascalRound(x: double): double;
+var
+  t: double;
+begin
+  //round towards positive infinity
+  t := Trunc(x);
+  if (x < 0.0) and (t - x = 0.5) then
+  begin
+    // Do nothing
+  end
+  else if Abs(x - t) >= 0.5 then
+  begin
+    t := t + Math.Sign(x);
+  end;
 
-implementation
+  if t = 0.0 then
+    Result := 0.0
+  else
+    Result := t;
+end;
 
-constructor TStat.Create(newMin: single;
-                         newMax: single;
-                         newSum: single;
-                         newCount: word);
+constructor TStat.Create(const newMin: int64; const newMax: int64;
+  const newSum: int64; const newCount: int64);
 begin
   self.min := newMin;
   self.max := newMax;
   self.sum := newSum;
-  self.count := newCount;
+  self.cnt := newCount;
 end;
 
 function TStat.ToString: string;
+var
+  minR, meanR, maxR: double; // Store the rounded values prior saving to TStringList.
 begin
-  {$IFDEF DEBUG}
-    Result := Format('Min: %.1f; Mean: %.1f; Maxp: %.1f; Sum: %.1f; Count %d',
-      [self.min, (self.sum / self.Count), self.max,
-      self.sum, self.Count]);
-  {$ENDIF DEBUG}
-  // Result := Format('%.1f/%.1f/%.1f', [self.min, (self.sum / self.count), self.max]);
-  Result := FormatFloat('0.0', self.min) + '/' + FormatFloat('0.0', (self.sum/self.count)) + '/' + FormatFloat('0.0', self.max)
-
+  minR := RoundEx(self.min / 10);
+  maxR := RoundEx(self.max / 10);
+  meanR := RoundEx(self.sum / self.cnt / 10);
+  Result := FormatFloat('0.0', minR) + '/' + FormatFloat('0.0', meanR) +
+    '/' + FormatFloat('0.0', maxR);
 end;
 
 {
@@ -78,10 +95,11 @@ function TStat.ToString: string;
   The following procedure Written by Székely Balázs for the 1BRC for Object Pascal.
   URL: https://github.com/gcarreno/1brc-ObjectPascal/tree/main
 }
-function CustomTStringListComparer(AList: TStringList; AIndex1, AIndex2: Integer): Integer;
+function CustomTStringListComparer(AList: TStringList;
+  AIndex1, AIndex2: integer): integer;
 var
-  Pos1, Pos2: Integer;
-  Str1, Str2: String;
+  Pos1, Pos2: integer;
+  Str1, Str2: string;
 begin
   Result := 0;
   Str1 := AList.Strings[AIndex1];
@@ -92,24 +110,19 @@ function CustomTStringListComparer(AList: TStringList; AIndex1, AIndex2: Integer
   begin
     Str1 := Copy(Str1, 1, Pos1 - 1);
     Str2 := Copy(Str2, 1, Pos2 - 1);
-    Result :=  CompareStr(Str1, Str2);
+    Result := CompareStr(Str1, Str2);
   end;
 end;
 
-procedure AddCityTemperature(cityName: string;
-                             newTemp: single;
-                             var weatherDictionary: TWeatherDictionary);
+
+procedure AddCityTemperature(const cityName: string; const newTemp: int64;
+  var weatherDictionary: TWeatherDictionary);
 var
   stat: TStat;
 begin
-  // If city name exists, modify temp as needed
+  // If city name esxists, modify temp as needed
   if weatherDictionary.ContainsKey(cityName) then
   begin
-
-    {$IFDEF DEBUG}
-    WriteLn('City found: ', cityName);
-    {$ENDIF DEBUG}
-
     // Get the temp record
     stat := weatherDictionary[cityName];
 
@@ -123,7 +136,7 @@ procedure AddCityTemperature(cityName: string;
     stat.sum := stat.sum + newTemp;
 
     // Increase the counter
-    stat.Count := stat.Count + 1;
+    stat.cnt := stat.cnt + 1;
 
     // Update the stat of this city
     weatherDictionary.AddOrSetValue(cityName, stat);
@@ -133,27 +146,20 @@ procedure AddCityTemperature(cityName: string;
   if not weatherDictionary.ContainsKey(cityName) then
   begin
     weatherDictionary.Add(cityName, TStat.Create(newTemp, newTemp, newTemp, 1));
-    {$IFDEF DEBUG}
-    WriteLn('Added: ', cityName);
-    {$ENDIF DEBUG}
   end;
 end;
 
-procedure ProcessTempMeasurements(filename: string);
+procedure ProcessTempMeasurements(const filename: string);
 var
   wd: TWeatherDictionary;
-  line, ws: string;
-  lineSeparated: array of string;
+  line, ws, strTemp: string;
   weatherStationList: TStringList;
   textFile: System.TextFile;
-  isFirstKey: boolean = True;
+  delimiterPos, valCode: integer;
+  intTemp: int64;
+  index: integer;
 begin
 
-  // Start a timer
-  {$IFDEF DEBUG}
-  Stopwatch.StartTimer;
-  {$ENDIF}
-
   // Create a city - weather dictionary
   wd := TWeatherDictionary.Create;
   weatherStationList := TStringList.Create;
@@ -167,18 +173,36 @@ procedure ProcessTempMeasurements(filename: string);
       // Open the file for reading
       Reset(textFile);
 
+      {$IFDEF DEBUG}
+      // Start a timer
+      Stopwatch.StartTimer;
+      {$ENDIF}
+
       // Keep reading lines until the end of the file is reached
       while not EOF(textFile) do
       begin
         // Read a line
         ReadLn(textFile, line);
-        // If the line start with #, then continue/skip.
-        if (line[1] = '#') then continue;
-
-        // Else, add an entry into the dictionary.
-        lineSeparated := line.Split([';']);
-        AddCityTemperature(lineSeparated[0], StrToFloat(lineSeparated[1]), wd);
 
+        // Get position of the delimiter
+        delimiterPos := Pos(';', line);
+        if delimiterPos > 0 then
+        begin
+          // Get the weather station name
+          // Using Copy and POS - as suggested by Gemini AI.
+          // This part saves 3 mins faster when processing 1 billion rows.
+          ws := Copy(line, 1, delimiterPos - 1);
+
+          // Get the temperature recorded, as string, remove '.' from string float
+          // because we want to save it as int64.
+          strTemp := Copy(line, delimiterPos + 1, Length(line));
+          strTemp := StringReplace(strTemp, '.', '', [rfReplaceAll]);
+
+          // Add the weather station and the recorded temp (as int64) in the TDictionary
+          Val(strTemp, intTemp, valCode);
+          if valCode <> 0 then Continue;
+          AddCityTemperature(ws, intTemp, wd);
+        end;
       end; // end while loop reading line at a time
 
       // Close the file
@@ -189,45 +213,52 @@ procedure ProcessTempMeasurements(filename: string);
         WriteLn('File handling error occurred. Details: ', E.Message);
     end; // End of file reading ////////////////////////////////////////////////
 
+    {$IFDEF DEBUG}
+    Stopwatch.StopTimer;
+    WriteLn('Finished reading and updating dictionary');
+    Stopwatch.DisplayTimer;
+    {$ENDIF}
+
     // Format and sort weather station by name and temp stat ///////////////////
+    {$IFDEF DEBUG}
+    Stopwatch.StartTimer;
+    {$ENDIF}
+    ws := '';
     for ws in wd.Keys do
     begin
-      weatherStationList.Add(ws + '=' + wd[ws].ToString);
+      weatherStationList.Add(ws + '=' + wd[ws].ToString + ', ');
     end;
     weatherStationList.CustomSort(@CustomTStringListComparer);
 
-    // Print TStringList - sorted by weather station and temp stat /////////////
-    Write('{');
-    for ws in weatherStationList do
-    begin
-      // If it's not the first key, print a comma
-      if not isFirstKey then
-        Write(', ');
-
-      // Print the weather station and the temp stat
-      Write(ws);
-
-      // Set isFirstKey to False after printing the first key
-      isFirstKey := False;
-    end;
+    {$IFDEF DEBUG}
+    Stopwatch.StopTimer;
+    WriteLn('Finished creating TStringList and sorted it');
+    Stopwatch.DisplayTimer;
+    {$ENDIF}
 
-    WriteLn('}');
+    // Print TStringList - sorted by weather station and temp stat /////////////
+    {$IFDEF DEBUG}
+    Stopwatch.StartTimer;
+    {$ENDIF}
+    strTemp := '';
+    // Print the weather station and the temp stat
+    for index := 0 to weatherStationList.Count - 1 do
+      strTemp := strTemp + weatherStationList[index];
+    // Remove last comma and space; ', ', a neat trick from Gus.
+    SetLength(strTemp, Length(strTemp) - 2);
+    WriteLn('{', strTemp, '}');
 
     {$IFDEF DEBUG}
-    WriteLn('DEBUG mode on');
-    {$ENDIF DEBUG}
+    Stopwatch.StopTimer;
+    WriteLn('Finished printing the sorted weather station and temperatures');
+    Stopwatch.DisplayTimer;
+    {$ENDIF}
 
   finally
     weatherStationList.Free;
     wd.Free;
   end; // End of processing TDictionary and TStringList
 
-  // Stop a timer
-  {$IFDEF DEBUG}
-  Stopwatch.StopTimer;
-  Stopwatch.DisplayTimer;
-  {$ENDIF}
-
 end;
 
 end.