diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..b74a498 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,29 @@ +cmake_minimum_required(VERSION 3.4.3) + + +set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}) + +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") +set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread") + + + +file(GLOB l4_SOURCES "lab4/*.cpp" "lab4/*.c") +file(GLOB l4_HEADERS "lab4/*.h" "lab4/*.hpp") +add_executable(Lab4 ${l4_SOURCES} ${l4_HEADERS}) +set_target_properties(Lab4 PROPERTIES LINKER_LANGUAGE CXX) + +file(GLOB l3_SOURCES "lab3/*.cpp" "lab3/*.c") +file(GLOB l3_HEADERS "lab3/*.h" "lab3/*.hpp") +add_executable(Lab3 ${l3_SOURCES} ${l3_HEADERS}) +set_target_properties(Lab3 PROPERTIES LINKER_LANGUAGE CXX) + +file(GLOB l2_SOURCES "lab2/*.cpp" "lab2/*.c") +file(GLOB l2_HEADERS "lab2/*.h" "lab2/*.hpp") +add_executable(Lab2 ${l2_SOURCES} ${l2_HEADERS}) +set_target_properties(Lab2 PROPERTIES LINKER_LANGUAGE CXX) + +file(GLOB l1_SOURCES "lab1/*.cpp" "lab1/*.c") +file(GLOB l1_HEADERS "lab1/*.h" "lab1/*.hpp") +add_executable(Lab1 ${l1_SOURCES} ${l1_HEADERS}) +set_target_properties(Lab1 PROPERTIES LINKER_LANGUAGE CXX) diff --git a/lab1/main.cpp b/lab1/main.cpp index d95a3d7..28be4d0 100644 --- a/lab1/main.cpp +++ b/lab1/main.cpp @@ -3,16 +3,9 @@ #include #include #include -#include "SFML/Graphics.hpp" #include "mtrand.h" -// In order to compile and run this project you're going to either comment out the SFML -// code or install SFML which is trivial on *NIX. - -// Just apt-get install libsfml-dev -// or brew install sfml - std::vector c = {0.806,0.517,0.1,0.908,0.965,0.669,0.524,0.902,0.351,0.876,0.462, 0.491,0.463,0.741,0.352,0.869,0.813,0.811,0.0828,0.964,0.789,0.360,0.369, @@ -566,21 +559,6 @@ int main() { function masters_cosine_wave_f(&masters_cosine_wave, 30, -30); function shekels_foxholes_f(&shekels_foxholes, 10, 0); -// shekels_foxholes_f.draw(); -// schwefel_f.draw(); -// de_jong_f.draw(); -// rosenbrock_f.draw(); -// rastrigin_f.draw(); -// griegwangk_f.draw(); -// sine_envelope_sine_wave_f.draw(); -// stretched_v_sine_wave_f.draw(); -// ackleys_one_f.draw(); -// ackleys_two_f.draw(); -// egg_holder_f.draw(); -// rana_f.draw(); -// pathological_f.draw(); -// michalewicz_f.draw(); -// masters_cosine_wave_f.draw(); std::string vals[] { "MEAN", "MEDIAN", "DEVIATION", "AVG_TIME", "DIMENSIONALIY", "UPPER_RANGE", "LOWER_RANGE"