Commit d421b2b8 authored by Dmitry Bagaev's avatar Dmitry Bagaev
Browse files

k3biilu2 new version added

parent 2c9f2b70
......@@ -8,10 +8,10 @@ SyncToy*
.idea/
Source/Solver/solver_fcbiilu2/fcbiilu2.cpp
Source/Solver/solver_k3biilu2/k3d.cpp
Source/Solver/solver_k3biilu2/k3d.h
Source/Solver/solver_k3biilu2/k3d_*
Source/Solver/solver_k3biilu2/k3d_*
.vscode/*
......
......@@ -222,12 +222,12 @@ int main(int argc, char **argv) {
properties["eps:use_closest"] = "false";
properties["eps:strict_bound"] = "false";
TTSP::Optimizers::SaveOptimizerOrReplace("test", optimizerType, properties, 15);
TTSP::Optimizers::SaveOptimizerOrReplace("test", optimizerType, properties, 9);
TTSP::OptimizerInterface *topt = TTSP::Optimizers::GetSavedOptimizer("test");
topt->SetVerbosityLevel(TTSP::OptimizerVerbosityLevel::Level1);
topt->SetRestartStrategy(TTSP::OptimizerRestartStrategy::RESTART_STRATEGY_WITH_BEST, 10);
topt->SetRestartStrategy(TTSP::OptimizerRestartStrategy::RESTART_STRATEGY_WITH_BEST, 7);
double metrics_total = 0.0;
......
if (USE_MPI)
if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/solver_k3biilu2.h" AND EXISTS
"${CMAKE_CURRENT_SOURCE_DIR}/solver_k3biilu2.cpp" AND EXISTS
"${CMAKE_CURRENT_SOURCE_DIR}/k3d.h" AND EXISTS
"${CMAKE_CURRENT_SOURCE_DIR}/k3d.cpp" AND USE_SOLVER_METIS)
"${CMAKE_CURRENT_SOURCE_DIR}/k3d_base.hxx" AND EXISTS
"${CMAKE_CURRENT_SOURCE_DIR}/k3d_base.cxx" AND USE_SOLVER_METIS)
set(SOLVER_DEFINITIONS ${SOLVER_DEFINITIONS} -DHAVE_SOLVER_K3BIILU2 PARENT_SCOPE)
set(HAVE_SOLVER_K3BIILU2 TRUE PARENT_SCOPE)
set(HEADER ${HEADER}
${CMAKE_CURRENT_SOURCE_DIR}/solver_k3biilu2.h
${CMAKE_CURRENT_SOURCE_DIR}/k3d.h
${CMAKE_CURRENT_SOURCE_DIR}/k3d_base.hxx
${CMAKE_CURRENT_SOURCE_DIR}/k3d_block.hxx
${CMAKE_CURRENT_SOURCE_DIR}/k3d_slv.hxx
${CMAKE_CURRENT_SOURCE_DIR}/k3d_slv_thr.hxx
${CMAKE_CURRENT_SOURCE_DIR}/SolverK3BIILU2.h PARENT_SCOPE)
set(SOURCE ${SOURCE}
${CMAKE_CURRENT_SOURCE_DIR}/solver_k3biilu2.cpp
${CMAKE_CURRENT_SOURCE_DIR}/k3d.cpp
${CMAKE_CURRENT_SOURCE_DIR}/k3d_base.cxx
${CMAKE_CURRENT_SOURCE_DIR}/k3d_block.cxx
${CMAKE_CURRENT_SOURCE_DIR}/k3d_slv.cxx
${CMAKE_CURRENT_SOURCE_DIR}/k3d_slv_thr.cxx
${CMAKE_CURRENT_SOURCE_DIR}/SolverK3BIILU2.cpp PARENT_SCOPE)
else ()
set(HAVE_SOLVER_K3BIILU2 FALSE PARENT_SCOPE)
......
......@@ -8,7 +8,7 @@
#include <math.h>
#include <string>
#include "k3d.h"
#include "k3d_slv.hxx"
#define T(x) //x // Trace of function calls. Use: "T(x) x" for trace and "T(x)" for silence
......
#ifndef SOLVER_K3BIILU2_H_INCLUDED
#define SOLVER_K3BIILU2_H_INCLUDED
#include "k3d.h"
#include "k3d_slv.hxx"
#include "inmost.h"
#include "inmost_solver.h"
......
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