lili/OCCT
1
0
Fork 0
mirror of https://github.com/Open-Cascade-SAS/OCCT.git synced 2026-05-11 01:58:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

0032763: Coding Rules - eliminate CLang warning -Wbitwise-instead-of-logical in math_FunctionSetRoot.cxx

Browse Source
This commit is contained in:
kgv
2022-01-12 19:51:18 +03:00
committed by smoskvin
parent 9ff36dac47
commit dfa2a6719c
4 changed files with 87 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/math/math_FunctionSetRoot.cxx
View File

@@ -736,12 +736,15 @@ void math_FunctionSetRoot::Perform(math_FunctionSetWithDerivatives& F,
myIsDivergent = Standard_False;
for (i = 1; i <= Ninc; i++)
{
myIsDivergent |= (Sol(i) < theInfBound(i)) | (theSupBound(i) < Sol(i));
myIsDivergent = myIsDivergent
|| Sol(i) < theInfBound(i)
|| Sol(i) > theSupBound(i);
}
if (theStopOnDivergent & myIsDivergent)
if (theStopOnDivergent && myIsDivergent)
{
return;
}
// Verification de la validite des inconnues par rapport aux bornes.
// Recentrage sur les bornes si pas valide.
for ( i = 1; i <= Ninc; i++) {
@@ -811,9 +814,11 @@ void math_FunctionSetRoot::Perform(math_FunctionSetWithDerivatives& F,
//
for (i = 1; i <= Ninc; i++)
{
myIsDivergent |= (Sol(i) < theInfBound(i)) | (theSupBound(i) < Sol(i));
myIsDivergent = myIsDivergent
|| Sol(i) < theInfBound(i)
|| Sol(i) > theSupBound(i);
}
if (theStopOnDivergent & myIsDivergent)
if (theStopOnDivergent && myIsDivergent)
{
return;
}
@@ -877,9 +882,11 @@ void math_FunctionSetRoot::Perform(math_FunctionSetWithDerivatives& F,
//
for (i = 1; i <= Ninc; i++)
{
myIsDivergent |= (Sol(i) < theInfBound(i)) | (theSupBound(i) < Sol(i));
myIsDivergent = myIsDivergent
|| Sol(i) < theInfBound(i)
|| Sol(i) > theSupBound(i);
}
if (theStopOnDivergent & myIsDivergent)
if (theStopOnDivergent && myIsDivergent)
{
return;
}
@@ -915,9 +922,11 @@ void math_FunctionSetRoot::Perform(math_FunctionSetWithDerivatives& F,
//
for (i = 1; i <= Ninc; i++)
{
myIsDivergent |= (Sol(i) < theInfBound(i)) | (theSupBound(i) < Sol(i));
myIsDivergent = myIsDivergent
|| Sol(i) < theInfBound(i)
|| Sol(i) > theSupBound(i);
}
if (theStopOnDivergent & myIsDivergent)
if (theStopOnDivergent && myIsDivergent)
{
return;
}
@@ -997,9 +1006,11 @@ void math_FunctionSetRoot::Perform(math_FunctionSetWithDerivatives& F,
//
for (i = 1; i <= Ninc; i++)
{
myIsDivergent |= (Sol(i) < theInfBound(i)) | (theSupBound(i) < Sol(i));
myIsDivergent = myIsDivergent
|| Sol(i) < theInfBound(i)
|| Sol(i) > theSupBound(i);
}
if (theStopOnDivergent & myIsDivergent)
if (theStopOnDivergent && myIsDivergent)
{
return;
}
@@ -1040,9 +1051,11 @@ void math_FunctionSetRoot::Perform(math_FunctionSetWithDerivatives& F,
//
for (i = 1; i <= Ninc; i++)
{
myIsDivergent |= (Sol(i) < theInfBound(i)) | (theSupBound(i) < Sol(i));
myIsDivergent = myIsDivergent
|| Sol(i) < theInfBound(i)
|| Sol(i) > theSupBound(i);
}
if (theStopOnDivergent & myIsDivergent)
if (theStopOnDivergent && myIsDivergent)
{
return;
}
@@ -1083,9 +1096,11 @@ void math_FunctionSetRoot::Perform(math_FunctionSetWithDerivatives& F,
//
for (i = 1; i <= Ninc; i++)
{
myIsDivergent |= (Sol(i) < theInfBound(i)) | (theSupBound(i) < Sol(i));
myIsDivergent = myIsDivergent
|| Sol(i) < theInfBound(i)
|| Sol(i) > theSupBound(i);
}
if (theStopOnDivergent & myIsDivergent)
if (theStopOnDivergent && myIsDivergent)
{
return;
}