mirror of
https://src.fedoraproject.org/rpms/sagemath.git
synced 2025-04-21 11:19:02 -04:00
122 lines
5.6 KiB
Diff
122 lines
5.6 KiB
Diff
diff -up sage-5.8/spkg/build/sage-5.8/module_list.py.orig sage-5.8/spkg/build/sage-5.8/module_list.py
|
|
--- sage-5.8/spkg/build/sage-5.8/module_list.py.orig 2013-03-19 18:12:56.762984664 -0300
|
|
+++ sage-5.8/spkg/build/sage-5.8/module_list.py 2013-03-19 18:13:07.073985059 -0300
|
|
@@ -2029,7 +2029,7 @@ if (os.path.isfile(SAGE_INC + "cplex.h")
|
|
libraries = ["csage", "stdc++", "cplex"])
|
|
)
|
|
|
|
-if is_package_installed('cbc'):
|
|
+if 1:
|
|
ext_modules.append(
|
|
Extension("sage.numerical.backends.coin_backend",
|
|
["sage/numerical/backends/coin_backend.pyx"],
|
|
diff -up sage-5.8/spkg/build/sage-5.8/sage/numerical/backends/coin_backend.pxd.orig sage-5.8/spkg/build/sage-5.8/sage/numerical/backends/coin_backend.pxd
|
|
--- sage-5.8/spkg/build/sage-5.8/sage/numerical/backends/coin_backend.pxd.orig 2013-03-19 18:12:59.568984771 -0300
|
|
+++ sage-5.8/spkg/build/sage-5.8/sage/numerical/backends/coin_backend.pxd 2013-03-19 18:13:07.074985059 -0300
|
|
@@ -22,23 +22,23 @@ from libcpp cimport bool
|
|
cdef extern from *:
|
|
ctypedef double* const_double_ptr "const double*"
|
|
|
|
-cdef extern from "../../local/include/coin/CbcStrategy.hpp":
|
|
+cdef extern from "coin/CbcStrategy.hpp":
|
|
cdef cppclass CbcStrategy:
|
|
pass
|
|
cdef cppclass CbcStrategyDefault(CbcStrategy):
|
|
- CbcStrategyDefault(int cutsOnlyAtRoot=?, int numberStrong = ?, int numberBeforeTrust = ?, int printLevel = ?)
|
|
+ CbcStrategyDefault(int cutsOnlyAtRoot=1, int numberStrong = 5, int numberBeforeTrust = 0, int printLevel = 0)
|
|
|
|
-cdef extern from "../../local/include/coin/CoinPackedVectorBase.hpp":
|
|
+cdef extern from "coin/CoinPackedVectorBase.hpp":
|
|
cdef cppclass CoinPackedVectorBase:
|
|
pass
|
|
|
|
-cdef extern from "../../local/include/coin/CoinPackedVector.hpp":
|
|
+cdef extern from "coin/CoinPackedVector.hpp":
|
|
cdef cppclass CoinPackedVector(CoinPackedVectorBase):
|
|
void insert(float, float)
|
|
CoinPackedVector *new_CoinPackedVector "new CoinPackedVector" ()
|
|
void del_CoinPackedVector "delete" (CoinPackedVector *)
|
|
|
|
-cdef extern from "../../local/include/coin/CoinShallowPackedVector.hpp":
|
|
+cdef extern from "coin/CoinShallowPackedVector.hpp":
|
|
cdef cppclass CoinShallowPackedVector:
|
|
void insert(float, float)
|
|
int * getIndices ()
|
|
@@ -47,7 +47,7 @@ cdef extern from "../../local/include/co
|
|
CoinShallowPackedVector *new_CoinShallowPackedVector "new CoinShallowPackedVector" ()
|
|
void del_CoinShallowPackedVector "delete" (CoinShallowPackedVector *)
|
|
|
|
-cdef extern from "../../local/include/coin/CoinPackedMatrix.hpp":
|
|
+cdef extern from "coin/CoinPackedMatrix.hpp":
|
|
cdef cppclass CoinPackedMatrix:
|
|
void setDimensions(int, int)
|
|
void appendRow(CoinPackedVector)
|
|
@@ -55,7 +55,7 @@ cdef extern from "../../local/include/co
|
|
CoinPackedMatrix *new_CoinPackedMatrix "new CoinPackedMatrix" (bool, double, double)
|
|
void del_CoinPackedMatrix "delete" (CoinPackedMatrix *)
|
|
|
|
-cdef extern from "../../local/include/coin/CoinMessageHandler.hpp":
|
|
+cdef extern from "coin/CoinMessageHandler.hpp":
|
|
cdef cppclass CoinMessageHandler:
|
|
void setLogLevel (int)
|
|
int LogLevel ()
|
|
@@ -63,11 +63,11 @@ cdef extern from "../../local/include/co
|
|
void del_CoinMessageHandler "delete" (CoinMessageHandler *)
|
|
|
|
|
|
-cdef extern from "../../local/include/coin/OsiSolverParameters.hpp":
|
|
+cdef extern from "coin/OsiSolverParameters.hpp":
|
|
cdef enum OsiIntParam:
|
|
OsiMaxNumIteration = 0, OsiMaxNumIterationHotStart, OsiNameDiscipline, OsiLastIntParam
|
|
|
|
-cdef extern from "../../local/include/coin/OsiSolverInterface.hpp":
|
|
+cdef extern from "coin/OsiSolverInterface.hpp":
|
|
|
|
cdef cppclass OsiSolverInterface:
|
|
|
|
@@ -130,19 +130,19 @@ cdef extern from "../../local/include/co
|
|
# miscellaneous
|
|
double getInfinity()
|
|
|
|
-cdef extern from "../../local/include/coin/CbcModel.hpp":
|
|
+cdef extern from "coin/CbcModel.hpp":
|
|
cdef cppclass CbcModel:
|
|
# default constructor
|
|
CbcModel()
|
|
# constructor from solver
|
|
CbcModel(OsiSolverInterface & si)
|
|
# assigning, owning solver
|
|
- void assignSolver(OsiSolverInterface * & solver, bool deleteSolver=?)
|
|
+ void assignSolver(OsiSolverInterface * & solver, bool deleteSolver=true)
|
|
void setModelOwnsSolver(bool ourSolver)
|
|
# get solver
|
|
OsiSolverInterface * solver()
|
|
# copy constructor
|
|
- CbcModel(CbcModel & rhs, int cloneHandler = ?)
|
|
+ CbcModel(CbcModel & rhs, int cloneHandler = false)
|
|
# shut up
|
|
void setLogLevel(int value)
|
|
int logLevel()
|
|
@@ -152,7 +152,7 @@ cdef extern from "../../local/include/co
|
|
void setNumberThreads (int)
|
|
int getSolutionCount()
|
|
# solve
|
|
- void branchAndBound(int doStatistics = ?)
|
|
+ void branchAndBound(int doStatistics = 0)
|
|
# not sure we need this but it can't hurt
|
|
CoinMessageHandler * messageHandler ()
|
|
void CbcMain0(CbcModel m)
|
|
@@ -160,11 +160,11 @@ cdef extern from "../../local/include/co
|
|
CbcModel *new_CbcModel "new CbcModel" ()
|
|
void del_CbcModel "delete" (CbcModel *)
|
|
|
|
-cdef extern from "../../local/include/coin/ClpSimplex.hpp":
|
|
+cdef extern from "coin/ClpSimplex.hpp":
|
|
cdef cppclass ClpSimplex:
|
|
void setNumberThreads(int)
|
|
|
|
-cdef extern from "../../local/include/coin/OsiClpSolverInterface.hpp":
|
|
+cdef extern from "coin/OsiClpSolverInterface.hpp":
|
|
|
|
cdef cppclass OsiClpSolverInterface(OsiSolverInterface):
|
|
|