diff --git a/exercice_2/src/dumper_series.cc b/exercice_2/src/dumper_series.cc new file mode 100644 index 0000000..e4a798f --- /dev/null +++ b/exercice_2/src/dumper_series.cc @@ -0,0 +1,5 @@ +#include "dumper_series.hh" + +DumperSeries::DumperSeries (Series & series) : series(series) { + +} diff --git a/exercice_2/src/dumper_series.hh b/exercice_2/src/dumper_series.hh index 2797283..967309a 100644 --- a/exercice_2/src/dumper_series.hh +++ b/exercice_2/src/dumper_series.hh @@ -1,9 +1,10 @@ #include "series.hh" class DumperSeries { public: + DumperSeries(Series & series); virtual void dump() = 0; protected: Series & series; }; diff --git a/exercice_2/src/main.cc b/exercice_2/src/main.cc index 57774e7..b506d87 100644 --- a/exercice_2/src/main.cc +++ b/exercice_2/src/main.cc @@ -1,11 +1,17 @@ /* created by Marti Bosch and Marc Schwaerzel*/ /* -------------------------------------------------------------------------- */ -#include "***.hh" +#include + +#include "compute_arithmetic.cc" +#include "print_series.hh" + // #include // #include /* -------------------------------------------------------------------------- */ -void main() { - +int main() { + ComputeArithmetic comparith; + PrintSeries printseries(comparith, 100, 10); + return EXIT_SUCCESS; } diff --git a/exercice_2/src/print_series.cc b/exercice_2/src/print_series.cc new file mode 100644 index 0000000..b89966d --- /dev/null +++ b/exercice_2/src/print_series.cc @@ -0,0 +1,11 @@ +#include +#include "print_series.hh" + +PrintSeries::PrintSeries (Series & series, unsigned int maxiter, unsigned int frequency) : DumperSeries(series), maxiter(maxiter), frequency(frequency) { + +} + +void PrintSeries::dump() { + for (int i=1; i <= this->maxiter; i += this->frequency) + std::cout << this->series.compute(i) << std::endl; +} diff --git a/exercice_2/src/print_series.hh b/exercice_2/src/print_series.hh new file mode 100644 index 0000000..1201122 --- /dev/null +++ b/exercice_2/src/print_series.hh @@ -0,0 +1,11 @@ +#include "dumper_series.hh" + +class PrintSeries : public DumperSeries { +public: + PrintSeries(Series & series, unsigned int maxiter, unsigned int frequency); + virtual ~PrintSeries(); + void dump(); +protected: + unsigned int maxiter; + unsigned int frequency; +};