Commit 5dfbeeca authored by David Gobbi's avatar David Gobbi
Browse files

BUG: 3501. Merge fix from main branch: cvs update -j 1.4 -j 1.6

parent 67ca165b
......@@ -15,7 +15,7 @@
#include "vtkAmoebaMinimizer.h"
#include "vtkObjectFactory.h"
vtkCxxRevisionMacro(vtkAmoebaMinimizer, "1.4");
vtkCxxRevisionMacro(vtkAmoebaMinimizer, "1.4.14.1");
vtkStandardNewMacro(vtkAmoebaMinimizer);
//----------------------------------------------------------------------------
......@@ -499,7 +499,13 @@ void vtkAmoebaMinimizer::InitializeAmoeba()
}
this->AmoebaSum[j] += this->ParameterValues[j];
}
}
for( i = 0 ; i < n_parameters+1 ; i++ )
{
for( j = 0; j < n_parameters; j++ )
{
this->ParameterValues[j] = this->AmoebaVertices[i][j];
}
this->EvaluateFunction();
this->AmoebaValues[i] = this->FunctionValue;
}
......@@ -636,6 +642,7 @@ double vtkAmoebaMinimizer::TryAmoeba(double sum[],
@NAME : PerformAmoeba
@INPUT :
@OUTPUT :
@RETURNS : true if numerically significant improvement
@DESCRIPTION: Performs one iteration of an amoeba, returning true if a
numerically significant improvement has been found recently.
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment