9th trial tidy and format

Author: salva24

src/cart_cell.cc

@@ -24,11 +24,7 @@
 #include <cstdint>
 #include <stdexcept>
 #include <string>
-
 #include "cart_cell.h"
-#include "hyperparams.h"
-#include "tumor_cell.h"
-#include "utils_aux.h"
 #include "core/agent/agent.h"
 #include "core/agent/new_agent_event.h"
 #include "core/container/math_array.h"
@@ -38,6 +34,9 @@
 #include "core/real_t.h"
 #include "core/resource_manager.h"
 #include "core/util/log.h"
+#include "hyperparams.h"
+#include "tumor_cell.h"
+#include "utils_aux.h"
 
 namespace bdm {
 

src/diffusion_thomas_algorithm.cc

@@ -23,15 +23,14 @@
 #include <string>
 #include <utility>
 #include <vector>
-
 #include "cart_cell.h"
-#include "diffusion_thomas_algorithm.h"
-#include "hyperparams.h"
-#include "tumor_cell.h"
 #include "core/agent/agent.h"
 #include "core/diffusion/diffusion_grid.h"
 #include "core/real_t.h"
 #include "core/resource_manager.h"
+#include "diffusion_thomas_algorithm.h"
+#include "hyperparams.h"
+#include "tumor_cell.h"
 
 namespace bdm {
 
@@ -42,7 +41,7 @@ DiffusionThomasAlgorithm::DiffusionThomasAlgorithm(int substance_id,
                                                    bool dirichlet_border)
     : DiffusionGrid(substance_id, std::move(substance_name), dc, mu,
                     resolution),
-      resolution_(GetResolution()),
+      resolution_(static_cast<int>(GetResolution())),
       d_space_(static_cast<real_t>(kBoundedSpaceLength) /
                static_cast<real_t>(resolution_)),
       dirichlet_border_(dirichlet_border),
@@ -290,7 +289,7 @@ void DiffusionThomasAlgorithm::BackSubstitution(
   // Back substitution loop
   for (int inner = resolution_ - 2; inner >= 0; inner--) {
     const size_t ind =
-        GetLoopIndex(direction, outer, middle, static_cast<int>(inner));
+        GetLoopIndex(direction, outer, middle, inner);
     const real_t current_concentration = all_concentrations[ind];
     const real_t next_concentration = all_concentrations[ind + jump];
     SetConcentration(

src/forces_tumor_cart.cc

@@ -22,13 +22,11 @@
 #include <algorithm>
 #include <cmath>
 #include <memory>
-
 #include "core/agent/agent.h"
 #include "core/agent/cell.h"
 #include "core/container/math_array.h"
 #include "core/interaction_force.h"
 #include "core/real_t.h"
-
 #include "forces_tumor_cart.h"
 #include "hyperparams.h"
 #include "tumor_cell.h"

src/tumor_cell.cc

@@ -19,9 +19,10 @@
  * for the compiler-research.org organization.
  */
 
-#include "tumor_cell.h"
-#include "hyperparams.h"
-#include "utils_aux.h"
+#include <algorithm>
+#include <cstdint>
+#include <stdexcept>
+#include <string>
 #include "core/agent/agent.h"
 #include "core/agent/cell_division_event.h"
 #include "core/agent/new_agent_event.h"
@@ -31,10 +32,10 @@
 #include "core/real_t.h"
 #include "core/resource_manager.h"
 #include "core/util/log.h"
-#include <algorithm>
-#include <cstdint>
-#include <stdexcept>
-#include <string>
+#include "hyperparams.h"
+#include "tumor_cell.h"
+#include "utils_aux.h"
+
 
 namespace bdm {
 

src/utils_aux.cc

@@ -26,14 +26,14 @@
 #include <tuple>
 #include <vector>
 
-#include "hyperparams.h"
-#include "tumor_cell.h"
-#include "utils_aux.h"
 #include "core/agent/agent.h"
 #include "core/container/math_array.h"
 #include "core/real_t.h"
 #include "core/resource_manager.h"
 #include "core/util/math.h"
+#include "hyperparams.h"
+#include "tumor_cell.h"
+#include "utils_aux.h"
 
 namespace bdm {