Skip to content

Commit 8c79308

Browse files
Refactor var class constructor: remove id parameter and adjust implementation for improved clarity and consistency
1 parent e19c108 commit 8c79308

3 files changed

Lines changed: 3 additions & 4 deletions

File tree

include/var.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace linspire
1515
friend class solver;
1616

1717
public:
18-
var(const utils::var id, const utils::inf_rational &lb = utils::inf_rational(utils::rational::negative_infinite), const utils::inf_rational &ub = utils::inf_rational(utils::rational::positive_infinite)) noexcept;
18+
var(const utils::inf_rational &lb = utils::inf_rational(utils::rational::negative_infinite), const utils::inf_rational &ub = utils::inf_rational(utils::rational::positive_infinite)) noexcept;
1919

2020
[[nodiscard]] utils::inf_rational get_lb() const noexcept;
2121
[[nodiscard]] utils::inf_rational get_ub() const noexcept;
@@ -31,7 +31,6 @@ namespace linspire
3131
void unset_ub(const utils::inf_rational &v, std::shared_ptr<const constraint> reason) noexcept;
3232

3333
private:
34-
const utils::var id; // the id of this variable in the solver..
3534
std::map<utils::inf_rational, std::set<std::shared_ptr<const constraint>>> lbs, ubs; // the lower and upper bounds with their reasons..
3635
utils::inf_rational val; // the current value of this variable..
3736
};

src/linspire.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace linspire
99
{
1010
assert(lb <= ub);
1111
const auto x = vars.size();
12-
vars.emplace_back(x, lb, ub);
12+
vars.emplace_back(lb, ub);
1313
t_watches.emplace_back();
1414
return x;
1515
}

src/var.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace linspire
66
{
7-
var::var(const utils::var id, const utils::inf_rational &lb, const utils::inf_rational &ub) noexcept : id(id) { assert(lb < ub); }
7+
var::var(const utils::inf_rational &lb, const utils::inf_rational &ub) noexcept { assert(lb < ub); }
88

99
utils::inf_rational var::get_lb() const noexcept { return lbs.empty() ? utils::rational::negative_infinite : lbs.rbegin()->first; }
1010
utils::inf_rational var::get_ub() const noexcept { return ubs.empty() ? utils::rational::positive_infinite : ubs.begin()->first; }

0 commit comments

Comments
 (0)