histogram.cpp

@@ -1,54 +0,0 @@
-#include "histogram.h"
-using namespace std;
-
-//  Ïîèñê ìàêñèìóìà è ìèíèìóìà ñðåäè îöåíîê.
-
-void find_minmax(const 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;
-        }
-}
-
-vector<size_t> make_histogram(const vector<double>& numbers, size_t bin_count)
-{
-//  Ïîèñê ìàêñèìóìà è ìèíèìóìà ñðåäè îöåíîê.
-    double min, max;
-
-    find_minmax(numbers, min, max);
-//  Ñîçäàíèå êîðçèí äëÿ äàëüíåéøåé ñîðòèðîâêè îöåíîê ïî íèì.
-
-    double bin_size = (max - min) / bin_count;
-
-    vector<size_t> bins(bin_count);
-
-    for (size_t i = 0; i < bin_count; i++)
-        bins[i] = 0;
-
-//  Ñîðòèðîâêà îöåíîê ïî êîðçèíàì.
-
-    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

lab01.cbp

@@ -33,11 +33,7 @@
 			<Add option="-Wall" />
 			<Add option="-fexceptions" />
 		</Compiler>
-		<Unit filename="histogram.cpp" />
-		<Unit filename="histogram.h" />
 		<Unit filename="main.cpp" />
-		<Unit filename="text.cpp" />
-		<Unit filename="text.h" />
 		<Extensions>
 			<lib_finder disable_auto="1" />
 		</Extensions>

main.cpp

@@ -1,7 +1,5 @@
 #include <iostream>
 #include <vector>
-#include "histogram.h"
-#include "text.h"
 using namespace std;
 
 //  Ñòðóêòóðà
@@ -18,7 +16,7 @@ Input
 input_data()
 {
     Input in;
-    size_t number_count;
+    size_t number_count, bin_count;
 
     cerr << "Enter number count: ";
     cin >> number_count;
@@ -30,10 +28,25 @@ input_data()
     return in;
 }
 
+//  Ïîèñê ìàêñèìóìà è ìèíèìóìà ñðåäè îöåíîê.
+
+void find_minmax(const 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;
+        }
+}
+
 int main()
 {
     auto in = input_data();
     auto bins = make_histogram(in.numbers, in.bin_count);
-    show_histogram_text(bins, in.bin_count);
+    show_histogram_text(bins, ...);
-    return 0;
 }

text.cpp

@@ -1,39 +0,0 @@
-#include "text.h"
-using namespace std;
-
-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;
-    //  Ïîèñê ìàêñèìàëüíîãî êîëè÷åñâà îöåíîê â îäíîì ñòîëáöå.
-
-    size_t max_count = bins[0];
-
-    for (size_t i = 0; i < bin_count; i++)
-        {
-            if (bins[i] > max_count)
-                max_count = bins[i];
-        }
-
-//  Ñîçäàíèå ãèñòîãðàììû ïî îöåíêàì.
-
-    size_t height;
-    size_t buf;
-
-    for (size_t i = 0; i < bin_count; i++)
-        {
-            buf = bins[i];
-            while (buf < max_count) //  Âûðàâíèâàíèå äëÿ ÷èñåë, ìåíüøèõ ÷åì ìàêñèìàëüíîå ÷èñëî.
-                {
-                    cout << " ";
-                    buf *= 10;
-                }
-            cout << bins[i] << "|";
-            height = bins[i];
-            if (max_count > MAX_ASTERISK)
-                height = MAX_ASTERISK * (static_cast<double>(bins[i]) / max_count);
-            for (size_t j = 1; j <= height; j++)
-                cout << "*";
-            cout << endl;
-        }
-}

text.h

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