Changeset 4 for trunk

Timestamp:

Sep 12, 2023, 10:52:25 PM (15 months ago)

Author:

chronos

Message:

• Modified: Show cars distinguished by name and engine type.

Location:

trunk

Files:

• Car.pas (modified) (20 diffs)
• PrefixMultiplier.pas (modified) (1 diff)

trunk/Car.pas

@@ -17 +17 @@
   TCar = class
     Name: string;
+    EngineType: TEngineType;
     Rents: TRents;
-    EngineType: TEngineType;
     constructor Create;
     destructor Destroy; override;
@@ -29 +29 @@
     function AddNew(Name: string): TCar;
     function SearchByName(Name: string): TCar;
+    function SearchByNameEngine(Name: string; EngineType: TEngineType): TCar;
   end;
 
@@ -48 +49 @@
     Consumption: Double;
     Odometer: Integer;
+    procedure Assign(Source: TRent);
     function GetEmission: Double;
     function GetFuel: Double;
@@ -85 +87 @@
     FOnLog: TLogEvent;
     procedure Log(Text: string);
+    procedure SaveAndFreeCar(var CarName: string; var EngineType: TEngineType;
+      var CompanyName: string; var Distance: Double; var Odometer: Integer;
+      var Price: double; var PriceWithFuel: double; var RentTime: TDateTime;
+      var Consumption: double);
   public
     Cars: TCars;
@@ -260 +266 @@
 { TRent }
 
+procedure TRent.Assign(Source: TRent);
+begin
+  Time := Source.Time;
+  Price := Source.Price;
+  PriceWithFuel := Source.PriceWithFuel;
+  Distance := Source.Distance;
+  Consumption := Source.Consumption;
+  Odometer := Source.Odometer;
+end;
+
 function TRent.GetEmission: Double;
 begin
@@ -342 +358 @@
 end;
 
+function TCars.SearchByNameEngine(Name: string; EngineType: TEngineType): TCar;
+var
+  I: Integer;
+begin
+  I := 0;
+  while (I < Count) and ((Items[I].Name <> Name) or
+    (Items[I].EngineType <> EngineType)) do Inc(I);
+  if I < Count then Result := Items[I]
+    else Result := nil;
+end;
+
 { TSummary }
 
@@ -364 +391 @@
   Lines: TStringList;
   Line: string;
-  Car: TCar;
-  Company: TCompany;
-  Rent: TRent;
-  Name: string;
   CarComparer: TCarComparer;
   ValueDouble: Double;
@@ -374 +397 @@
   Part: string;
   Odometer: Integer;
+  ValueInteger: Integer;
   InBetween: string;
   LeftIndex: Integer;
   RightIndex: Integer;
+  CarName: string;
+  EngineType: TEngineType;
+  CompanyName: string;
+  Distance: double;
+  Price: double;
+  PriceWithFuel: double;
+  RentTime: TDateTime;
+  Consumption: double;
 const
   DistanceText = '* Vzdálenost:';
@@ -399 +431 @@
     Line := Lines[I];
     if Pos('==', Line) > 0 then begin
-      Name := Trim(Line, '=');
-      Car := Cars.SearchByName(Name);
-      if not Assigned(Car) then Car := Cars.AddNew(Name);
-      Rent := Rents.AddNew;
-      Rent.Car := Car;
-      Car.Rents.Add(Rent);
+      SaveAndFreeCar(CarName, EngineType, CompanyName, Distance, Odometer, Price,
+        PriceWithFuel, RentTime, Consumption);
+      CarName := Trim(Line, '=');
     end else
     if Line.StartsWith(DistanceText) then begin
@@ -413 +442 @@
         InBetween := Copy(Line, LeftIndex + 1, RightIndex - LeftIndex - 1);
         if Pos('-', InBetween) > 0 then InBetween := Copy(InBetween, Pos('-', InBetween) + 1, MaxInt);
-        if TryStrToInt(Trim(InBetween), Odometer) then
-          Rent.Odometer := Odometer;
+        if TryStrToInt(Trim(InBetween), ValueInteger) then
+          Odometer := ValueInteger;
         Line := Copy(Line, 1, LeftIndex - 1) + Copy(Line, RightIndex + 1, MaxInt);
       end;
@@ -420 +449 @@
         Line := Trim(Copy(Line, 1, Pos(DistanceUnit, Line) - 1));
       if TryStrToFloat(Line, ValueDouble) then begin
-        Rent.Distance := ValueDouble;
+        Distance := ValueDouble;
       end else begin
         Log('Špatná vzdálenost ' + Line);
@@ -426 +455 @@
     end else
     if Line.StartsWith(BrandText) then begin
-      Line := Copy(Line, Length(BrandText) + 1, MaxInt);
-      if Pos('diesel', Line) > 0 then
-        Car.EngineType := etDiesel;
+      Line := LowerCase(Copy(Line, Length(BrandText) + 1, MaxInt));
+      if Line.Contains('diesel') then EngineType := etDiesel
+      else if Line.Contains('lpg') then EngineType := etLpg
+      else if Line.Contains('kwh') then EngineType := etElectric;
     end else
     if Line.StartsWith(PriceText) then begin
@@ -435 +465 @@
         Line := Trim(Copy(Line, 1, Pos(PriceUnit, Line) - 1));
       if TryStrToFloat(Line, ValueDouble) then begin
-        Rent.Price := ValueDouble;
+        Price := ValueDouble;
       end else begin
         Log('Špatná cena ' + Line);
@@ -445 +475 @@
         Line := Trim(Copy(Line, 1, Pos(PriceUnit, Line) - 1));
       if TryStrToFloat(Line, ValueDouble) then begin
-        Rent.PriceWithFuel := ValueDouble;
+        PriceWithFuel := ValueDouble;
       end else begin
         Log('Špatná cena včetně paliva ' + Line);
@@ -455 +485 @@
         Line := Trim(Copy(Line, 1, Pos(PriceUnit, Line) - 1));
       if TryStrToFloat(Line, ValueDouble) then begin
-        Rent.PriceWithFuel := ValueDouble;
+        PriceWithFuel := ValueDouble;
       end else begin
         Log('Špatný cena včetně energie ' + Line);
@@ -463 +493 @@
       Line := Trim(Copy(Line, Length(DateText) + 1, MaxInt));
       if TryStrToDate(Line, ValueDate) then begin
-        Rent.Time := ValueDate;
+        RentTime := ValueDate;
       end else begin
         Log('Špatný datum ' + Line);
@@ -472 +502 @@
       if Pos(ConsumptionUnit, Line) > 0 then begin
         Line := Trim(Copy(Line, 1, Pos(ConsumptionUnit, Line) - 1));
-        if Car.EngineType = etNone then
-          Car.EngineType := etPetrol;
+        if EngineType = etNone then
+          EngineType := etPetrol;
         if TryStrToFloat(Line, ValueDouble) then
-          Rent.Consumption := ValueDouble;
+          Consumption := ValueDouble;
       end;
       if Pos(ConsumptionUnitElectric, Line) > 0 then begin
         Line := Trim(Copy(Line, 1, Pos(ConsumptionUnitElectric, Line) - 1));
-        if Car.EngineType = etNone then
-          Car.EngineType := etElectric;
+        if EngineType = etNone then
+          EngineType := etElectric;
         if TryStrToFloat(Line, ValueDouble) then
-          Rent.Consumption := ValueDouble;
+          Consumption := ValueDouble;
       end;
       if Pos(ConsumptionUnitCng, Line) > 0 then begin
         Line := Trim(Copy(Line, 1, Pos(ConsumptionUnitCng, Line) - 1));
-        if Car.EngineType = etNone then
-          Car.EngineType := etCng;
+        if EngineType = etNone then
+          EngineType := etCng;
         if TryStrToFloat(Line, ValueDouble) then
-          Rent.Consumption := ValueDouble * 1000;
+          Consumption := ValueDouble * 1000;
       end;
     end else
     if Line.StartsWith(CompanyText) then begin
-      Line := Trim(Copy(Line, Length(CompanyText) + 1, MaxInt));
-      Company := Companies.SearchByName(Line);
-      if not Assigned(Company) then
-        Company := Companies.AddNew(Line);
-      Company.Rents.Add(Rent);
-      Rent.Company := Company;
+      CompanyName := Trim(Copy(Line, Length(CompanyText) + 1, MaxInt));
     end else
     if Line.StartsWith(TableLineStartText) then begin
@@ -505 +530 @@
         Part := Parts[4];
         Part := Trim(Part);
-        if TryStrToInt(Part, Odometer) and (Rent.Odometer = 0) then
-          Rent.Odometer := Odometer;
+        if TryStrToInt(Part, Odometer) and (Odometer = 0) then
+          Odometer := Odometer;
       end;
     end else begin
@@ -512 +537 @@
     end;
   end;
+  SaveAndFreeCar(CarName, EngineType, CompanyName, Distance, Odometer, Price,
+    PriceWithFuel, RentTime, Consumption);
   Lines.Free;
   CarComparer := TCarComparer.Create;
@@ -648 +675 @@
 end;
 
+procedure TSummary.SaveAndFreeCar(var CarName: string;
+  var EngineType: TEngineType; var CompanyName: string; var Distance: Double;
+  var Odometer: Integer; var Price: double; var PriceWithFuel: double;
+  var RentTime: TDateTime; var Consumption: double);
+var
+  Car: TCar;
+  Rent: TRent;
+  Company: TCompany;
+begin
+  if EngineType = etNone then EngineType := etPetrol;
+  if CarName <> '' then begin
+    Car := Cars.SearchByNameEngine(CarName, EngineType);
+    if not Assigned(Car) then begin
+      Car := Cars.AddNew(CarName);
+      Car.EngineType := EngineType;
+    end;
+
+    Rent := Rents.AddNew;
+    Car.Rents.Add(Rent);
+    Rent.Car := Car;
+    Rent.Odometer := Odometer;
+    Rent.Distance := Distance;
+    Rent.Price := Price;
+    Rent.PriceWithFuel := PriceWithFuel;
+    Rent.Time := RentTime;
+    Rent.Consumption := Consumption;
+
+    Company := Companies.SearchByName(CompanyName);
+    if not Assigned(Company) then begin
+      Company := Companies.AddNew(CompanyName);
+    end;
+    Company.Rents.Add(Rent);
+    Rent.Company := Company;
+  end;
+
+  CarName := '';
+  EngineType := etNone;
+  CompanyName := '';
+  Odometer := 0;
+  Distance := 0;
+  Price := 0;
+  PriceWithFuel := 0;
+  RentTime := 0;
+  Consumption := 0;
+end;
+
 end.
 

trunk/PrefixMultiplier.pas

@@ -31 +31 @@
   (
     (ShortText: 'y'; FullText: 'yocto'; Value: 1e-24),
-          (ShortText: 'z'; FullText: 'zepto'; Value: 1e-21),
+    (ShortText: 'z'; FullText: 'zepto'; Value: 1e-21),
     (ShortText: 'a'; FullText: 'atto'; Value: 1e-18),
     (ShortText: 'f'; FullText: 'femto'; Value: 1e-15),