first commit to be able to make more modifications

jamesjer · May 11, 2006 · 919b0e6 · 919b0e6
1 parent af08551
commit 919b0e6
Show file tree

Hide file tree

Showing 106 changed files with 11,195 additions and 156 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1 +1,8 @@
 * text=auto !eol
+/Externals -text
+/config.guess -text
+/config.sub -text
+/configure.ac -text
+/depcomp -text
+/install-sh -text
+/missing -text
diff --git a/Externals b/Externals
@@ -0,0 +1,6 @@
+BuildTools    https://www.coin-or.org/svn/BuildTools/trunk
+Data/Netlib   https://www.coin-or.org/svn/Data/trunk/Netlib
+Data/Sample   https://www.coin-or.org/svn/Data/trunk/Sample
+CoinBase      https://www.coin-or.org/svn/CoinBase/trunk/CoinBase
+Clp           https://www.coin-or.org/svn/Clp/trunk/Clp
+Vol           https://www.coin-or.org/svn/Vol/trunk/Vol
diff --git a/Makefile b/Makefile
diff --git a/Makefile.Osi b/Makefile.Osi
diff --git a/AUTHORS → Osi/AUTHORS b/AUTHORS → Osi/AUTHORS
diff --git a/INSTALL → Osi/INSTALL b/INSTALL → Osi/INSTALL
diff --git a/TODO → Osi/TODO b/TODO → Osi/TODO
diff --git a/OsiAuxInfo.cpp → Osi/src/OsiAuxInfo.cpp b/OsiAuxInfo.cpp → Osi/src/OsiAuxInfo.cpp
diff --git a/include/OsiAuxInfo.hpp → Osi/src/OsiAuxInfo.hpp b/include/OsiAuxInfo.hpp → Osi/src/OsiAuxInfo.hpp
diff --git a/OsiCbc/Makefile → Osi/src/OsiCbc/Makefile b/OsiCbc/Makefile → Osi/src/OsiCbc/Makefile
diff --git a/OsiCbc/Makefile.lightweight → Osi/src/OsiCbc/Makefile.lightweight b/OsiCbc/Makefile.lightweight → Osi/src/OsiCbc/Makefile.lightweight
diff --git a/OsiCbc/OsiCbcSolverInterface.cpp → Osi/src/OsiCbc/OsiCbcSolverInterface.cpp b/OsiCbc/OsiCbcSolverInterface.cpp → Osi/src/OsiCbc/OsiCbcSolverInterface.cpp
diff --git a/OsiCbc/include/OsiCbcSolverInterface.hpp → .../OsiCbc/include/OsiCbcSolverInterface.hpp b/OsiCbc/include/OsiCbcSolverInterface.hpp → .../OsiCbc/include/OsiCbcSolverInterface.hpp
diff --git a/OsiClp/AUTHORS → Osi/src/OsiClp/AUTHORS b/OsiClp/AUTHORS → Osi/src/OsiClp/AUTHORS
diff --git a/OsiClp/Makefile → Osi/src/OsiClp/Makefile b/OsiClp/Makefile → Osi/src/OsiClp/Makefile
diff --git a/OsiClp/OsiClpSolverInterface.cpp → Osi/src/OsiClp/OsiClpSolverInterface.cpp b/OsiClp/OsiClpSolverInterface.cpp → Osi/src/OsiClp/OsiClpSolverInterface.cpp
diff --git a/OsiClp/include/OsiClpParamMap.hpp → Osi/src/OsiClp/include/OsiClpParamMap.hpp b/OsiClp/include/OsiClpParamMap.hpp → Osi/src/OsiClp/include/OsiClpParamMap.hpp
diff --git a/OsiClp/include/OsiClpSolverInterface.hpp → .../OsiClp/include/OsiClpSolverInterface.hpp b/OsiClp/include/OsiClpSolverInterface.hpp → .../OsiClp/include/OsiClpSolverInterface.hpp
diff --git a/OsiColCut.cpp → Osi/src/OsiColCut.cpp b/OsiColCut.cpp → Osi/src/OsiColCut.cpp
diff --git a/include/OsiColCut.hpp → Osi/src/OsiColCut.hpp b/include/OsiColCut.hpp → Osi/src/OsiColCut.hpp
diff --git a/include/OsiCollections.hpp → Osi/src/OsiCollections.hpp b/include/OsiCollections.hpp → Osi/src/OsiCollections.hpp
diff --git a/OsiCpx/Makefile → Osi/src/OsiCpx/Makefile b/OsiCpx/Makefile → Osi/src/OsiCpx/Makefile
diff --git a/OsiCpx/OsiCpxSolverInterface.cpp → Osi/src/OsiCpx/OsiCpxSolverInterface.cpp b/OsiCpx/OsiCpxSolverInterface.cpp → Osi/src/OsiCpx/OsiCpxSolverInterface.cpp
diff --git a/OsiCpx/include/OsiCpxSolverInterface.hpp → .../OsiCpx/include/OsiCpxSolverInterface.hpp b/OsiCpx/include/OsiCpxSolverInterface.hpp → .../OsiCpx/include/OsiCpxSolverInterface.hpp
diff --git a/OsiCut.cpp → Osi/src/OsiCut.cpp b/OsiCut.cpp → Osi/src/OsiCut.cpp
diff --git a/include/OsiCut.hpp → Osi/src/OsiCut.hpp b/include/OsiCut.hpp → Osi/src/OsiCut.hpp
diff --git a/OsiCuts.cpp → Osi/src/OsiCuts.cpp b/OsiCuts.cpp → Osi/src/OsiCuts.cpp
diff --git a/include/OsiCuts.hpp → Osi/src/OsiCuts.hpp b/include/OsiCuts.hpp → Osi/src/OsiCuts.hpp
diff --git a/OsiDylp/AUTHORS → Osi/src/OsiDylp/AUTHORS b/OsiDylp/AUTHORS → Osi/src/OsiDylp/AUTHORS
diff --git a/OsiDylp/Makefile → Osi/src/OsiDylp/Makefile b/OsiDylp/Makefile → Osi/src/OsiDylp/Makefile
diff --git a/OsiDylp/OsiDylpMessages.cpp → Osi/src/OsiDylp/OsiDylpMessages.cpp b/OsiDylp/OsiDylpMessages.cpp → Osi/src/OsiDylp/OsiDylpMessages.cpp
diff --git a/OsiDylp/OsiDylpPresolve.cpp → Osi/src/OsiDylp/OsiDylpPresolve.cpp b/OsiDylp/OsiDylpPresolve.cpp → Osi/src/OsiDylp/OsiDylpPresolve.cpp
diff --git a/OsiDylp/OsiDylpSolverInterface.cpp → Osi/src/OsiDylp/OsiDylpSolverInterface.cpp b/OsiDylp/OsiDylpSolverInterface.cpp → Osi/src/OsiDylp/OsiDylpSolverInterface.cpp
diff --git a/OsiDylp/OsiDylpWarmStartBasis.cpp → Osi/src/OsiDylp/OsiDylpWarmStartBasis.cpp b/OsiDylp/OsiDylpWarmStartBasis.cpp → Osi/src/OsiDylp/OsiDylpWarmStartBasis.cpp
diff --git a/OsiDylp/include/OsiDylpMessages.hpp → Osi/src/OsiDylp/include/OsiDylpMessages.hpp b/OsiDylp/include/OsiDylpMessages.hpp → Osi/src/OsiDylp/include/OsiDylpMessages.hpp
diff --git a/OsiDylp/include/OsiDylpSolverInterface.hpp → ...siDylp/include/OsiDylpSolverInterface.hpp b/OsiDylp/include/OsiDylpSolverInterface.hpp → ...siDylp/include/OsiDylpSolverInterface.hpp
diff --git a/OsiDylp/include/OsiDylpWarmStartBasis.hpp → ...OsiDylp/include/OsiDylpWarmStartBasis.hpp b/OsiDylp/include/OsiDylpWarmStartBasis.hpp → ...OsiDylp/include/OsiDylpWarmStartBasis.hpp
diff --git a/include/OsiFactorization2.ipp → Osi/src/OsiFactorization2.ipp b/include/OsiFactorization2.ipp → Osi/src/OsiFactorization2.ipp
diff --git a/OsiFmp/Makefile → Osi/src/OsiFmp/Makefile b/OsiFmp/Makefile → Osi/src/OsiFmp/Makefile
diff --git a/OsiFmp/OsiFmpSolverInterface.cpp → Osi/src/OsiFmp/OsiFmpSolverInterface.cpp b/OsiFmp/OsiFmpSolverInterface.cpp → Osi/src/OsiFmp/OsiFmpSolverInterface.cpp
diff --git a/OsiFmp/include/OsiFmpSolverInterface.hpp → .../OsiFmp/include/OsiFmpSolverInterface.hpp b/OsiFmp/include/OsiFmpSolverInterface.hpp → .../OsiFmp/include/OsiFmpSolverInterface.hpp
diff --git a/OsiGlpk/Makefile → Osi/src/OsiGlpk/Makefile b/OsiGlpk/Makefile → Osi/src/OsiGlpk/Makefile
diff --git a/OsiGlpk/OsiGlpkSolverInterface.cpp → Osi/src/OsiGlpk/OsiGlpkSolverInterface.cpp b/OsiGlpk/OsiGlpkSolverInterface.cpp → Osi/src/OsiGlpk/OsiGlpkSolverInterface.cpp
diff --git a/OsiGlpk/include/OsiGlpkSolverInterface.hpp → ...siGlpk/include/OsiGlpkSolverInterface.hpp b/OsiGlpk/include/OsiGlpkSolverInterface.hpp → ...siGlpk/include/OsiGlpkSolverInterface.hpp
diff --git a/OsiMsk/Makefile → Osi/src/OsiMsk/Makefile b/OsiMsk/Makefile → Osi/src/OsiMsk/Makefile
diff --git a/OsiMsk/OsiMskSolverInterface.cpp → Osi/src/OsiMsk/OsiMskSolverInterface.cpp b/OsiMsk/OsiMskSolverInterface.cpp → Osi/src/OsiMsk/OsiMskSolverInterface.cpp
diff --git a/OsiMsk/include/OsiMskSolverInterface.hpp → .../OsiMsk/include/OsiMskSolverInterface.hpp b/OsiMsk/include/OsiMskSolverInterface.hpp → .../OsiMsk/include/OsiMskSolverInterface.hpp
diff --git a/OsiOpbdpSolve.cpp → Osi/src/OsiOpbdpSolve.cpp b/OsiOpbdpSolve.cpp → Osi/src/OsiOpbdpSolve.cpp
diff --git a/include/OsiOpbdpSolve.hpp → Osi/src/OsiOpbdpSolve.hpp b/include/OsiOpbdpSolve.hpp → Osi/src/OsiOpbdpSolve.hpp
diff --git a/OsiOsl/Makefile → Osi/src/OsiOsl/Makefile b/OsiOsl/Makefile → Osi/src/OsiOsl/Makefile
diff --git a/OsiOsl/OsiOslSolverInterface.cpp → Osi/src/OsiOsl/OsiOslSolverInterface.cpp b/OsiOsl/OsiOslSolverInterface.cpp → Osi/src/OsiOsl/OsiOslSolverInterface.cpp
diff --git a/OsiOsl/include/OsiOslSolverInterface.hpp → .../OsiOsl/include/OsiOslSolverInterface.hpp b/OsiOsl/include/OsiOslSolverInterface.hpp → .../OsiOsl/include/OsiOslSolverInterface.hpp
diff --git a/OsiPresolve.cpp → Osi/src/OsiPresolve.cpp b/OsiPresolve.cpp → Osi/src/OsiPresolve.cpp
diff --git a/include/OsiPresolve.hpp → Osi/src/OsiPresolve.hpp b/include/OsiPresolve.hpp → Osi/src/OsiPresolve.hpp
diff --git a/OsiRowCut.cpp → Osi/src/OsiRowCut.cpp b/OsiRowCut.cpp → Osi/src/OsiRowCut.cpp
diff --git a/include/OsiRowCut.hpp → Osi/src/OsiRowCut.hpp b/include/OsiRowCut.hpp → Osi/src/OsiRowCut.hpp
diff --git a/OsiRowCutDebugger.cpp → Osi/src/OsiRowCutDebugger.cpp b/OsiRowCutDebugger.cpp → Osi/src/OsiRowCutDebugger.cpp
diff --git a/include/OsiRowCutDebugger.hpp → Osi/src/OsiRowCutDebugger.hpp b/include/OsiRowCutDebugger.hpp → Osi/src/OsiRowCutDebugger.hpp
diff --git a/OsiSolverBranch.cpp → Osi/src/OsiSolverBranch.cpp b/OsiSolverBranch.cpp → Osi/src/OsiSolverBranch.cpp
diff --git a/include/OsiSolverBranch.hpp → Osi/src/OsiSolverBranch.hpp b/include/OsiSolverBranch.hpp → Osi/src/OsiSolverBranch.hpp
diff --git a/OsiSolverInterface.cpp → Osi/src/OsiSolverInterface.cpp b/OsiSolverInterface.cpp → Osi/src/OsiSolverInterface.cpp
diff --git a/include/OsiSolverInterface.hpp → Osi/src/OsiSolverInterface.hpp b/include/OsiSolverInterface.hpp → Osi/src/OsiSolverInterface.hpp
diff --git a/include/OsiSolverParameters.hpp → Osi/src/OsiSolverParameters.hpp b/include/OsiSolverParameters.hpp → Osi/src/OsiSolverParameters.hpp
diff --git a/OsiSpx/Makefile → Osi/src/OsiSpx/Makefile b/OsiSpx/Makefile → Osi/src/OsiSpx/Makefile
diff --git a/OsiSpx/OsiSpxSolverInterface.cpp → Osi/src/OsiSpx/OsiSpxSolverInterface.cpp b/OsiSpx/OsiSpxSolverInterface.cpp → Osi/src/OsiSpx/OsiSpxSolverInterface.cpp
diff --git a/OsiSpx/include/OsiSpxSolverInterface.hpp → .../OsiSpx/include/OsiSpxSolverInterface.hpp b/OsiSpx/include/OsiSpxSolverInterface.hpp → .../OsiSpx/include/OsiSpxSolverInterface.hpp
diff --git a/OsiSym/Makefile → Osi/src/OsiSym/Makefile b/OsiSym/Makefile → Osi/src/OsiSym/Makefile
diff --git a/OsiSym/OsiSymSolverInterface.cpp → Osi/src/OsiSym/OsiSymSolverInterface.cpp b/OsiSym/OsiSymSolverInterface.cpp → Osi/src/OsiSym/OsiSymSolverInterface.cpp
diff --git a/OsiSym/SymWarmStart.cpp → Osi/src/OsiSym/SymWarmStart.cpp b/OsiSym/SymWarmStart.cpp → Osi/src/OsiSym/SymWarmStart.cpp
diff --git a/OsiSym/include/OsiSymSolverInterface.hpp → .../OsiSym/include/OsiSymSolverInterface.hpp b/OsiSym/include/OsiSymSolverInterface.hpp → .../OsiSym/include/OsiSymSolverInterface.hpp
diff --git a/OsiSym/include/OsiSymSolverParameters.hpp → ...OsiSym/include/OsiSymSolverParameters.hpp b/OsiSym/include/OsiSymSolverParameters.hpp → ...OsiSym/include/OsiSymSolverParameters.hpp
diff --git a/OsiSym/include/SymWarmStart.hpp → Osi/src/OsiSym/include/SymWarmStart.hpp b/OsiSym/include/SymWarmStart.hpp → Osi/src/OsiSym/include/SymWarmStart.hpp
diff --git a/OsiVol/Makefile → Osi/src/OsiVol/Makefile b/OsiVol/Makefile → Osi/src/OsiVol/Makefile
diff --git a/OsiVol/OsiVolSolverInterface.cpp → Osi/src/OsiVol/OsiVolSolverInterface.cpp b/OsiVol/OsiVolSolverInterface.cpp → Osi/src/OsiVol/OsiVolSolverInterface.cpp
diff --git a/OsiVol/OsiVolSolverInterfaceIO.cpp → Osi/src/OsiVol/OsiVolSolverInterfaceIO.cpp b/OsiVol/OsiVolSolverInterfaceIO.cpp → Osi/src/OsiVol/OsiVolSolverInterfaceIO.cpp
diff --git a/OsiVol/include/OsiVolSolverInterface.hpp → .../OsiVol/include/OsiVolSolverInterface.hpp b/OsiVol/include/OsiVolSolverInterface.hpp → .../OsiVol/include/OsiVolSolverInterface.hpp
diff --git a/OsiXpr/Makefile → Osi/src/OsiXpr/Makefile b/OsiXpr/Makefile → Osi/src/OsiXpr/Makefile
diff --git a/OsiXpr/OsiXprSolverInterface.cpp → Osi/src/OsiXpr/OsiXprSolverInterface.cpp b/OsiXpr/OsiXprSolverInterface.cpp → Osi/src/OsiXpr/OsiXprSolverInterface.cpp
diff --git a/OsiXpr/include/OsiXprSolverInterface.hpp → .../OsiXpr/include/OsiXprSolverInterface.hpp b/OsiXpr/include/OsiXprSolverInterface.hpp → .../OsiXpr/include/OsiXprSolverInterface.hpp
diff --git a/Test/Makefile → Osi/test/Makefile b/Test/Makefile → Osi/test/Makefile
diff --git a/Test/Makefile.test → Osi/test/Makefile.test b/Test/Makefile.test → Osi/test/Makefile.test
diff --git a/Test/OsiCbcSolverInterfaceTest.cpp → Osi/test/OsiCbcSolverInterfaceTest.cpp b/Test/OsiCbcSolverInterfaceTest.cpp → Osi/test/OsiCbcSolverInterfaceTest.cpp
diff --git a/Test/OsiClpSolverInterfaceTest.cpp → Osi/test/OsiClpSolverInterfaceTest.cpp b/Test/OsiClpSolverInterfaceTest.cpp → Osi/test/OsiClpSolverInterfaceTest.cpp
diff --git a/Test/OsiColCutTest.cpp → Osi/test/OsiColCutTest.cpp b/Test/OsiColCutTest.cpp → Osi/test/OsiColCutTest.cpp
diff --git a/Test/OsiCpxSolverInterfaceTest.cpp → Osi/test/OsiCpxSolverInterfaceTest.cpp b/Test/OsiCpxSolverInterfaceTest.cpp → Osi/test/OsiCpxSolverInterfaceTest.cpp
diff --git a/Test/OsiCutsTest.cpp → Osi/test/OsiCutsTest.cpp b/Test/OsiCutsTest.cpp → Osi/test/OsiCutsTest.cpp
diff --git a/Test/OsiDylpSolverInterfaceTest.cpp → Osi/test/OsiDylpSolverInterfaceTest.cpp b/Test/OsiDylpSolverInterfaceTest.cpp → Osi/test/OsiDylpSolverInterfaceTest.cpp
diff --git a/Test/OsiFmpSolverInterfaceTest.cpp → Osi/test/OsiFmpSolverInterfaceTest.cpp b/Test/OsiFmpSolverInterfaceTest.cpp → Osi/test/OsiFmpSolverInterfaceTest.cpp
diff --git a/Test/OsiGlpkSolverInterfaceTest.cpp → Osi/test/OsiGlpkSolverInterfaceTest.cpp b/Test/OsiGlpkSolverInterfaceTest.cpp → Osi/test/OsiGlpkSolverInterfaceTest.cpp
diff --git a/Test/OsiMskSolverInterfaceTest.cpp → Osi/test/OsiMskSolverInterfaceTest.cpp b/Test/OsiMskSolverInterfaceTest.cpp → Osi/test/OsiMskSolverInterfaceTest.cpp
diff --git a/Test/OsiOslSolverInterfaceTest.cpp → Osi/test/OsiOslSolverInterfaceTest.cpp b/Test/OsiOslSolverInterfaceTest.cpp → Osi/test/OsiOslSolverInterfaceTest.cpp
diff --git a/Test/OsiRowCutDebuggerTest.cpp → Osi/test/OsiRowCutDebuggerTest.cpp b/Test/OsiRowCutDebuggerTest.cpp → Osi/test/OsiRowCutDebuggerTest.cpp
diff --git a/Test/OsiRowCutTest.cpp → Osi/test/OsiRowCutTest.cpp b/Test/OsiRowCutTest.cpp → Osi/test/OsiRowCutTest.cpp
diff --git a/Test/OsiSolverInterfaceTest.cpp → Osi/test/OsiSolverInterfaceTest.cpp b/Test/OsiSolverInterfaceTest.cpp → Osi/test/OsiSolverInterfaceTest.cpp
diff --git a/Test/OsiSpxSolverInterfaceTest.cpp → Osi/test/OsiSpxSolverInterfaceTest.cpp b/Test/OsiSpxSolverInterfaceTest.cpp → Osi/test/OsiSpxSolverInterfaceTest.cpp
diff --git a/Test/OsiSymSolverInterfaceTest.cpp → Osi/test/OsiSymSolverInterfaceTest.cpp b/Test/OsiSymSolverInterfaceTest.cpp → Osi/test/OsiSymSolverInterfaceTest.cpp
diff --git a/Test/OsiVolSolverInterfaceTest.cpp → Osi/test/OsiVolSolverInterfaceTest.cpp b/Test/OsiVolSolverInterfaceTest.cpp → Osi/test/OsiVolSolverInterfaceTest.cpp
diff --git a/Test/OsiXprSolverInterfaceTest.cpp → Osi/test/OsiXprSolverInterfaceTest.cpp b/Test/OsiXprSolverInterfaceTest.cpp → Osi/test/OsiXprSolverInterfaceTest.cpp
diff --git a/Test/unitTest.cpp → Osi/test/unitTest.cpp b/Test/unitTest.cpp → Osi/test/unitTest.cpp