Бесхмельнова Ксения. Задача 3. Вариант 25. Построение выпуклой оболочки – проход Джарвиса.

tasks/mpi/beskhmelnova_k_jarvis_march/perf_tests/main.cpp

@@ -8,7 +8,11 @@
 TEST(mpi_beskhmelnova_k_jarvis_march_perf_test, test_pipeline_run) {
   boost::mpi::communicator world;
 
+<<<<<<< HEAD
+  int num_points = 500000;
+=======
   int num_points = 1000;
+>>>>>>> upstream/master
   std::vector<double> x;
   std::vector<double> y;
 
@@ -89,7 +93,11 @@ TEST(mpi_beskhmelnova_k_jarvis_march_perf_test, test_pipeline_run) {
 TEST(mpi_beskhmelnova_k_jarvis_march_perf_test, test_task_run) {
   boost::mpi::communicator world;
 
+<<<<<<< HEAD
+  int num_points = 500000;
+=======
   int num_points = 1000;
+>>>>>>> upstream/master
   std::vector<double> x;
   std::vector<double> y;