Extend Optimizer interface

include/optimizer.h

@@ -18,13 +18,14 @@ template <typename argtype, typename valtype> class Optimizer {
 
 /*
    Class using the gradient descent method in order to minimize a given
-   function by performing a the gradient descent with a given factor applied to
+   function by performing the gradient descent with a given factor applied to
    the gradient at each step.
 */
 class GradientDescent : public Optimizer<double, double> {
   public:
-    GradientDescent(Differentiator<double, double>& _diff, double _stepsize)
-        : diff(_diff), stepsize(_stepsize) {}
+    GradientDescent(Differentiator<double, double>& _diff, double _stepsize, 
+		double _diff_precision)
+        : diff(_diff), stepsize(_stepsize), diff_precision(_diff_precision) {}
 
     Coordinate<double> optimize(Function<Coordinate<double>, double>& func,
                                 Coordinate<double>& start,
@@ -32,7 +33,7 @@ class GradientDescent : public Optimizer<double, double> {
 
   protected:
     Differentiator<double, double>& diff;
-    double stepsize;
+    double stepsize, diff_precision;
 };
 
 /*
@@ -69,6 +70,10 @@ class ConjugateGradient : public Optimizer<double, double> {
                                 Coordinate<double>& start,
                                 double precision) const override;
 
+    Coordinate<double> CGstep(Function<Coordinate<double>, double>& func,
+                                Coordinate<double>& start,
+                                double precision) const override;
+
   protected:
     Differentiator<double, double>& diff;
     double diff_precision;

src/optimizer.cpp

@@ -2,13 +2,14 @@
 
 using namespace numerics;
 /*
-   For an explanation on what the three methods do see the exercise sheet, your
-   lecture notes as well as the internet :)
+   For an explanation on what the three methods do, see the exercise sheet, your
+   lecture notes, the header file as well as possibly the Internet :)
 */
 
 Coordinate<double>
 GradientDescent::optimize(Function<Coordinate<double>, double>& func,
                           Coordinate<double>& start, double precision) const {
+	// TODO Problem 1
     return start;
 }
 
@@ -16,11 +17,20 @@ Coordinate<double>
 GradientRootfinder::optimize(Function<Coordinate<double>, double>& func,
                              Coordinate<double>& start,
                              double precision) const {
+	// TODO Problem 2
     return start;
 }
 
 Coordinate<double>
 ConjugateGradient::optimize(Function<Coordinate<double>, double>& func,
                             Coordinate<double>& start, double precision) const {
+	// TODO Problem 3
+    return start;
+}
+
+Coordinate<double>
+ConjugateGradient::CGstep(Function<Coordinate<double>, double>& func,
+                            Coordinate<double>& start, double precision) const {
+	// TODO Problem 3
     return start;
 }