Ignore:
Timestamp:
Dec 10, 2009 7:29:38 PM (10 years ago)
Author:
lou
Message:

Mark #if 0 with JJF_ZERO and #if 1 with JJF_ONE as a historical reference
point.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/sandbox/Cbc/src/Cbc_ampl.cpp

    r1361 r1393  
    159159// strdup used to avoid g++ compiler warning
    160160static SufDecl suftab[] = {
    161 #if 0
     161#ifdef JJF_ZERO
    162162    { const_cast<char*>("current"), 0, ASL_Sufkind_con | ASL_Sufkind_outonly },
    163163    { const_cast<char*>("current"), 0, ASL_Sufkind_var | ASL_Sufkind_outonly },
     
    182182    { const_cast<char*>("sstatus"), 0, ASL_Sufkind_con, 0 },
    183183    { const_cast<char*>("upPseudocost"), 0, ASL_Sufkind_var | ASL_Sufkind_real }
    184 #if 0
     184#ifdef JJF_ZERO
    185185    { const_cast<char*>("unbdd"), 0, ASL_Sufkind_var | ASL_Sufkind_outonly},
    186186    { const_cast<char*>("up"), 0, ASL_Sufkind_con | ASL_Sufkind_outonly },
     
    525525            /* all slack basis */
    526526            // leave status for output */
    527 #if 0
     527#ifdef JJF_ZERO
    528528            free(info->rowStatus);
    529529            info->rowStatus = NULL;
     
    785785    }
    786786}
    787 #if 0
     787#ifdef JJF_ZERO
    788788static real
    789789qterm(ASL *asl, fint *colq, fint *rowq, real *delsq)
     
    893893            if (nsos) {
    894894                abort();
    895 #if 0
     895#ifdef JJF_ZERO
    896896                info->numberSos = nsos;
    897897                info->sosType = (char *) malloc(nsos);
     
    976976            /* all slack basis */
    977977            // leave status for output */
    978 #if 0
     978#ifdef JJF_ZERO
    979979            free(rowStatus);
    980980            rowStatus = NULL;
     
    13461346                    continue;
    13471347                }
    1348 #if 0
     1348#ifdef JJF_ZERO
    13491349                printf("%d quadratic els\n", nels);
    13501350                for (int j = 0; j < n_var; j++) {
Note: See TracChangeset for help on using the changeset viewer.