source: branches

Revision Log Mode:


Legend:

Added
Modified
Copied or renamed
Diff Rev Age Author Log Message
(edit) @1304   11 years lou Merge Cbc/trunk r1262:1270 to sync with stable/2.4 (created at r1270).
(edit) @1303   11 years EdwinStraver Updated csv and xls with latest modifications
(edit) @1302   11 years EdwinStraver Added new files for breakup of CbcBranchBase?
(edit) @1301   11 years EdwinStraver Broke up the objects form CbcBranchBase?
(edit) @1300   11 years bjarni Added CbcSourceFilesTable? and CbcSourceFilesTable2 (separate objects …
(edit) @1299   11 years bjarni Final fix on the Makefile.am, now sandbox compiles ok
(edit) @1298   11 years bjarni Renamed CbcClique?.hpp to .cpp in Makefile.am
(edit) @1297   11 years bjarni Another missing / in Makefile.am
(edit) @1296   11 years bjarni uploading new Cbc/src/Makefile.am and Makefile.in
(edit) @1295   11 years EdwinStraver Error in make file
(edit) @1294   11 years EdwinStraver With changes for the breakup of CbcBranchActual?
(edit) @1293   11 years EdwinStraver
(edit) @1292   11 years bjarni Add CbcChooseVariable?.hpp and CbcCompare?.hpp to Makefile.am in the sandbox
(edit) @1291   11 years bjarni Add CbcCompare?.hpp and CbcChooseVariable?.hpp to libCbc.vcproj in the …
(edit) @1290   11 years bjarni Extract classes CbcCompare? and CbcChooseVariable? from …
(edit) @1289   11 years bjarni Remove extra Bjarni
(edit) @1288   11 years bjarni Recommitting (rev 1277) CbcModel_stro3.cpp and CbcModel_stro2.cpp to …
(edit) @1287   11 years bjarni Recommitting (rev 1276) Astyle formatting options based on ansi (A1), …
(edit) @1286   11 years EdwinStraver Changed formatting using AStyle -A4 -p
(edit) @1284   11 years bjarni Deleted CbcSourceFilesTable? files from the reeng top-level folder.
(edit) @1283   11 years bjarni Added CbcSourceFilesTable? both in CSV and XLS formats to reeng\Cbc
(edit) @1282   11 years bjarni CbcSourceFilesTable? both in CSV and XLS formats.
(edit) @1281   11 years bjarni Applying the Astyle formatting option pad-oper (-p) to all the source …
(edit) @1280   11 years bjarni Applying the Astyle formatting option Stroustrup (-A4) to all the …
(edit) @1279   11 years bjarni Astyle conversion with --pad-oper (-p) to add consistent padding …
(edit) @1278   11 years bjarni Astyle conversion with --pad-oper (-p) to add consistent padding …
(edit) @1277   11 years bjarni Added CbcModel_stro3.cpp and CbcModel_stro2.cpp to confirm we can set …
(edit) @1276   11 years bjarni Add Astyle formatting options based on ansi (A1), k&r (A3), stroustrup …
(edit) @1275   11 years bjarni Test commit from Bjarni
(edit) @1273   11 years tkr Adding new branches and tags
(edit) @1272   11 years tkr Removing reeng branch
(edit) @1265   11 years lou BUILDABLE. Fold in additional comments (in varying amount) for about …
(edit) @1264   11 years lou NOT BUILDABLE! Temporary branch to hold a version of cbc trunk with a …
(edit) @1263   11 years lou Sync with cbc trunk r1262.
(edit) @1260   11 years EdwinStraver Another test
(edit) @1259   11 years EdwinStraver Test
(edit) @1256   11 years tkr Adding branch for reengineering effort
(edit) @1109   12 years mahdi test
(edit) @1106   12 years rlh creating copy of trunk for joint development of RandRound? and PivotAndFix?
(edit) @1021   12 years jpgoncal Added methods to delete nodes above the current node.
(edit) @1001   12 years jpgoncal The boounds of the parent were not changed when the grandparent was …
(edit) @999   12 years jpgoncal fixed getTree()
(edit) @998   12 years jpgoncal getTree was not working if there was a node deleted. Now it tests for …
(edit) @997   12 years jpgoncal removed printout from clp.
(edit) @996   12 years ladanyi
(edit) @995   12 years ladanyi seems to work
(edit) @994   12 years ladanyi
(edit) @993   12 years ladanyi works???
(edit) @992   12 years ladanyi one more bug…
(edit) @991   12 years ladanyi one more check…
(edit) @990   12 years ladanyi one step closer…
(edit) @989   12 years ladanyi still not there…
(edit) @988   12 years ladanyi still not there…
(edit) @987   12 years jpgoncal fixed the bounds of GP and its descendants.
(edit) @986   12 years jpgoncal added a few things in the printout for debugging.
(edit) @985   12 years ladanyi slowly debugging
(edit) @981   12 years jpgoncal Added print statements for debugging.
(edit) @980   12 years ladanyi works properly on p0033.mps, though does not save any nodes…
(edit) @977   12 years ladanyi shared libs should be found now
(edit) @976   12 years ladanyi seems to work if FUNNY_BRANCHING is not defined
(edit) @975   12 years ladanyi
(edit) @974   12 years ladanyi
(edit) @973   12 years ladanyi
(edit) @972   12 years ladanyi
(edit) @971   12 years ladanyi change how way is set. its value is now the currently processed child …
(edit) @970   12 years jpgoncal Added function to do move.
(edit) @969   12 years jpgoncal Added variables to store children of a node.
(edit) @967   12 years ladanyi
(edit) @966   12 years ladanyi added -lOsiClp
(edit) @965   12 years jpgoncal Copied code from OsiClpSolverInterface?.
(edit) @963   12 years ladanyi set up the dir for working on dynamic branching
(edit) @962   12 years ladanyi Create branch to code dynamic branching
(edit) @949   12 years ladanyi Creating a new branch to make threaded version fast.
(edit) @911   12 years ladanyi
(edit) @910   12 years ladanyi change usage of pow() and log() to appease MSVC++
(edit) @909   12 years ladanyi added new files to the MSVC++ project files
(edit) @908   12 years jpgoncal Ran autotools and configure changed/
(edit) @907   12 years jpgoncal Add new files.
(edit) @906   12 years jpgoncal Merged with changes done in trunk
(edit) @901   13 years jpgoncal latest version with random choice.
(edit) @898   13 years ladanyi fixed previousBranch() for a couple of branching object types. still …
(edit) @897   13 years ladanyi evenly distributed heur invocation doesn't crash
(edit) @896   13 years ladanyi added debug info
(edit) @895   13 years jpgoncal Store branching object in CbcNOdeInfo.
(edit) @894   13 years jpgoncal header.
(edit) @893   13 years jpgoncal Added function to print info.
(edit) @891   13 years jpgoncal Added gutsOfConstructor in CbcHeuristicNode?.
(edit) @890   13 years jpgoncal Small changes in CbcHeuristicNode?.
(edit) @889   13 years ladanyi code to decide when to run heuristics is done and compiles, need to debug
(edit) @886   13 years ladanyi Added a new way of determinig when to run a heuristic
(edit) @885   13 years jpgoncal Cleaned up a little bit.
(edit) @884   13 years jpgoncal Draft code for heuristic to control heuristics.
(edit) @883   13 years jpgoncal Create a branch to work with the heuristics.
(edit) @878   13 years ladanyi creating a branch to experiment with common search tree class
(edit) @766   13 years andreasw deleting temporary BSP branch
(edit) @764   13 years ladanyi committing merging w/ trunk of Clp, Osi, Cbc
(edit) @763   13 years andreasw unded [762] and moved CbcCbcParam?.cpp from libCbc to libCbcSolver
(edit) @762   13 years tkr Fixing dependence of libCbc on libCbcSolver
(edit) @761   13 years andreasw moved all ASL dependent code into new installable library libCbcSolver
(edit) @757   13 years andreasw allow --enable-doscompile on MinGW/MSys
Note: See TracRevisionLog for help on using the revision log.