Changeset a82885 in git


Ignore:
Timestamp:
Jan 9, 2007, 1:36:05 PM (17 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b21a664aa22dc6e196223af8a74ad4885e83547c')
Children:
3d4a5a6feb25d26d6b5353dab0cea5db6d585dab
Parents:
651f6f6ccc0a56bd7a942ae30d458534e45e50d4
Message:
*hannes: rSum for alternating algebra fixed


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

Legend:

Unmodified
Added
Removed
  • kernel/ring.cc

    r651f6f ra82885  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: ring.cc,v 1.50 2007-01-03 00:17:11 motsak Exp $ */
     4/* $Id: ring.cc,v 1.51 2007-01-09 12:36:05 Singular Exp $ */
    55
    66/*
     
    12161216
    12171217    // !!!! BUG? C1 and C2 might live in different baserings!!!
    1218     // Let's assume its the currRing! :)
    1219     assume( R1->nc->basering == currRing );
    1220     assume( R2->nc->basering == currRing );
     1218    // it cannot be both the currRing! :)
     1219    // the currRing is sum!
    12211220   
    12221221    int l = rVar(R1) + rVar(R2);
     
    12311230      }
    12321231    }
     1232    sum->nc->C = C;
     1233    sum->nc->D = D;
     1234    if (nc_InitMultiplication(sum))
     1235      WarnS("Error initializing multiplication!");
    12331236    for (i=1; i< rVar(R1); i++)
    12341237    {
     
    12431246      }
    12441247    }
     1248    idTest((ideal)C);
    12451249    for (i=1; i< rVar(R2); i++)
    12461250    {
     
    12481252      {
    12491253        MATELEM(C,rVar(R1)+i,rVar(R1)+j) = pPermPoly(MATELEM(C2,i,j),perm2,R2,nMap2,par_perm2,rPar(R2));
    1250               if (MATELEM(D2,i,j) != NULL)
     1254        if (MATELEM(D2,i,j) != NULL)
    12511255        {
    12521256          MATELEM(D,rVar(R1)+i,rVar(R1)+j) = pPermPoly(MATELEM(D2,i,j),perm2,R2,nMap2,par_perm2,rPar(R2));
     
    12541258      }
    12551259    }
    1256     idTest((ideal)C);
    12571260    idTest((ideal)D);
    1258     sum->nc->C = C;
    1259     sum->nc->D = D;
    12601261    if (nc_InitMultiplication(sum))
    12611262      WarnS("Error initializing multiplication!");
Note: See TracChangeset for help on using the changeset viewer.