main.cpp

@@ -1,47 +1,97 @@
 #include <iostream>
 #include <vector>
-#include "histogram.h"
-#include "text.h"
-#include "svg.h"
-using namespace std;
 
+using namespace std;
 
-struct Input {
+int main()
-    vector<double> numbers;
+{
-    size_t bin_count{};
+    const size_t SCREEN_WIDTH = 80;
-    size_t number_count{};
+    const size_t MAX_ASTERISK = SCREEN_WIDTH - 3-1;
-    size_t max_count{};
+    //Êîëè÷åñòâî ÷èñåë
-};
 
-Input
+    size_t number_count;
-input_data() {
+    cerr<<"Enter number count: ";
-    Input in;
+    cin>>number_count;
-    cerr << "Enter number count: ";
+    vector<double>numbers(number_count);
-    cin >> in.number_count;
 
-    vector<double> numbers(in.number_count);
+    //×èñëà
-    in.numbers.resize(in.number_count);
+    cerr<<"Enter elements: ";
-    for (size_t i = 0; i < in.number_count; i++) {
+    for (int i=0; i<number_count;i++){
-        cin >> in.numbers[i];
+        cin>>numbers[i];
     }
 
+
+
+
+    //Êîëè÷åñòâî êîðçèí
     size_t bin_count;
-    cerr << "Enter bin count: ";
+    cerr<<"Enter bins count: ";
-    cin >> in.bin_count;
+    cin>>bin_count;
+    vector<size_t>bins(bin_count);
 
-    size_t max_count;
+    //Îïðåäåëåíèå äèàïàçîíà ÷èñåë (max è min) â ìàññèâå
-    in.max_count = 0;
+    double min=numbers[0];
-    return in;
+    double max=numbers[0];
-}
+    for (double x: numbers){
+        if (x<min){
+            min=x;
+        }
+        else if (x>max){
+            max=x;
+        }
+    }
 
 
+        double bin_size=(max-min)/bin_count;
 
-int main()
+        for (size_t i=0; i<number_count; i++){ //Îïîçíîâàíèå è óâåëè÷. ñ÷åò÷èêà ïîñëåäíåé êîðçèíû
-{
+        bool found =false;
-    auto in = input_data();
+        for (size_t j=0; (j<bin_count-1)&&!found; j++){
-    auto bins = make_histogram(in.numbers, in.bin_count, in.number_count, in.max_count);
+            auto lo=min+j*bin_size;
-    vector<double> test;
+            auto hi = min+(j+1)*bin_size;
-    show_histogram_svg(bins, in.max_count, in.bin_count, test);
+            if ((lo<=numbers[i])&&(numbers[i]<hi)){
+                bins[j]++;
+                found=true;
+            }
+        }
+        if (!found){
+            bins[bin_count-1]++;
+        }
+    }
+
+
+    //Ìàêñèìàëüíîå êîë-âî çâåçäî÷åê
+    int max_simb=0;
+    for (int i=0; i<bin_count;i++){
+        int c=0;
+        c=bins[i];
+        if (max_simb<c){
+            max_simb=c;
+        }
+    }
+
+       if (max_simb > MAX_ASTERISK){
+        vector<size_t> hights(bin_count);
+        for (size_t i = 0; i < bin_count; i++){
+            size_t height = MAX_ASTERISK * (static_cast<double>(bins[i]) / max_simb);
+            hights[i] = height;
+            printf("%3d|", bins[i]);
+            for (int j=0; j<(hights[i]); j++){
+                cout<<"*";
+            }
+            cout<<endl;
+        }
+
+       }
+        else{
+        for (int i=0; i<bin_count; i++){
+        printf("%3d|", bins[i]);
+            for (int j=0; j<bins[i]; j++){
+                cout<<"*";
+            }
+            cout<<endl;
+        }
+       }
 
     return 0;
 }

test.cbp

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