From 78b148282d52653ef6cb7e8d4c0aacc430049c18 Mon Sep 17 00:00:00 2001 From: Mike Stillman Date: Wed, 7 Jun 2023 12:40:44 -0400 Subject: [PATCH 1/2] fix github issue #2865 --- M2/Macaulay2/packages/gfanInterface.m2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/M2/Macaulay2/packages/gfanInterface.m2 b/M2/Macaulay2/packages/gfanInterface.m2 index 4296780e0db..798cc6a657b 100644 --- a/M2/Macaulay2/packages/gfanInterface.m2 +++ b/M2/Macaulay2/packages/gfanInterface.m2 @@ -1640,7 +1640,7 @@ gfanInitialForms (MarkedPolynomialList, List) := opts -> (L,W) -> ( ) gfanInitialForms (Ideal, List) := opts -> (I,L) -> ( - gfanInitialForms(flatten entries gens I, List, opts) + gfanInitialForms(flatten entries gens I, L, opts) ) -------------------------------------------------------- From e08f5f190e32e077630a40207ce810e88f893656 Mon Sep 17 00:00:00 2001 From: "Daniel R. Grayson" Date: Tue, 13 Jun 2023 12:46:42 -0400 Subject: [PATCH 2/2] get ready for next release --- M2/Macaulay2/packages/=distributed-packages | 2 +- .../examples/_solve__Decomposable__System.out | 10 + M2/Macaulay2/packages/GraphicalModelsMLE.m2 | 16 +- M2/Macaulay2/packages/Jets.m2 | 16 +- M2/Macaulay2/packages/LinearTruncations.m2 | 16 +- M2/Macaulay2/packages/Macaulay2Doc/changes.m2 | 40 ++ ...tions_spon_spnoncommutative_spalgebras.out | 4 +- .../_matrix_lp__N__C__Ring__Map_rp.out | 2 +- .../NCAlgebra/examples/_to__M2__Ring.out | 2 +- M2/Macaulay2/packages/NoetherianOperators.m2 | 20 +- .../examples/___L__Rtriple.out | 190 +++++----- .../examples/___Pieri__Homotopies.out | 50 +-- .../examples/_change__Flags.out | 4 +- .../examples/_parse__Triplet.out | 342 +++++++++--------- .../examples/_print__Statistics.out | 2 +- .../examples/_set__Verbose__Level.out | 96 ++--- .../_solutions__To__Affine__Coords.out | 24 +- .../examples/_to__Laurent__Polynomial.out | 6 +- .../PseudomonomialPrimaryDecomposition.m2 | 16 +- M2/Macaulay2/packages/RationalMaps.m2 | 16 +- M2/VERSION | 2 +- M2/distributions/deb/changelog | 6 + M2/libraries/gc/Makefile.in | 3 +- M2/libraries/readline/Makefile.in | 4 +- 24 files changed, 514 insertions(+), 375 deletions(-) diff --git a/M2/Macaulay2/packages/=distributed-packages b/M2/Macaulay2/packages/=distributed-packages index 81efacaa614..c341610f61a 100644 --- a/M2/Macaulay2/packages/=distributed-packages +++ b/M2/Macaulay2/packages/=distributed-packages @@ -255,4 +255,4 @@ PseudomonomialPrimaryDecomposition PolyominoIdeals MatchingFields CellularResolutions -SagbiGbDetection \ No newline at end of file +SagbiGbDetection diff --git a/M2/Macaulay2/packages/DecomposableSparseSystems/examples/_solve__Decomposable__System.out b/M2/Macaulay2/packages/DecomposableSparseSystems/examples/_solve__Decomposable__System.out index bee3f2408da..dcb01dc1719 100644 --- a/M2/Macaulay2/packages/DecomposableSparseSystems/examples/_solve__Decomposable__System.out +++ b/M2/Macaulay2/packages/DecomposableSparseSystems/examples/_solve__Decomposable__System.out @@ -102,6 +102,16 @@ The mixed volume of is 3 yet we found 2 points Attempting to find all 3 points via monodromy. +Found:2 solutions via monodromy +Found:3 solutions via monodromy +Found:3 solutions via monodromy +Found:3 solutions via monodromy +Found:3 solutions via monodromy +Found:3 solutions via monodromy +Found:3 solutions via monodromy +Found:3 solutions via monodromy +Found:3 solutions via monodromy +Found:3 solutions via monodromy Monodromy recovery was successful basicSolver: Computed 3 solutions diff --git a/M2/Macaulay2/packages/GraphicalModelsMLE.m2 b/M2/Macaulay2/packages/GraphicalModelsMLE.m2 index 3128db446f0..45a4fe50938 100644 --- a/M2/Macaulay2/packages/GraphicalModelsMLE.m2 +++ b/M2/Macaulay2/packages/GraphicalModelsMLE.m2 @@ -44,7 +44,21 @@ newPackage( Headline => "maximum likelihood estimates for graphical statistical models", Keywords => {"Algebraic Statistics"}, DebuggingMode => true, - PackageExports => {"GraphicalModels","Graphs","EigenSolver","NumericalAlgebraicGeometry","StatGraphs"} + PackageExports => {"GraphicalModels","Graphs","EigenSolver","NumericalAlgebraicGeometry","StatGraphs"}, + Certification => { + "journal name" => "The Journal of Software for Algebra and Geometry", + "journal URI" => "http://j-sag.org/", + "article title" => "Computing maximum likelihood estimates for Gaussian graphical models with Macaulay2", + "acceptance date" => "14 March 2022", + "published article URI" => "https://msp.org/jsag/2022/12-1/p01.xhtml", + "published article DOI" => "10.2140/jsag.2022.12.1", + "published code URI" => "https://msp.org/jsag/2022/12-1/jsag-v12-n1-x01-GraphicalModelsMLE.zip", + "repository code URI" => "http://github.com/Macaulay2/M2/blob/master/M2/Macaulay2/packages/GraphicalModelsMLE.m2", + "release at publication" => "f0aaf5e74216283f022f7773bc1116f8de6b944b", -- git commit number in hex + "version at publication" => "1.0", + "volume number" => "12", + "volume URI" => "https://msp.org/jsag/2022/12-1/" + } ) export { "checkPD", diff --git a/M2/Macaulay2/packages/Jets.m2 b/M2/Macaulay2/packages/Jets.m2 index 615ef300ff3..30e33af1b89 100644 --- a/M2/Macaulay2/packages/Jets.m2 +++ b/M2/Macaulay2/packages/Jets.m2 @@ -34,7 +34,21 @@ newPackage( Headline => "compute jets of various algebraic, geometric and combinatorial objects", PackageImports => {"SimpleDoc","EdgeIdeals"}, PackageExports => {"EdgeIdeals"}, - DebuggingMode => false + DebuggingMode => false, + Certification => { + "journal name" => "The Journal of Software for Algebra and Geometry", + "journal URI" => "http://j-sag.org/", + "article title" => "Computing with jets", + "acceptance date" => "20 October 2022", + "published article URI" => "https://msp.org/jsag/2022/12-1/p06.xhtml", + "published article DOI" => "10.2140/jsag.2022.12.43", + "published code URI" => "https://msp.org/jsag/2022/12-1/jsag-v12-n1-x06-Jets.m2", + "repository code URI" => "http://github.com/Macaulay2/M2/blob/master/M2/Macaulay2/packages/Jets.m2", + "release at publication" => "b0d482205848caeda2616f4ed58be2a6783e88a2", -- git commit number in hex + "version at publication" => "1.1", + "volume number" => "12", + "volume URI" => "https://msp.org/jsag/2022/12-1/" + } ) diff --git a/M2/Macaulay2/packages/LinearTruncations.m2 b/M2/Macaulay2/packages/LinearTruncations.m2 index d521556c78f..e51c80a6658 100644 --- a/M2/Macaulay2/packages/LinearTruncations.m2 +++ b/M2/Macaulay2/packages/LinearTruncations.m2 @@ -8,7 +8,21 @@ newPackage( {Name => "Navid Nemati", Email => "Navid.Nemati@inria.fr"}}, Headline => "find the multigraded truncations that give linear resolutions", PackageExports => {"Truncations", "TateOnProducts"}, - DebuggingMode => false + DebuggingMode => false, + Certification => { + "journal name" => "The Journal of Software for Algebra and Geometry", + "journal URI" => "http://j-sag.org/", + "article title" => "Linear truncations package for Macaulay2", + "acceptance date" => "18 May 2022", + "published article URI" => "https://msp.org/jsag/2022/12-1/p02.xhtml", + "published article DOI" => "10.2140/jsag.2022.12.11", + "published code URI" => "https://msp.org/jsag/2022/12-1/jsag-v12-n1-x02-LinearTruncations.m2", + "repository code URI" => "http://github.com/Macaulay2/M2/blob/master/M2/Macaulay2/packages/LinearTruncations.m2", + "release at publication" => "c1b72330821054c17b07c574649d98ac577cb3af", -- git commit number in hex + "version at publication" => "1.0", + "volume number" => "12", + "volume URI" => "https://msp.org/jsag/2022/12-1/" + } ) export{ diff --git a/M2/Macaulay2/packages/Macaulay2Doc/changes.m2 b/M2/Macaulay2/packages/Macaulay2Doc/changes.m2 index 5a7e5214d5e..54a5f924f36 100644 --- a/M2/Macaulay2/packages/Macaulay2Doc/changes.m2 +++ b/M2/Macaulay2/packages/Macaulay2Doc/changes.m2 @@ -6,6 +6,7 @@ document { Key => "changes to Macaulay2, by version", Subnodes => { TO "changes made for the next release", + TO "changes, 1.22", TO "changes, 1.21", TO "changes, 1.20", TO "changes, 1.19.1", @@ -44,6 +45,45 @@ document { document { Key => "changes, 1.22", UL { + LI { "packages that have been published and certified:", + UL { + -- LI { star, " ", TO "::", ", a package by ... for ..., has been published." }, + LI { star, " ", TO "GraphicalModelsMLE::GraphicalModelsMLE", ", a package by + Carlos Amendola, Luis David Garcia Puente, Roser Homs Pons, Olga Kuznetsova, + Harshit J Motwani, Elina Robeva, and David Swinarski, for maximum likelihood + estimates for graphical statistical models, has been published." }, + LI { star, " ", TO "LinearTruncations::LinearTruncations", ", a package by Lauren Cranton Heller, + David Eisenbud, and Navid Nemati for finding multigraded truncations that give linear resolutions, + has been published." + }, + LI { star, " ", TO "RationalMaps::RationalMaps", ", a package by Karl Schwede, + Daniel Smolkin, S. Hamid Hassanzadeh, and C. J. Bott, for working with rational maps, has been published." }, + LI { star, " ", TO "PseudomonomialPrimaryDecomposition::PseudomonomialPrimaryDecomposition", ", a package by Alan + A. Veliz-Cuba for primary decomposition of square free pseudomonomial ideals, has been published."}, + LI { star, " ", TO "NoetherianOperators::NoetherianOperators", ", a package by Robert Krone, Justin Chen, + Marc Harkonen, Yairon Cid-Ruiz, and Anton Leykin, for numerically computing local dual spaces, + Hilbert functions, and Noetherian operators, has been published." }, + LI { star, " ", TO "Jets::Jets", ", a package by Federico Galetto and + Nicholas Iammarino, for computing jets of various algebraic, geometric and combinatorial objects, has been published." } + } + }, + LI { "new packages:", + UL { + -- LI { TO "::", ", a package by ... for ..., has been added." }, + LI { TO "HolonomicSystems::HolonomicSystems", ", a package by Mahrud Sayrafi, Christine Berkesch, Anton Leykin, and + Harrison Tsai for holonomic systems, has been added. The code was originally in the Dmodules package." }, + LI { TO "BernsteinSato::BernsteinSato", ", a package by Anton Leykin and Harrison Tsai for Bernstein-Sato, + has been added. The code was originally in the Dmodules package." }, + LI { TO "PolyominoIdeals::PolyominoIdeals", ", a package by Carmelo Cisto, Francesco Navarra, and Rizwan Jahangir for + binomial ideals of collections of cells, has been added." }, + LI { TO "MatchingFields::MatchingFields", ", a package by Oliver Clarke for matching fields, has been added." }, + LI { TO "CellularResolutions::CellularResolutions", ", a package by Jay Yang and Aleksandra Sobieska for + cellular resolutions of monomial ideals, has been added." }, + LI { TO "SagbiGbDetection::SagbiGbDetection", ", a package by Viktoriia Borovik, Timothy Duff, and Elima Shehu for verifying + whether the given generators of an ideal form the Gr\"obner basis or whether the given generators of a finitely + generated subalgebra of a polynomial ring are the SAGBI basis, has been added." } + } + }, LI { "functionality added:", UL { LI { "A ", TO RingMap, " object may now be raised to the 0th power if its ", TO source, " and ", TO target, " agree." }, diff --git a/M2/Macaulay2/packages/NCAlgebra/examples/___Basic_spoperations_spon_spnoncommutative_spalgebras.out b/M2/Macaulay2/packages/NCAlgebra/examples/___Basic_spoperations_spon_spnoncommutative_spalgebras.out index 36a515615d7..35a7a06b4b2 100644 --- a/M2/Macaulay2/packages/NCAlgebra/examples/___Basic_spoperations_spon_spnoncommutative_spalgebras.out +++ b/M2/Macaulay2/packages/NCAlgebra/examples/___Basic_spoperations_spon_spnoncommutative_spalgebras.out @@ -332,7 +332,7 @@ i45 : E' = QQ[x,y,z,w,SkewCommutative=>true] o45 = E' -o45 : PolynomialRing, 4 skew commutative variables +o45 : PolynomialRing, 4 skew commutative variable(s) i46 : E = toNCRing E' --Calling Bergman for NCGB calculation. @@ -387,7 +387,7 @@ i54 : C'' = toM2Ring(C,SkewCommutative=>true) o54 = C'' -o54 : PolynomialRing, 4 skew commutative variables +o54 : PolynomialRing, 4 skew commutative variable(s) i55 : y*x diff --git a/M2/Macaulay2/packages/NCAlgebra/examples/_matrix_lp__N__C__Ring__Map_rp.out b/M2/Macaulay2/packages/NCAlgebra/examples/_matrix_lp__N__C__Ring__Map_rp.out index 161581caa3c..cb0a4aa8248 100644 --- a/M2/Macaulay2/packages/NCAlgebra/examples/_matrix_lp__N__C__Ring__Map_rp.out +++ b/M2/Macaulay2/packages/NCAlgebra/examples/_matrix_lp__N__C__Ring__Map_rp.out @@ -12,7 +12,7 @@ i2 : B = QQ[a,b,c,SkewCommutative=>true] o2 = B -o2 : PolynomialRing, 3 skew commutative variables +o2 : PolynomialRing, 3 skew commutative variable(s) i3 : f = ncMap(B,A,{a^3,b^2,a+b,a-b}) diff --git a/M2/Macaulay2/packages/NCAlgebra/examples/_to__M2__Ring.out b/M2/Macaulay2/packages/NCAlgebra/examples/_to__M2__Ring.out index 84eb9d78eb1..23e10e73267 100644 --- a/M2/Macaulay2/packages/NCAlgebra/examples/_to__M2__Ring.out +++ b/M2/Macaulay2/packages/NCAlgebra/examples/_to__M2__Ring.out @@ -44,7 +44,7 @@ i7 : C = toM2Ring(A,SkewCommutative=>true) o7 = C -o7 : PolynomialRing, 4 skew commutative variables +o7 : PolynomialRing, 4 skew commutative variable(s) i8 : x*y-y*x diff --git a/M2/Macaulay2/packages/NoetherianOperators.m2 b/M2/Macaulay2/packages/NoetherianOperators.m2 index d4b9e72355a..7427dfcbee6 100644 --- a/M2/Macaulay2/packages/NoetherianOperators.m2 +++ b/M2/Macaulay2/packages/NoetherianOperators.m2 @@ -20,11 +20,25 @@ newPackage( PackageImports => {"PrimaryDecomposition"}, AuxiliaryFiles => false, DebuggingMode => false, - Keywords => {"Numerical Algebraic Geometry", "Commutative Algebra"} -) + Keywords => {"Numerical Algebraic Geometry", "Commutative Algebra"}, + Certification => { + "journal name" => "The Journal of Software for Algebra and Geometry", + "journal URI" => "http://j-sag.org/", + "article title" => "Noetherian operators in Macaulay2", + "acceptance date" => "26 September 2022", + "published article URI" => "https://msp.org/jsag/2022/12-1/p05.xhtml", + "published article DOI" => "10.2140/jsag.2022.12.33", + "published code URI" => "https://msp.org/jsag/2022/12-1/jsag-v12-n1-x05-NoetherianOperators.m2", + "repository code URI" => "http://github.com/Macaulay2/M2/blob/master/M2/Macaulay2/packages/NoetherianOperators.m2", + "release at publication" => "28faaabb38111c186c23ef6e6a3d487b0823390e", -- git commit number in hex + "version at publication" => "2.2.1", + "volume number" => "12", + "volume URI" => "https://msp.org/jsag/2022/12-1/" + } + ) debug NumericalLinearAlgebra - + export { "truncatedDual", "zeroDimensionalDual", diff --git a/M2/Macaulay2/packages/NumericalSchubertCalculus/examples/___L__Rtriple.out b/M2/Macaulay2/packages/NumericalSchubertCalculus/examples/___L__Rtriple.out index e0626ad62ed..2f6fe3736ed 100644 --- a/M2/Macaulay2/packages/NumericalSchubertCalculus/examples/___L__Rtriple.out +++ b/M2/Macaulay2/packages/NumericalSchubertCalculus/examples/___L__Rtriple.out @@ -9,12 +9,12 @@ i4 : result := LRtriple(n,m); i5 : stdio << "the fixed flags :\n" << result_0; the fixed flags : - -4.08248290463863E-01 0.00000000000000E+00 -4.72085446817433E-02 -4.52979868649730E-01 5.41161724926203E-01 -2.47207907529739E-01 -1.32176911249782E-01 -2.28201970805131E-01 2.36139472149256E-01 -1.87739864365389E-01 3.11759017480660E-01 1.19153245292991E-01 - 5.56878874843095E-02 -4.04432350157850E-01 -3.66114997609468E-01 4.35493465632689E-03 -3.75466323350980E-01 -1.79353949734268E-02 -3.37089456589007E-01 1.09184570046039E-02 6.32916047119544E-01 1.43190422050627E-01 8.50317067363224E-02 1.26144412375443E-01 - -4.08144702499215E-01 -9.19611268385567E-03 4.10229510257585E-01 -6.62199849777962E-02 -5.36673520388478E-01 1.89377380436866E-03 -2.11007715043063E-01 -5.35167787516717E-01 -1.09738691803618E-01 -4.88064910019195E-02 1.81938450320808E-04 -1.65180017628623E-01 - 4.07285703592482E-01 2.80182496927228E-02 3.93751341331076E-01 -6.44629036508820E-02 1.29747517901737E-01 8.16212381454746E-03 -7.55415659355416E-02 3.88600945732782E-02 3.64892907685067E-01 -5.78270817076200E-02 2.25708083950237E-01 -6.80136111500466E-01 - 7.07399797116559E-02 -4.02072781890370E-01 -1.63799171362049E-01 3.60900238276350E-01 3.63851850002974E-01 9.76101469078975E-02 -5.26311952003756E-01 -2.38646826009220E-01 -3.98618871807167E-01 5.41111688686785E-02 4.75305531754421E-02 -1.90519074761423E-01 - 1.95687898368325E-02 -4.07779019974040E-01 4.34733836676498E-02 -4.09491669168698E-01 -2.35872346804551E-01 4.75482230671679E-02 7.19019396782173E-02 3.73406870789826E-01 -4.16896522749570E-01 3.69117815129642E-02 5.34441821546929E-01 -2.16227340369752E-02 + -4.08248290463863E-01 -1.85037170770859E-17 3.97812324059320E-01 9.79174839149694E-02 -3.14031586278321E-01 -1.77692247250931E-01 8.72558320358186E-02 5.55057765241127E-02 3.26603807820814E-01 4.50079520070478E-01 -1.21477444123812E-01 4.47892420160762E-01 + -3.31646271829620E-01 2.38070193531614E-01 -3.33688927682635E-01 -4.41919858253321E-02 1.88919891065188E-01 2.27346320870824E-01 -4.44853393347985E-01 -2.96270804351182E-01 -2.68017149858233E-01 4.17865005709478E-01 2.51229213826536E-01 1.93451859210120E-01 + -3.83273496319134E-01 1.40599052934127E-01 -4.18504865460909E-01 1.82476392974900E-01 -6.40678637658166E-01 2.36261384607933E-02 9.94880240507409E-02 1.58337849859311E-01 -4.72950872095731E-02 -4.27535007632162E-02 2.93899098035654E-03 -4.18114815999641E-01 + 4.01140073193088E-01 7.58505658865559E-02 -2.36582711732953E-01 1.72836943189620E-01 -4.04708999156962E-01 -1.07343253658322E-01 -3.74682062675373E-01 1.15784231762851E-01 -1.14710174394788E-01 -2.49371301578811E-01 -1.03153948113123E-01 5.76541024749319E-01 + 1.35340093932427E-02 4.08023892996979E-01 -2.71251275529851E-01 -6.61593552387677E-02 2.11836190247706E-01 -2.15567268248658E-01 6.36537592748278E-01 2.76418271402020E-01 -2.69424234570330E-01 8.22850649989294E-02 8.55910480493980E-02 3.09454285127493E-01 + -3.67664943735471E-01 1.77451840831984E-01 2.80633567514338E-01 5.17550799722571E-01 1.76260380326836E-01 -2.71443831475986E-01 -6.71993903613725E-02 -1.69618081610741E-01 -1.58819347923215E-01 -5.10216650142325E-01 2.46667136784666E-01 4.79007839571318E-02 THE MOVED FLAG : 1 1 1 1 1 1 @@ -25,18 +25,18 @@ THE MOVED FLAG : -1 0 0 0 0 0 THE 3-SOLUTION PLANES : - -1.07700499041284E+00 -8.11068437983347E-01 0.00000000000000E+00 0.00000000000000E+00 0.00000000000000E+00 0.00000000000000E+00 + -1.11978157975915E+00 1.65613772077393E-01 0.00000000000000E+00 0.00000000000000E+00 0.00000000000000E+00 0.00000000000000E+00 1.00000000000000E+00 0.00000000000000E+00 0.00000000000000E+00 0.00000000000000E+00 0.00000000000000E+00 0.00000000000000E+00 - 0.00000000000000E+00 0.00000000000000E+00 -3.36987250104405E-01 -1.67450845937719E-01 0.00000000000000E+00 0.00000000000000E+00 + 0.00000000000000E+00 0.00000000000000E+00 -3.75221192076092E-01 -2.48041653266659E-01 0.00000000000000E+00 0.00000000000000E+00 0.00000000000000E+00 0.00000000000000E+00 1.00000000000000E+00 0.00000000000000E+00 0.00000000000000E+00 0.00000000000000E+00 - 0.00000000000000E+00 0.00000000000000E+00 0.00000000000000E+00 0.00000000000000E+00 -2.30564287152720E-01 5.64924049337573E-03 + 0.00000000000000E+00 0.00000000000000E+00 0.00000000000000E+00 0.00000000000000E+00 -6.23616597635860E-01 -2.18599169648558E+00 0.00000000000000E+00 0.00000000000000E+00 0.00000000000000E+00 0.00000000000000E+00 1.00000000000000E+00 0.00000000000000E+00 - -2.39519267028103E-01 -1.10486524678214E-01 0.00000000000000E+00 0.00000000000000E+00 0.00000000000000E+00 0.00000000000000E+00 + -2.45448902320671E-01 -1.02626547024311E-01 0.00000000000000E+00 0.00000000000000E+00 0.00000000000000E+00 0.00000000000000E+00 1.00000000000000E+00 0.00000000000000E+00 0.00000000000000E+00 0.00000000000000E+00 0.00000000000000E+00 0.00000000000000E+00 - 0.00000000000000E+00 0.00000000000000E+00 9.63898127100209E-01 -3.01351874683110E-01 0.00000000000000E+00 0.00000000000000E+00 + 0.00000000000000E+00 0.00000000000000E+00 -1.36521846024660E+00 5.40175955796651E-01 0.00000000000000E+00 0.00000000000000E+00 0.00000000000000E+00 0.00000000000000E+00 1.00000000000000E+00 0.00000000000000E+00 0.00000000000000E+00 0.00000000000000E+00 - 0.00000000000000E+00 0.00000000000000E+00 0.00000000000000E+00 0.00000000000000E+00 -1.15368987352860E+00 1.20932611395459E+00 + 0.00000000000000E+00 0.00000000000000E+00 0.00000000000000E+00 0.00000000000000E+00 -1.28868981690887E+00 6.08007127143010E-01 0.00000000000000E+00 0.00000000000000E+00 0.00000000000000E+00 0.00000000000000E+00 1.00000000000000E+00 0.00000000000000E+00 @@ -44,59 +44,59 @@ i6 : stdio << "polynomial system solved :\n" << result_1; polynomial system solved : 6 3 -+( 2.26456764896410E-02 + 2.49844937328485E-01*i)*x11*x32*x53 -+( 3.15777245187067E-01 + 9.66166977235230E-03*i)*x11*x32 -+(-2.18039974912898E-01 + 5.72681877540543E-02*i)*x11*x53 -+( 1.09626716659595E-01 - 2.97017034585406E-01*i)*x32*x53 -+( 1.52355901543258E-01 + 2.09468425437531E-01*i)*x11 -+(-3.11325662430988E-01 - 3.22301515871292E-01*i)*x32 -+(-2.66953639602332E-01 + 1.27177783632620E-02*i)*x53 -+(-1.64152368621853E-01 + 1.07777676474340E-01*i); - -+(-1.35742889778990E-01 + 2.17682459193376E-01*i)*x11*x32*x53 -+( 1.71921548377550E-01 - 8.29071611236532E-02*i)*x11*x32 -+( 2.70820739191635E-01 - 1.07243745128727E-01*i)*x11*x53 -+(-1.02921496859705E-01 + 2.90239027460114E-01*i)*x32*x53 -+( 3.94198672213008E-01 - 3.98958519352494E-01*i)*x11 -+( 3.22090999358762E-02 + 1.39423752602463E-01*i)*x32 -+( 2.41226791120785E-01 - 2.59403039422168E-02*i)*x53 -+( 6.15363963064252E-01 - 1.67078635461445E-01*i); - -+( 3.09510704039293E-01 - 5.95168448036128E-01*i)*x11*x32*x53 -+( 3.36210442667399E-01 + 7.05987643216428E-03*i)*x11*x32 -+(-1.11225261790743E-01 - 2.54560554556378E-01*i)*x11*x53 -+( 2.28103938452441E-01 - 2.08980888394715E-02*i)*x32*x53 -+( 1.41695965472263E-01 + 4.00079612516609E-02*i)*x11 -+( 2.57165526542390E-01 + 2.88186394666915E-01*i)*x32 -+(-1.67148338603389E-01 + 1.76966921330865E-01*i)*x53 -+( 8.97253197565314E-02 + 2.62865341036959E-01*i); - -+( 2.81681822921272E-01 + 8.66231982908467E-01*i)*x11*x32*x53 -+( 2.28809384623938E-01 + 5.32114920885280E-01*i)*x11*x32 -+(-5.86367688889768E-01 + 3.15425474457949E-01*i)*x11*x53 -+( 2.08919157440114E-01 + 3.96158762546460E-01*i)*x32*x53 -+(-2.12864431021167E-01 + 1.96129322290429E-01*i)*x11 -+( 1.69504223981375E-01 + 2.30815036927011E-01*i)*x32 -+(-3.92511753956552E-01 - 2.50775379441183E-02*i)*x53 -+(-1.41619353187752E-01 - 1.92988534627778E-02*i); - -+(-5.55613554896697E-01 + 9.58350943486976E-02*i)*x11*x32*x53 -+(-4.86062825888290E-01 + 2.30140984236890E-01*i)*x11*x32 -+(-3.32649167951689E-01 - 5.22180313407958E-02*i)*x11*x53 -+(-1.46716505023529E-01 + 3.18264494923420E-01*i)*x32*x53 -+(-2.99897684682840E-01 - 2.31528698367347E-01*i)*x11 -+(-1.13823522219086E-01 + 3.90394031670838E-01*i)*x32 -+(-1.87140101166406E-01 - 2.37420886733269E-01*i)*x53 -+(-1.11414879522674E-02 - 2.63936409999584E-01*i); - -+( 3.46124123545673E-01 - 8.16809752626568E-02*i)*x11*x32*x53 -+( 6.68268421197837E-03 - 6.45761479639423E-01*i)*x11*x32 -+(-1.69153698627581E-01 + 2.28277756848134E-01*i)*x11*x53 -+( 1.93501124916598E-01 + 7.71025618738563E-02*i)*x32*x53 -+( 3.15408036580370E-01 - 2.33880697858375E-01*i)*x11 -+(-6.19712747216821E-03 - 1.90642624043654E-01*i)*x32 -+(-1.72863621209133E-01 + 1.14694130775271E-01*i)*x53 -+( 3.24681386619333E-01 + 1.00680402675064E-01*i); ++(-2.22031736978857E-01 + 3.18789771979949E-01*i)*x11*x32*x53 ++(-6.17422879466825E-01 - 9.60784463860935E-02*i)*x11*x32 ++(-1.61810550546247E-01 + 1.08504019387186E-01*i)*x11*x53 ++(-1.57955128990380E-01 + 3.34968485755594E-01*i)*x32*x53 ++(-3.74696526626732E-01 - 9.99730706347352E-03*i)*x11 ++(-1.84709768939814E-01 + 3.62947612331143E-01*i)*x32 ++(-1.44595312861631E-01 + 1.19035248438782E-01*i)*x53 ++(-2.86542298065088E-01 + 2.86096288784835E-01*i); + ++( 8.42059732147426E-01 + 3.39910304104641E-02*i)*x11*x32*x53 ++( 9.05100164926549E-01 + 2.94497407778889E-02*i)*x11*x32 ++( 3.51820718787900E-01 + 6.70277596934115E-02*i)*x11*x53 ++( 1.33744938329095E-01 - 5.82345002438941E-03*i)*x32*x53 ++( 6.05161081977061E-01 + 2.14195097892559E-02*i)*x11 ++( 1.23633363417116E-01 + 1.40843859182061E-02*i)*x32 ++( 1.03549820073609E-01 - 7.79413307564618E-02*i)*x53 ++( 1.74053131549760E-01 - 1.43377559277007E-01*i); + ++( 1.19042617826994E-01 + 3.34483475553423E-02*i)*x11*x32*x53 ++(-3.23842703713701E-01 - 2.55133309039113E-01*i)*x11*x32 ++( 4.85663839563644E-01 + 5.64101617459871E-02*i)*x11*x53 ++( 1.96719924543530E-01 + 2.12527754874998E-01*i)*x32*x53 ++(-3.97899137772641E-01 - 7.96444590159542E-01*i)*x11 ++(-3.06177374356630E-02 - 1.73096159671485E-01*i)*x32 ++( 5.26340292766507E-01 - 8.13707548071123E-02*i)*x53 ++(-1.20517493699459E-01 - 8.06023766456248E-01*i); + ++(-7.26841776132968E-01 - 1.39339586961160E-01*i)*x11*x32*x53 ++(-5.72841803432976E-01 - 3.02898132054218E-01*i)*x11*x32 ++(-6.99419107949223E-01 - 4.43094367516545E-01*i)*x11*x53 ++(-5.36534750824741E-01 - 5.06082109214979E-01*i)*x32*x53 ++(-5.44984576154230E-01 - 6.02383441523054E-01*i)*x11 ++(-3.45200716768154E-01 - 5.47254493845745E-01*i)*x32 ++(-6.81729875269734E-01 - 5.40086737117702E-01*i)*x53 ++(-4.12666744241273E-01 - 7.67335042360796E-01*i); + ++(-3.36003336771691E-01 + 4.39449075450039E-01*i)*x11*x32*x53 ++(-3.11588823087300E-01 + 1.70571569957293E-01*i)*x11*x32 ++(-3.50092653925388E-01 + 9.98991969928704E-02*i)*x11*x53 ++( 8.93111359067309E-02 + 8.83124645506282E-02*i)*x32*x53 ++(-7.44439523933786E-01 - 5.82411185729712E-02*i)*x11 ++( 1.41508162164850E-01 - 4.47870840208402E-02*i)*x32 ++(-1.14269366264579E-01 - 5.61647977516906E-02*i)*x53 ++(-2.68431378789617E-01 - 2.95933339843714E-02*i); + ++(-9.61093933093429E-02 - 8.10505054733194E-01*i)*x11*x32*x53 ++(-4.89316629840530E-01 - 4.33934277072278E-01*i)*x11*x32 ++( 1.29309747019464E-01 - 4.37976591954737E-01*i)*x11*x53 ++(-3.10945872263800E-01 - 5.88323486643750E-01*i)*x32*x53 ++( 1.83522450602465E-01 - 7.32565449651871E-01*i)*x11 ++(-6.48563773259940E-01 - 5.14568173716295E-01*i)*x32 ++( 4.88264433532052E-02 - 3.70066088587247E-01*i)*x53 ++( 5.04752436689806E-02 - 7.00956613197506E-01*i); ROOT REFINING PARAMETERS 1. output during the iterations : no @@ -112,22 +112,22 @@ solutions : 2 3 =========================================================================== -solution 1 : start residual : 1.693E-15 #iterations : 1 success +solution 1 : start residual : 6.412E-15 #iterations : 1 success t : 1.00000000000000E+00 0.00000000000000E+00 m : 1 the solution for t : - x11 : -1.07700499041284E+00 -8.11068437983347E-01 - x32 : -3.36987250104405E-01 -1.67450845937719E-01 - x53 : -2.30564287152720E-01 5.64924049337642E-03 -== err : 4.712E-17 = rco : 2.862E-01 = res : 1.249E-16 = complex regular == -solution 2 : start residual : 3.886E-15 #iterations : 1 success + x11 : -1.11978157975915E+00 1.65613772077393E-01 + x32 : -3.75221192076093E-01 -2.48041653266659E-01 + x53 : -6.23616597635846E-01 -2.18599169648558E+00 +== err : 3.894E-15 = rco : 5.719E-02 = res : 5.551E-16 = complex regular == +solution 2 : start residual : 2.040E-15 #iterations : 1 success t : 1.00000000000000E+00 0.00000000000000E+00 m : 1 the solution for t : - x11 : -2.39519267028103E-01 -1.10486524678215E-01 - x32 : 9.63898127100208E-01 -3.01351874683111E-01 - x53 : -1.15368987352860E+00 1.20932611395459E+00 -== err : 2.362E-16 = rco : 2.105E-01 = res : 3.331E-16 = complex regular == + x11 : -2.45448902320671E-01 -1.02626547024311E-01 + x32 : -1.36521846024660E+00 5.40175955796650E-01 + x53 : -1.28868981690887E+00 6.08007127143011E-01 +== err : 4.767E-16 = rco : 2.379E-01 = res : 2.498E-16 = complex regular == =========================================================================== A list of 2 solutions has been refined : Number of regular solutions : 2. @@ -141,7 +141,7 @@ Number of failures : 0. Frequency tables for correction, residual, and condition numbers : FreqCorr : 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 : 2 FreqResi : 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 : 2 -FreqCond : 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 : 2 +FreqCond : 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 : 2 Small correction terms and residuals counted to the right. Well conditioned and distinct roots counted to the left. @@ -152,40 +152,40 @@ solution 1 : t : 1.00000000000000E+00 0.00000000000000E+00 m : 1 the solution for t : - x11 : -1.07700499041284E+00 -8.11068437983347E-01 - x32 : -3.36987250104405E-01 -1.67450845937719E-01 - x53 : -2.30564287152720E-01 5.64924049337642E-03 -== err : 4.712E-17 = rco : 2.862E-01 = res : 1.249E-16 == + x11 : -1.11978157975915E+00 1.65613772077393E-01 + x32 : -3.75221192076093E-01 -2.48041653266659E-01 + x53 : -6.23616597635846E-01 -2.18599169648558E+00 +== err : 3.894E-15 = rco : 5.719E-02 = res : 5.551E-16 == solution 2 : t : 1.00000000000000E+00 0.00000000000000E+00 m : 1 the solution for t : - x11 : -2.39519267028103E-01 -1.10486524678215E-01 - x32 : 9.63898127100208E-01 -3.01351874683111E-01 - x53 : -1.15368987352860E+00 1.20932611395459E+00 -== err : 2.362E-16 = rco : 2.105E-01 = res : 3.331E-16 == + x11 : -2.45448902320671E-01 -1.02626547024311E-01 + x32 : -1.36521846024660E+00 5.40175955796650E-01 + x53 : -1.28868981690887E+00 6.08007127143011E-01 +== err : 4.767E-16 = rco : 2.379E-01 = res : 2.498E-16 == TIMING INFORMATION for Root refining -The elapsed time in seconds was 0.000470000 = 0h 0m 0s 0ms -User time in seconds was 0.000411000 = 0h 0m 0s 0ms -System CPU time in seconds was 0.000059000 = 0h 0m 0s 0ms -Non-I/O page faults was 28 +The elapsed time in seconds was 0.000425000 = 0h 0m 0s 0ms +User time in seconds was 0.000382000 = 0h 0m 0s 0ms +System CPU time in seconds was 0.000043000 = 0h 0m 0s 0ms +Non-I/O page faults was 27 I/O page faults was 0 Signals delivered was 0 Swaps was 0 -Total context switches was 1 +Total context switches was 0 TIMING INFORMATION for resolving a Schubert problem -The elapsed time in seconds was 0.008962000 = 0h 0m 0s 9ms -User time in seconds was 0.008770000 = 0h 0m 0s 9ms -System CPU time in seconds was 0.000192000 = 0h 0m 0s 0ms -Non-I/O page faults was 178 +The elapsed time in seconds was 0.008244000 = 0h 0m 0s 8ms +User time in seconds was 0.008046000 = 0h 0m 0s 8ms +System CPU time in seconds was 0.000198000 = 0h 0m 0s 0ms +Non-I/O page faults was 159 I/O page faults was 0 Signals delivered was 0 Swaps was 0 -Total context switches was 3 +Total context switches was 0 -Seed used in random number generators : 82707. +Seed used in random number generators : 24787. PHCv2.4.77 released 2020-06-12 i8 : diff --git a/M2/Macaulay2/packages/NumericalSchubertCalculus/examples/___Pieri__Homotopies.out b/M2/Macaulay2/packages/NumericalSchubertCalculus/examples/___Pieri__Homotopies.out index 5d7093ec8fd..b6633a1df5d 100644 --- a/M2/Macaulay2/packages/NumericalSchubertCalculus/examples/___Pieri__Homotopies.out +++ b/M2/Macaulay2/packages/NumericalSchubertCalculus/examples/___Pieri__Homotopies.out @@ -3,23 +3,23 @@ i1 : (ipt, otp) := PieriHomotopies(2,2); i2 : print ipt -{| -.5 -.156693-.47535ii |, | -.5 -.393934-.433592ii |, | -.5 .512862+.452276ii |, | -.5 .0279051+.376076ii |} - | .201236-.457716ii -.488637+.0159579ii | | .498614+.0372063ii -.276014+.153901ii | | .144239+.478743ii -.318615-.207177ii | | -.177981-.46725ii -.429875+.0533154ii | - | .462573+.189805ii .146037-.49664ii | | -.46663+.179601ii .280441-.151808ii | | -.0697009+.495118ii -.260024+.275036ii | | -.232842-.442475ii .259034+.251049ii | - | .238586-.439405ii .473754+.134341ii | | .412393-.282723ii -.213211-.640151ii | | .400527-.299296ii .388872-.305781ii | | -.294096-.404361ii .396186-.618923ii | +{| -.5 .361294+.0806396ii |, | -.5 .216008+.134438ii |, | -.5 .284982+.222929ii |, | -.5 .22015-.484395ii |} + | .0560812+.496845ii -.345688-.122686ii | | .425294-.262917ii -.25443-.000255548ii | | -.424034+.264943ii -.612614+.0126839ii | | -.495841+.064355ii -.407594-.169567ii | + | -.312843+.390038ii -.575119+.134847ii | | .378729+.326442ii -.510118+.406777ii | | .356538-.350544ii -.489129+.356105ii | | -.498392-.0400682ii -.307603+.337509ii | + | -.499532+.0216369ii -.0303484+.615261ii | | -.498042+.0442031ii -.517987+.42016ii | | -.487797-.109792ii -.348876-.0765384ii | | -.0473766+.49775ii .384254-.407219ii | i3 : print otp -{| 1 0 |, | 1 0 |} - | -.237282-.112854ii -1.5372-1.19825ii | | -.193856+.191757ii 1.26877+.351218ii | - | -.0761311+.302235ii 1 | | .841397+.00470807ii 1 | - | 0 1.419-3.27969ii | | 0 -.324549-1.86455ii | +{| 1 0 |, | 1 0 |} + | -.0995275-.303491ii .10685+.135117ii | | .122055+2.67619ii .77208+.270864ii | + | -1.00317+1.13845ii 1 | | .855829+3.01373ii 1 | + | 0 1.04563+.64657ii | | 0 -.205684-.309834ii | i4 : in0 = ipt_0 -o4 = | -.5 -.156693-.47535ii | - | .201236-.457716ii -.488637+.0159579ii | - | .462573+.189805ii .146037-.49664ii | - | .238586-.439405ii .473754+.134341ii | +o4 = | -.5 .361294+.0806396ii | + | .0560812+.496845ii -.345688-.122686ii | + | -.312843+.390038ii -.575119+.134847ii | + | -.499532+.0216369ii -.0303484+.615261ii | 4 2 o4 : Matrix CC <--- CC @@ -27,10 +27,10 @@ o4 : Matrix CC <--- CC i5 : out0 = otp_0 -o5 = | 1 0 | - | -.237282-.112854ii -1.5372-1.19825ii | - | -.0761311+.302235ii 1 | - | 0 1.419-3.27969ii | +o5 = | 1 0 | + | -.0995275-.303491ii .10685+.135117ii | + | -1.00317+1.13845ii 1 | + | 0 1.04563+.64657ii | 4 2 o5 : Matrix CC <--- CC @@ -38,15 +38,15 @@ o5 : Matrix CC <--- CC i6 : m = in0|out0 -o6 = | -.5 -.156693-.47535ii 1 - | .201236-.457716ii -.488637+.0159579ii -.237282-.112854ii - | .462573+.189805ii .146037-.49664ii -.0761311+.302235ii - | .238586-.439405ii .473754+.134341ii 0 +o6 = | -.5 .361294+.0806396ii 1 + | .0560812+.496845ii -.345688-.122686ii -.0995275-.303491ii + | -.312843+.390038ii -.575119+.134847ii -1.00317+1.13845ii + | -.499532+.0216369ii -.0303484+.615261ii 0 ------------------------------------------------------------------------ - 0 | - -1.5372-1.19825ii | - 1 | - 1.419-3.27969ii | + 0 | + .10685+.135117ii | + 1 | + 1.04563+.64657ii | 4 4 o6 : Matrix CC <--- CC @@ -54,7 +54,7 @@ o6 : Matrix CC <--- CC i7 : det m -o7 = 2.10795754464218e-15-2.69974970552918e-15*ii +o7 = 1.39373833114133e-15-5.34558582120369e-18*ii o7 : CC (of precision 53) diff --git a/M2/Macaulay2/packages/NumericalSchubertCalculus/examples/_change__Flags.out b/M2/Macaulay2/packages/NumericalSchubertCalculus/examples/_change__Flags.out index f86f37a1219..f3afbf21705 100644 --- a/M2/Macaulay2/packages/NumericalSchubertCalculus/examples/_change__Flags.out +++ b/M2/Macaulay2/packages/NumericalSchubertCalculus/examples/_change__Flags.out @@ -42,7 +42,7 @@ i9 : FlagsF = F/last; i10 : FlagsG = G/last; i11 : time S' = changeFlags(S,({l1,l2,l3},FlagsF,FlagsG)) - -- used 1.82521 seconds + -- used 1.84162 seconds o11 = {| .124063-.286284ii .167867-.0639299ii .295488-.366109ii |, | | -.25181-.0448108ii -.107521-.190275ii -.0896067-.483543ii | | @@ -63,7 +63,7 @@ o11 : List i12 : assert all(S', s-> checkIncidenceSolution(s,G)) i13 : time S' = changeFlags(S,({l1,l2,l3},FlagsF,FlagsG), OneHomotopy=>false) - -- used 1.11693 seconds + -- used 1.08499 seconds o13 = {| -.226702-.119043ii -.326452-.119841ii .0929953-.230085ii |, | | -.229738+.0833434ii -.445398+.0639826ii .150646-.436884ii | | diff --git a/M2/Macaulay2/packages/NumericalSchubertCalculus/examples/_parse__Triplet.out b/M2/Macaulay2/packages/NumericalSchubertCalculus/examples/_parse__Triplet.out index 1b945c7fcaf..c414cafdf8a 100644 --- a/M2/Macaulay2/packages/NumericalSchubertCalculus/examples/_parse__Triplet.out +++ b/M2/Macaulay2/packages/NumericalSchubertCalculus/examples/_parse__Triplet.out @@ -4,208 +4,208 @@ i1 : (f, p, s) = LRtriple(6,matrix{{3, 2, 4, 6}}); i2 : (R, pols, sols, fixedFlags, movedFlag, solutionPlanes) = parseTriplet(f, p, s) -o2 = (R, {(- .0399744 - .0145143*ii)x11*x32*x53 + (.0926769 + - - - - - - ------------------------------------------------------------------------ - .354494*ii)x11*x32 + (- .632386 + .186907*ii)x11*x53 + (.0228595 + - - - - - - ------------------------------------------------------------------------ - .0537889*ii)x32*x53 + (.406348 + .234116*ii)x11 + (- .0652501 - - - - - - - ------------------------------------------------------------------------ - .0138565*ii)x32 + (- .249868 + .134704*ii)x53 + .211821 - .165463*ii, - - - - - - ------------------------------------------------------------------------ - (.0933272 - .373609*ii)x11*x32*x53 + (.264606 - .401113*ii)x11*x32 + (- - - - - - +o2 = (R, {(.208692 + 1.03965*ii)x11*x32*x53 + (.405301 + .197189*ii)x11*x32 + + + + + + ------------------------------------------------------------------------ - .0939123 - .679424*ii)x11*x53 + (.0455688 - .0119688*ii)x32*x53 + + (.566151 + .487787*ii)x11*x53 + (- .209197 + .468217*ii)x32*x53 + ------------------------------------------------------------------------ - (.0451169 - .683975*ii)x11 + (.0388899 + .0672329*ii)x32 + (- .110409 - - - - - - + (.312468 + .303249*ii)x11 + (- .0604092 - .0194041*ii)x32 + (.23684 + + + + + + ------------------------------------------------------------------------ - .0867227*ii)x53 - .341856 - .148787*ii, (- .590604 + + .252038*ii)x53 - .0591918 + .101699*ii, (- .463283 - ------------------------------------------------------------------------ - .0241807*ii)x11*x32*x53 + (- .13432 - .00692575*ii)x11*x32 + (.0566638 - + .240783*ii)x11*x32*x53 + (- .458021 + .0439516*ii)x11*x32 + (- .407911 - ------------------------------------------------------------------------ - .0743429*ii)x11*x53 + (- .497876 - .197278*ii)x32*x53 + (.39268 - + .347409*ii)x11*x53 + (.306426 - .453088*ii)x32*x53 + (- .712326 + ------------------------------------------------------------------------ - .106231*ii)x11 + (- .0559863 - .0344225*ii)x32 + (.207618 + - - - - - - ------------------------------------------------------------------------ - .0018821*ii)x53 + .546447 + .0849719*ii, (- .163197 + - - - - - - ------------------------------------------------------------------------ - .856396*ii)x11*x32*x53 + (- .12002 + .6028*ii)x11*x32 + (- .0789951 + - - - - - - ------------------------------------------------------------------------ - .294668*ii)x11*x53 + (.494277 + .293229*ii)x32*x53 + (- .132923 + + .220682*ii)x11 + (- .202248 - .483313*ii)x32 + (.0203615 - + + + + + + ------------------------------------------------------------------------ + .380034*ii)x53 - .544592 - .206127*ii, (- .561299 - + + + + + + ------------------------------------------------------------------------ + .376592*ii)x11*x32*x53 + (.0107828 - .36624*ii)x11*x32 + (.166971 - + + + + + + ------------------------------------------------------------------------ + .449345*ii)x11*x53 + (- .393243 - .431221*ii)x32*x53 + (.699459 - ------------------------------------------------------------------------ - .073211*ii)x11 + (.0697774 - .0225692*ii)x32 + (.268987 + .156267*ii)x53 + .374566*ii)x11 + (- .05748 - .258966*ii)x32 + (.248463 - .408062*ii)x53 + + + + + + ------------------------------------------------------------------------ + + .518536 - .16739*ii, (- .40362 + .263607*ii)x11*x32*x53 + (- .680842 - ------------------------------------------------------------------------ - - .120066 - .217474*ii, (- .0647381 - .530494*ii)x11*x32*x53 + (.244667 + .459741*ii)x11*x32 + (- .283004 - .21073*ii)x11*x53 + (- .329091 + + + + + + + ------------------------------------------------------------------------ + .191945*ii)x32*x53 + (- .208371 - .65307*ii)x11 + (- .695681 - + + + + + + ------------------------------------------------------------------------ + .421961*ii)x32 + (- .323339 - .169246*ii)x53 - .251152 - .718577*ii, (- ------------------------------------------------------------------------ - + .0388226*ii)x11*x32 + (- .071549 - .251294*ii)x11*x53 + (- .00247907 + - - - - - + .00437712 + .0530547*ii)x11*x32*x53 + (- .761652 + .146076*ii)x11*x32 + + + + + + + ------------------------------------------------------------------------ + (- .106439 + .109494*ii)x11*x53 + (- .36773 - .0415626*ii)x32*x53 + (- + + + + + + ------------------------------------------------------------------------ + .776877 + .551073*ii)x11 + (- .276157 - .298111*ii)x32 + (- .245764 + + + + + + ------------------------------------------------------------------------ - .0248108*ii)x32*x53 + (.21949 - .0809399*ii)x11 + (- .0359926 - + .0300706*ii)x53 - .453972 + .283598*ii, (.135972 + + + + + + + ------------------------------------------------------------------------ + .588926*ii)x11*x32*x53 + (.6076 - .200541*ii)x11*x32 + (- .283696 + + + + + + + ------------------------------------------------------------------------ + .172472*ii)x11*x53 + (.14003 + .618682*ii)x32*x53 + (.622696 - + + + + + + ------------------------------------------------------------------------ + .0521078*ii)x11 + (.487289 - .0181031*ii)x32 + (- .174105 + + + + + + + ------------------------------------------------------------------------ + .19223*ii)x53 + .516146 + .110568*ii}, {{-.821212-.037818*ii, + + + + + + ------------------------------------------------------------------------ + -.569987-.018055*ii, .112781-1.49632*ii}, {-.674526-.501588*ii, ------------------------------------------------------------------------ - .0103534*ii)x32 + (- .363356 + .0515771*ii)x53 + .00303043 - .137416*ii, - - - - - - ------------------------------------------------------------------------ - (.124577 + .254012*ii)x11*x32*x53 + (.430422 + .0947952*ii)x11*x32 + - - - - - - ------------------------------------------------------------------------ - (.432935 - .140885*ii)x11*x53 + (- .153941 - .0356372*ii)x32*x53 + - - - - - - ------------------------------------------------------------------------ - (.6925 - .164863*ii)x11 + (- .0791601 - .0121276*ii)x32 + (.130397 - - - - - - - ------------------------------------------------------------------------ - .488438*ii)x53 + .0622165 - .376375*ii}, {{-.222837+.0578575*ii, - - - - - - ------------------------------------------------------------------------ - -.283529-1.74632*ii, -.170237+.574751*ii}, {.313108+.0647815*ii, - - - - - - ------------------------------------------------------------------------ - 1.55934+3.57986*ii, -.119638-.243962*ii}}, {| -.408248+3.70074e-17ii - | -.254463-.319242ii - | -.379006-.151728ii - | .148242-.380383ii - | -.400969+.0767495ii - | .34486-.218491ii - ------------------------------------------------------------------------ - .295782-.557811ii -.123338-.130106ii -.443403-.43011ii - -.277722-.0337416ii -.15377+.281621ii .287922-.0364758ii - -.310281+.0181191ii -.414435+.0695857ii .155757-.124855ii - -.154992-.218188ii .665036+.134935ii -.224407-.00485309ii - .437341-.302059ii .157632+.2603ii .322701+.575512ii - .0124012-.268702ii -.310116+.197611ii .0692093-.0616366ii - ------------------------------------------------------------------------ - .101776-.0720625ii -.0339506+.0651831ii |}, | 1 1 1 1 1 1 |, {| - .171133-.455241ii -.0427233+.574042ii | | -1 -1 -1 -1 -1 0 | | - -.370187+.597805ii -.149512-.059328ii | | 1 1 1 1 0 0 | | - -.131206+.363686ii -.0506159+.314321ii | | -1 -1 -1 0 0 0 | | - -.0364793+.110345ii .0844233-.0473268ii | | 1 1 0 0 0 0 | | - .209126+.2163ii .724911-.033938ii | | -1 0 0 0 0 0 | | - ------------------------------------------------------------------------ - -.222837+.0578575ii 0 0 |, | - 1 0 0 | | - 0 -.283529-1.74632ii 0 | | - 0 1 0 | | - 0 0 -.170237+.574751ii | | - 0 0 1 | | - ------------------------------------------------------------------------ - .313108+.0647815ii 0 0 |}) - 1 0 0 | - 0 1.55934+3.57986ii 0 | - 0 1 0 | - 0 0 -.119638-.243962ii | - 0 0 1 | + -.461876-.739848*ii, -.224144+.66624*ii}}, {| -.408248+1.85037e-17ii + | .35285+.205337ii + | .180223+.366314ii + | -.112231+.392519ii + | -.386429-.131678ii + | .379266-.151075ii + ------------------------------------------------------------------------ + .0119294+.502626ii -.186934+.620316ii .122167-.151345ii + -.383343-.127677ii .230949+.244268ii .0430535+.174629ii + -.342457+.00934968ii .0827073+.0851401ii -.196086-.478639ii + -.313814+.130817ii -.28829-.368183ii -.150923-.316389ii + -.0511755-.330575ii -.0730288+.0544028ii -.677879+.188118ii + .00236316-.488989ii -.275102+.387978ii .151215-.147044ii + ------------------------------------------------------------------------ + -.207192+.198433ii .0258732+.200046ii |}, | 1 1 1 1 1 1 |, {| + -.232673-.232934ii .278648+.581968ii | | -1 -1 -1 -1 -1 0 | | + -.422701-.037308ii -.261099-.431386ii | | 1 1 1 1 0 0 | | + .382436+.28813ii .28168+.259944ii | | -1 -1 -1 0 0 0 | | + -.293505+.0889841ii .344844-.0724727ii | | 1 1 0 0 0 0 | | + .118466+.540239ii .0999718-.087378ii | | -1 0 0 0 0 0 | | + ------------------------------------------------------------------------ + -.821212-.0378182ii 0 0 |, | + 1 0 0 | | + 0 -.569987-.018055ii 0 | | + 0 1 0 | | + 0 0 .112781-1.49632ii | | + 0 0 1 | | + ------------------------------------------------------------------------ + -.674526-.501588ii 0 0 |}) + 1 0 0 | + 0 -.461876-.739848ii 0 | + 0 1 0 | + 0 0 -.224144+.66624ii | + 0 0 1 | o2 : Sequence @@ -218,32 +218,32 @@ o3 : Matrix R <--- R i4 : peek sols -o4 = {Point{cache => CacheTable{...3...} - Coordinates => {-.222837+.0578575*ii, -.283529-1.74632*ii, +o4 = {Point{cache => CacheTable{...3...} + Coordinates => {-.821212-.037818*ii, -.569987-.018055*ii, ------------------------------------------------------------------------ - }, Point{cache => CacheTable{...3...} - -.170237+.574751*ii} Coordinates => {.313108+.0647815*ii, + }, Point{cache => CacheTable{...3...} + .112781-1.49632*ii} Coordinates => {-.674526-.501588*ii, ------------------------------------------------------------------------ }} - 1.55934+3.57986*ii, -.119638-.243962*ii} + -.461876-.739848*ii, -.224144+.66624*ii} i5 : peek solutionPlanes -o5 = {Matrix{cache => CacheTable{} }, Matrix{cache => CacheTable{} }} - RawMatrix => -.222837+.0578575i 0 0 RawMatrix => .313108+.0647815i 0 0 - 1 0 0 1 0 0 - 0 -.283529-1.74632i 0 0 1.55934+3.57986i 0 - 0 1 0 0 1 0 - 0 0 -.170237+.574751i 0 0 -.119638-.243962i - 0 0 1 0 0 1 +o5 = {Matrix{cache => CacheTable{} }, Matrix{cache => CacheTable{} }} + RawMatrix => -.821212-.037818i 0 0 RawMatrix => -.674526-.501588i 0 0 + 1 0 0 1 0 0 + 0 -.569987-.018055i 0 0 -.461876-.739848i 0 + 0 1 0 0 1 0 + 0 0 .112781-1.49632i 0 0 -.224144+.66624i + 0 0 1 0 0 1 - ring => CC ring => CC - 53 53 - 3 3 - source => CC source => CC - 53 53 - 6 6 - target => CC target => CC - 53 53 + ring => CC ring => CC + 53 53 + 3 3 + source => CC source => CC + 53 53 + 6 6 + target => CC target => CC + 53 53 i6 : diff --git a/M2/Macaulay2/packages/NumericalSchubertCalculus/examples/_print__Statistics.out b/M2/Macaulay2/packages/NumericalSchubertCalculus/examples/_print__Statistics.out index fa811d2d070..bdc94aaac7c 100644 --- a/M2/Macaulay2/packages/NumericalSchubertCalculus/examples/_print__Statistics.out +++ b/M2/Macaulay2/packages/NumericalSchubertCalculus/examples/_print__Statistics.out @@ -42,6 +42,6 @@ i6 : printStatistics() # moves of type {2, 0, 0} = 3 # moves of type {2, 1, 0} = 1 # moves of type {2, 2, 0} = 12 -tracking time = .0627298 +tracking time = .0726057 i7 : diff --git a/M2/Macaulay2/packages/NumericalSchubertCalculus/examples/_set__Verbose__Level.out b/M2/Macaulay2/packages/NumericalSchubertCalculus/examples/_set__Verbose__Level.out index f8c4e93dc51..05eff1e0dc6 100644 --- a/M2/Macaulay2/packages/NumericalSchubertCalculus/examples/_set__Verbose__Level.out +++ b/M2/Macaulay2/packages/NumericalSchubertCalculus/examples/_set__Verbose__Level.out @@ -56,84 +56,84 @@ i5 : setVerboseLevel 1; i6 : S = solveSchubertProblem(SchPblm,2,4) -- playCheckers --- cpu time = .00494953 +-- cpu time = .00601947 -- making a recursive call to resolveNode -- playCheckers --- cpu time = .00228437 +-- cpu time = .00384407 -- making a recursive call to resolveNode -- playCheckers --- cpu time = .000274343 +-- cpu time = .000405587 resolveNode reached node of no remaining conditions --- time to make equations: .00390117 +-- time to make equations: .0113492 Setup time: 0 Computing time:0 - -- trackHomotopy time = .0136096 sec. for [{0, 1, 2, 3}, {0, infinity, 2, infinity}] --- time of performing one checker move: .0196087 --- time of performing one checker move: .0010252 --- time of performing one checker move: .00101623 --- time to make equations: .00493436 + -- trackHomotopy time = .00641883 sec. for [{0, 1, 2, 3}, {0, infinity, 2, infinity}] +-- time of performing one checker move: .0224431 +-- time of performing one checker move: .00136392 +-- time of performing one checker move: .00125758 +-- time to make equations: .00409937 Setup time: 0 Computing time:0 - -- trackHomotopy time = .00615856 sec. for [{1, 2, 3, 0}, {1, infinity, infinity, 2}] --- time of performing one checker move: .0152368 --- time to make equations: .00436537 + -- trackHomotopy time = .00526319 sec. for [{1, 2, 3, 0}, {1, infinity, infinity, 2}] +-- time of performing one checker move: .0136233 +-- time to make equations: .0110752 Setup time: 0 Computing time:0 - -- trackHomotopy time = .00607117 sec. for [{1, 3, 2, 0}, {1, infinity, infinity, 2}] --- time of performing one checker move: .0145254 --- time to make equations: .0044331 + -- trackHomotopy time = .00619821 sec. for [{1, 3, 2, 0}, {1, infinity, infinity, 2}] +-- time of performing one checker move: .0213222 +-- time to make equations: .00419011 Setup time: 0 Computing time:0 - -- trackHomotopy time = .0143777 sec. for [{2, 3, 1, 0}, {2, infinity, infinity, 1}] --- time of performing one checker move: .0221031 --- time to make equations: .0105845 + -- trackHomotopy time = .00526115 sec. for [{2, 3, 1, 0}, {2, infinity, infinity, 1}] +-- time of performing one checker move: .0136673 +-- time to make equations: .0166996 Setup time: 0 Computing time:0 - -- trackHomotopy time = .00788359 sec. for [{0, 1, 2, 3}, {infinity, 1, 2, infinity}] --- time of performing one checker move: .0230352 --- time to make equations: .0101357 + -- trackHomotopy time = .00752237 sec. for [{0, 1, 2, 3}, {infinity, 1, 2, infinity}] +-- time of performing one checker move: .0288234 +-- time to make equations: .00926965 Setup time: 0 Computing time:0 - -- trackHomotopy time = .00744606 sec. for [{0, 1, 3, 2}, {infinity, 1, infinity, 2}] --- time of performing one checker move: .0221374 --- time of performing one checker move: .000947422 --- time of performing one checker move: .000955539 --- time to make equations: .0102118 + -- trackHomotopy time = .00642767 sec. for [{0, 1, 3, 2}, {infinity, 1, infinity, 2}] +-- time of performing one checker move: .0198177 +-- time of performing one checker move: .00678202 +-- time of performing one checker move: .00125066 +-- time to make equations: .0103571 Setup time: 0 Computing time:0 - -- trackHomotopy time = .00708272 sec. for [{1, 3, 2, 0}, {infinity, 3, infinity, 1}] --- time of performing one checker move: .0291536 + -- trackHomotopy time = .00633686 sec. for [{1, 3, 2, 0}, {infinity, 3, infinity, 1}] +-- time of performing one checker move: .0212162 -- making a recursive call to resolveNode -- playCheckers --- cpu time = .00277507 +-- cpu time = .00377576 -- making a recursive call to resolveNode -- playCheckers --- cpu time = .000321946 +-- cpu time = .000418823 resolveNode reached node of no remaining conditions --- time to make equations: .00393774 +-- time to make equations: .00425091 Setup time: 0 Computing time:0 - -- trackHomotopy time = .00502202 sec. for [{0, 1, 2, 3}, {0, infinity, 2, infinity}] --- time of performing one checker move: .0123765 --- time of performing one checker move: .000840275 --- time to make equations: .0113042 + -- trackHomotopy time = .006444 sec. for [{0, 1, 2, 3}, {0, infinity, 2, infinity}] +-- time of performing one checker move: .0219552 +-- time of performing one checker move: .00136799 +-- time to make equations: .00463165 Setup time: 0 Computing time:0 - -- trackHomotopy time = .00574352 sec. for [{0, 2, 3, 1}, {0, infinity, infinity, 2}] --- time of performing one checker move: .021032 --- time of performing one checker move: .000887347 --- time of performing one checker move: .000689267 --- time of performing one checker move: .000872269 --- time of performing one checker move: .000953705 --- time of performing one checker move: .000664042 --- time of performing one checker move: .000883894 --- time of performing one checker move: .000898403 --- time to make equations: .0085071 + -- trackHomotopy time = .00525894 sec. for [{0, 2, 3, 1}, {0, infinity, infinity, 2}] +-- time of performing one checker move: .0139133 +-- time of performing one checker move: .00107706 +-- time of performing one checker move: .000772814 +-- time of performing one checker move: .00101058 +-- time of performing one checker move: .00113463 +-- time of performing one checker move: .00100553 +-- time of performing one checker move: .00650399 +-- time of performing one checker move: .00132128 +-- time to make equations: .0101487 Setup time: 0 Computing time:0 - -- trackHomotopy time = .00610873 sec. for [{1, 3, 2, 0}, {1, infinity, infinity, 3}] --- time of performing one checker move: .0182445 --- time of performing one checker move: .00130729 + -- trackHomotopy time = .00655759 sec. for [{1, 3, 2, 0}, {1, infinity, infinity, 3}] +-- time of performing one checker move: .0211642 +-- time of performing one checker move: .00174374 o6 = {| -1.65573-.600637ii .0201935+.0437095ii |, | -.154703+.175591ii | -1.23037-1.66989ii -.0308057-.00120618ii | | -.801221-.0354303ii diff --git a/M2/Macaulay2/packages/NumericalSchubertCalculus/examples/_solutions__To__Affine__Coords.out b/M2/Macaulay2/packages/NumericalSchubertCalculus/examples/_solutions__To__Affine__Coords.out index 523745cef2a..5c4b4ac7ea5 100644 --- a/M2/Macaulay2/packages/NumericalSchubertCalculus/examples/_solutions__To__Affine__Coords.out +++ b/M2/Macaulay2/packages/NumericalSchubertCalculus/examples/_solutions__To__Affine__Coords.out @@ -31,19 +31,19 @@ o1 : List i2 : S = solveSchubertProblem(Pblm, 3,6) -o2 = {| .362674+1.2327e-16ii 5.87881+2.97425e-14ii .067722-9.01983e-17ii |, - | -.168148+9.29853e-17ii 10.2268+5.44749e-14ii .359604-1.18969e-16ii | - | .287667+4.05941e-17ii 5.41301+2.76829e-14ii .178413-1.05689e-16ii | - | .399967+8.73997e-17ii 10.4365+5.39029e-14ii .172408-1.02452e-16ii | - | .893699+3.57479e-18ii 2.90938+1.5283e-14ii .127632-3.63809e-17ii | - | -.108865+9.87064e-17ii 5.44614+2.94139e-14ii .099289-9.57795e-17ii | +o2 = {| .362674+4.83909e-16ii 5.87881+1.4973e-13ii .067722-3.25474e-16ii |, + | -.168148+3.65025e-16ii 10.2268+2.74238e-13ii .359604-4.29289e-16ii | + | .287667+1.59357e-16ii 5.41301+1.39362e-13ii .178413-3.8137e-16ii | + | .399967+3.43098e-16ii 10.4365+2.71358e-13ii .172408-3.69689e-16ii | + | .893699+1.40332e-17ii 2.90938+7.69377e-14ii .127632-1.31278e-16ii | + | -.108865+3.87484e-16ii 5.44614+1.48076e-13ii .099289-3.45613e-16ii | ------------------------------------------------------------------------ - | .675164+1.2692e-15ii .770431+2.49223e-15ii -.0909566-8.88941e-16ii - | .0675706+9.5739e-16ii .870501+4.56466e-15ii .150312-1.17248e-15ii - | .390574+4.17962e-16ii .658364+2.31966e-15ii -.00751668-1.04161e-15ii - | .621526+8.99879e-16ii 1.17845+4.51673e-15ii -.0078269-1.0097e-15ii - | .902762+3.68065e-17ii .284467+1.28062e-15ii .0636297-3.58549e-16ii - | .141356+1.01629e-15ii .394186+2.46471e-15ii -.0692081-9.43946e-16ii + | .675164+1.12445e-15ii .770431+2.17408e-15ii -.0909566-7.64252e-16ii + | .0675706+8.48201e-16ii .870501+3.98194e-15ii .150312-1.00802e-15ii + | .390574+3.70294e-16ii .658364+2.02353e-15ii -.00751668-8.95503e-16ii + | .621526+7.9725e-16ii 1.17845+3.94013e-15ii -.0078269-8.68074e-16ii + | .902762+3.26088e-17ii .284467+1.11714e-15ii .0636297-3.08256e-16ii + | .141356+9.00388e-16ii .394186+2.15007e-15ii -.0692081-8.11541e-16ii ------------------------------------------------------------------------ |} | diff --git a/M2/Macaulay2/packages/PHCpack/examples/_to__Laurent__Polynomial.out b/M2/Macaulay2/packages/PHCpack/examples/_to__Laurent__Polynomial.out index 94c2709be86..18ba2226965 100644 --- a/M2/Macaulay2/packages/PHCpack/examples/_to__Laurent__Polynomial.out +++ b/M2/Macaulay2/packages/PHCpack/examples/_to__Laurent__Polynomial.out @@ -6,9 +6,7 @@ i2 : sys = {y-x^2, z-x^3, (x+y+z-1)/x}; i3 : describe ring ideal sys -o3 = frac/QQ[x..z, Degrees => {3:1}, Heft => {1}, MonomialOrder => {MonomialSize => 32}, DegreeRank => 1]\ - | {GRevLex => {3:1} } | - \ {Position => Up } / +o3 = frac(QQ[x..z, Degrees => {3:1}, Heft => {1}]) i4 : convertedSys = toLaurentPolynomial(sys,w); @@ -27,7 +25,7 @@ o7 : PolynomialRing i8 : describe oo -o8 = QQ {x..z, w , Degrees => {4:1}, MonomialOrder => {Weights => {4:-1} }, DegreeRank => 1, Inverses => true, Global => false} +o8 = QQ {x..z, w , Degrees => {4:1}, MonomialOrder => {Weights => {4:-1} }, Inverses => true, Local => true, Global => false} 0 {MonomialSize => 32} {GroupRevLex => 4 } {Position => Up } diff --git a/M2/Macaulay2/packages/PseudomonomialPrimaryDecomposition.m2 b/M2/Macaulay2/packages/PseudomonomialPrimaryDecomposition.m2 index 2f3eb102d7c..e68e408a491 100644 --- a/M2/Macaulay2/packages/PseudomonomialPrimaryDecomposition.m2 +++ b/M2/Macaulay2/packages/PseudomonomialPrimaryDecomposition.m2 @@ -9,7 +9,21 @@ newPackage( Email => "avelizcuba1@udayton.edu", HomePage => "https://sites.google.com/site/alanvelizcuba/" }}, - DebuggingMode => false + DebuggingMode => false, + Certification => { + "journal name" => "The Journal of Software for Algebra and Geometry", + "journal URI" => "http://j-sag.org/", + "article title" => "Primary decomposition of squarefree pseudomonomial ideals", + "acceptance date" => "18 July 2022", + "published article URI" => "https://msp.org/jsag/2022/12-1/p04.xhtml", + "published article DOI" => "10.2140/jsag.2022.12.27", + "published code URI" => "https://msp.org/jsag/2022/12-1/jsag-v12-n1-x04-PseudomonomialPrimaryDecomposition.m2", + "repository code URI" => "http://github.com/Macaulay2/M2/blob/master/M2/Macaulay2/packages/PseudomonomialPrimaryDecomposition.m2", + "release at publication" => "4c86bb7c1f80a36c5e2ce6786863f5702c13ddda", -- git commit number in hex + "version at publication" => "0.3", + "volume number" => "12", + "volume URI" => "https://msp.org/jsag/2022/12-1/" + } ) diff --git a/M2/Macaulay2/packages/RationalMaps.m2 b/M2/Macaulay2/packages/RationalMaps.m2 index 391ffa88c3c..0b71f288a92 100644 --- a/M2/Macaulay2/packages/RationalMaps.m2 +++ b/M2/Macaulay2/packages/RationalMaps.m2 @@ -18,7 +18,21 @@ newPackage( "RationalMaps", }, --this file is in the public domain Keywords => {"Commutative Algebra"}, Headline => "rational maps between varieties", - PackageExports => {"FastMinors"} + PackageExports => {"FastMinors"}, + Certification => { + "journal name" => "The Journal of Software for Algebra and Geometry", + "journal URI" => "http://j-sag.org/", + "article title" => "RationalMaps, a package for Macaulay2", + "acceptance date" => "17 July 2022", + "published article URI" => "https://msp.org/jsag/2022/12-1/p03.xhtml", + "published article DOI" => "10.2140/jsag.2022.12.17", + "published code URI" => "https://msp.org/jsag/2022/12-1/jsag-v12-n1-x03-RationalMaps.m2", + "repository code URI" => "http://github.com/Macaulay2/M2/blob/master/M2/Macaulay2/packages/RationalMaps.m2", + "release at publication" => "0cee3a5ae1e3fbd3dfa8407a4c8d6ad6a13dffd3", -- git commit number in hex + "version at publication" => "1.0", + "volume number" => "12", + "volume URI" => "https://msp.org/jsag/2022/12-1/" + } ) --Hassanzadeh was supported by CNPq-bolsa de Produtividade and by the MathAmSud project ``ALGEO'' --Schwede was supported in part by the NSF FRG Grant DMS \#1265261/1501115, NSF CAREER Grant DMS \#1252860/1501102, NSF Grants DMS \#1840190 and DMS \#2101800. diff --git a/M2/VERSION b/M2/VERSION index d2ab029d32c..71f7f51df9a 100644 --- a/M2/VERSION +++ b/M2/VERSION @@ -1 +1 @@ -1.21 +1.22 diff --git a/M2/distributions/deb/changelog b/M2/distributions/deb/changelog index 80b71c180b6..f0df74d53a9 100644 --- a/M2/distributions/deb/changelog +++ b/M2/distributions/deb/changelog @@ -94,3 +94,9 @@ macaulay2 (1.21) stable; urgency=low macaulay2 (1.21.0.1) stable; urgency=low * release version 1.21.0.1 -- Daniel R Grayson Wed, 7 Dec 2022 09:50:25 -0500 +macaulay2 (1.22) stable; urgency=low + * release version 1.22 + -- Daniel R Grayson Wed, 7 Jun 2023 09:50:25 -0500 +macaulay2 (1.22.0.1) stable; urgency=low + * release version 1.22.0.1 + -- Daniel R Grayson Wed, 7 Jun 2023 09:50:25 -0500 diff --git a/M2/libraries/gc/Makefile.in b/M2/libraries/gc/Makefile.in index 5a173e7e76c..6556e4e5c69 100644 --- a/M2/libraries/gc/Makefile.in +++ b/M2/libraries/gc/Makefile.in @@ -6,6 +6,7 @@ VERSION = 8.0.4 #VERSION = 7.6.2 LICENSEFILES = README.QUICK PATCHFILE = @abs_srcdir@/patch-$(VERSION) +SHARED = yes # the foreign functions package needs this # We can also get the sources from the home page above or from # https://github.com/ivmai/bdwgc/ @@ -57,7 +58,7 @@ CONFIGOPTIONS += --enable-threads=posix ## always build for large memory configurations CPPFLAGS += -DMAX_HEAP_SECTS=81920 -DMAXHINCR=4096 -ifeq (@SHARED@,no) +ifeq (@SHARED@-SHARED,no-no) CONFIGOPTIONS += --disable-shared --enable-static endif diff --git a/M2/libraries/readline/Makefile.in b/M2/libraries/readline/Makefile.in index 813d4dbd67c..ded9d5e5fbc 100644 --- a/M2/libraries/readline/Makefile.in +++ b/M2/libraries/readline/Makefile.in @@ -1,7 +1,7 @@ LICENSEFILES = COPYING -VERSION = 6.3 -PATCHES = 001 002 003 004 005 006 007 008 +VERSION = 8.2 +PATCHES = 001 RELAX = yes # URL = ftp://ftp.gnu.org/gnu/readline