[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: koffice/kspread
From: Stefan Nikolaus <nikolaus4 () googlemail ! com>
Date: 2007-06-26 8:19:57
Message-ID: 1182845997.706908.10296.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 680448 by nikolaus:
compile
M +1 -1 Number.h
M +2 -2 plugins/solver/Solver.cpp
M +1 -1 tests/TestDatetimeFunctions.cpp
M +3 -3 tests/TestEngineeringFunctions.cpp
M +1 -1 tests/TestFinancialFunctions.cpp
M +1 -1 tests/TestMathFunctions.cpp
M +2 -2 tests/TestStatisticalFunctions.cpp
M +1 -1 tests/TestTrigFunctions.cpp
M +9 -9 tests/TestValue.cpp
--- trunk/koffice/kspread/Number.h #680447:680448
@@ -128,7 +128,7 @@
// conversion to double ... when we add the option to #define the Number class as \
double, this routine should be kept in place, and it should simply return its \
parameter // usage of this function should eventually be removed, because places \
that use it are not ready for high precision support
-double numToDouble (Number n);
+KSPREAD_EXPORT double numToDouble (Number n);
// external operators, so that we can do things like 4+a without having to create \
temporary objects // not provided for complex numbers, as we won't be using them \
often like that
--- trunk/koffice/kspread/plugins/solver/Solver.cpp #680447:680448
@@ -149,7 +149,7 @@
gsl_vector* x = gsl_vector_alloc( dimension );
foreach (Cell cell, parameters->cells)
{
- gsl_vector_set( x, index++, cell.value().asFloat() );
+ gsl_vector_set( x, index++, numToDouble(cell.value().asFloat()) );
}
/* Initialize method and iterate */
@@ -218,7 +218,7 @@
}
// TODO check for errors/correct type
- return s_formula->eval().asFloat();
+ return numToDouble(s_formula->eval().asFloat());
}
#include "Solver.moc"
--- trunk/koffice/kspread/tests/TestDatetimeFunctions.cpp #680447:680448
@@ -52,7 +52,7 @@
{
if(v.isNumber())
{
- double d = v.asFloat();
+ double d = numToDouble(v.asFloat());
if(fabs(d) < DBL_EPSILON)
d = 0.0;
return Value( QString::number(d, 'g', 9) );
--- trunk/koffice/kspread/tests/TestEngineeringFunctions.cpp #680447:680448
@@ -40,8 +40,8 @@
{
if ( v.isComplex() )
{
- const double imag = v.asComplex().imag();
- QString complex = QString::number( v.asComplex().real(), 'g', 10);
+ const double imag = numToDouble(v.asComplex().imag());
+ QString complex = QString::number( numToDouble(v.asComplex().real()), 'g', \
10); if ( imag >= 0.0 )
complex += '+';
complex += QString::number( imag, 'g', 10);
@@ -49,7 +49,7 @@
return Value( complex );
}
else if ( v.isNumber() )
- return Value( QString::number(v.asFloat(), 'g', 10) );
+ return Value( QString::number(numToDouble(v.asFloat()), 'g', 10) );
else
return v;
}
--- trunk/koffice/kspread/tests/TestFinancialFunctions.cpp #680447:680448
@@ -38,7 +38,7 @@
static Value RoundNumber(const Value& v)
{
if(v.isNumber())
- return Value( QString::number(v.asFloat(), 'g', 10) );
+ return Value( QString::number(numToDouble(v.asFloat()), 'g', 10) );
else
return v;
}
--- trunk/koffice/kspread/tests/TestMathFunctions.cpp #680447:680448
@@ -39,7 +39,7 @@
{
if(v.isNumber())
{
- double d = v.asFloat();
+ double d = numToDouble(v.asFloat());
if(fabs(d) < DBL_EPSILON)
d = 0.0;
return Value( QString::number(d, 'g', 15) );
--- trunk/koffice/kspread/tests/TestStatisticalFunctions.cpp #680447:680448
@@ -46,7 +46,7 @@
static Value RoundNumber(const Value& v)
{
if(v.isNumber())
- return Value( QString::number(v.asFloat(), 'g', 15) );
+ return Value( QString::number(numToDouble(v.asFloat()), 'g', 15) );
else
return v;
}
@@ -76,7 +76,7 @@
QString message;
QTextStream ts( &message, QIODevice::WriteOnly );
if( value.isFloat() )
- ts << QString::number(value.asFloat(), 'g', 20);
+ ts << QString::number(numToDouble(value.asFloat()), 'g', 20);
else
ts << value;
return qstrdup(message.toLatin1());
--- trunk/koffice/kspread/tests/TestTrigFunctions.cpp #680447:680448
@@ -39,7 +39,7 @@
{
if(v.isNumber())
{
- double d = v.asFloat();
+ double d = numToDouble(v.asFloat());
if(fabs(d) < DBL_EPSILON)
d = 0.0;
return Value( QString::number(d, 'g', 10) );
--- trunk/koffice/kspread/tests/TestValue.cpp #680447:680448
@@ -86,7 +86,7 @@
// floating-point value
v1 = new Value( M_PI );
QCOMPARE( v1->type(), Value::Float );
- QCOMPARE( v1->asFloat(), M_PI );
+ QCOMPARE( numToDouble(v1->asFloat()), M_PI );
*v1 = Value( false ); // dummy
*v1 = Value( 14.03 );
QCOMPARE( v1->type(), Value::Float );
@@ -94,7 +94,7 @@
QCOMPARE( v1->isFloat(), true );
QCOMPARE( v1->isString(), false );
QCOMPARE( v1->isNumber(), true );
- QCOMPARE( v1->asFloat(), 14.03 );
+ QCOMPARE( numToDouble(v1->asFloat()), 14.03 );
delete v1;
}
@@ -146,7 +146,7 @@
if( !dv1.isValid() ) continue;
double serialNo = -dv1.daysTo( refDate ) + 1.0;
*v1 = Value( Value( dv1, &doc ) );
- QCOMPARE(v1->asFloat(),serialNo);
+ QCOMPARE(numToDouble(v1->asFloat()),serialNo);
date_error = v1->asFloat() != serialNo;
}
delete v1;
@@ -241,7 +241,7 @@
delete v2;
v2 = new Value( v1->element( 0, 0 ) );
QCOMPARE( v2->type(), Value::Float );
- QCOMPARE( v2->asFloat(), 14.3 );
+ QCOMPARE( numToDouble(v2->asFloat()), 14.3 );
delete v2;
delete v1;
@@ -278,7 +278,7 @@
delete v1;
v1 = new Value( v2->element( 0, 0 ) );
QCOMPARE( v1->type(), Value::Float );
- QCOMPARE( v1->asFloat(), 14.3 );
+ QCOMPARE( numToDouble(v1->asFloat()), 14.3 );
delete v1;
delete v2;
@@ -306,8 +306,8 @@
v2 = new Value( *v1 );
QCOMPARE( v1->type(), Value::Float );
QCOMPARE( v2->type(), Value::Float );
- QCOMPARE( v1->asFloat(), 14.3 );
- QCOMPARE( v2->asFloat(), 14.3 );
+ QCOMPARE( numToDouble(v1->asFloat()), 14.3 );
+ QCOMPARE( numToDouble(v2->asFloat()), 14.3 );
delete v1;
delete v2;
}
@@ -323,8 +323,8 @@
*v2 = *v1;
QCOMPARE( v1->type(), Value::Float );
QCOMPARE( v2->type(), Value::Float );
- QCOMPARE( v1->asFloat(), 14.3 );
- QCOMPARE( v2->asFloat(), 14.3 );
+ QCOMPARE( numToDouble(v1->asFloat()), 14.3 );
+ QCOMPARE( numToDouble(v2->asFloat()), 14.3 );
delete v1;
delete v2;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic