lili/OCCT
1
0
Fork 0
mirror of https://github.com/Open-Cascade-SAS/OCCT.git synced 2026-07-10 04:17:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Coding - Rework of Math global functions to stl (#833)

Browse Source 
Majority of functions now simply call same functions from std namespace.
Functions that duplicate std namespace functionality are declared
deprecated.
Calls of deprecated functions are replaced with std functions calls.
This commit is contained in:
Dmitrii Kulikov
2025-11-17 14:20:24 +00:00
committed by GitHub
parent 1a246afa2e
commit c479f6e000
1205 changed files with 12672 additions and 11286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ModelingAlgorithms/TKExpress/Expr/Expr.cxx
View File

@@ -61,5 +61,5 @@ Standard_Integer Expr::NbOfFreeVariables(const Handle(Expr_GeneralExpression)& e
Standard_Real Expr::Sign(const Standard_Real val)
{
return ::Sign(1.0, val);
return std::copysign(1.0, val);
}

4
src/ModelingAlgorithms/TKExpress/Expr/Expr_Absolute.cxx
View File

@@ -38,7 +38,7 @@ Handle(Expr_GeneralExpression) Expr_Absolute::ShallowSimplified() const
if (op->IsKind(STANDARD_TYPE(Expr_NumericValue)))
{
Handle(Expr_NumericValue) valop = Handle(Expr_NumericValue)::DownCast(op);
return new Expr_NumericValue(Abs(valop->GetValue()));
return new Expr_NumericValue(std::abs(valop->GetValue()));
}
if (op->IsKind(STANDARD_TYPE(Expr_UnaryMinus)))
{
@@ -80,7 +80,7 @@ Handle(Expr_GeneralExpression) Expr_Absolute::Derivative(const Handle(Expr_Named
Standard_Real Expr_Absolute::Evaluate(const Expr_Array1OfNamedUnknown& vars,
const TColStd_Array1OfReal& vals) const
{
return ::Abs(Operand()->Evaluate(vars, vals));
return std::abs(Operand()->Evaluate(vars, vals));
}
TCollection_AsciiString Expr_Absolute::String() const

4
src/ModelingAlgorithms/TKExpress/Expr/Expr_ArcCosine.cxx
View File

@@ -40,7 +40,7 @@ Handle(Expr_GeneralExpression) Expr_ArcCosine::ShallowSimplified() const
if (op->IsKind(STANDARD_TYPE(Expr_NumericValue)))
{
Handle(Expr_NumericValue) valop = Handle(Expr_NumericValue)::DownCast(op);
return new Expr_NumericValue(ACos(valop->GetValue()));
return new Expr_NumericValue(std::acos(valop->GetValue()));
}
if (op->IsKind(STANDARD_TYPE(Expr_Cosine)))
{
@@ -101,7 +101,7 @@ Handle(Expr_GeneralExpression) Expr_ArcCosine::Derivative(const Handle(Expr_Name
Standard_Real Expr_ArcCosine::Evaluate(const Expr_Array1OfNamedUnknown& vars,
const TColStd_Array1OfReal& vals) const
{
return ::ACos(Operand()->Evaluate(vars, vals));
return std::acos(Operand()->Evaluate(vars, vals));
}
TCollection_AsciiString Expr_ArcCosine::String() const

4
src/ModelingAlgorithms/TKExpress/Expr/Expr_ArcSine.cxx
View File

@@ -38,7 +38,7 @@ Handle(Expr_GeneralExpression) Expr_ArcSine::ShallowSimplified() const
if (op->IsKind(STANDARD_TYPE(Expr_NumericValue)))
{
Handle(Expr_NumericValue) valop = Handle(Expr_NumericValue)::DownCast(op);
return new Expr_NumericValue(ASin(valop->GetValue()));
return new Expr_NumericValue(std::asin(valop->GetValue()));
}
if (op->IsKind(STANDARD_TYPE(Expr_Sine)))
{
@@ -97,7 +97,7 @@ Handle(Expr_GeneralExpression) Expr_ArcSine::Derivative(const Handle(Expr_NamedU
Standard_Real Expr_ArcSine::Evaluate(const Expr_Array1OfNamedUnknown& vars,
const TColStd_Array1OfReal& vals) const
{
return ::ASin(Operand()->Evaluate(vars, vals));
return std::asin(Operand()->Evaluate(vars, vals));
}
TCollection_AsciiString Expr_ArcSine::String() const

4
src/ModelingAlgorithms/TKExpress/Expr/Expr_ArcTangent.cxx
View File

@@ -38,7 +38,7 @@ Handle(Expr_GeneralExpression) Expr_ArcTangent::ShallowSimplified() const
if (op->IsKind(STANDARD_TYPE(Expr_NumericValue)))
{
Handle(Expr_NumericValue) valop = Handle(Expr_NumericValue)::DownCast(op);
return new Expr_NumericValue(ATan(valop->GetValue()));
return new Expr_NumericValue(std::atan(valop->GetValue()));
}
if (op->IsKind(STANDARD_TYPE(Expr_Tangent)))
{
@@ -94,7 +94,7 @@ Handle(Expr_GeneralExpression) Expr_ArcTangent::Derivative(const Handle(Expr_Nam
Standard_Real Expr_ArcTangent::Evaluate(const Expr_Array1OfNamedUnknown& vars,
const TColStd_Array1OfReal& vals) const
{
return ::ATan(Operand()->Evaluate(vars, vals));
return std::atan(Operand()->Evaluate(vars, vals));
}
TCollection_AsciiString Expr_ArcTangent::String() const

4
src/ModelingAlgorithms/TKExpress/Expr/Expr_ArgCosh.cxx
View File

@@ -38,7 +38,7 @@ Handle(Expr_GeneralExpression) Expr_ArgCosh::ShallowSimplified() const
if (op->IsKind(STANDARD_TYPE(Expr_NumericValue)))
{
Handle(Expr_NumericValue) valop = Handle(Expr_NumericValue)::DownCast(op);
return new Expr_NumericValue(ACosh(valop->GetValue()));
return new Expr_NumericValue(std::acosh(valop->GetValue()));
}
if (op->IsKind(STANDARD_TYPE(Expr_Cosh)))
{
@@ -98,7 +98,7 @@ Standard_Real Expr_ArgCosh::Evaluate(const Expr_Array1OfNamedUnknown& vars,
const TColStd_Array1OfReal& vals) const
{
Standard_Real val = Operand()->Evaluate(vars, vals);
return ::Log(val + ::Sqrt(::Square(val) - 1.0));
return std::log(val + std::sqrt(::Square(val) - 1.0));
}
TCollection_AsciiString Expr_ArgCosh::String() const

4
src/ModelingAlgorithms/TKExpress/Expr/Expr_ArgSinh.cxx
View File

@@ -39,7 +39,7 @@ Handle(Expr_GeneralExpression) Expr_ArgSinh::ShallowSimplified() const
if (op->IsKind(STANDARD_TYPE(Expr_NumericValue)))
{
Handle(Expr_NumericValue) valop = Handle(Expr_NumericValue)::DownCast(op);
return new Expr_NumericValue(ASinh(valop->GetValue()));
return new Expr_NumericValue(std::asinh(valop->GetValue()));
}
if (op->IsKind(STANDARD_TYPE(Expr_Sinh)))
{
@@ -99,7 +99,7 @@ Standard_Real Expr_ArgSinh::Evaluate(const Expr_Array1OfNamedUnknown& vars,
const TColStd_Array1OfReal& vals) const
{
Standard_Real val = Operand()->Evaluate(vars, vals);
return ::Log(val + ::Sqrt(::Square(val) + 1.0));
return std::log(val + std::sqrt(::Square(val) + 1.0));
}
TCollection_AsciiString Expr_ArgSinh::String() const

4
src/ModelingAlgorithms/TKExpress/Expr/Expr_ArgTanh.cxx
View File

@@ -37,7 +37,7 @@ Handle(Expr_GeneralExpression) Expr_ArgTanh::ShallowSimplified() const
if (op->IsKind(STANDARD_TYPE(Expr_NumericValue)))
{
Handle(Expr_NumericValue) valop = Handle(Expr_NumericValue)::DownCast(op);
return new Expr_NumericValue(ATanh(valop->GetValue()));
return new Expr_NumericValue(std::atanh(valop->GetValue()));
}
if (op->IsKind(STANDARD_TYPE(Expr_Tanh)))
{
@@ -96,7 +96,7 @@ Standard_Real Expr_ArgTanh::Evaluate(const Expr_Array1OfNamedUnknown& vars,
const TColStd_Array1OfReal& vals) const
{
Standard_Real val = Operand()->Evaluate(vars, vals);
return ::Log((1.0 + val) / (1.0 - val)) / 2.0;
return std::log((1.0 + val) / (1.0 - val)) / 2.0;
}
TCollection_AsciiString Expr_ArgTanh::String() const

4
src/ModelingAlgorithms/TKExpress/Expr/Expr_Cosh.cxx
View File

@@ -38,7 +38,7 @@ Handle(Expr_GeneralExpression) Expr_Cosh::ShallowSimplified() const
if (myexp->IsKind(STANDARD_TYPE(Expr_NumericValue)))
{
Handle(Expr_NumericValue) myNVexp = Handle(Expr_NumericValue)::DownCast(myexp);
return new Expr_NumericValue(Cosh(myNVexp->GetValue()));
return new Expr_NumericValue(std::cosh(myNVexp->GetValue()));
}
if (myexp->IsKind(STANDARD_TYPE(Expr_ArgCosh)))
{
@@ -86,7 +86,7 @@ Standard_Real Expr_Cosh::Evaluate(const Expr_Array1OfNamedUnknown& vars,
const TColStd_Array1OfReal& vals) const
{
Standard_Real val = Operand()->Evaluate(vars, vals);
return (::Exp(val) + ::Exp(-val)) / 2.0;
return (std::exp(val) + std::exp(-val)) / 2.0;
}
TCollection_AsciiString Expr_Cosh::String() const

4
src/ModelingAlgorithms/TKExpress/Expr/Expr_Cosine.cxx
View File

@@ -39,7 +39,7 @@ Handle(Expr_GeneralExpression) Expr_Cosine::ShallowSimplified() const
if (myexp->IsKind(STANDARD_TYPE(Expr_NumericValue)))
{
Handle(Expr_NumericValue) myNVexp = Handle(Expr_NumericValue)::DownCast(myexp);
return new Expr_NumericValue(Cos(myNVexp->GetValue()));
return new Expr_NumericValue(std::cos(myNVexp->GetValue()));
}
if (myexp->IsKind(STANDARD_TYPE(Expr_ArcCosine)))
{
@@ -86,7 +86,7 @@ Handle(Expr_GeneralExpression) Expr_Cosine::Derivative(const Handle(Expr_NamedUn
Standard_Real Expr_Cosine::Evaluate(const Expr_Array1OfNamedUnknown& vars,
const TColStd_Array1OfReal& vals) const
{
return ::Cos(Operand()->Evaluate(vars, vals));
return std::cos(Operand()->Evaluate(vars, vals));
}
TCollection_AsciiString Expr_Cosine::String() const

4
src/ModelingAlgorithms/TKExpress/Expr/Expr_Exponential.cxx
View File

@@ -37,7 +37,7 @@ Handle(Expr_GeneralExpression) Expr_Exponential::ShallowSimplified() const
if (myexp->IsKind(STANDARD_TYPE(Expr_NumericValue)))
{
Handle(Expr_NumericValue) myNVexp = Handle(Expr_NumericValue)::DownCast(myexp);
return new Expr_NumericValue(Exp(myNVexp->GetValue()));
return new Expr_NumericValue(std::exp(myNVexp->GetValue()));
}
if (myexp->IsKind(STANDARD_TYPE(Expr_LogOfe)))
{
@@ -83,7 +83,7 @@ Handle(Expr_GeneralExpression) Expr_Exponential::Derivative(
Standard_Real Expr_Exponential::Evaluate(const Expr_Array1OfNamedUnknown& vars,
const TColStd_Array1OfReal& vals) const
{
return ::Exp(Operand()->Evaluate(vars, vals));
return std::exp(Operand()->Evaluate(vars, vals));
}
TCollection_AsciiString Expr_Exponential::String() const

4
src/ModelingAlgorithms/TKExpress/Expr/Expr_Exponentiate.cxx
View File

@@ -58,7 +58,7 @@ Handle(Expr_GeneralExpression) Expr_Exponentiate::ShallowSimplified() const
if (myfirst->IsKind(STANDARD_TYPE(Expr_NumericValue)))
{
Handle(Expr_NumericValue) myNVf = Handle(Expr_NumericValue)::DownCast(myfirst);
return new Expr_NumericValue(Pow(myNVf->GetValue(), myvals));
return new Expr_NumericValue(std::pow(myNVf->GetValue(), myvals));
}
}
if (myfirst->IsKind(STANDARD_TYPE(Expr_NumericValue)))
@@ -151,7 +151,7 @@ Standard_Real Expr_Exponentiate::Evaluate(const Expr_Array1OfNamedUnknown& vars,
const TColStd_Array1OfReal& vals) const
{
Standard_Real res = FirstOperand()->Evaluate(vars, vals);
return ::Pow(res, SecondOperand()->Evaluate(vars, vals));
return std::pow(res, SecondOperand()->Evaluate(vars, vals));
}
TCollection_AsciiString Expr_Exponentiate::String() const

6
src/ModelingAlgorithms/TKExpress/Expr/Expr_LogOf10.cxx
View File

@@ -37,7 +37,7 @@ Handle(Expr_GeneralExpression) Expr_LogOf10::ShallowSimplified() const
if (myexp->IsKind(STANDARD_TYPE(Expr_NumericValue)))
{
Handle(Expr_NumericValue) myNVexp = Handle(Expr_NumericValue)::DownCast(myexp);
return new Expr_NumericValue(Log10(myNVexp->GetValue()));
return new Expr_NumericValue(std::log10(myNVexp->GetValue()));
}
Handle(Expr_LogOf10) me = this;
return me;
@@ -71,7 +71,7 @@ Handle(Expr_GeneralExpression) Expr_LogOf10::Derivative(const Handle(Expr_NamedU
}
Handle(Expr_GeneralExpression) myexp = Operand();
Handle(Expr_GeneralExpression) myder = myexp->Derivative(X);
Standard_Real vlog = Log(10.0);
Standard_Real vlog = std::log(10.0);
Handle(Expr_NumericValue) vallog = new Expr_NumericValue(vlog);
Handle(Expr_Product) theprod = Expr::CopyShare(myexp) * vallog;
Handle(Expr_Division) thediv = myder / theprod->ShallowSimplified();
@@ -81,7 +81,7 @@ Handle(Expr_GeneralExpression) Expr_LogOf10::Derivative(const Handle(Expr_NamedU
Standard_Real Expr_LogOf10::Evaluate(const Expr_Array1OfNamedUnknown& vars,
const TColStd_Array1OfReal& vals) const
{
return ::Log10(Operand()->Evaluate(vars, vals));
return std::log10(Operand()->Evaluate(vars, vals));
}
TCollection_AsciiString Expr_LogOf10::String() const

4
src/ModelingAlgorithms/TKExpress/Expr/Expr_LogOfe.cxx
View File

@@ -37,7 +37,7 @@ Handle(Expr_GeneralExpression) Expr_LogOfe::ShallowSimplified() const
if (myexp->IsKind(STANDARD_TYPE(Expr_NumericValue)))
{
Handle(Expr_NumericValue) myNVexp = Handle(Expr_NumericValue)::DownCast(myexp);
return new Expr_NumericValue(Log(myNVexp->GetValue()));
return new Expr_NumericValue(std::log(myNVexp->GetValue()));
}
if (myexp->IsKind(STANDARD_TYPE(Expr_Exponential)))
{
@@ -82,7 +82,7 @@ Handle(Expr_GeneralExpression) Expr_LogOfe::Derivative(const Handle(Expr_NamedUn
Standard_Real Expr_LogOfe::Evaluate(const Expr_Array1OfNamedUnknown& vars,
const TColStd_Array1OfReal& vals) const
{
return ::Log(Operand()->Evaluate(vars, vals));
return std::log(Operand()->Evaluate(vars, vals));
}
TCollection_AsciiString Expr_LogOfe::String() const

4
src/ModelingAlgorithms/TKExpress/Expr/Expr_Sine.cxx
View File

@@ -38,7 +38,7 @@ Handle(Expr_GeneralExpression) Expr_Sine::ShallowSimplified() const
if (myexp->IsKind(STANDARD_TYPE(Expr_NumericValue)))
{
Handle(Expr_NumericValue) myNVexp = Handle(Expr_NumericValue)::DownCast(myexp);
return new Expr_NumericValue(Sin(myNVexp->GetValue()));
return new Expr_NumericValue(std::sin(myNVexp->GetValue()));
}
if (myexp->IsKind(STANDARD_TYPE(Expr_ArcSine)))
{
@@ -84,7 +84,7 @@ Handle(Expr_GeneralExpression) Expr_Sine::Derivative(const Handle(Expr_NamedUnkn
Standard_Real Expr_Sine::Evaluate(const Expr_Array1OfNamedUnknown& vars,
const TColStd_Array1OfReal& vals) const
{
return ::Sin(Operand()->Evaluate(vars, vals));
return std::sin(Operand()->Evaluate(vars, vals));
}
TCollection_AsciiString Expr_Sine::String() const

4
src/ModelingAlgorithms/TKExpress/Expr/Expr_Sinh.cxx
View File

@@ -38,7 +38,7 @@ Handle(Expr_GeneralExpression) Expr_Sinh::ShallowSimplified() const
if (myexp->IsKind(STANDARD_TYPE(Expr_NumericValue)))
{
Handle(Expr_NumericValue) myNVexp = Handle(Expr_NumericValue)::DownCast(myexp);
return new Expr_NumericValue(Sinh(myNVexp->GetValue()));
return new Expr_NumericValue(std::sinh(myNVexp->GetValue()));
}
if (myexp->IsKind(STANDARD_TYPE(Expr_ArgSinh)))
{
@@ -85,7 +85,7 @@ Standard_Real Expr_Sinh::Evaluate(const Expr_Array1OfNamedUnknown& vars,
const TColStd_Array1OfReal& vals) const
{
Standard_Real val = Operand()->Evaluate(vars, vals);
return (::Exp(val) - ::Exp(-val)) / 2.0;
return (std::exp(val) - std::exp(-val)) / 2.0;
}
TCollection_AsciiString Expr_Sinh::String() const

4
src/ModelingAlgorithms/TKExpress/Expr/Expr_SquareRoot.cxx
View File

@@ -38,7 +38,7 @@ Handle(Expr_GeneralExpression) Expr_SquareRoot::ShallowSimplified() const
if (myexp->IsKind(STANDARD_TYPE(Expr_NumericValue)))
{
Handle(Expr_NumericValue) myNVexp = Handle(Expr_NumericValue)::DownCast(myexp);
return new Expr_NumericValue(Sqrt(myNVexp->GetValue()));
return new Expr_NumericValue(std::sqrt(myNVexp->GetValue()));
}
if (myexp->IsKind(STANDARD_TYPE(Expr_Square)))
{
@@ -84,7 +84,7 @@ Handle(Expr_GeneralExpression) Expr_SquareRoot::Derivative(const Handle(Expr_Nam
Standard_Real Expr_SquareRoot::Evaluate(const Expr_Array1OfNamedUnknown& vars,
const TColStd_Array1OfReal& vals) const
{
return ::Sqrt(Operand()->Evaluate(vars, vals));
return std::sqrt(Operand()->Evaluate(vars, vals));
}
TCollection_AsciiString Expr_SquareRoot::String() const

4
src/ModelingAlgorithms/TKExpress/Expr/Expr_Tangent.cxx
View File

@@ -38,7 +38,7 @@ Handle(Expr_GeneralExpression) Expr_Tangent::ShallowSimplified() const
if (myexp->IsKind(STANDARD_TYPE(Expr_NumericValue)))
{
Handle(Expr_NumericValue) myNVexp = Handle(Expr_NumericValue)::DownCast(myexp);
return new Expr_NumericValue(Tan(myNVexp->GetValue()));
return new Expr_NumericValue(std::tan(myNVexp->GetValue()));
}
if (myexp->IsKind(STANDARD_TYPE(Expr_ArcTangent)))
{
@@ -85,7 +85,7 @@ Handle(Expr_GeneralExpression) Expr_Tangent::Derivative(const Handle(Expr_NamedU
Standard_Real Expr_Tangent::Evaluate(const Expr_Array1OfNamedUnknown& vars,
const TColStd_Array1OfReal& vals) const
{
return ::Tan(Operand()->Evaluate(vars, vals));
return std::tan(Operand()->Evaluate(vars, vals));
}
TCollection_AsciiString Expr_Tangent::String() const

4
src/ModelingAlgorithms/TKExpress/Expr/Expr_Tanh.cxx
View File

@@ -38,7 +38,7 @@ Handle(Expr_GeneralExpression) Expr_Tanh::ShallowSimplified() const
if (myexp->IsKind(STANDARD_TYPE(Expr_NumericValue)))
{
Handle(Expr_NumericValue) myNVexp = Handle(Expr_NumericValue)::DownCast(myexp);
return new Expr_NumericValue(Tanh(myNVexp->GetValue()));
return new Expr_NumericValue(std::tanh(myNVexp->GetValue()));
}
if (myexp->IsKind(STANDARD_TYPE(Expr_ArgTanh)))
{
@@ -86,7 +86,7 @@ Standard_Real Expr_Tanh::Evaluate(const Expr_Array1OfNamedUnknown& vars,
const TColStd_Array1OfReal& vals) const
{
Standard_Real val = Operand()->Evaluate(vars, vals);
return (::Exp(val) - ::Exp(-val)) / (::Exp(val) + ::Exp(-val));
return (std::exp(val) - std::exp(-val)) / (std::exp(val) + std::exp(-val));
}
TCollection_AsciiString Expr_Tanh::String() const