Changeset cc93648 in git


Ignore:
Timestamp:
Apr 24, 2014, 7:03:24 PM (10 years ago)
Author:
Jakob Kroeker <kroeker@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
d21b700adb5e8106ab69ce599d924b7818ffb9ad
Parents:
dcd3cea67ee020fad5765aab2ede6d9e49aa2e5c
git-author:
Jakob Kroeker <kroeker@math.uni-hannover.de>2014-04-24 19:03:24+02:00
git-committer:
Jakob Kröker <kroeker@math.uni-hannover.de>2014-04-25 10:51:36+02:00
Message:
fix variable conflict issue in primdecint.lib
Files:
3 added
2 edited

Legend:

Unmodified
Added
Removed
  • Singular/LIB/primdecint.lib

    rdcd3ce rcc93648  
    897897"USAGE:  intersectZ(I,J); I,J ideals
    898898RETURN:  the intersection of the input ideals
    899 NOTE:    this is needed because intersect(I,J) does not work, should be replaced
    900          by intersect later
     899NOTE:    this is an alternative to intersect(I,J) over integers,
     900         is faster for some examples and should be kept for debug purposes.
    901901EXAMPLE: example intersectZ; shows an example
    902902{
    903903   def R = basering;
    904    execute("ring S=integer,(t,"+varstr(R)+"),(dp(1),dp(nvars(R)));");
    905    ideal I=imap(R,I);
    906    ideal J=imap(R,J);
    907    ideal K=addIdealZ(t*I,(1-t)*J);
    908    K=stdZ(K);
     904   execute("ring S=integer,( X(1..nvars(R)) ), ( dp(nvars(R)) );");
     905   ideal I = fetch(R,I);
     906   ideal J = fetch(R,J);
     907   execute("ring St=integer, ( t, X(1..nvars(R))  ), ( dp(1), dp(nvars(R)) );");
     908   ideal I = imap(S,I);
     909   ideal J = imap(S,J);
     910   ideal K = addIdealZ( var(1)*I,(1-var(1))*J);
     911   K = stdZ(K);
    909912   int i;
    910913   ideal L;
    911    for(i=1;i<=size(K);i++)
    912    {
    913       if(lead(K[i])/t==0){L[size(L)+1]=K[i];}
    914    }
     914   for(i=1; i<=size(K); i++)
     915   {
     916      if ( lead(K[i])/var(1)==0 ) { L[size(L)+1] = K[i]; }
     917   }
     918   setring S;
     919   ideal L = imap(St, L);
    915920   setring R;
    916    ideal L=imap(S,L);
     921   ideal L = fetch(S, L);
    917922   return(L);
    918923}
  • Tst/Short.lst

    rdcd3ce rcc93648  
    6262Short/bug_5.tst
    6363Short/bug_6.tst
     64Short/bug_609.tst
    6465Short/bug_7.tst
    6566Short/bug_8.tst
Note: See TracChangeset for help on using the changeset viewer.