mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-04 13:13:25 +03:00
0031671: Coding Rules - eliminate warnings issued by clang 11
Fixed -Wdeprecated-copy warning by removing trivial operator=. Fixed formatting issues in places producing -Wmisleading-indentation warning.
This commit is contained in:
@@ -353,53 +353,73 @@ Standard_Integer AppDef_LinearCriteria::QualityValues(const Standard_Real J1min,
|
||||
// (critere sureleve => Non minimisation )
|
||||
|
||||
for(i = 0; i <= 2; i++)
|
||||
{
|
||||
if((ValCri[i] < 0.8 * myEstimation[i]) && (myEstimation[i] > JEsMin[i])) {
|
||||
if(ICDANA < 1) ICDANA = 1;
|
||||
if(ValCri[i] < 0.1 * myEstimation[i]) ICDANA = 2;
|
||||
myEstimation[i] = Max(1.05*ValCri[i], JEsMin[i]);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// (3) Mise a jours des Estimation
|
||||
// (critere sous-estimer => mauvais conditionement)
|
||||
|
||||
if (ValCri[0] > myEstimation[0] * 2) {
|
||||
myEstimation[0] += ValCri[0] * .1;
|
||||
if (ICDANA == 0) {
|
||||
if (ValCri[0] > myEstimation[0] * 10) {
|
||||
ICDANA = 2;
|
||||
}
|
||||
else ICDANA = 1;
|
||||
}
|
||||
else {
|
||||
ICDANA = 2;
|
||||
}
|
||||
if (ValCri[0] > myEstimation[0] * 2)
|
||||
{
|
||||
myEstimation[0] += ValCri[0] * .1;
|
||||
if (ICDANA == 0)
|
||||
{
|
||||
if (ValCri[0] > myEstimation[0] * 10)
|
||||
{
|
||||
ICDANA = 2;
|
||||
}
|
||||
else
|
||||
{
|
||||
ICDANA = 1;
|
||||
}
|
||||
}
|
||||
if (ValCri[1] > myEstimation[1] * 20) {
|
||||
myEstimation[1] += ValCri[1] * .1;
|
||||
if (ICDANA == 0) {
|
||||
if (ValCri[1] > myEstimation[1] * 100) {
|
||||
ICDANA = 2;
|
||||
}
|
||||
else ICDANA = 1;
|
||||
}
|
||||
else {
|
||||
ICDANA = 2;
|
||||
}
|
||||
else
|
||||
{
|
||||
ICDANA = 2;
|
||||
}
|
||||
if (ValCri[2] > myEstimation[2] * 20) {
|
||||
myEstimation[2] += ValCri[2] * .05;
|
||||
if (ICDANA == 0) {
|
||||
if (ValCri[2] > myEstimation[2] * 100) {
|
||||
ICDANA = 2;
|
||||
}
|
||||
else ICDANA = 1;
|
||||
}
|
||||
else {
|
||||
ICDANA = 2;
|
||||
}
|
||||
}
|
||||
if (ValCri[1] > myEstimation[1] * 20)
|
||||
{
|
||||
myEstimation[1] += ValCri[1] * .1;
|
||||
if (ICDANA == 0)
|
||||
{
|
||||
if (ValCri[1] > myEstimation[1] * 100)
|
||||
{
|
||||
ICDANA = 2;
|
||||
}
|
||||
else
|
||||
{
|
||||
ICDANA = 1;
|
||||
}
|
||||
}
|
||||
|
||||
else
|
||||
{
|
||||
ICDANA = 2;
|
||||
}
|
||||
}
|
||||
if (ValCri[2] > myEstimation[2] * 20)
|
||||
{
|
||||
myEstimation[2] += ValCri[2] * .05;
|
||||
if (ICDANA == 0)
|
||||
{
|
||||
if (ValCri[2] > myEstimation[2] * 100)
|
||||
{
|
||||
ICDANA = 2;
|
||||
}
|
||||
else
|
||||
{
|
||||
ICDANA = 1;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
ICDANA = 2;
|
||||
}
|
||||
}
|
||||
|
||||
return ICDANA;
|
||||
}
|
||||
|
Reference in New Issue
Block a user