diff --git a/lab_3.xcodeproj/project.xcworkspace/xcuserdata/lesaminov.xcuserdatad/UserInterfaceState.xcuserstate b/lab_3.xcodeproj/project.xcworkspace/xcuserdata/lesaminov.xcuserdatad/UserInterfaceState.xcuserstate index 13ae96d..ec8a4cb 100644 Binary files a/lab_3.xcodeproj/project.xcworkspace/xcuserdata/lesaminov.xcuserdatad/UserInterfaceState.xcuserstate and b/lab_3.xcodeproj/project.xcworkspace/xcuserdata/lesaminov.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/main.cpp b/main.cpp index 485e4e4..0ae7456 100644 --- a/main.cpp +++ b/main.cpp @@ -4,6 +4,7 @@ #include "histogram.hpp" #include "text.hpp" #include "svg.hpp" +#include using namespace std; @@ -13,26 +14,28 @@ struct Input size_t bin_count{}; }; -Input input_data() +Input input_data(istream& in, bool prompt) { size_t number_count; - cerr << "Enter number count: "; - cin >> number_count; // Кол-во чисел - Input in; - in.numbers.resize(number_count); + if (prompt) {cerr << "Enter number count: ";} + in >> number_count; // Кол-во чисел + Input inp; + inp.numbers.resize(number_count); for (size_t i = 0; i < number_count; i++) { - cerr << "Enter number №" << i+1 << ": "; - cin >> in.numbers[i]; + if(prompt){cerr << "Enter number №" << i+1 << ": ";} + in >> inp.numbers[i]; } - cerr << "Enter bin count: "; - cin >> in.bin_count; - return in; + if(prompt){cerr << "Enter bin count: ";} + in >> inp.bin_count; + return inp; } int main() { - auto in = input_data(); +// curl_global_init(CURL_GLOBAL_ALL); + bool prompt = false; + auto in = input_data(cin, prompt); auto bins = make_histogram(in.numbers, in.bin_count); show_histogram_svg(bins); return 0; diff --git a/unittest/unittest.xcodeproj/project.xcworkspace/xcuserdata/lesaminov.xcuserdatad/UserInterfaceState.xcuserstate b/unittest/unittest.xcodeproj/project.xcworkspace/xcuserdata/lesaminov.xcuserdatad/UserInterfaceState.xcuserstate index 6936264..2840af0 100644 Binary files a/unittest/unittest.xcodeproj/project.xcworkspace/xcuserdata/lesaminov.xcuserdatad/UserInterfaceState.xcuserstate and b/unittest/unittest.xcodeproj/project.xcworkspace/xcuserdata/lesaminov.xcuserdatad/UserInterfaceState.xcuserstate differ