histogram.cpp

@@ -1,68 +0,0 @@
-#include "histogram.h"
-#include <vector>
-
-using namespace std;
-
-
-void
-static find_minmax(const vector<double>& numbers, double& min, double& max) {
-    min = numbers[0];
-    max = numbers[0];
-    for(size_t i=0; i< numbers.size(); i++){
-        if(min > numbers[i])
-            min = numbers[i];
-        if(max < numbers[i])
-            max = numbers[i];
-}}
-
-vector<size_t> make_histogram(vector<double>& numbers, size_t bin_count)
-{
-
-vector<size_t> bins(bin_count);
-vector<size_t> binss(bin_count);
-
-double max, min;
-find_minmax(numbers, min, max);
-double bin_size = (max / min) / 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]++;
-}
-}
-
-int max_count = bins[0];
-for (size_t i = 0; i < bin_count; i++)
-{
-if (bins[i] > max_count)
-{
-max_count = bins[i];
-}
-}
-
-if (max_count > 76)
-{
-
-for (size_t i = 0; i < bin_count; i++)
-{
-int count = bins[i];
-size_t height = 76 * (static_cast<double>(count) / max_count);
-bins[i] = height;
-}
-}
-
-return bins;
-}

histogram.h

@@ -1,13 +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
-

histogram.h.save-failed

@@ -1,15 +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):
-
-
-find_minmax(const std::vector<double>& numbers, double& min, double& max):
-
-
-
-#endif // HISTOGRAM_H_INCLUDED
-

histogram_internal.h

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

lab01.depend

@@ -1,17 +0,0 @@
-# depslib dependency file v1.0
-1686062766 source:c:\users\kostello\desktop\lubs\lub03\lub01\main.cpp
-	<vector>
-	<conio.h>
-	<iostream>
-	<vector>
-
-1686137810 source:c:\users\kostello\desktop\lubs\lub03\lub01\histogram.cpp
-	"histogram.h"
-	<vector>
-
-1686137015 c:\users\kostello\desktop\lubs\lub03\lub01\histogram.h
-	<vector>
-
-1686137097 c:\users\kostello\desktop\lubs\lub03\lub01\histogram_internal.h
-	<vector>
-

main.cpp

@@ -1,83 +1,66 @@
 #include <iostream>
 #include <vector>
-#include <cmath>
-#include <string>
-#include "histogram.h"
-#include "text.h"
 #include <conio.h>
-#include "histogram_internal.h"
-#include <curl/curl.h>
-#include <sstream>
-#include "svg.h"
-
 
 using namespace std;
 
-struct Input
-{
-vector<double> numbers;
-size_t bin_count{};
-};
 
-Input
-input_data(istream &tin, bool promt)
+
+
+int main()
 {
-Input in;
 size_t number_count;
 
-if (promt)
-{
-    cerr << "enter number count";
-}
-tin>> number_count;
+cerr << "Enter number count: ";              //количество чисел
+cin >> number_count;
 
+vector<double> numbers(number_count);         //векток с числами
 
+for(size_t i=0; i < number_count; i++)       //заполнение вектора
+    cin >> numbers[i];
 
-in.numbers.resize(number_count);
-for (size_t i = 0; i < number_count; i++)
-{
-in>> in.numbers[i];
-}
+size_t bin_count;                               //количество корзин
+cerr << "Enter bin count: ";
+cin >> bin_count;
 
-if (promt)
-{
-    cerr<<"enter bin count:";
-}
-in >>in.bin_count;
+vector<size_t> bins(bin_count);
 
-return in;
-}
+double min;
+min = numbers[0];
+for (size_t i = 1; i < numbers.size(); i++)
+    if (numbers[i] < min)
+        min = numbers[i];
 
 
+double max;
+max = numbers[0];
+for (size_t i = 1; i < numbers.size(); i++)
+    if (numbers[i] > max)
+        max = numbers[i];
 
-int main(int arg, char* argv[])
-{
-    if (arg > 1)
-    {
-        CURL* curl = curl_easy_init();
-        if(curl)
-        {
-            CURLcode res;
-            curl_easy_setopt(curl,CURLOPT_URL,argv[1]);
-            res = curl_easy_perform(curl);
-            curl_easy_cleanup(curl);
-            if (res != CURE_OK)
-            {
-                cout<<curl_easy_strerror;
-                exit(1);
-            }
-        }
-        return 0;
+double bin_size = (max - min) / bin_count;
 
+for (size_t i = 0; i < number_count; 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]++;
+    }
+}
 
-Input in = input_data();
-char arr[bin_count];
-for(int i=0; i<bin_count;i++)
-{
-    cin>>arr[i];
+for (size_t i=0; i<bins.size(); i++)
+    {cout << bins[i] << "|";
+    for (size_t j=0; j<bins[i]; j++)
+        cout << "*";
+    cout << "\n" ;
 }
-auto bins = make_histogram(in.numbers, in.bin_count);
-show_histogram_svg(bins);
-return 0;
+
+    return 0;
 }

unittest.cpp

@@ -1,29 +0,0 @@
-#define DOCTEST_CONFIG_NO_MULTITHREADING
-#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
-#include "doctest.h"
-#include "histogram_internal.h"
-
-TEST_CASE("distinct positive numbers") {
-double min = 0;
-double max = 0;
-find_minmax({1, 2}, min, max);
-CHECK(min == 1);
-CHECK(max == 2);
-}
-
-TEST_CASE("odinakovie") {
-double min = 0;
-double max = 0;
-find_minmax({1, 1}, min, max);
-CHECK(min == 1);
-CHECK(max == 1);
-}
-
-TEST_CASE("distinct negative numbers") {
-double min = 0;
-double max = 0;
-find_minmax({-2, -1}, min, max);
-CHECK(min == -2);
-CHECK(max == -1);
-}
-