Changeset 8ebd1a0 in git


Ignore:
Timestamp:
Apr 25, 2005, 8:15:25 PM (19 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'd25190065115c859833252500a64cfb7b11e3a50')
Children:
5d00520a016f7e7089be25484b5cc41e3b897fd4
Parents:
720ff4a017189777645e1e4ed50e4080ba8f1edb
Message:
* avoid plural bugs for commutative rings


git-svn-id: file:///usr/local/Singular/svn/trunk@7897 2c84dea3-7e68-4137-9b89-c4e89433aadc
Location:
kernel
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • kernel/ideals.cc

    r720ff4 r8ebd1a0  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: ideals.cc,v 1.10 2005-04-22 18:09:43 levandov Exp $ */
     4/* $Id: ideals.cc,v 1.11 2005-04-25 18:15:23 Singular Exp $ */
    55/*
    66* ABSTRACT - all basic methods to manipulate ideals
     
    24272427#ifdef HAVE_PLURAL
    24282428  /* update nc structure on tmpR */
    2429   int BAD = 0;
    2430   if ( nc_rComplete(origR, &tmpR) )
    2431   {
    2432     Werror("error in nc_rComplete");
    2433     BAD = 1;
    2434   }
    2435   if (!BAD)
    2436   {
    2437     /* tests the admissibility of the new elim. ordering */
    2438     if ( nc_CheckOrdCondition( (&tmpR)->nc->D, &tmpR) )
    2439     {
    2440       Werror("no elimination is possible: ordering condition is violated");
    2441       BAD = 1;
    2442     }
    2443   }
    2444   if (BAD)
    2445   {
    2446     // cleanup
    2447     omFree((ADDRESS)wv[0]);
    2448     omFreeSize((ADDRESS)wv,ordersize*sizeof(int**));
    2449     omFreeSize((ADDRESS)ord,ordersize*sizeof(int));
    2450     omFreeSize((ADDRESS)block0,ordersize*sizeof(int));
    2451     omFreeSize((ADDRESS)block1,ordersize*sizeof(int));
    2452     rUnComplete(&tmpR);
    2453     if (w!=NULL)     
    2454     {
    2455       delete w;
    2456     }
    2457     return idCopy(h1);
     2429  if (rIsPluralRing(currRing))
     2430  {
     2431    BOOLEAN BAD = FALSE;
     2432    if ( nc_rComplete(origR, &tmpR) )
     2433    {
     2434      Werror("error in nc_rComplete");
     2435      BAD = TRUE;
     2436    }
     2437    if (!BAD)
     2438    {
     2439      /* tests the admissibility of the new elim. ordering */
     2440      if ( nc_CheckOrdCondition( (&tmpR)->nc->D, &tmpR) )
     2441      {
     2442        Werror("no elimination is possible: ordering condition is violated");
     2443        BAD = TRUE;
     2444      }
     2445    }
     2446    if (BAD)
     2447    {
     2448      // cleanup
     2449      omFree((ADDRESS)wv[0]);
     2450      omFreeSize((ADDRESS)wv,ordersize*sizeof(int**));
     2451      omFreeSize((ADDRESS)ord,ordersize*sizeof(int));
     2452      omFreeSize((ADDRESS)block0,ordersize*sizeof(int));
     2453      omFreeSize((ADDRESS)block1,ordersize*sizeof(int));
     2454      rUnComplete(&tmpR);
     2455      if (w!=NULL)     
     2456      {
     2457        delete w;
     2458      }
     2459      return idCopy(h1);
     2460    }
    24582461  }
    24592462#endif
  • kernel/kstd1.cc

    r720ff4 r8ebd1a0  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: kstd1.cc,v 1.6 2005-04-11 15:59:01 Singular Exp $ */
     4/* $Id: kstd1.cc,v 1.7 2005-04-25 18:15:23 Singular Exp $ */
    55/*
    66* ABSTRACT:
     
    12311231      // statistics
    12321232      if (TEST_OPT_PROT) PrintS("s");
     1233      // cancel unit
     1234      cancelunit(&strat->P);
    12331235      // normalization
    12341236      if (!TEST_OPT_INTSTRATEGY)
     
    12421244      if (TEST_OPT_INTSTRATEGY)
    12431245        strat->P.pCleardenom();
    1244       // cancel unit
    1245       cancelunit(&strat->P);
    12461246
    12471247      // put in T
  • kernel/kutil.cc

    r720ff4 r8ebd1a0  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: kutil.cc,v 1.7 2005-03-17 14:15:13 Singular Exp $ */
     4/* $Id: kutil.cc,v 1.8 2005-04-25 18:15:24 Singular Exp $ */
    55/*
    66* ABSTRACT: kernel: utils for kStd
     
    41044104    for (l=IDELEMS(r)-1;l>=0;l--)
    41054105    {
    4106       if (r->m[l]!=NULL)
     4106      if ((r->m[l]!=NULL)
     4107      && (strat->syzComp>0)
     4108      && (pGetComp(r->m[l])<=strat->syzComp))
    41074109      {
    41084110        for(q=IDELEMS(Q)-1; q>=0;q--)
  • kernel/prCopy.cc

    r720ff4 r8ebd1a0  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: prCopy.cc,v 1.1.1.1 2003-10-06 12:15:57 Singular Exp $ */
     4/* $Id: prCopy.cc,v 1.2 2005-04-25 18:15:25 Singular Exp $ */
    55/*
    66* ABSTRACT - implementation of functions for Copy/Move/Delete for Polys
     
    2626    assume(n == pGetCoeff(dest));
    2727  }
    28   if (rRing_has_Comp(dest_r))
     28  if (rRing_has_Comp(dest_r) && rRing_has_Comp(src_r))
    2929    p_SetComp(dest, p_GetComp( src,src_r), dest_r);
    3030  assume(n == pGetCoeff(dest));
  • kernel/syz.cc

    r720ff4 r8ebd1a0  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: syz.cc,v 1.8 2005-03-17 14:14:17 Singular Exp $ */
     4/* $Id: syz.cc,v 1.9 2005-04-25 18:15:25 Singular Exp $ */
    55
    66/*
     
    781781    }
    782782  }
    783   //if (idHomModule(res[0],currQuotient,&w)!=isHomog)
    784   //{
    785   //  Warn("betti-command: Input is not homogeneous!");
    786   //  weights=NULL;
    787   //}
     783#if 0
     784  if (idHomModule(res[0],currQuotient,&w)!=isHomog)
     785  {
     786    Warn("betti-command: Input is not homogeneous!");
     787    weights=NULL;
     788  }
     789#endif
    788790  if (weights==NULL) weights=w;
    789791  else delete w;
Note: See TracChangeset for help on using the changeset viewer.