Revert "use delta instead of fastDelta when determining the need for …

…shifts" This reverts commit a7b4fab.
scipopt · Jun 11, 2024 · 3f52108 · 3f52108
1 parent a7b4fab
commit 3f52108
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/soplex/spxboundflippingrt.hpp b/src/soplex/spxboundflippingrt.hpp
@@ -847,7 +847,7 @@ SPxId SPxBoundFlippingRT<R>::selectEnter(
          break;
    }
 
-   degeneps = this->delta / moststable;  /* as in SPxFastRT */
+   degeneps = this->fastDelta / moststable;  /* as in SPxFastRT */
    // get stability requirements
    instable = this->thesolver->instableLeave;
    assert(!instable || this->thesolver->instableLeaveNum >= 0);
@@ -1149,7 +1149,7 @@ int SPxBoundFlippingRT<R>::selectLeave(
          break;
    }
 
-   degeneps = this->delta / moststable;  /* as in SPxFastRT */
+   degeneps = this->fastDelta / moststable;  /* as in SPxFastRT */
    // get stability requirements
    instable = this->thesolver->instableEnter;
    assert(!instable || this->thesolver->instableEnterId.isValid());

diff --git a/src/soplex/spxfastrt.hpp b/src/soplex/spxfastrt.hpp
@@ -887,7 +887,7 @@ bool SPxFastRT<R>::maxReLeave(R& sel, int leave, R maxabs, bool polish)
    {
       R x = vec.delta()[leave];
 
-      if(sel < -this->delta / maxabs)
+      if(sel < -fastDelta / maxabs)
       {
          sel = 0.0;
 
@@ -931,7 +931,7 @@ bool SPxFastRT<R>::minReLeave(R& sel, int leave, R maxabs, bool polish)
    {
       R x = vec.delta()[leave];
 
-      if(sel > this->delta / maxabs)
+      if(sel > fastDelta / maxabs)
       {
          sel = 0.0;
 
@@ -1202,7 +1202,7 @@ bool SPxFastRT<R>::maxReEnter(R& sel,
 
    if((*up)[nr] != (*low)[nr])
    {
-      if(sel < -this->delta / maxabs)
+      if(sel < -fastDelta / maxabs)
       {
          sel = 0.0;
 
@@ -1309,7 +1309,7 @@ bool SPxFastRT<R>::minReEnter(
 
    if((*up)[nr] != (*low)[nr])
    {
-      if(sel > this->delta / maxabs)
+      if(sel > fastDelta / maxabs)
       {
          sel = 0.0;