Skip to content

Commit ef38ea5

Browse files
committed
mip
1 parent 49f3a6d commit ef38ea5

File tree

4 files changed

+3
-13
lines changed

4 files changed

+3
-13
lines changed

check/TestPdlp.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ TEST_CASE("pdlp-restart-add-row", "[pdlp]") {
334334
}
335335

336336
TEST_CASE("hi-pdlp", "[pdlp]") {
337-
std::string model = "adlittle"; //"adlittle";//"afiro";// shell// stair //25fv47 //fit2p
337+
std::string model = "afiro"; //"adlittle";//"afiro";// shell// stair //25fv47 //fit2p
338338
std::string model_file =
339339
std::string(HIGHS_DIR) + "/check/instances/" + model + ".mps";
340340
Highs h;
@@ -358,7 +358,7 @@ TEST_CASE("hi-pdlp", "[pdlp]") {
358358
h.setOptionValue("pdlp_scaling_mode", pdlp_scaling);
359359
h.setOptionValue("pdlp_step_size_strategy", 1);
360360
h.setOptionValue("pdlp_restart_strategy", 2);
361-
h.setOptionValue("pdlp_iteration_limit",3520);
361+
//h.setOptionValue("pdlp_iteration_limit",3520);
362362
// h.setOptionValue("log_dev_level", kHighsLogDevLevelVerbose);
363363
auto start_hipdlp = std::chrono::high_resolution_clock::now();
364364
HighsStatus run_status = h.run();

highs/pdlp/cupdlp/cupdlp_restart.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ PDHG_restart_choice PDHG_Check_Restart_GPU(CUPDLPwork *work) {
8080
resobj->dDualFeasLastCandidate = resobj->dDualFeasAverage;
8181
resobj->dDualityGapLastCandidate = resobj->dDualityGapAverage;
8282
}
83-
work->settings->nLogLevel = 2;
83+
8484
if (restart_choice != PDHG_NO_RESTART) {
8585
if (muCurrent < muAverage) {
8686
if (work->settings->nLogLevel > 1)

highs/pdlp/hipdlp/pdhg.cc

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,6 @@ PostSolveRetcode PDLPSolver::postprocess(HighsSolution& solution) {
460460
}
461461

462462
void PDLPSolver::solve(std::vector<double>& x, std::vector<double>& y) {
463-
auto solve_start = std::chrono::high_resolution_clock::now();
464463
Timer solver_timer;
465464
const HighsLp& lp = lp_;
466465

@@ -480,12 +479,6 @@ void PDLPSolver::solve(std::vector<double>& x, std::vector<double>& y) {
480479
"Using power method step sizes: eta = %g, omega = %g\n",
481480
working_params.eta, working_params.omega);
482481

483-
highsLogUser(params_.log_options_, HighsLogType::kInfo,
484-
"Initial step sizes from power method lambda = %g: primal = %g; "
485-
"dual = %g\n",
486-
stepsize_.power_method_lambda, stepsize_.primal_step,
487-
stepsize_.dual_step);
488-
489482
// --- 1. Initialization ---
490483
restart_scheme_.passLogOptions(&working_params.log_options_);
491484
restart_scheme_.passDebugPdlpLogFile(debug_pdlp_log_file_);
@@ -713,8 +706,6 @@ void PDLPSolver::solve(std::vector<double>& x, std::vector<double>& y) {
713706
y = y_avg_;
714707

715708
results_.term_code = TerminationStatus::TIMEOUT;
716-
auto solve_end = std::chrono::high_resolution_clock::now();
717-
timings_.total_time = std::chrono::duration<double>(solve_end - solve_start).count();
718709
return;
719710
}
720711

highs/pdlp/hipdlp/pdhg.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ class PDLPSolver {
5353
DebugPdlpData debug_pdlp_data_;
5454
DetailedTimings timings_;
5555
const DetailedTimings& getTimings() const { return timings_; }
56-
5756
private:
5857
// --- Core Algorithm Logic ---
5958
void Initialize();

0 commit comments

Comments
 (0)