Ignore:
Timestamp:
Jan 13, 2010 6:39:15 PM (10 years ago)
Author:
pbonami
Message:

Port Claudia's code to trunk

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Bonmin/src/Interfaces/BonOsiTMINLPInterface.hpp

    r1512 r1536  
    240240    hasContinuedAfterNlpFailure_ = true;
    241241  }
     242
     243
     244  //Added by Claudia
     245 
     246  double getNewCutoffDecr()
     247  {
     248    return newCutoffDecr;
     249  }
     250
     251  void setNewCutoffDecr(double d)
     252  {
     253    newCutoffDecr = d;
     254  }
     255
     256
    242257  /// Did we continue on a failure
    243258  bool hasContinuedOnAFailure()
     
    11551170  /// Number of times problem will be resolved in case of a failure
    11561171  int numRetryUnsolved_;
     1172
     1173
     1174  //Added by Claudia
     1175  /// Dynamic cutOff_
     1176  int dynamicCutOff_;
     1177  /// coeff_var_threshold_
     1178  double coeff_var_threshold_;
     1179  /// first_perc_for_cutoff_decr_
     1180  double first_perc_for_cutoff_decr_;
     1181  /// second_perc_for_cutoff_decr_
     1182  double second_perc_for_cutoff_decr_;
     1183 
     1184
    11571185  /** Messages specific to an OsiTMINLPInterface. */
    11581186  Messages messages_;
     
    12211249  OaMessageHandler * oaHandler_;
    12221250  //@}
     1251
     1252  double newCutoffDecr;
    12231253protected:
    12241254  /** Facilitator to create an application. */
Note: See TracChangeset for help on using the changeset viewer.