chore: DCornelius:Baseline.Common.RoundExDouble

Author: gcarreno

baseline/Common/baseline.common.pas

@@ -7,8 +7,7 @@
 interface
 
 uses
-  Classes
-, SysUtils
+ System.SysUtils
 ;
 
 function RoundExDouble(const ATemp: Double): Double;

entries/dcornelius/src/dcornelius.dproj

@@ -86,6 +86,12 @@
         <CfgParent>Base</CfgParent>
         <Base>true</Base>
     </PropertyGroup>
+    <PropertyGroup Condition="('$(Platform)'=='Linux64' and '$(Cfg_2)'=='true') or '$(Cfg_2_Linux64)'!=''">
+        <Cfg_2_Linux64>true</Cfg_2_Linux64>
+        <CfgParent>Cfg_2</CfgParent>
+        <Cfg_2>true</Cfg_2>
+        <Base>true</Base>
+    </PropertyGroup>
     <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
         <Cfg_2_Win32>true</Cfg_2_Win32>
         <CfgParent>Cfg_2</CfgParent>
@@ -240,11 +246,16 @@
         <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
         <DCC_DebugInformation>0</DCC_DebugInformation>
     </PropertyGroup>
+    <PropertyGroup Condition="'$(Cfg_2_Linux64)'!=''">
+        <DCC_UnitSearchPath>..\..\..\baseline\Common;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+    </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
         <VerInfo_Locale>1033</VerInfo_Locale>
+        <DCC_UnitSearchPath>..\..\..\baseline\Common;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
         <VerInfo_Locale>1033</VerInfo_Locale>
+        <DCC_UnitSearchPath>..\..\..\baseline\Common;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">

entries/dcornelius/src/uChallengeCommon.pas

@@ -33,7 +33,6 @@   TChallengeCommon = class
   public
     constructor Create(const NewInputFilename: string);
     procedure ReadAndParseAllData(WeatherCityProcessor: TWeatherCityProc);
-    function PascalRound(x: Double): Double;
     function SplitCityTemp(const StationLine: string; var CityName: string; var CityTemp: Integer): Boolean;
     property InputFilename: string read FInputFilename write FInputFilename;
   end;
@@ -48,7 +47,8 @@ implementation
   {$IFDEF DEBUG}
   System.Diagnostics,
   {$ENDIF }
-  System.Math;
+  System.Math,
+  Baseline.Common;
 
 { TChallengeCommon }
 
@@ -62,20 +62,6 @@ constructor TChallengeCommon.Create(const NewInputFilename: string);
     raise EFileNotFoundException.Create(NewInputFilename + ' not found.');
 end;
 
-function TChallengeCommon.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
-    Result := t
-  else if Abs(x - t) >= 0.5 then
-    Result := t + Sign(x)
-  else
-    Result := x;
-end;
-
 procedure TChallengeCommon.ReadAndParseAllData(WeatherCityProcessor: TWeatherCityProc);
 var
   StreamReader: TStreamReader;
@@ -166,7 +152,7 @@ constructor TWeatherCity.Create(const NewCityName: string; const NewTemp: Intege
 
 function TWeatherCity.Mean: Double;
 begin
-  Result := ChallengeCommon.PascalRound(TotalTemp / DataCount);
+  Result := RoundExDouble(TotalTemp / DataCount);
 end;
 
 function TWeatherCity.OutputSumLine: string;

entries/dcornelius/src/udmChallengeWithFireDAC.pas

@@ -18,7 +18,7 @@ interface
   FireDAC.DatS, FireDAC.Phys.Intf, FireDAC.DApt.Intf, Data.DB, FireDAC.Comp.DataSet, FireDAC.Comp.Client,
   FireDAC.Stan.ExprFuncs, FireDAC.Phys.SQLiteWrapper.Stat, FireDAC.Phys.SQLiteDef, FireDAC.UI.Intf, FireDAC.Stan.Def,
   FireDAC.Stan.Pool, FireDAC.Stan.Async, FireDAC.Phys, FireDAC.Phys.SQLite, FireDAC.ConsoleUI.Wait,
-  FireDAC.Phys.SQLiteVDataSet, FireDAC.DApt;
+  FireDAC.Phys.SQLiteVDataSet, FireDAC.DApt, Baseline.Common;
 
 type
   TdmChallengeWithFireDAC = class(TDataModule)
@@ -55,7 +55,7 @@ procedure ChallengeWithFireDAC;
 
   function OutputLine: string;
   begin
-    var MeanTemp := ChallengeCommon.PascalRound(dmChallengeWithFireDAC.qryCityTempsSumTemp.AsFloat /
+    var MeanTemp := RoundExDouble(dmChallengeWithFireDAC.qryCityTempsSumTemp.AsFloat /
                                                 dmChallengeWithFireDAC.qryCityTempsTempCount.AsFloat);
     Result := Format('%s=%0.1f/%0.1f/%0.1f',
                        [dmChallengeWithFireDAC.qryCityTempsCityName.AsString,