Commit 1ea97bf3 authored by Dmitry Bagaev's avatar Dmitry Bagaev
Browse files

update structure

parent 68586e3a
......@@ -34,7 +34,7 @@ option(USE_SOLVER_MONDRIAAN "Use Mondriaan for matrix reordering" OFF)
option(USE_SOLVER_PETSC "Use PETSc solvers" OFF)
option(USE_SOLVER_TRILINOS "Use Trilinos solvers" OFF)
option(USE_SOLVER_SUPERLU "Use SuperLU solver" OFF)
option(USE_SOLVER_TTSP_FEATURE "Use Trace and Tune Solver Parameters optimization toolkit" OFF)
option(USE_TTSP "Use Trace and Tune Solver Parameters optimization toolkit" OFF)
#option(USE_AUTODIFF_ASMJIT "Use AsmJit for automatic differentiation" OFF)
#option(USE_AUTODIFF_EXPRESSION_TEMPLATES "Use c++ expression templates for automatic differentiation" OFF)
......@@ -281,6 +281,7 @@ set(INMOST_INSTALL_HEADERS Source/Headers/inmost.h
Source/Headers/inmost_xml.h
Source/Headers/inmost_variable.h
Source/Headers/inmost_block_variable.h
Source/Headers/inmost_ttsp.h
Source/Headers/container.hpp)
......@@ -315,6 +316,7 @@ set_property(TARGET inmost PROPERTY PUBLIC_HEADER
"${PROJECT_SOURCE_DIR}/Source/Headers/inmost_variable.h"
"${PROJECT_SOURCE_DIR}/Source/Headers/inmost_block_variable.h"
"${PROJECT_SOURCE_DIR}/Source/Headers/inmost_xml.h"
"${PROJECT_SOURCE_DIR}/Source/Headers/inmost_ttsp.h"
"${PROJECT_SOURCE_DIR}/Source/Headers/container.hpp")
install(FILES
......
......@@ -5,7 +5,7 @@
#include <cmath>
#include <cstdio>
#include "Source/Solver/ttsp/ttsp.h"
#include <inmost_ttsp.h>
#include "series.h"
using namespace INMOST;
......
......@@ -2,6 +2,7 @@
add_subdirectory(Data)
add_subdirectory(Mesh)
add_subdirectory(IO)
add_subdirectory(TTSP)
add_subdirectory(Solver)
add_subdirectory(NonlinearSolver)
add_subdirectory(Autodiff)
......
......@@ -22,6 +22,7 @@ set(HEADER
${CMAKE_CURRENT_SOURCE_DIR}/inmost_sparse.h
${CMAKE_CURRENT_SOURCE_DIR}/inmost_nonlinear.h
${CMAKE_CURRENT_SOURCE_DIR}/inmost_xml.h
${CMAKE_CURRENT_SOURCE_DIR}/inmost_ttsp.h
${CMAKE_CURRENT_SOURCE_DIR}/container.hpp
PARENT_SCOPE
)
\ No newline at end of file
......@@ -23,6 +23,8 @@
#cmakedefine USE_SOLVER_ANI
#cmakedefine USE_SOLVER_SUPERLU
#cmakedefine USE_TTSP
#cmakedefine USE_NONLINEAR
#cmakedefine USE_NONLINEAR_TRILINOS
#cmakedefine USE_NONLINEAR_PETSC
......
#include <utility>
#ifndef INMOST_INMOST_TTSP_H
#define INMOST_INMOST_TTSP_H
//
// Created by bvdmitri on 04.02.19.
//
#include "inmost.h"
#ifndef INMOST_TTSP_H
#define INMOST_TTSP_H
#if defined(USE_TTSP)
#include <vector>
#include <algorithm>
......@@ -338,5 +336,6 @@ namespace TTSP {
};
#endif
#endif //INMOST_TTSP_H
#endif //INMOST_INMOST_TTSP_H
......@@ -32,10 +32,6 @@ endif()
if (USE_SOLVER_SUPERLU)
add_subdirectory(solver_superlu)
endif()
if (USE_SOLVER_TTSP_FEATURE)
add_subdirectory(ttsp)
endif()
endif(USE_SOLVER)
set(HEADER ${HEADER} PARENT_SCOPE)
......
set(SOURCE ${SOURCE}
${CMAKE_CURRENT_SOURCE_DIR}/ttsp.cpp)
set(HEADER ${HEADER}
${CMAKE_CURRENT_SOURCE_DIR}/ttsp.h)
add_subdirectory(optimizers)
set(HEADER ${HEADER} PARENT_SCOPE)
set(SOURCE ${SOURCE} PARENT_SCOPE)
\ No newline at end of file
if (USE_TTSP)
set(SOURCE ${SOURCE}
${CMAKE_CURRENT_SOURCE_DIR}/ttsp.cpp)
add_subdirectory(optimizers)
endif ()
set(HEADER ${HEADER} PARENT_SCOPE)
set(SOURCE ${SOURCE} PARENT_SCOPE)
\ No newline at end of file
......@@ -5,7 +5,7 @@
#ifndef INMOST_TTSP_ALTERNATING_H
#define INMOST_TTSP_ALTERNATING_H
#include <Source/Solver/ttsp/ttsp.h>
#include <inmost_ttsp.h>
namespace TTSP {
......
......@@ -5,7 +5,7 @@
#ifndef INMOST_TTSP_ANNEALING_H
#define INMOST_TTSP_ANNEALING_H
#include <Source/Solver/ttsp/ttsp.h>
#include <inmost_ttsp.h>
#include <random>
namespace TTSP {
......
......@@ -5,7 +5,7 @@
#ifndef INMOST_TTSP_BRUTEFORCE_H
#define INMOST_TTSP_BRUTEFORCE_H
#include <Source/Solver/ttsp/ttsp.h>
#include <inmost_ttsp.h>
namespace TTSP {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment