Changeset 19370c in git


Ignore:
Timestamp:
Feb 7, 2007, 11:49:41 AM (16 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')
Children:
89b59f6bb2e4c55ff6effd6ee652ae6444d424aa
Parents:
bccc3fcf764b040cb2f6573b1c8756d685b5eb0b
Message:
*hannes: naming conventions


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

Legend:

Unmodified
Added
Removed

  • kernel/gr_kstd2.cc

    rbccc3f r19370c  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: gr_kstd2.cc,v 1.12 2007-02-01 18:53:54 Singular Exp $ */
     4/* $Id: gr_kstd2.cc,v 1.13 2007-02-07 10:49:39 Singular Exp $ */
    55/*
    66*  ABSTRACT -  Kernel: noncomm. alg. of Buchberger
    … …  
    7676        wrp(strat->S[j]);
    7777      }
    78       (*h).p = nc_ReduceSPoly(strat->S[j],(*h).p, currRing);
     78      (*h).p = nc_ReduceSpoly(strat->S[j],(*h).p, currRing);
    7979      //spSpolyRed(strat->T[j].p,(*h).p,strat->kNoether);
    8080
    … …  
    179179      }
    180180      /*- compute the s-polynomial -*/
    181       (*h).p = nc_ReduceSPoly(strat->S[j],(*h).p/*,strat->kNoether*/,currRing);
     181      (*h).p = nc_ReduceSpoly(strat->S[j],(*h).p,currRing);
    182182      if ((*h).p == NULL)
    183183      {
    … …  
    868868        /* prod.crit itself in nc_CreateSpoly */
    869869      }
    870       strat->P.p = nc_SPoly(strat->P.p1,strat->P.p2/*,strat->kNoether*/,currRing);
     870      strat->P.p = nc_CreateSpoly(strat->P.p1,strat->P.p2,currRing);
    871871    }
    872872    if (strat->P.p != NULL)

  • kernel/gring.cc

    rbccc3f r19370c  
    77 *  Author:  levandov (Viktor Levandovsky)
    88 *  Created: 8/00 - 11/00
    9  *  Version: $Id: gring.cc,v 1.42 2007-02-02 13:00:33 Singular Exp $
     9 *  Version: $Id: gring.cc,v 1.43 2007-02-07 10:49:39 Singular Exp $
    1010 *******************************************************************/
    1111#include "mod2.h"
    … …  
    19971997        #endif
    19981998       
    1999         q = nc_ReduceSPoly(p,q,currRing);
     1999        q = nc_ReduceSpoly(p,q,currRing);
    20002000
    20012001        #ifdef PDEBUG

  • kernel/gring.h

    rbccc3f r19370c  
    44*  Computer Algebra System SINGULAR     *
    55****************************************/
    6 /* $Id: gring.h,v 1.18 2007-01-31 23:51:24 motsak Exp $ */
     6/* $Id: gring.h,v 1.19 2007-02-07 10:49:40 Singular Exp $ */
    77/*
    88* ABSTRACT additional defines etc for --with-plural
    … …  
    129129}
    130130
    131 inline poly nc_SPoly(const poly p1, const poly p2, const ring r)
     131inline poly nc_CreateSpoly(const poly p1, const poly p2, const ring r)
    132132{
    133133  assume(rIsPluralRing(r));
    … …  
    136136}
    137137
    138 inline poly nc_ReduceSPoly(const poly p1, poly p2, const ring r)
     138inline poly nc_ReduceSpoly(const poly p1, poly p2, const ring r)
    139139{
    140140  assume(rIsPluralRing(r));
    … …  
    143143}
    144144
    145 inline void nc_BucketPolyRed(kBucket_pt b, poly p, number *c)
     145inline void nc_kBucketPolyRed(kBucket_pt b, poly p, number *c)
    146146{
    147147  assume(rIsPluralRing(currRing));

  • kernel/kspoly.cc

    rbccc3f r19370c  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: kspoly.cc,v 1.8 2007-01-11 10:37:35 Singular Exp $ */
     4/* $Id: kspoly.cc,v 1.9 2007-02-07 10:49:40 Singular Exp $ */
    55/*
    66*  ABSTRACT -  Routines for Spoly creation and reductions
    … …  
    7373    // (only needed if exp-bound(tailring)<exp-b(currRing))
    7474    number c;
    75     if (PR->bucket!=NULL)  nc_BucketPolyRed(PR->bucket, p2,&c);
     75    if (PR->bucket!=NULL)  nc_kBucketPolyRed(PR->bucket, p2,&c);
    7676    else
    7777    {

  • kernel/kstd2.cc

    rbccc3f r19370c  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: kstd2.cc,v 1.38 2007-02-06 13:16:52 Singular Exp $ */
     4/* $Id: kstd2.cc,v 1.39 2007-02-07 10:49:40 Singular Exp $ */
    55/*
    66*  ABSTRACT -  Kernel: alg. of Buchberger
    … …  
    10011001      {
    10021002        number coef;
    1003         nc_BucketPolyRed(P.bucket,strat->S[j],&coef);
     1003        nc_kBucketPolyRed(P.bucket,strat->S[j],&coef);
    10041004        nDelete(&coef);
    10051005      }

  • kernel/kutil.cc

    rbccc3f r19370c  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: kutil.cc,v 1.47 2007-02-01 16:39:30 Singular Exp $ */
     4/* $Id: kutil.cc,v 1.48 2007-02-07 10:49:40 Singular Exp $ */
    55/*
    66* ABSTRACT: kernel: utils for kStd
    … …  
    13741374        }
    13751375        else
    1376           Lp.p = nc_SPoly(strat->S[i],p,currRing); // ?
    1377       }
    1378       else
    1379         Lp.p = nc_SPoly(strat->S[i],p,currRing);
     1376          Lp.p = nc_CreateSpoly(strat->S[i],p,currRing); // ?
     1377      }
     1378      else  Lp.p = nc_CreateSpoly(strat->S[i],p,currRing);
    13801379    }
    13811380    else

  • kernel/tgb.cc

    rbccc3f r19370c  
    55*  Computer Algebra System SINGULAR     *
    66****************************************/
    7 /* $Id: tgb.cc,v 1.122 2007-02-06 09:59:00 bricken Exp $ */
     7/* $Id: tgb.cc,v 1.123 2007-02-07 10:49:41 Singular Exp $ */
    88/*
    99* ABSTRACT: slimgb and F4 implementation
    … …  
    22842284#ifdef HAVE_PLURAL
    22852285      if (c->nc){
    2286         h= nc_SPoly(c->S->m[s->i], c->S->m[s->j]/*, NULL*/, c->r);
     2286        h= nc_CreateSpoly(c->S->m[s->i], c->S->m[s->j]/*, NULL*/, c->r);
    22872287        if (h!=NULL)
    22882288          pCleardenom(h);
Note: See TracChangeset for help on using the changeset viewer.