Changeset 345 for trunk/Map.pas

Timestamp:

Dec 23, 2024, 11:25:36 AM (9 hours ago)

Author:

chronos

Message:

• Modified: Improved test cases.

File:

• trunk/Map.pas (modified) (5 diffs)

trunk/Map.pas

@@ -48 +48 @@
     Extra: TExtraType;
     OneUnitId: Integer; // Temporary value
+    function Compare(Cell: TCell): Boolean;
     procedure ConnectTo(Cell: TCell);
     procedure DisconnectFrom(Cell: TCell);
@@ -80 +81 @@
     procedure LoadFromNode(Node: TDOMNode);
     procedure SaveToNode(Node: TDOMNode);
+    function Compare(Cells: TCells): Boolean;
     procedure ClearMark;
     procedure ClearWeight;
@@ -409 +411 @@
 end;
 
+function TCells.Compare(Cells: TCells): Boolean;
+var
+  I: Integer;
+begin
+  Result := True;
+  for I := 0 to Count - 1 do
+  with Items[I] do begin
+    if not Items[I].Compare(Cells[I]) then begin
+      Result := False;
+      Break;
+    end;
+  end;
+end;
+
 procedure TCells.ClearMark;
 var
@@ -543 +559 @@
 function TMap.Compare(Map: TMap): Boolean;
 begin
-  Result := True;
+  Result := (MaxPower = Map.MaxPower) and
+    (Cyclic = Map.Cyclic) and
+    (Size = Map.Size) and
+    (DefaultCellSize = Map.DefaultCellSize) and
+    (Shape = Map.Shape) and
+    Cells.Compare(Map.Cells);
 end;
 
@@ -942 +963 @@
 end;
 
+function TCell.Compare(Cell: TCell): Boolean;
+begin
+  Result := (Id = Cell.Id) and
+    (PosPx = Cell.PosPx) and
+    (Terrain = Cell.Terrain) and
+    Polygon.Compare(Cell.Polygon) and
+    (Player = Cell.Player) and
+    (Mark = Cell.Mark) and
+    (Extra = Cell.Extra);
+end;
+
 procedure TCell.ConnectTo(Cell: TCell);
 begin