Ticket #13363: trac_13363.patch

File trac_13363.patch, 16.5 KB (added by mhansen, 9 years ago)
  • module_list.py

    # HG changeset patch
    # User Mike Hansen <mhansen@gmail.com>
    # Date 1344892926 25200
    # Node ID d802e239b2fe0ea5e56a9bfcbac674a20da40f84
    # Parent  5c1ee32b5ab10e445dd83039d11564f52e53d78d
    #13363: Move sage/graphs/planarity/ to sage/graphs/planarity_c/
    
    diff --git a/module_list.py b/module_list.py
    a b  
    376376              depends = flint_depends),
    377377
    378378    Extension('sage.graphs.planarity',
    379               sources = ['sage/graphs/planarity/graphColorVertices.c',
    380                          'sage/graphs/planarity/graphColorVertices_Extensions.c',
    381                          'sage/graphs/planarity/graphDrawPlanar.c',
    382                          'sage/graphs/planarity/graphDrawPlanar_Extensions.c',
    383                          'sage/graphs/planarity/graphEmbed.c',
    384                          'sage/graphs/planarity/graphExtensions.c',
    385                          'sage/graphs/planarity/graphIO.c',
    386                          'sage/graphs/planarity/graphIsolator.c',
    387                          'sage/graphs/planarity/graphK23Search.c',
    388                          'sage/graphs/planarity/graphK23Search_Extensions.c',
    389                          'sage/graphs/planarity/graphK33Search.c',
    390                          'sage/graphs/planarity/graphK33Search_Extensions.c',
    391                          'sage/graphs/planarity/graphK4Search.c',
    392                          'sage/graphs/planarity/graphK4Search_Extensions.c',
    393                          'sage/graphs/planarity/graphNonplanar.c',
    394                          'sage/graphs/planarity/graphOuterplanarObstruction.c',
    395                          'sage/graphs/planarity/graphPreprocess.c',
    396                          'sage/graphs/planarity/graphTests.c',
    397                          'sage/graphs/planarity/graphUtils.c',
    398                          'sage/graphs/planarity/listcoll.c',
    399                          'sage/graphs/planarity/planarity.c',
    400                          'sage/graphs/planarity/planarityCommandLine.c',
    401                          'sage/graphs/planarity/planarityRandomGraphs.c',
    402                          'sage/graphs/planarity/planaritySpecificGraph.c',
    403                          'sage/graphs/planarity/planarityUtils.c',
    404                          'sage/graphs/planarity/stack.c',
     379              sources = ['sage/graphs/planarity_c/graphColorVertices.c',
     380                         'sage/graphs/planarity_c/graphColorVertices_Extensions.c',
     381                         'sage/graphs/planarity_c/graphDrawPlanar.c',
     382                         'sage/graphs/planarity_c/graphDrawPlanar_Extensions.c',
     383                         'sage/graphs/planarity_c/graphEmbed.c',
     384                         'sage/graphs/planarity_c/graphExtensions.c',
     385                         'sage/graphs/planarity_c/graphIO.c',
     386                         'sage/graphs/planarity_c/graphIsolator.c',
     387                         'sage/graphs/planarity_c/graphK23Search.c',
     388                         'sage/graphs/planarity_c/graphK23Search_Extensions.c',
     389                         'sage/graphs/planarity_c/graphK33Search.c',
     390                         'sage/graphs/planarity_c/graphK33Search_Extensions.c',
     391                         'sage/graphs/planarity_c/graphK4Search.c',
     392                         'sage/graphs/planarity_c/graphK4Search_Extensions.c',
     393                         'sage/graphs/planarity_c/graphNonplanar.c',
     394                         'sage/graphs/planarity_c/graphOuterplanarObstruction.c',
     395                         'sage/graphs/planarity_c/graphPreprocess.c',
     396                         'sage/graphs/planarity_c/graphTests.c',
     397                         'sage/graphs/planarity_c/graphUtils.c',
     398                         'sage/graphs/planarity_c/listcoll.c',
     399                         'sage/graphs/planarity_c/planarity.c',
     400                         'sage/graphs/planarity_c/planarityCommandLine.c',
     401                         'sage/graphs/planarity_c/planarityRandomGraphs.c',
     402                         'sage/graphs/planarity_c/planaritySpecificGraph.c',
     403                         'sage/graphs/planarity_c/planarityUtils.c',
     404                         'sage/graphs/planarity_c/stack.c',
    405405                         'sage/graphs/planarity.pyx'],
    406               depends = ['sage/graphs/planarity/appconst.h',
    407                          'sage/graphs/planarity/graphColorVertices.h',
    408                          'sage/graphs/planarity/graphColorVertices.private.h',
    409                          'sage/graphs/planarity/graphDrawPlanar.h',
    410                          'sage/graphs/planarity/graphDrawPlanar.private.h',
    411                          'sage/graphs/planarity/graphExtensions.h',
    412                          'sage/graphs/planarity/graphExtensions.private.h',
    413                          'sage/graphs/planarity/graphFunctionTable.h',
    414                          'sage/graphs/planarity/graph.h',
    415                          'sage/graphs/planarity/graphK23Search.h',
    416                          'sage/graphs/planarity/graphK23Search.private.h',
    417                          'sage/graphs/planarity/graphK33Search.h',
    418                          'sage/graphs/planarity/graphK33Search.private.h',
    419                          'sage/graphs/planarity/graphK4Search.h',
    420                          'sage/graphs/planarity/graphK4Search.private.h',
    421                          'sage/graphs/planarity/graphStructures.h',
    422                          'sage/graphs/planarity/listcoll.h',
    423                          'sage/graphs/planarity/planarity.h',
    424                          'sage/graphs/planarity/platformTime.h',
    425                          'sage/graphs/planarity/stack.h']),
     406              depends = ['sage/graphs/planarity_c/appconst.h',
     407                         'sage/graphs/planarity_c/graphColorVertices.h',
     408                         'sage/graphs/planarity_c/graphColorVertices.private.h',
     409                         'sage/graphs/planarity_c/graphDrawPlanar.h',
     410                         'sage/graphs/planarity_c/graphDrawPlanar.private.h',
     411                         'sage/graphs/planarity_c/graphExtensions.h',
     412                         'sage/graphs/planarity_c/graphExtensions.private.h',
     413                         'sage/graphs/planarity_c/graphFunctionTable.h',
     414                         'sage/graphs/planarity_c/graph.h',
     415                         'sage/graphs/planarity_c/graphK23Search.h',
     416                         'sage/graphs/planarity_c/graphK23Search.private.h',
     417                         'sage/graphs/planarity_c/graphK33Search.h',
     418                         'sage/graphs/planarity_c/graphK33Search.private.h',
     419                         'sage/graphs/planarity_c/graphK4Search.h',
     420                         'sage/graphs/planarity_c/graphK4Search.private.h',
     421                         'sage/graphs/planarity_c/graphStructures.h',
     422                         'sage/graphs/planarity_c/listcoll.h',
     423                         'sage/graphs/planarity_c/planarity.h',
     424                         'sage/graphs/planarity_c/platformTime.h',
     425                         'sage/graphs/planarity_c/stack.h']),
    426426
    427427    Extension('sage.graphs.graph_decompositions.rankwidth',
    428428              sources = ['sage/graphs/graph_decompositions/rankwidth.pyx']),
  • sage/graphs/planarity.pyx

    diff --git a/sage/graphs/planarity.pyx b/sage/graphs/planarity.pyx
    a b  
    22Wrapper for Boyer's (C) planarity algorithm.
    33"""
    44
    5 cdef extern from "planarity/graph.h":
     5cdef extern from "planarity_c/graph.h":
    66    ctypedef struct graphNode:
    77        int v
    88        int link[2]