Changeset 175 for Generics

Timestamp:

Mar 6, 2011, 6:44:23 PM (13 years ago)

Author:

george

Message:

• Added: Generic Matrix class methods enhacement.

Location:

Generics/TemplateGenerics

Files:

• Generic (modified) (1 prop)
• Generic/GenericList.inc (modified) (2 diffs)
• Generic/GenericMatrix.inc (modified) (14 diffs)
• Specialized (modified) (1 prop)
• Specialized/SpecializedMatrix.pas (modified) (4 diffs)

Generics/TemplateGenerics/Generic/GenericList.inc

@@ -49 +49 @@
     function Remove(Item: TGListItem): TGListIndex;
     procedure Reverse;
+    procedure Replace(Index: TGListIndex; Source: TGList);
     procedure Sort(Compare: TGListSortCompare);
     procedure SetArray(Values: TGListItemArray);
@@ -71 +72 @@
 
 { TGList }
+
+procedure TGList.Replace(Index: TGListIndex; Source: TGList);
+var
+  I: TGListIndex;
+begin
+  I := 0;
+  while I < Source.Count do begin
+    Items[Index + I] := Source[I];
+    I := I + 1;
+  end;
+end;
 
 function TGList.GetCapacity: TGListIndex;

Generics/TemplateGenerics/Generic/GenericMatrix.inc

@@ -7 +7 @@
   TGMatrixFromStringConverter = function(Text: string): TGMatrixItem;
   TGMatrixRow = array of TGMatrixItem;
+  TGMatrixMerge = function(Item1, Item2: TGMatrixItem): TGMatrixItem of object;
 
   TGMatrixIndex = record
@@ -18 +19 @@
     FItems: array of array of TGMatrixItem;
     FCount: TGMatrixIndex;
-    function Get(Y: TGMatrixIndexY; X: TGMatrixIndexX): TGMatrixItem;
+    function GetXY(Y: TGMatrixIndexY; X: TGMatrixIndexX): TGMatrixItem;
+    function Get(Index: TGMatrixIndex): TGMatrixItem;
     function GetCapacity: TGMatrixIndex;
     function GetLast: TGMatrixItem;
@@ -25 +27 @@
     procedure SetLast(AValue: TGMatrixItem);
     procedure SetFirst(AValue: TGMatrixItem);
-    procedure Put(Y: TGMatrixIndexY; X: TGMatrixIndexX; const AValue: TGMatrixItem); virtual;
+    procedure PutXY(Y: TGMatrixIndexY; X: TGMatrixIndexX; const AValue: TGMatrixItem); virtual;
+    procedure Put(Index: TGMatrixIndex; const AValue: TGMatrixItem); virtual;
     procedure SetCount(const AValue: TGMatrixIndex);
   public
@@ -34 +37 @@
     procedure Clear; virtual;
     procedure Contract;
-    function CreateIndex(Y: TGMatrixIndexY; X: TGMatrixIndexX): TGMatrixIndex;
+    function CreateIndex(X: TGMatrixIndexY; Y: TGMatrixIndexX): TGMatrixIndex;
     procedure Delete(Index: TGMatrixIndex); virtual;
     procedure DeleteItems(Index, Count: TGMatrixIndex);
@@ -52 +55 @@
     procedure Move(CurIndex, NewIndex: TGMatrixIndex);
     procedure MoveItems(CurIndex, NewIndex, Count: TGMatrixIndex);
+    procedure Merge(Index: TGMatrixIndex; Source: TGMatrix; Proc: TGMatrixMerge);
+    procedure Replace(Index: TGMatrixIndex; Source: TGMatrix);
     function Remove(Item: TGMatrixItem): TGMatrixIndex;
     procedure Reverse;
+    procedure ReverseHorizontal;
+    procedure ReverseVertical;
     procedure Sort(Compare: TGMatrixSortCompare);
     procedure SetArray(Values: array of TGMatrixItem);
     property Count: TGMatrixIndex read FCount write SetCount;
     property Capacity: TGMatrixIndex read GetCapacity write SetCapacity;
-    property Items[Y: TGMatrixIndexY; X: TGMatrixIndexX]: TGMatrixItem read Get write Put; default;
+    property ItemsXY[Y: TGMatrixIndexY; X: TGMatrixIndexX]: TGMatrixItem read GetXY write PutXY; default;
+    property Items[Index: TGMatrixIndex]: TGMatrixItem read Get write Put;
     property Last: TGMatrixItem read GetLast write SetLast;
   end;
@@ -71 +79 @@
 
 resourcestring
-  SMatrixIndexError = 'Matrix index error [%d, %d]';
+  SMatrixIndexError = 'Matrix index error [X: %d, Y: %d]';
 
 {$UNDEF IMPLEMENTATION_USES}
@@ -80 +88 @@
 { TGMatrix }
 
-function TGMatrix.CreateIndex(Y: TGMatrixIndexY; X: TGMatrixIndexX): TGMatrixIndex;
+procedure TGMatrix.Replace(Index: TGMatrixIndex; Source: TGMatrix);
+var
+  X: TGMatrixIndexX;
+  Y: TGMatrixIndexY;
+begin
+  Y := 0;
+  while Y < Source.Count.Y do begin
+    X := 0;
+    while X < Source.Count.X do begin
+      ItemsXY[Index.Y + Y, Index.X + X] := Source.ItemsXY[Y, X];
+      X := X + 1;
+    end;
+    Y := Y + 1;
+  end;
+end;
+
+procedure TGMatrix.Merge(Index: TGMatrixIndex; Source: TGMatrix; Proc: TGMatrixMerge);
+var
+  X: TGMatrixIndexX;
+  Y: TGMatrixIndexY;
+begin
+  Y := 0;
+  while Y < Source.Count.Y do begin
+    X := 0;
+    while X < Source.Count.X do begin
+      ItemsXY[Index.Y + Y, Index.X + X] := Proc(ItemsXY[Index.Y + Y, Index.X + X], Source.ItemsXY[Y, X]);
+      X := X + 1;
+    end;
+    Y := Y + 1;
+  end;
+end;
+
+function TGMatrix.CreateIndex(X: TGMatrixIndexY; Y: TGMatrixIndexX): TGMatrixIndex;
 begin
   Result.X := X;
@@ -97 +137 @@
 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
@@ -104 +144 @@
     end;
   end;
-end;
-
-function TGMatrix.Get(Y: TGMatrixIndexY; X: TGMatrixIndexX): TGMatrixItem;
-begin
+  *)
+    SetLength(FItems, AValue.Y, AValue.X);
+  end;
+end;
+
+function TGMatrix.GetXY(Y: TGMatrixIndexY; X: TGMatrixIndexX): TGMatrixItem;
+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;
 
-procedure TGMatrix.Put(Y: TGMatrixIndexY; X: TGMatrixIndexX; const AValue: TGMatrixItem);
-begin
+function TGMatrix.Get(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.PutXY(Y: TGMatrixIndexY; X: TGMatrixIndexX; 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.Put(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;;
+  Capacity := AValue;
   FCount := AValue;
 end;
@@ -124 +189 @@
 procedure TGMatrix.Assign(Source: TGMatrix);
 var
-  X: TGMatrixIndexX;
-  Y: TGMatrixIndexY;
+  Index: TGMatrixIndex;
 begin
   Count := Source.Count;
-  Y := 0;
-  while Y < Count.Y do begin
-    while X < Count.X do begin
-      Items[Y, X] := Source[Y, X];
-      X := X + 1;
-    end;
-    Y := Y + 1;
+  Index.Y := 0;
+  while Index.Y < Count.Y do begin
+    Index.X := 0;
+    while Index.X < Count.X do begin
+      Items[Index] := Source.Items[Index];
+      Index.X := Index.X + 1;
+    end;
+    Index.Y := Index.Y + 1;
   end;
 end;
@@ -349 +414 @@
 procedure TGMatrix.Reverse;
 var
-  I: TGMatrixIndex;
-begin
-(*  I := 0;
-  while I < (Count div 2) do begin
-    Exchange(I, Count - 1 - I);
-    I := I + 1;
-  end; *)
+  X: TGMatrixIndexX;
+  Y: TGMatrixIndexY;
+begin
+  Y := 0;
+  while Y < (Count.Y - 1) do begin
+    X := 1 + Y;
+    while X < Count.X do begin
+      Exchange(CreateIndex(X, Y), CreateIndex(Y, X));
+      X := X + 1;
+    end;
+    Y := Y + 1;
+  end;
+end;
+
+procedure TGMatrix.ReverseHorizontal;
+var
+  X: TGMatrixIndexX;
+  Y: TGMatrixIndexY;
+begin
+  Y := 0;
+  while Y < Count.Y do begin
+    X := 0;
+    while X < (Count.X div 2) do begin
+      Exchange(CreateIndex(X, Y), CreateIndex(Count.X - 1 - X, Y));
+      X := X + 1;
+    end;
+    Y := Y + 1;
+  end;
+end;
+
+procedure TGMatrix.ReverseVertical;
+var
+  X: TGMatrixIndexX;
+  Y: TGMatrixIndexY;
+begin
+  X := 0;
+  while X < Count.X do begin
+    Y := 0;
+    while Y < (Count.Y div 2) do begin
+      Exchange(CreateIndex(X, Y), CreateIndex(X, Count.Y - 1 - Y));
+      Y := Y + 1;
+    end;
+    X := X + 1;
+  end;
 end;
 
@@ -408 +510 @@
     X := 0;
     while X < Count.X do begin
-      Result := Result + Converter(Items[Y, X]);
+      Result := Result + Converter(ItemsXY[Y, X]);
       if X < (Count.X - 1) then
         Result := Result + ColSeparator;
@@ -487 +589 @@
     X := Start.X;
     while X < Count.X do begin
-      Items[Y, X] := Value;
+      ItemsXY[Y, X] := Value;
       X := X + 1;
     end;
@@ -498 +600 @@
   Temp: TGMatrixItem;
 begin
-  if ((Index1.Y >= FCount.Y) or (Index1.Y < 0)) then
-    raise EListError.CreateFmt(SMatrixIndexError, [Index1.Y, Index1.X]);
-  if ((Index2.Y >= FCount.Y) or (Index2.Y < 0)) then
-    raise EListError.CreateFmt(SMatrixIndexError, [Index2.Y, Index2.X]);
+  if (Index1.X < 0) or (Index1.X >= Count.X) or
+    (Index1.Y < 0) or (Index1.Y >= Count.Y) then
+    raise EListError.CreateFmt(SMatrixIndexError, [Index1.X, Index1.Y]);
+  if (Index2.X < 0) or (Index2.X >= Count.X) or
+    (Index2.Y < 0) or (Index2.Y >= Count.Y) then
+    raise EListError.CreateFmt(SMatrixIndexError, [Index2.X, Index2.Y]);
   Temp := FItems[Index1.Y, Index1.X];
-  FItems[Index1.Y, Index1.X] := FItems[Index2.Y, Index1.X];
+  FItems[Index1.Y, Index1.X] := FItems[Index2.Y, Index2.X];
   FItems[Index2.Y, Index2.X] := Temp;
 end;

Generics/TemplateGenerics/Specialized/SpecializedMatrix.pas

@@ -21 +21 @@
 {$DEFINE TGMatrixToStringConverter := TMatrixIntegerToStringConverter}
 {$DEFINE TGMatrixFromStringConverter := TMatrixIntegerFromStringConverter}
+{$DEFINE TGMatrixMerge := TMatrixIntegerMerge}
+{$DEFINE INTERFACE}
+{$I 'GenericMatrix.inc'}
+
+// TMatrixByte<Integer, Integer, Byte>
+{$DEFINE TGMatrixIndexX := Integer}
+{$DEFINE TGMatrixIndexY := Integer}
+{$DEFINE TGMatrixItem := Byte}
+{$DEFINE TGMatrixIndex := TMatrixByteIndex}
+{$DEFINE TGMatrixRow := TMatrixByteRow}
+{$DEFINE TGMatrix := TMatrixByte}
+{$DEFINE TGMatrixSortCompare := TMatrixByteSortCompare}
+{$DEFINE TGMatrixToStringConverter := TMatrixByteToStringConverter}
+{$DEFINE TGMatrixFromStringConverter := TMatrixByteFromStringConverter}
+{$DEFINE TGMatrixMerge := TMatrixByteMerge}
 {$DEFINE INTERFACE}
 {$I 'GenericMatrix.inc'}
@@ -34 +49 @@
 {$DEFINE TGMatrixToStringConverter := TMatrixObjectToStringConverter}
 {$DEFINE TGMatrixFromStringConverter := TMatrixObjectFromStringConverter}
+{$DEFINE TGMatrixMerge := TMatrixStringMerge}
 {$DEFINE INTERFACE}
 {$I 'GenericMatrix.inc'}
@@ -52 +68 @@
 {$DEFINE TGMatrixToStringConverter := TMatrixIntegerToStringConverter}
 {$DEFINE TGMatrixFromStringConverter := TMatrixIntegerFromStringConverter}
+{$DEFINE TGMatrixMerge := TMatrixIntegerMerge}
+{$DEFINE IMPLEMENTATION}
+{$I 'GenericMatrix.inc'}
+
+// TMatrixByte<Integer, Integer, Byte>
+{$DEFINE TGMatrixIndexX := Integer}
+{$DEFINE TGMatrixIndexY := Integer}
+{$DEFINE TGMatrixItem := Byte}
+{$DEFINE TGMatrixIndex := TMatrixByteIndex}
+{$DEFINE TGMatrixRow := TMatrixByteRow}
+{$DEFINE TGMatrix := TMatrixByte}
+{$DEFINE TGMatrixSortCompare := TMatrixByteSortCompare}
+{$DEFINE TGMatrixToStringConverter := TMatrixByteToStringConverter}
+{$DEFINE TGMatrixFromStringConverter := TMatrixByteFromStringConverter}
+{$DEFINE TGMatrixMerge := TMatrixByteMerge}
 {$DEFINE IMPLEMENTATION}
 {$I 'GenericMatrix.inc'}
@@ -65 +96 @@
 {$DEFINE TGMatrixToStringConverter := TMatrixObjectToStringConverter}
 {$DEFINE TGMatrixFromStringConverter := TMatrixObjectFromStringConverter}
+{$DEFINE TGMatrixMerge := TMatrixStringMerge}
 {$DEFINE IMPLEMENTATION}
 {$I 'GenericMatrix.inc'}