Changeset 109 for Generics/TemplateGenerics/Generic

Timestamp:

Jan 3, 2011, 7:22:47 AM (14 years ago)

Author:

george

Message:

• Added: TGMatrix implode.

Location:

Generics/TemplateGenerics/Generic

Files:

• GenericList.inc (modified) (1 diff)
• GenericMatrix.inc (modified) (5 diffs)

Generics/TemplateGenerics/Generic/GenericList.inc

@@ -181 +181 @@
 begin
   Result := Start;
+  // Use slower CompareMem instead of (FItems[Result] <> Item) to support records
   while (Result < FCount) and
   not CompareMem(Addr(FItems[Result]), Addr(Item), SizeOf(TGListItem)) do

Generics/TemplateGenerics/Generic/GenericMatrix.inc

@@ -6 +6 @@
   TGMatrixToStringConverter = function(Item: TGMatrixItem): string;
   TGMatrixFromStringConverter = function(Text: string): TGMatrixItem;
+  TGMatrixRow = array of TGMatrixItem;
 
   TGMatrixIndex = record
@@ -28 +29 @@
   public
     function Add(Item: TGMatrixItem): TGMatrixIndex;
-    procedure AddArray(Values: array of TGMatrixItem);
+    procedure AddMatrix(Values: array of TGMatrixRow);
     procedure AddList(List: TGMatrix);
     procedure Assign(Source: TGMatrix);
@@ -42 +43 @@
     property First: TGMatrixItem read GetFirst write SetFirst;
     procedure Fill(Start, Count: TGMatrixIndex; Value: TGMatrixItem);
-    function Implode(Separator: string; Converter: TGMatrixToStringConverter): string;
+    function Implode(RowSeparator, ColSeparator: string; Converter: TGMatrixToStringConverter): string;
     procedure Explode(Text, Separator: string; Converter: TGMatrixFromStringConverter; SlicesCount: Integer = -1);
     function IndexOf(Item: TGMatrixItem; Start: TGMatrixIndex = 0): TGMatrixIndex;
@@ -363 +364 @@
 end;
 
-procedure TGMatrix.AddArray(Values: array of TGMatrixItem);
+procedure TGMatrix.AddMatrix(Values: array of TGMatrixRow);
 var
   I: TGMatrixIndex;
@@ -397 +398 @@
 end;
 
-function TGMatrix.Implode(Separator: string; Converter: TGMatrixToStringConverter): string;
-var
-  I: TGMatrixIndex;
-begin
-(*  Result := '';
-  I := 0;
-  while I < Count do begin
-    Result := Result + Converter(Items[I]);
-    if I < (Count - 1) then
-      Result := Result + Separator;
-    I := I + 1;
-  end; *)
+function TGMatrix.Implode(RowSeparator, ColSeparator: string; Converter: TGMatrixToStringConverter): string;
+var
+  Y: TGMatrixIndexY;
+  X: TGMatrixIndexX;
+begin
+  Result := '';
+  Y := 0;
+  while Y < Count.Y do begin
+    X := 0;
+    while X < Count.X do begin
+      Result := Result + Converter(Items[Y, X]);
+      if X < (Count.X - 1) then
+        Result := Result + ColSeparator;
+      X := X + 1;
+    end;
+    if Y < (Count.Y - 1) then
+      Result := Result + RowSeparator;
+    Y := Y + 1;
+  end;
 end;