From f79e0acb4f3361939cc495956b7afb52a318d02b Mon Sep 17 00:00:00 2001 From: iasonmanolas Date: Thu, 23 Dec 2021 21:29:04 +0200 Subject: [PATCH] Resolved conflicts --- CMakeLists.txt | 64 ++++++------------------------- reducedmodeloptimizer_structs.hpp | 2 +- 2 files changed, 13 insertions(+), 53 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ec08fce..4a50ebf 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,28 +9,19 @@ if (CMAKE_VERSION VERSION_LESS 3.2) else() set(UPDATE_DISCONNECTED_IF_AVAILABLE "UPDATE_DISCONNECTED 1") endif() -<<<<<<< HEAD #set(EXTERNAL_DEPS_DIR "/home/iason/Coding/build/external dependencies") if(NOT EXISTS EXTERNAL_DEPS_DIR) -======= -set(EXTERNAL_DEPS_DIR "/home/iason/Coding/build/external dependencies") -if(NOT EXISTS ${EXTERNAL_DEPS_DIR}) ->>>>>>> c9fc6ccd0877f92308795b99e51c8e5dfd1e31eb set(EXTERNAL_DEPS_DIR ${CMAKE_CURRENT_BINARY_DIR}) message("External dependencies directory set:" ${EXTERNAL_DEPS_DIR}) endif() ##Create directory for the external libraries file(MAKE_DIRECTORY ${EXTERNAL_DEPS_DIR}) -<<<<<<< HEAD #message(${POLYSCOPE_ALREADY_COMPILED}) if(NOT DEFINED USE_POLYSCOPE) message(FATAL_ERROR "Use polyscope was not defined") endif() - -======= ->>>>>>> c9fc6ccd0877f92308795b99e51c8e5dfd1e31eb if(${USE_POLYSCOPE}) set(POLYSCOPE_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/polyscope) download_project(PROJ POLYSCOPE @@ -44,21 +35,6 @@ if(${USE_POLYSCOPE}) add_compile_definitions(POLYSCOPE_DEFINED) endif() -<<<<<<< HEAD - -##dlib -#set(DLIB_BIN_DIR ${CMAKE_CURRENT_BINARY_DIR}/dlib_bin) -#file(MAKE_DIRECTORY ${DLIB_BIN_DIR}) -#download_project(PROJ DLIB -# GIT_REPOSITORY https://github.com/davisking/dlib.git -# GIT_TAG master -# BINARY_DIR ${DLIB_BIN_DIR} -# PREFIX ${EXTERNAL_DEPS_DIR} -# ${UPDATE_DISCONNECTED_IF_AVAILABLE} -#) -#add_subdirectory(${DLIB_SOURCE_DIR} ${DLIB_BINARY_DIR}) -======= ->>>>>>> c9fc6ccd0877f92308795b99e51c8e5dfd1e31eb ##vcglib devel branch download_project(PROJ vcglib_devel GIT_REPOSITORY https://github.com/IasonManolas/vcglib.git @@ -99,9 +75,6 @@ download_project(PROJ threed-beam-fea ) add_subdirectory(${threed-beam-fea_SOURCE_DIR} ${threed-beam-fea_BINARY_DIR}) -<<<<<<< HEAD - -======= ##TBB set(TBB_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/tbb) download_project(PROJ TBB @@ -114,13 +87,10 @@ download_project(PROJ TBB option(TBB_BUILD_TESTS "Build TBB tests and enable testing infrastructure" OFF) add_subdirectory(${TBB_SOURCE_DIR} ${TBB_BINARY_DIR}) link_directories(${TBB_BINARY_DIR}) -###Eigen 3 NOTE: Eigen is required on the system the code is ran -find_package(Eigen3 3.3 REQUIRED) ->>>>>>> c9fc6ccd0877f92308795b99e51c8e5dfd1e31eb + if(MSVC) add_compile_definitions(_HAS_STD_BYTE=0) endif(MSVC) -#link_directories(${CMAKE_CURRENT_LIST_DIR}/boost_graph/libs) file(GLOB MySourcesFiles ${CMAKE_CURRENT_LIST_DIR}/*.hpp ${CMAKE_CURRENT_LIST_DIR}/*.cpp) add_library(${PROJECT_NAME} ${MySourcesFiles} ${vcglib_devel_SOURCE_DIR}/wrap/ply/plylib.cpp) target_include_directories(${PROJECT_NAME} @@ -150,7 +120,6 @@ if(USE_ENSMALLEN) ${UPDATE_DISCONNECTED_IF_AVAILABLE} ) add_subdirectory(${ENSMALLEN_SOURCE_DIR} ${ENSMALLEN_BINARY_DIR}) -<<<<<<< HEAD download_project(PROJ ARMADILLO GIT_REPOSITORY https://gitlab.com/conradsnicta/armadillo-code.git @@ -160,19 +129,13 @@ if(USE_ENSMALLEN) ) add_subdirectory(${ARMADILLO_SOURCE_DIR} ${ARMADILLO_BINARY_DIR}) target_include_directories(${PROJECT_NAME} PUBLIC armadillo ) - -======= - set(ARMADILLO_SOURCE_DIR "/home/iason/Coding/Libraries/armadillo") - add_subdirectory(${ARMADILLO_SOURCE_DIR} ${EXTERNAL_DEPS_DIR}/armadillo_build) ->>>>>>> c9fc6ccd0877f92308795b99e51c8e5dfd1e31eb if(${MYSOURCES_STATIC_LINK}) - target_link_libraries(${PROJECT_NAME} PUBLIC "-static" ensmallen ${EXTERNAL_DEPS_DIR}/armadillo_build/libarmadillo.a) + target_link_libraries(${PROJECT_NAME} PUBLIC "-static" ensmallen ${ARMADILLO_BINARY_DIR}/libarmadillo.a) else() target_link_libraries(${PROJECT_NAME} PUBLIC armadillo ensmallen) endif() - target_include_directories(${PROJECT_NAME} PUBLIC ${ARMADILLO_SOURCE_DIR}/include) + target_include_directories(${PROJECT_NAME} PUBLIC armadillo) endif() -<<<<<<< HEAD target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_LIST_DIR}/boost_graph @@ -216,17 +179,14 @@ if(${MYSOURCES_STATIC_LINK}) else() target_link_libraries(${PROJECT_NAME} PUBLIC matplot) endif() -#endif() -#download_project(PROJ GSL -# GIT_REPOSITORY https://github.com/microsoft/GSL.git -# GIT_TAG master -# PREFIX ${EXTERNAL_DEPS_DIR} -# ${UPDATE_DISCONNECTED_IF_AVAILABLE} -# ) -#add_subdirectory(${GSL_SOURCE_DIR} ${GSL_BINARY_DIR}) -#target_link_libraries(${PROJECT_NAME} PUBLIC GSL) -#target_include_directories(${PROJECT_NAME} PUBLIC GSL) +download_project(PROJ GSL + GIT_REPOSITORY https://github.com/microsoft/GSL.git + GIT_TAG master + PREFIX ${EXTERNAL_DEPS_DIR} + ${UPDATE_DISCONNECTED_IF_AVAILABLE} + ) +add_subdirectory(${GSL_SOURCE_DIR} ${GSL_BINARY_DIR}) +target_link_libraries(${PROJECT_NAME} PUBLIC GSL) +target_include_directories(${PROJECT_NAME} PUBLIC GSL) -======= ->>>>>>> c9fc6ccd0877f92308795b99e51c8e5dfd1e31eb diff --git a/reducedmodeloptimizer_structs.hpp b/reducedmodeloptimizer_structs.hpp index 4cc695a..d507a83 100644 --- a/reducedmodeloptimizer_structs.hpp +++ b/reducedmodeloptimizer_structs.hpp @@ -67,7 +67,7 @@ enum OptimizationParameterIndex { E, A, I2, I3, J, R, Theta, NumberOfOptimizatio struct Settings { std::filesystem::path intermediateResultsDirectoryPath; - std::vector> optimizationVariables; + std::vector> optimizationVariables; enum NormalizationStrategy { NonNormalized, Epsilon }; std::vector parameterRanges; inline static vector normalizationStrategyStrings{"NonNormalized", "Epsilon"};