[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdeutils/kcalc
From: Evan Teran <eteran () alum ! rit ! edu>
Date: 2010-09-04 0:10:25
Message-ID: 20100904001025.1F64EAC884 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1171491 by teran:
because KNumber does allocations upon copy (pointer to implementation)
and it is not reference counted, it is cheaper to pass by const reference
whenever possible and appropriate.
M +49 -49 kcalc_core.cpp
M +48 -48 kcalc_core.h
--- trunk/KDE/kdeutils/kcalc/kcalc_core.cpp #1171490:1171491
@@ -233,7 +233,7 @@
return last_number_;
}
-void CalcEngine::ArcCosDeg(KNumber input)
+void CalcEngine::ArcCosDeg(const KNumber &input)
{
if (input.type() == KNumber::SpecialType ||
input < -KNumber::One || input > KNumber::One) {
@@ -258,7 +258,7 @@
last_number_ = Rad2Deg(KNumber(acos(static_cast<double>(input))));
}
-void CalcEngine::ArcCosRad(KNumber input)
+void CalcEngine::ArcCosRad(const KNumber &input)
{
if (input.type() == KNumber::SpecialType ||
input < -KNumber::One || input > KNumber::One) {
@@ -268,7 +268,7 @@
last_number_ = KNumber(acos(static_cast<double>(input)));
}
-void CalcEngine::ArcCosGrad(KNumber input)
+void CalcEngine::ArcCosGrad(const KNumber &input)
{
if (input.type() == KNumber::SpecialType ||
input < -KNumber::One || input > KNumber::One) {
@@ -292,7 +292,7 @@
last_number_ = Rad2Gra(KNumber(acos(static_cast<double>(input))));
}
-void CalcEngine::ArcSinDeg(KNumber input)
+void CalcEngine::ArcSinDeg(const KNumber &input)
{
if (input.type() == KNumber::SpecialType ||
input < -KNumber::One || input > KNumber::One) {
@@ -316,7 +316,7 @@
last_number_ = Rad2Deg(KNumber(asin(static_cast<double>(input))));
}
-void CalcEngine::ArcSinRad(KNumber input)
+void CalcEngine::ArcSinRad(const KNumber &input)
{
if (input.type() == KNumber::SpecialType ||
input < -KNumber::One || input > KNumber::One) {
@@ -326,7 +326,7 @@
last_number_ = KNumber(asin(static_cast<double>(input)));
}
-void CalcEngine::ArcSinGrad(KNumber input)
+void CalcEngine::ArcSinGrad(const KNumber &input)
{
if (input.type() == KNumber::SpecialType ||
input < -KNumber::One || input > KNumber::One) {
@@ -350,7 +350,7 @@
last_number_ = Rad2Gra(KNumber(asin(static_cast<double>(input))));
}
-void CalcEngine::ArcTangensDeg(KNumber input)
+void CalcEngine::ArcTangensDeg(const KNumber &input)
{
if (input.type() == KNumber::SpecialType) {
if (input == KNumber("nan")) last_number_ = KNumber("nan");
@@ -362,7 +362,7 @@
last_number_ = Rad2Deg(KNumber(atan(static_cast<double>(input))));
}
-void CalcEngine::ArcTangensRad(KNumber input)
+void CalcEngine::ArcTangensRad(const KNumber &input)
{
if (input.type() == KNumber::SpecialType) {
if (input == KNumber("nan")) last_number_ = KNumber("nan");
@@ -376,7 +376,7 @@
last_number_ = KNumber(atan(static_cast<double>(input)));
}
-void CalcEngine::ArcTangensGrad(KNumber input)
+void CalcEngine::ArcTangensGrad(const KNumber &input)
{
if (input.type() == KNumber::SpecialType) {
if (input == KNumber("nan")) last_number_ = KNumber("nan");
@@ -388,7 +388,7 @@
last_number_ = Rad2Gra(KNumber(atan(static_cast<double>(input))));
}
-void CalcEngine::AreaCosHyp(KNumber input)
+void CalcEngine::AreaCosHyp(const KNumber &input)
{
if (input.type() == KNumber::SpecialType) {
if (input == KNumber("nan")) last_number_ = KNumber("nan");
@@ -408,7 +408,7 @@
last_number_ = KNumber(acosh(static_cast<double>(input)));
}
-void CalcEngine::AreaSinHyp(KNumber input)
+void CalcEngine::AreaSinHyp(const KNumber &input)
{
if (input.type() == KNumber::SpecialType) {
if (input == KNumber("nan")) last_number_ = KNumber("nan");
@@ -424,7 +424,7 @@
last_number_ = KNumber(asinh(static_cast<double>(input)));
}
-void CalcEngine::AreaTangensHyp(KNumber input)
+void CalcEngine::AreaTangensHyp(const KNumber &input)
{
if (input.type() == KNumber::SpecialType) {
last_number_ = KNumber("nan");
@@ -446,7 +446,7 @@
last_number_ = KNumber(atanh(static_cast<double>(input)));
}
-void CalcEngine::Complement(KNumber input)
+void CalcEngine::Complement(const KNumber &input)
{
if (input.type() != KNumber::IntegerType) {
last_number_ = KNumber("nan");
@@ -478,7 +478,7 @@
}
-void CalcEngine::CosDeg(KNumber input)
+void CalcEngine::CosDeg(const KNumber &input)
{
if (input.type() == KNumber::SpecialType) {
last_number_ = KNumber("nan");
@@ -505,7 +505,7 @@
last_number_ = KNumber(cos(static_cast<double>(trunc_input)));
}
-void CalcEngine::CosRad(KNumber input)
+void CalcEngine::CosRad(const KNumber &input)
{
if (input.type() == KNumber::SpecialType) {
last_number_ = KNumber("nan");
@@ -514,7 +514,7 @@
last_number_ = KNumber(cos(static_cast<double>(input)));
}
-void CalcEngine::CosGrad(KNumber input)
+void CalcEngine::CosGrad(const KNumber &input)
{
if (input.type() == KNumber::SpecialType) {
last_number_ = KNumber("nan");
@@ -541,7 +541,7 @@
last_number_ = KNumber(cos(static_cast<double>(trunc_input)));
}
-void CalcEngine::CosHyp(KNumber input)
+void CalcEngine::CosHyp(const KNumber &input)
{
if (input.type() == KNumber::SpecialType) {
if (input == KNumber("nan")) last_number_ = KNumber("nan");
@@ -553,17 +553,17 @@
last_number_ = KNumber(cosh(static_cast<double>(input)));
}
-void CalcEngine::Cube(KNumber input)
+void CalcEngine::Cube(const KNumber &input)
{
last_number_ = input * input * input;
}
-void CalcEngine::CubeRoot(KNumber input)
+void CalcEngine::CubeRoot(const KNumber &input)
{
last_number_ = input.cbrt();
}
-void CalcEngine::Exp(KNumber input)
+void CalcEngine::Exp(const KNumber &input)
{
if (input.type() == KNumber::SpecialType) {
if (input == KNumber("nan")) last_number_ = KNumber("nan");
@@ -574,7 +574,7 @@
last_number_ = KNumber(exp(static_cast<double>(input)));
}
-void CalcEngine::Exp10(KNumber input)
+void CalcEngine::Exp10(const KNumber &input)
{
if (input.type() == KNumber::SpecialType) {
if (input == KNumber("nan")) last_number_ = KNumber("nan");
@@ -586,7 +586,7 @@
}
-void CalcEngine::Factorial(KNumber input)
+void CalcEngine::Factorial(const KNumber &input)
{
if (input == KNumber("inf")) return;
if (input < KNumber::Zero || input.type() == KNumber::SpecialType) {
@@ -599,12 +599,12 @@
last_number_ = tmp_amount.factorial();
}
-void CalcEngine::InvertSign(KNumber input)
+void CalcEngine::InvertSign(const KNumber &input)
{
last_number_ = -input;
}
-void CalcEngine::Ln(KNumber input)
+void CalcEngine::Ln(const KNumber &input)
{
if (input.type() == KNumber::SpecialType) {
if (input == KNumber("nan")) last_number_ = KNumber("nan");
@@ -623,7 +623,7 @@
}
}
-void CalcEngine::Log10(KNumber input)
+void CalcEngine::Log10(const KNumber &input)
{
if (input.type() == KNumber::SpecialType) {
if (input == KNumber("nan")) last_number_ = KNumber("nan");
@@ -656,18 +656,18 @@
return;
}
-void CalcEngine::ParenOpen(KNumber input)
+void CalcEngine::ParenOpen(const KNumber &input)
{
enterOperation(input, FUNC_BRACKET);
}
-void CalcEngine::Reciprocal(KNumber input)
+void CalcEngine::Reciprocal(const KNumber &input)
{
last_number_ = KNumber::One / input;
}
-void CalcEngine::SinDeg(KNumber input)
+void CalcEngine::SinDeg(const KNumber &input)
{
if (input.type() == KNumber::SpecialType) {
last_number_ = KNumber("nan");
@@ -695,7 +695,7 @@
last_number_ = KNumber(sin(static_cast<double>(trunc_input)));
}
-void CalcEngine::SinRad(KNumber input)
+void CalcEngine::SinRad(const KNumber &input)
{
if (input.type() == KNumber::SpecialType) {
last_number_ = KNumber("nan");
@@ -705,7 +705,7 @@
last_number_ = KNumber(sin(static_cast<double>(input)));
}
-void CalcEngine::SinGrad(KNumber input)
+void CalcEngine::SinGrad(const KNumber &input)
{
if (input.type() == KNumber::SpecialType) {
last_number_ = KNumber("nan");
@@ -734,7 +734,7 @@
last_number_ = KNumber(sin(static_cast<double>(trunc_input)));
}
-void CalcEngine::SinHyp(KNumber input)
+void CalcEngine::SinHyp(const KNumber &input)
{
if (input.type() == KNumber::SpecialType) {
if (input == KNumber("nan")) last_number_ = KNumber("nan");
@@ -746,42 +746,42 @@
last_number_ = KNumber(sinh(static_cast<double>(input)));
}
-void CalcEngine::Square(KNumber input)
+void CalcEngine::Square(const KNumber &input)
{
last_number_ = input * input;
}
-void CalcEngine::SquareRoot(KNumber input)
+void CalcEngine::SquareRoot(const KNumber &input)
{
last_number_ = input.sqrt();
}
-void CalcEngine::StatClearAll(KNumber input)
+void CalcEngine::StatClearAll(const KNumber &input)
{
Q_UNUSED(input);
stats.clearAll();
}
-void CalcEngine::StatCount(KNumber input)
+void CalcEngine::StatCount(const KNumber &input)
{
Q_UNUSED(input);
last_number_ = KNumber(stats.count());
}
-void CalcEngine::StatDataNew(KNumber input)
+void CalcEngine::StatDataNew(const KNumber &input)
{
stats.enterData(input);
last_number_ = KNumber(stats.count());
}
-void CalcEngine::StatDataDel(KNumber input)
+void CalcEngine::StatDataDel(const KNumber &input)
{
Q_UNUSED(input);
stats.clearLast();
last_number_ = KNumber::Zero;
}
-void CalcEngine::StatMean(KNumber input)
+void CalcEngine::StatMean(const KNumber &input)
{
Q_UNUSED(input);
last_number_ = stats.mean();
@@ -789,7 +789,7 @@
error_ = stats.error();
}
-void CalcEngine::StatMedian(KNumber input)
+void CalcEngine::StatMedian(const KNumber &input)
{
Q_UNUSED(input);
last_number_ = stats.median();
@@ -797,7 +797,7 @@
error_ = stats.error();
}
-void CalcEngine::StatStdDeviation(KNumber input)
+void CalcEngine::StatStdDeviation(const KNumber &input)
{
Q_UNUSED(input);
last_number_ = stats.std();
@@ -805,7 +805,7 @@
error_ = stats.error();
}
-void CalcEngine::StatStdSample(KNumber input)
+void CalcEngine::StatStdSample(const KNumber &input)
{
Q_UNUSED(input);
last_number_ = stats.sample_std();
@@ -813,13 +813,13 @@
error_ = stats.error();
}
-void CalcEngine::StatSum(KNumber input)
+void CalcEngine::StatSum(const KNumber &input)
{
Q_UNUSED(input);
last_number_ = stats.sum();
}
-void CalcEngine::StatSumSquares(KNumber input)
+void CalcEngine::StatSumSquares(const KNumber &input)
{
Q_UNUSED(input);
last_number_ = stats.sum_of_squares();
@@ -827,7 +827,7 @@
error_ = stats.error();
}
-void CalcEngine::TangensDeg(KNumber input)
+void CalcEngine::TangensDeg(const KNumber &input)
{
if (input.type() == KNumber::SpecialType) {
last_number_ = KNumber("nan");
@@ -841,7 +841,7 @@
last_number_ = arg1 / arg2;
}
-void CalcEngine::TangensRad(KNumber input)
+void CalcEngine::TangensRad(const KNumber &input)
{
if (input.type() == KNumber::SpecialType) {
last_number_ = KNumber("nan");
@@ -855,7 +855,7 @@
last_number_ = arg1 / arg2;
}
-void CalcEngine::TangensGrad(KNumber input)
+void CalcEngine::TangensGrad(const KNumber &input)
{
if (input.type() == KNumber::SpecialType) {
last_number_ = KNumber("nan");
@@ -869,7 +869,7 @@
last_number_ = arg1 / arg2;
}
-void CalcEngine::TangensHyp(KNumber input)
+void CalcEngine::TangensHyp(const KNumber &input)
{
if (input.type() == KNumber::SpecialType) {
if (input == KNumber("nan")) last_number_ = KNumber("nan");
@@ -881,8 +881,8 @@
last_number_ = KNumber(tanh(static_cast<double>(input)));
}
-KNumber CalcEngine::evalOperation(KNumber arg1, Operation operation,
- KNumber arg2)
+KNumber CalcEngine::evalOperation(const KNumber &arg1, Operation operation,
+ const KNumber &arg2)
{
if (!percent_mode_ || Operator[operation].prcnt_ptr == NULL) {
return (Operator[operation].arith_ptr)(arg1, arg2);
--- trunk/KDE/kdeutils/kcalc/kcalc_core.h #1171490:1171491
@@ -73,54 +73,54 @@
void enterOperation(KNumber num, Operation func);
- void ArcCosDeg(KNumber input);
- void ArcCosRad(KNumber input);
- void ArcCosGrad(KNumber input);
- void ArcSinDeg(KNumber input);
- void ArcSinRad(KNumber input);
- void ArcSinGrad(KNumber input);
- void ArcTangensDeg(KNumber input);
- void ArcTangensRad(KNumber input);
- void ArcTangensGrad(KNumber input);
- void AreaCosHyp(KNumber input);
- void AreaSinHyp(KNumber input);
- void AreaTangensHyp(KNumber input);
- void Complement(KNumber input);
- void CosDeg(KNumber input);
- void CosRad(KNumber input);
- void CosGrad(KNumber input);
- void CosHyp(KNumber input);
- void Cube(KNumber input);
- void CubeRoot(KNumber input);
- void Exp(KNumber input);
- void Exp10(KNumber input);
- void Factorial(KNumber input);
- void InvertSign(KNumber input);
- void Ln(KNumber input);
- void Log10(KNumber input);
+ void ArcCosDeg(const KNumber &input);
+ void ArcCosRad(const KNumber &input);
+ void ArcCosGrad(const KNumber &input);
+ void ArcSinDeg(const KNumber &input);
+ void ArcSinRad(const KNumber &input);
+ void ArcSinGrad(const KNumber &input);
+ void ArcTangensDeg(const KNumber &input);
+ void ArcTangensRad(const KNumber &input);
+ void ArcTangensGrad(const KNumber &input);
+ void AreaCosHyp(const KNumber &input);
+ void AreaSinHyp(const KNumber &input);
+ void AreaTangensHyp(const KNumber &input);
+ void Complement(const KNumber &input);
+ void CosDeg(const KNumber &input);
+ void CosRad(const KNumber &input);
+ void CosGrad(const KNumber &input);
+ void CosHyp(const KNumber &input);
+ void Cube(const KNumber &input);
+ void CubeRoot(const KNumber &input);
+ void Exp(const KNumber &input);
+ void Exp10(const KNumber &input);
+ void Factorial(const KNumber &input);
+ void InvertSign(const KNumber &input);
+ void Ln(const KNumber &input);
+ void Log10(const KNumber &input);
void ParenClose(KNumber input);
- void ParenOpen(KNumber input);
- void Reciprocal(KNumber input);
- void SinDeg(KNumber input);
- void SinGrad(KNumber input);
- void SinRad(KNumber input);
- void SinHyp(KNumber input);
- void Square(KNumber input);
- void SquareRoot(KNumber input);
- void StatClearAll(KNumber input);
- void StatCount(KNumber input);
- void StatDataNew(KNumber input);
- void StatDataDel(KNumber input);
- void StatMean(KNumber input);
- void StatMedian(KNumber input);
- void StatStdDeviation(KNumber input);
- void StatStdSample(KNumber input);
- void StatSum(KNumber input);
- void StatSumSquares(KNumber input);
- void TangensDeg(KNumber input);
- void TangensRad(KNumber input);
- void TangensGrad(KNumber input);
- void TangensHyp(KNumber input);
+ void ParenOpen(const KNumber &input);
+ void Reciprocal(const KNumber &input);
+ void SinDeg(const KNumber &input);
+ void SinGrad(const KNumber &input);
+ void SinRad(const KNumber &input);
+ void SinHyp(const KNumber &input);
+ void Square(const KNumber &input);
+ void SquareRoot(const KNumber &input);
+ void StatClearAll(const KNumber &input);
+ void StatCount(const KNumber &input);
+ void StatDataNew(const KNumber &input);
+ void StatDataDel(const KNumber &input);
+ void StatMean(const KNumber &input);
+ void StatMedian(const KNumber &input);
+ void StatStdDeviation(const KNumber &input);
+ void StatStdSample(const KNumber &input);
+ void StatSum(const KNumber &input);
+ void StatSumSquares(const KNumber &input);
+ void TangensDeg(const KNumber &input);
+ void TangensRad(const KNumber &input);
+ void TangensGrad(const KNumber &input);
+ void TangensHyp(const KNumber &input);
void Reset();
private:
@@ -161,7 +161,7 @@
bool evalStack();
- KNumber evalOperation(KNumber arg1, Operation operation, KNumber arg2);
+ KNumber evalOperation(const KNumber &arg1, Operation operation, const KNumber &arg2);
const KNumber Deg2Rad(const KNumber &x) const {
return KNumber(2) * KNumber::Pi() / KNumber(360) * x;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic