Use std::min and std::max

This commit is contained in:
Romain Goyet
2020-04-12 15:43:39 -04:00
committed by Ecco
parent 77ee5126e1
commit 950862f8d0
79 changed files with 297 additions and 406 deletions

View File

@@ -4,7 +4,7 @@
#include <poincare/code_point_layout.h>
#include <poincare/vertical_offset_layout.h>
#include <poincare/preferences.h>
#include <algorithm>
#include <assert.h>
using namespace Poincare;
@@ -12,8 +12,6 @@ using namespace Shared;
namespace Regression {
static inline int maxInt(int x, int y) { return x > y ? x : y; }
CalculationController::CalculationController(Responder * parentResponder, ButtonRowController * header, Store * store) :
TabTableController(parentResponder),
ButtonRowDelegate(header, nullptr),
@@ -375,7 +373,7 @@ int CalculationController::maxNumberOfCoefficients() const {
int numberOfDefinedSeries = m_store->numberOfNonEmptySeries();
for (int i = 0; i < numberOfDefinedSeries; i++) {
int currentNumberOfCoefs = m_store->modelForSeries(m_store->indexOfKthNonEmptySeries(i))->numberOfCoefficients();
maxNumberCoefficients = maxInt(maxNumberCoefficients, currentNumberOfCoefs);
maxNumberCoefficients = std::max(maxNumberCoefficients, currentNumberOfCoefs);
}
return maxNumberCoefficients;
}