Browse Source

Optimization: cleanup, rename ObjectiveChecker.cs file name to match class name

pull/489/head
Christoph Ruegg 11 years ago
committed by Erik Ovegard
parent
commit
5a0ee082fc
  1. 2
      src/Numerics/Numerics.csproj
  2. 0
      src/Numerics/Optimization/Implementation/CheckedObjectiveFunction.cs
  3. 12
      src/Numerics/Optimization/MinimizationOutput.cs

2
src/Numerics/Numerics.csproj

@ -121,7 +121,7 @@
<Compile Include="Optimization\IObjectiveFunction.cs" /> <Compile Include="Optimization\IObjectiveFunction.cs" />
<Compile Include="Optimization\Implementation\LineSearchOutput.cs" /> <Compile Include="Optimization\Implementation\LineSearchOutput.cs" />
<Compile Include="Optimization\Implementation\NullObjectiveFunction.cs" /> <Compile Include="Optimization\Implementation\NullObjectiveFunction.cs" />
<Compile Include="Optimization\Implementation\ObjectiveChecker.cs" /> <Compile Include="Optimization\Implementation\CheckedObjectiveFunction.cs" />
<Compile Include="Optimization\Implementation\WeakWolfeLineSearch.cs" /> <Compile Include="Optimization\Implementation\WeakWolfeLineSearch.cs" />
<Compile Include="Optimization\IUnconstrainedMinimizer.cs" /> <Compile Include="Optimization\IUnconstrainedMinimizer.cs" />
<Compile Include="Optimization\MinimizationOutput.cs" /> <Compile Include="Optimization\MinimizationOutput.cs" />

0
src/Numerics/Optimization/Implementation/ObjectiveChecker.cs → src/Numerics/Optimization/Implementation/CheckedObjectiveFunction.cs

12
src/Numerics/Optimization/MinimizationOutput.cs

@ -4,7 +4,17 @@ namespace MathNet.Numerics.Optimization
{ {
public class MinimizationOutput public class MinimizationOutput
{ {
public enum ExitCondition { None, RelativeGradient, LackOfProgress, AbsoluteGradient, WeakWolfeCriteria, BoundTolerance, StrongWolfeCriteria, LackOfFunctionImprovement } public enum ExitCondition
{
None,
RelativeGradient,
LackOfProgress,
AbsoluteGradient,
WeakWolfeCriteria,
BoundTolerance,
StrongWolfeCriteria,
LackOfFunctionImprovement
}
public Vector<double> MinimizingPoint { get { return FunctionInfoAtMinimum.Point; } } public Vector<double> MinimizingPoint { get { return FunctionInfoAtMinimum.Point; } }
public IObjectiveFunction FunctionInfoAtMinimum { get; private set; } public IObjectiveFunction FunctionInfoAtMinimum { get; private set; }

Loading…
Cancel
Save