Changeset 7835f61 in git


Ignore:
Timestamp:
May 27, 2014, 3:20:05 PM (10 years ago)
Author:
Jakob Kröker <kroeker@…>
Branches:
(u'spielwiese', '5b153614cbc72bfa198d75b1e9e33dab2645d9fe')
Children:
d1df8403f1e5f64fed914d1e5be781a8fe2f763e
Parents:
89e00fe0d8e7a3f4bd8fc54c01ae113472268780
Message:
 used Hans routine hasGlobalOrdering instead of my hasGlobalMonomialOrdering
File:
1 edited

Legend:

Unmodified
Added
Removed
  • Singular/LIB/primdec.lib

    r89e00f r7835f61  
    6666{
    6767  ASSUME(0, not isQuotientRing(basering) ) ;
    68   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     68  ASSUME(0, hasGlobalOrdering(basering) ) ;
    6969
    7070  int @k;
     
    9494{
    9595  ASSUME(0, not isQuotientRing(basering) ) ;
    96   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     96  ASSUME(0, hasGlobalOrdering(basering) ) ;
    9797  int @k,@i;
    9898  def @P= basering;
     
    161161{
    162162  ASSUME(0, not isQuotientRing(basering) ) ;
    163   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     163  ASSUME(0, hasGlobalOrdering(basering) ) ;
    164164  int i,k;
    165165  poly f=1;
     
    209209{
    210210  ASSUME(0, not isQuotientRing(basering) ) ;
    211   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     211  ASSUME(0, hasGlobalOrdering(basering) ) ;
    212212  int i,j,k,action;
    213213  ideal verg;
     
    271271{
    272272  ASSUME(0, not isQuotientRing(basering) ) ;
    273   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     273  ASSUME(0, hasGlobalOrdering(basering) ) ;
    274274  poly keep=p;
    275275
     
    297297{
    298298  ASSUME(0, not isQuotientRing(basering) ) ;
    299   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     299  ASSUME(0, hasGlobalOrdering(basering) ) ;
    300300  ideal @i;
    301301  list @l;
     
    417417{
    418418  ASSUME(0, not isQuotientRing(basering) ) ;
    419   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     419  ASSUME(0, hasGlobalOrdering(basering) ) ;
    420420  int m=1;
    421421  int n=nvars(basering);
     
    512512{
    513513  ASSUME(0, not isQuotientRing(basering) ) ;
    514   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     514  ASSUME(0, hasGlobalOrdering(basering) ) ;
    515515  int i,j;
    516516  if(size(act)<=1)
     
    535535{
    536536  ASSUME(0, not isQuotientRing(basering) ) ;
    537   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     537  ASSUME(0, hasGlobalOrdering(basering) ) ;
    538538  int i,j,k,s,r,w;
    539539  list keepresult,act,keepprime;
     
    726726{
    727727  ASSUME(0, not isQuotientRing(basering) ) ;
    728   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     728  ASSUME(0, hasGlobalOrdering(basering) ) ;
    729729  if((char(basering)==0)||(npars(basering)>0))
    730730  {
     
    856856{
    857857  ASSUME(0, not isQuotientRing(basering) ) ;
    858   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     858  ASSUME(0, hasGlobalOrdering(basering) ) ;
    859859
    860860  def   @P = basering;
     
    13161316{
    13171317  ASSUME(0, not isQuotientRing(basering) ) ;
    1318   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     1318  ASSUME(0, hasGlobalOrdering(basering) ) ;
    13191319//zero_dimensional primary decomposition after finite field extension
    13201320  def R=basering;
     
    14091409
    14101410  ASSUME(0, not isQuotientRing(basering) ) ;
    1411   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     1411  ASSUME(0, hasGlobalOrdering(basering) ) ;
    14121412  def R=basering;
    14131413
    14141414  //i has to be a reduced groebner basis
     1415  ASSUME(1, dim(i)==0);
    14151416  ideal F=finduni(i);
    14161417
     
    15001501
    15011502  ASSUME(0, not isQuotientRing(basering) ) ;
    1502   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     1503  ASSUME(0, hasGlobalOrdering(basering) ) ;
    15031504  if(homog(I)==1){return(maxideal(1));}
    15041505
     
    15411542 
    15421543  ASSUME(0, not isQuotientRing(basering) ) ;
    1543   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     1544  ASSUME(0, hasGlobalOrdering(basering) ) ;
    15441545  def R=basering;
    15451546  list pr=zeroSp(i);
     
    15871588{
    15881589  ASSUME(0, not isQuotientRing(basering) ) ;
    1589   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     1590  ASSUME(0, hasGlobalOrdering(basering) ) ;
    15901591  int k,j;
    15911592  poly m;
     
    16661667{
    16671668 ASSUME(0, not isQuotientRing(basering) ) ;
    1668   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     1669  ASSUME(0, hasGlobalOrdering(basering) ) ;
    16691670 int k,j;
    16701671 intvec m,n,v,w;
     
    17921793{
    17931794  ASSUME(0, not isQuotientRing(basering) ) ;
    1794   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     1795  ASSUME(0, hasGlobalOrdering(basering) ) ;
    17951796  int n,k,di;
    17961797  list resu,hilf;
     
    18601861{
    18611862  ASSUME(0, not isQuotientRing(basering) ) ;
    1862   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     1863  ASSUME(0, hasGlobalOrdering(basering) ) ;
    18631864  ideal @ih,@jh;
    18641865  int npar=npars(basering);
     
    19261927{
    19271928   ASSUME(0, not isQuotientRing(basering) ) ;
    1928   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     1929  ASSUME(0, hasGlobalOrdering(basering) ) ;
    19291930   def @P=basering;
    19301931   if(size(i)==0){return(list(ideal(0)));}
     
    20542055{
    20552056   ASSUME(0, not isQuotientRing(basering) ) ;
    2056   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     2057  ASSUME(0, hasGlobalOrdering(basering) ) ;
    20572058
    20582059   //assumes that all generators of i are irreducible
     
    20842085{
    20852086  ASSUME(0, not isQuotientRing(basering) ) ;
    2086   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     2087  ASSUME(0, hasGlobalOrdering(basering) ) ;
    20872088
    20882089  if(size(i) == 0){return(list(ideal(0)));}
     
    23842385      );
    23852386  }
    2386   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     2387  ASSUME(0, hasGlobalOrdering(basering) ) ;
    23872388
    23882389  intvec op ;
     
    24932494      );
    24942495  }
    2495   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     2496  ASSUME(0, hasGlobalOrdering(basering) ) ;
    24962497
    24972498  def  P = basering;
     
    26172618{
    26182619   ASSUME(0, not isQuotientRing(basering) ) ;
    2619   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     2620  ASSUME(0, hasGlobalOrdering(basering) ) ;
    26202621
    26212622//reduces primery decomposition over algebraic extensions to
     
    27402741{
    27412742  ASSUME(0, not isQuotientRing(basering) ) ;
    2742   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     2743  ASSUME(0, hasGlobalOrdering(basering) ) ;
    27432744
    27442745  list resu,tempo;
     
    27672768{
    27682769  ASSUME(0, not isQuotientRing(basering) ) ;
    2769   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     2770  ASSUME(0, hasGlobalOrdering(basering) ) ;
    27702771
    27712772  intvec op,@vv;
     
    37503751{
    37513752   ASSUME(0, not isQuotientRing(basering) ) ;
    3752   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     3753  ASSUME(0, hasGlobalOrdering(basering) ) ;
    37533754
    37543755   int i;
     
    37733774{
    37743775   ASSUME(0, not isQuotientRing(basering) ) ;
    3775   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     3776  ASSUME(0, hasGlobalOrdering(basering) ) ;
    37763777
    37773778   def R=basering;
     
    38263827{
    38273828   ASSUME(0, not isQuotientRing(basering) ) ;
    3828   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     3829  ASSUME(0, hasGlobalOrdering(basering) ) ;
    38293830
    38303831   if(homog(I)==1){return(maxideal(1));}
     
    38503851
    38513852   option(redSB);
     3853   ASSUME(1, dim(I)==0);
    38523854   ideal F=finduni(I);//F[i] generates I intersected with K[var(i)]
    38533855
     
    39303932      );
    39313933   }
    3932    ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     3934   ASSUME(0, hasGlobalOrdering(basering) ) ;
    39333935
    39343936   if((char(basering)<100)&&(char(basering)!=0))
     
    40524054{
    40534055  ASSUME(0, not isQuotientRing(basering) ) ;
    4054   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     4056  ASSUME(0, hasGlobalOrdering(basering) ) ;
    40554057
    40564058  if(homog(i)!=1)
     
    40984100{
    40994101   ASSUME(0, not isQuotientRing(basering) ) ;
    4100   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     4102  ASSUME(0, hasGlobalOrdering(basering) ) ;
    41014103
    41024104   int ii,jj;
     
    41314133{
    41324134  ASSUME(0, not isQuotientRing(basering) ) ;
    4133   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     4135  ASSUME(0, hasGlobalOrdering(basering) ) ;
    41344136
    41354137  def r=basering;
     
    42384240{
    42394241  ASSUME(0, not isQuotientRing(basering) ) ;
    4240   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     4242  ASSUME(0, hasGlobalOrdering(basering) ) ;
    42414243
    42424244  intvec op;
     
    43424344{
    43434345  ASSUME(0, not isQuotientRing(basering) ) ;
    4344   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     4346  ASSUME(0, hasGlobalOrdering(basering) ) ;
    43454347
    43464348  intvec op;
     
    44844486{
    44854487  ASSUME(0, not isQuotientRing(basering) ) ;
    4486   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     4488  ASSUME(0, hasGlobalOrdering(basering) ) ;
    44874489
    44884490  if((choose<0) or (choose>3))
     
    47104712{
    47114713  ASSUME(0, not isQuotientRing(basering) ) ;
    4712   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     4714  ASSUME(0, hasGlobalOrdering(basering) ) ;
    47134715
    47144716  list L;          // The list of minimal associated primes,
     
    47634765{
    47644766  ASSUME(0, not isQuotientRing(basering) ) ;
    4765   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     4767  ASSUME(0, hasGlobalOrdering(basering) ) ;
    47664768
    47674769  int i,j,l;
     
    48644866{
    48654867  ASSUME(0, not isQuotientRing(basering) ) ;
    4866   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     4868  ASSUME(0, hasGlobalOrdering(basering) ) ;
    48674869
    48684870  list Q;
     
    49364938{
    49374939  ASSUME(0, not isQuotientRing(basering) ) ;
    4938   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     4940  ASSUME(0, hasGlobalOrdering(basering) ) ;
    49394941
    49404942  list indsets=indepSet(SP,0);
     
    50445046{
    50455047  ASSUME(0, not isQuotientRing(basering) ) ;
    5046   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     5048  ASSUME(0, hasGlobalOrdering(basering) ) ;
    50475049
    50485050  ideal fac=factorize(p,1);       //the irreducible factors of p
     
    50935095{
    50945096  ASSUME(0, not isQuotientRing(basering) ) ;
    5095   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     5097  ASSUME(0, hasGlobalOrdering(basering) ) ;
    50965098
    50975099  fac=sort(fac)[1];
     
    51405142{
    51415143   ASSUME(0, not isQuotientRing(basering) ) ;
    5142   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     5144  ASSUME(0, hasGlobalOrdering(basering) ) ;
    51435145
    51445146   intvec op;
     
    52135215{
    52145216   ASSUME(0, not isQuotientRing(basering) ) ;
    5215   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     5217  ASSUME(0, hasGlobalOrdering(basering) ) ;
    52165218
    52175219   int j;
     
    57705772     );
    57715773  }
    5772   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     5774  ASSUME(0, hasGlobalOrdering(basering) ) ;
    57735775
    57745776  return(radical(i, 1));
     
    59855987{
    59865988   ASSUME(0, not isQuotientRing(basering) ) ;
    5987   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     5989  ASSUME(0, hasGlobalOrdering(basering) ) ;
    59885990
    59895991// ideal I     The ideal for which the radical is computed
     
    60256027{
    60266028  ASSUME(0, not isQuotientRing(basering) ) ;
    6027   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     6029  ASSUME(0, hasGlobalOrdering(basering) ) ;
    60286030
    60296031  ideal rad = 1;
     
    61106112//                    It is used to set the value of done.)
    61116113  ASSUME(0, not isQuotientRing(basering) ) ;
    6112   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     6114  ASSUME(0, hasGlobalOrdering(basering) ) ;
    61136115
    61146116  attrib(I, "isSB", 1);   // I needs to be a reduced standard basis
     
    63856387{
    63866388  ASSUME(0, not isQuotientRing(basering) ) ;
    6387   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     6389  ASSUME(0, hasGlobalOrdering(basering) ) ;
    63886390
    63896391  int k = 1;                     // Counter
     
    64556457{
    64566458  ASSUME(0, not isQuotientRing(basering) ) ;
    6457   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     6459  ASSUME(0, hasGlobalOrdering(basering) ) ;
    64586460
    64596461  int n, k, di;
     
    65496551{
    65506552  ASSUME(0, not isQuotientRing(basering) ) ;
    6551   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     6553  ASSUME(0, hasGlobalOrdering(basering) ) ;
    65526554
    65536555  ideal @ih,@jh;
     
    66046606      );
    66056607  }
    6606   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     6608  ASSUME(0, hasGlobalOrdering(basering) ) ;
    66076609
    66086610  ideal j=std(i);
     
    66556657      );
    66566658  }
    6657   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     6659  ASSUME(0, hasGlobalOrdering(basering) ) ;
    66586660
    66596661  ideal j=groebner(i);
     
    66886690{
    66896691   ASSUME(0, not isQuotientRing(basering) ) ;
    6690   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     6692  ASSUME(0, hasGlobalOrdering(basering) ) ;
    66916693
    66926694   int i;
     
    67296731    );
    67306732  }
    6731   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     6733  ASSUME(0, hasGlobalOrdering(basering) ) ;
    67326734
    67336735  def R=basering;
     
    68436845{
    68446846  ASSUME(0, not isQuotientRing(basering) ) ;
    6845   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     6847  ASSUME(0, hasGlobalOrdering(basering) ) ;
    68466848
    68476849  intvec op,@vv;
     
    77487750{
    77497751   ASSUME(0, not isQuotientRing(basering) ) ;
    7750   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     7752  ASSUME(0, hasGlobalOrdering(basering) ) ;
    77517753
    77527754
     
    80498051{
    80508052  ASSUME(0, not isQuotientRing(basering) ) ;
    8051   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     8053  ASSUME(0, hasGlobalOrdering(basering) ) ;
    80528054
    80538055  ideal P = 1;
     
    80928094{
    80938095  ASSUME(0, not isQuotientRing(basering) ) ;
    8094   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     8096  ASSUME(0, hasGlobalOrdering(basering) ) ;
    80958097
    80968098  int k = 1;
     
    81478149{
    81488150  ASSUME(0, not isQuotientRing(basering) ) ;
    8149   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     8151  ASSUME(0, hasGlobalOrdering(basering) ) ;
    81508152
    81518153  int n, k, di;
     
    82508252{
    82518253  ASSUME(0, not isQuotientRing(basering) ) ;
    8252   ASSUME(0, hasGlobalMonomialOrdering(basering) ) ;
     8254  ASSUME(0, hasGlobalOrdering(basering) ) ;
    82538255
    82548256  def   @P = basering;
Note: See TracChangeset for help on using the changeset viewer.