Skip to content

Commit e7ff875

Browse files
committed
Use double
1 parent ea24d48 commit e7ff875

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/mip/HighsDomain.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -480,8 +480,8 @@ void HighsDomain::CutpoolPropagation::updateActivityLbChange(HighsInt col,
480480
cutpool->getMatrix().forEachPositiveColumnEntry(
481481
col, [&](HighsInt row, double val) {
482482
assert(val > 0);
483-
HighsCDouble deltamin = computeDelta(row, val, oldbound, newbound,
484-
-kHighsInf, activitycutsinf_);
483+
double deltamin = computeDelta(row, val, oldbound, newbound, -kHighsInf,
484+
activitycutsinf_);
485485
activitycuts_[row] += deltamin;
486486

487487
if (deltamin <= 0) {
@@ -541,8 +541,8 @@ void HighsDomain::CutpoolPropagation::updateActivityUbChange(HighsInt col,
541541
cutpool->getMatrix().forEachNegativeColumnEntry(
542542
col, [&](HighsInt row, double val) {
543543
assert(val < 0);
544-
HighsCDouble deltamin = computeDelta(row, val, oldbound, newbound,
545-
kHighsInf, activitycutsinf_);
544+
double deltamin = computeDelta(row, val, oldbound, newbound, kHighsInf,
545+
activitycutsinf_);
546546
activitycuts_[row] += deltamin;
547547

548548
if (deltamin <= 0) {
@@ -1527,7 +1527,7 @@ void HighsDomain::updateActivityLbChange(HighsInt col, double oldbound,
15271527

15281528
for (HighsInt i = start; i != end; ++i) {
15291529
if (mip->a_matrix_.value_[i] > 0) {
1530-
HighsCDouble deltamin =
1530+
double deltamin =
15311531
computeDelta(mip->a_matrix_.index_[i], mip->a_matrix_.value_[i],
15321532
oldbound, newbound, -kHighsInf, activitymininf_);
15331533
activitymin_[mip->a_matrix_.index_[i]] += deltamin;
@@ -1571,7 +1571,7 @@ void HighsDomain::updateActivityLbChange(HighsInt col, double oldbound,
15711571
mip->row_upper_[mip->a_matrix_.index_[i]] != kHighsInf)
15721572
markPropagate(mip->a_matrix_.index_[i]);
15731573
} else {
1574-
HighsCDouble deltamax =
1574+
double deltamax =
15751575
computeDelta(mip->a_matrix_.index_[i], mip->a_matrix_.value_[i],
15761576
oldbound, newbound, -kHighsInf, activitymaxinf_);
15771577
activitymax_[mip->a_matrix_.index_[i]] += deltamax;
@@ -1666,7 +1666,7 @@ void HighsDomain::updateActivityUbChange(HighsInt col, double oldbound,
16661666

16671667
for (HighsInt i = start; i != end; ++i) {
16681668
if (mip->a_matrix_.value_[i] > 0) {
1669-
HighsCDouble deltamax =
1669+
double deltamax =
16701670
computeDelta(mip->a_matrix_.index_[i], mip->a_matrix_.value_[i],
16711671
oldbound, newbound, kHighsInf, activitymaxinf_);
16721672
activitymax_[mip->a_matrix_.index_[i]] += deltamax;
@@ -1713,7 +1713,7 @@ void HighsDomain::updateActivityUbChange(HighsInt col, double oldbound,
17131713
// propagateinds_.push_back(mip->a_matrix_.index_[i]);
17141714
}
17151715
} else {
1716-
HighsCDouble deltamin =
1716+
double deltamin =
17171717
computeDelta(mip->a_matrix_.index_[i], mip->a_matrix_.value_[i],
17181718
oldbound, newbound, kHighsInf, activitymininf_);
17191719
activitymin_[mip->a_matrix_.index_[i]] += deltamin;

0 commit comments

Comments
 (0)