OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-29 14:00:49 +03:00
Code Activity

031697: Foundation Classes - Expr_GeneralExpression::Derivative does not seem to work (691 & 720)

Browse Source
This commit is contained in:
ifv
2020-08-07 12:20:40 +03:00
parent 2f7f720226
commit 7bf8aa1b75
2 changed files with 49 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Expr/Expr_NamedUnknown.cxx
View File

@@ -123,7 +123,7 @@ Standard_Boolean Expr_NamedUnknown::IsLinear () const
Handle(Expr_GeneralExpression) Expr_NamedUnknown::Derivative (const Handle(Expr_NamedUnknown)& X) const Handle(Expr_GeneralExpression) Expr_NamedUnknown::Derivative (const Handle(Expr_NamedUnknown)& X) const
{ {
Handle(Expr_NamedUnknown) me = this; Handle(Expr_NamedUnknown) me = this;
if (me != X) { if (!me->IsIdentical(X)) {
if (IsAssigned()) { if (IsAssigned()) {
return myExpression->Derivative(X); return myExpression->Derivative(X);
} }

48
src/QABugs/QABugs_19.cxx
View File

@@ -4357,6 +4357,53 @@ static Standard_Integer OCC30708_2 (Draw_Interpretor& di, Standard_Integer, cons
return 0; return 0;
} }
#include <ExprIntrp_GenExp.hxx>
#include <Expr_GeneralExpression.hxx>
#include <Expr_NamedUnknown.hxx>
//=======================================================================
//function : OCC31697
//purpose :
//=======================================================================
static Standard_Integer OCC31697(Draw_Interpretor& di, Standard_Integer argc, const char ** argv)
{
if (argc < 3)
{
di << "Usage : " << argv[0] << " expression variable\n";
return 1;
}
TCollection_AsciiString anExpStr(argv[1]);
TCollection_AsciiString aVarStr(argv[2]);
Handle(ExprIntrp_GenExp) exprIntrp = ExprIntrp_GenExp::Create();
//
// Create the expression
exprIntrp->Process(anExpStr);
if (!exprIntrp->IsDone())
{
di << "Interpretation of expression " << argv[1] << " failed\n";
return 1;
}
Handle(Expr_GeneralExpression) anExpr = exprIntrp->Expression();
Handle(Expr_NamedUnknown) aVar = new Expr_NamedUnknown(aVarStr);
if (!anExpr->Contains(aVar))
{
di << "Expression " << argv[1] << " does not contain variable " << argv[2] << "\n";
return 1;
}
Handle(Expr_GeneralExpression) aDer = anExpr->Derivative(aVar);
TCollection_AsciiString aDerStr = aDer->String();
di << "The derivative of the " << argv[1] << " by " << argv[2] << " is equal to " << aDerStr << "\n";
return 0;
}
void QABugs::Commands_19(Draw_Interpretor& theCommands) { void QABugs::Commands_19(Draw_Interpretor& theCommands) {
const char *group = "QABugs"; const char *group = "QABugs";
@@ -4455,5 +4502,6 @@ void QABugs::Commands_19(Draw_Interpretor& theCommands) {
theCommands.Add ("OCC30708_2", "Tests initialization of the BRepLib_MakeWire with null shape", theCommands.Add ("OCC30708_2", "Tests initialization of the BRepLib_MakeWire with null shape",
__FILE__, OCC30708_2, group); __FILE__, OCC30708_2, group);
theCommands.Add("OCC31697", "OCC31697 expression variable", __FILE__, OCC31697, group);
return; return;
} }