diff --git a/stepmania/src/RageUtil.cpp b/stepmania/src/RageUtil.cpp index b8627624d4..b504f5caa8 100644 --- a/stepmania/src/RageUtil.cpp +++ b/stepmania/src/RageUtil.cpp @@ -1000,7 +1000,7 @@ float calc_stddev( const float *pStart, const float *pEnd, bool bSample ) } bool CalcLeastSquares( const vector< pair > &vCoordinates, - float &pfSlope, float &pfIntercept, float &pfError ) + float &fSlope, float &fIntercept, float &fError ) { if( vCoordinates.empty() ) return false; @@ -1013,17 +1013,17 @@ bool CalcLeastSquares( const vector< pair > &vCoordinates, fSumY += vCoordinates[i].second; } const float fDenominator = vCoordinates.size() * fSumXX - fSumX * fSumX; - pfSlope = (vCoordinates.size() * fSumXY - fSumX * fSumY) / fDenominator; - pfIntercept = (fSumXX * fSumY - fSumX * fSumXY) / fDenominator; + fSlope = (vCoordinates.size() * fSumXY - fSumX * fSumY) / fDenominator; + fIntercept = (fSumXX * fSumY - fSumX * fSumXY) / fDenominator; - pfError = 0.0f; + fError = 0.0f; for( unsigned i = 0; i < vCoordinates.size(); ++i ) { - const float fOneError = pfIntercept + pfSlope * vCoordinates[i].first - vCoordinates[i].second; - pfError += fOneError * fOneError; + const float fOneError = fIntercept + fSlope * vCoordinates[i].first - vCoordinates[i].second; + fError += fOneError * fOneError; } - pfError /= vCoordinates.size(); - pfError = sqrtf( pfError ); + fError /= vCoordinates.size(); + fError = sqrtf( fError ); return true; } diff --git a/stepmania/src/RageUtil.h b/stepmania/src/RageUtil.h index bf1ef8a679..8892cef5d6 100644 --- a/stepmania/src/RageUtil.h +++ b/stepmania/src/RageUtil.h @@ -450,7 +450,7 @@ float calc_stddev( const float *pStart, const float *pEnd, bool bSample = false * Returns true on success, false on failure. */ bool CalcLeastSquares( const vector< pair > &vCoordinates, - float &p_fSlope, float &p_fIntercept, float &p_fError ); + float &fSlope, float &fIntercept, float &fError ); /* * This method throws away any points that are more than fCutoff away from