Changeset 392682 in git


Ignore:
Timestamp:
Jan 15, 2007, 6:45:33 PM (17 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b21a664aa22dc6e196223af8a74ad4885e83547c')
Children:
0d0763b5f948b33d8a6ba2d7e1d6d32a36742eb9
Parents:
5aec73093e57f2bc8df5d7134d52ceaabbf29312
Message:
*hannes: better test in rCompose


git-svn-id: file:///usr/local/Singular/svn/trunk@9722 2c84dea3-7e68-4137-9b89-c4e89433aadc
File:
1 edited

Legend:

Unmodified
Added
Removed
  • Singular/ipshell.cc

    r5aec73 r392682  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: ipshell.cc,v 1.145 2006-10-16 15:47:30 Singular Exp $ */
     4/* $Id: ipshell.cc,v 1.146 2007-01-15 17:45:33 Singular Exp $ */
    55/*
    66* ABSTRACT:
     
    708708      memset(&tmpW,0,sizeof(sleftv));
    709709      tmpW.rtyp=IDTYP(w);
    710       if (tmpW.rtyp==MAP_CMD) 
    711       { 
     710      if (tmpW.rtyp==MAP_CMD)
     711      {
    712712        tmpW.rtyp=IDEAL_CMD;
    713713        save_r=IDMAP(w)->preimage;
     
    735735      }
    736736      if (save_r!=NULL)
    737       { 
     737      {
    738738        IDMAP(w)->preimage=save_r;
    739739        IDMAP((idhdl)v)->preimage=omStrDup(save_r);
     
    19321932      R->order[j]=rOrderName(omStrDup((char*)vv->m[0].Data())); // assume STRING
    19331933      if (j==0) R->block0[0]=1;
    1934       else 
     1934      else
    19351935      {
    19361936         int jj=j-1;
    19371937         while((jj>=0)
    1938          && ((R->order[jj]== ringorder_a) 
     1938         && ((R->order[jj]== ringorder_a)
    19391939            || (R->order[jj]== ringorder_aa)
    19401940            || (R->order[jj]== ringorder_c)
     
    20292029    ideal q=(ideal)L->m[3].Data();
    20302030    if (q->m[0]!=NULL)
     2031    {
     2032      if ((R->ch!=currRing->ch)
     2033      || (R->P!=currRing->P))
     2034      {
     2035        WerrorS("coefficient fields must be equal if q-ideal !=0");
     2036        goto rCompose_err;
     2037      }
    20312038      R->qideal=idrCopyR(q,currRing,R);
     2039    }
    20322040  }
    20332041  else
     
    43684376#ifdef HAVE_RING2TOM
    43694377  int cring = 0;
    4370 #endif 
     4378#endif
    43714379  int float_len=0;
    43724380  int float_len2=0;
Note: See TracChangeset for help on using the changeset viewer.