From ead4017b5fc494739d77918edae2dfb8abb89a75 Mon Sep 17 00:00:00 2001 From: pzinn Date: Wed, 17 Jul 2024 23:57:06 +1000 Subject: [PATCH] moved pseudocodeClosureClass def down --- M2/Macaulay2/d/expr.d | 3 +- .../examples/___L__Rdecomposition.out | 18 +++---- .../examples/_backward__Substitution.out | 34 ++++++------ .../examples/_extract__Left__Lower.out | 22 ++++---- .../examples/_extract__Right__Upper.out | 22 ++++---- .../examples/_forward__Substitution.out | 34 ++++++------ .../AdjointIdeal/examples/_trace__Matrix.out | 28 +++++----- .../examples/_initial__Ideals.out | 2 +- .../StatePolytope/examples/_is__Stable.out | 53 +------------------ ...polymake__State__Polytope_lp__Ideal_rp.out | 18 +------ ..._State__Polytope_lp__Z__Z_cm__Ideal_rp.out | 18 +------ 11 files changed, 84 insertions(+), 168 deletions(-) diff --git a/M2/Macaulay2/d/expr.d b/M2/Macaulay2/d/expr.d index 03409c1a6d6..03f77789a8b 100644 --- a/M2/Macaulay2/d/expr.d +++ b/M2/Macaulay2/d/expr.d @@ -276,7 +276,6 @@ export compiledFunctionClosureClass := newtypeof(functionClass); export symbolClass := newbasictype(); export keywordClass := newtypeof(symbolClass); export pseudocodeClass := newbasictype(); -export pseudocodeClosureClass := newtypeof(pseudocodeClass); export mysqlConnectionClass := newbasictype(); export mysqlFieldClass := newbasictype(); export mysqlResultClass := newbasictype(); @@ -347,7 +346,7 @@ export RRiClass := newbignumbertype(); export pointerClass := newbasictype(); export atomicIntClass := newbasictype(); -- all new types, dictionaries, and classes go just above this line, if possible, so hash codes don't change gratuitously! - +export pseudocodeClosureClass := newtypeof(pseudocodeClass); --Error Handling export buildErrorPacket(message:string):Expr := Expr(Error(dummyPosition,message,nullE,false,dummyFrame)); diff --git a/M2/Macaulay2/packages/AdjointIdeal/examples/___L__Rdecomposition.out b/M2/Macaulay2/packages/AdjointIdeal/examples/___L__Rdecomposition.out index b659b13ce58..ffb98796dbd 100644 --- a/M2/Macaulay2/packages/AdjointIdeal/examples/___L__Rdecomposition.out +++ b/M2/Macaulay2/packages/AdjointIdeal/examples/___L__Rdecomposition.out @@ -1,4 +1,4 @@ --- -*- M2-comint -*- {* hash: 8304827897892544867 +-- -*- M2-comint -*- hash: 10702941089498353388 i1 : A=random(QQ^3,QQ^3) @@ -6,8 +6,8 @@ o1 = | 9/2 1/2 3/2 | | 1/2 1 3/4 | | 9/4 3/4 7/4 | - 3 3 -o1 : Matrix QQ <--- QQ + 3 3 +o1 : Matrix QQ <-- QQ i2 : (perm,LR)=LRdecomposition(A,j->-j); @@ -23,8 +23,8 @@ o4 = | 1 0 0 | | 0 1 0 | | 0 0 1 | - 3 3 -o4 : Matrix QQ <--- QQ + 3 3 +o4 : Matrix QQ <-- QQ i5 : R=extractRightUpper(LR) @@ -32,8 +32,8 @@ o5 = | 9/2 1/2 3/2 | | 0 17/18 7/12 | | 0 0 47/68 | - 3 3 -o5 : Matrix QQ <--- QQ + 3 3 +o5 : Matrix QQ <-- QQ i6 : L=extractLeftLower(LR) @@ -41,8 +41,8 @@ o6 = | 1 0 0 | | 1/9 1 0 | | 1/2 9/17 1 | - 3 3 -o6 : Matrix QQ <--- QQ + 3 3 +o6 : Matrix QQ <-- QQ i7 : L*R==P*A diff --git a/M2/Macaulay2/packages/AdjointIdeal/examples/_backward__Substitution.out b/M2/Macaulay2/packages/AdjointIdeal/examples/_backward__Substitution.out index 0ee5e4eb3a3..a64000e58ac 100644 --- a/M2/Macaulay2/packages/AdjointIdeal/examples/_backward__Substitution.out +++ b/M2/Macaulay2/packages/AdjointIdeal/examples/_backward__Substitution.out @@ -1,4 +1,4 @@ --- -*- M2-comint -*- {* hash: 7984992172877006531 +-- -*- M2-comint -*- hash: 2904647246987054764 i1 : A=random(QQ^3,QQ^3) @@ -6,8 +6,8 @@ o1 = | 9/2 1/2 3/2 | | 1/2 1 3/4 | | 9/4 3/4 7/4 | - 3 3 -o1 : Matrix QQ <--- QQ + 3 3 +o1 : Matrix QQ <-- QQ i2 : (perm,LR)=LRdecomposition(A,j->-j); @@ -17,8 +17,8 @@ o3 = | 9/2 1/2 3/2 | | 1/9 17/18 7/12 | | 1/2 9/17 47/68 | - 3 3 -o3 : Matrix QQ <--- QQ + 3 3 +o3 : Matrix QQ <-- QQ i4 : P=transpose (id_(QQ^3))_perm @@ -26,8 +26,8 @@ o4 = | 1 0 0 | | 0 1 0 | | 0 0 1 | - 3 3 -o4 : Matrix QQ <--- QQ + 3 3 +o4 : Matrix QQ <-- QQ i5 : R=extractRightUpper(LR) @@ -35,8 +35,8 @@ o5 = | 9/2 1/2 3/2 | | 0 17/18 7/12 | | 0 0 47/68 | - 3 3 -o5 : Matrix QQ <--- QQ + 3 3 +o5 : Matrix QQ <-- QQ i6 : L=extractLeftLower(LR) @@ -44,8 +44,8 @@ o6 = | 1 0 0 | | 1/9 1 0 | | 1/2 9/17 1 | - 3 3 -o6 : Matrix QQ <--- QQ + 3 3 +o6 : Matrix QQ <-- QQ i7 : L*R==P*A @@ -53,8 +53,8 @@ o7 = true i8 : b=random(QQ^3,QQ^1); - 3 1 -o8 : Matrix QQ <--- QQ + 3 1 +o8 : Matrix QQ <-- QQ i9 : y=forwardSubstitution(LR,P*b) @@ -62,8 +62,8 @@ o9 = | 7/9 | | 497/810 | | -109/510 | - 3 1 -o9 : Matrix QQ <--- QQ + 3 1 +o9 : Matrix QQ <-- QQ i10 : x=backwardSubstitution(LR,y) @@ -71,8 +71,8 @@ o10 = | 386/2115 | | 1778/2115 | | -218/705 | - 3 1 -o10 : Matrix QQ <--- QQ + 3 1 +o10 : Matrix QQ <-- QQ i11 : inverse(A)*b==x diff --git a/M2/Macaulay2/packages/AdjointIdeal/examples/_extract__Left__Lower.out b/M2/Macaulay2/packages/AdjointIdeal/examples/_extract__Left__Lower.out index c9241a1241f..82b19c62674 100644 --- a/M2/Macaulay2/packages/AdjointIdeal/examples/_extract__Left__Lower.out +++ b/M2/Macaulay2/packages/AdjointIdeal/examples/_extract__Left__Lower.out @@ -1,4 +1,4 @@ --- -*- M2-comint -*- {* hash: 7196600487489436217 +-- -*- M2-comint -*- hash: 9594713679095244738 i1 : A=random(QQ^3,QQ^3) @@ -6,8 +6,8 @@ o1 = | 9/2 1/2 3/2 | | 1/2 1 3/4 | | 9/4 3/4 7/4 | - 3 3 -o1 : Matrix QQ <--- QQ + 3 3 +o1 : Matrix QQ <-- QQ i2 : (perm,LR)=LRdecomposition(A,j->-j); @@ -17,8 +17,8 @@ o3 = | 9/2 1/2 3/2 | | 1/9 17/18 7/12 | | 1/2 9/17 47/68 | - 3 3 -o3 : Matrix QQ <--- QQ + 3 3 +o3 : Matrix QQ <-- QQ i4 : P=transpose (id_(QQ^3))_perm @@ -26,8 +26,8 @@ o4 = | 1 0 0 | | 0 1 0 | | 0 0 1 | - 3 3 -o4 : Matrix QQ <--- QQ + 3 3 +o4 : Matrix QQ <-- QQ i5 : R=extractRightUpper(LR) @@ -35,8 +35,8 @@ o5 = | 9/2 1/2 3/2 | | 0 17/18 7/12 | | 0 0 47/68 | - 3 3 -o5 : Matrix QQ <--- QQ + 3 3 +o5 : Matrix QQ <-- QQ i6 : L=extractLeftLower(LR) @@ -44,8 +44,8 @@ o6 = | 1 0 0 | | 1/9 1 0 | | 1/2 9/17 1 | - 3 3 -o6 : Matrix QQ <--- QQ + 3 3 +o6 : Matrix QQ <-- QQ i7 : L*R==P*A diff --git a/M2/Macaulay2/packages/AdjointIdeal/examples/_extract__Right__Upper.out b/M2/Macaulay2/packages/AdjointIdeal/examples/_extract__Right__Upper.out index c9241a1241f..82b19c62674 100644 --- a/M2/Macaulay2/packages/AdjointIdeal/examples/_extract__Right__Upper.out +++ b/M2/Macaulay2/packages/AdjointIdeal/examples/_extract__Right__Upper.out @@ -1,4 +1,4 @@ --- -*- M2-comint -*- {* hash: 7196600487489436217 +-- -*- M2-comint -*- hash: 9594713679095244738 i1 : A=random(QQ^3,QQ^3) @@ -6,8 +6,8 @@ o1 = | 9/2 1/2 3/2 | | 1/2 1 3/4 | | 9/4 3/4 7/4 | - 3 3 -o1 : Matrix QQ <--- QQ + 3 3 +o1 : Matrix QQ <-- QQ i2 : (perm,LR)=LRdecomposition(A,j->-j); @@ -17,8 +17,8 @@ o3 = | 9/2 1/2 3/2 | | 1/9 17/18 7/12 | | 1/2 9/17 47/68 | - 3 3 -o3 : Matrix QQ <--- QQ + 3 3 +o3 : Matrix QQ <-- QQ i4 : P=transpose (id_(QQ^3))_perm @@ -26,8 +26,8 @@ o4 = | 1 0 0 | | 0 1 0 | | 0 0 1 | - 3 3 -o4 : Matrix QQ <--- QQ + 3 3 +o4 : Matrix QQ <-- QQ i5 : R=extractRightUpper(LR) @@ -35,8 +35,8 @@ o5 = | 9/2 1/2 3/2 | | 0 17/18 7/12 | | 0 0 47/68 | - 3 3 -o5 : Matrix QQ <--- QQ + 3 3 +o5 : Matrix QQ <-- QQ i6 : L=extractLeftLower(LR) @@ -44,8 +44,8 @@ o6 = | 1 0 0 | | 1/9 1 0 | | 1/2 9/17 1 | - 3 3 -o6 : Matrix QQ <--- QQ + 3 3 +o6 : Matrix QQ <-- QQ i7 : L*R==P*A diff --git a/M2/Macaulay2/packages/AdjointIdeal/examples/_forward__Substitution.out b/M2/Macaulay2/packages/AdjointIdeal/examples/_forward__Substitution.out index 0ee5e4eb3a3..a64000e58ac 100644 --- a/M2/Macaulay2/packages/AdjointIdeal/examples/_forward__Substitution.out +++ b/M2/Macaulay2/packages/AdjointIdeal/examples/_forward__Substitution.out @@ -1,4 +1,4 @@ --- -*- M2-comint -*- {* hash: 7984992172877006531 +-- -*- M2-comint -*- hash: 2904647246987054764 i1 : A=random(QQ^3,QQ^3) @@ -6,8 +6,8 @@ o1 = | 9/2 1/2 3/2 | | 1/2 1 3/4 | | 9/4 3/4 7/4 | - 3 3 -o1 : Matrix QQ <--- QQ + 3 3 +o1 : Matrix QQ <-- QQ i2 : (perm,LR)=LRdecomposition(A,j->-j); @@ -17,8 +17,8 @@ o3 = | 9/2 1/2 3/2 | | 1/9 17/18 7/12 | | 1/2 9/17 47/68 | - 3 3 -o3 : Matrix QQ <--- QQ + 3 3 +o3 : Matrix QQ <-- QQ i4 : P=transpose (id_(QQ^3))_perm @@ -26,8 +26,8 @@ o4 = | 1 0 0 | | 0 1 0 | | 0 0 1 | - 3 3 -o4 : Matrix QQ <--- QQ + 3 3 +o4 : Matrix QQ <-- QQ i5 : R=extractRightUpper(LR) @@ -35,8 +35,8 @@ o5 = | 9/2 1/2 3/2 | | 0 17/18 7/12 | | 0 0 47/68 | - 3 3 -o5 : Matrix QQ <--- QQ + 3 3 +o5 : Matrix QQ <-- QQ i6 : L=extractLeftLower(LR) @@ -44,8 +44,8 @@ o6 = | 1 0 0 | | 1/9 1 0 | | 1/2 9/17 1 | - 3 3 -o6 : Matrix QQ <--- QQ + 3 3 +o6 : Matrix QQ <-- QQ i7 : L*R==P*A @@ -53,8 +53,8 @@ o7 = true i8 : b=random(QQ^3,QQ^1); - 3 1 -o8 : Matrix QQ <--- QQ + 3 1 +o8 : Matrix QQ <-- QQ i9 : y=forwardSubstitution(LR,P*b) @@ -62,8 +62,8 @@ o9 = | 7/9 | | 497/810 | | -109/510 | - 3 1 -o9 : Matrix QQ <--- QQ + 3 1 +o9 : Matrix QQ <-- QQ i10 : x=backwardSubstitution(LR,y) @@ -71,8 +71,8 @@ o10 = | 386/2115 | | 1778/2115 | | -218/705 | - 3 1 -o10 : Matrix QQ <--- QQ + 3 1 +o10 : Matrix QQ <-- QQ i11 : inverse(A)*b==x diff --git a/M2/Macaulay2/packages/AdjointIdeal/examples/_trace__Matrix.out b/M2/Macaulay2/packages/AdjointIdeal/examples/_trace__Matrix.out index 58824f15525..6e0cd88aa8a 100644 --- a/M2/Macaulay2/packages/AdjointIdeal/examples/_trace__Matrix.out +++ b/M2/Macaulay2/packages/AdjointIdeal/examples/_trace__Matrix.out @@ -1,4 +1,4 @@ --- -*- M2-comint -*- {* hash: 6396807864014088849 +-- -*- M2-comint -*- hash: 12037781316971699690 i1 : K=QQ @@ -25,8 +25,8 @@ i5 : QR=frac(Rvu); i6 : ib=matrix {{1, v, (-1+v^2)/(-1+u), 1/(-1+u)/u*v^3+(-2+u)/(-1+u)/u*v}}; - 1 4 -o6 : Matrix QR <--- QR + 1 4 +o6 : Matrix QR <-- QR i7 : traceMatrix(I,ib) @@ -35,8 +35,8 @@ o7 = | 4 0 0 0 | | 0 0 8u+4 0 | | 0 8u-4 0 16 | - 4 4 -o7 : Matrix (frac QQ[u]) <--- (frac QQ[u]) + 4 4 +o7 : Matrix (frac(QQ[u])) <-- (frac(QQ[u])) i8 : K=QQ; @@ -55,8 +55,8 @@ i12 : QR=frac(Rvu); i13 : ib=matrix({{1,v,v^2/u}}); - 1 3 -o13 : Matrix QR <--- QR + 1 3 +o13 : Matrix QR <-- QR i14 : traceMatrix(I,ib) @@ -64,8 +64,8 @@ o14 = | 3 0 0 | | 0 0 3u | | 0 3u 0 | - 3 3 -o14 : Matrix (frac QQ[u]) <--- (frac QQ[u]) + 3 3 +o14 : Matrix (frac(QQ[u])) <-- (frac(QQ[u])) i15 : K=QQ; @@ -81,8 +81,8 @@ i19 : QR=frac(Rvu); i20 : ib=matrix({{1,v,v^2,v^3/(u+1),1/u/(u+1)*v^4,1/u^2/(u+1)*v^5-7/5*(u-1)/u*v}}); - 1 6 -o20 : Matrix QR <--- QR + 1 6 +o20 : Matrix QR <-- QR i21 : traceMatrix(I,ib) @@ -96,7 +96,7 @@ o21 = | 6 0 0 0 (-28u2-56u-28)/5 (-28u3-56u2-28u)/5 0 0 (-36u4-36u3)/5 - -36u4/5 0 + (-36u4)/5 0 0 (196u4+784u3+1176u2+784u+196)/25 (196u4+980u3+1372u2+588u)/25 0 ----------------------------------------------------------------------- @@ -107,7 +107,7 @@ o21 = | 6 0 0 0 | (420u4+1764u3+1260u2-84u)/25 | - 6 6 -o21 : Matrix (frac QQ[u]) <--- (frac QQ[u]) + 6 6 +o21 : Matrix (frac(QQ[u])) <-- (frac(QQ[u])) i22 : diff --git a/M2/Macaulay2/packages/StatePolytope/examples/_initial__Ideals.out b/M2/Macaulay2/packages/StatePolytope/examples/_initial__Ideals.out index 7f6c83ae294..039c963ccba 100644 --- a/M2/Macaulay2/packages/StatePolytope/examples/_initial__Ideals.out +++ b/M2/Macaulay2/packages/StatePolytope/examples/_initial__Ideals.out @@ -1,4 +1,4 @@ --- -*- M2-comint -*- hash: 14658019932774412443 +-- -*- M2-comint -*- hash: 16854173351536854980 i1 : R = QQ[a,b]; diff --git a/M2/Macaulay2/packages/StatePolytope/examples/_is__Stable.out b/M2/Macaulay2/packages/StatePolytope/examples/_is__Stable.out index 97105b418a5..2e505a2ff50 100644 --- a/M2/Macaulay2/packages/StatePolytope/examples/_is__Stable.out +++ b/M2/Macaulay2/packages/StatePolytope/examples/_is__Stable.out @@ -1,4 +1,4 @@ --- -*- M2-comint -*- hash: 8122218477276221205 +-- -*- M2-comint -*- hash: 125432350973036782 i1 : R = QQ[a..d]; @@ -7,38 +7,6 @@ i2 : I = ideal(a*c-b^2,a*d-b*c,b*d-c^2); o2 : Ideal of R i3 : isStable(3,I) -polymake: used package cdd - cddlib - Implementation of the double description method of Motzkin et al. - Copyright by Komei Fukuda. - http://www-oldurls.inf.ethz.ch/personal/fukudak/cdd_home/ - -VERTICES -1 9 6 6 9 -1 6 12 3 9 -1 4 14 5 7 -1 3 14 8 5 -1 9 3 12 6 -1 7 5 14 4 -1 5 8 14 3 -1 3 12 12 3 - -polymake: used package cdd - cddlib - Implementation of the double description method of Motzkin et al. - Copyright by Komei Fukuda. - http://www-oldurls.inf.ethz.ch/personal/fukudak/cdd_home/ - -VERTICES -1 9 6 6 9 -1 6 12 3 9 -1 4 14 5 7 -1 3 14 8 5 -1 9 3 12 6 -1 7 5 14 4 -1 5 8 14 3 -1 3 12 12 3 - o3 = true @@ -47,25 +15,6 @@ i4 : I = ideal(a^2,b^2,b*c); o4 : Ideal of R i5 : isStable(3,I) -polymake: used package cdd - cddlib - Implementation of the double description method of Motzkin et al. - Copyright by Komei Fukuda. - http://www-oldurls.inf.ethz.ch/personal/fukudak/cdd_home/ - -VERTICES -1 11 13 6 3 - -polymake: used package cdd - cddlib - Implementation of the double description method of Motzkin et al. - Copyright by Komei Fukuda. - http://www-oldurls.inf.ethz.ch/personal/fukudak/cdd_home/ - -VERTICES -1 33/4 33/4 33/4 33/4 -1 11 13 6 3 - o5 = false diff --git a/M2/Macaulay2/packages/StatePolytope/examples/_polymake__State__Polytope_lp__Ideal_rp.out b/M2/Macaulay2/packages/StatePolytope/examples/_polymake__State__Polytope_lp__Ideal_rp.out index a8eb3ee85d1..6ccb26de82c 100644 --- a/M2/Macaulay2/packages/StatePolytope/examples/_polymake__State__Polytope_lp__Ideal_rp.out +++ b/M2/Macaulay2/packages/StatePolytope/examples/_polymake__State__Polytope_lp__Ideal_rp.out @@ -1,4 +1,4 @@ --- -*- M2-comint -*- hash: 18003085181435605007 +-- -*- M2-comint -*- hash: 1752494526488495928 i1 : R = QQ[a..d]; @@ -7,22 +7,6 @@ i2 : I = ideal(a*c-b^2,a*d-b*c,b*d-c^2); o2 : Ideal of R i3 : polymakeStatePolytope(I) -polymake: used package cdd - cddlib - Implementation of the double description method of Motzkin et al. - Copyright by Komei Fukuda. - http://www-oldurls.inf.ethz.ch/personal/fukudak/cdd_home/ - -VERTICES -1 11 7 7 11 -1 7 15 3 11 -1 4 18 6 8 -1 3 18 9 6 -1 11 3 15 7 -1 8 6 18 4 -1 6 9 18 3 -1 3 15 15 3 - o3 = {{11, 7, 7, 11}, {7, 15, 3, 11}, {4, 18, 6, 8}, {3, 18, 9, 6}, {11, 3, ------------------------------------------------------------------------ diff --git a/M2/Macaulay2/packages/StatePolytope/examples/_polymake__State__Polytope_lp__Z__Z_cm__Ideal_rp.out b/M2/Macaulay2/packages/StatePolytope/examples/_polymake__State__Polytope_lp__Z__Z_cm__Ideal_rp.out index 282cb172665..1153f22575c 100644 --- a/M2/Macaulay2/packages/StatePolytope/examples/_polymake__State__Polytope_lp__Z__Z_cm__Ideal_rp.out +++ b/M2/Macaulay2/packages/StatePolytope/examples/_polymake__State__Polytope_lp__Z__Z_cm__Ideal_rp.out @@ -1,4 +1,4 @@ --- -*- M2-comint -*- hash: 18002316241657736360 +-- -*- M2-comint -*- hash: 1751725586710627281 i1 : R = QQ[a..d]; @@ -7,22 +7,6 @@ i2 : I = ideal(a*c-b^2,a*d-b*c,b*d-c^2); o2 : Ideal of R i3 : polymakeStatePolytope(3,I) -polymake: used package cdd - cddlib - Implementation of the double description method of Motzkin et al. - Copyright by Komei Fukuda. - http://www-oldurls.inf.ethz.ch/personal/fukudak/cdd_home/ - -VERTICES -1 9 6 6 9 -1 6 12 3 9 -1 4 14 5 7 -1 3 14 8 5 -1 9 3 12 6 -1 7 5 14 4 -1 5 8 14 3 -1 3 12 12 3 - o3 = {{9, 6, 6, 9}, {6, 12, 3, 9}, {4, 14, 5, 7}, {3, 14, 8, 5}, {9, 3, 12, ------------------------------------------------------------------------