fix: Rounding to positive infinity by sbalazs

Author: gcarreno

baseline/Common/baseline.common.pas

@@ -33,9 +33,10 @@   TBaseline = class(TObject)
     FInputFile: String;
     FStationNames: TStringList;
     FHashStationList: TFPHashList;
-
     procedure AddToHashList(AStation: String; ATemp: Int64);
     procedure BuildHashList;
+    function RoundEx(x: Double): Double;
+    function PascalRound(x: Double): Double;
   protected
   public
     constructor Create(AInputFile: String);
@@ -182,6 +183,32 @@ procedure TBaseline.BuildHashList;
   end;
 end;
 
+function TBaseline.RoundEx(x: Double): Double;
+begin
+  Result := PascalRound(x*10.0)/10.0;
+end;
+
+function TBaseline.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;
+
+  if t = 0.0 then
+    Result := 0.0
+  else
+    Result := t;
+end;
+
 procedure TBaseline.Generate;
 var
   index: Integer;
@@ -199,9 +226,9 @@ procedure TBaseline.Generate;
   for index := 0 to FHashStationList.Count - 1 do
   begin
     weatherStation := FHashStationList.Items[index];
-    Min := weatherStation^.FMin/10;
-    Max := weatherStation^.FMax/10;
-    Mean := weatherStation^.FTot/weatherStation^.FCnt/10;
+    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;

entries/sbalazs/src/uweatherstations.pas

@@ -84,6 +84,8 @@   TWSThread = class(TWSThreadBase)
 
   TWSThreadsWatcher = class(TWSThreadBase)
   private
+    function RoundEx(x: Double): Double;
+    function PascalRound(x: Double): Double;
     procedure CreateFinalList;
   protected
     procedure Execute; override;
@@ -493,6 +495,32 @@ function Compare(List: TStringList; Index1, Index2: Integer): Integer;
   end;
 end;
 
+function TWSThreadsWatcher.RoundEx(x: Double): Double;
+begin
+  Result := PascalRound(x*10.0)/10.0;
+end;
+
+function TWSThreadsWatcher.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;
+
+  if t = 0.0 then
+    Result := 0.0
+  else
+    Result := t;
+end;
+
 procedure TWSThreadsWatcher.CreateFinalList;
 var
   I: Integer;
@@ -516,9 +544,9 @@ procedure TWSThreadsWatcher.CreateFinalList;
         Continue;
       SetString(Name, Pointer(@WS.FStation[0]), Length(WS.FStation));
       SetCodePage(Name, CP_UTF8, True);
-      Min := WS.FData.FMin/10;
-      Max := WS.FData.FMax/10;
-      Mean := WS.FData.FTot/WS.FData.FCnt/10;
+      Min := RoundEx(WS.FData.FMin/10);
+      Max := RoundEx(WS.FData.FMax/10);
+      Mean := RoundEx(WS.FData.FTot/WS.FData.FCnt/10);
       Str := Name + '=' + FormatFloat('0.0', Min) + '/' + FormatFloat('0.0', Mean) + '/' + FormatFloat('0.0', Max) + ',';
       SL.Add(Str);
     end;