Changeset 521349 in git


Ignore:
Timestamp:
Jul 7, 2008, 3:18:57 PM (16 years ago)
Author:
Oliver Wienand <wienand@…>
Branches:
(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')
Children:
b547dc098c643d2e47143c81e0a51e711b5b10ff
Parents:
d351d85cc90334b89306247371fbd1761ed311b7
Message:
pNorm nicht für Ringe


git-svn-id: file:///usr/local/Singular/svn/trunk@10840 2c84dea3-7e68-4137-9b89-c4e89433aadc
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • Singular/extra.cc

    rd351d8 r521349  
    22*  Computer Algebra System SINGULAR      *
    33*****************************************/
    4 /* $Id: extra.cc,v 1.273 2008-06-27 08:15:37 Singular Exp $ */
     4/* $Id: extra.cc,v 1.274 2008-07-07 13:18:56 wienand Exp $ */
    55/*
    66* ABSTRACT: general interface to internals of Singular ("system" command)
    … …  
    23742374    }
    23752375    else
     2376#ifdef HAVE_VANIDEAL
    23762377/*==================== Creating zero polynomials =================*/
    23772378    if (strcmp(sys_cmd, "createG0")==0)
    … …  
    23982399    }
    23992400    else
     2401#endif
    24002402    if (strcmp(sys_cmd, "redNF_ring")==0)
    24012403    {

  • kernel/kstd2.cc

    rd351d8 r521349  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: kstd2.cc,v 1.66 2008-04-04 10:30:09 Singular Exp $ */
     4/* $Id: kstd2.cc,v 1.67 2008-07-07 13:18:56 wienand Exp $ */
    55/*
    66*  ABSTRACT -  Kernel: alg. of Buchberger
    … …  
    11631163
    11641164      // reduce the tail and normalize poly
    1165       if (TEST_OPT_INTSTRATEGY)
     1165      // in the ring case we cannot expect LC(f) = 1,
     1166      // therefore we call pContent instead of pNorm
     1167      if ((TEST_OPT_INTSTRATEGY) || (rField_is_Ring(currRing)))
    11661168      {
    11671169        strat->P.pCleardenom();

  • kernel/kutil.cc

    rd351d8 r521349  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: kutil.cc,v 1.96 2008-07-07 12:21:42 wienand Exp $ */
     4/* $Id: kutil.cc,v 1.97 2008-07-07 13:18:56 wienand Exp $ */
    55/*
    66* ABSTRACT: kernel: utils for kStd
    … …  
    12051205    return;
    12061206  }
    1207   pNorm(p);
    12081207  if ((strat->fromQ!=NULL) && (isFromQ!=0) && (strat->fromQ[i]!=0))
    12091208  {
    … …  
    21762175
    21772176#ifdef HAVE_RING2TOM
    2178 long twoPow(long arg)
    2179 {
    2180   return 1L << arg;
    2181 }
    2182 
    21832177long ind2(long arg)
    21842178{
    … …  
    22042198  }
    22052199  return ind;
     2200}
     2201#endif
     2202
     2203#ifdef HAVE_VANIDEAL
     2204long twoPow(long arg)
     2205{
     2206  return 1L << arg;
    22062207}
    22072208

  • kernel/polys.cc

    rd351d8 r521349  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: polys.cc,v 1.29 2008-06-24 16:25:02 wienand Exp $ */
     4/* $Id: polys.cc,v 1.30 2008-07-07 13:18:57 wienand Exp $ */
    55
    66/*
    … …  
    720720void pNorm(poly p1)
    721721{
    722   poly h;
    723   number k, c;
    724722#ifdef HAVE_RINGS
    725723  if (rField_is_Ring(currRing))
    726724  {
    727     if ((p1!=NULL) && rField_has_Units(currRing))
    728     {
    729       k = nGetUnit(pGetCoeff(p1));
    730       if (!nIsOne(k))
    731       {
    732         k = nInvers(k);
    733         c = nMult(pGetCoeff(p1), k); 
    734         nDelete(&pGetCoeff(p1));
    735         pSetCoeff0(p1, c);
    736         h = pNext(p1);
    737         while (h != NULL)
    738         {
    739           c = nMult(pGetCoeff(h), k);
    740           nDelete(&pGetCoeff(h));
    741           pSetCoeff0(h, c);
    742           pIter(h);
    743         }
    744       }
    745       nDelete(&k);
    746     }
    747     return;
     725    Werror("pNorm not possible in the case of coefficient rings.");
    748726  }
    749727  else
    … …  
    756734      return;
    757735    }
     736    poly h;
    758737    if (!nIsOne(pGetCoeff(p1)))
    759738    {
     739      number k, c;
    760740      nNormalize(pGetCoeff(p1));
    761741      k = pGetCoeff(p1);
Note: See TracChangeset for help on using the changeset viewer.