v518 - fixed near-sill infeasibility problem in management

removed binary variable treatment of stage-discharge constraint
 - greatly simplifies problem
 - no more need for branch + bound

[BACKWARD COMPATIBILITY] - management models now have maximum penalty of 1,000,000

Author: James Craig

src/DemandExpressionHandling.cpp

@@ -1334,20 +1334,27 @@ void CDemandOptimizer::AddConstraintToLP(const int ii, const int kk, lp_lib::lpr
       return; 
     }
 
+    //bool is_stage;
+    //double h_min;
     RHS=0.0;
     for (int j = 0; j < pE->nGroups; j++)
     {
       coeff=1.0;
       group_has_dv=false;
       DV_ind=DOESNT_EXIST;
-
+      //is_stage=false;
       for (int k = 0; k < pE->nTermsPerGrp[j]; k++)
       {
         if (pE->pTerms[j][k]->type == TERM_DV)
         {
           DV_ind=pE->pTerms[j][k]->DV_ind;
           group_has_dv=true;
           coeff *= (pE->pTerms[j][k]->mult);
+
+          //is_stage= ((pE->pTerms[j][k]->origexp[0]=='!') && (pE->pTerms[j][k]->origexp[1] == 'h'));
+          //if (is_stage){
+          //  h_min=_pModel->GetSubBasin(pE->pTerms[j][k]->p_index)->GetReservoir()->GetDryStage();
+          //}
         }
         else if (!(pE->pTerms[j][k]->is_nested))
         {
@@ -1362,6 +1369,7 @@ void CDemandOptimizer::AddConstraintToLP(const int ii, const int kk, lp_lib::lpr
           else {
             coeff *= (pE->pTerms[j][k]->mult) * term;
           }
+          
         }
       }
 
@@ -1372,6 +1380,9 @@ void CDemandOptimizer::AddConstraintToLP(const int ii, const int kk, lp_lib::lpr
         col_ind[i]=DV_ind;
         row_val[i]=coeff;
         i++;
+        //if (is_stage) {
+        //  RHS-=coeff*h_min;
+        //}
       }
     }
   }