Changeset 109 for Generics/TemplateGenerics/Demo/UMainForm.pas

Timestamp:

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

Author:

george

Message:

• Added: TGMatrix implode.

File:

• Generics/TemplateGenerics/Demo/UMainForm.pas (modified) (10 diffs)

Generics/TemplateGenerics/Demo/UMainForm.pas

@@ -24 +24 @@
     ButtonIntegerList: TButton;
     ButtonStringList: TButton;
+    LabelTestName: TLabel;
     ListViewOutput: TListView;
     procedure ButtonBenchmarkDictionaryClick(Sender: TObject);
@@ -61 +62 @@
 begin
   ListViewOutput.Clear;
-  WriteOutput('TListInteger test');
+  LabelTestName.Caption := 'TListInteger test';
   List := TListInteger.Create;
   with List do try
@@ -90 +91 @@
 begin
   ListViewOutput.Clear;
-  WriteOutput('TListInteger test');
+  LabelTestName.Caption := 'TMatrixInteger test';
   Matrix := TMatrixInteger.Create;
   with Matrix do try
-    WriteOutput('AddMatrix([10, 20, 30, 40])');
-    //AddMatrix([10, 20, 30, 40]);
-    WriteOutput('Implode: ' + Implode(',', IntToStr));
+    Count := CreateIndex(2, 2);
+    WriteOutput('Count := CreateIndex(2, 2)', '[' + Implode('; ', ', ', IntToStr) + ']');
+    Fill(CreateIndex(0, 0), Count, 1);
+    WriteOutput('Fill(1)', '[' + Implode('; ', ', ', IntToStr) + ']');
+    Count := CreateIndex(3, 3);
+    WriteOutput('Count := CreateIndex(3, 3)', '[' + Implode('; ', ', ', IntToStr) + ']');
+    WriteOutput('Count [Y, X]', IntToStr(Count.Y) + ', ' + IntToStr(Count.X));
     Clear;
-    for I := 0 to 10 do Add(I);
-    WriteOutput('Implode: ' + Implode(',', IntToStr));
-    WriteOutput('Count: Y: ' + IntToStr(Count.Y) + ', ' + IntToStr(Count.X));
-    WriteOutput('Implode: ' + Implode(',', IntToStr));
-    WriteOutput('Reverse');
-    Reverse;
-    WriteOutput('Implode: ' + Implode(',', IntToStr));
-    WriteOutput('First: ' + IntToStr(First));
-    WriteOutput('Last: ' + IntToStr(Last));
-    //MoveItems(3, 2, 3);
-    WriteOutput('Implode: ' + Implode(',', IntToStr));
-    WriteOutput('Insert(5, 11)');
-    //Insert(5, 11);
-    WriteOutput('Implode: ' + Implode(',', IntToStr));
+    WriteOutput('Clear', '[' + Implode('; ', ', ', IntToStr) + ']');
+    WriteOutput('Count [Y, X]', IntToStr(Count.Y) + ', ' + IntToStr(Count.X));
   finally
     Free;
@@ -127 +120 @@
 begin
   ListViewOutput.Clear;
-  WriteOutput('TListObject test');
+  LabelTestName.Caption := 'TListObject test';
   List := TListObject.Create;
   with List do try
@@ -152 +145 @@
 begin
   ListViewOutput.Clear;
-  WriteOutput('TQueueInteger test');
+  LabelTestName.Caption := 'TQueueInteger test';
   Queue := TQueueInteger.Create;
   with Queue do try
@@ -178 +171 @@
 begin
   ListViewOutput.Clear;
-  WriteOutput('TDictionaryString test');
+  LabelTestName.Caption := 'TDictionaryString test';
   Dictionary := TDictionaryStringString.Create;
   with Dictionary do try
@@ -204 +197 @@
 var
   List: TListChar;
-begin
-  ListViewOutput.Clear;
-  WriteOutput('TListChar test');
+  List2: TListChar;
+begin
+  ListViewOutput.Clear;
+  LabelTestName.Caption := 'TListChar test';
   List := TListChar.Create;
+  List2 := TListChar.Create;
   with List do try
     AddArray([' ', ' ', 'A', 'b', 'c', 'd', ' ']);
@@ -222 +217 @@
     LowerCase;
     WriteOutput('LowerCase', '''' + Implode('', CharToStr) + '''');
-  finally
+    WriteOutput('IndexOf(''c'')', IntToStr(IndexOf('c')));
+    List2.AddArray(['c', 'b']);
+    WriteOutput('IndexOfList(''cb'')', IntToStr(IndexOfList(List2)));
+  finally
+    List2.Free;
     Free;
   end;
@@ -234 +233 @@
   I: Integer;
 begin
+  LabelTestName.Caption := 'Generic specialized TListObject vs. classic non-generic TList benchmark';
   ListViewOutput.Clear;
   try
@@ -377 +377 @@
   R: string;
 begin
+  LabelTestName.Caption := 'Generic specialized TDictionaryStringString vs. classic non-generic TStringList benchmark';
   ListViewOutput.Clear;
   try