initial
This commit is contained in:
parent
aa9bd22bde
commit
8108fc154c
10
main.cpp
10
main.cpp
@ -5,8 +5,8 @@
|
|||||||
#include <thread>
|
#include <thread>
|
||||||
|
|
||||||
std::vector<int> read_measurements(const std::string& filename);
|
std::vector<int> read_measurements(const std::string& filename);
|
||||||
void parallel_measurements(std::vector<int> measurements);
|
void parallel_measurements(std::vector<int>& measurements);
|
||||||
void serial_measurements(std::vector<int> measurements);
|
void serial_measurements(std::vector<int>& measurements);
|
||||||
|
|
||||||
int main() {
|
int main() {
|
||||||
std::vector<int> measurements = read_measurements(R"(C:\Users\tilob\CLionProjects\threads\measurements.txt)");
|
std::vector<int> measurements = read_measurements(R"(C:\Users\tilob\CLionProjects\threads\measurements.txt)");
|
||||||
@ -26,7 +26,7 @@ int main() {
|
|||||||
std::cout << "Serial Took: " << diff.count() << "s\n";
|
std::cout << "Serial Took: " << diff.count() << "s\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
void parallel_measurements(std::vector<int> measurements) {
|
void parallel_measurements(std::vector<int>& measurements) {
|
||||||
int numThreads = 4;
|
int numThreads = 4;
|
||||||
std::vector<int> results(numThreads, 0);
|
std::vector<int> results(numThreads, 0);
|
||||||
std::vector<std::thread> threads;
|
std::vector<std::thread> threads;
|
||||||
@ -88,8 +88,8 @@ std::vector<int> read_measurements(const std::string& filename) {
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
void serial_measurements(std::vector<int> measurements) {
|
void serial_measurements(std::vector<int>& measurements) {
|
||||||
int result = 0;
|
int result = 1;
|
||||||
for (size_t i = 1; i < measurements.size(); ++i) {
|
for (size_t i = 1; i < measurements.size(); ++i) {
|
||||||
if (measurements[i] > measurements[i - 1])
|
if (measurements[i] > measurements[i - 1])
|
||||||
++result;
|
++result;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user