diff --git a/lab01.layout b/lab01.layout index edf0887..da1f663 100644 --- a/lab01.layout +++ b/lab01.layout @@ -2,29 +2,24 @@ - - - - - - + - + - + - + - + - + - + @@ -32,14 +27,19 @@ - + - + - + - + + + + + + diff --git a/main.cpp b/main.cpp index 94280cd..76f43d8 100644 --- a/main.cpp +++ b/main.cpp @@ -18,17 +18,23 @@ struct Input { }; Input -input_data(istream& in) { +input_data(istream& in,bool prompt) { + string a, b, c; + if(prompt== true){ + a = "Enter number count:"; + b = "Enter numbers:"; + c = "Enter bin count:"; + } size_t number_count; - cerr << "Enter number count: "; + cerr << a; in >> number_count; Input on; on.numbers.resize(number_count); for (size_t i = 0; i < number_count; i++) { - cerr << "Enter number " << i+1 << ": "; + cerr << b << i+1 << ": "; in >> on.numbers[i];} - cerr << "Enter bin count: "; + cerr << c; in >> on.bin_count; on.n = 0; @@ -44,11 +50,16 @@ input_data(istream& in) { -int main() +int main(int argc, char* argv[]) { + if (argc > 1) { + cerr << "argv[0] = " << argv[0] <<'\n'; + cerr << "argc = " << argc; + return 0;} + curl_global_init(CURL_GLOBAL_ALL); - auto in = input_data(cin); + auto in = input_data(cin,true); auto bins = make_histogram(in.numbers, in.bin_count); show_histogram_svg(bins); return 0;