Changeset 460 for trunk


Ignore:
Timestamp:
Oct 20, 2006 12:40:47 PM (13 years ago)
Author:
forrest
Message:

for Brady - sum of infeasibilities

Location:
trunk/Cbc/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/src/CbcNode.cpp

    r395 r460  
    658658  objectiveValue_(1.0e100),
    659659  guessedObjectiveValue_(1.0e100),
     660  sumInfeasibilities_(0.0),
    660661  branch_(NULL),
    661662  depth_(-1),
     
    672673  objectiveValue_(1.0e100),
    673674  guessedObjectiveValue_(1.0e100),
     675  sumInfeasibilities_(0.0),
    674676  branch_(NULL),
    675677  depth_(-1),
     
    967969      estimatedDegradation=0.0;
    968970      numberUnsatisfied_ = 0;
     971      // initialize sum of "infeasibilities"
     972      sumInfeasibilities_ = 0.0;
    969973      int bestPriority=INT_MAX;
    970974      /*
     
    10571061          estimatedDegradation += CoinMin(object->upEstimate(),object->downEstimate());
    10581062          numberUnsatisfied_++;
     1063          sumInfeasibilities_ += infeasibility;
    10591064          // Better priority? Flush choices.
    10601065          if (priorityLevel<bestPriority) {
     
    20792084      estimatedDegradation=0.0;
    20802085      numberUnsatisfied_ = 0;
     2086      // initialize sum of "infeasibilities"
     2087      sumInfeasibilities_ = 0.0;
    20812088      int bestPriority=INT_MAX;
    20822089      /*
     
    21442151          upEstimate[i]=object->upEstimate();
    21452152          numberUnsatisfied_++;
     2153          sumInfeasibilities_ += infeasibility;
    21462154          // Better priority? Flush choices.
    21472155          if (priorityLevel<bestPriority) {
  • trunk/Cbc/src/CbcNode.hpp

    r303 r460  
    538538  inline int numberUnsatisfied() const
    539539  {return numberUnsatisfied_;};
     540  /// Sum of "infeasibilities" reported by each object
     541  inline double sumInfeasibilities() const
     542  { return sumInfeasibilities_;};
    540543
    541544  // Guessed objective value (for solution)
     
    559562  // Guessed satisfied Objective value
    560563  double guessedObjectiveValue_;
     564  /// Sum of "infeasibilities" reported by each object
     565  double sumInfeasibilities_;
    561566  /// Branching object for this node
    562567  CbcBranchingObject * branch_;
Note: See TracChangeset for help on using the changeset viewer.