Changeset d312f6 in git


Ignore:
Timestamp:
Jan 11, 2007, 11:27:04 AM (17 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b21a664aa22dc6e196223af8a74ad4885e83547c')
Children:
d606265146ccd278e654a9d22bbcaa1132fcea2e
Parents:
35c62a92d36241464b88cbd648cd39499fc70ad8
Message:
*hannes: PLURAL TEST


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

Legend:

Unmodified
Added
Removed
  • kernel/gring.h

    r35c62a9 rd312f6  
    44*  Computer Algebra System SINGULAR     *
    55****************************************/
    6 /* $Id: gring.h,v 1.15 2007-01-03 00:17:10 motsak Exp $ */
     6/* $Id: gring.h,v 1.16 2007-01-11 10:27:03 Singular Exp $ */
    77/*
    88* ABSTRACT additional defines etc for --with-plural
    99*/
    1010
    11 // #ifdef HAVE_PLURAL
     11#ifdef HAVE_PLURAL
    1212#include "structs.h"
    1313
     
    128128
    129129
    130 
    131 inline BOOLEAN rIsPluralRing(ring r)
    132 {
    133 #ifdef HAVE_PLURAL
    134   return ((r != NULL) && (r->nc != NULL) && (r->nc->type != nc_error));
    135 #else
    136   return 0;
    137 #endif
    138 }
    139130
    140131inline void ncRingType(ring r, nc_type t)
     
    269260
    270261#endif
     262#endif
  • kernel/kutil.cc

    r35c62a9 rd312f6  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: kutil.cc,v 1.42 2007-01-05 17:59:32 Singular Exp $ */
     4/* $Id: kutil.cc,v 1.43 2007-01-11 10:27:03 Singular Exp $ */
    55/*
    66* ABSTRACT: kernel: utils for kStd
     
    12201220  pSetm(Lp.lcm);
    12211221
    1222   const bool bIsPluralRing = rIsPluralRing(currRing);
    1223   const bool bIsSCA        = rIsSCA(currRing) && strat->homog; // for prod-crit
    1224   const bool bNCProdCrit   = ( !bIsPluralRing || bIsSCA ); // commutative or homogeneous SCA
     1222#ifdef HAVE_PLURAL
     1223  const BOOLEAN bIsPluralRing = rIsPluralRing(currRing);
     1224  const BOOLEAN bIsSCA        = rIsSCA(currRing) && strat->homog; // for prod-crit
     1225  const BOOLEAN bNCProdCrit   = ( !bIsPluralRing || bIsSCA ); // commutative or homogeneous SCA
     1226#else
     1227  const BOOLEAN bIsPluralRing = FALSE;
     1228  const BOOLEAN bIsSCA        = FALSE;
     1229  const BOOLEAN bNCProdCrit   = TRUE;
     1230#endif
    12251231
    12261232  if (strat->sugarCrit && bNCProdCrit)
     
    13641370  else
    13651371  {
     1372    #ifdef HAVE_PLURAL
    13661373    if ( bIsPluralRing )
    13671374    {
     
    13881395    }
    13891396    else
     1397    #endif
    13901398    {
    13911399      Lp.p = ksCreateShortSpoly(strat->S[i],p, strat->tailRing);
     
    14521460  {
    14531461    //PrintS("prod-crit\n");
     1462    #ifdef HAVE_PLURAL
    14541463    if(!rIsPluralRing(currRing) || (rIsSCA(currRing) && strat->homog))
     1464    #endif
    14551465    {
    14561466      //PrintS("prod-crit\n");
     
    14861496  /*-  compute the short s-polynomial -*/
    14871497
    1488 //   #ifdef HAVE_PLURAL
     1498  #ifdef HAVE_PLURAL
    14891499  if (rIsPluralRing(currRing))
    14901500  {
     
    14921502  }
    14931503  else
    1494 //   #endif
     1504  #endif
    14951505    Lp.p = ksCreateShortSpoly(strat->S[i],p,strat->tailRing);
    14961506
     
    51365146  strat->noTailReduction = !TEST_OPT_REDTAIL;
    51375147
     5148#ifdef HAVE_PLURAL
    51385149  // and r is plural_ring
    51395150  if( rIsPluralRing(currRing) || (rIsSCA(currRing) && !strat->homog) )
     
    51435154    strat->honey = FALSE;
    51445155  }
     5156#endif
    51455157
    51465158#ifdef HAVE_RING2TOM
  • kernel/ring.h

    r35c62a9 rd312f6  
    77* ABSTRACT - the interpreter related ring operations
    88*/
    9 /* $Id: ring.h,v 1.15 2007-01-03 00:17:12 motsak Exp $ */
     9/* $Id: ring.h,v 1.16 2007-01-11 10:27:04 Singular Exp $ */
    1010
    1111/* includes */
     
    3232ring   rOpposite(ring r);
    3333ring   rEnvelope(ring r);
     34
     35#ifdef HAVE_PLURAL
     36inline BOOLEAN rIsPluralRing(ring r)
     37{
     38  return ((r != NULL) && (r->nc != NULL) && (r->nc->type != nc_error));
     39}
     40#else
     41#define rIsPluralRing(R) 0
     42#endif
    3443
    3544
  • kernel/sca.h

    r35c62a9 rd312f6  
    55*  Computer Algebra System SINGULAR     *
    66****************************************/
    7 /* $Id: sca.h,v 1.3 2007-01-09 14:29:32 Singular Exp $ */
     7/* $Id: sca.h,v 1.4 2007-01-11 10:27:04 Singular Exp $ */
    88
     9#ifdef HAVE_PLURAL
    910#include <structs.h>
    1011// #include <polys-impl.h>
     
    135136
    136137#endif // #ifndef GRING_SUPER_COMMUTATIVE_ALGEBRA_H
    137 
     138#endif
Note: See TracChangeset for help on using the changeset viewer.