1
0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-21 10:13:43 +03:00

0024377: [Regression-like] OCC 6.7.0 beta contaminates log with more unnecessary debug symbols

These "DEBUG outputs" are replace with analogically comments.
This commit is contained in:
nbv 2013-11-19 12:06:09 +04:00 committed by bugmaster
parent 3cb19cf162
commit 28cec2ba3e
2 changed files with 382 additions and 437 deletions

View File

@ -68,10 +68,7 @@ Standard_Real Extrema_FuncExtCC::SearchOfTolerance(const Standard_Address C)
} }
else else
{ {
#ifdef DEB //Warning: No curve for tolerance computing!
cout << "+++ Function Extrema_FuncExtCC::SearchOfTolerance(...)" << endl;
cout << "Warning: No curve for tolerance computing!---"<<endl;
#endif
return MinTol; return MinTol;
} }
@ -294,14 +291,10 @@ Standard_Boolean Extrema_FuncExtCC::Value (const math_Vector& UV, math_Vector& F
if (Ndu <= MinTol) if (Ndu <= MinTol)
{ {
#ifdef DEB //Warning: 1st derivative of C1 is equal to zero!
cout << "+++Function Extrema_FuncExtCC::Value(...)." << endl;
cout << "Warning: 1st derivative of C1 is equal to zero!---"<<endl;
#endif
return Standard_False; return Standard_False;
} }
Standard_Real Ndv = myDv.Magnitude(); Standard_Real Ndv = myDv.Magnitude();
if(myMaxDerivOrderC2 != 0) if(myMaxDerivOrderC2 != 0)
@ -389,10 +382,7 @@ Standard_Boolean Extrema_FuncExtCC::Value (const math_Vector& UV, math_Vector& F
if (Ndv <= MinTol) if (Ndv <= MinTol)
{ {
#ifdef DEB //1st derivative of C2 is equal to zero!
cout << "+++Function Extrema_FuncExtCC::Value(...)." << endl;
cout << "1st derivative of C2 is equal to zero!---"<<endl;
#endif
return Standard_False; return Standard_False;
} }
@ -419,10 +409,7 @@ Standard_Boolean Extrema_FuncExtCC::Values (const math_Vector& UV,
if(Value(UV, F) == Standard_False) //Computes F, myDu, myDv if(Value(UV, F) == Standard_False) //Computes F, myDu, myDv
{ {
#ifdef DEB //Warning: No function value found!
cout << "+++Standard_Boolean Extrema_FuncExtCC::Values(...)." << endl;
cout << "Warning: No function value found!---"<<endl;
#endif
return Standard_False; return Standard_False;
}//if(Value(UV, F) == Standard_False) }//if(Value(UV, F) == Standard_False)
@ -478,12 +465,8 @@ Standard_Boolean Extrema_FuncExtCC::Values (const math_Vector& UV,
UV3(2)=myV; UV3(2)=myV;
if(!((Value(UV2,FF2)) && (Value(UV3,FF3)))) if(!((Value(UV2,FF2)) && (Value(UV3,FF3))))
{ {
#ifdef DEB //There are many points close to singularity points and which have zero-derivative.
cout << "+++ Function Extrema_FuncExtCC::Values(...)" << endl; //Try to decrease aDelta variable's value.
cout << "There are many points close to singularity points "
"and which have zero-derivative." << endl;
cout << "Try to decrease aDelta variable's value. ---" << endl;
#endif
return Standard_False; return Standard_False;
} }
@ -503,12 +486,8 @@ Standard_Boolean Extrema_FuncExtCC::Values (const math_Vector& UV,
if(!((Value(UV2,FF2)) && (Value(UV1,FF1)))) if(!((Value(UV2,FF2)) && (Value(UV1,FF1))))
{ {
#ifdef DEB //There are many points close to singularity points and which have zero-derivative.
cout << "+++ Function Extrema_FuncExtCC::Values(...)" << endl; //Try to decrease aDelta variable's value.
cout << "There are many points close to singularity points "
"and which have zero-derivative." << endl;
cout << "Try to decrease aDelta variable's value. ---" << endl;
#endif
return Standard_False; return Standard_False;
} }
@ -535,12 +514,8 @@ Standard_Boolean Extrema_FuncExtCC::Values (const math_Vector& UV,
if(!((Value(UV2,FF2)) && (Value(UV3,FF3)))) if(!((Value(UV2,FF2)) && (Value(UV3,FF3))))
{ {
#ifdef DEB //There are many points close to singularity points and which have zero-derivative.
cout << "+++ Function Extrema_FuncExtCC::Values(...)" << endl; //Try to decrease aDelta variable's value.
cout << "There are many points close to singularity points "
"and which have zero-derivative." << endl;
cout << "Try to decrease aDelta variable's value. ---" << endl;
#endif
return Standard_False; return Standard_False;
} }
F2 = FF2(1); F2 = FF2(1);
@ -558,12 +533,8 @@ Standard_Boolean Extrema_FuncExtCC::Values (const math_Vector& UV,
UV1(2)=myV-2*aDeltaV; UV1(2)=myV-2*aDeltaV;
if(!((Value(UV2,FF2)) && (Value(UV1,FF1)))) if(!((Value(UV2,FF2)) && (Value(UV1,FF1))))
{ {
#ifdef DEB //There are many points close to singularity points and which have zero-derivative.
cout << "+++ Function Extrema_FuncExtCC::Values(...)" << endl; //Try to decrease aDelta variable's value.
cout << "There are many points close to singularity points "
"and which have zero-derivative." << endl;
cout << "Try to decrease aDelta variable's value. ---" << endl;
#endif
return Standard_False; return Standard_False;
} }
@ -606,12 +577,8 @@ Standard_Boolean Extrema_FuncExtCC::Values (const math_Vector& UV,
if(!((Value(UV2,FF2)) && (Value(UV3,FF3)))) if(!((Value(UV2,FF2)) && (Value(UV3,FF3))))
{ {
#ifdef DEB //There are many points close to singularity points and which have zero-derivative.
cout << "+++ Function Extrema_FuncExtCC::Values(...)" << endl; //Try to decrease aDelta variable's value.
cout << "There are many points close to singularity points "
"and which have zero-derivative." << endl;
cout << "Try to decrease aDelta variable's value. ---" << endl;
#endif
return Standard_False; return Standard_False;
} }
@ -632,12 +599,8 @@ Standard_Boolean Extrema_FuncExtCC::Values (const math_Vector& UV,
if(!((Value(UV2,FF2)) && (Value(UV1,FF1)))) if(!((Value(UV2,FF2)) && (Value(UV1,FF1))))
{ {
#ifdef DEB //There are many points close to singularity points and which have zero-derivative.
cout << "+++ Function Extrema_FuncExtCC::Values(...)" << endl; //Try to decrease aDelta variable's value.
cout << "There are many points close to singularity points "
"and which have zero-derivative." << endl;
cout << "Try to decrease aDelta variable's value. ---" << endl;
#endif
return Standard_False; return Standard_False;
} }
@ -663,12 +626,8 @@ Standard_Boolean Extrema_FuncExtCC::Values (const math_Vector& UV,
UV3(2)=myV; UV3(2)=myV;
if(!((Value(UV2,FF2)) && (Value(UV3,FF3)))) if(!((Value(UV2,FF2)) && (Value(UV3,FF3))))
{ {
#ifdef DEB //There are many points close to singularity points and which have zero-derivative.
cout << "+++ Function Extrema_FuncExtCC::Values(...)" << endl; //Try to decrease aDelta variable's value.
cout << "There are many points close to singularity points "
"and which have zero-derivative." << endl;
cout << "Try to decrease aDelta variable's value. ---" << endl;
#endif
return Standard_False; return Standard_False;
} }
@ -688,12 +647,9 @@ Standard_Boolean Extrema_FuncExtCC::Values (const math_Vector& UV,
if(!((Value(UV2,FF2)) && (Value(UV1,FF1)))) if(!((Value(UV2,FF2)) && (Value(UV1,FF1))))
{ {
#ifdef DEB //There are many points close to singularity points
cout << "+++ Function Extrema_FuncExtCC::Values(...)" << endl; //and which have zero-derivative.
cout << "There are many points close to singularity points " //Try to decrease aDelta variable's value.
"and which have zero-derivative." << endl;
cout << "Try to decrease aDelta variable's value. ---" << endl;
#endif
return Standard_False; return Standard_False;
} }

View File

@ -247,10 +247,7 @@ Standard_Boolean Extrema_FuncExtPC::Value (const Standard_Real U, Standard_Real&
if (Ndu <= MinTol) if (Ndu <= MinTol)
{ {
#ifdef DEB //Warning: 1st derivative is equal to zero!
cout << "+++Function Extrema_FuncExtPC::Value(...)." << endl;
cout << "Warning: 1st derivative is equal to zero!---"<<endl;
#endif
return Standard_False; return Standard_False;
} }
@ -270,7 +267,9 @@ Standard_Boolean Extrema_FuncExtPC::Derivative (const Standard_Real U, Standard_
} }
//============================================================================= //=============================================================================
Standard_Boolean Extrema_FuncExtPC::Values (const Standard_Real U, Standard_Real& F, Standard_Real& D1f) Standard_Boolean Extrema_FuncExtPC::Values (const Standard_Real U,
Standard_Real& F,
Standard_Real& D1f)
{ {
if (!myPinit || !myCinit) if (!myPinit || !myCinit)
Standard_TypeMismatch::Raise("No init"); Standard_TypeMismatch::Raise("No init");
@ -279,10 +278,7 @@ Standard_Boolean Extrema_FuncExtPC::Values (const Standard_Real U, Standard_Real
if(Value(U,F) == Standard_False) if(Value(U,F) == Standard_False)
{ {
#ifdef DEB //Warning: No function value found!;
cout << "+++Function Extrema_FuncExtPC::Values(...)." << endl;
cout << "Warning: No function value found!---"<<endl;
#endif
myD1Init = Standard_False; myD1Init = Standard_False;
return Standard_False; return Standard_False;
@ -322,12 +318,9 @@ Standard_Boolean Extrema_FuncExtPC::Values (const Standard_Real U, Standard_Real
if(!((Value(U2,F2)) && (Value(U3,F3)))) if(!((Value(U2,F2)) && (Value(U3,F3))))
{ {
#ifdef DEB //There are many points close to singularity points and
cout << "+++ Function Extrema_FuncExtPC::Values(...)" << endl; //which have zero-derivative. Try to decrease aDelta variable's value.
cout << "There are many points close to singularity points "
"and which have zero-derivative." << endl;
cout << "Try to decrease aDelta variable's value. ---" << endl;
#endif
myD1Init = Standard_False; myD1Init = Standard_False;
return Standard_False; return Standard_False;
} }
@ -345,12 +338,8 @@ Standard_Boolean Extrema_FuncExtPC::Values (const Standard_Real U, Standard_Real
if(!((Value(U2,F2)) && (Value(U1,F1)))) if(!((Value(U2,F2)) && (Value(U1,F1))))
{ {
#ifdef DEB //There are many points close to singularity points and
cout << "+++ Function Extrema_FuncExtPC::Values(...)" << endl; //which have zero-derivative. Try to decrease aDelta variable's value.
cout << "There are many points close to singularity points "
"and which have zero-derivative." << endl;
cout << "Try to decrease aDelta variable's value. ---" << endl;
#endif
myD1Init = Standard_False; myD1Init = Standard_False;
return Standard_False; return Standard_False;
} }