diff --git a/Header.cpp b/Header.cpp index 822fa4d..28d384f 100644 --- a/Header.cpp +++ b/Header.cpp @@ -1,19 +1,5 @@ #include "Header.h" -Input input_data() -{ - Input in; - size_t n, korz; - - cerr << "Number of elem "; - cin >> n; - in.vec.resize(n); - for (size_t i = 0; i < n; i++) - cin >> in.vec[i]; - cerr << "Enter bin count: "; - cin >> in.korz; - return in; -} -void find_minmax(vector vec, double& min, double& max) { +void static find_minmax(vector vec, double& min, double& max) { min = vec[0]; max = vec[0]; for (double x : vec) { diff --git a/Header.h b/Header.h index 9e347c9..6febae0 100644 --- a/Header.h +++ b/Header.h @@ -1,10 +1,4 @@ #include #include using namespace std; -struct Input { - vector vec; - size_t korz{}; -}; -Input input_data(); -void find_minmax(vector vec, double& min, double& max); vector make_histogram(size_t number, vector vec); diff --git a/histogram_internal.cpp b/histogram_internal.cpp new file mode 100644 index 0000000..a3dfa85 --- /dev/null +++ b/histogram_internal.cpp @@ -0,0 +1,14 @@ +#include "histogram_internal.h" +void find_minmax(vector vec, double& min, double& max) { + min = vec[0]; + max = vec[0]; + for (double x : vec) { + if (x < min) { + min = x; + } + else if (x > max) + { + max = x; + } + } +} \ No newline at end of file diff --git a/histogram_internal.h b/histogram_internal.h new file mode 100644 index 0000000..7af7fa2 --- /dev/null +++ b/histogram_internal.h @@ -0,0 +1,2 @@ +#include "Header.h" +void find_minmax(vector vec, double& min, double& max); diff --git a/maincpp.cpp b/maincpp.cpp index 4a6793c..e3025e9 100644 --- a/maincpp.cpp +++ b/maincpp.cpp @@ -1,8 +1,24 @@ #include "Header.h" #include "text.h" +struct Input { + vector vec; + size_t korz{}; +}; +Input input_data() { + Input in; + size_t n, korz; + + cerr << "Number of elem "; + cin >> n; + in.vec.resize(n); + for (size_t i = 0; i < n; i++) + cin >> in.vec[i]; + cerr << "Enter bin count: "; + cin >> in.korz; + return in; +} int main() { auto in = input_data(); auto bins = make_histogram(in.korz, in.vec); show_histogram(bins); - } \ No newline at end of file