|
|
@2400
|
2 years |
stefan |
use Cbc's own get.dependencies.sh; remove upload to bintray for now
|
|
|
@2399
|
2 years |
stefan |
eliminate CYGPATH_W from -I flags; rerun autotools
|
|
|
@2396
|
2 years |
stefan |
update travis file
|
|
|
@2395
|
2 years |
stefan |
add get.dependencies.sh and compile; remove check for …
|
|
|
@2394
|
2 years |
stefan |
update Dependencies
|
|
|
@2393
|
2 years |
stefan |
clear out base directory
|
|
|
@2391
|
2 years |
lou |
Fix up handling of nauty now that COIN_CHK_LIB has a functioning link …
|
|
|
@2390
|
2 years |
lou |
Bring Cbc into the autotools-update world. Rough, many options untested.
|
|
|
@2389
|
2 years |
lou |
Create autotools-update branch from current trunk.
|
|
|
@1542
|
10 years |
stefan |
remove old split branch
|
|
|
@1463
|
11 years |
stefan |
rerun autotools; move some code from OsiConfig?.h to CbcConfig?.h
|
|
|
@1448
|
11 years |
stefan |
rerun autotools
|
|
|
@1447
|
11 years |
stefan |
change dependency to CoinUtils?/trunk
|
|
|
@1446
|
11 years |
stefan |
switch to BuildTools?/trunk; rerun autotools
|
|
|
@1445
|
11 years |
stefan |
use advanced COIN_HAS_MODULE macro; setup addlibs file from .pc file; …
|
|
|
@1444
|
11 years |
stefan |
use new fallback macro; do not use COIN_HAS_PROJECT anymore
|
|
|
@1439
|
11 years |
stefan |
add OsiCbc?
|
|
|
@1438
|
11 years |
stefan |
add no pkg-config fallback (not tested)
|
|
|
@1437
|
11 years |
stefan |
use pkg-config to find dependencies
|
|
|
@1436
|
11 years |
stefan |
create split branch from trunk
|
|
|
@1422
|
11 years |
tkr |
Moving branches/sandbox/ to trunk/
|
|
|
@1421
|
11 years |
tkr |
Moving current trunk to tags
|
|
|
@1420
|
11 years |
forrest |
fix if integers have very large coefficients
|
|
|
@1412
|
11 years |
forrest |
try and modularize threads
|
|
|
@1410
|
11 years |
stefan |
give up waiting and fix externals by myself
|
|
|
@1409
|
11 years |
forrest |
first attempt at cleaning up threads
|
|
|
@1406
|
11 years |
forrest |
fix memory leak
|
|
|
@1405
|
11 years |
bjarni |
Added CbcThread?.cpp to libCbc.vcproj for Visual Studio 2008 (v9) to …
|
|
|
@1404
|
11 years |
forrest |
preliminary changes for cleaning up threads and smaller CbcModel? methods
|
|
|
@1401
|
11 years |
lou |
A final commit to make it clear that CbcSolver? is an unused class in …
|
|
|
@1400
|
11 years |
lou |
Add a final blank line; hudson test server seems to want it.
|
|
|
@1399
|
11 years |
bjarni |
Updated Makefile.am in sandbox adding CbcSolverExpandKnapsack?.cpp (and …
|
|
|
@1398
|
11 years |
bjarni |
Extracted expandKnapsack() from CbcSolver?.cpp and placed it in …
|
|
|
@1397
|
11 years |
tkr |
Updating externals
|
|
|
@1396
|
11 years |
bjarni |
Update Makefile.am to add CbcSolverAnalyze?.cpp (and .hpp)
|
|
|
@1395
|
11 years |
bjarni |
Extracted analyze() from CbcSolver?.cpp and placed it in …
|
|
|
@1394
|
11 years |
bjarni |
Moving global variables CbcOrClpRead_mode, CbcOrClpReadCommand?, …
|
|
|
@1393
|
11 years |
lou |
Mark #if 0 with JJF_ZERO and #if 1 with JJF_ONE as a historical …
|
|
|
@1392
|
11 years |
lou |
Fix increase in time (incorrect parameter to doHeuristic).
|
|
|
@1391
|
11 years |
lou |
Add comments for callCbc, callCbc1 shells.
|
|
|
@1390
|
11 years |
lou |
Remove CPX_KEEP_RESULT. Use CBC_OTHER_SOLVER = 1.
|
|
|
@1389
|
11 years |
caphillSNL |
Start at adding documentation, removing magic numbers, removing dead …
|
|
|
@1388
|
11 years |
bjarni |
Added CbcLinkedUtils?.cpp and removed ClpAmplStuff?.cpp from …
|
|
|
@1387
|
11 years |
lou |
This commit removes remaining code associated with NEW_STYLE_SOLVER. …
|
|
|
@1386
|
11 years |
lou |
Yet another try at cleaning CbcSolver?. This is an intermediate commit …
|
|
|
@1385
|
11 years |
bjarni |
Updated Makefile.am to add CbcSolverHeuristics?.cpp/.hpp and ran autotools
|
|
|
@1384
|
11 years |
bjarni |
Updated libCbc.vcproj in Visual Studio 2008 (v9) to include …
|
|
|
@1383
|
11 years |
bjarni |
Extracted crunchIt, fixVubs, doHeuristics from CbcSolver?.cpp and …
|
|
|
@1381
|
11 years |
lou |
Revert CbcSolver?.cpp. Complications due to ASL require more careful …
|
|
|
@1380
|
11 years |
mjs |
CbcMain? deleted.
|
|
|
@1379
|
11 years |
lou |
This should have been deleted. Try again and see if it'll stay dead.
|
|
|
@1377
|
11 years |
lou |
Removed all code related to NEW_STYLE_SOLVER from CbcSolver?. A few …
|
|
|
@1376
|
11 years |
tkr |
Changing externals to new stable versions
|
|
|
@1375
|
11 years |
bjarni |
Remove Data/Netlib? and Data/miplib3 from externals property for sandbox
|
|
|
@1374
|
11 years |
bjarni |
Renamed all CbcGenXXXX.cpp_lou back to CbcGenXXXX.cpp (same for .hpp) …
|
|
|
@1373
|
11 years |
bjarni |
Renamed parameter constants in CbcParam?, CbcSolver?, and ClpAmplStuff? …
|
|
|
@1372
|
11 years |
bjarni |
The option 'Wp64' has been deprecated and will be removed in a future …
|
|
|
@1371
|
11 years |
bjarni |
The option 'Wp64' has been deprecated and will be removed in a future …
|
|
|
@1370
|
11 years |
dfylstra |
|
|
|
@1369
|
11 years |
dfylstra |
|
|
|
@1368
|
11 years |
EdwinStraver |
Broke out CbcHeuristicRENS, CbcHeuristicDINS and CbcHeuristicVND out …
|
|
|
@1367
|
11 years |
bjarni |
Remove CbcGenCtlBlk?.cpp and CbcGenMessage?.cpp from CbcLib?.vcproj in VS …
|
|
|
@1366
|
11 years |
EdwinStraver |
Added Lou's comments
|
|
|
@1365
|
11 years |
dfylstra |
|
|
|
@1364
|
11 years |
EdwinStraver |
Added comments from Lou
|
|
|
@1363
|
11 years |
dfylstra |
Updated (conservatively) for work through Dec 4.
|
|
|
@1362
|
11 years |
EdwinStraver |
added Lou's comments
|
|
|
@1361
|
11 years |
bjarni |
Added Lou's annotations to Cbc_ampl.cpp, CbcSolver?.cpp, CbcSolver?.hpp, …
|
|
|
@1360
|
11 years |
dfylstra |
Updated (conservatively) for work through Dec 4.
|
|
|
@1359
|
11 years |
forrest |
out printf
|
|
|
@1358
|
11 years |
bjarni |
Removing AStyle sample test files from few weeks ago
|
|
|
@1357
|
11 years |
coin |
run 'astyle -A4 -p' and dos2unix
|
|
|
@1356
|
11 years |
EdwinStraver |
Added some comments from Lou
|
|
|
@1355
|
11 years |
coin |
reformatted with 'astyle -A4 -p'
|
|
|
@1354
|
11 years |
bjarni |
Renamed all CbcGenXXXX.cpp to CbcGenXXXX.cpp_lou (same for .hpp) so …
|
|
|
@1353
|
11 years |
bjarni |
Removed CbcGenCtlBlk?.cpp and CbcGenMessages?.cpp from libCbc.vcproj in …
|
|
|
@1352
|
11 years |
bjarni |
Removed CbcGeneric? project from solution Cbc.sln in Visual Studio 2008 (v9)
|
|
|
@1351
|
11 years |
EdwinStraver |
Combined CbcBranchDynamic?.cpp with CbcDynamicPseudoCostBranchingObject? …
|
|
|
@1350
|
11 years |
EdwinStraver |
Combined CbcSOS with CbcSOSBranchingObject
Combined CbcNWay with …
|
|
|
@1349
|
11 years |
bjarni |
Added Data/Netlib? and Data/miplib3 to externals property for sandbox
|
|
|
@1348
|
11 years |
dfylstra |
Updated to reflect recombined source files, more source files …
|
|
|
@1347
|
11 years |
EdwinStraver |
Combined CbcSimpleInteger? and CbcIntegerBranchingObject?
Combined …
|
|
|
@1346
|
11 years |
EdwinStraver |
Combined CbcGeneralDepth?, CbcGeneralBranchingObject? and …
|
|
|
@1345
|
11 years |
bjarni |
Added Data/Netlib? and Data/miplib3 to Externals for sandbox
|
|
|
@1344
|
11 years |
EdwinStraver |
Combined CbcClique? with CbcCliqueBranchingObject? and …
|
|
|
@1343
|
11 years |
dfylstra |
Removed (via #ifdef 0) class CbcTreeArray? and CbcNewTree? - not used …
|
|
|
@1342
|
11 years |
dfylstra |
Removed (via #ifdef 0) class CbcTreeArray? and CbcNewTree? - not used …
|
|
|
@1341
|
11 years |
EdwinStraver |
Removed CbcTreeArray? code
|
|
|
@1340
|
11 years |
EdwinStraver |
Fixed yesterday's bugs
|
|
|
@1339
|
11 years |
dfylstra |
Just a comment to clarify genFlags = 63;
|
|
|
@1338
|
11 years |
ladanyi |
temporarily exclude broken code for parallel cbc
|
|
|
@1337
|
11 years |
bjarni |
Add static_cast<unsigned int> for time(NULL) to avoid MSVC warnings …
|
|
|
@1336
|
11 years |
bjarni |
Changed strdup to CoinStrdup? to avoid POSIX name deprecated warnings …
|
|
|
@1335
|
11 years |
bjarni |
Check CoinFindSeparator? and set Windows directory to …
|
|
|
@1334
|
11 years |
bjarni |
Changed the default directories to ..\..\..\..\Data\Sample for Windows …
|
|
|
@1333
|
11 years |
bjarni |
New CbcSourceFilesTable2.xls (and .csv) with Dan/Edwin/Bjarni? assigned …
|
|
|
@1332
|
11 years |
EdwinStraver |
Further breakouts from branchAndBound()
|
|
|
@1331
|
11 years |
forrest |
microsft compiler warnings
|
|
|
@1330
|
11 years |
EdwinStraver |
Broke a few routines out of branchAndBound routine.
|
|
|
@1329
|
11 years |
bjarni |
New CbcSourceFilesTable2.xls (and .csv) with minor updates
|
|
|