fixes

Author: VirtualRoyalty

algorithm/include/OpenedHashMap.h

@@ -1,6 +1,7 @@
 #pragma once
 #include <random>
 #include <math.h>
+#include <string>
 
 template <typename K>
 class KeyHash{
@@ -22,7 +23,7 @@ class KeyHash<int>{
  private:
  size_t tableSize;
  unsigned int a, b;
- unsigned int p = 1721;
+ unsigned int p = 3571;
  public:
  KeyHash(size_t tableSize){
  this->tableSize = tableSize;
@@ -45,19 +46,45 @@ template <>
 class KeyHash<std::vector<int>>{
  private:
  size_t tableSize;
- int a;
+ unsigned int a, p = 3571;
  public:
  KeyHash(size_t tableSize){
  this->tableSize = tableSize;
  std::mt19937 mers(42);
- std::uniform_int_distribution<int> a_uid(1, this->tableSize-1);
+ std::uniform_int_distribution<int> a_uid(1, this->p-1);
  this->a = a_uid(mers);
+
  }
  unsigned long operator[](const std::vector<int>& key) const
  {
  unsigned long hkey = 0;
- for (int i=0; i<key.size(); i++){
- hkey += ((int)pow(this->a, i) * key[i]) % this->tableSize;
+ for (auto i=0; i<key.size(); i++){
+ hkey = ((hkey * this->a) + key[i]) % this->p;
+ }
+ return hkey % this->tableSize;
+ }
+
+};
+
+
+template <>
+class KeyHash<std::string>{
+ private:
+ size_t tableSize;
+ unsigned int a, p = 3571;
+ public:
+ KeyHash(size_t tableSize){
+ this->tableSize = tableSize;
+ std::mt19937 mers(42);
+ std::uniform_int_distribution<int> a_uid(1, this->p-1);
+ this->a = a_uid(mers);
+
+ }
+ unsigned long operator[](const std::string key) const
+ {
+ unsigned long hkey = 0;
+ for (auto i=0; i<key.size(); i++){
+ hkey = ((hkey * this->a) + key[i]) % this->p;
  }
  return hkey % this->tableSize;
  }

algorithm/include/OpenedHashNode.h

@@ -1,6 +1,5 @@
 #pragma once
-#include <random>
-#include <math.h>
+#include <string>
 #include <iostream>
 
 template <typename L>
@@ -32,11 +31,23 @@ class VComparator<std::vector<int>>
  bool compare(std::vector<int> a, std::vector<int> b){
  if (a.size() != b.size())
  return false;
- for(auto i=0; i<a.size(); i++)
+ for(auto i=0; i<a.size(); i++){
  if (a[i] != b[i])
  return false;
+ }
  return true;
 
  }
 
 };
+
+template <>
+class VComparator<std::string>
+{
+public:
+ VComparator(){};
+ bool compare(std::vector<int> a, std::vector<int> b){
+ return a == b;
+ }
+
+};

algorithm/include/UniversalHash.h

@@ -38,8 +38,8 @@ int main() {
  */
 
  // test integer number hashing
- std::cout << "Linked Hashing Numbers:\n";
- testNumberLinkedHashMap();
+ // std::cout << "Linked Hashing Numbers:\n";
+ // testNumberLinkedHashMap();
  //test vector of integer number hashing
  std::cout << "Linked Hashing Vectors:\n";
  testVectorLinkedHashMap();

algorithm/include/VComparator.h

@@ -8,8 +8,7 @@
 
 void testVectorLinkedHashMap()
 {
- std::cout << "\nEnter tableSize: ";
- const auto tableSize = 71;// = [](int t){ return std::cin >> t, t; }({});
+ const size_t tableSize = 100;
 
  std::size_t vecSize, itemSize;
  std::cout << "\nEnter vecSize: ";
@@ -23,12 +22,12 @@ void testVectorLinkedHashMap()
  // building hashMap
  HashMap <std::vector<int>, std::vector<int>, tableSize> hmap;
  for(auto const& vec: randVec){
- std::cout << "[ ";
- for(auto const& value: vec)
- {
- std::cout << value << " ";
- }
- std::cout << "]"<<std::endl;
+ // std::cout << "[ ";
+ // for(auto const& value: vec)
+ // {
+ //  std::cout << value << " ";
+ // }
+ // std::cout << "]"<<std::endl;
  hmap.insert(vec, vec);
  }