We don't use 'using' for other std types either in this file

Change-Id: I561e515da65db619330b536e3c8c6de555730740
This commit is contained in:
Tor Lillqvist
2016-03-03 21:38:22 +02:00
parent db145e5073
commit 56f81d96e3

View File

@@ -17,8 +17,6 @@
#include <cmath> #include <cmath>
#include <vector> #include <vector>
using ::std::vector;
using namespace formula; using namespace formula;
struct DataPoint struct DataPoint
@@ -72,7 +70,7 @@ class ScETSForecastCalculation
{ {
private: private:
SvNumberFormatter* mpFormatter; SvNumberFormatter* mpFormatter;
vector< DataPoint > maRange; // data (X, Y) std::vector< DataPoint > maRange; // data (X, Y)
double* mpBase; // calculated base value array double* mpBase; // calculated base value array
double* mpTrend; // calculated trend factor array double* mpTrend; // calculated trend factor array
double* mpPerIdx; // calculated periodical deviation array, not used with eds double* mpPerIdx; // calculated periodical deviation array, not used with eds
@@ -267,7 +265,7 @@ bool ScETSForecastCalculation::PreprocessDataRange( ScMatrixRef rMatX, ScMatrixR
case 5 : // MEDIAN case 5 : // MEDIAN
{ {
vector< double > aTmp; std::vector< double > aTmp;
aTmp.push_back( maRange[ i - 1 ].Y ); aTmp.push_back( maRange[ i - 1 ].Y );
while ( maRange[ i ].X == maRange[ i - 1 ].X && i < mnCount ) while ( maRange[ i ].X == maRange[ i - 1 ].X && i < mnCount )
{ {
@@ -436,7 +434,7 @@ bool ScETSForecastCalculation::prefillPerIdx()
return false; return false;
} }
SCSIZE nPeriods = mnCount / mnSmplInPrd; SCSIZE nPeriods = mnCount / mnSmplInPrd;
vector< double > aPeriodAverage( nPeriods, 0.0 ); std::vector< double > aPeriodAverage( nPeriods, 0.0 );
for ( SCSIZE i = 0; i < nPeriods ; i++ ) for ( SCSIZE i = 0; i < nPeriods ; i++ )
{ {
for ( SCSIZE j = 0; j < mnSmplInPrd; j++ ) for ( SCSIZE j = 0; j < mnSmplInPrd; j++ )
@@ -1003,7 +1001,7 @@ bool ScETSForecastCalculation::GetETSPredictionIntervals( ScMatrixRef rTMat, ScM
std::unique_ptr< double[] > xScenBase( new double[nSize]); std::unique_ptr< double[] > xScenBase( new double[nSize]);
std::unique_ptr< double[] > xScenTrend( new double[nSize]); std::unique_ptr< double[] > xScenTrend( new double[nSize]);
std::unique_ptr< double[] > xScenPerIdx( new double[nSize]); std::unique_ptr< double[] > xScenPerIdx( new double[nSize]);
vector< vector< double > > aPredictions( nSize, vector< double >( cnScenarios ) ); std::vector< std::vector< double > > aPredictions( nSize, std::vector< double >( cnScenarios ) );
// fill scenarios // fill scenarios
for ( SCSIZE k = 0; k < cnScenarios; k++ ) for ( SCSIZE k = 0; k < cnScenarios; k++ )
@@ -1132,7 +1130,7 @@ bool ScETSForecastCalculation::GetEDSPredictionIntervals( ScMatrixRef rTMat, ScM
double z = ScInterpreter::gaussinv( ( 1.0 + fPILevel ) / 2.0 ); double z = ScInterpreter::gaussinv( ( 1.0 + fPILevel ) / 2.0 );
double o = 1 - fPILevel; double o = 1 - fPILevel;
vector< double > c( nSize ); std::vector< double > c( nSize );
for ( SCSIZE i = 0; i < nSize; i++ ) for ( SCSIZE i = 0; i < nSize; i++ )
{ {
c[ i ] = sqrt( 1 + ( fPILevel / pow( 1 + o, 3.0 ) ) * c[ i ] = sqrt( 1 + ( fPILevel / pow( 1 + o, 3.0 ) ) *