Ticket #13023: trac_13023_move_toric_files.patch

File trac_13023_move_toric_files.patch, 6.3 KB (added by Andrey Novoseltsev, 11 years ago)

Actual move with minimal changes

  • doc/en/reference/schemes.rst

    # HG changeset patch
    # User Andrey Novoseltsev <novoselt@gmail.com>
    # Date 1338309003 25200
    # Node ID ded7bf71c17192d7a5dccec1477d55b8324a1c99
    # Parent  395bbc13c8f3fd1cff124071a73547359213e2ed
    Move toric varieties code to schemes/toric/
    
    diff --git a/doc/en/reference/schemes.rst b/doc/en/reference/schemes.rst
    a b  
    1616   sage/schemes/generic/ambient_space
    1717   sage/schemes/generic/affine_space
    1818   sage/schemes/generic/projective_space
    19    sage/schemes/generic/toric_variety
    20    sage/schemes/generic/fano_toric_variety
    21    sage/schemes/generic/toric_variety_library
    22    sage/schemes/generic/toric_divisor
    23    sage/schemes/generic/toric_chow_group
    24    sage/schemes/generic/toric_ideal
    2519   sage/schemes/generic/algebraic_scheme
    2620   sage/schemes/generic/hypersurface
    2721
    2822   sage/schemes/generic/homset
    2923   sage/schemes/generic/morphism
    30    sage/schemes/generic/toric_morphism
    3124   sage/schemes/generic/divisor
    3225
    3326   sage/schemes/generic/rational_point
     27   
     28   
     29   sage/schemes/toric/variety
     30   sage/schemes/toric/fano_variety
     31   sage/schemes/toric/library
     32   sage/schemes/toric/divisor
     33   sage/schemes/toric/chow_group
     34   sage/schemes/toric/ideal
     35   sage/schemes/toric/morphism
     36
  • module_list.py

    diff --git a/module_list.py b/module_list.py
    a b  
    16841684              include_dirs = [SAGE_INC + 'FLINT/'],
    16851685              libraries = ['flint', 'gmp', 'ratpoints']),
    16861686
    1687     Extension('sage.schemes.generic.toric_divisor_class',
    1688               sources = ['sage/schemes/generic/toric_divisor_class.pyx'],
    1689               libraries = ['gmp']),
    1690              
    16911687    Extension('sage.schemes.hyperelliptic_curves.hypellfrob',
    16921688              sources = ['sage/schemes/hyperelliptic_curves/hypellfrob.pyx',
    16931689                         'sage/schemes/hyperelliptic_curves/hypellfrob/hypellfrob.cpp',
     
    17011697              include_dirs = ['sage/libs/ntl/',
    17021698                              'sage/schemes/hyperelliptic_curves/hypellfrob/']),
    17031699
     1700    Extension('sage.schemes.toric.divisor_class',
     1701              sources = ['sage/schemes/toric/divisor_class.pyx'],
     1702              libraries = ['gmp']),             
     1703
    17041704    ################################
    17051705    ##
    17061706    ## sage.sets
  • sage/schemes/all.py

    diff --git a/sage/schemes/all.py b/sage/schemes/all.py
    a b  
    3434
    3535from generic.all import *
    3636
     37from toric.all import *
    3738
    3839
    3940
  • sage/schemes/generic/all.py

    diff --git a/sage/schemes/generic/all.py b/sage/schemes/generic/all.py
    a b  
    44from affine_space     import AffineSpace, is_AffineSpace
    55from algebraic_scheme import is_AlgebraicScheme
    66from ambient_space    import is_AmbientSpace
    7 from fano_toric_variety import CPRFanoToricVariety
    87from morphism         import is_SchemeMorphism
    98from projective_space import ProjectiveSpace, is_ProjectiveSpace
    109from scheme           import is_Scheme, is_AffineScheme
    11 from toric_variety import AffineToricVariety, ToricVariety
    12 from toric_variety_library import toric_varieties
    1310from hypersurface     import ProjectiveHypersurface, AffineHypersurface
    14 from toric_ideal import ToricIdeal
  • all.py

    diff --git a/sage/schemes/generic/__init__.py b/sage/schemes/toric/__init__.py
    copy from sage/schemes/generic/__init__.py
    copy to sage/schemes/toric/__init__.py
    diff --git a/sage/schemes/generic/all.py b/sage/schemes/toric/all.py
    copy from sage/schemes/generic/all.py
    copy to sage/schemes/toric/all.py
    old new  
    11# code exports
    22
    3 from spec             import Spec, is_Spec
    4 from affine_space     import AffineSpace, is_AffineSpace
    5 from algebraic_scheme import is_AlgebraicScheme
    6 from ambient_space    import is_AmbientSpace
    7 from fano_toric_variety import CPRFanoToricVariety
    8 from morphism         import is_SchemeMorphism
    9 from projective_space import ProjectiveSpace, is_ProjectiveSpace
    10 from scheme           import is_Scheme, is_AffineScheme
    11 from toric_variety import AffineToricVariety, ToricVariety
    12 from toric_variety_library import toric_varieties
    13 from hypersurface     import ProjectiveHypersurface, AffineHypersurface
    14 from toric_ideal import ToricIdeal
     3from fano_variety import CPRFanoToricVariety
     4from ideal import ToricIdeal
     5from library import toric_varieties
     6from variety import AffineToricVariety, ToricVariety
  • setup.py

    diff --git a/sage/schemes/generic/toric_chow_group.py b/sage/schemes/toric/chow_group.py
    rename from sage/schemes/generic/toric_chow_group.py
    rename to sage/schemes/toric/chow_group.py
    diff --git a/sage/schemes/generic/toric_divisor.py b/sage/schemes/toric/divisor.py
    rename from sage/schemes/generic/toric_divisor.py
    rename to sage/schemes/toric/divisor.py
    diff --git a/sage/schemes/generic/toric_divisor_class.pyx b/sage/schemes/toric/divisor_class.pyx
    rename from sage/schemes/generic/toric_divisor_class.pyx
    rename to sage/schemes/toric/divisor_class.pyx
    diff --git a/sage/schemes/generic/fano_toric_variety.py b/sage/schemes/toric/fano_variety.py
    rename from sage/schemes/generic/fano_toric_variety.py
    rename to sage/schemes/toric/fano_variety.py
    diff --git a/sage/schemes/generic/toric_homset.py b/sage/schemes/toric/homset.py
    rename from sage/schemes/generic/toric_homset.py
    rename to sage/schemes/toric/homset.py
    diff --git a/sage/schemes/generic/toric_ideal.py b/sage/schemes/toric/ideal.py
    rename from sage/schemes/generic/toric_ideal.py
    rename to sage/schemes/toric/ideal.py
    diff --git a/sage/schemes/generic/toric_variety_library.py b/sage/schemes/toric/library.py
    rename from sage/schemes/generic/toric_variety_library.py
    rename to sage/schemes/toric/library.py
    diff --git a/sage/schemes/generic/toric_morphism.py b/sage/schemes/toric/morphism.py
    rename from sage/schemes/generic/toric_morphism.py
    rename to sage/schemes/toric/morphism.py
    diff --git a/sage/schemes/generic/toric_variety.py b/sage/schemes/toric/variety.py
    rename from sage/schemes/generic/toric_variety.py
    rename to sage/schemes/toric/variety.py
    diff --git a/setup.py b/setup.py
    a b  
    10021002                     'sage.schemes.plane_quartics',
    10031003                     'sage.schemes.elliptic_curves',
    10041004                     'sage.schemes.hyperelliptic_curves',
     1005                     'sage.schemes.toric',
    10051006
    10061007                     'sage.server',
    10071008                     'sage.server.simple',