refactor: New version + score from Székely Balázs

Author: gcarreno

README.md

@@ -73,23 +73,18 @@ Submit your implementation and become part of the leader board!
 ## Results
 
 These are the results from running all entries into the challenge on my personal computer:
+- Ubuntu 23.10 64b
 - Ryzen 9 5950x 16 cores
 - 32GB RAM
 - 250GB SSD
 - 1TB HDD
 
 | # | Result (m:s.ms): SSD | Result (m:s.ms): HDD | Submitter     | Notes     | Certificates |
 |---|----------------------|----------------------|---------------|-----------|--------------|
-| 1 | 1:4.925 | 2:29.476 | Székely Balázs aka GetMem | Using 16 threads | |
+| 1 | 0:29.212 | 2:2.504 | Székely Balázs | Using 16 threads | |
 
 ## Evaluating Results
 
-Results are determined by running the program on:
-- Ryzen 9 5950x 16 core
-- 32GB RAM
-- 250GB SSD
-- 1TB HDD
-
 Each contender is run 10 times in a row for both `SSD` and `HDD` using `hyperfine` for the time taking.
 The mean value of the 10 runs is the result for that contender and will be added to the results table above.
 The exact same `measurements.txt` file is used for evaluating all contenders.

entries/sbalazs/src/uweatherstations.pas

@@ -5,7 +5,7 @@
 interface
 
 uses
-  Classes, SysUtils, syncobjs, contnrs;
+  Classes, SysUtils, Math, syncobjs, contnrs;
 
 type
   TWSManager = class;
@@ -62,7 +62,7 @@   TWSThread = class(TWSThreadBase)
     FMS: TMemoryStream;
     procedure ProcessBuffer(ABuffer: String);
     procedure UpdateMainHashList;
-    procedure AddToHashList(AStation, ATemp: String);
+    procedure AddToHashList(AStation, ATemp: String); inline;
     procedure UpdateThreadList(AUpdateType: TUpdateType);
   protected
     procedure Execute; override;
@@ -155,6 +155,8 @@ function TWSThreadBase.GetLeftOver(AST: TStream): String;
   ReadCnt: LongInt;
 begin
   Result := '';
+  if AST.Position = AST.Size then
+    Exit;
   Len := 100 div SizeOf(Char);
   SetLength(Result, Len);
   ReadCnt := AST.Read(Pointer(Result)^, Len);
@@ -166,7 +168,6 @@ function TWSThreadBase.GetLeftOver(AST: TStream): String;
     begin
       Result := Copy(Result, 1, P - 1);
       AST.Position := AST.Position + Length(Result)*SizeOf(Char);
-      Result := Result + sLineBreak + ' ';
     end;
   end;
 end;
@@ -257,17 +258,16 @@ procedure TWSThread.UpdateMainHashList;
     else
     begin
       WSAll := FWSManager.FHashListAll.Items[Index];
-      if WS^.FMin < WSAll^.FMin then
-        WSAll^.FMin := WS^.FMin;
-      if WS^.FMax > WSALL^.FMax then
-        WSAll^.FMax := WS^.FMax;
+      WSAll^.FMin := Min(WSALL^.FMin, WS^.FMin);
+      WSAll^.FMax := Max(WSAll^.FMax, WS^.FMax);
       WSAll^.FTot := WSAll^.FTot + WS^.FTot;
       WSAll^.FCnt := WSAll^.FCnt + WS^.FCnt;
     end;
   end;
 end;
 
 procedure TWSThread.UpdateThreadList(AUpdateType: TUpdateType);
+
 begin
   while (not Terminated) do
   begin
@@ -297,13 +297,14 @@ procedure TWSThread.AddToHashList(AStation, ATemp: String);
   WS: PWS;
   Index: Integer;
   Temp: Single;
+ Code: Integer;
 begin
   Index := FHashList.FindIndexOf(AStation);
   if Index = -1 then
   begin
-    ATemp := ATemp + '000000001';
-    if not TryStrToFloat(ATemp, Temp) then
-      Exit;
+    Val(ATemp, Temp, Code);
+    if Code <> 0 then Exit;
+
     New(WS);
     WS^.FName := AStation;
     WS^.FMin := Temp;
@@ -314,64 +315,60 @@ procedure TWSThread.AddToHashList(AStation, ATemp: String);
   end
   else
   begin
-    if not TryStrToFloat(ATemp, Temp) then
-      Exit;
+    Val(ATemp, Temp, Code);
+    if Code <> 0 then Exit;
+
     WS := FHashList.Items[Index];
-    if Temp < WS^.FMin then
-      WS^.FMin := Temp;
-    if Temp > WS^.FMax then
-      WS^.FMax := Temp;
+    WS^.FMin := Min(WS^.FMin, Temp);
+    WS^.FMax := Max(WS^.FMax, Temp);
     WS^.FTot := WS^.FTot + Temp;
     WS^.FCnt := WS^.FCnt + 1;
   end;
 end;
 
 procedure TWSThread.ProcessBuffer(ABuffer: String);
 var
-  SL: TStringList;
+  P: Integer;
+  PDel, PEnd: Integer;
   Str: String;
-  P, I: Integer;
   Station: String;
   Temp: String;
 begin
-  SL := TStringList.Create;
-  try
-    SL.DefaultEncoding := TEncoding.UTF8;
-    SL.BeginUpdate;
-    SL.Text := ABuffer;
-    for I := 0 to SL.Count - 1 do
-    begin
-      Str := SL.Strings[I];
-      P := Pos(';', Str);
-      if P > 0 then
-      begin
-        Station := Copy(Str, 1, P - 1);
-        Temp := Copy(Str, P + 1, Length(Str));
-        AddToHashList(Trim(Station), Trim(Temp));
-      end;
-    end;
-    SL.EndUpdate;
-  finally
-    SL.Free;
-  end;
+  Str := StringReplace(ABuffer, sLineBreak, ':', [rfReplaceAll]);
+  if Str[1] = ':' then
+    Delete(Str, 1, 1);
+  P := 1;
+  repeat
+    PDel := Pos(';', Str, P);
+    PEnd := Pos(':', Str, P);
+    if PEnd = 0 then
+      PEnd := Length(Str);
+    Station := Copy(Str, P, PDel - P);
+    Temp := Copy(Str, PDel + 1, PEnd - PDel - 1);
+    if (Station <> '') and (Temp <> '') then
+      AddToHashList(Station, Temp);
+    P := PEnd + 1;
+  until (PDel = 0) or (PEnd = 0);
 end;
 
 procedure TWSThread.Execute;
-const
-  BufferSize =  1048576;
 var
   Buffer: string;
   ReadCnt: LongInt;
+  BufferSize: Int64;
 begin
   UpdateThreadList(utAdd);
   try
     FMS.Write(Pointer(FStr)^, Length(FStr) div SizeOf(Char));
     FMS.Position := 0;
     FStr := '';
+    BufferSize := 1048576;
     repeat
        if Terminated then
          Break;
        Buffer := '';
+       if BufferSize > FMS.Size - FMS.Position then
+         BufferSize := FMS.Size - FMS.Position;
        SetLength(Buffer, BufferSize div SizeOf(Char));
        ReadCnt := FMS.Read(Pointer(Buffer)^, BufferSize div SizeOf(Char));
        if (ReadCnt > 0) then
@@ -407,7 +404,7 @@ function Compare(List: TStringList; Index1, Index2: Integer): Integer;
   begin
     Str1 := Copy(Str1, 1, P1 - 1);
     Str2 := Copy(Str2, 1, P2 - 1);
-    Result :=  CompareText(Str1, Str2);
+    Result := CompareStr(Str1, Str2);
   end;
 end;
 
@@ -423,18 +420,18 @@ procedure TWSThreadsWatcher.CreateFinalList;
   try
     SL.DefaultEncoding := TEncoding.UTF8;
     SL.BeginUpdate;
-    SL.CustomSort(@Compare);
     for I := 0 to FWSManager.FHashListAll.Count - 1 do
     begin
       WS := FWSManager.FHashListAll.Items[I];
+      if Trim(WS^.FName) = '' then
+        Continue;
+      WS^.FTot := Round(WS^.FTot*10)/10;
       WS^.FMean := WS^.FTot/WS^.FCnt;
-      WS^.FMean := Round(WS^.FMean*1000)/1000;
       Str := WS^.FName + '=' + FormatFloat('0.0', WS^.FMin) + '/' + FormatFloat('0.0', WS^.FMean) + '/' + FormatFloat('0.0', WS^.FMax) + ',';
       SL.Add(Str);
     end;
-    SL.SortStyle := sslUser;
-    SL.Sorted := True;
     SL.EndUpdate;
+    SL.CustomSort(@Compare);
     Str := SL.Text;
   finally
     SL.Free;
@@ -477,6 +474,7 @@ procedure TWSThreadsWatcher.Execute;
       ReadCnt := FS.Read(Pointer(Buffer)^, BufferSize div SizeOf(Char));
       if (ReadCnt > 0) then
       begin
+        if Terminated then Break;
         Buffer := Buffer + GetLeftOver(FS);
         WSThread := TWSThread.Create(Buffer, FWSManager);
         WSThread.Start;