Сравнить коммиты
4 Коммитов
c37b1fed88
...
2eaf794295
| Автор | SHA1 | Дата | |
|---|---|---|---|
| 2eaf794295 | |||
| bcc61042de | |||
| d5a9d78924 | |||
| 7bd4bee170 |
1
.gitignore
поставляемый
1
.gitignore
поставляемый
@@ -1,2 +1,3 @@
|
|||||||
/bin
|
/bin
|
||||||
/obj
|
/obj
|
||||||
|
/curl
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include "hist_proc.h"
|
#include "hist_proc.h"
|
||||||
|
#include "hist_proc_internal.h"
|
||||||
using namespace std;
|
using namespace std;
|
||||||
vector<size_t> make_histogram_proc(const vector<double> numbers, size_t bin_count, vector<size_t> bins){
|
vector<size_t> make_histogram_proc(const vector<double> numbers, size_t bin_count, vector<size_t> bins){
|
||||||
vector<size_t> procent(bin_count);
|
vector<size_t> procent(bin_count);
|
||||||
|
|||||||
@@ -4,8 +4,14 @@
|
|||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
|
|
||||||
static void
|
bool
|
||||||
find_minmax(const vector<double>& numbers, double& min, double& max) {
|
find_minmax(const vector<double>& numbers, double& min, double& max) {
|
||||||
|
bool flag;
|
||||||
|
if (numbers.size() == 0){
|
||||||
|
flag=false;
|
||||||
|
|
||||||
|
}
|
||||||
|
else {
|
||||||
min = numbers[0];
|
min = numbers[0];
|
||||||
max = numbers[0];
|
max = numbers[0];
|
||||||
for (double x : numbers) {
|
for (double x : numbers) {
|
||||||
@@ -18,7 +24,10 @@ find_minmax(const vector<double>& numbers, double& min, double& max) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
vector<size_t> make_histogram(const vector<double> numbers, size_t bin_count){
|
return flag;
|
||||||
|
}
|
||||||
|
|
||||||
|
vector<size_t> make_histogram(const vector<double> numbers, size_t bin_count, bool& flag){
|
||||||
vector<size_t> bins(bin_count);
|
vector<size_t> bins(bin_count);
|
||||||
double max, min = 0;
|
double max, min = 0;
|
||||||
find_minmax(numbers, min, max);
|
find_minmax(numbers, min, max);
|
||||||
|
|||||||
@@ -4,6 +4,6 @@
|
|||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
std::vector<size_t>
|
std::vector<size_t>
|
||||||
make_histogram(const std::vector<double> numbers, size_t bin_count);
|
make_histogram(const std::vector<double> numbers, size_t bin_count, bool& flag);
|
||||||
|
|
||||||
#endif // HISTOGRAM_H_INCLUDED
|
#endif // HISTOGRAM_H_INCLUDED
|
||||||
|
|||||||
@@ -13,7 +13,11 @@
|
|||||||
<Option compiler="gcc" />
|
<Option compiler="gcc" />
|
||||||
<Compiler>
|
<Compiler>
|
||||||
<Add option="-g" />
|
<Add option="-g" />
|
||||||
|
<Add directory="curl/include" />
|
||||||
</Compiler>
|
</Compiler>
|
||||||
|
<Linker>
|
||||||
|
<Add library="curl/include" />
|
||||||
|
</Linker>
|
||||||
</Target>
|
</Target>
|
||||||
<Target title="Release">
|
<Target title="Release">
|
||||||
<Option output="bin/Release/lab003" prefix_auto="1" extension_auto="1" />
|
<Option output="bin/Release/lab003" prefix_auto="1" extension_auto="1" />
|
||||||
@@ -31,7 +35,11 @@
|
|||||||
<Compiler>
|
<Compiler>
|
||||||
<Add option="-Wall" />
|
<Add option="-Wall" />
|
||||||
<Add option="-fexceptions" />
|
<Add option="-fexceptions" />
|
||||||
|
<Add directory="curl/include" />
|
||||||
</Compiler>
|
</Compiler>
|
||||||
|
<Linker>
|
||||||
|
<Add directory="curl/include" />
|
||||||
|
</Linker>
|
||||||
<Unit filename="hist_proc.cpp" />
|
<Unit filename="hist_proc.cpp" />
|
||||||
<Unit filename="hist_proc.h" />
|
<Unit filename="hist_proc.h" />
|
||||||
<Unit filename="histogram.cpp" />
|
<Unit filename="histogram.cpp" />
|
||||||
|
|||||||
62
main.cpp
62
main.cpp
@@ -5,7 +5,7 @@
|
|||||||
#include "histogram.h"
|
#include "histogram.h"
|
||||||
#include <text.h>
|
#include <text.h>
|
||||||
#include <svg.h>
|
#include <svg.h>
|
||||||
|
#include <curl/curl.h>
|
||||||
|
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
@@ -20,29 +20,67 @@ struct Input {
|
|||||||
|
|
||||||
|
|
||||||
Input
|
Input
|
||||||
input_data() {
|
input_data(istream& in, bool prompt) {
|
||||||
|
if (prompt == true) {
|
||||||
size_t number_count;
|
size_t number_count;
|
||||||
cin >> number_count;
|
cerr << "amount of numbers";
|
||||||
Input in;
|
in >> number_count;
|
||||||
in.numbers.resize(number_count);
|
Input inn;
|
||||||
|
inn.numbers.resize(number_count);
|
||||||
vector<double> numbers(number_count);
|
vector<double> numbers(number_count);
|
||||||
|
cerr << "input numbers";
|
||||||
for (size_t i = 0; i < number_count; i++) {
|
for (size_t i = 0; i < number_count; i++) {
|
||||||
cin >> in.numbers[i];
|
in >> inn.numbers[i];
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t bin_count;
|
size_t bin_count;
|
||||||
cin >> in.bin_count;
|
cerr << "amount of baskets";
|
||||||
return in;
|
in >> inn.bin_count;
|
||||||
|
return inn;
|
||||||
|
}
|
||||||
|
|
||||||
|
else if (prompt == false) {
|
||||||
|
size_t number_count;
|
||||||
|
cout << "amount of numbers";
|
||||||
|
in >> number_count;
|
||||||
|
Input inn;
|
||||||
|
inn.numbers.resize(number_count);
|
||||||
|
vector<double> numbers(number_count);
|
||||||
|
cout << "input numbers";
|
||||||
|
for (size_t i = 0; i < number_count; i++) {
|
||||||
|
in >> inn.numbers[i];
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t bin_count;
|
||||||
|
cout << "input baskets";
|
||||||
|
in >> inn.bin_count;
|
||||||
|
return inn;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
int main()
|
int main(int argc, char* argv[])
|
||||||
{
|
{
|
||||||
auto in = input_data();
|
|
||||||
auto bins = make_histogram(in.numbers, in.bin_count);
|
CURL *curl = curl_easy_init();
|
||||||
auto procent = make_histogram_proc(in.numbers, in.bin_count, bins);
|
if(curl) {
|
||||||
|
CURLcode res;
|
||||||
|
curl_easy_setopt(curl, CURLOPT_URL, "http://uit.mpei.ru/study/courses/cs/lab03/marks.txt");
|
||||||
|
res = curl_easy_perform(curl);
|
||||||
|
curl_easy_cleanup(curl);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
bool flag;
|
||||||
|
bool prompt;
|
||||||
|
prompt = true;
|
||||||
|
auto inn = input_data(cin, prompt);
|
||||||
|
auto bins = make_histogram(inn.numbers, inn.bin_count, flag);
|
||||||
|
auto procent = make_histogram_proc(inn.numbers, inn.bin_count, bins);
|
||||||
show_histogram_svg(bins, procent);
|
show_histogram_svg(bins, procent);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|||||||
@@ -9,4 +9,9 @@ TEST_CASE("distinct positive numbers") {
|
|||||||
CHECK(procent[0] == 33);
|
CHECK(procent[0] == 33);
|
||||||
CHECK(procent[1] == 33);
|
CHECK(procent[1] == 33);
|
||||||
CHECK(procent[2] == 34);
|
CHECK(procent[2] == 34);
|
||||||
|
|
||||||
|
procent = make_histogram_proc({1}, 3, {1, 0, 0});
|
||||||
|
CHECK(procent[0] == 100);
|
||||||
|
CHECK(procent[1] == 0);
|
||||||
|
CHECK(procent[2] == 0);
|
||||||
}
|
}
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user