Changeset 334c21f in git


Ignore:
Timestamp:
Apr 14, 2009, 2:08:36 PM (14 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')
Children:
797d4f19229a77bdf9613bc5ed8a5f46eaebabe4
Parents:
3360fb21d69c352925dd6bc1692b4f0bd0c595c1
Message:
*hannes: syntax fix


git-svn-id: file:///usr/local/Singular/svn/trunk@11696 2c84dea3-7e68-4137-9b89-c4e89433aadc
Location:
Singular/LIB
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • Singular/LIB/freegb.lib

    r3360fb r334c21f  
    11//////////////////////////////////////////////////////////////////////////////
    2 version="$Id: freegb.lib,v 1.22 2009-04-14 12:00:14 Singular Exp $";
     2version="$Id: freegb.lib,v 1.23 2009-04-14 12:08:36 Singular Exp $";
    33category="Noncommutative";
    44info="
    … …  
    3636
    3737LIB "qhmoduli.lib"; // for Max
    38 
    39 proc testfreegblib()
    40 {
    41   example makeLetterplaceRing;
    42   example freeGBasis;
    43   example setLetterplaceAttributes;
    44     "AUXILIARY PROCEDURES: ";
    45   example shiftPoly;
    46   example lpMult;
    47   example lp2lstr;
    48   example lst2str;
    49   example mod2str;
    50   example vct2str;
    51   example lieBracket;
    52   example serreRelations;
    53   example isVar;
    54 }
    55 
    5638
    5739proc setLetterplaceAttributes(def R, int uptodeg, int lV)
    … …  
    25452527  return(0);
    25462528}
    2547 
    2548 // alias libs for compatibility with older examples
    2549 proc freegbRing(int d)
    2550 {
    2551   return(makeLetterplaceRing(d));
    2552 }
    2553 
    2554 proc freegbasis( list L, int n)
    2555 {
    2556   return(freeGBasis(L, n));
    2557 }

  • Singular/LIB/qhmoduli.lib

    r3360fb r334c21f  
    11///////////////////////////////////////////////////////////////////////////////
    2 version="$Id: qhmoduli.lib,v 1.16 2009-04-14 11:51:43 seelisch Exp $";
     2version="$Id: qhmoduli.lib,v 1.17 2009-04-14 12:08:36 Singular Exp $";
    33category="Singularities";
    44info="
    … …  
    11651165  mma = Max(wt);
    11661166
    1167 <<<<<<< qhmoduli.lib
    1168   for(i = mi; i <= ma; i = i + 1) {
    1169     if(containedQ(wt, i)) {    // find variables of weight i
    1170 =======
    11711167  for(ii = mmi; ii <= mma; ii++)
    11721168  {
    11731169    if(containedQ(wt, ii))
    11741170    {    // find variables of weight ii
    1175 >>>>>>> 1.15
    11761171      k = 0;
    11771172      index = 0;
    … …  
    13691364      {
    13701365        newP = temp + decP[j];        // new partition
    1371 <<<<<<< qhmoduli.lib
    1372         if(!containedQ(parts, newP, 1)) {
    1373 =======
    13741366        if(!containedQ(parts, newP, 1))
    13751367        {
    1376 >>>>>>> 1.15
    13771368          k = k + 1;
    13781369          parts[k] = newP;
    … …  
    14511442  c = 1;
    14521443
    1453 <<<<<<< qhmoduli.lib
    1454   for(int i = 1; i <= size(l1); i = i + 1) {
    1455     b = containedQ(l2, l1[i]);
    1456     if(b == 1) {
    1457 =======
    14581444  for(int i = 1; i <= size(l1); i++)
    14591445  {
    … …  
    14611447    if(b == 1)
    14621448    {
    1463 >>>>>>> 1.15
    14641449      l[c] = l1[i];
    14651450      c++;
Note: See TracChangeset for help on using the changeset viewer.