code: добавление функции создания гистограммы (расчёта bins)

main.cpp

@@ -46,21 +46,26 @@ void find_minmax(const vector<double>& numbers, double& Min, double& Max){
 
 }
 
-/*
+//Ôóíêöèÿ ðàñ÷¸òà ãèñòîãðàììû
-	//Ïîèñê ìàêñèìóìà
+vector<size_t> make_histogram(vector<double> Numbers, size_t bin_count){
-	double max = Numbers[0];
+    //Îïðåäåëåíèå øàãà ìåæäó êîðçèíàìè
-	for (int i = 1; i < number_count; i++) {
+    double Max, Min;
-		if (Numbers[i] > max)
+    find_minmax(Numbers, Min, Max);
-			max = Numbers[i];
+	double bin_size = (Max-Min) / bin_count;
-	}
+	//Ìàññèâ êîðçèí
-	//Ïîèñê ìèíèìóìà
+	vector<size_t> bins(bin_count);
-	double min = Numbers[0];
+	for (size_t i = 0; i < bin_count; i++) // îáíóëåíèå êîðçèí
-	for (int i = 1; i < number_count; i++) {
+		bins[i] = 0;
-		if (Numbers[i] < min)
+	for (size_t i = 0; i < bin_count; i++) {
-			min = Numbers[i];
+		double lo = Min + i * bin_size;
+		double hi = Min + (i + 1) * bin_size;
+		for (size_t j = 0; j < Numbers.size(); j++) {
+			if (lo <= Numbers[j] && Numbers[j] <= hi)
+				bins[i]++;
+		}
 	}
-
+	return bins;
-	*/
+}
 
 int main() {
     const size_t SCREEN_WIDTH = 80;
@@ -73,6 +78,9 @@ int main() {
 	double max, min;
 	find_minmax(in.Numbers, min, max);
 
+	//
+	vector<size_t> bins = make_histogram(in.Numbers, in.bin_count);
+
 	/*
 	//Îïðåäåëåíèå øàãà ìåæäó êîðçèíàìè
 	double bin_size = (max - min) / bin_count;