code: исправление ошибок

histogram.cpp

@@ -1,38 +0,0 @@
-
-#include "histogram.h"
-#include <vector>
-
-static void find_minmax(const std::vector <double> &numbers, double &min, double &max){
-    min = numbers[0];
-    max = numbers[0];
-    for ( double x : numbers ){
-        if ( x < min ){
-            min = x;
-        } else if ( x > max ){
-            max = x;
-        }
-    }
-}
-
-std::vector<std::size_t> make_histogram(const std::vector<double> &numbers, size_t bin_count) {
-    double min = numbers[0];
-    double max = numbers[0];
-    find_minmax(numbers, min, max);
-    double bin_size = ( max - min ) / bin_count;
-    std::vector<std::size_t> bins ( bin_count );
-    for (size_t i=0; i <  numbers.size(); i++ ){
-        bool found = false;
-        for (size_t j = 0; ( j < bin_count - 1 ) && !found; j++ ){
-            auto lo = min + j * bin_size;
-            auto hi = min + ( j + 1 ) * bin_size;
-            if (lo <= numbers[i] && ( numbers[i] < hi )){
-                bins[j]++;
-                found = true;
-            }
-        }
-        if ( !found ){
-            bins[bin_count-1]++;
-        }
-    }
-    return bins;
-}

histogram.h

@@ -1,10 +0,0 @@
-#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

main.cpp

@@ -1,14 +1,14 @@
 #include <iostream>
 #include <vector>
-#include "histogram.h"
 
-using namespace std;
 
+using namespace std;
 const size_t SCREEN_WIDTH = 80;
 const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
 
-struct Input {
+struct Input
-    vector<double> numbers;
+{
+    std::vector<double> numbers;
     size_t bin_count{};
 };
 
@@ -18,7 +18,7 @@ Input input_data()
     cerr << "Enter number count:";
     cin >> number_count;
 
-Input in;
+    Input in;
 
     in.numbers.resize(number_count);
     cerr << "Enter numbers: ";
@@ -31,67 +31,61 @@ Input in;
     return in;
 
 }
-
+void find_minmax(const vector<double> &numbers, double &min, double &max)
-void find_minmax(vector<double>& numbers, double& min, double& max) {
+{
     min = numbers[0];
     max = numbers[0];
-    // (çäåñü êîä ïîèñêà ìèíèìóìà è ìàêñèìóìà)
+    for ( double x : numbers )
-    for (double x : numbers){
+    {
-        if (x < min){
+        if ( x < min )
+        {
             min = x;
-        } else if (x > max){
+        }
+        else if ( x > max )
+        {
             max = x;
         }
     }
 }
 
-vector<size_t> make_histogram(vector<double> &numbers, size_t bin_count) {
+vector<size_t> make_histogram(const vector<double> &numbers, size_t bin_count)
+{
     double min = numbers[0];
     double max = numbers[0];
     find_minmax(numbers, min, max);
-
     double bin_size = (max - min) / bin_count;
-    vector<size_t> bins (bin_count);
 
-    for (size_t i=0; i < numbers.size(); i++ ){
+    vector<size_t> bins (bin_count);
+    for (size_t i=0; i <  numbers.size(); i++)
+    {
         bool found = false;
-        for (size_t j = 0; (j < bin_count - 1) && !found; j++){
+        for (size_t j = 0; ( j < bin_count - 1) && !found; j++)
+        {
             auto lo = min + j * bin_size;
-            auto hi = min + ( j + 1 ) * bin_size;
+            auto hi = min + (j + 1) * bin_size;
-
+            if (lo <= numbers[i] && (numbers[i] < hi))
-            if (lo <= numbers[i] && (numbers[i] < hi)){
+            {
                 bins[j]++;
                 found = true;
             }
         }
-        if (!found){
+        if (!found)
+        {
             bins[bin_count-1]++;
         }
     }
     return bins;
 }
-void show_histogram_text(vector<size_t> &bins){
+void show_histogram_text(const vector<size_t> &bins)
-   size_t maxbin = bins[0];
-    for (size_t i=1; i < bins.size(); i++){
-        if (maxbin < bins[i]){
-            maxbin = bins[i];
-        }
-    }
-}
-int main()
 {
-    Input in = input_data();
-    auto bins = make_histogram(in.numbers, in.bin_count);
-    show_histogram_text(bins);
-
     size_t maxbin = bins[0];
-    for (size_t i=1; i < in.bin_count; i++){
+    for (size_t i=1; i < bins.size(); i++){
         if (maxbin < bins[i]){
             maxbin = bins[i];
         }
     }
     if (maxbin <= MAX_ASTERISK){
-        for (size_t i=0; i < in.bin_count; i++){
+        for (size_t i=0; i < bins.size(); i++){
             if ((bins[i] < 1000)&&(bins[i] > 99)){
                 cout << bins[i] << "|";
                 for ( size_t j=0; j < bins[i]; j++ ){
@@ -115,7 +109,7 @@ int main()
             }
         }
     } else {
-        for (size_t i=0; i < in.bin_count; i++){
+        for (size_t i=0; i < bins.size(); i++){
             size_t heightG= MAX_ASTERISK * (static_cast<double>(bins[i]) / maxbin);
 
             if ((bins[i] < 1000)&&(bins[i] > 99)){
@@ -144,4 +138,14 @@ int main()
     }
 }
 
+int main(){
+
+    Input in = input_data();
+
+    auto bins = make_histogram(in.numbers, in.bin_count);
+
+    show_histogram_text(bins);
+
+
+}