zyppe/sagemath
1
0
Fork 0
mirror of https://src.fedoraproject.org/rpms/sagemath.git synced 2025-04-22 11:45:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

Update to sagemath 5.9

Browse source
This commit is contained in:
pcpa 2013-05-09 11:45:42 -03:00
parent eac7c8fec1
commit fbc0e8d055
33 changed files with 597 additions and 578 deletions
Download patch file Download diff file Expand all files Collapse all files

42
sagemath-cbc.patch
View file

@ -1,7 +1,7 @@
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")
diff -up sage-5.9/spkg/build/sage-5.9/module_list.py.orig sage-5.9/spkg/build/sage-5.9/module_list.py
--- sage-5.9/spkg/build/sage-5.9/module_list.py.orig 2013-05-06 14:18:02.386812933 -0300
+++ sage-5.9/spkg/build/sage-5.9/module_list.py 2013-05-06 14:18:07.352813123 -0300
@@ -2021,7 +2021,7 @@ if (os.path.isfile(SAGE_INC + "/cplex.h"
libraries = ["csage", "stdc++", "cplex"])
)
@ -10,9 +10,9 @@ diff -up sage-5.8/spkg/build/sage-5.8/module_list.py.orig sage-5.8/spkg/build/sa
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
diff -up sage-5.9/spkg/build/sage-5.9/sage/numerical/backends/coin_backend.pxd.orig sage-5.9/spkg/build/sage-5.9/sage/numerical/backends/coin_backend.pxd
--- sage-5.9/spkg/build/sage-5.9/sage/numerical/backends/coin_backend.pxd.orig 2013-05-06 14:18:23.609813746 -0300
+++ sage-5.9/spkg/build/sage-5.9/sage/numerical/backends/coin_backend.pxd 2013-05-06 14:19:37.702816583 -0300
@@ -22,23 +22,23 @@ from libcpp cimport bool
cdef extern from *:
ctypedef double* const_double_ptr "const double*"
@ -22,8 +22,7 @@ diff -up sage-5.8/spkg/build/sage-5.8/sage/numerical/backends/coin_backend.pxd.o
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)
CbcStrategyDefault()
-cdef extern from "../../local/include/coin/CoinPackedVectorBase.hpp":
+cdef extern from "coin/CoinPackedVectorBase.hpp":
@ -74,7 +73,7 @@ diff -up sage-5.8/spkg/build/sage-5.8/sage/numerical/backends/coin_backend.pxd.o
cdef cppclass OsiSolverInterface:
@@ -130,19 +130,19 @@ cdef extern from "../../local/include/co
@@ -130,7 +130,7 @@ cdef extern from "../../local/include/co
# miscellaneous
double getInfinity()
@ -83,29 +82,6 @@ diff -up sage-5.8/spkg/build/sage-5.8/sage/numerical/backends/coin_backend.pxd.o
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 *)