Changeset e19002 in git


Ignore:
Timestamp:
Jan 9, 2007, 2:07:04 PM (17 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b21a664aa22dc6e196223af8a74ad4885e83547c')
Children:
eb3a3ce8b87aaa8f1f63a449db240123e51f8b79
Parents:
9675434920f5dba21c7906f147376672641bcb7c
Message:
*hannes: fixed opposite


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

Legend:

Unmodified
Added
Removed
  • kernel/gring.cc

    r967543 re19002  
    77 *  Author:  levandov (Viktor Levandovsky)
    88 *  Created: 8/00 - 11/00
    9  *  Version: $Id: gring.cc,v 1.32 2007-01-03 00:17:09 motsak Exp $
     9 *  Version: $Id: gring.cc,v 1.33 2007-01-09 13:07:04 Singular Exp $
    1010 *******************************************************************/
    1111#include "mod2.h"
     
    24522452      if ( MATELEM(r->nc->D,i,j) == NULL ) /* quasicommutative case */
    24532453      {
    2454     /* 1x1 mult.matrix */
    2455     r->nc->MTsize[UPMATELEM(i,j,r->N)] = 1;
    2456     r->nc->MT[UPMATELEM(i,j,r->N)] = mpNew(1,1);
     2454        /* 1x1 mult.matrix */
     2455        r->nc->MTsize[UPMATELEM(i,j,r->N)] = 1;
     2456        r->nc->MT[UPMATELEM(i,j,r->N)] = mpNew(1,1);
    24572457      }
    24582458      else /* pure noncommutative case */
    24592459      {
    2460     /* TODO check the special multiplication properties */
    2461     IsNonComm = 1;
    2462     p_Delete(&(MATELEM(COM,i,j)),r);
    2463     //MATELEM(COM,i,j) = NULL; // done by p_Delete
    2464     r->nc->MTsize[UPMATELEM(i,j,r->N)] = DefMTsize; /* default sizes */
    2465     r->nc->MT[UPMATELEM(i,j,r->N)] = mpNew(DefMTsize, DefMTsize);
     2460        /* TODO check the special multiplication properties */
     2461        IsNonComm = 1;
     2462        p_Delete(&(MATELEM(COM,i,j)),r);
     2463        //MATELEM(COM,i,j) = NULL; // done by p_Delete
     2464        r->nc->MTsize[UPMATELEM(i,j,r->N)] = DefMTsize; /* default sizes */
     2465        r->nc->MT[UPMATELEM(i,j,r->N)] = mpNew(DefMTsize, DefMTsize);
    24662466      }
    24672467      /* set MT[i,j,1,1] to c_i_j*x_i*x_j + D_i_j */
    24682468      p = p_ISet(1,r); /* instead of     p = pOne(); */
    2469       p_SetCoeff(p,n_Copy(pGetCoeff(MATELEM(r->nc->C,i,j)),r),r);
     2469      if (MATELEM(r->nc->C,i,j)!=NULL)
     2470        p_SetCoeff(p,n_Copy(pGetCoeff(MATELEM(r->nc->C,i,j)),r),r);
    24702471      p_SetExp(p,i,1,r);
    24712472      p_SetExp(p,j,1,r);
  • kernel/ring.cc

    r967543 re19002  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: ring.cc,v 1.51 2007-01-09 12:36:05 Singular Exp $ */
     4/* $Id: ring.cc,v 1.52 2007-01-09 13:07:04 Singular Exp $ */
    55
    66/*
     
    39383938    return r;
    39393939  }
    3940   if ( rIsPluralRing(src) )
    3941   {
    39423940  rChangeCurrRing(r);  /* we were not in r */
    39433941  /* basic nc constructions  */
     
    39493947  int *par_perm   = NULL;
    39503948  nMapFunc nMap   = nSetMap(src);
    3951   int j;
    39523949  int ni,nj;
    39533950  for(i=1; i<=r->N; i++)
     
    39573954  matrix C = mpNew(rVar(r),rVar(r));
    39583955  matrix D = mpNew(rVar(r),rVar(r));
     3956  r->nc->C = C;
     3957  r->nc->D = D;
     3958  if (nc_InitMultiplication(r))
     3959    WarnS("Error initializing multiplication!");
    39593960  for (i=1; i< rVar(r); i++)
    39603961  {
     
    39693970  idTest((ideal)C);
    39703971  idTest((ideal)D);
    3971   r->nc->C = C;
    3972   r->nc->D = D;
    39733972  if (nc_InitMultiplication(r))
    39743973    WarnS("Error initializing multiplication!");
     
    39833982  rTest(r);
    39843983  rChangeCurrRing(save);
    3985   }
    39863984#endif /* HAVE_PLURAL */
    39873985  return r;
Note: See TracChangeset for help on using the changeset viewer.