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 new file mode 100644 index 0000000..967309a --- /dev/null +++ b/exercice_2/src/dumper_series.hh @@ -0,0 +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 8695820..18443df 100644 --- a/exercice_2/src/main.cc +++ b/exercice_2/src/main.cc @@ -1,17 +1,17 @@ /* created by Marti Bosch and Marc Schwaerzel*/ /* -------------------------------------------------------------------------- */ -//#include "***.hh" #include #include -#include "series.hh" -#include "compute_arithmetic.cc" -#include "compute_pi.cc" -/* -------------------------------------------------------------------------- */ +#include + +#include "compute_arithmetic.hh" +#include "print_series.hh" +/* -------------------------------------------------------------------------- */ -int main(){ - std::cout<< "exercice 2" << std::endl; - +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; +};