diff --git a/.gitignore b/.gitignore
index 15a5798..85c821d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
/bin
/obj
*.depend
-*.layout
\ No newline at end of file
+*.layout
+/curl
\ No newline at end of file
diff --git a/cs-lab34.cbp b/cs-lab34.cbp
index 981bf7b..4bc68b5 100644
--- a/cs-lab34.cbp
+++ b/cs-lab34.cbp
@@ -13,7 +13,12 @@
+
+
+
+
+
diff --git a/main.cpp b/main.cpp
index ac8a47e..b844796 100644
--- a/main.cpp
+++ b/main.cpp
@@ -3,6 +3,7 @@
#include "histogram.h"
#include "text.h"
#include "svg.h"
+#include
using namespace std;
@@ -11,24 +12,30 @@ struct Input {
size_t bin_count{};
};
-Input
-input_data(istream& stream) {
- Input in;
- size_t number_count;
+Input input_data(istream& stream, bool prompt) {
+ Input in;
+ size_t number_count;
+ if (prompt) {
cerr << "Enter number count: ";
- stream >> number_count;
- in.numbers.resize(number_count);
- for (size_t i = 0; i < number_count; i++)
- {
- stream >> in.numbers[i];
+ }
+ stream >> number_count;
+ in.numbers.resize(number_count);
+ for (size_t i = 0; i < number_count; i++) {
+ if (prompt) {
+ cerr << "Enter number " << i+1 << ": ";
}
+ stream >> in.numbers[i];
+ }
+ if (prompt) {
cerr << "Enter bin count: ";
- stream >> in.bin_count;
- return in;
+ }
+ stream >> in.bin_count;
+ return in;
}
int main() {
- Input in = input_data(cin);
+ curl_global_init(CURL_GLOBAL_ALL);
+ Input in = input_data(cin, false);
vector bins = make_histogram(in.numbers, in.bin_count);
show_histogram_svg(bins);
}