code: добавил логическую переменную promt для вывода приглашений

main
Пивоваров Ярослав 2 лет назад
Родитель 80f2e0c04a
Сommit 03b79f9172

@ -1,45 +1,43 @@
#include <math.h>
#include <iostream> #include <iostream>
#include <conio.h>
#include <vector> #include <vector>
#include <cmath>
#include "histogram.h" #include "histogram.h"
#include "text.h" #include "text.h"
#include "svg.h" #include "svg.h"
#include <string> #include "histogram_internal.h"
#include <conio.h>
using namespace std; using namespace std;
struct Input { struct Input {
vector<double> numbers; vector<double> numbers;
size_t bin_count{}; size_t bin_count{};
size_t interval;
}; };
Input Input
input_data() { input_data(istream &tin, bool prompt){
if (prompt)
cerr << "Input numbers count: ";
size_t number_count; size_t number_count;
cin >> number_count; tin >> number_count;
Input in; Input in;
in.numbers.resize(number_count); in.numbers.resize(number_count);
if (prompt)
cerr << "Input numbers: ";
for (size_t i = 0; i < number_count; i++) { for (size_t i = 0; i < number_count; i++) {
cin >> in.numbers[i]; tin >> in.numbers[i];
} }
if (prompt)
cerr << "Enter number of bins"; cerr << "Input bin count: ";
cin >> in.bin_count; tin >> in.bin_count;
return in; return in;
} }
int main() {
Input in = input_data(cin, false);
int main()
{
Input in = input_data();
auto bins = make_histogram(in.numbers, in.bin_count); auto bins = make_histogram(in.numbers, in.bin_count);
show_histogram_svg(bins); show_histogram_svg(bins);
return 0; return 0;
} }

@ -33,7 +33,12 @@
1685969642 c:\users\hp\desktop\lab-03\project3\histogram_internal.h 1685969642 c:\users\hp\desktop\lab-03\project3\histogram_internal.h
<vector> <vector>
1685943355 source:c:\users\hp\desktop\lab-03\project3\svg.cpp 1686062922 source:c:\users\hp\desktop\lab-03\project3\svg.cpp
<iostream>
<conio.h>
<vector>
<string>
"svg.h"
<math.h> <math.h>
<iostream> <iostream>
<conio.h> <conio.h>

Загрузка…
Отмена
Сохранить