update linking related variable name and replace some binarySearch

src/MibSBilevel.cpp

@@ -160,14 +160,13 @@ MibSBilevel::createBilevel(CoinPackedVector* sol,
     }
   }
 
-  for(i = 0; i < N; i ++){
-      if(binarySearch(0, uN - 1, i, upperColInd) >= 0){
-	  if((varType[i] == MibSVarLinking) &&
-             (fabs(upper[i] - lower[i]) > etol)){
-	      isLinkVarsFixed_ = false;
-	      break;
-	  }
-      }
+  for(i = 0; i < uN; i++){
+    index = upperColInd[i];
+    if((varType[index] == MibSVarLinking) &&
+      (fabs(upper[index] - lower[index]) > etol)){
+        isLinkVarsFixed_ = false;
+        break;
+    }  
   }
 
   /* put the solution in order by integers first */

src/MibSCutGenerator.cpp

@@ -1703,22 +1703,24 @@ MibSCutGenerator::storeBestSolHypercubeIC(const double* lpSol, double optLowerOb
 
     OsiSolverInterface * oSolver = localModel_->solver();
     MibSBilevel *bS = localModel_->bS_;
-    int i(0);
+    int i(0), index(0);
     int numCols(oSolver->getNumCols());
     int uN(localModel_->getUpperDim());
     int lN(localModel_->getLowerDim());
     double objVal(0.0);
     //double startTimeUB(0.0);
     int * varType = localModel_->getVarType();
+    int * uColInd = localModel_->getUpperColInd();
 
     int useLinkingSolutionPool(localModel_->MibSPar_->entry
 		   (MibSParams::useLinkingSolutionPool));
 
     std::vector<double> linkSol;
-    for(i = 0; i < uN + lN; i++){
-	if(varType[i] == MibSVarLinking){
-	    linkSol.push_back(lpSol[i]);
-	}
+    for(i = 0; i < uN; i++){
+      index = uColInd[i];
+      if(varType[index] == MibSVarLinking){
+        linkSol.push_back(lpSol[index]);
+      }
     }
 
     OsiSolverInterface *UBSolver;

src/MibSModel.cpp

@@ -138,7 +138,7 @@ MibSModel::initialize()
   upperRowNum_ = 0;
   origUpperRowNum_ =0;
   structRowNum_ = 0;
-  sizeFixedInd_ = 0;
+  sizeLinkVars_ = 0;
   objAlignment_ = 0;
   counterVF_ = 0;
   counterUB_ = 0;
@@ -1048,17 +1048,6 @@ MibSModel::readProblemData()
    }
 
    delete [] colType;
-
-   for (int i = 0; i < upperDim_; i++){
-      if (varType_[i] == MibSVarLinking){
-         if (colType_[i] == 'C'){
-            throw CoinError("All linking variables should be integer",
-                            "readProblemData",
-                            "MibSModel");
-         }
-      }
-   }
-
    delete mps;
 }
 
@@ -3503,7 +3492,7 @@ MibSModel::setVarTypes()
 		posRow = binarySearch(0, lRows - 1, rowIndex, lowerRowInd);
 		if(posRow >= 0){
 		    varType_[i] = MibSVarLinking;
-		    sizeFixedInd_ ++;
+		    sizeLinkVars_ ++;
 		    break;
 		}
 	    }
@@ -3531,8 +3520,12 @@ MibSModel::analyzeStructure()
 
    for(i = 0; i < uCols; i++){
       index = uColIndices[i];
-      if (colType_[index] != 'C'){
+      if(colType_[index] != 'C'){
          numUpperInt_ ++;
+      }else if(varType_[index] == MibSVarLinking){
+         throw CoinError("All linking variables should be integer",
+                  "analyzeStructure",
+                  "MibSModel");
       }
    }
 

src/MibSModel.hpp

@@ -103,7 +103,7 @@ class MibSModel : public BlisModel {
     int structRowNum_;
 
     /** Size of first-stage variables in second-stage constraints **/
-    int sizeFixedInd_;
+    int sizeLinkVars_;
 
     /** Alignment between lower and upper objectives **/
     double objAlignment_;