Build: Функции распределены по файлам

ProgUit Lab1/ProgUit Lab1.cpp

@@ -1,6 +1,11 @@
 #include <iostream>
 #include <vector>
 
+#include "histogram.h"
+#include "text.h"
+
+
+
 using namespace std;
 
 
@@ -39,122 +44,17 @@ input_data() {
 	return in;
 }
 
-void
-find_minmax(const vector<double>& numbers, double& min_in_numbers, double& max_in_numbers) {
-	min_in_numbers = numbers[0];
-	max_in_numbers = *(max_element(begin(numbers), end(numbers)));
-	min_in_numbers = *(min_element(begin(numbers), end(numbers)));
-	
-}
-
-vector <size_t> make_histogram(const vector<double>& numbers, const size_t bin_count) {
-
-	vector <size_t> bins(bin_count);
-
-	double min_in_numbers, max_in_numbers;
-	find_minmax(numbers, min_in_numbers, max_in_numbers);
-	double bin_size = (max_in_numbers - min_in_numbers) / bin_count;
-
-	for (size_t i = 0; i < numbers.size(); i++) {
-		int to_bin = int((numbers[i]) - min_in_numbers) / bin_size;
-		if (to_bin >= bin_count) {
-			bins[to_bin - 1]++;
-		}
-		else {
-			bins[to_bin]++;
-		}
-	}
-
-	return bins;
-}
-
-
-
-void show_histogram_text(vector <size_t> bins, size_t bin_count) {
-	// Максимальное в коорзинах
-
-
-	const size_t SCREEN_WIDTH = 80;
-	const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
-
-	int max_in_bins = 0;
-
-
-	for (int i = 0; i < bin_count; i++) {
-		if (bins[i] > max_in_bins) {
-			max_in_bins = bins[i];
-		}
-	}
-
-
-	if (max_in_bins > MAX_ASTERISK) {
-
-		for (int i = 0; i < bin_count; i++) {
-			if (bins[i] < 100) {
-				cout << " ";
-			}
-			if (bins[i] < 10) {
-				cout << " ";
-			}
-			size_t height = MAX_ASTERISK * (static_cast<double>(bins[i]) / max_in_bins);
-
-			cout << bins[i] << "|";
-
-
-			for (int j = 0; j < height; j++) {
-				cout << "*";
-			}
-			cout << endl;
-		}
-
-
-	}
-	else {
-		// Если максимальное число среди коорзин меньше или равно 76
-		for (int i = 0; i < bin_count; i++) {
-			if (bins[i] < 100) {
-				cout << " ";
-			}
-			if (bins[i] < 10) {
-				cout << " ";
-			}
-
-
-			cout << bins[i] << "|";
-			for (int j = 0; j < bins[i]; j++) {
-				cout << "*";
-			}
-			cout << endl;
-		}
-
-
-	}
 
 
 
 
 
-}
 int main()
 {
-	
+	// Функция main 
-	// Константы
+	auto in = input_data(); // Ввод структуры
-	
+	auto bins = make_histogram(in.numbers, in.bin_count); // Распределние по корзинам
-
+	show_histogram_text(bins, in.bin_count); // Вывод графика
-	
-
-	// Ввод данных через функцию
-
-	//Input in = input_data();
-
-	// Объявление перменных промежуточных/вывода
-
-	
-
-	
-	auto in = input_data();
-	auto bins = make_histogram(in.numbers, in.bin_count);
-	show_histogram_text(bins, in.bin_count);
 
 
 	

ProgUit Lab1/histogram.cpp

@@ -0,0 +1,36 @@
+#include <iostream>
+#include <vector>
+
+#include "histogram.h"
+
+using namespace std;
+
+
+
+void find_minmax(const vector<double>& numbers, double& min_in_numbers, double& max_in_numbers) {
+	min_in_numbers = numbers[0];
+	max_in_numbers = *(max_element(begin(numbers), end(numbers)));
+	min_in_numbers = *(min_element(begin(numbers), end(numbers)));
+
+}
+
+vector <size_t> make_histogram(const vector<double>& numbers, const size_t bin_count) {
+
+	vector <size_t> bins(bin_count);
+
+	double min_in_numbers, max_in_numbers;
+	find_minmax(numbers, min_in_numbers, max_in_numbers);
+	double bin_size = (max_in_numbers - min_in_numbers) / bin_count;
+
+	for (size_t i = 0; i < numbers.size(); i++) {
+		int to_bin = int((numbers[i]) - min_in_numbers) / bin_size;
+		if (to_bin >= bin_count) {
+			bins[to_bin - 1]++;
+		}
+		else {
+			bins[to_bin]++;
+		}
+	}
+
+	return bins;
+}

ProgUit Lab1/histogram.h

@@ -0,0 +1,12 @@
+#ifndef HISTOGRAM_H_INCLUDED
+#define HISTOGRAM_H_INCLUDED
+
+
+
+#include <vector>
+
+std::vector<size_t>
+make_histogram(const std::vector<double>& numbers, size_t bin_count);
+
+
+#endif // HISTOGRAM_H_INCLUDED

ProgUit Lab1/text.cpp

@@ -0,0 +1,73 @@
+#include <iostream>
+#include <vector>
+
+#include "text.h"
+
+using namespace std;
+
+
+void show_histogram_text(const vector <size_t> bins, const size_t bin_count) {
+	// Ìàêñèìàëüíîå â êîîðçèíàõ
+
+
+	const size_t SCREEN_WIDTH = 80;
+	const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
+
+	int max_in_bins = 0;
+
+
+	for (int i = 0; i < bin_count; i++) {
+		if (bins[i] > max_in_bins) {
+			max_in_bins = bins[i];
+		}
+	}
+
+
+	if (max_in_bins > MAX_ASTERISK) {
+
+		for (int i = 0; i < bin_count; i++) {
+			if (bins[i] < 100) {
+				cout << " ";
+			}
+			if (bins[i] < 10) {
+				cout << " ";
+			}
+			size_t height = MAX_ASTERISK * (static_cast<double>(bins[i]) / max_in_bins);
+
+			cout << bins[i] << "|";
+
+
+			for (int j = 0; j < height; j++) {
+				cout << "*";
+			}
+			cout << endl;
+		}
+
+
+	}
+	else {
+		// Åñëè ìàêñèìàëüíîå ÷èñëî ñðåäè êîîðçèí ìåíüøå èëè ðàâíî 76
+		for (int i = 0; i < bin_count; i++) {
+			if (bins[i] < 100) {
+				cout << " ";
+			}
+			if (bins[i] < 10) {
+				cout << " ";
+			}
+
+
+			cout << bins[i] << "|";
+			for (int j = 0; j < bins[i]; j++) {
+				cout << "*";
+			}
+			cout << endl;
+		}
+
+
+	}
+
+
+
+
+
+}

ProgUit Lab1/text.h

@@ -0,0 +1,10 @@
+#ifndef TEXT_H_INCLUDED
+#define TEXT_H_INCLUDED
+
+
+
+#include <vector>
+
+void show_histogram_text(std::vector <size_t> bins, size_t bin_count);
+
+#endif // TEXT_H_INCLUDED