diff --git a/src/math/lp/lar_constraints.h b/src/math/lp/lar_constraints.h index 416a3b41c..0260ab8cc 100644 --- a/src/math/lp/lar_constraints.h +++ b/src/math/lp/lar_constraints.h @@ -96,7 +96,7 @@ public: }; -class constrau_set { +class constraint_set { region m_region; column_namer& m_namer; vector m_constraints; @@ -139,10 +139,10 @@ class constrau_set { } public: - constrau_set(column_namer& cn): + constraint_set(column_namer& cn): m_namer(cn) {} - ~constrau_set() { + ~constraint_set() { for (auto* c : m_constraints) c->~lar_base_constraint(); } @@ -198,15 +198,15 @@ public: bool valid_index(constraint_index ci) const { return ci < m_constraints.size(); } class active_constraints { - friend class constrau_set; - constrau_set const& cs; + friend class constraint_set; + constraint_set const& cs; public: - active_constraints(constrau_set const& cs): cs(cs) {} + active_constraints(constraint_set const& cs): cs(cs) {} class iterator { - friend class constrau_set; - constrau_set const& cs; + friend class constraint_set; + constraint_set const& cs; unsigned m_index; - iterator(constrau_set const& cs, unsigned idx): cs(cs), m_index(idx) { forward(); } + iterator(constraint_set const& cs, unsigned idx): cs(cs), m_index(idx) { forward(); } void next() { ++m_index; forward(); } void forward() { for (; m_index < cs.m_constraints.size() && !cs.is_active(m_index); m_index++) ; } public: @@ -224,15 +224,15 @@ public: active_constraints active() const { return active_constraints(*this); } class active_indices { - friend class constrau_set; - constrau_set const& cs; + friend class constraint_set; + constraint_set const& cs; public: - active_indices(constrau_set const& cs): cs(cs) {} + active_indices(constraint_set const& cs): cs(cs) {} class iterator { - friend class constrau_set; - constrau_set const& cs; + friend class constraint_set; + constraint_set const& cs; unsigned m_index; - iterator(constrau_set const& cs, unsigned idx): cs(cs), m_index(idx) { forward(); } + iterator(constraint_set const& cs, unsigned idx): cs(cs), m_index(idx) { forward(); } void next() { ++m_index; forward(); } void forward() { for (; m_index < cs.m_constraints.size() && !cs.is_active(m_index); m_index++) ; } public: @@ -288,7 +288,7 @@ public: }; -inline std::ostream& operator<<(std::ostream& out, constrau_set const& cs) { +inline std::ostream& operator<<(std::ostream& out, constraint_set const& cs) { return cs.display(out); } diff --git a/src/math/lp/lar_solver.h b/src/math/lp/lar_solver.h index 98e1031b6..ad3a28f11 100644 --- a/src/math/lp/lar_solver.h +++ b/src/math/lp/lar_solver.h @@ -93,7 +93,7 @@ public: var_register m_var_register; var_register m_term_register; stacked_vector m_columns_to_ul_pairs; - constrau_set m_constraints; + constraint_set m_constraints; // the set of column indices j such that bounds have changed for j u_set m_columns_with_changed_bound; u_set m_rows_with_changed_bounds; @@ -111,7 +111,7 @@ public: const vector & terms() const { return m_terms; } lar_term const& term(unsigned i) const { return *m_terms[i]; } - constrau_set const& constraints() const { return m_constraints; } + constraint_set const& constraints() const { return m_constraints; } void set_int_solver(int_solver * int_slv) { m_int_solver = int_slv; } int_solver * get_int_solver() { return m_int_solver; } diff --git a/src/math/lp/lp_dual_core_solver.h b/src/math/lp/lp_dual_core_solver.h index b6f1707c2..f4aa4b44d 100644 --- a/src/math/lp/lp_dual_core_solver.h +++ b/src/math/lp/lp_dual_core_solver.h @@ -39,7 +39,7 @@ public: T m_theta_P; int m_q; // todo : replace by a vector later - std::set m_breakpou_set; // it is F in "Progress in the dual simplex method ..." + std::set m_breakpoint_set; // it is F in "Progress in the dual simplex method ..." std::set m_flipped_boxed; std::set m_tight_set; // it is the set of all breakpoints that become tight when m_q becomes tight vector m_a_wave; @@ -124,7 +124,7 @@ public: bool can_be_breakpoint(unsigned j); - void fill_breakpou_set(); + void fill_breakpoint_set(); void DSE_FTran(); T get_delta(); @@ -183,7 +183,7 @@ public: bool tight_breakpoinst_are_all_boxed(); - T calculate_harris_delta_on_breakpou_set(); + T calculate_harris_delta_on_breakpoint_set(); void fill_tight_set_on_harris_delta(const T & harris_delta ); @@ -191,7 +191,7 @@ public: void find_q_and_tight_set(); - void erase_tight_breakpoints_and_q_from_breakpou_set(); + void erase_tight_breakpoints_and_q_from_breakpoint_set(); bool ratio_test(); diff --git a/src/math/lp/lp_dual_core_solver_def.h b/src/math/lp/lp_dual_core_solver_def.h index 91d8f0025..1e6553458 100644 --- a/src/math/lp/lp_dual_core_solver_def.h +++ b/src/math/lp/lp_dual_core_solver_def.h @@ -285,11 +285,11 @@ template bool lp_dual_core_solver::can_be_breakpo } } -template void lp_dual_core_solver::fill_breakpou_set() { - m_breakpou_set.clear(); +template void lp_dual_core_solver::fill_breakpoint_set() { + m_breakpoint_set.clear(); for (unsigned j : this->non_basis()) { if (can_be_breakpoint(j)) { - m_breakpou_set.insert(j); + m_breakpoint_set.insert(j); } } } @@ -590,11 +590,11 @@ template bool lp_dual_core_solver::tight_breakpoi return true; } -template T lp_dual_core_solver::calculate_harris_delta_on_breakpou_set() { +template T lp_dual_core_solver::calculate_harris_delta_on_breakpoint_set() { bool first_time = true; T ret = zero_of_type(); - lp_assert(m_breakpou_set.size() > 0); - for (auto j : m_breakpou_set) { + lp_assert(m_breakpoint_set.size() > 0); + for (auto j : m_breakpoint_set) { T t; if (this->x_is_at_lower_bound(j)) { t = abs((std::max(this->m_d[j], numeric_traits::zero()) + m_harris_tolerance) / this->m_pivot_row[j]); @@ -613,7 +613,7 @@ template T lp_dual_core_solver::calculate_harris_ template void lp_dual_core_solver::fill_tight_set_on_harris_delta(const T & harris_delta ){ m_tight_set.clear(); - for (auto j : m_breakpou_set) { + for (auto j : m_breakpoint_set) { if (this->x_is_at_lower_bound(j)) { if (abs(std::max(this->m_d[j], numeric_traits::zero()) / this->m_pivot_row[j]) <= harris_delta){ m_tight_set.insert(j); @@ -646,26 +646,26 @@ template void lp_dual_core_solver::find_q_on_tigh } template void lp_dual_core_solver::find_q_and_tight_set() { - T harris_del = calculate_harris_delta_on_breakpou_set(); + T harris_del = calculate_harris_delta_on_breakpoint_set(); fill_tight_set_on_harris_delta(harris_del); find_q_on_tight_set(); m_entering_boundary_position = this->get_non_basic_column_value_position(m_q); } -template void lp_dual_core_solver::erase_tight_breakpoints_and_q_from_breakpou_set() { - m_breakpou_set.erase(m_q); +template void lp_dual_core_solver::erase_tight_breakpoints_and_q_from_breakpoint_set() { + m_breakpoint_set.erase(m_q); for (auto j : m_tight_set) { - m_breakpou_set.erase(j); + m_breakpoint_set.erase(j); } } template bool lp_dual_core_solver::ratio_test() { m_sign_of_alpha_r = define_sign_of_alpha_r(); - fill_breakpou_set(); + fill_breakpoint_set(); m_flipped_boxed.clear(); int initial_delta_sign = m_delta >= numeric_traits::zero()? 1: -1; do { - if (m_breakpou_set.empty()) { + if (m_breakpoint_set.empty()) { set_status_to_tentative_dual_unbounded_or_dual_unbounded(); return false; } @@ -674,13 +674,13 @@ template bool lp_dual_core_solver::ratio_test() { if (!tight_breakpoinst_are_all_boxed()) break; T del = m_delta - delta_lost_on_flips_of_tight_breakpoints() * initial_delta_sign; if (!delta_keeps_the_sign(initial_delta_sign, del)) break; - if (m_tight_set.size() + 1 == m_breakpou_set.size()) { + if (m_tight_set.size() + 1 == m_breakpoint_set.size()) { break; // deciding not to flip since we might get stuck without finding m_q, the column entering the basis } // we can flip m_q together with the tight set and look for another breakpoint candidate for m_q and another tight set add_tight_breakpoints_and_q_to_flipped_set(); m_delta = del; - erase_tight_breakpoints_and_q_from_breakpou_set(); + erase_tight_breakpoints_and_q_from_breakpoint_set(); } while (true); m_theta_D = this->m_d[m_q] / this->m_pivot_row[m_q]; return true; diff --git a/src/math/lp/u_set.h b/src/math/lp/u_set.h index 23833925d..7bb92ca40 100644 --- a/src/math/lp/u_set.h +++ b/src/math/lp/u_set.h @@ -15,7 +15,7 @@ Author: Revision History: - TBD use indexed_uu_set from src/util/uu_set.h, +TBD use indexed_uint_set from src/util/uu_set.h, --*/ #pragma once