Add benchmark script and instances
This commit is contained in:
@@ -13,7 +13,7 @@ set(TEST_SOURCES
|
||||
tests/greedy-nd-test.cpp)
|
||||
|
||||
add_library(infinity_static ${COMMON_SOURCES})
|
||||
set_target_properties(infinity_static PROPERTIES OUTPUT_NAME lifting)
|
||||
set_target_properties(infinity_static PROPERTIES OUTPUT_NAME infinity)
|
||||
target_include_directories (infinity_static PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
|
||||
add_executable(infinity-test.run ${COMMON_SOURCES} ${TEST_SOURCES})
|
||||
|
||||
@@ -435,7 +435,7 @@ int GREEDY_ND_generate_cut(int nrows,
|
||||
rval = GREEDY_ND_bound(nrows, nrays, f, rays, x, beta, &epsilon_x,
|
||||
tx);
|
||||
abort_if(rval, "GREEDY_ND_bound failed");
|
||||
epsilon_x *= 0.999;
|
||||
// epsilon_x *= 0.999;
|
||||
|
||||
if(isinf(epsilon_x)) break;
|
||||
|
||||
@@ -464,7 +464,7 @@ int GREEDY_ND_generate_cut(int nrows,
|
||||
if(t[i])
|
||||
{
|
||||
beta[i] = min(beta[i], epsilon);
|
||||
beta[i] *= 0.999;
|
||||
// beta[i] *= 0.999;
|
||||
}
|
||||
else if(!skip_ahull)
|
||||
{
|
||||
@@ -482,7 +482,7 @@ int GREEDY_ND_generate_cut(int nrows,
|
||||
}
|
||||
|
||||
beta[i] = min(beta[i], alpha);
|
||||
beta[i] *= 0.999;
|
||||
// beta[i] *= 0.999;
|
||||
}
|
||||
|
||||
log_debug(" beta[%2d] = %.4lf\n", i, beta[i]);
|
||||
|
||||
@@ -22,7 +22,6 @@
|
||||
#include <multirow/util.h>
|
||||
|
||||
#include <infinity/greedy.h>
|
||||
#include <infinity/greedy-bsearch.h>
|
||||
#include <infinity/greedy-2d.h>
|
||||
#include <infinity/greedy-nd.h>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user