File tree Expand file tree Collapse file tree 2 files changed +7
-6
lines changed
Expand file tree Collapse file tree 2 files changed +7
-6
lines changed Original file line number Diff line number Diff line change @@ -157,7 +157,7 @@ constructor TWeatherCity.Create(const NewCityName: string; const NewTemp: Intege
157157
158158function TWeatherCity.Mean : Double;
159159begin
160- Result := ChallengeCommon.PascalRound (TotalTemp / DataCount);
160+ Result := Ceil (TotalTemp / DataCount) / 10.0 ;
161161end ;
162162
163163function TWeatherCity.OutputSumLine (const FirstOutput: Boolean): string;
Original file line number Diff line number Diff line change @@ -46,6 +46,7 @@ implementation
4646{ $R *.dfm}
4747
4848uses
49+ System.Math,
4950 uChallengeCommon;
5051
5152procedure ChallengeWithFireDAC ;
@@ -55,13 +56,13 @@ procedure ChallengeWithFireDAC;
5556
5657 function OutputLine : string;
5758 begin
58- var MeanTemp := ChallengeCommon.PascalRound (dmChallengeWithFireDAC.qryCityTempsSumTemp.AsFloat /
59- dmChallengeWithFireDAC.qryCityTempsTempCount.AsFloat);
59+ var MeanTemp := Ceil (dmChallengeWithFireDAC.qryCityTempsSumTemp.AsFloat /
60+ dmChallengeWithFireDAC.qryCityTempsTempCount.AsFloat / 10.0 );
6061 Result := Format(' %s=%0.1f/%0.1f/%0.1f' ,
6162 [dmChallengeWithFireDAC.qryCityTempsCityName.AsString,
62- dmChallengeWithFireDAC.qryCityTempsMinTemp.AsFloat,
63- MeanTemp,
64- dmChallengeWithFireDAC.qryCityTempsMaxTemp.AsFloat]);
63+ dmChallengeWithFireDAC.qryCityTempsMinTemp.AsFloat / 10.0 ,
64+ MeanTemp / 10.0 ,
65+ dmChallengeWithFireDAC.qryCityTempsMaxTemp.AsFloat / 10.0 ]);
6566 Inc(TotalOutput);
6667 end ;
6768
You can’t perform that action at this time.
0 commit comments