Use unordered_map and unordered_set with strings

fintarin · Feb 5, 2024 · c66ba15 · c66ba15
1 parent 695de48
commit c66ba15
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 17 deletions.
diff --git a/src/fintamath/expressions/binary/CompExpression.cpp b/src/fintamath/expressions/binary/CompExpression.cpp
@@ -1,10 +1,10 @@
 #include "fintamath/expressions/binary/CompExpression.hpp"
 
 #include <functional>
-#include <map>
 #include <memory>
 #include <ranges>
 #include <string>
+#include <unordered_map>
 #include <utility>
 
 #include "fintamath/core/CoreUtils.hpp"
@@ -111,7 +111,7 @@ void CompExpression::markAsSolution() {
 }
 
 std::shared_ptr<IFunction> CompExpression::getOppositeFunction(const IFunction &function) {
-  static const std::map<std::string, std::shared_ptr<IFunction>, std::less<>> oppositeFunctions = {
+  static const std::unordered_map<std::string, std::shared_ptr<IFunction>> oppositeFunctions = {
       {Eqv{}.toString(), std::make_shared<Eqv>()},
       {Neqv{}.toString(), std::make_shared<Neqv>()},
       {More{}.toString(), std::make_shared<Less>()},

diff --git a/src/fintamath/expressions/binary/DivExpression.cpp b/src/fintamath/expressions/binary/DivExpression.cpp
@@ -3,8 +3,8 @@
 #include <cstddef>
 #include <functional>
 #include <ranges>
-#include <set>
 #include <string>
+#include <unordered_set>
 #include <utility>
 
 #include "fintamath/core/CoreUtils.hpp"
@@ -584,7 +584,7 @@ ArgumentPtr DivExpression::secCscSimplify(const IFunction & /*func*/, const Argu
 }
 
 bool DivExpression::containsDivTrigFunction(const ArgumentPtr &arg) {
-  static const std::set<std::string, std::less<>> functionStrings = {
+  static const std::unordered_set<std::string> functionStrings = {
       Tan{}.toString(),
       Cot{}.toString(),
       Sec{}.toString(),

diff --git a/src/fintamath/expressions/unary/FloorCeilExpression.cpp b/src/fintamath/expressions/unary/FloorCeilExpression.cpp
@@ -1,9 +1,9 @@
 #include "fintamath/expressions/unary/FloorCeilExpression.hpp"
 
 #include <functional>
-#include <map>
 #include <memory>
 #include <string>
+#include <unordered_map>
 #include <utility>
 
 #include "fintamath/core/CoreUtils.hpp"
@@ -55,7 +55,7 @@ ArgumentPtr FloorCeilExpression::negSimplify(const IFunction &func, const Argume
 }
 
 std::shared_ptr<IFunction> FloorCeilExpression::getOppositeFunction(const IFunction &function) {
-  static const std::map<std::string, std::shared_ptr<IFunction>, std::less<>> oppositeFunctions = {
+  static const std::unordered_map<std::string, std::shared_ptr<IFunction>> oppositeFunctions = {
       {Floor{}.toString(), std::make_shared<Ceil>()},
       {Ceil{}.toString(), std::make_shared<Floor>()},
   };

diff --git a/src/fintamath/expressions/unary/HyperbExpression.cpp b/src/fintamath/expressions/unary/HyperbExpression.cpp
@@ -1,9 +1,9 @@
 #include "fintamath/expressions/unary/HyperbExpression.hpp"
 
 #include <functional>
-#include <map>
 #include <memory>
 #include <string>
+#include <unordered_map>
 #include <utility>
 
 #include "fintamath/core/CoreUtils.hpp"
@@ -29,7 +29,7 @@
 
 namespace fintamath {
 
-using SimplifyFunctionMap = std::map<std::string, std::function<ArgumentPtr(const ArgumentPtr &)>, std::less<>>;
+using SimplifyFunctionMap = std::unordered_map<std::string, std::function<ArgumentPtr(const ArgumentPtr &)>>;
 
 HyperbExpression::HyperbExpression(const IFunction &inFunc, ArgumentPtr inChild)
     : IUnaryExpressionCRTP(inFunc, std::move(inChild)) {
@@ -112,7 +112,7 @@ ArgumentPtr HyperbExpression::negSimplify(const IFunction &func, const ArgumentP
 }
 
 std::shared_ptr<IFunction> HyperbExpression::getOppositeFunction(const IFunction &function) {
-  static const std::map<std::string, std::shared_ptr<IFunction>, std::less<>> oppositeFunctions = {
+  static const std::unordered_map<std::string, std::shared_ptr<IFunction>> oppositeFunctions = {
       {Sinh{}.toString(), std::make_unique<Asinh>()},
       {Cosh{}.toString(), std::make_unique<Acosh>()},
       {Tanh{}.toString(), std::make_unique<Atanh>()},

diff --git a/src/fintamath/expressions/unary/InvTrigExpression.cpp b/src/fintamath/expressions/unary/InvTrigExpression.cpp
@@ -1,8 +1,8 @@
 #include "fintamath/expressions/unary/InvTrigExpression.hpp"
 
 #include <functional>
-#include <map>
 #include <string>
+#include <unordered_map>
 #include <utility>
 
 #include "fintamath/core/Converter.hpp"
@@ -26,7 +26,7 @@
 
 namespace fintamath {
 
-using TrigonometryFunctionMap = std::map<std::string, std::function<ArgumentPtr(const Rational &)>, std::less<>>;
+using TrigonometryFunctionMap = std::unordered_map<std::string, std::function<ArgumentPtr(const Rational &)>>;
 
 using TrigonometryTable = std::map<Rational, ArgumentPtr>;
 

diff --git a/src/fintamath/expressions/unary/NotExpression.cpp b/src/fintamath/expressions/unary/NotExpression.cpp
@@ -1,9 +1,9 @@
 #include "fintamath/expressions/unary/NotExpression.hpp"
 
 #include <functional>
-#include <map>
 #include <memory>
 #include <string>
+#include <unordered_map>
 #include <utility>
 
 #include "fintamath/core/CoreUtils.hpp"
@@ -89,7 +89,7 @@ ArgumentPtr NotExpression::nestedNotSimplify(const IFunction & /*func*/, const A
 }
 
 std::shared_ptr<IFunction> NotExpression::getLogicOppositeFunction(const IFunction &function) {
-  static const std::map<std::string, std::shared_ptr<IFunction>, std::less<>> oppositeFunctions = {
+  static const std::unordered_map<std::string, std::shared_ptr<IFunction>> oppositeFunctions = {
       {Eqv{}.toString(), std::make_shared<Neqv>()},
       {Neqv{}.toString(), std::make_shared<Eqv>()},
       {More{}.toString(), std::make_shared<LessEqv>()},

diff --git a/src/fintamath/expressions/unary/TrigExpression.cpp b/src/fintamath/expressions/unary/TrigExpression.cpp
@@ -1,10 +1,10 @@
 #include "fintamath/expressions/unary/TrigExpression.hpp"
 
 #include <functional>
-#include <map>
 #include <memory>
 #include <string>
 #include <tuple>
+#include <unordered_map>
 #include <utility>
 
 #include "fintamath/core/Converter.hpp"
@@ -34,9 +34,9 @@
 
 namespace fintamath {
 
-using SimplifyFunctionMap = std::map<std::string, std::function<ArgumentPtr(const ArgumentPtr &)>, std::less<>>;
+using SimplifyFunctionMap = std::unordered_map<std::string, std::function<ArgumentPtr(const ArgumentPtr &)>>;
 
-using TrigonometryFunctionMap = std::map<std::string, std::function<ArgumentPtr(const Rational &)>, std::less<>>;
+using TrigonometryFunctionMap = std::unordered_map<std::string, std::function<ArgumentPtr(const Rational &)>>;
 
 using TrigonometryTable = std::map<Rational, ArgumentPtr>;
 
@@ -234,7 +234,7 @@ Rational TrigExpression::phaseShiftPeriod(const Rational &rhs) {
 }
 
 std::shared_ptr<IFunction> TrigExpression::getOppositeFunction(const IFunction &function) {
-  static const std::map<std::string, std::shared_ptr<IFunction>, std::less<>> oppositeFunctions = {
+  static const std::unordered_map<std::string, std::shared_ptr<IFunction>> oppositeFunctions = {
       {Sin{}.toString(), std::make_shared<Asin>()},
       {Cos{}.toString(), std::make_shared<Acos>()},
       {Tan{}.toString(), std::make_shared<Atan>()},