Ignore:
Timestamp:
Oct 1, 2004 4:01:01 PM (16 years ago)
Author:
forrest
Message:

Trying to make faster

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/ClpNonLinearCost.cpp

    r448 r461  
    2222  changeCost_(0.0),
    2323  feasibleCost_(0.0),
     24  infeasibilityWeight_(-1.0),
    2425  largestInfeasibility_(0.0),
    2526  sumInfeasibilities_(0.0),
     
    6364  changeCost_=0.0;
    6465  feasibleCost_=0.0;
     66  infeasibilityWeight_ = -1.0;
    6567  double infeasibilityCost = model_->infeasibilityCost();
    6668  sumInfeasibilities_=0.0;
     
    173175  feasibleCost_=0.0;
    174176  double infeasibilityCost = model_->infeasibilityCost();
     177  infeasibilityWeight_ = infeasibilityCost;;
    175178  largestInfeasibility_=0.0;
    176179  sumInfeasibilities_=0.0;
     
    280283  changeCost_(0.0),
    281284  feasibleCost_(0.0),
     285  infeasibilityWeight_(-1.0),
    282286  largestInfeasibility_(0.0),
    283287  sumInfeasibilities_(0.0),
     
    313317    changeCost_ = rhs.changeCost_;
    314318    feasibleCost_ = rhs.feasibleCost_;
     319    infeasibilityWeight_ = rhs.infeasibilityWeight_;
    315320    largestInfeasibility_ = rhs.largestInfeasibility_;
    316321    sumInfeasibilities_ = rhs.sumInfeasibilities_;
     
    377382    changeCost_ = rhs.changeCost_;
    378383    feasibleCost_ = rhs.feasibleCost_;
     384    infeasibilityWeight_ = rhs.infeasibilityWeight_;
    379385    largestInfeasibility_ = rhs.largestInfeasibility_;
    380386    sumInfeasibilities_ = rhs.sumInfeasibilities_;
     
    405411  bool toNearest = oldTolerance<=0.0;
    406412  feasibleCost_=0.0;
     413  //bool checkCosts = (infeasibilityWeight_ != infeasibilityCost);
     414  infeasibilityWeight_ = infeasibilityCost;
    407415   
    408416  // nonbasic should be at a valid bound
Note: See TracChangeset for help on using the changeset viewer.