Rename temporary variables in computeLocalItemNumberInChildItem

code was correct but hard to read since item and sub-item variable names were
inverted

src/mesh/ConnectivityComputer.cpp

@@ -36,27 +36,26 @@ computeInverseConnectivityMatrix(const ConnectivityMatrix& item_to_child_item_ma
   child_item_to_item_matrix = child_item_to_items_vector;
 }
 
-template <ItemType child_item_type,
-          ItemType item_type,
+template <ItemType item_type,
+          ItemType child_item_type,
           typename ConnectivityType>
-SubItemValuePerItem<const unsigned short, item_type, child_item_type>
+SubItemValuePerItem<const unsigned short, child_item_type, item_type>
 ConnectivityComputer::computeLocalItemNumberInChildItem(const ConnectivityType& connectivity) const
 {
-#warning check that these connectivities are named correctly
   const ConnectivityMatrix& child_item_to_items_matrix
       = getConnectivityMatrix<child_item_type, item_type>(connectivity);
   const ConnectivityMatrix& item_to_child_items_matrix
       = getConnectivityMatrix<item_type, child_item_type>(connectivity);
 
-  SubItemValuePerItem<unsigned short, item_type, child_item_type> item_number_in_child_item(connectivity);
-  for (unsigned int r=0; r<child_item_to_items_matrix.numRows(); ++r) {
-    const auto& child_item_to_items = child_item_to_items_matrix.rowConst(r);
-    for (unsigned short J=0; J<child_item_to_items.length; ++J) {
-      const unsigned int j = child_item_to_items(J);
-      const auto& item_to_child_items = item_to_child_items_matrix.rowConst(j);
+  SubItemValuePerItem<unsigned short, child_item_type, item_type> item_number_in_child_item(connectivity);
+  for (unsigned int r=0; r<item_to_child_items_matrix.numRows(); ++r) {
+    const auto& item_to_child_items = item_to_child_items_matrix.rowConst(r);
+    for (unsigned short J=0; J<item_to_child_items.length; ++J) {
+      const unsigned int j = item_to_child_items(J);
+      const auto& child_item_to_items = child_item_to_items_matrix.rowConst(j);
 
-      for (unsigned int R=0; R<item_to_child_items.length; ++R) {
-        if (item_to_child_items(R) == r) {
+      for (unsigned int R=0; R<child_item_to_items.length; ++R) {
+        if (child_item_to_items(R) == r) {
           item_number_in_child_item(r,J) = R;
           break;
         }

src/mesh/ConnectivityComputer.hpp

@@ -9,11 +9,11 @@ struct ConnectivityComputer
   void computeInverseConnectivityMatrix(const ConnectivityMatrix& item_to_child_item_matrix,
                                         ConnectivityMatrix& child_item_to_item_matrix) const;
 
-  template <ItemType child_item_type,
-            ItemType item_type,
+  template <ItemType item_type,
+            ItemType child_item_type,
             typename ConnectivityType>
-  SubItemValuePerItem<const unsigned short, item_type, child_item_type>
-  computeLocalItemNumberInChildItem(const ConnectivityType& c) const;
+  SubItemValuePerItem<const unsigned short, child_item_type, item_type>
+  computeLocalItemNumberInChildItem(const ConnectivityType& connectivity) const;
 };
 
 #endif // CONNECTIVITY_COMPUTER_HPP