Changeset 7476bc in git

Timestamp:

Oct 15, 2013, 10:31:38 AM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

1c0823c8f21646ea01043ff03c516b598de0f7fc

Parents:

76d26c42ef4754edaa37b1777b4d2831f6f7e349

Message:

fix: schubert.lib from master

File:

• Singular/LIB/schubert.lib (modified) (5 diffs)

Singular/LIB/schubert.lib

@@ -1 @@
-//////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
 version="version schubert.lib 4.0.0.0 Jun_2013 "; // $Id$
-
 category="Algebraic Geometry";
 info="
@@ -17 +16 @@
     , Grassmannians, and projective bundles.
 
-<<<<<<< HEAD
-PROCEDURES:
-    makeVariety(int,ideal)            create a variety
-    productVariety(variety,variety)   product of two varieties
-    ChowRing(variety)                 create the Chow ring of a variety
-    dimension(variety)                dimension of a variety
-    relations(variety)                relations of a variety
-    Grassmannian(int,int)             create a Grassmannian as a variety
-    projectiveSpace(int)              create a projective space as a variety
-    projectiveBundle(sheaf)           create a projective bundle as a variety
-    integral(variety,poly)            degree of a 0-cycle on a variety
-    makeSheaf(variety,poly)           create a sheaf
-    ChernCharacter(sheaf)             the Chern character of a sheaf
-    totalChernClass(sheaf)            the total Chern class of a sheaf
-    ChernClass(sheaf,int)             the k-th Chern class of a sheaf
-    topChernClass(sheaf)              the top Chern class of a sheaf
-    totalSegreClass(sheaf)            the total Segre class of a sheaf
-    dualSheaf(sheaf)                  the dual of a sheaf
-    tensorSheaf(sheaf,sheaf)          the tensor of two sheaves
-    symmetricPowerSheaf(sheaf,int)    the k-th symmetric power of a sheaf
-    minusSheaf(sheaf,sheaf)           the quotient of two sheaves
-    plusSheaf(sheaf,sheaf)            the direct sum of two sheaves
-=======
     An important task of this library is related to the computation of
     Gromov-Witten invariants. In particular, we implement new tools for the
@@ -48 +24 @@
     Kontsevich, and the graphs corresponding to the fixed point components of a
     torus action on the moduli spaces of stable maps.
->>>>>>> 2ba3231... chg: new version of schubert.lib
 
 REFERENCES:
@@ -1766 +1741 @@
     return(V);
 }
-<<<<<<< HEAD
-
-proc dimension(variety V)
-=======
-example
->>>>>>> 2ba3231... chg: new version of schubert.lib
+example
 {
     "EXAMPLE:"; echo=2;
@@ -1870 +1840 @@
     G24;
     def r = G24.baseRing;
-<<<<<<< HEAD
-=======
     setring r;
->>>>>>> 2ba3231... chg: new version of schubert.lib
     subBundle;
     quotientBundle;