Add type alias and pointer in arguments

ls1mardyn · Jul 29, 2024 · 23e8b9d · 23e8b9d
1 parent c903ba6
commit 23e8b9d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/molecules/Comp2Param.cpp b/src/molecules/Comp2Param.cpp
@@ -8,7 +8,7 @@
 
 
 void Comp2Param::initialize(
-		const std::vector<Component>& components, std::map<int,std::map<int,MixingRuleBase*>> mixcoeff,
+		const std::vector<Component>& components, const MixRulesType & mixcoeff,
 		double epsRF, double rc, double rcLJ)
 {
 	m_numcomp = components.size();
@@ -41,7 +41,7 @@ void Comp2Param::initialize(
 		for (unsigned int compj = compi + 1; compj < m_numcomp; ++compj) {
 			ParaStrm& pstrmij = m_ssparatbl(compi, compj);
 			unsigned int ncj = components[compj].numLJcenters();
-			const auto mixingrule = mixcoeff[compi][compj];
+			const auto mixingrule = mixcoeff.at(compi).at(compj);
 			// Generic mixing functions
 			std::function<double(double, double)> mixingSigma;
 			std::function<double(double, double)> mixingEpsilon;

diff --git a/src/molecules/Comp2Param.h b/src/molecules/Comp2Param.h
@@ -14,6 +14,9 @@
  * @author Martin Bernreuther <[email protected]> et al. (2010)
  */
 class Comp2Param {
+
+    using MixRulesType = std::map<int,std::map<int,MixingRuleBase*>>;
+
     public:
         /** Create a new empty parameter stream. */
         Comp2Param() : m_numcomp(0), m_ssparatbl(0,0) {}
@@ -22,7 +25,7 @@ class Comp2Param {
          * the given components and parameters.
          */
         Comp2Param(const std::vector<Component>& components,
-				   std::map<int,std::map<int,MixingRuleBase*>> mixcoeff,
+				   const MixRulesType & mixcoeff,
 				   double epsRF, double rc, double rcLJ) :
 			m_numcomp(components.size()), m_ssparatbl(m_numcomp,m_numcomp)
 		{
@@ -39,7 +42,7 @@ class Comp2Param {
          *   The order of the entries must correspond to the
          *   PotForce() function found in potforce.h reading the stream
          */
-        void initialize(const std::vector<Component>& components, std::map<int,std::map<int,MixingRuleBase*>> mixcoeff, double epsRF, double rc, double rcLJ);
+        void initialize(const std::vector<Component>& components, const MixRulesType & mixcoeff, double epsRF, double rc, double rcLJ);
 
     private:
         unsigned int m_numcomp;  /**< number of components */