diff --git a/exercice_2/src/CMakeLists.txt b/exercice_2/src/CMakeLists.txt index 5a8844a..681fd68 100644 --- a/exercice_2/src/CMakeLists.txt +++ b/exercice_2/src/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.8) project(exercice_2) -add_executable(main main.cc series.hh series.cc compute_arithmetic.hh compute_arithmetic.cc compute_pi.hh compute_pi.cc) +add_executable(main main.cc series.hh series.cc compute_arithmetic.hh compute_arithmetic.cc compute_pi.hh compute_pi.cc dumper_series.hh dumper_series.cc print_series.hh print_series.cc) diff --git a/exercice_2/src/dumper_series.cc b/exercice_2/src/dumper_series.cc index 4a118ee..f3c6e88 100644 --- a/exercice_2/src/dumper_series.cc +++ b/exercice_2/src/dumper_series.cc @@ -1,3 +1,5 @@ #include "dumper_series.hh" DumperSeries::DumperSeries(Series &series) : series(series) {} + +DumperSeries::~DumperSeries() = default; diff --git a/exercice_2/src/dumper_series.hh b/exercice_2/src/dumper_series.hh index 1181f69..f7f8203 100644 --- a/exercice_2/src/dumper_series.hh +++ b/exercice_2/src/dumper_series.hh @@ -1,17 +1,18 @@ #ifndef DUMPER_SERIES_HH #define DUMPER_SERIES_HH #include "series.hh" class DumperSeries { public: DumperSeries(Series &series); + virtual ~DumperSeries(); public: virtual void dump() = 0; protected: Series &series; }; #endif diff --git a/exercice_2/src/main.cc b/exercice_2/src/main.cc index 27572f4..36f2b3b 100644 --- a/exercice_2/src/main.cc +++ b/exercice_2/src/main.cc @@ -1,45 +1,49 @@ /* created by Marti Bosch and Marc Schwaerzel*/ /* -------------------------------------------------------------------------- */ #include #include #include #include "compute_arithmetic.hh" #include "compute_pi.hh" #include "print_series.hh" #include "series.hh" /* -------------------------------------------------------------------------- */ int main(int argc, char **argv) { std::cout << "exercice 2" << std::endl; std::cout << "please enter the following arguments: frequence, maxiter, " "serie_type= #" << std::endl; const char *series_type; int maxiter; int ferquency; if (argc != 3) { std::cout << "retry with arg: frequence, maxiter, serie_type=pi/arithmetic" << std::endl; return EXIT_FAILURE; } Series *input_series_type; /* if (series_type == "arithmetic"){ input_series_type = new ComputeArithmetic(); } else if (series_type == "pi"){ input_series_type = new ComputePi(); } else{std::cout << "input error"<< std::endl; }*/ + + ComputeArithmetic comparith; + + PrintSeries printseries(comparith, 100, 10); } diff --git a/exercice_2/src/print_series.cc b/exercice_2/src/print_series.cc index 7f9bd94..78488c3 100644 --- a/exercice_2/src/print_series.cc +++ b/exercice_2/src/print_series.cc @@ -1,11 +1,13 @@ #include "print_series.hh" #include 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; } + +PrintSeries::~PrintSeries() = default;