Changeset 14


Ignore:
Timestamp:
Jul 19, 2006 2:04:34 PM (13 years ago)
Author:
pbonami
Message:

Fix doxygen.conf
Some forgotten options

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Bonmin/doc/options.tex

    r6 r14  
    221221
    222222
     223\paragraph{warm_start}
     224Select the warm start method. Possible values:
     225\begin{itemize}
     226 \item {\tt none}: no warm start,
     227\item {\tt optimum}: warm start with direct parent optimum",
     228\item {\tt interior_point}: Warm start with an interior point of direct parent".
     229\end{itemize}
     230The default value is {\tt optimum}.
    223231
    224232\subsection{\Bonmin\ options for robustness}
  • trunk/Bonmin/experimental/FP/FP.cpp

    r1 r14  
    5252           std::string* nl_file_content /* = NULL */):AmplTMINLP()
    5353           {
    54                std::cout<<"Toto"<<std::endl;
    5554               Initialize2(jnlst, options, argv, suffix_handler,
    5655               appName, nl_file_content);
  • trunk/Bonmin/src/Apps/bonmin.cpp

    r1 r14  
    143143    std::cout<<pbName<<" \t";
    144144    std::string message;
     145    std::string status;
    145146    if(bb.mipStatus()==BonminBB::FeasibleOptimal) {
    146       std::cout<<"\t\"Finished\"\t";
     147      status = "\t\"Finished\"";
    147148      message = "\nbonmin: Optimal";
    148149    }
    149150    else if(bb.mipStatus()==BonminBB::ProvenInfeasible) {
    150       std::cout<<"\t\"Finished\"\t";
     151      status = "\t\"Finished\"";
    151152      message = "\nbonmin: Infeasible problem";
    152153    }
    153154    else if(bb.mipStatus()==BonminBB::Feasible) {
    154       std::cout<<"\t\"Not finished\""<<"\t";
     155      status = "\t\"Not finished\"";
    155156      message = "\n Optimization not finished.";
    156157    }
    157158    else if(bb.mipStatus()==BonminBB::NoSolutionKnown) {
    158       std::cout<<"\t\"Not finished\""<<"\t";
     159      status = "\t\"Not finished\"";
    159160      message = "\n Optimization not finished.";
    160161    }
    161     std::cout<<CoinCpuTime()-time1<<"\t"
     162
     163  if(0)// To output a line for building tables
     164    std::cout<<status<<"\t"<<CoinCpuTime()-time1<<"\t"
    162165             <<bb.bestObj()<<"\t"
    163166             <<bb.numNodes()<<"\t"
  • trunk/doxydoc/doxygen.conf

    r1 r14  
    118118WARN_LOGFILE           =
    119119
    120 INPUT                  = Bonmin/src Bonmin/test/MyBonmin.cpp
     120INPUT                  = . Bonmin/examples/CppExample/MyBonmin.cpp
    121121
    122122FILE_PATTERNS          = *.hpp *.h
Note: See TracChangeset for help on using the changeset viewer.