Changeset 51 for trunk/Packages/TemplateGenerics/Generic/GenericMatrix.inc

Timestamp:

Dec 20, 2021, 6:45:12 PM (2 years ago)

Author:

chronos

Message:

• Modified: Updated Common package.
• Removed: CoolTranslator merged into Common package.
• Modified: Code cleanup.

File:

• trunk/Packages/TemplateGenerics/Generic/GenericMatrix.inc (modified) (4 diffs)

trunk/Packages/TemplateGenerics/Generic/GenericMatrix.inc

@@ -30 +30 @@
     procedure PutItem(Index: TGMatrixIndex; const AValue: TGMatrixItem); virtual;
     procedure SetCount(const AValue: TGMatrixIndex);
+    procedure CheckRange(X: TGMatrixIndexX; Y: TGMatrixIndexY); inline;
   public
+    constructor Create; virtual;
     function Add(Item: TGMatrixItem): TGMatrixIndex;
     procedure AddMatrix(Values: array of TGMatrixRow);
@@ -140 +142 @@
 begin
   if (Capacity.X <> AValue.X) and (Capacity.Y <> AValue.Y) then begin
-(*    SetLength(FItems, AValue.Y);
+    SetLength(FItems, AValue.Y);
     Y := 0;
     while Y < Length(FItems) do begin
@@ -146 +148 @@
       Y := Y + 1;
     end;
-  end;
-  *)
-    SetLength(FItems, AValue.Y, AValue.X);
+
+  {  SetLength(FItems, AValue.Y, AValue.X);}
   end;
 end;
 
 function TGMatrix.GetItemXY(X: TGMatrixIndexX; Y: TGMatrixIndexY): TGMatrixItem;
+begin
+  CheckRange(X, Y);
+  Result := FItems[Y, X];
+end;
+
+function TGMatrix.GetItem(Index: TGMatrixIndex): TGMatrixItem;
+begin
+  CheckRange(Index.X, Index.Y);
+  Result := FItems[Index.Y, Index.X];
+end;
+
+procedure TGMatrix.PutItemXY(X: TGMatrixIndexX; Y: TGMatrixIndexY; const AValue: TGMatrixItem);
+begin
+  CheckRange(X, Y);
+  FItems[Y, X] := AValue;
+end;
+
+procedure TGMatrix.PutItem(Index: TGMatrixIndex; const AValue: TGMatrixItem);
+begin
+  CheckRange(Index.X, Index.Y);
+  FItems[Index.Y, Index.X] := AValue;
+end;
+
+procedure TGMatrix.SetCount(const AValue: TGMatrixIndex);
+begin
+  Capacity := AValue;
+  FCount := AValue;
+end;
+
+procedure TGMatrix.CheckRange(X: TGMatrixIndexX; Y: TGMatrixIndexY);
 begin
   if (X < 0) or (X >= Count.X) or
     (Y < 0) or (Y >= Count.Y) then
     raise EListError.CreateFmt(SMatrixIndexError, [X, Y]);
-  Result := FItems[Y, X];
-end;
-
-function TGMatrix.GetItem(Index: TGMatrixIndex): TGMatrixItem;
-begin
-  if (Index.X < 0) or (Index.X >= Count.X) or
-    (Index.Y < 0) or (Index.Y >= Count.Y) then
-    raise EListError.CreateFmt(SMatrixIndexError, [Index.X, Index.Y]);
-  Result := FItems[Index.Y, Index.X];
-end;
-
-procedure TGMatrix.PutItemXY(X: TGMatrixIndexX; Y: TGMatrixIndexY; const AValue: TGMatrixItem);
-begin
-  if (X < 0) or (X >= Count.X) or
-    (Y < 0) or (Y >= Count.Y) then
-    raise EListError.CreateFmt(SMatrixIndexError, [X, Y]);
-  FItems[Y, X] := AValue;
-end;
-
-procedure TGMatrix.PutItem(Index: TGMatrixIndex; const AValue: TGMatrixItem);
-begin
-  if (Index.X < 0) or (Index.X >= Count.X) or
-    (Index.Y < 0) or (Index.Y >= Count.Y) then
-    raise EListError.CreateFmt(SMatrixIndexError, [Index.X, Index.Y]);
-  FItems[Index.Y, Index.X] := AValue;
-end;
-
-procedure TGMatrix.SetCount(const AValue: TGMatrixIndex);
-begin
-  Capacity := AValue;
-  FCount := AValue;
 end;
 
@@ -555 +555 @@
 end;
 
+constructor TGMatrix.Create;
+begin
+  SetLength(FItems, 0, 0);
+  FCount := CreateIndex(0, 0);
+end;
+
 procedure TGMatrix.Clear;
 begin