LazUtils: Fix and improve TLookupStringList and its example project.

git-svn-id: trunk@64460 -

components/lazutils/examples/LookupStringList/TDedupeDemo.lpi

@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="9"/>
+    <Version Value="12"/>
     <PathDelim Value="\"/>
     <General>
+      <Flags>
+        <CompatibilityMode Value="True"/>
+      </Flags>
       <SessionStorage Value="InProjectDir"/>
-      <MainUnit Value="0"/>
       <Title Value="TDedupeDemo"/>
       <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
@@ -13,21 +15,17 @@
     <i18n>
       <EnableI18N LFM="False"/>
     </i18n>
-    <VersionInfo>
-      <StringTable ProductVersion=""/>
-    </VersionInfo>
     <BuildModes Count="1">
       <Item1 Name="Default" Default="True"/>
     </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
-      <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
-      <ExcludeFileFilter Value="*.(bak|ppu|o|so);*~;backup"/>
     </PublishOptions>
     <RunParams>
-      <local>
+      <FormatVersion Value="2"/>
-        <FormatVersion Value="1"/>
+      <Modes Count="1">
-      </local>
+        <Mode0 Name="default"/>
+      </Modes>
     </RunParams>
     <RequiredPackages Count="1">
       <Item1>

components/lazutils/examples/LookupStringList/main.lfm

@@ -11,7 +11,7 @@ object Form1: TForm1
   OnDestroy = FormDestroy
   OnShow = FormShow
   Position = poScreenCenter
-  LCLVersion = '1.5'
+  LCLVersion = '2.1.0.0'
   object btnDedupeMemo: TButton
     Left = 346
     Height = 25
@@ -32,23 +32,23 @@ object Form1: TForm1
   end
   object lblTime: TLabel
     Left = 16
-    Height = 17
+    Height = 18
     Top = 48
-    Width = 32
+    Width = 34
     Caption = 'Time:'
     ParentColor = False
   end
   object lblLines: TLabel
     Left = 130
-    Height = 17
+    Height = 18
     Top = 48
-    Width = 98
+    Width = 105
     Caption = 'Duplicated Lines:'
     ParentColor = False
   end
   object SpinEdit1: TSpinEdit
     Left = 8
-    Height = 23
+    Height = 32
     Top = 8
     Width = 94
     Increment = 1000
@@ -78,12 +78,17 @@ object Form1: TForm1
     TabOrder = 4
   end
   object Label1: TLabel
+    AnchorSideLeft.Control = btnDedupeFile
+    AnchorSideRight.Control = btnDedupeFile
+    AnchorSideRight.Side = asrBottom
+    AnchorSideBottom.Control = btnDedupeFile
     Left = 346
-    Height = 64
+    Height = 96
-    Top = 168
+    Top = 136
-    Width = 182
+    Width = 183
+    Anchors = [akLeft, akRight, akBottom]
     AutoSize = False
-    Caption = 'Deduplicating from a file is very much faster than using a GUI control. Use the button below to see the whole process.'
+    Caption = 'Deduplicating from a file is much faster than using a GUI control. Use the button below to see the whole process.'
     ParentColor = False
     WordWrap = True
   end

components/lazutils/examples/LookupStringList/main.pas

@@ -5,8 +5,7 @@ unit Main;
 interface
 
 uses
-  Classes, SysUtils, Math, Forms, Controls, Dialogs, StdCtrls, Spin,
+  Classes, SysUtils, Math, Forms, Controls, Dialogs, StdCtrls, Spin, LookupStringList;
-  LookupStringList;
 
 type
 
@@ -113,13 +112,12 @@ begin
 
   if Trim(Memo.Text) = '' then
   begin
-    ShowMessage('Generating data. Please wait.');
     btnGenerateClick(nil);
+    ShowMessage('Generated data.');
   end;
 
-  ShowMessage('Saving memo to a file. Please wait.');
   Memo.Lines.SaveToFile('temp.txt');
-  ShowMessage('Dedupping the file.');
+  ShowMessage('Saved memo to a file.');
   T := Now;
   N := Memo.Lines.Count;
   DSL := TLookupStringList.Create;
@@ -128,7 +126,7 @@ begin
     lblLines.Caption := 'Duplicated Lines: ' + IntToStr(N - DSL.Count);
     DSL.SaveToFile('temp.txt');
     lblTime.Caption := 'Time: ' + TimeToStr(Now - T);
-    ShowMessage('Deleting the file.');
+    ShowMessage('Dedupping the file. Will delete it.');
     DeleteFile('temp.txt');
   finally
     DSL.Free;

components/lazutils/lazfglhash.pas

@@ -6,7 +6,7 @@
   for details about the license.
  *****************************************************************************
 }
-unit lazfglhash;
+unit LazFglHash;
 
 {$mode objfpc}{$H+}
 

components/lazutils/lookupstringlist.pas

@@ -41,6 +41,7 @@ type
   protected
     procedure InsertItem(Index: Integer; const S: string); override;
   public
+    constructor Create(aCaseSensitive: Boolean);
     constructor Create;
     destructor Destroy; override;
     procedure Assign(Source: TPersistent); override;
@@ -53,24 +54,24 @@ type
     function IndexOf(const S: string): Integer; override;
   end;
 
-function Deduplicate(AStrings: TStrings): Boolean;
+function Deduplicate(AStrings: TStrings): Integer;
+
 
 implementation
 
-{
+function Deduplicate(AStrings: TStrings): Integer;
-  Removes duplicate strings (case sensitive) from AStrings.
+// Removes duplicate strings (case sensitive) from AStrings.
-  When the AStrings owns and contains objects, the function will return false.
+// Returns the number of duplicates removed.
-}
-function Deduplicate(AStrings: TStrings): Boolean;
 var
   DSL: TLookupStringList;
+  InCnt: Integer;
 begin
-  Result := False;
+  InCnt := AStrings.Count;
-  DSL := TLookupStringList.Create;
+  DSL := TLookupStringList.Create(True);
   try
     DSL.Assign(AStrings);
     AStrings.Assign(DSL);
-    Result := True;
+    Result := InCnt - AStrings.Count;
   finally
     DSL.Free;
   end;
@@ -78,10 +79,16 @@ end;
 
 { TLookupStringList }
 
-constructor TLookupStringList.Create;
+constructor TLookupStringList.Create(aCaseSensitive: Boolean);
 begin
   inherited Create;
-  FMap := TStringMap.Create(True);
+  CaseSensitive := aCaseSensitive;
+  FMap := TStringMap.Create(aCaseSensitive);
+end;
+
+constructor TLookupStringList.Create;
+begin
+  Create(False);  // Case-insensitive by default
 end;
 
 destructor TLookupStringList.Destroy;