ranges

Author: dweindl

src/model.cpp

@@ -98,7 +98,7 @@ static realtype getValueById(
     std::vector<std::string> const& ids, std::vector<realtype> const& values,
     std::string const& id, char const* variable_name, char const* id_name
 ) {
-    auto it = std::find(ids.begin(), ids.end(), id);
+    auto it = std::ranges::find(ids, id);
     if (it != ids.end())
         return values.at(it - ids.begin());
 
@@ -121,7 +121,7 @@ static void setValueById(
     realtype value, std::string const& id, char const* variable_name,
     char const* id_name
 ) {
-    auto it = std::find(ids.begin(), ids.end(), id);
+    auto it = std::ranges::find(ids, id);
     if (it != ids.end())
         values.at(it - ids.begin()) = value;
     else
@@ -338,8 +338,8 @@ void Model::initializeSplineSensitivities() {
     std::vector<realtype> tmp_dvalues(allnodes, 0.0);
     std::vector<realtype> tmp_dslopes(allnodes, 0.0);
     for (int ip = 0; ip < nplist(); ip++) {
-        std::fill(tmp_dvalues.begin(), tmp_dvalues.end(), 0.0);
-        std::fill(tmp_dslopes.begin(), tmp_dslopes.end(), 0.0);
+        std::ranges::fill(tmp_dvalues, 0.0);
+        std::ranges::fill(tmp_dslopes, 0.0);
         fdspline_valuesdp(
             tmp_dvalues.data(), state_.unscaledParameters.data(),
             state_.fixedParameters.data(), plist(ip)
@@ -405,7 +405,7 @@ void Model::initEvents(
 ) {
     std::vector<realtype> rootvals(ne, 0.0);
     froot(simulation_parameters_.tstart_, x, dx, rootvals);
-    std::fill(roots_found.begin(), roots_found.end(), 0);
+    std::ranges::fill(roots_found, 0);
     for (int ie = 0; ie < ne; ie++) {
         if (rootvals.at(ie) < 0) {
             state_.h.at(ie) = 0.0;
@@ -796,7 +796,7 @@ double Model::getTimepoint(int const it) const {
 }
 
 void Model::setTimepoints(std::vector<realtype> const& ts) {
-    if (!std::is_sorted(ts.begin(), ts.end()))
+    if (!std::ranges::is_sorted(ts))
         throw AmiException("Encountered non-monotonic timepoints, please order"
                            " timepoints such that they are monotonically"
                            " increasing!");
@@ -813,9 +813,7 @@ std::vector<bool> const& Model::getStateIsNonNegative() const {
 
 void Model::setStateIsNonNegative(std::vector<bool> const& nonNegative) {
     auto any_state_non_negative
-        = std::any_of(nonNegative.begin(), nonNegative.end(), [](bool x) {
-              return x;
-          });
+        = std::ranges::any_of(nonNegative, [](bool x) { return x; });
     if (nx_solver != nx_rdata) {
         if (any_state_non_negative)
             throw AmiException("Non-negative states are not supported with"
@@ -845,7 +843,7 @@ int Model::plist(int pos) const { return state_.plist.at(pos); }
 
 void Model::setParameterList(std::vector<int> const& plist) {
     int np = this->np(); // cannot capture 'this' in lambda expression
-    if (std::any_of(plist.begin(), plist.end(), [&np](int idx) {
+    if (std::ranges::any_of(plist, [&np](int idx) {
             return idx < 0 || idx >= np;
         })) {
         throw AmiException("Indices in plist must be in [0..np]");
@@ -1112,7 +1110,7 @@ void Model::addObservableObjective(
     std::vector<realtype> nllh(nJ, 0.0);
     for (int iyt = 0; iyt < nytrue; iyt++) {
         if (edata.isSetObservedData(it, iyt)) {
-            std::fill(nllh.begin(), nllh.end(), 0.0);
+            std::ranges::fill(nllh, 0.0);
             fJy(nllh.data(), iyt, state_.unscaledParameters.data(),
                 state_.fixedParameters.data(), derived_state_.y_.data(),
                 derived_state_.sigmay_.data(), edata.getObservedDataPtr(it));
@@ -1303,7 +1301,7 @@ void Model::addEventObjective(
     std::vector<realtype> nllh(nJ, 0.0);
     for (int iztrue = 0; iztrue < nztrue; iztrue++) {
         if (edata.isSetObservedEvents(nroots, iztrue)) {
-            std::fill(nllh.begin(), nllh.end(), 0.0);
+            std::ranges::fill(nllh, 0.0);
             fJz(nllh.data(), iztrue, state_.unscaledParameters.data(),
                 state_.fixedParameters.data(), derived_state_.z_.data(),
                 derived_state_.sigmaz_.data(),
@@ -1323,7 +1321,7 @@ void Model::addEventObjectiveRegularization(
     std::vector<realtype> nllh(nJ, 0.0);
     for (int iztrue = 0; iztrue < nztrue; iztrue++) {
         if (edata.isSetObservedEvents(nroots, iztrue)) {
-            std::fill(nllh.begin(), nllh.end(), 0.0);
+            std::ranges::fill(nllh, 0.0);
             fJrz(
                 nllh.data(), iztrue, state_.unscaledParameters.data(),
                 state_.fixedParameters.data(), derived_state_.rz_.data(),
@@ -1395,7 +1393,7 @@ void Model::getEventTimeSensitivity(
     AmiVector const& x, AmiVectorArray const& sx
 ) {
 
-    std::fill(stau.begin(), stau.end(), 0.0);
+    std::ranges::fill(stau, 0.0);
 
     for (int ip = 0; ip < nplist(); ip++) {
         fstau(
@@ -1525,7 +1523,7 @@ void Model::updateHeavisideB(int const* rootsfound) {
 int Model::checkFinite(
     gsl::span<realtype const> array, ModelQuantity model_quantity, realtype t
 ) const {
-    auto it = std::find_if(array.begin(), array.end(), [](realtype x) {
+    auto it = std::ranges::find_if(array, [](realtype x) {
         return !std::isfinite(x);
     });
     if (it == array.end()) {
@@ -1624,7 +1622,7 @@ int Model::checkFinite(
     gsl::span<realtype const> array, ModelQuantity model_quantity,
     size_t num_cols, realtype t
 ) const {
-    auto it = std::find_if(array.begin(), array.end(), [](realtype x) {
+    auto it = std::ranges::find_if(array, [](realtype x) {
         return !std::isfinite(x);
     });
     if (it == array.end()) {
@@ -1739,7 +1737,7 @@ int Model::checkFinite(SUNMatrix m, ModelQuantity model_quantity, realtype t)
     // check flat array, to see if there are any issues
     // (faster, in particular for sparse arrays)
     auto m_flat = gsl::make_span(m);
-    auto it = std::find_if(m_flat.begin(), m_flat.end(), [](realtype x) {
+    auto it = std::ranges::find_if(m_flat, [](realtype x) {
         return !std::isfinite(x);
     });
     if (it == m_flat.end()) {
@@ -1831,9 +1829,7 @@ void Model::setAlwaysCheckFinite(bool alwaysCheck) {
 bool Model::getAlwaysCheckFinite() const { return always_check_finite_; }
 
 void Model::fx0(AmiVector& x) {
-    std::fill(
-        derived_state_.x_rdata_.begin(), derived_state_.x_rdata_.end(), 0.0
-    );
+    std::ranges::fill(derived_state_.x_rdata_, 0.0);
     /* this function  also computes initial total abundances */
     fx0(derived_state_.x_rdata_.data(), simulation_parameters_.tstart_,
         state_.unscaledParameters.data(), state_.fixedParameters.data());
@@ -1877,10 +1873,7 @@ void Model::fsx0(AmiVectorArray& sx, AmiVector const& x) {
     for (int ip = 0; ip < nplist(); ip++) {
         if (ncl() > 0)
             stcl = &state_.stotal_cl.at(plist(ip) * ncl());
-        std::fill(
-            derived_state_.sx_rdata_.begin(), derived_state_.sx_rdata_.end(),
-            0.0
-        );
+        std::ranges::fill(derived_state_.sx_rdata_, 0.0);
         fsx0(
             derived_state_.sx_rdata_.data(), simulation_parameters_.tstart_,
             computeX_pos(x), state_.unscaledParameters.data(),
@@ -2244,10 +2237,7 @@ void Model::fdJydy(int const it, AmiVector const& x, ExpData const& edata) {
             }
         }
     } else {
-        std::fill(
-            derived_state_.dJydy_matlab_.begin(),
-            derived_state_.dJydy_matlab_.end(), 0.0
-        );
+        std::ranges::fill(derived_state_.dJydy_matlab_, 0.0);
         for (int iyt = 0; iyt < nytrue; iyt++) {
             if (!edata.isSetObservedData(it, iyt))
                 continue;
@@ -2821,7 +2811,7 @@ void Model::fsspl(realtype const t) {
 
 void Model::fw(realtype const t, realtype const* x, bool include_static) {
     if (include_static) {
-        std::fill(derived_state_.w_.begin(), derived_state_.w_.end(), 0.0);
+        std::ranges::fill(derived_state_.w_, 0.0);
     }
     fspl(t);
     fw(derived_state_.w_.data(), t, x, state_.unscaledParameters.data(),
@@ -3076,7 +3066,7 @@ std::vector<double> Model::get_trigger_timepoints() const {
     for (auto const& kv : state_independent_events_) {
         *(it++) = kv.first;
     }
-    std::sort(trigger_timepoints.begin(), trigger_timepoints.end());
+    std::ranges::sort(trigger_timepoints);
     return trigger_timepoints;
 }