Changeset 28325ab in git

Timestamp:

Jun 10, 2008, 12:20:11 PM (15 years ago)

Author:

Motsak Oleksandr <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

7234766a762552b692e77a91f024bc0c5035587f

Parents:

52e2f60700ff18f1b002b09ada312e11d8a71027

Message:

*motsak: cleanup


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

File:

• Singular/extra.cc (modified) (2 diffs)

Singular/extra.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR      *
 *****************************************/
-/* $Id: extra.cc,v 1.270 2008-05-23 19:46:32 ederc Exp $ */
+/* $Id: extra.cc,v 1.271 2008-06-10 10:20:11 motsak Exp $ */
 /*
 * ABSTRACT: general interface to internals of Singular ("system" command)
@@ -831 +831 @@
     
 /*==================== PLURAL =================*/
-#if 0
-    if (strcmp(sys_cmd, "PLURAL") == 0)
-    {
-      matrix C;
-      matrix D;
-      number nN;
-      poly pN;
-      int i,j;
-      sleftv tmp_v;
-      memset(&tmp_v,0,sizeof(tmp_v));
-
-      if (currRing->nc==NULL)
-      {
-        currRing->nc=(nc_struct *)omAlloc0(sizeof(nc_struct));
-        currRing->nc->ref=1;
-        currRing->nc->basering=currRing;
-      }
-      else
-      {
-        WarnS("redefining algebra structure");
-        if (currRing->nc->ref>1) // in use by somebody else
-          currRing->nc->ref--;
-        else
-          ncKill(currRing); /* kill the previous nc data */
-        currRing->nc=(nc_struct *)omAlloc0(sizeof(nc_struct));
-        currRing->nc->ref=1;
-        currRing->nc->basering=currRing;
-      }
-      currRing->nc->type=nc_general;
-      /* C is either a poly (coeff - an int or a number) or a  matrix */
-      if (h==NULL) return TRUE;
-      leftv hh=h->next;
-      h->next=NULL;
-      switch(h->Typ())
-      {
-        case MATRIX_CMD: { C=(matrix)h->CopyD(); break; }
-
-        case INT_CMD: case NUMBER_CMD:
-        {
-          i=iiTestConvert(h->Typ(), POLY_CMD);
-          if (i==0)
-          {
-            Werror("cannot convert to poly");
-            return TRUE;
-          }
-          iiConvert(h->Typ(), POLY_CMD, i, h, &tmp_v);
-          pN=(poly)tmp_v.Data();
-          break;
-        }
-
-        case POLY_CMD:  {pN=(poly)h->Data(); break;}
-
-        default: return TRUE;
-      }
-      if (h->Typ()==MATRIX_CMD)
-      {
-        currRing->nc->type=nc_undef; /* to analyze later ! */
-        //        currRing->nc->IsSkewConstant=NULL;
-      }
-      else
-      {
-        nN=pGetCoeff(pN); // pN is not NULL anyway
-        if (nIsZero(nN))
-        {
-          Werror("zero coefficients are not allowed");
-          return TRUE;
-        }
-        if (nIsOne(nN)) currRing->nc->type=nc_lie;
-        else currRing->nc->type=nc_skew;
-        currRing->nc->IsSkewConstant=1;
-        /* create matrix C */
-        C=mpNew(currRing->N,currRing->N);
-        for(i=1;i<currRing->N;i++)
-        {
-          for(j=i+1;j<=currRing->N;j++)
-          {
-            MATELEM(C,i,j) = nc_p_CopyPut(pN,currRing);
-            //  MATELEM(C,i,j)=pCopy(pN);
-          }
-        }
-      }
-      pN=NULL;
-      h=hh;
-      /* D is either a poly or a matrix */
-      if (h==NULL) { pN=NULL;}  /* D is zero matrix */
-      else
-      {
-        switch(h->Typ())
-        {
-          case MATRIX_CMD: { D=(matrix)h->CopyD(); break;}
-
-          case INT_CMD: case NUMBER_CMD:
-          {
-            i=iiTestConvert(h->Typ(), POLY_CMD);
-            if (i==0)
-            {
-              Werror("cannot convert to poly");
-              return TRUE;
-            }
-            iiConvert(h->Typ(), POLY_CMD, i, h, &tmp_v);
-            pN=(poly)tmp_v.Data();
-            break;
-          }
-
-          case POLY_CMD:  { pN=(poly)h->Data();break;}
-
-          default: return TRUE;
-        }
-      } /* end else h==NULL */
-      if (pN==NULL)
-      {
-        if (currRing->nc->type==nc_lie)
-        {
-          currRing->nc->type=nc_skew; /* even commutative! */
-        }
-      }
-      else
-      {
-        if (currRing->nc->type==nc_skew) currRing->nc->type=nc_general;
-      } /* end pN==NULL */
-      if (h==NULL)
-      {
-         WerrorS("expected `system(\"PLURAL\",<matrix>,<matrix>)`");
-         idDelete((ideal *)&(currRing->nc->C));
-         omFreeSize((ADDRESS)currRing->nc,sizeof(nc_struct));
-         currRing->nc=NULL;
-         return TRUE;
-      }
-      if (h->Typ()!=MATRIX_CMD)
-      {
-        D=mpNew(currRing->N,currRing->N);
-        /* create matrix D */
-        for(i=1;i<currRing->N;i++)
-        {
-          for(j=i+1;j<=currRing->N;j++)
-          {
-            MATELEM(D,i,j) = nc_p_CopyPut(pN,currRing);
-            //            MATELEM(D,i,j)=pCopy(pN);
-          }
-        }
-      }
-      else currRing->nc->type=nc_undef;
-      tmp_v.CleanUp();
-      pN=NULL;
-      /* Now we proceed with C and D */
-      matrix COM;
-      currRing->nc->MT=(matrix *)omAlloc0(currRing->N*(currRing->N-1)/2*sizeof(matrix));
-      currRing->nc->MTsize=(int *)omAlloc0(currRing->N*(currRing->N-1)/2*sizeof(int));
-      currRing->nc->C=C;
-      currRing->nc->D=D;
-      COM=mpCopy(currRing->nc->C);
-      poly p;
-      short DefMTsize=7;
-      int tmpIsSkewConstant=1;
-      int IsNonComm=0;
-      pN=nc_p_CopyGet(MATELEM(currRing->nc->C,1,2),currRing);
-      //      pN=MATELEM(currRing->nc->C,1,2);
-
-      for(i=1;i<currRing->N;i++)
-      {
-        for(j=i+1;j<=currRing->N;j++)
-        {
-          if (MATELEM(currRing->nc->C,i,j)==NULL)
-          {
-            Werror("Incorrect input : matrix of coefficients contains zeros in the upper triangle!");
-            return TRUE;
-          }
-          if (!nEqual(pGetCoeff(pN),pGetCoeff(MATELEM(currRing->nc->C,i,j)))) tmpIsSkewConstant=0;
-          if (MATELEM(currRing->nc->D,i,j)==NULL) /* quasicommutative case */
-          {
-            currRing->nc->MTsize[UPMATELEM(i,j,currRing->N)]=1;
-            /* 1x1 mult.matrix */
-            currRing->nc->MT[UPMATELEM(i,j,currRing->N)]=mpNew(1,1);
-          }
-          else /* pure noncommutative case*/
-          {
-            IsNonComm=1;
-            MATELEM(COM,i,j)=NULL;
-            currRing->nc->MTsize[UPMATELEM(i,j,currRing->N)]=DefMTsize; /* default sizes */
-            currRing->nc->MT[UPMATELEM(i,j,currRing->N)]=mpNew(DefMTsize,DefMTsize);
-          }
-          p=pOne();
-          pSetCoeff(p,nCopy(pGetCoeff(MATELEM(currRing->nc->C,i,j))));
-          pSetExp(p,i,1);
-          pSetExp(p,j,1);
-          pSetm(p);
-          //          p=pAdd(p,pCopy(MATELEM(currRing->nc->D,i,j)));
-          p=pAdd(p,nc_p_CopyGet(MATELEM(currRing->nc->D,i,j),currRing));
-          //          MATELEM(currRing->nc->MT[UPMATELEM(i,j,currRing->N)],1,1)=p;
-          MATELEM(currRing->nc->MT[UPMATELEM(i,j,currRing->N)],1,1)=nc_p_CopyPut(p,currRing);
-          pDelete(&p);
-          p=NULL;
-        }
-        /* set MT[i,j,1,1] to c_i_j*x_i*x_j + D_i_j */
-      }
-      if (currRing->nc->type==nc_undef)
-      {
-        if (IsNonComm==1)
-        {
-          assume(pN!=NULL);
-          if ((tmpIsSkewConstant==1) && (nIsOne(pGetCoeff(pN)))) currRing->nc->type=nc_lie;
-          else currRing->nc->type=nc_general;
-        }
-        if (IsNonComm==0)
-        {
-          currRing->nc->type=nc_skew; /* could be also commutative */
-          currRing->nc->IsSkewConstant=tmpIsSkewConstant;
-        }
-      }
-      currRing->nc->COM=COM;
-      return FALSE;
-    }
-    else
-#endif
 /*==================== opp ==================================*/
     if (strcmp(sys_cmd, "opp")==0)