Changeset 428


Ignore:
Timestamp:
Aug 5, 2005 4:35:03 PM (14 years ago)
Author:
andreasw
Message:

astyle

Location:
branches/dev
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/dev/Common/IpJournalist.cpp

    r426 r428  
    160160        va_end(apcopy);
    161161#else
     162
    162163        journals_[i]->Printf(pformat, ap);
    163164#endif
     165
    164166      }
    165167    }
     
    189191        va_end(apcopy);
    190192#else
     193
    191194        journals_[i]->Printf(pformat, ap);
    192195#endif
     196
    193197      }
    194198    }
  • branches/dev/PDSystemImpl/PDFullSpace/IpPDFullSpaceSolver.cpp

    r427 r428  
    457457                                                 delta_c, delta_d);
    458458        }
    459         else if (retval==SYMSOLVER_WRONG_INERTIA &&
    460                 augSysSolver_->NumberOfNegEVals() < numberOfEVals) {
    461           Jnlst().Printf(J_DETAILED, J_LINEAR_ALGEBRA,
    462                         "Number of negative eigenvalues too small!\n");
    463           // If the number of negative eigenvalues is too small, then
    464           // we first try to remedy this by asking for better quality
    465           // solution (e.g. increasing pivot tolerance), and if that
    466           // doesn't help, we assume that the system is singular
    467           bool assume_singular = true;
    468           if (!augsys_improved_) {
    469             Jnlst().Printf(J_DETAILED, J_LINEAR_ALGEBRA,
    470                            "Asking augmented system solver to improve quality of its solutions.\n");
    471             augsys_improved_ = augSysSolver_->IncreaseQuality();
    472             if (augsys_improved_) {
    473               IpData().Append_info_string("q");
    474               resolve_with_better_quality = true;
    475               assume_singular = false;
    476             }
    477             else {
    478               Jnlst().Printf(J_DETAILED, J_LINEAR_ALGEBRA,
    479                              "Quality could not be improved\n");
    480             }
    481           }
    482           if (assume_singular) {
    483             perturbHandler_->PerturbForSingularity(delta_x, delta_s,
    484                                                    delta_c, delta_d);
    485             IpData().Append_info_string("M");
    486           }
    487         }
     459        else if (retval==SYMSOLVER_WRONG_INERTIA &&
     460                augSysSolver_->NumberOfNegEVals() < numberOfEVals) {
     461          Jnlst().Printf(J_DETAILED, J_LINEAR_ALGEBRA,
     462                        "Number of negative eigenvalues too small!\n");
     463          // If the number of negative eigenvalues is too small, then
     464          // we first try to remedy this by asking for better quality
     465          // solution (e.g. increasing pivot tolerance), and if that
     466          // doesn't help, we assume that the system is singular
     467          bool assume_singular = true;
     468          if (!augsys_improved_) {
     469            Jnlst().Printf(J_DETAILED, J_LINEAR_ALGEBRA,
     470                           "Asking augmented system solver to improve quality of its solutions.\n");
     471            augsys_improved_ = augSysSolver_->IncreaseQuality();
     472            if (augsys_improved_) {
     473              IpData().Append_info_string("q");
     474              resolve_with_better_quality = true;
     475              assume_singular = false;
     476            }
     477            else {
     478              Jnlst().Printf(J_DETAILED, J_LINEAR_ALGEBRA,
     479                             "Quality could not be improved\n");
     480            }
     481          }
     482          if (assume_singular) {
     483            perturbHandler_->PerturbForSingularity(delta_x, delta_s,
     484                                                   delta_c, delta_d);
     485            IpData().Append_info_string("M");
     486          }
     487        }
    488488        else if (retval==SYMSOLVER_WRONG_INERTIA ||
    489489                 retval==SYMSOLVER_SINGULAR) {
  • branches/dev/PDSystemImpl/PDFullSpace/IpPardisoSolverInterface.cpp

    r427 r428  
    259259      Jnlst().Printf(J_DETAILED, J_LINEAR_ALGEBRA,
    260260                     "Wrong inertia: required are %d, but we got %d.\n",
    261                      numberOfNegEVals, negevals_);
     261                     numberOfNegEVals, negevals_);
    262262      return SYMSOLVER_WRONG_INERTIA;
    263263    }
Note: See TracChangeset for help on using the changeset viewer.