Changeset 7d1574 in git


Ignore:
Timestamp:
May 24, 2007, 3:42:17 PM (17 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38dfc5131670d387a89455159ed1e071997eec94')
Children:
3e123051cc068e5915d1a459dcec90f90da9eb2b
Parents:
7efd3caffaf4f30f1464d6160c4257b82947837c
Message:
*hannes: rp/rs


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

Legend:

Unmodified
Added
Removed

  • kernel/ring.cc

    r7efd3c r7d1574  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: ring.cc,v 1.59 2007-05-24 07:53:42 Singular Exp $ */
     4/* $Id: ring.cc,v 1.60 2007-05-24 13:42:17 Singular Exp $ */
    55
    66/*
    … …  
    5959  "L", //ringorder_L,
    6060  "aa", //ringorder_aa
     61  "rs", //ringorder_rs,
    6162  " _" //ringorder_unspec
    6263};
    … …  
    14751476  {
    14761477    if (r2->order[i] == 0) return 0;
    1477     if ((r1->order[i] != r2->order[i]) ||
    1478         (r1->block0[i] != r2->block0[i]) || (r2->block0[i] != r1->block0[i]))
     1478    if ((r1->order[i] != r2->order[i])
     1479    || (r1->block0[i] != r2->block0[i])
     1480    || (r2->block0[i] != r1->block0[i]))
    14791481      return 0;
    14801482    if (r1->wvhdl[i] != NULL)
    … …  
    15361538  if (rHasSimpleOrder(r))
    15371539  {
    1538     if ((r->order[1] == ringorder_c) || (r->order[1] == ringorder_C))
     1540    if ((r->order[1] == ringorder_c)
     1541    || (r->order[1] == ringorder_C))
    15391542    {
    15401543      switch(r->order[0])
    … …  
    15461549          case ringorder_ls:
    15471550          case ringorder_unspec:
    1548             if (r->order[1] == ringorder_C ||  r->order[0] == ringorder_unspec)
     1551            if (r->order[1] == ringorder_C
     1552            ||  r->order[0] == ringorder_unspec)
    15491553              return rOrderType_ExpComp;
    15501554            return rOrderType_Exp;
    … …  
    15521556          default:
    15531557            assume(r->order[0] == ringorder_lp ||
    1554                    r->order[0] == ringorder_rp ||
     1558                   r->order[0] == ringorder_rs ||
    15551559                   r->order[0] == ringorder_Dp ||
    15561560                   r->order[0] == ringorder_Wp ||
    … …  
    15791583  if (blocks == 1) return TRUE;
    15801584  if (blocks > 2)  return FALSE;
    1581   if (r->order[0] != ringorder_c && r->order[0] != ringorder_C &&
    1582       r->order[1] != ringorder_c && r->order[1] != ringorder_C)
     1585  if ((r->order[0] != ringorder_c)
     1586  && (r->order[0] != ringorder_C)
     1587  && (r->order[1] != ringorder_c)
     1588  && i(r->order[1] != ringorder_C))
    15831589    return FALSE;
    1584   if (r->order[1] == ringorder_M || r->order[0] == ringorder_M)
     1590  if i((r->order[1] == ringorder_M)
     1591  || (r->order[0] == ringorder_M))
    15851592    return FALSE;
    15861593  return TRUE;
    … …  
    16341641{
    16351642  int blocks = rBlocks(r) - 1;
    1636   if (blocks > 3 || blocks < 2) return FALSE;
     1643  if ((blocks > 3) || (blocks < 2)) return FALSE;
    16371644  if (blocks == 3)
    16381645  {
    1639     return ((r->order[0] == ringorder_aa && r->order[1] != ringorder_M &&
    1640              (r->order[2] == ringorder_c || r->order[2] == ringorder_C)) ||
    1641             ((r->order[0] == ringorder_c || r->order[0] == ringorder_C) &&
    1642              r->order[1] == ringorder_aa && r->order[2] != ringorder_M));
     1646    return (((r->order[0] == ringorder_aa) && (r->order[1] != ringorder_M) &&
     1647             ((r->order[2] == ringorder_c) || (r->order[2] == ringorder_C))) ||
     1648            (((r->order[0] == ringorder_c) || (r->order[0] == ringorder_C)) &&
     1649             (r->order[1] == ringorder_aa) && (r->order[2] != ringorder_M)));
    16431650  }
    16441651  else
    16451652  {
    1646     return (r->order[0] == ringorder_aa && r->order[1] != ringorder_M);
     1653    return ((r->order[0] == ringorder_aa) && (r->order[1] != ringorder_M));
    16471654  }
    16481655}
    … …  
    16571664    {
    16581665      sro_ord* o=&(r->typ[pos]);
    1659       if (o->ord_typ == ro_syzcomp || o->ord_typ == ro_syz) return TRUE;
     1666      if ((o->ord_typ == ro_syzcomp) || (o->ord_typ == ro_syz)) return TRUE;
    16601667    }
    16611668  }
    … …  
    17021709        case ringorder_a64: /* assume: all weight are non-negative!*/
    17031710        case ringorder_lp:
    1704         case ringorder_rp:
     1711        case ringorder_rs:
    17051712        case ringorder_dp:
    17061713        case ringorder_Dp:
    … …  
    22452252        else
    22462253        {
    2247           order[j]=ringorder_rp;
     2254          order[j]=ringorder_rs;
    22482255          need_other_ring=TRUE;
    22492256          omit_degree=FALSE;
    … …  
    25002507      break;
    25012508    case ringorder_ls:
     2509    case ringorder_rs:
    25022510    case ringorder_ds:
    25032511    case ringorder_Ds:
    … …  
    25362544  r->firstBlockEnds=block1[i];
    25372545  r->firstwv = wvhdl[i];
    2538   if ((order[i]== ringorder_ws) || (order[i]==ringorder_Ws)
    2539   || (order[i]== ringorder_wp) || (order[i]==ringorder_Wp)
    2540   || (order[i]== ringorder_a) /*|| (order[i]==ringorder_A)*/)
     2546  if ((order[i]== ringorder_ws)
     2547  || (order[i]==ringorder_Ws)
     2548  || (order[i]== ringorder_wp)
     2549  || (order[i]==ringorder_Wp)
     2550  || (order[i]== ringorder_a)
     2551   /*|| (order[i]==ringorder_A)*/)
    25412552  {
    25422553    int j;
    … …  
    26192630      r->ComponentOrder=-1;
    26202631    if (r->OrdSgn == -1) r->pLDeg = pLDeg0c;
    2621     if ((order[0] == ringorder_lp) || (order[0] == ringorder_ls) || order[0] == ringorder_rp)
     2632    if ((order[0] == ringorder_lp)
     2633    || (order[0] == ringorder_ls)
     2634    || (order[0] == ringorder_rp)
     2635    || (order[0] == ringorder_rs))
    26222636    {
    26232637      r->LexOrder=TRUE;
    26242638      r->pLDeg = pLDeg1c;
    2625     }
    2626     if (order[0] == ringorder_wp || order[0] == ringorder_Wp ||
    2627         order[0] == ringorder_ws || order[0] == ringorder_Ws)
     2639      r->pFDeg = pTotaldegree;
     2640    }
     2641    if ((order[0] == ringorder_a)
     2642    || (order[0] == ringorder_wp)
     2643    || (order[0] == ringorder_Wp)
     2644    || (order[0] == ringorder_ws)
     2645    || (order[0] == ringorder_Ws))
    26282646      r->pFDeg = pWFirstTotalDegree;
    26292647    r->firstBlockEnds=block1[0];
    … …  
    26412659        order[0]==ringorder_s)
    26422660      r->ComponentOrder=-1;
    2643     if ((order[1] == ringorder_lp) || (order[1] == ringorder_ls) || order[1] == ringorder_rp)
     2661    if ((order[1] == ringorder_lp)
     2662    || (order[1] == ringorder_ls)
     2663    || (order[1] == ringorder_rp)
     2664    || order[1] == ringorder_rs)
    26442665    {
    26452666      r->LexOrder=TRUE;
    26462667      r->pLDeg = pLDeg1c;
     2668      r->pFDeg = pTotaldegree;
    26472669    }
    26482670    r->firstBlockEnds=block1[1];
    26492671    r->firstwv = wvhdl[1];
    2650     if (order[1] == ringorder_wp || order[1] == ringorder_Wp ||
    2651         order[1] == ringorder_ws || order[1] == ringorder_Ws)
     2672    if ((order[1] == ringorder_a)
     2673    || (order[1] == ringorder_wp)
     2674    || (order[1] == ringorder_Wp)
     2675    || (order[1] == ringorder_ws)
     2676    || (order[1] == ringorder_Ws))
    26522677      r->pFDeg = pWFirstTotalDegree;
    26532678  }
    … …  
    28292854      case ringorder_ls:
    28302855        rO_LexVars_neg(j, j_bits, r->block0[i],r->block1[i], prev_ordsgn,
     2856                       tmp_ordsgn,v, bits, -1);
     2857        break;
     2858
     2859      case ringorder_rs:
     2860        rO_LexVars_neg(j, j_bits, r->block1[i],r->block0[i], prev_ordsgn,
    28312861                       tmp_ordsgn,v, bits, -1);
    28322862        break;
    … …  
    39363966      // not yet done:
    39373967      case ringorder_ls:
     3968      case ringorder_rs:
    39383969      case ringorder_ds:
    39393970      case ringorder_Ds:

  • kernel/ring.h

    r7efd3c r7d1574  
    77* ABSTRACT - the interpreter related ring operations
    88*/
    9 /* $Id: ring.h,v 1.20 2007-05-11 10:48:05 wienand Exp $ */
     9/* $Id: ring.h,v 1.21 2007-05-24 13:42:17 Singular Exp $ */
    1010
    1111/* includes */
    … …  
    286286  // the following are only used internally
    287287  ringorder_aa, // for idElimination, like a, except pFDeg, pWeigths ignore it
     288  ringorder_rs,
    288289  ringorder_unspec
    289290} rRingOrder_t;
Note: See TracChangeset for help on using the changeset viewer.