Ticket #9828: 7_bool_bint.patch

File 7_bool_bint.patch, 5.3 KB (added by robertwb, 12 years ago)

  • sage/categories/morphism.pxd 

    # HG changeset patch
# User Robert Bradshaw <robertwb@math.washington.edu>
# Date 1284629032 25200
# Node ID 559d1f0400da45889dc0225d6ed372dd87d9fc95
# Parent  e40729740c2bd551d2623bbdd177882345b2438f
Use bint not bool.

diff -r e40729740c2b -r 559d1f0400da sage/categories/morphism.pxd
    a b  
    77
    88cdef class SetMorphism(Morphism):
    99    cdef object _function
    10     cpdef bool _eq_c_impl(left, Element right)
     10    cpdef bint _eq_c_impl(left, Element right)

  • sage/categories/morphism.pyx 

    diff -r e40729740c2b -r 559d1f0400da sage/categories/morphism.pyx
    a b  
    286286        self._function = _slots['_function']
    287287        Map._update_slots(self, _slots)
    288288
    289     cpdef bool _eq_c_impl(self, Element other):
     289    cpdef bint _eq_c_impl(self, Element other):
    290290        """
    291291        Equality test
    292292

  • sage/graphs/base/c_graph.pyx 

    diff -r e40729740c2b -r 559d1f0400da sage/graphs/base/c_graph.pyx
    a b  
    24662466    cdef int direction
    24672467    cdef list stack
    24682468    cdef bitset_t seen
    2469     cdef bool test_out
    2470     cdef bool test_in
     2469    cdef bint test_out
     2470    cdef bint test_in
    24712471
    24722472    def __init__(self, graph, v, direction=0, reverse=False,
    24732473                 ignore_direction=False):

  • sage/graphs/cliquer.pxd 

    diff -r e40729740c2b -r 559d1f0400da sage/graphs/cliquer.pxd
    a b  
    88
    99
    1010cdef extern from "cliquer/reorder.h":
    11      cdef int *reorder_by_greedy_coloring(graph_t *g, bool weighted)
    12      cdef int *reorder_by_degree(graph_t *g, bool weighted)
     11     cdef int *reorder_by_greedy_coloring(graph_t *g, bint weighted)
     12     cdef int *reorder_by_degree(graph_t *g, bint weighted)
    1313
    1414cdef extern from "cliquer/cliquer.h":
    15      bool clique_print_time(intlevel, int i, int n, int max, double cputime, double realtime, clique_options *opts)
     15     bint clique_print_time(intlevel, int i, int n, int max, double cputime, double realtime, clique_options *opts)
    1616
    1717
    1818cdef extern from "cliquer/cl.h":

  • sage/numerical/mip.pyx 

    diff -r e40729740c2b -r 559d1f0400da sage/numerical/mip.pyx
    a b  
    16321632            5 x_2 +2 x_3
    16331633        """
    16341634        cdef dict d = deepcopy(self._f)
    1635         cdef bool first = True
     1635        cdef bint first = True
    16361636        t = ""
    16371637
    16381638        if d.has_key(-1):

  • sage/numerical/mip_glpk.pyx 

    diff -r e40729740c2b -r 559d1f0400da sage/numerical/mip_glpk.pyx
    a b  
    181181
    182182    glp_write_lp(lp,NULL,filename)
    183183
    184 cdef int build_glp_prob(c_glp_prob * lp, c_glp_iocp * iocp, LP, int log, bool names) except -1:
     184cdef int build_glp_prob(c_glp_prob * lp, c_glp_iocp * iocp, LP, int log, bint names) except -1:
    185185    """
    186186    Builds the GLPK structure corresponding to the LP
    187187

  • sage/numerical/osi_interface.pxd 

    diff -r e40729740c2b -r 559d1f0400da sage/numerical/osi_interface.pxd
    a b  
    1010     ctypedef struct c_CoinPackedMatrix "CoinPackedMatrix":
    1111         void setDimensions(int, int)
    1212         void appendRow(c_CoinPackedVector)
    13      c_CoinPackedMatrix *new_c_CoinPackedMatrix "new CoinPackedMatrix" (bool, double, double)
     13     c_CoinPackedMatrix *new_c_CoinPackedMatrix "new CoinPackedMatrix" (bint, double, double)
    1414     void del_CoinPackedMatrix "delete" (c_CoinPackedMatrix *)
    1515
    1616cdef extern from "../../local/include/coin/CoinMessageHandler.hpp":
    … …  
    8686     void del_OsiCbcSolverInterface "delete" (c_OsiCbcSolverInterface *)
    8787
    8888cdef class Osi_interface:
    89      cdef float osi_solve(self, LP, c_OsiSolverInterface * si,bool objective_only, bool is_cplex) except? -687654
     89     cdef float osi_solve(self, LP, c_OsiSolverInterface * si, bint objective_only, bint is_cplex) except? -687654

  • sage/numerical/osi_interface.pyx 

    diff -r e40729740c2b -r 559d1f0400da sage/numerical/osi_interface.pyx
    a b  
    66cdef int INTEGER = 0
    77
    88cdef class Osi_interface:
    9     cdef float osi_solve(self, LP, c_OsiSolverInterface * si,bool objective_only, bool is_cplex):
     9    cdef float osi_solve(self, LP, c_OsiSolverInterface * si, bint objective_only, bint is_cplex):
    1010        from itertools import izip
    1111        n_cols = len(LP._variables_type);
    1212   

  • setup.py 

    diff -r e40729740c2b -r 559d1f0400da setup.py
    a b  
    120120
    121121for m in ext_modules:
    122122    m.libraries = ['csage'] + m.libraries + ['stdc++', 'ntl']
    123     m.extra_compile_args += extra_compile_args
     123    m.extra_compile_args += extra_compile_args # + ["-DCYTHON_REFNANNY"]
    124124    if os.environ.has_key('SAGE_DEBIAN'):
    125125        m.library_dirs += ['/usr/lib','/usr/lib/eclib','/usr/lib/singular','/usr/lib/R/lib','%s/lib' % SAGE_LOCAL]
    126126    else: