Changeset 548


Ignore:
Timestamp:
Oct 24, 2005 11:26:04 AM (14 years ago)
Author:
andreasw
Message:
Location:
branches/dev/Algorithm
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/dev/Algorithm/IpIpoptAlg.cpp

    r546 r548  
    386386      if (adjusted_slacks==1) {
    387387        Jnlst().Printf(J_WARNING, J_MAIN,
    388                        "In iteration $d, %d Slack too small, adjusting variable bound\n",
     388                       "In iteration %d, %d Slack too small, adjusting variable bound\n",
    389389                       IpData().iter_count(), adjusted_slacks);
    390390      }
    391391      else {
    392392        Jnlst().Printf(J_WARNING, J_MAIN,
    393                        "In iteration $d, %d Slacks too small, adjusting variable bounds\n",
     393                       "In iteration %d, %d Slacks too small, adjusting variable bounds\n",
    394394                       IpData().iter_count(), adjusted_slacks);
    395395      }
  • branches/dev/Algorithm/LinearSolvers/IpPardisoSolverInterface.cpp

    r547 r548  
    121121    IPARM_[9] = 12;
    122122    IPARM_[10] = 1;
    123     // Matching information:  IPARM_[12] = 1 seems ok, but results in a 
     123    // Matching information:  IPARM_[12] = 1 seems ok, but results in a
    124124    // large number of pivot perturbation
    125125    // Matching information:  IPARM_[12] = 2 robust,  but more  expensive method
     
    328328        // call, even if the current inertia estimate is correct
    329329        // OLAF MICHAEL : Maybe we need to discuss this
    330         have_symbolic_factorization_ = false;
    331         // We assume now that if there was just a symbolic
    332         // factorization and we still have perturbed pivots, that the
    333         // system is actually singular
    334         if (just_performed_symbolic_factorization) {
     330        have_symbolic_factorization_ = false;
     331        // We assume now that if there was just a symbolic
     332        // factorization and we still have perturbed pivots, that the
     333        // system is actually singular
     334        if (just_performed_symbolic_factorization) {
    335335          IpData().Append_info_string("Ps");
    336336          //break; // Declaring this system singular doesn't seem to be
    337                  // working well???
    338           return SYMSOLVER_SINGULAR;
    339           }
    340         IpData().Append_info_string("Pp");
    341         /*
    342         // If we there were perturbed pivots, and the inertia of the
    343         // system is correct, and we haven't redone the symblic
    344         // factorization during this call yet, trigger a new
    345         // factorization after a symblic factorization
    346         done = (just_performed_symbolic_factorization || !check_NegEVals ||
    347                 numberOfNegEVals==negevals_);
    348         */
    349         done = false;
     337          // working well???
     338          return SYMSOLVER_SINGULAR;
     339        }
     340        IpData().Append_info_string("Pp");
     341        /*
     342               // If we there were perturbed pivots, and the inertia of the
     343               // system is correct, and we haven't redone the symblic
     344               // factorization during this call yet, trigger a new
     345               // factorization after a symblic factorization
     346               done = (just_performed_symbolic_factorization || !check_NegEVals ||
     347                       numberOfNegEVals==negevals_);
     348        */
     349        done = false;
    350350      }
    351351      else {
Note: See TracChangeset for help on using the changeset viewer.