Changeset 4063070 in git


Ignore:
Timestamp:
Feb 12, 2019, 11:29:50 AM (5 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '3720ae8bfcff4a4649ee98a15552089151d2d59b')
Children:
2c2315ad70d773ecea87ebd165ee4385f8e6e327868c93d69eedf64bb173d7cd1ed87a9d92151a67c94cbe6fe1e620b042576958c7723c842e597c30
Parents:
867e67690349689b080604af2d756258e5076938705501e9c1243b90d049bde35cba1c383fb97724
git-author:
Hans Schoenemann <hannes@mathematik.uni-kl.de>2019-02-12 11:29:50+01:00
git-committer:
GitHub <noreply@github.com>2019-02-12 11:29:50+01:00
Message:
Merge pull request #913 from levandov/spielwiese

Doc fixes, reordering, cleaning
Files:
3 deleted
8 edited

Legend:

Unmodified
Added
Removed
  • Singular/LIB/freegb.lib

    r705501 r4063070  
    2626lpDegBound(R);                   returns the degree bound of a letterplace ring
    2727lpVarBlockSize(R);               returns the size of the letterplace blocks
    28 letplaceGBasis(I);               (deprecated) two-sided Groebner basis of a letterplace ideal I
    2928lpDivision(f,I);                 two-sided division with remainder
    3029lpGBPres2Poly(L,I);              reconstructs a polynomial from the output of lpDivision
    31 lieBracket(a,b[, N]);            Lie bracket ab-ba of two letterplace polynomials
    3230isOrderingShiftInvariant(i);     tests shift-invariance of the monomial ordering
    33 isVar(p);                        check whether p is a power of a single variable
    34 makeLetterplaceRing(d);          (deprecated) creates a Letterplace ring out of given data
     31makeLetterplaceRing(d);          (deprecated, use freeAlgebra) creates a Letterplace ring out of given data
     32letplaceGBasis(I);               (deprecated, use twostd) two-sided Groebner basis of a letterplace ideal I
     33lieBracket(a,b[, N]);            (deprecated, use bracket) Lie bracket ab-ba of two letterplace polynomials
    3534setLetterplaceAttributes(R,d,b); (for testing purposes) supplies ring R with the letterplace structure
    3635
     
    7271  example lieBracket;
    7372  example lpPrint;
    74   example isVar;
    7573
    7674  example ivL2lpI;
     
    323321}
    324322
    325 proc isVar(poly p)
     323static proc isVar(poly p)
    326324"USAGE:  isVar(p);  poly p
    327325RETURN:  int
     
    416414"
    417415{
    418   if (lpAssumeViolation())
    419   {
    420     //    ERROR("Either 'uptodeg' or 'lV' global variables are not set!");
    421     ERROR("Incomplete Letterplace structure on the basering!");
    422   }
    423   // alias ppLiebr;
    424   //if int N is given compute [a,[...[a,b]]]] left normed bracket
    425416  int N=1;
    426417  if (size(#)>0)
     
    431422    }
    432423  }
    433   if (N<=0) { return(q); }
    434   poly q = a*b - b*a;
    435   if (N >1)
    436   {
    437     for(int i=1; i<=N-1; i++)
    438     {
    439       q = lieBracket(a,q);
    440     }
    441   }
    442   return(q);
     424  return (bracket(a,b,N));
     425
     426  /* if (lpAssumeViolation()) */
     427  /* { */
     428  /*   //    ERROR("Either 'uptodeg' or 'lV' global variables are not set!"); */
     429  /*   ERROR("Incomplete Letterplace structure on the basering!"); */
     430  /* } */
     431  /* // alias ppLiebr; */
     432  /* //if int N is given compute [a,[...[a,b]]]] left normed bracket */
     433  /* int N=1; */
     434  /* if (size(#)>0) */
     435  /* { */
     436  /*   if (typeof(#[1])=="int") */
     437  /*   { */
     438  /*     N = int(#[1]); */
     439  /*   } */
     440  /* } */
     441  /* if (N<=0) { return(q); } */
     442  /* poly q = a*b - b*a; */
     443  /* if (N >1) */
     444  /* { */
     445  /*   for(int i=1; i<=N-1; i++) */
     446  /*   { */
     447  /*     q = lieBracket(a,q); */
     448  /*   } */
     449  /* } */
     450  /* return(q); */
    443451}
    444452example
  • Singular/iparith.cc

    r705501 r4063070  
    28752875  res->data=NULL;
    28762876
    2877   if (rIsPluralRing(currRing))
     2877  if (rIsPluralRing(currRing) || rIsLPRing(currRing))
    28782878  {
    28792879    const poly q = (poly)b->Data();
     
    28832883      if( (poly)a->Data() != NULL )
    28842884      {
    2885         poly p = (poly)a->CopyD(POLY_CMD); // p = copy!
    2886         res->data = nc_p_Bracket_qq(p,q, currRing); // p will be destroyed!
     2885        if (rIsPluralRing(currRing))
     2886        {
     2887          poly p = (poly)a->CopyD(POLY_CMD); // p = copy!
     2888          res->data = nc_p_Bracket_qq(p,q, currRing); // p will be destroyed!
     2889        }
     2890        else if (rIsLPRing(currRing))
     2891        {
     2892          const poly p = (poly)a->Data();
     2893          res->data = pAdd(ppMult_qq(p,q), pNeg(ppMult_qq(q,p)));
     2894        }
     2895      }
     2896    }
     2897  }
     2898  return FALSE;
     2899}
     2900static BOOLEAN jjBRACKET_REC(leftv res, leftv a, leftv b, leftv c)
     2901{
     2902  res->data=NULL;
     2903
     2904  if (rIsLPRing(currRing) || rIsPluralRing(currRing))
     2905  {
     2906    const poly q = (poly)b->Data();
     2907    if(q != NULL)
     2908    {
     2909      if((poly)a->Data() != NULL)
     2910      {
     2911        const poly p = (poly)a->Data();
     2912        int k=(int)(long)c->Data();
     2913        if (k > 0)
     2914        {
     2915          poly qq = pCopy(q);
     2916          for (int i = 0; i < k; i++)
     2917          {
     2918            poly qq_ref = qq;
     2919            if (rIsLPRing(currRing))
     2920            {
     2921              qq = pAdd(ppMult_qq(p,qq), pNeg(ppMult_qq(qq,p)));
     2922            }
     2923            else if (rIsPluralRing(currRing))
     2924            {
     2925              qq = nc_p_Bracket_qq(pCopy(p), qq, currRing);
     2926            }
     2927            pDelete(&qq_ref);
     2928            if (qq == NULL) break;
     2929          }
     2930          res->data = qq;
     2931        }
     2932        else
     2933        {
     2934          Werror("invalid number of iterations");
     2935        }
    28872936      }
    28882937    }
  • Singular/table.h

    r705501 r4063070  
    593593,{D(jjBETTI2_ID), BETTI_CMD,      INTMAT_CMD,     IDEAL_CMD,  INT_CMD, ALLOW_PLURAL | ALLOW_RING}
    594594,{D(jjBETTI2_ID), BETTI_CMD,      INTMAT_CMD,     MODUL_CMD,  INT_CMD, ALLOW_PLURAL | ALLOW_RING}
    595 #ifdef HAVE_PLURAL
    596 ,{D(jjBRACKET),   BRACKET_CMD,    POLY_CMD,       POLY_CMD,   POLY_CMD, ALLOW_PLURAL | NO_RING}
     595#if defined(HAVE_PLURAL) || defined(HAVE_SHIFTBBA)
     596,{D(jjBRACKET),   BRACKET_CMD,    POLY_CMD,       POLY_CMD,   POLY_CMD, ALLOW_NC | NO_RING}
    597597#endif
    598598,{D(jjCHINREM_BI),CHINREM_CMD,    BIGINT_CMD,     INTVEC_CMD, INTVEC_CMD, ALLOW_PLURAL |ALLOW_RING}
     
    794794,{D(atATTRIB3),        ATTRIB_CMD, NONE,       IDHDL,      STRING_CMD, DEF_CMD, ALLOW_NC |ALLOW_RING}
    795795,{D(jjBAREISS3),       BAREISS_CMD,LIST_CMD,   MODUL_CMD,  INT_CMD,    INT_CMD, NO_NC |ALLOW_RING|NO_ZERODIVISOR}
     796#if defined(HAVE_SHIFTBBA) || defined(HAVE_PLURAL)
     797,{D(jjBRACKET_REC),    BRACKET_CMD,POLY_CMD,   POLY_CMD,   POLY_CMD,   INT_CMD, ALLOW_NC | NO_RING}
     798#endif
    796799,{D(jjCOEFFS3_P),      COEFFS_CMD, MATRIX_CMD, POLY_CMD,   POLY_CMD,   MATRIX_CMD, ALLOW_PLURAL |ALLOW_RING}
    797800,{D(jjCOEFFS3_P),      COEFFS_CMD, MATRIX_CMD, VECTOR_CMD, POLY_CMD,   MATRIX_CMD, ALLOW_PLURAL |ALLOW_RING}
     
    986989  { "bigintmat",   0, BIGINTMAT_CMD ,     BIGINTMAT_CMD},
    987990  { "branchTo",    0, BRANCHTO_CMD ,      CMD_M},
    988   #ifdef HAVE_PLURAL
    989   { "bracket",     0, BRACKET_CMD ,       CMD_2},
     991  #if defined(HAVE_SHIFTBBA) || defined(HAVE_PLURAL)
     992  { "bracket",     0, BRACKET_CMD ,       CMD_23},
    990993  #endif
    991994  { "break",       0, BREAK_CMD ,         BREAK_CMD},
  • Tst/Manual/m.lst

    r705501 r4063070  
    10701070involution
    10711071isFsat
    1072 isVar
    10731072makeQsl2
    10741073makeUsp1
  • Tst/Short/ncfactor_example_all_procedures_s.res.gz.uu

    r705501 r4063070  
    11begin 640 ncfactor_example_all_procedures_s.res.gz
    2 M'XL("(^-:%H"`VYC9F%C=&]R7V5X86UP;&5?86QL7W!R;V-E9'5R97-?<RYR
    3 M97,`W5??3^,X$'[/7Q$A'H!*Y9H$5BH2I]V6ZB*QA:/5WD.U6SG)I+%P[&`[
    4 M_7%__8V3E`4V#@LKG73W$J>>;[Z,QS-?[=E\'$Y=UQU<NM?A)_=`*]UG-#JX
    5 M<&:-Q;MT<7)).=5'QQ>.&=W+2Y?'*8FUD$O8DKQ@L"2,+0LI8DA*"6JI^APV
    6 M?:6)?F3R&Z85%Q*.#D9?9FXX=@_#Y/``B4]/GUB'[A/K(T'0!+G_]HM(SVK^
    7 MO=5$.P>E*5^Y"3#0L$S*@M&8:(R/"PUKPOK.K(QC4"HM\?U5^)+P9*F$U*UN
    8 ML<@CRN$^I9REK8@"9%X4K2;T)'(W`R+CK!6P`OV1L3%=4PQ`3:3()[C.:ZK:
    9 M@]&2$KZ:EGFK-45WXSH7(==KB*V@VCP7UN_@GB=E#'^(7*P,:"+D;35E@0NE
    10 M:,1J_"V16H7\$^@-`&_%<]CJ68[%!?**:[E[*^E4\#N(2ZGH&EI]*8\EY,!-
    11 MB5LS\9FV1T>56?+50TE8>_3[+J'J+]B]BOG3"HHSB._#%#.+)335V4\#[904
    12 MDS02>5YBCV)R9F5TA]/MA5`'&']'=\#HWX!%TU'"(P%I.L?>`H7?C]J3(B1N
    13 M.E)-*D[5WJ;8"PFTV_*2:5JPG?''<&Y*79261L%Q.L+8VWD$5TW]S3/";<OZ
    14 M3+9C6$F`+Y8*HFK29`?S)WA#V0HU^@))R!58=.8%E[W\#-,S:'NN,M,VF("N
    15 MNGJ!,7)OJX'NVD1]J-HTY%D]:$#%0ZDB$654[[J"4,B^(=XO0A+4=IFC4-_A
    16 MQ$WZ732ZG%8DSPG&/L]`DRX@ZI7$E%>LP$&4:B_9[_.ZAE2_S_..KK).5^QG
    17 M;`H857];=7V@T&$I5V2=V6@:.8^:_)DJLR%O*W4VFTM!80JKN&;6SJW*8HRR
    18 M*FE4FJ!^8O770!+\.<=]O4D;_*U@.\O^FT9]%R[D:S#-:0]\0W4F9-(MTD9Z
    19 MC1$U]R.S2BY:K0S&G-%4O]:KM?P;@QNXJ9`_V)"),DCZSM6V@!B7-N3.8O!U
    20 MZ)A#X:GG++SZ_<@[>0B^G1^?;(-OP4F"CUX]==8+S!#TSLW@5P#?`/P&X-<6
    21 MKQHJLV?,7L\_V>*;U_-P#F=Z@]^<A=]\[<$0^0:)C][1<\<M\ON]VBEP1*0)
    22 M-K,U\#=0/7[^7UELM2MG_]-=602U3S)P%F?UZQ;C/F]F?6?QH9G]#^_@6Q:)
    23 MS]]_W&>J\*BCW8V0]\UA&H]M;->OX0S(^ND1T5QXAL.GEYS'R\]Y??DQ%ZY2
    24 7F:O/WO#AF6%P?.$>.O\`2J>J*_8-````
     2M'XL("%B;8EP"`VYC9F%C=&]R7V5X86UP;&5?86QL7W!R;V-E9'5R97-?<RYR
     3M97,`W5=;3^,X%'[/KX@0#T"ELDT"(Q6)U4Q+M9&8PM)J]J&:J9SDI+%P[&`[
     4MO>ROW^,D98")P\!(*^V^Q*[/=SX?GUOMV7P<3EW7'5RZU^$G]T`KW6<T.KAP
     5M9HW$NW1Q<4DYU4?'%XX9W<M+E\<IB;602]B2O&"P)(PM"REB2$H):JGZ'#9]
     6MI8E^9/(;IA47$HX.1E]F;CAV#\/D\`")3T^?2(?N$^DC0=`8N=_[A:5G-?]>
     7M:JR=@]*4K]P$&&A8)F7!:$PTVL>%AC5A?6=6QC$HE98X?Q6^)#Q9*B%UJUHL
     8M\HARN$\I9VDKH@"9%T6K"#6)W,V`R#AK!:Q`?V1L3-<4#5`3*?()GO.:JG9C
     9MM*2$KZ9EWBI-4=VHSD7(]1IB*Z@6SX5U'XQY4L;PA\C%RH`F0MY62Q:X4(I&
     10MK,;?$JE5R#^!W@#P5CR'K9[EF%P@K[B6N[>23@6_@[B4BJZA59?R6$(.W*2X
     11MU1-4F:-=/92$M5NYKP:J_H+=JY@_K:`X@_@^3-&#F"I3G?TTT$Y)T1DCD><E
     12MUB(Z859&=[C<'O#:P/@[N@-&_P9,CHY4'0E(TSG6$"C</VIWBI`87*2:5)RJ
     13MO1PQYQ-HE^4ET[1@.Z./YMR4NB@M!8'C=(2VM_,(KIH\FV>$VX[UF6S'L)(`
     14M7ZR9,FF\@_X3O*%LA9H^`DG(%5CZR0LN>_H9IF?0=E]EICS0`5UY]0)CVKHM
     15M![IS$_M`58XAS^I!`W8V;$DDHHSJ79<1"MDWQ/M%2((]7.;8D.]PX2;]WARZ
     16ME%8DSPG:/L]`DRX@]B6)+J]8@8,HU;XUOT_K&E+]/LT[NLHZ5;&>L2A@5/T]
     17MU?GQF7),Y8JLTQM-(>=1XS^393;D;=6%37`I*'1A9=?,6KE56HRQK4H:E<:H
     18MGSC]-9`$?\XQKC=I@[\5;&>)ORG4=^%"O@93G';#-U1G0B;=3=JT7B/$GON1
     19M65LN2JT,1IS15+]6JW7[-P(W<%,A?Y`A$V60])VK;0$Q'FW(G<7@Z]`QE[]3
     20MSUEX]?S(.WD(OIT?GVR#;\%)@I]>O736"\P0],[-X%<`WP#\!N#7$J\:*K%G
     21MQ%[//]GBS.MYN(8KO<%OSL)O=GLP1+Y!XJ=W]%QQB_Q^KU8*'!%I@L5L-?P-
     22M5(_;_RN'K:)R]C^-RB*H=9*!LSBKIUNT^[Q9]9W%AV;U/QS!MQP2O[__&&>J
     23M\*JCW8V0]\VE&:]M;->OX0S(^ND5T3QLAL.GCYG'1\YY_<@Q#ZM2F2?.7O#A
     241F6!P?.$>.O\`/4L7U-X-````
    2525`
    2626end
  • Tst/Short/ncfactor_example_all_procedures_s.stat

    r705501 r4063070  
    1 1 >> tst_memory_0 :: 1516801423:4104, 64 bit:4.1.0:x86_64-Linux:nepomuck:3967424
    2 1 >> tst_memory_1 :: 1516801423:4104, 64 bit:4.1.0:x86_64-Linux:nepomuck:7045120
    3 1 >> tst_memory_2 :: 1516801423:4104, 64 bit:4.1.0:x86_64-Linux:nepomuck:17891328
    4 1 >> tst_timer :: 1516801423:4104, 64 bit:4.1.0:x86_64-Linux:nepomuck:14634
    5 2 >> tst_memory_0 :: 1516801423:4104, 64 bit:4.1.0:x86_64-Linux:nepomuck:3968152
    6 2 >> tst_memory_1 :: 1516801423:4104, 64 bit:4.1.0:x86_64-Linux:nepomuck:7045120
    7 2 >> tst_memory_2 :: 1516801423:4104, 64 bit:4.1.0:x86_64-Linux:nepomuck:17891328
    8 2 >> tst_timer_1 :: 1516801423:4104, 64 bit:4.1.0:x86_64-Linux:nepomuck:14634
     11 >> tst_memory_0 :: 1549966168:4114, 64 bit:4.1.1:x86_64-Linux:nepomuck:4038920
     21 >> tst_memory_1 :: 1549966168:4114, 64 bit:4.1.1:x86_64-Linux:nepomuck:9031680
     31 >> tst_memory_2 :: 1549966168:4114, 64 bit:4.1.1:x86_64-Linux:nepomuck:17932288
     41 >> tst_timer :: 1549966168:4114, 64 bit:4.1.1:x86_64-Linux:nepomuck:11234
     52 >> tst_memory_0 :: 1549966168:4114, 64 bit:4.1.1:x86_64-Linux:nepomuck:4039648
     62 >> tst_memory_1 :: 1549966168:4114, 64 bit:4.1.1:x86_64-Linux:nepomuck:9031680
     72 >> tst_memory_2 :: 1549966168:4114, 64 bit:4.1.1:x86_64-Linux:nepomuck:17932288
     82 >> tst_timer_1 :: 1549966168:4114, 64 bit:4.1.1:x86_64-Linux:nepomuck:11235
Note: See TracChangeset for help on using the changeset viewer.