Changeset 1334 for branches


Ignore:
Timestamp:
Dec 2, 2009 7:14:06 PM (9 years ago)
Author:
bjarni
Message:

Changed the default directories to ..\..\..\..\Data\Sample for Windows to accommodate for MSVisualStudio folders

File:
1 edited

Legend:

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

    r1315 r1334  
    409409    } else {
    410410        directory = ".\\";
    411         dirSample = "..\\..\\Data\\Sample\\";
    412         dirNetlib = "..\\..\\Data\\Netlib\\";
    413         dirMiplib = "..\\..\\Data\\miplib3\\";
     411        dirSample = "..\\..\\..\\..\\Data\\Sample\\";
     412        dirNetlib = "..\\..\\..\\..\\Data\\Netlib\\";
     413        dirMiplib = "..\\..\\..\\..\\Data\\miplib3\\";
    414414    }
    415415    std::string defaultDirectory = directory;
     
    31563156    } else {
    31573157        directory = ".\\";
    3158         dirSample = "..\\..\\Data\\Sample\\";
    3159         dirNetlib = "..\\..\\Data\\Netlib\\";
    3160         dirMiplib = "..\\..\\Data\\miplib3\\";
     3158        dirSample = "..\\..\\..\\..\\Data\\Sample\\";
     3159        dirNetlib = "..\\..\\..\\..\\Data\\Netlib\\";
     3160        dirMiplib = "..\\..\\..\\..\\Data\\miplib3\\";
    31613161    }
    31623162    std::string defaultDirectory = directory;
     
    42304230        } else {
    42314231            directory = ".\\";
    4232             dirSample = "..\\..\\Data\\Sample\\";
    4233             dirNetlib = "..\\..\\Data\\Netlib\\";
    4234             dirMiplib = "..\\..\\Data\\miplib3\\";
     4232            dirSample = "..\\..\\..\\..\\Data\\Sample\\";
     4233            dirNetlib = "..\\..\\..\\..\\Data\\Netlib\\";
     4234            dirMiplib = "..\\..\\..\\..\\Data\\miplib3\\";
    42354235        }
    42364236        std::string defaultDirectory = directory;
Note: See TracChangeset for help on using the changeset viewer.