@@ -42,8 +42,8 @@ class RegulatoryNetwork : public Behavior {
4242#ifndef __ROOTCLING__
4343 RegulatoryNetwork (
4444 real_t dt, int n_dt, const std::vector<real_t >& x, ODE_solver m,
45- const std::function<void (const b_vector_t &, b_vector_t &, real_t ,
46- Agent*)>& rhs,
45+ const std::function<void (const b_vector_t &, b_vector_t &, real_t , Agent*)>&
46+ rhs,
4747 const std::function<void(const b_vector_t &, b_matrix_t &, real_t ,
4848 b_vector_t &, Agent*)>& jacob,
4949 const std::function<void(const b_vector_t &, real_t , Agent*)>& out) {
@@ -98,14 +98,11 @@ class RegulatoryNetwork : public Behavior {
9898 // update the previous solution
9999 previous_species_ = current_species_;
100100
101- auto ode_rhs_ = [&](const b_vector_t & x, b_vector_t & dxdt,
102- real_t t) {
101+ auto ode_rhs_ = [&](const b_vector_t & x, b_vector_t & dxdt, real_t t) {
103102 rhs_ (x, dxdt, t, agent);
104103 };
105- auto ode_jacob_ = [&](const b_vector_t & x, b_matrix_t & jac,
106- real_t t, b_vector_t & dfdt) {
107- jacob_ (x, jac, t, dfdt, agent);
108- };
104+ auto ode_jacob_ = [&](const b_vector_t & x, b_matrix_t & jac, real_t t,
105+ b_vector_t & dfdt) { jacob_ (x, jac, t, dfdt, agent); };
109106
110107 // initialize the time-integration scheme
111108 if (ODE_solver::Euler == method_) {
@@ -132,10 +129,9 @@ class RegulatoryNetwork : public Behavior {
132129
133130 // perform the time-integration
134131 integrate_const (stepper, std::make_pair (ode_rhs_, ode_jacob_),
135- current_species_,
136- current_time_, (current_time_ + time_step_),
137- (time_step_/time_subdivision_)
138- );
132+ current_species_, current_time_,
133+ (current_time_ + time_step_),
134+ (time_step_ / time_subdivision_));
139135 } else if (ODE_solver::RungeKutta == method_) {
140136 typedef boost::numeric::odeint::runge_kutta_dopri5<b_vector_t > ode_int;
141137
@@ -144,10 +140,9 @@ class RegulatoryNetwork : public Behavior {
144140 boost::numeric::odeint::make_dense_output<ode_int>(1e-6 , 1e-6 );
145141
146142 // perform the time-integration
147- integrate_const (stepper, ode_rhs_,
148- current_species_,
149- current_time_, (current_time_ + time_step_),
150- (time_step_/time_subdivision_));
143+ integrate_const (stepper, ode_rhs_, current_species_, current_time_,
144+ (current_time_ + time_step_),
145+ (time_step_ / time_subdivision_));
151146 } else {
152147 Log::Fatal (" RegulatoryNetwork::Run" ,
153148 " invalid type of ODE solution method indicated" );
@@ -192,9 +187,9 @@ class RegulatoryNetwork : public Behavior {
192187#endif
193188
194189#ifndef __ROOTCLING__
195- std::function<void (const b_vector_t &, b_vector_t &, real_t , Agent*)>
196- rhs_;
197- std::function< void ( const b_vector_t &, b_matrix_t &, real_t , b_vector_t &, Agent*)>
190+ std::function<void (const b_vector_t &, b_vector_t &, real_t , Agent*)> rhs_;
191+ std::function< void ( const b_vector_t &, b_matrix_t &, real_t , b_vector_t &,
192+ Agent*)>
198193 jacob_;
199194 std::function<void (const b_vector_t &, real_t , Agent*)> out_;
200195#endif
0 commit comments