Changeset c40c1a in git


Ignore:
Timestamp:
Sep 29, 2023, 3:53:32 PM (8 months ago)
Author:
slap <slaplagne@…>
Branches:
(u'spielwiese', 'd08f5f0bb3329b8ca19f23b74cb1473686415c3a')
Children:
18d6a5bcc54d44bcdcd28d7ca350f404c249bf3f
Parents:
86dc427e1dba8999d3d7ff50adfd728ebb6e930f
git-author:
slap <slaplagne@gmail.com>2023-09-29 15:53:32+02:00
git-committer:
Hans Schoenemann <hannes@mathematik.uni-kl.de>2023-11-07 16:30:31+01:00
Message:
valIKClass fixed

The order of expansions at classes was sometimes wrongly computed.
Location:
Singular/LIB
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • Singular/LIB/.singularhistory

    r86dc42 rc40c1a  
    57305730int t = timer;
    57315731list l1 = integralBasis(g, 2, "atOrigin");
    5732 
    57335732l1;
    57345733timer - t;
    … …  
    57365735list l2 = integralBasis(f, 2, "atOrigin", "noOpti");
    57375736timer - t;
    5738 
    57395737list l2 = integralBasis(g, 2, "atOrigin", "noOpti");
    57405738timer - t;
    5741 
    57425739l2;
    57435740"Verification...";
    57445741size(reduce(l1[1], groebner(l2[1])));
    57455742size(reduce(l2[1], groebner(l1[1])));
     5743printlevel = 3;
     5744LIB"integralbasis.lib";
     5745ring R = 0,(x,y),dp;
     5746poly f = x^(30)+x^2*y^2+y^(11);
     5747map phi = R,x+2*y+x^2+x*y+y^2+x^3,3*x+5*y+x^2*y+y^2;
     5748poly g =phi(f);
     5749int t = timer;
     5750list l1 = integralBasis(g, 2, "atOrigin");
     5751l1;
     5752LIB"normal.lib";
     5753ring r=0,(x,y,z,w,t),dp;   //dim 2, dim s_locus 1
     5754ideal i= x2+zw, y3+xwt, xw3+z3t+ywt2, y2w4-xy2z2t-w3t3;
     5755int t = timer;
     5756normal(i);
     5757timer - t;
     5758int t = timer;
     5759normal(i, "GBRadical");
     5760timer - t;
     5761LIB"normal.lib";
     5762ring r=0,(x,y,z,w,t),dp;   //dim 2, dim s_locus 1
     5763ideal i= x2+zw, y3+xwt, xw3+z3t+ywt2, y2w4-xy2z2t-w3t3;
     5764int t = timer;
     5765normal(i, "noGBRadical");
     5766LIB"normal.lib";
     5767ring r=0,(x,y,z,w,t),dp;   //dim 2, dim s_locus 1
     5768ideal i= x2+zw, y3+xwt, xw3+z3t+ywt2, y2w4-xy2z2t-w3t3;
     5769int t = timer;
     5770normal(i, "noGBRadical");
     5771timer - t;
     5772t = timer;
     5773normal(i, "GBRadical");
     5774timer - t;
     5775LIB"normal.lib";
     5776ring r=0,(x, y),dp;
     5777ideal i=y9+y8x+y8+y5+y4x+y3x2+y2x3+yx8+x9;
     5778timeNormal(i, "normal", "normalC", "normalP", "isPrim");
     5779int t = timer;
     5780normal(i, "noGBRadical");
     5781timer - t;
     5782t = timer;
     5783normal(i, "GBRadical");
     5784timer - t;
     5785LIB"normal.lib";
     5786ring r=0,(x, y),dp;
     5787ideal i=y9+y8x+y8+y5+y4x+y3x2+y2x3+yx8+x9;
     5788int t = timer;
     5789normal(i, "noGBRadical");
     5790timer - t;
     5791t = timer;
     5792normal(i, "GBRadical");
     5793timer - t;
     5794LIB"normal.lib";
     5795ring r=0,(x, y),dp;
     5796ideal i=y9+y8x+y8+y5+y4x+y3x2+y2x3+yx8+x9;
     5797int t = timer;
     5798normal(i, "noGBRadical");
     5799timer - t;
     5800t = timer;
     5801normal(i, "GBRadical");
     5802timer - t;
     5803LIB"normal.lib";
     5804ring r=0,(v,u,z,y,x),dp;
     5805ideal i = z3+zyx+y3x2+y2x3, uyx+z2,uz+z+y2x+yx2, u2+u+zy+zx, v3+vux+vz2+vzyx+vzx+uz3+uz2y+z3+z2yx2;
     5806int t = timer;
     5807normal(i, "noGBRadical");
     5808timer - t;
     5809t = timer;
     5810normal(i, "GBRadical");
     5811timer - t;
     5812LIB"normal.lib";
     5813ring r=0,(v,u,z,y,x),dp;
     5814ideal i = z3+zyx+y3x2+y2x3, uyx+z2,uz+z+y2x+yx2, u2+u+zy+zx, v3+vux+vz2+vzyx+vzx+uz3+uz2y+z3+z2yx2;
     5815int t = timer;
     5816normal(i, "noGBRadical");
     5817timer - t;
     5818t = timer;
     5819normal(i, "GBRadical");
     5820timer - t;
     5821LIB"normal.lib";
     5822ring r=0,(x, y),dp;
     5823ideal I = (y^15 + 2*x^38)*(y^19 + 7*x^52) + y^100;
     5824int t = timer;
     5825normal(i, "noGBRadical");
     5826timer - t;
     5827t = timer;
     5828normal(i, "GBRadical");
     5829timer - t;
     5830LIB"normal.lib";
     5831ring r=0,(x, y),dp;
     5832ideal i = (y^15 + 2*x^38)*(y^19 + 7*x^52) + y^100;
     5833int t = timer;
     5834normal(i, "noGBRadical");
     5835timer - t;
     5836t = timer;
     5837normal(i, "GBRadical");
     5838timer - t;
     5839LIB"normal.lib";
     5840ring r=0,(x, y),dp;
     5841ideal i = (y^5 + 2*x^8)*(y^9 + 7*x^2) + y^15;
     5842int t = timer;
     5843normal(i, "noGBRadical");
     5844timer - t;
     5845t = timer;
     5846normal(i, "GBRadical");
     5847timer - t;
     5848LIB"normal.lib";
     5849ring r=0,(x, y),dp;
     5850ideal i = (y^15 + 2*x^8)*(y^19 + 7*x^2) + y^35;
     5851int t = timer;
     5852normal(i, "noGBRadical");
     5853timer - t;
     5854t = timer;
     5855normal(i, "GBRadical");
     5856timer - t;
     5857LIB"normal.lib";
     5858ring r=0,(x, y),dp;
     5859ideal i = (y^15 + 2*x^13)*(y^19 + 7*x^7) + y^35;
     5860int t = timer;
     5861normal(i, "noGBRadical");
     5862timer - t;
     5863t = timer;
     5864normal(i, "GBRadical");
     5865timer - t;
     5866LIB"normal.lib";
     5867ring r=0,(x, y),dp;
     5868ideal i = (y^15 + 2*x^13)*(y^19 + 7*x^7)*(y^23 + 3*x^8*y^7 + x^7) + y^58;
     5869int t = timer;
     5870normal(i, "noGBRadical");
     5871timer - t;
     5872t = timer;
     5873normal(i, "GBRadical");
     5874timer - t;
     5875LIB"normal.lib";
     5876ring r=0,(x, y),dp;
     5877ideal i = (y^15 + 2*x^13)*(y^23 + 3*x^8*y^7 + x^7) + y^40;
     5878int t = timer;
     5879normal(i, "noGBRadical");
     5880timer - t;
     5881t = timer;
     5882normal(i, "GBRadical");
     5883timer - t;
     5884LIB"normal.lib";
     5885ring r=0,(x, y),dp;
     5886ideal i = (y^15 + 2*x^13)*(y^23 + 3*x^8*y^7 + x^7) + y^40;
     5887int t = timer;
     5888normal(i, "noGBRadical", "modular");
     5889timer - t;
     5890t = timer;
     5891normal(i, "GBRadical", "modular");
     5892timer - t;
     5893LIB"normal.lib";
     5894ring r=0,(x, y),dp;
     5895ideal i = (y^15 + 2*x^13)*(y^13 + 3*x^8*y^7 + x^7) + y^30;
     5896int t = timer;
     5897normal(i, "noGBRadical", "modular");
     5898timer - t;
     5899t = timer;
     5900normal(i, "GBRadical", "modular");
     5901timer - t;
     5902LIB"normal.lib";
     5903ring r=0,(x, y),dp;
     5904ideal i = (y^8 + 2*x^13)*(y^13 + 3*x^8*y^7 + x^7) + y^22;
     5905int t = timer;
     5906normal(i, "noGBRadical", "modular");
     5907timer - t;
     5908t = timer;
     5909normal(i, "GBRadical", "modular");
     5910timer - t;
     5911LIB"normal.lib";
     5912ring r=0,(x, y),dp;
     5913ideal i = (y^8 + 2*x^13)*(y^13 + 3*x^4*y^7 + x^7) + y^22;
     5914int t = timer;
     5915normal(i, "noGBRadical", "modular");
     5916timer - t;
     5917t = timer;
     5918normal(i, "GBRadical", "modular");
     5919timer - t;
     5920LIB"normal.lib";
     5921ring r=0,(x, y),dp;
     5922ideal i = (y^8 + 2*x^13)*(y^5 + 3*x^2*y^2 + x^7) + y^22;
     5923int t = timer;
     5924normal(i, "noGBRadical", "modular");
     5925timer - t;
     5926t = timer;
     5927normal(i, "GBRadical", "modular");
     5928timer - t;
     5929LIB"normal.lib";
     5930ring r=0,(x, y),dp;
     5931ideal i = (y^8 + 2*x^13)*(y^5 + 3*x^2*y^2 + x^7) + y^22;
     5932int t = timer;
     5933normal(i, "noGBRadical");
     5934timer - t;
     5935t = timer;
     5936normal(i, "GBRadical");
     5937timer - t;
     5938LIB"normal.lib";
     5939ring r=0,(x, y),dp;
     5940ideal i = (y^8 + 2*x^3)*(y^5 + 3*x^2*y^2 + x^7) + y^22;
     5941int t = timer;
     5942normal(i, "noGBRadical");
     5943timer - t;
     5944t = timer;
     5945normal(i, "GBRadical");
     5946timer - t;
     5947LIB"normal.lib";
     5948ring r=0,(x, y),dp;
     5949ideal i = (y^7 + 2*x^3)*(y^5 + 3*x^2*y^2 + x^4) + y^13;
     5950int t = timer;
     5951normal(i, "noGBRadical");
     5952timer - t;
     5953t = timer;
     5954normal(i, "GBRadical");
     5955timer - t;
     5956LIB"normal.lib";
     5957ring r=0,(x, y),dp;
     5958ideal i = (y^7 + 2*x^3)*(y^5 + 3*x^2*y^2 + x^17) + y^13;
     5959int t = timer;
     5960normal(i, "noGBRadical");
     5961timer - t;
     5962t = timer;
     5963normal(i, "GBRadical");
     5964timer - t;
     5965LIB"normal.lib";
     5966ring r=0,(x, y),dp;
     5967ideal i = (y^7 + 2*x^13)*(y^5 + 3*x^2*y^2 + x^17) + y^13;
     5968int t = timer;
     5969normal(i, "noGBRadical");
     5970timer - t;
     5971t = timer;
     5972normal(i, "GBRadical");
     5973timer - t;
     5974LIB"normal.lib";
     5975ring r=0,(x, y),dp;
     5976ideal i = (y^3 + 2*x^2)*(y^2 + 2*x^2)*(y^5 - 3*x^2) + y^12;
     5977int t = timer;
     5978normal(i, "noGBRadical");
     5979timer - t;
     5980t = timer;
     5981normal(i, "GBRadical");
     5982timer - t;
     5983LIB"normal.lib";
     5984ring r=0,(x, y),dp;
     5985ideal i = (y^3 + 2*x^2)*(y^2 + 2*x^9)*(y^5 - 3*x^7) + y^12;
     5986int t = timer;
     5987normal(i, "noGBRadical");
     5988timer - t;
     5989t = timer;
     5990normal(i, "GBRadical");
     5991timer - t;
     5992LIB"normal.lib";
     5993ring r=0,(x, y),dp;
     5994poly f1 = 9127158539954*X^10+3212722859346*X^8*Y^2+228715574724*X^6*Y^4 - 34263110700*X^4*Y^6-5431439286*X^2*Y^8-201803238*Y^10-134266087241*X^8-15052058268*X^6*Y^2;
     5995poly f2 = 12024807786*X^4*Y^4+506101284*X^2*Y^6-202172841*Y^8+761328152*X^6-128361096*X^4*Y^2+47970216*X^2*Y^4-6697080*Y^6-2042158*X^4+660492*X^2*Y^2-84366*Y^4;
     5996poly f3 = 2494*X^4-474*Y^3-1;
     5997poly f = f1 + f2 + f3;
     5998int t = timer;
     5999normal(f, list("noGBRadical"));
     6000timer - t;
     6001t = timer;
     6002normal(i, "GBRadical");
     6003timer - t;
     6004LIB"normal.lib";
     6005ring R = 0, (X, Y), dp;
     6006poly f1 = 9127158539954*X^10+3212722859346*X^8*Y^2+228715574724*X^6*Y^4 - 34263110700*X^4*Y^6-5431439286*X^2*Y^8-201803238*Y^10-134266087241*X^8-15052058268*X^6*Y^2;
     6007poly f2 = 12024807786*X^4*Y^4+506101284*X^2*Y^6-202172841*Y^8+761328152*X^6-128361096*X^4*Y^2+47970216*X^2*Y^4-6697080*Y^6-2042158*X^4+660492*X^2*Y^2-84366*Y^4;
     6008poly f3 = 2494*X^4-474*Y^3-1;
     6009poly f = f1 + f2 + f3;
     6010int t = timer;
     6011normal(f, list("noGBRadical"));
     6012timer - t;
     6013t = timer;
     6014normal(i, "GBRadical");
     6015timer - t;
     6016LIB"normal.lib";
     6017ring R = 0, (X, Y), dp;
     6018poly f1 = 9127158539954*X^10+3212722859346*X^8*Y^2+228715574724*X^6*Y^4 - 34263110700*X^4*Y^6-5431439286*X^2*Y^8-201803238*Y^10-134266087241*X^8-15052058268*X^6*Y^2;
     6019poly f2 = 12024807786*X^4*Y^4+506101284*X^2*Y^6-202172841*Y^8+761328152*X^6-128361096*X^4*Y^2+47970216*X^2*Y^4-6697080*Y^6-2042158*X^4+660492*X^2*Y^2-84366*Y^4;
     6020poly f3 = 2494*X^4-474*Y^3-1;
     6021poly f = f1 + f2 + f3;
     6022int t = timer;
     6023normal(f, list("noGBRadical"));
     6024LIB"normal.lib";
     6025ring R = 0, (X, Y), dp;
     6026poly f1 = 9127158539954*X^17+3212722859346*X^8*Y^2+228715574724*X^6*Y^4 - 34263110700*X^4*Y^6-5431439286*X^2*Y^8-201803238*Y^10-134266087241*X^8-15052058268*X^6*Y^2;
     6027poly f2 = 12024807786*X^4*Y^4+506101284*X^2*Y^6-202172841*Y^8+761328152*X^6-128361096*X^4*Y^2+47970216*X^2*Y^4-6697080*Y^6-2042158*X^4+660492*X^2*Y^2-84366*Y^4;
     6028poly f3 = 2494*X^2-474*Y^2-1;
     6029poly f = f1 + f2 + f3;
     6030int t = timer;
     6031normal(f, list("noGBRadical"));
     6032timer - t;
     6033LIB"normal.lib";
     6034ring r=0,(x, y),dp;
     6035ideal i = (y^15 + 2*x^13)*(y^19 + 7*x^7) + y^35;
     6036int t = timer;
     6037normal(i, "noGBRadical");
     6038timer - t;
     6039t = timer;
     6040normal(i, "GBRadical");
     6041timer - t;
     6042LIB"integralbasis.lib";
     6043ring R = 0,(x,y,x0),dp;
     6044poly f = x^(30)+x^2*y^2+y^(11);
     6045map phi = R,x+2*y+x^2+x*y+y^2+x^3,3*x+5*y+x^2*y+y^2;
     6046poly g =phi(f);
     6047int t = timer;
     6048list l1 = integralBasis(g, 2, "atOrigin");
     6049LIB"integralbasis.lib";
     6050ring R = 0,(x,y),dp;
     6051poly f = x^(30)+x^2*y^2+y^(11);
     6052map phi = R,x+2*y+x^2+x*y+y^2+x^3,3*x+5*y+x^2*y+y^2;
     6053poly g =phi(f);
     6054int t = timer;
     6055list l1 = integralBasis(g, 2, "atOrigin");
     6056l1;
     6057LIB"integralbasis.lib";
     6058ring R = 0,(x,y),dp;
     6059poly f = x^(30)+x^2*y^2+y^(11);
     6060map phi = R,x+2*y+x^2+x*y+y^2+x^3,3*x+5*y+x^2*y+y^2;
     6061poly g =phi(f);
     6062int t = timer;
     6063list l1 = integralBasis(g, 2, "atOrigin");
     6064LIB"integralbasis.lib";
     6065ring R = 0,(x,y),dp;
     6066poly f = x^(30)+x^2*y^2+y^(11);
     6067map phi = R,x+2*y+x^2+x*y+y^2+x^3,3*x+5*y+x^2*y+y^2;
     6068poly g =phi(f);
     6069int t = timer;
     6070list l1 = integralBasis(g, 2, "atOrigin");
     6071MSelf
     6072M
     6073LIB"integralbasis.lib";
     6074LIB"integralbasis.lib";
     6075ring R = 0,(x,y),dp;
     6076poly f = x^(30)+x^2*y^2+y^(11);
     6077map phi = R,x+2*y+x^2+x*y+y^2+x^3,3*x+5*y+x^2*y+y^2;
     6078poly g =phi(f);
     6079int t = timer;
     6080list l1 = integralBasis(g, 2, "atOrigin");
     6081def S = classes[1][1];
     6082setring S;
     6083PE
     6084setring R;
     6085def S = classes[2][1];
     6086setring S
     6087PE
     6088basering
     6089setring R;
     6090def S = classes[1][1];
     6091setring S;
     6092PE
     6093MClass
     6094LIB"integralbasis.lib";
     6095ring R = 0,(x,y),dp;
     6096poly f = x^(30)+x^2*y^2+y^(11);
     6097map phi = R,x+2*y+x^2+x*y+y^2+x^3,3*x+5*y+x^2*y+y^2;
     6098poly g =phi(f);
     6099int t = timer;
     6100list l1 = integralBasis(g, 2, "atOrigin");
     6101MClass
     6102LIB"integralbasis.lib";
     6103ring R = 0,(x,y),dp;
     6104poly f = x^(30)+x^2*y^2+y^(11);
     6105map phi = R,x+2*y+x^2+x*y+y^2+x^3,3*x+5*y+x^2*y+y^2;
     6106poly g =phi(f);
     6107int t = timer;
     6108list l1 = integralBasis(g, 2, "atOrigin");
     6109LIB"integralbasis.lib";
     6110ring R = 0,(x,y),dp;
     6111poly f = x^(30)+x^2*y^2+y^(11);
     6112map phi = R,x+2*y+x^2+x*y+y^2+x^3,3*x+5*y+x^2*y+y^2;
     6113poly g =phi(f);
     6114int t = timer;
     6115list l1 = integralBasis(g, 2, "atOrigin");
     6116den
     6117LIB"integralbasis.lib";
     6118ring R = 0,(x,y),dp;
     6119poly f = x^(30)+x^2*y^2+y^(11);
     6120map phi = R,x+2*y+x^2+x*y+y^2+x^3,3*x+5*y+x^2*y+y^2;
     6121poly g =phi(f);
     6122int t = timer;
     6123list l1 = integralBasis(g, 2, "atOrigin");
     6124o(1)
     6125o(2)
     6126f
     6127setring S
     6128LIB"integralbasis.lib";
     6129ring R = 0,(x,y),dp;
     6130poly f = x^(30)+x^2*y^2+y^(11);
     6131map phi = R,x+2*y+x^2+x*y+y^2+x^3,3*x+5*y+x^2*y+y^2;
     6132poly g =phi(f);
     6133int t = timer;
     6134list l1 = integralBasis(g, 2, "atOrigin");
     6135printlevel = 3;
     6136LIB"integralbasis.lib";
     6137ring R = 0,(x,y),dp;
     6138poly f = x^(30)+x^2*y^2+y^(11);
     6139map phi = R,x+2*y+x^2+x*y+y^2+x^3,3*x+5*y+x^2*y+y^2;
     6140poly g =phi(f);
     6141int t = timer;
     6142list l1 = integralBasis(g, 2, "atOrigin");
     6143valIKClass
     6144printlevel = 3;
     6145LIB"integralbasis.lib";
     6146ring R = 0,(x,y),dp;
     6147poly f = x^(30)+x^2*y^2+y^(11);
     6148map phi = R,x+2*y+x^2+x*y+y^2+x^3,3*x+5*y+x^2*y+y^2;
     6149poly g =phi(f);
     6150int t = timer;
     6151list l1 = integralBasis(g, 2, "atOrigin");
     6152MClass
     6153printlevel = 3;
     6154LIB"integralbasis.lib";
     6155ring R = 0,(x,y),dp;
     6156poly f = x^(30)+x^2*y^2+y^(11);
     6157map phi = R,x+2*y+x^2+x*y+y^2+x^3,3*x+5*y+x^2*y+y^2;
     6158poly g =phi(f);
     6159int t = timer;
     6160list l1 = integralBasis(g, 2, "atOrigin");
     6161j
     6162f(j)
     6163basering
     6164printlevel = 3;
     6165LIB"integralbasis.lib";
     6166ring R = 0,(x,y),dp;
     6167poly f = x^(30)+x^2*y^2+y^(11);
     6168map phi = R,x+2*y+x^2+x*y+y^2+x^3,3*x+5*y+x^2*y+y^2;
     6169poly g =phi(f);
     6170int t = timer;
     6171list l1 = integralBasis(g, 2, "atOrigin");
     6172LIB"integralbasis.lib";
     6173ring R = 0,(x,y),dp;
     6174poly f = x^(30)+x^2*y^4+y^2*x^4+y^(40);
     6175map phi = R,x+3y+x^3+x*y+x^2*y, y+y^2+x*y^2;
     6176poyl g  = phi(f);
     6177int t = timer;
     6178list l1 = integralBasis(g, 2, "atOrigin");
     6179timer - t;
     6180LIB"integralbasis.lib";
     6181ring R = 0,(x,y),dp;
     6182poly f = x^(30)+x^2*y^4+y^2*x^4+y^(40);
     6183map phi = R,x+3y+x^3+x*y+x^2*y, y+y^2+x*y^2;
     6184poly g  = phi(f);
     6185int t = timer;
     6186list l1 = integralBasis(g, 2, "atOrigin");
     6187timer - t;
     6188g = monic(g);
     6189int t = timer;
     6190list l1 = integralBasis(g, 2, "atOrigin");
     6191timer - t;
     6192LIB"integralbasis.lib";
     6193ring R = 0,(x,y),dp;
     6194poly f = x^(30)+x^2*y^4+y^2*x^4+y^(40);
     6195map phi = R,x+3y+x^3+x*y+x^2*y, y+y^2+x*y^2;
     6196poly g  = phi(f);
     6197g = monic(g);
     6198g;
     6199LIB"integralbasis.lib";
     6200ring R = 0,(x,y),dp;
     6201poly f = x^(30)+x^2*y^4+y^2*x^4+y^(40);
     6202map phi = R,x+3y+x^3+x*y+x^2*y, y+y^2+x*y^2;
     6203poly g  = phi(f);
     6204g
     6205;
     6206monic(g);
     6207g;
     6208coeff(g);
     6209coef(g);
     6210coef(g,y);
     6211LIB"integralbasis.lib";
     6212ring R = 0,(x,y),dp;
     6213poly f = x^(30)+x^2*y^4+y^2*x^4+y^(40);
     6214map phi = R,x+3y+x^3+x*y+x^2*y, y+y^2+x*y^2;
     6215map phi2 = R, x+y, y;
     6216poly g  = phi(f);
     6217g = phi2(g);
     6218g = monic(g);
     6219int t = timer;
     6220list l1 = integralBasis(g, 2, "atOrigin");
     6221printlevel = 5;
     6222LIB"integralbasis.lib";
     6223ring R = 0,(x,y),dp;
     6224poly f = xx^(30)+xx^2*yy^4+yy^2*xx^4+yy^(40);
     6225map phi = R,x+3y+x^3+x*y+x^2*y, y+y^2+x*y^2;
     6226map phi2 = R, x+y, y;
     6227poly g  = phi(f);
     6228g = phi2(g);
     6229g = monic(g);
     6230int t = timer;
     6231list l1 = integralBasis(g, 2, "atOrigin");
     6232printlevel = 5;
     6233LIB"integralbasis.lib";
     6234ring R = 0,(x,y),dp;
     6235poly f = xx^(30)+xx^2*yy^4+yy^2*xx^4+yy^(40);
     6236map phi = R,x+3y+x^3+x*y+x^2*y, y+y^2+x*y^2;
     6237map phi2 = R, x+y, y;
     6238poly g  = phi(f);
     6239g = phi2(g);
     6240g = monic(g);
     6241int t = timer;
     6242list l1 = integralBasis(g, 2, "atOrigin");
     6243LIB"integralbasis.lib";
     6244ring R = 0,(x,y),dp;
     6245poly f = xx^(30)+xx^2*yy^4+yy^2*xx^4+yy^(40);
     6246map phi = R,x+3y+x^3+x*y+x^2*y, y+y^2+x*y^2;
     6247map phi2 = R, x+y, y;
     6248poly g  = phi(f);
     6249g = phi2(g);
     6250g = monic(g);
     6251puiseux(g,1,-1);
     6252LIB"integralbasis.lib";
     6253ring R = 0,(x,y),dp;
     6254poly f = xx^(30)+xx^2*yy^4+yy^2*xx^4+yy^(40);
     6255map phi = R,x+3y+x^3+x*y+x^2*y, y+y^2+x*y^2;
     6256map phi2 = R, x+y, y;
     6257poly g  = phi(f);
     6258g = phi2(g);
     6259g = monic(g);
     6260newtonpoly(g);
     6261LIB"integralbasis.lib";
     6262ring r = 0,(x,y),(dp, L(100000));
     6263poly f = (y^15 + 2*x^38)*(y^19 + 7*x^52) + y^100;
     6264int t = timer;
     6265list l1 = integralBasis(f, 2, "atOrigin");
     6266timer - t;
     6267t = timer;
     6268list l2 = integralBasis(f, 2, "atOrigin", "noOpti");
     6269timer - t;
     6270poly f = (y^15 + 2*x^38)*(y^19 + 7*x^52) + y^100;
     6271int t = timer;
     6272list l1 = integralBasis(f, 2, "atOrigin");
     6273timer - t;
     6274t = timer;
     6275list l2 = integralBasis(f, 2, "atOrigin", "noOpti");
     6276timer - t;
     6277size(reduce(l1[1], groebner(l2[1])));
     6278size(reduce(l2[1], groebner(l1[1])));
     6279LIB"integralbasis.lib";
     6280ring r = 0,(x,y),(dp, L(100000));
     6281poly f = (y^15 + 2*x^38)*(y^19 + 7*x^52)*(y^7+3*x^2) + y^100;
     6282int t = timer;
     6283list l1 = integralBasis(f, 2, "atOrigin");
     6284timer - t;
     6285t = timer;
     6286list l2 = integralBasis(f, 2, "atOrigin", "noOpti");
     6287timer - t;
     6288size(reduce(l1[1], groebner(l2[1])));
     6289size(reduce(l2[1], groebner(l1[1])));
     6290LIB"integralbasis.lib";
     6291ring r = 0,(x,y),(dp, L(100000));
     6292poly f = (y^15 + 2*x^38)*(y^19 + 7*x^52)*(y^7+3*x^2) + y^100;
     6293int t = timer;
     6294list l1 = integralBasis(f, 2, "atOrigin");
     6295timer - t;
     6296t = timer;
     6297list l2 = integralBasis(f, 2, "atOrigin", "noOpti");
     6298timer - t;
     6299size(reduce(l1[1], groebner(l2[1])));
     6300size(reduce(l2[1], groebner(l1[1])));
     6301LIB"integralbasis.lib";
     6302ring r = 0, (x,y), dp;
     6303poly f = (y7 + x4) * (y7 + y5x3 + x4) + y30;
     6304int t = timer;
     6305list l1 = integralBasis(f, 2, "atOrigin");
     6306timer - t;
     6307t = timer;
     6308list l2 = integralBasis(f, 2, "atOrigin", "noOpti");
     6309timer - t;
    57466310
     6311size(reduce(l1[1], groebner(l2[1])));
     6312size(reduce(l2[1], groebner(l1[1])));
     6313
     6314printlevel = 5;
     6315LIB"integralbasis.lib";
     6316ring r = 0, (x,y), dp;
     6317poly f = (y7 + x4) * (y7 + y5x3 + x4) + y16;
     6318int t = timer;
     6319list l1 = integralBasis(f, 2, "atOrigin");
     6320timer - t;
     6321t = timer;
     6322list l2 = integralBasis(f, 2, "atOrigin", "noOpti");
     6323timer - t;
     6324
     6325size(reduce(l1[1], groebner(l2[1])));
     6326size(reduce(l2[1], groebner(l1[1])));
     6327

  • Singular/LIB/integralbasis.lib

    r86dc42 rc40c1a  
    31353135      poly f = subst(PE[1][1], @a, 0);
    31363136      int den(i) = PE[1][2];
    3137       number o = number(ratDeg(PE[1][1])) / number(den(i));
     3137      number o = number(ratDeg(PE[1][1])) / number(den(i));  // Check if we should have orderExp here...
    31383138      setring R;
    31393139      poly f(i) = imap(S, f);
    … …  
    32203220      int den(i) = PE[1][2];
    32213221      int mmult(i) = lcm(pardeg(minpoly), den(i)) div den(i);  // mult(i) * den(i) should be the number of elements in the conjugacy class
    3222       number o = number(ratDeg(PE[1][1])) / number(den(i));
     3222      number o = number(orderExp(PE[1][1])) / number(den(i));  // The degree of the smallest term
    32233223      setring R;
    32243224      poly f(i) = imap(S, f);
    … …  
    32683268          {
    32693269            // Finally, if they have the same order we use ordAtPol.
    3270             l = buildPolyGroundXRoot(f(j), den(j), -1);
     3270            l = buildPolyGroundXRootClass(classes[j], -1);
    32713271            MC[i, j] = ordAtPol(l[1], list(f(i), den(i)));
    32723272          }
Note: See TracChangeset for help on using the changeset viewer.