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

Timestamp:

Feb 8, 2012, 1:04:21 PM (13 years ago)

Author:

chronos

Message:

• Modified: TListChar in unit SpecializedList replaced by more general TGString in GenericString.
• Added: TGBitmap example implementation.
• Modified: TGList splitted to TGAbstractList and TGList as memory implementation.
• Modified: TGMatrix splitted to TGAbstractMatrix and TGMatrix as memory implementation.

File:

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

Generics/NativeGenerics/Units/GenericMatrix.pas

@@ -9 +9 @@
 
 type
-  TGMatrix<TItem> = class
+  TGAbstractMatrix<TItem> = class
   public
     type
@@ -24 +24 @@
         Y: TIndexY;
       end;
+  protected
+    function GetItemXY(X: TIndexX; Y: TIndexY): TItem; virtual; abstract;
+    procedure PutItemXY(X: TIndexX; Y: TIndexY; const AValue: TItem); virtual; abstract;
+    function GetItem(Index: TIndex): TItem; virtual; abstract;
+    function GetCapacity: TIndex; virtual; abstract;
+    function GetLast: TItem; virtual; abstract;
+    function GetFirst: TItem; virtual; abstract;
+    function GetCount: TIndex; virtual; abstract;
+    procedure SetLast(AValue: TItem); virtual; abstract;
+    procedure SetFirst(AValue: TItem); virtual; abstract;
+    procedure PutItem(Index: TIndex; const AValue: TItem);  virtual; abstract;
+    procedure SetCount(const AValue: TIndex); virtual; abstract;
+  public
+    property Count: TIndex read GetCount write SetCount;
+    property ItemsXY[X: TIndexX; Y: TIndexY]: TItem
+      read GetItemXY write PutItemXY; default;
+    property Items[Index: TIndex]: TItem
+      read GetItem write PutItem;
+    property Last: TItem read GetLast write SetLast;
+  end;
+
+  TGMatrix<TItem> = class(TGAbstractMatrix<TItem>)
+  public
+    type
+      TIndex = TGAbstractMatrix<TItem>.TIndex;
+  protected
+    function GetItemXY(X: TIndexX; Y: TIndexY): TItem; override;
+    procedure PutItemXY(X: TIndexX; Y: TIndexY; const AValue: TItem); override;
+    function GetItem(Index: TIndex): TItem; override;
+    function GetLast: TItem; override;
+    function GetFirst: TItem; override;
+    function GetCount: TIndex; override;
+    procedure SetLast(AValue: TItem); override;
+    procedure SetFirst(AValue: TItem); override;
+    procedure PutItem(Index: TIndex; const AValue: TItem);  override;
+    procedure SetCount(const AValue: TIndex); override;
   private
     FItems: array of array of TItem;
     FCount: TIndex;
-    function GetItemXY(X: TIndexX; Y: TIndexY): TItem;
-    function GetItem(Index: TIndex): TItem;
-    function GetCapacity: TIndex;
-    function GetLast: TItem;
-    function GetFirst: TItem;
+    function GetCapacity: TIndex; override;
     procedure SetCapacity(const AValue: TIndex);
-    procedure SetLast(AValue: TItem);
-    procedure SetFirst(AValue: TItem);
-    procedure PutItemXY(X: TIndexX; Y: TIndexY; const AValue: TItem); virtual;
-    procedure PutItem(Index: TIndex; const AValue: TItem); virtual;
-    procedure SetCount(const AValue: TIndex);
   public
     function Add(Item: TItem): TIndex;
@@ -72 +99 @@
     procedure Sort(Compare: TSortCompare);
     procedure SetArray(Values: array of TItem);
-    property Count: TIndex read FCount write SetCount;
     property Capacity: TIndex read GetCapacity write SetCapacity;
-    property ItemsXY[X: TIndexX; Y: TIndexY]: TItem
-      read GetItemXY write PutItemXY; default;
-    property Items[Index: TIndex]: TItem
-      read GetItem write PutItem;
-    property Last: TItem read GetLast write SetLast;
+  end;
+
+  TGRawMatrix<TItem> = class(TGAbstractMatrix<TItem>)
+  public
+    type
+      TIndex = TGAbstractMatrix<TItem>.TIndex;
+  private
+    FData: Pointer;
+    FCount: TIndex;
   end;
 
@@ -620 +650 @@
 end;
 
+function TGMatrix<TItem>.GetCount: TIndex;
+begin
+  Result := FCount;
+end;
+
+
 end.