Merge pull request #112 from EagleAglow/main

Version 2.2

Author: gcarreno

entries/bfire/README.md

@@ -56,3 +56,4 @@ Finally, the TStringList is sorted and used to output sorted data.
 - Version 1.1: modified rounding to new baseline.
 - Version 2.0: use hashing, sort later.
 - Version 2.1: minor speed tweaks.
+- Version 2.2: try hash functions modification.

entries/bfire/src/ProcessByHashUnit.pas

@@ -191,15 +191,17 @@ function BytesToIndexHash;
 // convert entry_chars to hash
 // use   Prime: Integer = 75013;
 var
-  G: Integer;
+  G: Cardinal;
   i: Integer;
-  Hash: Integer;
+  Hash: Cardinal;
 begin
   Hash := 0;
-  for i := 0 to entry_name_array_length - 1 do
+//  for i := 0 to entry_name_array_length - 1 do
+  for i := entry_name_array_length - 1 downto 0 do
   begin
     Hash := (Hash shl 4) + entry_name_array[i];
     G := Hash and $F0000000;
+//    G := Hash and $F000000;
     if (G <> 0) then
       Hash := (Hash xor (G shr 24)) xor G;
   end;
@@ -310,9 +312,9 @@ procedure HashAndSave;
       end
       else // collision, try next spot in HashMap array
       begin
-        Inc(entry_hash);
-        if entry_hash >= Prime then
-          entry_hash := 0; // wrap around
+        entry_hash := entry_hash + 19;
+        if entry_hash >= Prime then // wrap around
+          entry_hash := entry_hash - Prime;
       end;
     end;
   end; // of: while True do
@@ -321,13 +323,11 @@ procedure HashAndSave;
 
 procedure FileToArrays(inFile: String; UseStdOut: Boolean); inline;
 var
-  PlaceIndex: Integer; // location in index array
   i: Integer; // used for temporary purposes
 
   LF: Boolean; // True after finding  #10
   SC: Boolean; // True after finding semi-colon
 
-  iFileHandle: Integer;
   iBytesRead: Integer;
   Buffer: PByte;
 
@@ -342,7 +342,6 @@ procedure FileToArrays(inFile: String; UseStdOut: Boolean); inline;
 
   // Load the data
   PlaceCount := 0;
-  PlaceIndex := 0;
   InitializeThings;
 
   if FileExists(inFile) then

entries/bfire/src/version.inc

@@ -1,2 +1,2 @@
 const
-  cVersion = '2.1';
+  cVersion = '2.2';