From 252c12a1af12b8a5d69e526406cafe6a9d88c2ea Mon Sep 17 00:00:00 2001 From: Yu Date: Thu, 1 Feb 2024 13:45:52 -0500 Subject: [PATCH 1/3] Change default ISIC message to (Type I) --- src/MibSModel.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/MibSModel.cpp b/src/MibSModel.cpp index 2fbe92c5..43a42228 100644 --- a/src/MibSModel.cpp +++ b/src/MibSModel.cpp @@ -4149,10 +4149,10 @@ MibSModel::printProblemInfo(){ if (MibSPar_->entry(MibSParams::useImprovingSolutionIC) == PARAM_ON){ if (MibSPar_->entry(MibSParams::bilevelFreeSetTypeISIC) == - MibSBilevelFreeSetTypeISICWithLLOptSol){ - std::cout << "Improving solution intersection cut generator (Type I) is on." << std::endl; - }else{ + MibSBilevelFreeSetTypeISICWithNewLLSol){ std::cout << "Improving solution intersection cut generator (Type II) is on." << std::endl; + }else{ + std::cout << "Improving solution intersection cut generator (Type I) is on." << std::endl; } } From dfc8f26bd7ae2e3b2634ae914d6875f1f6067ab4 Mon Sep 17 00:00:00 2001 From: Yu Date: Mon, 22 Apr 2024 20:22:01 -0400 Subject: [PATCH 2/3] Revert "Change default ISIC message to (Type I)" This reverts commit 252c12a1af12b8a5d69e526406cafe6a9d88c2ea. --- src/MibSModel.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/MibSModel.cpp b/src/MibSModel.cpp index 43a42228..2fbe92c5 100644 --- a/src/MibSModel.cpp +++ b/src/MibSModel.cpp @@ -4149,10 +4149,10 @@ MibSModel::printProblemInfo(){ if (MibSPar_->entry(MibSParams::useImprovingSolutionIC) == PARAM_ON){ if (MibSPar_->entry(MibSParams::bilevelFreeSetTypeISIC) == - MibSBilevelFreeSetTypeISICWithNewLLSol){ - std::cout << "Improving solution intersection cut generator (Type II) is on." << std::endl; - }else{ + MibSBilevelFreeSetTypeISICWithLLOptSol){ std::cout << "Improving solution intersection cut generator (Type I) is on." << std::endl; + }else{ + std::cout << "Improving solution intersection cut generator (Type II) is on." << std::endl; } } From 3b53772d38e13d7e7cbbb2ce394fb4817546a02c Mon Sep 17 00:00:00 2001 From: Yu Date: Mon, 22 Apr 2024 20:27:07 -0400 Subject: [PATCH 3/3] Change ISIC cut type default to Type I --- src/MibSParams.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MibSParams.cpp b/src/MibSParams.cpp index 618fc7f4..aaea9766 100644 --- a/src/MibSParams.cpp +++ b/src/MibSParams.cpp @@ -388,7 +388,7 @@ MibSParams::setDefaultEntries() { setEntry(useFractionalCutsRootOnly, 0); - setEntry(bilevelFreeSetTypeISIC, MibSBilevelFreeSetTypeISICNotSet); + setEntry(bilevelFreeSetTypeISIC, MibSBilevelFreeSetTypeISICWithLLOptSol); setEntry(solveSecondLevelEveryIteration, PARAM_OFF);