Changeset 255


Ignore:
Timestamp:
Feb 17, 2006 1:37:06 PM (14 years ago)
Author:
forrest
Message:

for ampl

Location:
trunk/Test
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Test/Cbc_ampl.cpp

    r244 r255  
    7474        { "barrier",    checkPhrase,            (char *) xxxxxx ,"-barrier" },
    7575        { "dual",       checkPhrase,            (char *) xxxxxx , "-dualsimplex"},
     76        { "help",       checkPhrase,            (char *) xxxxxx , "-?"},
    7677        { "initial",    checkPhrase,            (char *) xxxxxx , "-initialsolve"},
    7778        { "max",        checkPhrase2,           (char *) xxxxxx , "-maximize"},
    7879        { "maximize",   checkPhrase2,           (char *) xxxxxx , "-maximize"},
    7980        { "primal",     checkPhrase,            (char *) xxxxxx , "-primalsimplex"},
     81        { "quit",       checkPhrase,            (char *) xxxxxx , "-quit"},
    8082        { "wantsol",    WS_val,         NULL, "write .sol file (without -AMPL)" }
    8183        };
  • trunk/Test/CoinSolve.cpp

    r254 r255  
    731731        }
    732732        if (type==GENERALQUERY) {
    733           std::cout<<"In argument list keywords have leading - "
    734             ", -stdin or just - switches to stdin"<<std::endl;
    735           std::cout<<"One command per line (and no -)"<<std::endl;
    736           std::cout<<"abcd? gives list of possibilities, if only one + explanation"<<std::endl;
    737           std::cout<<"abcd?? adds explanation, if only one fuller help"<<std::endl;
    738           std::cout<<"abcd without value (where expected) gives current value"<<std::endl;
    739           std::cout<<"abcd value sets value"<<std::endl;
    740           std::cout<<"Commands are:"<<std::endl;
     733          if (verbose<4&&usingAmpl)
     734            verbose +=4;
     735          if (verbose<4) {
     736            std::cout<<"In argument list keywords have leading - "
     737              ", -stdin or just - switches to stdin"<<std::endl;
     738            std::cout<<"One command per line (and no -)"<<std::endl;
     739            std::cout<<"abcd? gives list of possibilities, if only one + explanation"<<std::endl;
     740            std::cout<<"abcd?? adds explanation, if only one fuller help"<<std::endl;
     741            std::cout<<"abcd without value (where expected) gives current value"<<std::endl;
     742            std::cout<<"abcd value sets value"<<std::endl;
     743            std::cout<<"Commands are:"<<std::endl;
     744          } else {
     745            std::cout<<"Cbc options are set within AMPL with commands like:"<<std::endl<<std::endl;
     746            std::cout<<"         option cbc_options \"cuts=root log=2 feas=on slog=1\""<<std::endl<<std::endl;
     747            std::cout<<"only maximize, dual, primal, help and quit are recognized without ="<<std::endl;
     748          }
    741749          int maxAcross=5;
    742750          if ((verbose%4)!=0)
     
    753761          types.push_back("Branch and Cut actions:");
    754762          int iType;
    755           if (verbose<4&&usingAmpl)
    756             verbose +=4;
    757763          for (iType=0;iType<8;iType++) {
    758764            int across=0;
     765            if ((verbose%4)!=0)
     766              std::cout<<std::endl;
    759767            std::cout<<types[iType]<<std::endl;
    760768            if ((verbose&2)!=0)
     
    785793                      std::cout<<"---- description"<<std::endl;
    786794                      parameters[iParam].printLongHelp();
    787                       std::cout<<"----"<<std::endl;
     795                      std::cout<<"----"<<std::endl<<std::endl;
    788796                    }
    789797                  } else {
Note: See TracChangeset for help on using the changeset viewer.