Commit deec8bb1 authored by Fabian Meyer's avatar Fabian Meyer
Browse files

Update example applications

parent b8e000bd

README.md

+3 −3
Original line number Original line Diff line number Diff line
@@ -67,8 +67,8 @@ int main() 
    // Create optimizer object with Ackley functor as objective.

    // Create optimizer object with Ackley functor as objective.

    //

    //

    // You can specify a StepSize functor as template parameter.

    // You can specify a StepSize functor as template parameter.

    // There are ConstantStepSize, LimitedChangeStep, BarzilaiBorweinStep and

    // There are ConstantStepSize,  BarzilaiBorweinStep and

    // WolfeLineSearch available. (Default is BarzilaiBorweinStep)

    // WolfeBacktracking available. (Default is BarzilaiBorweinStep)

    //

    //

    // You can additionally specify a Callback functor as template parameter.

    // You can additionally specify a Callback functor as template parameter.

    //

    //
@@ -76,7 +76,7 @@ int main() 
    // parameter. There are Forward-, Backward- and CentralDifferences

    // parameter. There are Forward-, Backward- and CentralDifferences

    // available. (Default is CentralDifferences)

    // available. (Default is CentralDifferences)

    gdc::GradientDescent<double, Ackley,

    gdc::GradientDescent<double, Ackley,

        gdc::WolfeLineSearch<double, Ackley>> optimizer;

        gdc::WolfeBacktracking<double>> optimizer;





    // Set number of iterations as stop criterion.

    // Set number of iterations as stop criterion.

    // Set it to 0 or negative for infinite iterations (default is 0).

    // Set it to 0 or negative for infinite iterations (default is 0).

examples/ackley.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -26,8 +26,8 @@ int main() 
    // Create optimizer object with Ackley functor as objective.

    // Create optimizer object with Ackley functor as objective.

    //

    //

    // You can specify a StepSize functor as template parameter.

    // You can specify a StepSize functor as template parameter.

    // There are ConstantStepSize, LimitedChangeStep, BarzilaiBorweinStep and

    // There are ConstantStepSize,  BarzilaiBorweinStep and

    // WolfeLineSearch available. (Default is BarzilaiBorweinStep)

    // WolfeBacktracking available. (Default is BarzilaiBorweinStep)

    //

    //

    // You can additionally specify a Callback functor as template parameter.

    // You can additionally specify a Callback functor as template parameter.

    //

    //
@@ -35,7 +35,7 @@ int main() 
    // parameter. There are Forward-, Backward- and CentralDifferences

    // parameter. There are Forward-, Backward- and CentralDifferences

    // available. (Default is CentralDifferences)

    // available. (Default is CentralDifferences)

    gdc::GradientDescent<double, Ackley,

    gdc::GradientDescent<double, Ackley,

        gdc::WolfeLineSearch<double, Ackley>> optimizer;

        gdc::WolfeBacktracking<double>> optimizer;





    // Set number of iterations as stop criterion.

    // Set number of iterations as stop criterion.

    // Set it to 0 or negative for infinite iterations (default is 0).

    // Set it to 0 or negative for infinite iterations (default is 0).

examples/paraboloid.cpp

+4 −4
Original line number Original line Diff line number Diff line
@@ -21,8 +21,8 @@ int main() 
    // Create optimizer object with Paraboloid functor as objective.

    // Create optimizer object with Paraboloid functor as objective.

    //

    //

    // You can specify a StepSize functor as template parameter.

    // You can specify a StepSize functor as template parameter.

    // There are ConstantStepSize, LimitedChangeStep, BarzilaiBorweinStep and

    // There are ConstantStepSize, BarzilaiBorweinStep and

    // WolfeLineSearch available. (Default is BarzilaiBorweinStep)

    // WolfeBacktracking available. (Default is BarzilaiBorweinStep)

    //

    //

    // You can additionally specify a Callback functor as template parameter.

    // You can additionally specify a Callback functor as template parameter.

    //

    //
@@ -30,7 +30,7 @@ int main() 
    // parameter. There are Forward-, Backward- and CentralDifferences

    // parameter. There are Forward-, Backward- and CentralDifferences

    // available. (Default is CentralDifferences)

    // available. (Default is CentralDifferences)

    gdc::GradientDescent<double, Paraboloid,

    gdc::GradientDescent<double, Paraboloid,

        gdc::ConstantStepSize<double, Paraboloid>> optimizer;

        gdc::ConstantStepSize<double>> optimizer;





    // Set number of iterations as stop criterion.

    // Set number of iterations as stop criterion.

    // Set it to 0 or negative for infinite iterations (default is 0).

    // Set it to 0 or negative for infinite iterations (default is 0).
@@ -47,7 +47,7 @@ int main() 
    optimizer.setMinStepLength(1e-6);

    optimizer.setMinStepLength(1e-6);





    // Set the the parametrized StepSize functor used for the step calculation.

    // Set the the parametrized StepSize functor used for the step calculation.

    optimizer.setStepSize(gdc::ConstantStepSize<double, Paraboloid>(0.8));

    optimizer.setStepSize(gdc::ConstantStepSize<double>(0.8));





    // Set the momentum rate used for the step calculation (default is 0.0).

    // Set the momentum rate used for the step calculation (default is 0.0).

    // Defines how much momentum is kept from previous iterations.

    // Defines how much momentum is kept from previous iterations.