Changeset 5f524e in git

Timestamp:

Nov 20, 2000, 5:02:03 PM (23 years ago)

Author:

Viktor Levandovskyy <levandov@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

c36beecfa29ca61b3d39473a32c3e6f3a0a985d1

Parents:

f2e841257a03cef8970190e17e935122992cc572

Message:

*** empty log message ***


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

Location:

Singular

Files:

• gring.cc (modified) (12 diffs)
• gring.h (modified) (2 diffs)

Singular/gring.cc

@@ -3 +3 @@
 ****************************************/
 /***************************************************************
- *  File:    pp_Mult_mm__Template.cc
- *  Purpose: template for p_Mult_n
- *  Author:  obachman (Olaf Bachmann) / levandov (Viktor Levandovsky)
+ *  File:    gring.cc
+ *  Purpose: pMult family of procedures
+ *  Author:  levandov (Viktor Levandovsky)
  *  Created: 8/00 - 11/00
- *  Version: $Id: gring.cc,v 1.1 2000-11-13 14:50:23 levandov Exp $
+ *  Version: $Id: gring.cc,v 1.2 2000-11-20 16:02:03 levandov Exp $
  *******************************************************************/
 #include "mod2.h"
 #include "gring.h"
+#include "polys.h"
 #ifdef HAVE_PLURAL
-/***************************************************************
- *
- *   Returns:  p*m
- *   Const:    p, m
- *   If spNoether != NULL, then monoms which are smaller
- *   then spNoether are cut
- *
- ***************************************************************/
+
+//global nc_macros :
+#define freeT(A) omFree((ADDRESS)A,(pVariables+1)*sizeof(Exponent_t))
+#define freeN(A,k) omFree((ADDRESS)A,k*sizeof(number))
 
 poly nc_pp_Mult_mm(poly p, const poly m, const poly spNoether, const ring ri)
@@ -52 +49 @@
 }
 
-poly nc_mm_Mult_mm(Exponent_t *F, Exponent_t *G, const ring ri)
+poly nc_mm_Mult_nn(Exponent_t *F, Exponent_t *G, const ring ri)
 
 /* destroys both f and g , f,g are monomials with the coefficient */
@@ -81 +78 @@
     out=pOne();
     for (i=1;i<=nv;i++) { F[i]=F[i]+G[i];}
-    F[0]=exp;
+//    F[0]=exp;
     pSetExpV(out,F);
     pSetCoeff(out,cOut);
@@ -226 +223 @@
 
 //----------pMultUU--------- 
-poly pMultUU (int i, int a, int j, int b)
+poly nc_uu_Mult_ww (int i, int a, int j, int b,const ring r)
 {
   int nv=pVariables;
@@ -234 +231 @@
   {
       out=pOne();
-      pSetExp(out,j,b);
-      pSetExp(out,i,a);
-      if (i==j) pSetExp(out,j,a+b);
-      pSetm(out);
+      p_SetExp(out,j,b,r);
+      p_SetExp(out,i,a,r);
+      if (i==j) p_SetExp(out,j,a+b,r);
+      p_Setm(out,r);
       return(out);
    }
@@ -252 +249 @@
          {
             out=pOne();
-            pSetExp(out,j,b);pSetm(out);
+            p_SetExp(out,j,b,r);p_Setm(out,r);
             return(out);
           }
@@ -261 +258 @@
          {
             out=pOne();
-            pSetExp(out,i,a);pSetm(out);
+            p_SetExp(out,i,a,r);p_Setm(out,r);
             return(out);
          }
@@ -270 +267 @@
 
   int vik = UPMATELEM(j,i);
-  if ((ri->nc->type==nc_skew)||(ri->nc->MF[vik]==0)) // ???
-  {
-    out=pOne();
-    pSetExp(out,j,b); pSetExp(out,i,a);
-    pSetm(out);
-    number tmp_number=NULL;
-    nPower(c,a*b,&tmp_number);
-    pSetCoeff(out,tmp_number);
-    return (out);
-  }
-  matrix cMT=currRing->MT[vik];
-  int cMTsize=currRing->MTsize[vik];
+// FOR future nc_skew case  
+//  if ((ri->nc->type==nc_skew)||(ri->nc->MF[vik]==0))
+//   {
+//     out=pOne();
+//     pSetExp(out,j,b); pSetExp(out,i,a);
+//     pSetm(out);
+//     number tmp_number=NULL;
+//     nPower(c,a*b,&tmp_number);
+//     pSetCoeff(out,tmp_number);
+//     return (out);
+//   }
+  matrix cMT=r->MT[vik];
+  int cMTsize=r->MTsize[vik];
 
   if (((a<cMTsize)&&(b<cMTsize))&&(MATELEM(cMT,a,b)!=NULL))
   {
-     out=pCopy(MATELEM(cMT,a,b));
+     out=p_Copy(MATELEM(cMT,a,b),r);
      return (out);
   }
 
-//End(Zero_Exceptions = (0,0),(0,b),(a,0) )
+//End(Zero_Exceptions = (0,0),(0,b),(a,0),(a==b) )
 //in fact, now a>=1 and b>=1; and j<i
 
-  poly C=MATELEM(currRing->C,j,i);
-  number c=pGetCoeff(C); //coeff
-  poly D=MATELEM(currRing->D,j,i);       //rest
-
-  int newcMTsize;
+  poly C=MATELEM(r->C,j,i);
+  number c=p_GetCoeff(C,r); //coeff
+  poly D=MATELEM(r->D,j,i);       //rest
+
+  int newcMTsize=0;
 
   if (D==NULL)                   /* (skew)-commutativity check */
   {
      out=pOne();
-     pSetExp(out,j,b); pSetExp(out,i,a);
-     pSetm(out);
+     p_SetExp(out,j,b,r); p_SetExp(out,i,a,r);
+     p_Setm(out,r);
      number tmp_number=NULL;
      nPower(c,a*b,&tmp_number);
-     pSetCoeff(out,tmp_number);
+     p_SetCoeff(out,tmp_number,r);
      return(out);
   }
@@ -311 +309 @@
   if ((a==1)&&(b==1))
   {
-     out= pCopy(MATELEM(cMT,1,1));  /* already computed */
+     out= p_Copy(MATELEM(cMT,1,1),r);  /* already computed */
      return(out);
   }
@@ -325 +323 @@
         for (int q=p;q<=nv;q++)
         {
-           MATELEM(tmp,p,q) = MATELEM(currRing->MT[UPMATELEM(j,i)],p,q);
-           MATELEM(currRing->MT[UPMATELEM(j,i)],p,q)=NULL;
+           MATELEM(tmp,p,q) = MATELEM(r->MT[UPMATELEM(j,i)],p,q);
+           MATELEM(r->MT[UPMATELEM(j,i)],p,q)=NULL;
         }
      }
-     idDelete((ideal *)&(currRing->MT[UPMATELEM(j,i)]));
-     currRing->MT[UPMATELEM(j,i)] = tmp;
-     currRing->MTsize[UPMATELEM(j,i)] = newcMTsize;
-  }  /* update of multiplication matrix is finished */
-
-  cMT=currRing->MT[UPMATELEM(j,i)];         //cMT=current MT
-
-  poly x=pOne();pSetExp(x,j,1);pSetm(x);//var(j);
-  poly y=pOne();pSetExp(y,i,1);pSetm(y);//var(i);  for convenience
+     id_Delete((ideal *)&(r->MT[UPMATELEM(j,i)]),r);
+     r->MT[UPMATELEM(j,i)] = tmp;
+     r->MTsize[UPMATELEM(j,i)] = newcMTsize;
+  }  /* The update of multiplication matrix is finished */
+
+  cMT=r->MT[UPMATELEM(j,i)];         //cMT=current MT
+
+  poly x=pOne();p_SetExp(x,j,1,r);p_Setm(x,r);//var(j);
+  poly y=pOne();p_SetExp(y,i,1,r);pSetm(y,r);//var(i);  for convenience
 
   int k,m;
@@ -349 +347 @@
      if (t==NULL)   /* not computed yet */
      {
-        t=pCopy(MATELEM(cMT,k-1,1));
-        t = pMultT2(y,t);
+        t=p_Copy(MATELEM(cMT,k-1,1),r);
+//        t = pMultT2(y,t);
+        t = nc_m_Mult_pp(y,t,,r);
         MATELEM(cMT,k,1) = t;
      }
@@ -363 +362 @@
      if (t==NULL)   //not computed yet
      {
-        t=pCopy(MATELEM(cMT,a,m-1));
-        t = pMultT(t,x);
+        t=p_Copy(MATELEM(cMT,a,m-1),r);
+//        t = pMultT(t,x);
+        t = nc_p_Mult_q(t,x,,r);
         MATELEM(cMT,a,m) = t;
      }
      t=NULL;
   }
-  pDelete(&x); pDelete(&y);
+  p_Delete(&x,r); p_Delete(&y,r);
   t=MATELEM(cMT,a,b);
-  return(pCopy(t));  /* as last computed element was cMT[a,b] */
+  return(p_Copy(t,r));  /* as last computed element was cMT[a,b] */
 }
 #endif

Singular/gring.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: gring.h,v 1.1 2000-11-13 14:50:23 levandov Exp $ */
+/* $Id: gring.h,v 1.2 2000-11-20 16:02:03 levandov Exp $ */
 /*
 * ABSTRACT additional defines etc for --with-plural
@@ -10 +10 @@
 
 #ifdef HAVE_PLURAL
+#include "polys.h" // do we need it really?
+#include "p_Procs.h"
+
 #define UPMATELEM(i,j) ( ((pVariables) * ((i)-1) - ((i) * ((i)-1))/2 + (j)-1)-(i) )
-
+// poly functions defined in p_Procs :
 poly nc_pp_Mult_mm(poly p, poly m, poly spNoether, const ring r);
 poly nc_p_Mult_mm(poly p, poly m, const ring r);
 poly nc_p_Minus_mm_Mult_qq(poly p, poly m, poly q,
                            int &shorter, poly spNoether, const ring r);
+// other routines we need in addition :
+poly nc_m_Mult_pp(poly m, poly p, poly spNoether, const ring r);
+poly nc_m_Mult_n(poly m, poly n, const ring r);
+poly nc_mm_Mult_uu(poly p, poly m, const ring r);
+poly nc_uu_Mult_ww(poly p, poly m, const ring r);
+
+// #define nc_pp_Mult_mm(p, m, spNoether) nc_pp_Mult_mm(p, poly m, poly spNoether, const ring r)
 
 #endif