diff options
author | Liana Hadarean <lianahady@gmail.com> | 2013-09-30 13:56:51 -0400 |
---|---|---|
committer | Liana Hadarean <lianahady@gmail.com> | 2013-09-30 13:56:51 -0400 |
commit | 7d2265eb2b5dc96ddff04211959e208b1cb8a7f0 (patch) | |
tree | 26fb270349580c90efe163ca7767bccce6607902 /src/theory/arith/approx_simplex.h | |
parent | db6df44574927f9b75db664e1e490f757725d13a (diff) | |
parent | 0c2eafec69b694a507ac914bf285fe0574be085f (diff) |
merged golden
Diffstat (limited to 'src/theory/arith/approx_simplex.h')
-rw-r--r-- | src/theory/arith/approx_simplex.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/theory/arith/approx_simplex.h b/src/theory/arith/approx_simplex.h index a2f3cde24..a34c8981d 100644 --- a/src/theory/arith/approx_simplex.h +++ b/src/theory/arith/approx_simplex.h @@ -24,7 +24,7 @@ public: /** * If glpk is enabled, return a subclass that can do something. - * If glpk is disabled, return a sublass that does nothing. + * If glpk is disabled, return a subclass that does nothing. */ static ApproximateSimplex* mkApproximateSimplexSolver(const ArithVariables& vars); ApproximateSimplex(); @@ -44,18 +44,15 @@ public: /** Sets a maximization criteria for the approximate solver.*/ virtual void setOptCoeffs(const ArithRatPairVec& ref) = 0; + virtual ArithRatPairVec heuristicOptCoeffs() const = 0; + virtual ApproxResult solveRelaxation() = 0; virtual Solution extractRelaxation() const = 0; virtual ApproxResult solveMIP() = 0; virtual Solution extractMIP() const = 0; - static void applySolution(LinearEqualityModule& linEq, const Solution& sol){ - linEq.forceNewBasis(sol.newBasis); - linEq.updateMany(sol.newValues); - } - - /** UTILIES FOR DEALING WITH ESTIMATES */ + /** UTILITIES FOR DEALING WITH ESTIMATES */ static const double SMALL_FIXED_DELTA; static const double TOLERENCE; |