Skip to content

Commit dda695d

Browse files
committed
Added variable/constraint IIS status
1 parent d175741 commit dda695d

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

highs/lp_data/HConst.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,8 +281,8 @@ enum IisStrategy : int {
281281
enum IisStatus {
282282
kIisStatusMin = 0,
283283
kIisStatusInConflict = kIisStatusMin, // 0
284-
kIisStatusNotInConflict, // 1
285-
kIisStatusMaybeInConflict, // 2
284+
kIisStatusNotInConflict, // 1
285+
kIisStatusMaybeInConflict, // 2
286286
kIisStatusMax = kIisStatusMaybeInConflict
287287
};
288288

highs/lp_data/HighsIis.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,9 +284,9 @@ void HighsIis::getStatus(const HighsLp& lp) {
284284
this->row_status_.assign(lp.num_row_, kIisStatusNotInConflict);
285285
HighsInt iis_num_col = this->col_index_.size();
286286
HighsInt iis_num_row = this->row_index_.size();
287-
for (HighsInt iisCol = 0; iisCol < iis_num_col; iisCol++)
287+
for (HighsInt iisCol = 0; iisCol < iis_num_col; iisCol++)
288288
this->col_status_[this->col_index_[iisCol]] = kIisStatusInConflict;
289-
for (HighsInt iisRow = 0; iisRow < iis_num_row; iisRow++)
289+
for (HighsInt iisRow = 0; iisRow < iis_num_row; iisRow++)
290290
this->row_status_[this->row_index_[iisRow]] = kIisStatusInConflict;
291291
}
292292

highs/lp_data/HighsInterface.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1869,7 +1869,7 @@ HighsStatus Highs::getIisInterfaceReturn(const HighsStatus return_status) {
18691869
// Construct the ISS status vectors
18701870
this->iis_.getStatus(model_.lp_);
18711871
}
1872-
return return_status;
1872+
return return_status;
18731873
}
18741874

18751875
HighsStatus Highs::getIisInterface() {
@@ -1915,7 +1915,8 @@ HighsStatus Highs::getIisInterface() {
19151915
}
19161916
// Don't continue with more expensive techniques if using the IIS
19171917
// light strategy
1918-
if (options_.iis_strategy == kIisStrategyLight) return this->getIisInterfaceReturn(HighsStatus::kOk);
1918+
if (options_.iis_strategy == kIisStrategyLight)
1919+
return this->getIisInterfaceReturn(HighsStatus::kOk);
19191920
const bool ray_option = false;
19201921
// options_.iis_strategy == kIisStrategyFromRayRowPriority ||
19211922
// options_.iis_strategy == kIisStrategyFromRayColPriority;

0 commit comments

Comments
 (0)