Changeset 52eebd in git


Ignore:
Timestamp:
Jun 20, 2017, 10:44:41 AM (7 years ago)
Author:
Janko Boehm <boehm@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
40280ad4562b54c6375cde5bd206ccff8af5b909
Parents:
04d9a4e4acde324a941c292278e1804bdce6c1ac79841e040271f4c682a3e29432cf8297a10db0ac
Message:
Merge branch 'spielwiese' of https://github.com/Singular/Sources into spielwiese
Files:
7 added
3 edited

Legend:

Unmodified
Added
Removed
  • Singular/ipassign.cc

    r04d9a4 r52eebd  
    266266  if (DEN((fraction)(p)) != NULL) // minpoly must be a fraction with poly numerator...!!
    267267  {
    268     poly z=NUM((fraction)p);
    269268    poly n=DEN((fraction)(p));
    270     z=p_Mult_nn(z,pGetCoeff(n),currRing->cf->extRing);
    271     NUM((fraction)p)=z;
     269    if(!p_IsConstantPoly(n,currRing->cf->extRing))
     270    {
     271      WarnS("denominator must be constant - ignoring it");
     272    }
     273    p_Delete(&n,currRing->cf->extRing);
    272274    DEN((fraction)(p))=NULL;
    273     p_Delete(&n,currRing->cf->extRing);
    274275  }
    275276
     
    288289//  NUM((fractionObject *)p) = NULL; // makes 0/ NULL fraction - which should not happen!
    289290//  n_Delete(&p, currRing->cf); // doesn't expect 0/ NULL :(
    290   if(true)
    291291  {
    292292    extern omBin fractionObjectBin;
     
    295295  }
    296296
    297 
    298297  coeffs new_cf = nInitChar(n_algExt, &A);
    299 
    300298  if (new_cf==NULL)
    301299  {
     
    309307    nKillChar(currRing->cf); currRing->cf=new_cf;
    310308  }
    311 
    312   return FALSE;
    313 }
     309  return FALSE;
     310}
     311
    314312static BOOLEAN jjNOETHER(leftv, leftv a)
    315313{
  • Tst/Short/ok_s.lst

    r04d9a4 r52eebd  
    55bug_misc
    66bug_minpoly
     7bug_minpoly_frac
    78bug_newstruct
    89bug_normalize
  • kernel/GBEngine/kstd1.cc

    r04d9a4 r52eebd  
    23542354        strat->homog=h;
    23552355      }
     2356      #ifdef ADIDEBUG
    23562357      else
    23572358      {
    2358         #ifdef ADIDEBUG
    23592359        printf("\npreIntegerCheck didn't found any new information\n");
    2360         #endif
    2361       }
     2360      }
     2361      #endif
    23622362      omTestMemory(1);
    23632363      if(w == NULL)
Note: See TracChangeset for help on using the changeset viewer.