Changeset 68349d in git

Timestamp:

Mar 25, 2004, 10:19:12 PM (20 years ago)

Author:

Viktor Levandovskyy <levandov@…>

Branches:

(u'spielwiese', 'a719bcf0b8dbc648b128303a49777a094b57592c')

Children:

c47b0a37e9aaabd8518efe50efd4ab6a540b00b6

Parents:

3d9ed9730c6639ccd48654bab09d3ef24067f307

Message:

*levandov: Plural Subst fix


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

Location:

kernel

Files:

• gring.cc (modified) (3 diffs)
• gring.h (modified) (4 diffs)
• polys.cc (modified) (3 diffs)

kernel/gring.cc

@@ -7 +7 @@
  *  Author:  levandov (Viktor Levandovsky)
  *  Created: 8/00 - 11/00
- *  Version: $Id: gring.cc,v 1.4 2003-12-17 19:40:41 levandov Exp $
+ *  Version: $Id: gring.cc,v 1.5 2004-03-25 21:19:12 levandov Exp $
  *******************************************************************/
 #include "mod2.h"
@@ -1393 +1393 @@
             ares=p_Add_q(ares, bres,currRing);
             /* What to give free? */
+            /* Do we have to free PREFIX/SUFFIX? it seems so */
             pDelete(&prefix);
             pDelete(&suffix);
@@ -1946 +1947 @@
 }
 
-#endif
+/* substitute the n-th variable by e in p
+* destroy p
+* e is not a constant
+*/
+poly nc_pSubst(poly p, int n, poly e)
+{
+  int rN=currRing->N;
+  int *PRE = (int *)omAlloc0((rN+1)*sizeof(int));
+  int *SUF = (int *)omAlloc0((rN+1)*sizeof(int));
+  int i,j,pow;
+  poly suf,pre;
+  poly res = NULL;
+  poly out = NULL;
+  while ( p!= NULL )
+  {
+    pGetExpV(p, PRE); /* faster splitting? */
+    pow = PRE[n]; PRE[n]=0;
+    res = NULL;
+    if (pow!=0)
+    {
+      for (i=n+1; i<=rN; i++)
+      {
+        SUF[i] = PRE[i];
+        PRE[i] = 0;
+      }
+      res =  pPower(pCopy(e),pow);
+      /* multiply with prefix */
+      pre = pOne();
+      pSetExpV(pre,PRE);
+      pSetm(pre);
+      pSetComp(pre,PRE[0]);
+      res = nc_mm_Mult_p(pre,res,currRing);
+      /* multiply with suffix */
+      suf = pOne();
+      pSetExpV(suf,SUF);
+      pSetm(suf);
+      pSetComp(suf,PRE[0]);
+      res = nc_p_Mult_mm(res,suf,currRing);
+    }
+    else /* pow==0 */
+    {
+      res = pHead(p);
+    }
+    p   = pLmDeleteAndNext(p);
+    out = pAdd(out,res);
+  }
+  freeT(PRE,rN);
+  freeT(SUF,rN);
+  return(out);
+}
+
+#endif

kernel/gring.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: gring.h,v 1.3 2003-12-16 18:30:31 levandov Exp $ */
+/* $Id: gring.h,v 1.4 2004-03-25 21:18:57 levandov Exp $ */
 /*
 * ABSTRACT additional defines etc for --with-plural
@@ -23 +23 @@
 void ncCleanUp(ring r); /* smaller than kill */
 
-// poly functions defined in p_Procs :
+/* poly functions defined in p_Procs : */
 poly nc_pp_Mult_mm(poly p, poly m, const ring r, poly &last);
 poly nc_p_Mult_mm(poly p, poly m, const ring r);
 poly nc_p_Minus_mm_Mult_qq(poly p, const poly m, poly q, const ring r);
-// other routines we need in addition :
+/* other routines we need in addition : */
 poly nc_p_Mult_mm_Common(poly p, const poly m, int side, const ring r);
 poly nc_mm_Mult_p(const poly m, poly p, const ring r);
@@ -42 +42 @@
 poly _nc_p_Mult_q(poly p, poly q, const int copy, const ring r);
 
-//copy :
+/* subst: */
+poly nc_pSubst(poly p, int n, poly e);
+
+/* copy : */
 poly nc_p_CopyGet(poly a, ring r);
 poly nc_p_CopyPut(poly a, ring r);
 
-//syzygies :
-// former nc_spGSpolyCreate
+/* syzygies : */
+/* former nc_spGSpolyCreate */
 poly nc_CreateSpoly(poly p1, poly p2, poly spNoether, const ring r);
-// former nc_spGSpolyRed
+/* former nc_spGSpolyRed */
 poly nc_ReduceSpoly(poly p1, poly p2, poly spNoether, const ring r);
-// former nc_spGSpolyRedNew
+/* former nc_spGSpolyRedNew */
 poly nc_ReduceSpolyNew(poly p1, poly p2, poly spNoether, const ring r);
-// former nc_spGSpolyRedTail
+/* former nc_spGSpolyRedTail */
 void nc_ReduceSpolyTail(poly p1, poly q, poly q2, poly spNoether, const ring r);
-// former nc_spShort
+/* former nc_spShort */
 poly nc_CreateShortSpoly(poly p1, poly p2, const ring r=currRing);
 
 ideal gr_bba (ideal F, ideal Q,kStrategy strat);
 
-// brackets:
+/* brackets: */
 poly nc_p_Bracket_qq(poly p, poly q);
 poly nc_mm_Bracket_nn(poly m1, poly m2);
 
-//twostd:
-
+/* twostd: */
 ideal twostd(ideal I);
 
-// complete reduction routines
+/* complete reduction routines */
 
-//void nc_kBucketPolyRed(kBucket_pt b, poly p);
+/* void nc_kBucketPolyRed(kBucket_pt b, poly p); */
 void nc_kBucketPolyRed(kBucket_pt b, poly p, number *c);
 void nc_PolyPolyRed(poly &b, poly p, number *c);
@@ -79 +81 @@
 
 #else
-// dummy definition to make gcc happy
+/* dummy definition to make gcc happy */
 #define nc_kBucketPolyRed(A,B,C) 0
 #define nc_PolyPolyRed(A,B,C) 0

kernel/polys.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: polys.cc,v 1.1.1.1 2003-10-06 12:15:55 Singular Exp $ */
+/* $Id: polys.cc,v 1.2 2004-03-25 21:16:15 levandov Exp $ */
 
 /*
@@ -20 +20 @@
 #include "ring.h"
 
+#ifdef HAVE_PLURAL
+#include "gring.h"
+#endif
+
 /* ----------- global variables, set by pSetGlobals --------------------- */
 /* computes length and maximal degree of a POLYnomial */
@@ -835 +839 @@
     else return pSubst2(p, n, pGetCoeff(e));
   }
+
+#ifdef HAVE_PLURAL
+  if (rIsPluralRing(currRing))
+  {
+    return nc_pSubst(p,n,e);
+  }
+#endif
 
   int exponent,i;