Changeset 379 for Generics/NativeGenerics/Units/GenericMatrix.pas

Timestamp:

Jun 21, 2012, 10:39:13 AM (12 years ago)

Author:

chronos

Message:

• Added: Package UpdateChecker for easy application update.

File:

• Generics/NativeGenerics/Units/GenericMatrix.pas (modified) (12 diffs)

Generics/NativeGenerics/Units/GenericMatrix.pas

@@ -19 +19 @@
       TRow = array of TItem;
       TMerge = function(Item1, Item2: TItem): TItem of object;
+      PItem = ^TItem;
 
       TIndex = record
@@ -68 +69 @@
     function Add(Item: TItem): TIndex;
     procedure AddMatrix(Values: array of TRow);
-    procedure AddList(List: TGMatrix);
-    procedure Assign(Source: TGMatrix);
+    procedure AddList(List: TGMatrix<TItem>);
+    procedure Assign(Source: TGMatrix<TItem>);
     procedure Clear; virtual;
     procedure Contract;
@@ -75 +76 @@
     procedure Delete(Index: TIndex); virtual;
     procedure DeleteItems(Index, Count: TIndex);
-    function EqualTo(List: TGMatrix): Boolean;
+    function EqualTo(List: TGMatrix<TItem>): Boolean;
     procedure Expand;
     function Extract(Item: TItem): TItem;
@@ -85 +86 @@
     procedure Explode(Text, Separator: string; Converter: TFromStringConverter; SlicesCount: Integer = -1);
     function IndexOf(Item: TItem; Start: TIndex = 0): TIndex;
-    function IndexOfList(List: TGMatrix; Start: TIndex = 0): TIndex;
+    function IndexOfList(List: TGMatrix<TItem>; Start: TIndex = 0): TIndex;
     procedure Insert(Index: TIndex; Item: TItem);
-    procedure InsertList(Index: TIndex; List: TGMatrix);
+    procedure InsertList(Index: TIndex; List: TGMatrix<TItem>);
     procedure InsertArray(Index: TIndex; Values: array of TItem);
     procedure Move(CurIndex, NewIndex: TIndex);
     procedure MoveItems(CurIndex, NewIndex, Count: TIndex);
-    procedure Merge(Index: TIndex; Source: TGMatrix; Proc: TMerge);
-    procedure Replace(Index: TIndex; Source: TGMatrix);
+    procedure Merge(Index: TIndex; Source: TGMatrix<TItem>; Proc: TMerge);
+    procedure Replace(Index: TIndex; Source: TGMatrix<TItem>);
     function Remove(Item: TItem): TIndex;
     procedure Reverse;
@@ -107 +108 @@
       TIndex = TGAbstractMatrix<TItem>.TIndex;
   private
+    FRowSize: Integer;
+    FCellSize: Integer;
     FData: Pointer;
     FCount: TIndex;
+  public
+    constructor Create;
+    function GetItemXY(X: TIndexX; Y: TIndexY): TItem; override;
+    procedure PutItemXY(X: TIndexX; Y: TIndexY; const AValue: TItem); override;
+    property Data: Pointer read FData;
+    property Count: TIndex read FCount write SetCount;
   end;
 
@@ -120 +129 @@
 
 
+{ TGRawMatrix }
+
+constructor TGRawMatrix<TItem>.Create;
+begin
+  FCellSize := SizeOf(TItem);
+end;
+
+function TGRawMatrix<TItem>.GetItemXY(X: TIndexX; Y: TIndexY): TItem;
+begin
+  Result := PItem(X * FCellSize + Y * FRowSize)^;
+end;
+
+procedure TGRawMatrix<TItem>.PutItemXY(X: TIndexX; Y: TIndexY; const AValue: TItem);
+begin
+  PItem(X * FCellSize + Y * FRowSize)^ := AValue;
+end;
+
 { TGMatrix }
 
-procedure TGMatrix<TItem>.Replace(Index: TIndex; Source: TGMatrix);
+procedure TGMatrix<TItem>.Replace(Index: TIndex; Source: TGMatrix<TItem>);
 var
   X: TIndexX;
@@ -138 +164 @@
 end;
 
-procedure TGMatrix<TItem>.Merge(Index: TIndex; Source: TGMatrix; Proc: TMerge);
+procedure TGMatrix<TItem>.Merge(Index: TIndex; Source: TGMatrix<TItem>; Proc: TMerge);
 var
   X: TIndexX;
@@ -221 +247 @@
 end;
 
-procedure TGMatrix<TItem>.Assign(Source: TGMatrix);
+procedure TGMatrix<TItem>.Assign(Source: TGMatrix<TItem>);
 var
   Index: TIndex;
@@ -309 +335 @@
 end;
 
-procedure TGMatrix<TItem>.InsertList(Index: TIndex; List: TGMatrix);
+procedure TGMatrix<TItem>.InsertList(Index: TIndex; List: TGMatrix<TItem>);
 var
   I: TIndex;
@@ -321 +347 @@
 end;
 
-function TGMatrix<TItem>.IndexOfList(List: TGMatrix; Start: TIndex): TIndex;
+function TGMatrix<TItem>.IndexOfList(List: TGMatrix<TItem>; Start: TIndex): TIndex;
 var
   I: TIndex;
@@ -429 +455 @@
 end;
 
-function TGMatrix<TItem>.EqualTo(List: TGMatrix): Boolean;
+function TGMatrix<TItem>.EqualTo(List: TGMatrix<TItem>): Boolean;
 var
   I: TIndex;
@@ -575 +601 @@
 end;
 
-procedure TGMatrix<TItem>.AddList(List: TGMatrix);
+procedure TGMatrix<TItem>.AddList(List: TGMatrix<TItem>);
 var
   I: TIndex;