diff --git a/Lab01.cbp b/Lab01.cbp index aa7d216..d645cb5 100644 --- a/Lab01.cbp +++ b/Lab01.cbp @@ -33,6 +33,7 @@ <Add option="-fexceptions" /> </Compiler> <Unit filename="histogram.cpp" /> + <Unit filename="histogram_internal.h" /> <Unit filename="main.cpp" /> <Unit filename="text.cpp" /> <Unit filename="text.h" /> diff --git a/histogram.cpp b/histogram.cpp index ebae521..6477f85 100644 --- a/histogram.cpp +++ b/histogram.cpp @@ -1,6 +1,6 @@ #include "histogram.h" #include <vector> -static void find_minmax(const std::vector <double> &numbers, double &min, double &max) +void find_minmax(const std::vector <double> &numbers, double &min, double &max) { min = numbers[0]; max = numbers[0]; diff --git a/histogram_internal.h b/histogram_internal.h new file mode 100644 index 0000000..44594cb --- /dev/null +++ b/histogram_internal.h @@ -0,0 +1,8 @@ +#ifndef HISTOGRAM_INTERNAL_H_INCLUDED +#define HISTOGRAM_INTERNAL_H_INCLUDED + +#include <vector> + +void find_minmax(const std::vector <double> &numbers, double &min, double &max, bool &res); + +#endif // HISTOGRAM_INTERNAL_H_INCLUDED diff --git a/text.cpp b/text.cpp index f272c99..34c7d59 100644 --- a/text.cpp +++ b/text.cpp @@ -40,7 +40,7 @@ show_histogram_text(const std::vector <std::size_t> &bins) else { - for (int i = 0; i < bins.size(); i++) + for (std::size_t i = 0; i < bins.size(); i++) { if (bins[i] < 100) { @@ -51,7 +51,7 @@ show_histogram_text(const std::vector <std::size_t> &bins) } } std::cout << bins[i] << "|"; - for (int j = 0; j < bins[i]; j++) + for (std::size_t j = 0; j < bins[i]; j++) { std::cout << "*"; }