From b1812bf7a82b521a295e101108fab4e765740c9e Mon Sep 17 00:00:00 2001 From: "Senya (YershovArA)" Date: Sun, 4 Jun 2023 20:06:15 +0300 Subject: [PATCH] code:.... --- .gitignore | 3 --- histogram.cpp | 4 ++-- lab_01.cbp | 1 + main.cpp | 2 +- unittest.cpp | 5 +++-- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 51b8cc7..ce8d0c8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,4 @@ /bin /obj -111.c lab01.cpp lab_01.layout -git.ignore.c - diff --git a/histogram.cpp b/histogram.cpp index 6f7cef2..4263d65 100644 --- a/histogram.cpp +++ b/histogram.cpp @@ -3,7 +3,7 @@ #include "histogram.h" using namespace std; void -find_minmax(vector numbers, double& min, double& max) { +find_minmax(const vector& numbers, double& min, double& max) { min = numbers[0]; max = numbers[0]; for (double x : numbers) { @@ -20,7 +20,7 @@ vector make_histogram(vector numbers, size_t bin_count) { vector bins(bin_count); double min, max; find_minmax(numbers, min, max); - size_t countt; + size_t count; double bin_size = (max - min) / bin_count; for (size_t i = 0; i < numbers.size(); i++) { bool found = false; diff --git a/lab_01.cbp b/lab_01.cbp index 64eca71..d8c5e0d 100644 --- a/lab_01.cbp +++ b/lab_01.cbp @@ -37,6 +37,7 @@ + diff --git a/main.cpp b/main.cpp index 6e60fd1..edc7407 100644 --- a/main.cpp +++ b/main.cpp @@ -16,7 +16,7 @@ input_data(){ cin >> number_count; Input in; in.numbers.resize(number_count); - for(int i;i> in.numbers[i]; } diff --git a/unittest.cpp b/unittest.cpp index 3ec56d4..2371961 100644 --- a/unittest.cpp +++ b/unittest.cpp @@ -3,11 +3,12 @@ #include "doctest.h" #include "histogram_internal.h" + TEST_CASE("distinct positive numbers") { double min = 0; double max = 0; - find_minmax({1, 2}, min, max); + std::vectorv{2,1}; + find_minmax(v, min, max); CHECK(min == 1); CHECK(max == 2); } -