code: изменение функции ввода данны и bool prompt
Этот коммит содержится в:
1
.gitignore
поставляемый
1
.gitignore
поставляемый
@@ -1,5 +1,6 @@
|
|||||||
cs-lab34.cbp
|
cs-lab34.cbp
|
||||||
cs-lab34.depend
|
cs-lab34.depend
|
||||||
unittest.cbp
|
unittest.cbp
|
||||||
|
Untitled1.c
|
||||||
/bin
|
/bin
|
||||||
/obj
|
/obj
|
||||||
|
|||||||
50
main.cpp
50
main.cpp
@@ -6,35 +6,49 @@
|
|||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
|
|
||||||
struct Input {
|
struct Input {
|
||||||
|
vector<double> dn;
|
||||||
vector<double> numbers;
|
vector<double> numbers;
|
||||||
size_t bin_count{};
|
size_t bin_count{};
|
||||||
|
size_t number_count{};
|
||||||
|
size_t max_count{};
|
||||||
};
|
};
|
||||||
|
|
||||||
Input input_data() {
|
Input
|
||||||
|
input_data(istream& cin, bool prompt) {
|
||||||
size_t number_count;
|
if (prompt == true){
|
||||||
|
|
||||||
cerr << "Enter number count: ";
|
|
||||||
cin >> number_count;
|
|
||||||
|
|
||||||
Input in;
|
Input in;
|
||||||
|
cerr << "Enter number count: ";
|
||||||
cerr << "Enter number of bins: ";
|
cin >> in.number_count;
|
||||||
cin >> in.bin_count;
|
vector<double> numbers(in.number_count);
|
||||||
|
in.numbers.resize(in.number_count);
|
||||||
in.numbers.resize(number_count);
|
for (size_t i = 0; i < in.number_count; i++) {
|
||||||
|
|
||||||
cerr << "Enter numbers: ";
|
|
||||||
for (size_t i = 0; i < number_count; i++)
|
|
||||||
{
|
|
||||||
cin >> in.numbers[i];
|
cin >> in.numbers[i];
|
||||||
}
|
}
|
||||||
|
size_t bin_count;
|
||||||
|
cerr << "Enter bin count: ";
|
||||||
|
cin >> in.bin_count;
|
||||||
|
|
||||||
|
size_t max_count;
|
||||||
|
in.max_count = 0;
|
||||||
return in;
|
return in;
|
||||||
}
|
}
|
||||||
|
else{
|
||||||
|
Input in;
|
||||||
|
cin >> in.number_count;
|
||||||
|
vector<double> numbers(in.number_count);
|
||||||
|
in.numbers.resize(in.number_count);
|
||||||
|
for (size_t i = 0; i < in.number_count; i++) {
|
||||||
|
cin >> in.numbers[i];
|
||||||
|
}
|
||||||
|
size_t bin_count;
|
||||||
|
cin >> in.bin_count;
|
||||||
|
|
||||||
|
size_t max_count;
|
||||||
|
in.max_count = 0;
|
||||||
|
return in;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -42,7 +56,7 @@ int main(){
|
|||||||
|
|
||||||
bool res = false;
|
bool res = false;
|
||||||
|
|
||||||
Input in = input_data();
|
auto in = input_data(cin, true);
|
||||||
|
|
||||||
auto bins = make_histogram(in.numbers, in.bin_count);
|
auto bins = make_histogram(in.numbers, in.bin_count);
|
||||||
|
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user