tracks/delphi/exercises/clock/uClockExample.pas in trackler-2.1.0.6 vs tracks/delphi/exercises/clock/uClockExample.pas in trackler-2.1.0.7

- old
+ new

@@ -10,12 +10,12 @@ hours: integer; minutes: integer; public constructor SetHands(aHours: integer; aMinutes: integer=0); function Add(minutesToAdd: integer): Clock; - function Subtract(minutesToSubtract: integer): Clock; function ToString: string; + function Equal(aClock: Clock): Boolean; End; implementation uses SysUtils, math; @@ -28,17 +28,17 @@ function Clock.Add(minutesToAdd: Integer): Clock; begin result := Clock.SetHands(hours, minutes + minutesToAdd); end; -function Clock.Subtract(minutesToSubtract: Integer): Clock; +function Clock.ToString: string; begin - result := Clock.SetHands(hours, minutes - minutesToSubtract); + result := format('%.2d:%.2d',[hours, minutes]); end; -function Clock.ToString: string; +function Clock.Equal(aClock: Clock): Boolean; begin - result := format('%.2d:%.2d',[hours, minutes]); + result := (aClock.hours = hours) and (aClock.minutes = minutes); end; class function Clock.fltMod(x, y: double): integer; var intX, intY: integer; tmpFloat: double;