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

0025376: Inconsistence between function and derivatives evaluation in Extrema_GlobOptFuncCS.

Browse Source 
Changed "value" function behavior in Extrema/Extrema_GlobOptFuncCS.cxx. Now it compute square distance between point on curve and point on surface.

Fixed description in Extrema_GlobOptFuncCC.
This commit is contained in:
aml
2014-10-15 11:44:53 +04:00
committed by bugmaster
parent ed06327034
commit f82a9555dc
4 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/math/math_PSO.cxx
View File

@@ -85,7 +85,7 @@ void math_PSO::Perform(const math_Vector& theSteps,
{
myFunc->Value(aCurrPoint, aCurrValue);
if (aCurrValue * aCurrValue < aParticle->Distance)
if (aCurrValue < aParticle->Distance)
{
Standard_Integer aDimIdx;
for(aDimIdx = 0; aDimIdx < myN; ++aDimIdx)
@@ -93,8 +93,8 @@ void math_PSO::Perform(const math_Vector& theSteps,
aParticle->Position[aDimIdx] = aCurrPoint(aDimIdx + 1);
aParticle->BestPosition[aDimIdx] = aCurrPoint(aDimIdx + 1);
}
aParticle->Distance = aCurrValue * aCurrValue;
aParticle->BestDistance = aCurrValue * aCurrValue;
aParticle->Distance = aCurrValue;
aParticle->BestDistance = aCurrValue;
aParticle = aPool.GetWorstParticle();
}
@@ -199,7 +199,6 @@ void math_PSO::performPSOWithGivenParticles(math_PSOParticlesPool& theParticles,
}
myFunc->Value(aCurrPoint, aParticle->Distance);
aParticle->Distance *= aParticle->Distance;
if(aParticle->Distance < aParticle->BestDistance)
{
aParticle->BestDistance = aParticle->Distance;