diff --git a/bin/Debug/unittest.exe b/bin/Debug/unittest.exe index bdbfd52..2e1c406 100644 Binary files a/bin/Debug/unittest.exe and b/bin/Debug/unittest.exe differ diff --git a/main.cpp b/main.cpp index 641d39e..45022b3 100644 --- a/main.cpp +++ b/main.cpp @@ -1,7 +1,13 @@ #include #include +#inclide +#invlude #include "histogram.h" #include "text.h" +#include +#include "histogram_internal.h" +#include +#include #include "svg.h" @@ -14,27 +20,30 @@ size_t bin_count{}; }; Input -input_data() +input_data(istream &tin, bool promt) { +Input in; size_t number_count; -cin>> number_count; +if (promt) +{ + cerr << "enter number count"; +} +tin>> number_count; -Input in; in.numbers.resize(number_count); for (size_t i = 0; i < number_count; i++) { -cin>> in.numbers[i]; +in>> in.numbers[i]; } -cin >>in.bin_count; -char in.arr[bin_count]; -for(int i=0; i>in.arr[i]; + cerr<<"enter bin count:"; } +in >>in.bin_count; return in; } diff --git a/obj/Debug/histogram.o b/obj/Debug/histogram.o index b191884..421bf65 100644 Binary files a/obj/Debug/histogram.o and b/obj/Debug/histogram.o differ diff --git a/unittest.depend b/unittest.depend index b539179..1f33cb7 100644 --- a/unittest.depend +++ b/unittest.depend @@ -55,6 +55,6 @@ "histogram.h" -1685565442 c:\users\Шестов Денис\desktop\laba3\histogram.h +1686126750 c:\users\Шестов Денис\desktop\laba3\histogram.h