Changeset 8e45403 in git

Timestamp:

Feb 17, 2011, 12:46:28 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

c6a3eb2acc5dd32736025e8cccb2ec85c75a4fbe

Parents:

59f768ac4671eddeb42e9d6db9ea83e7b4226cf0

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-02-17 12:46:28+01:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 11:59:33+01:00

Message:

longalg  in rSum

File:

• libpolys/polys/monomials/ring.cc (modified) (10 diffs)

libpolys/polys/monomials/ring.cc

@@ -945 +945 @@
         if (!vartest || (strcmp(r1->parameter[0],r2->parameter[0])==0)) /* 1 par */
         {
-          tmpR.parameter=(char_ptr *)omAllocBin(char_ptr_bin);
-          tmpR.parameter[0]=omStrDup(r1->parameter[0]);
-          tmpR.P=1;
+          //tmpR.parameter=(char **)omAllocBin(char *);
+          //tmpR.parameter[0]=omStrDup(r1->parameter[0]);
+          //tmpR.P=1;
         }
         else
@@ -970 +970 @@
               && n_Equal(r1->minpoly,r2->minpoly, r1->cf))
           {
-            tmpR.parameter=(char_ptr *)omAllocBin(char_ptr_bin);
-            tmpR.parameter[0]=omStrDup(r1->parameter[0]);
-            tmpR.minpoly=n_Copy(r1->minpoly, r1->cf);
-            tmpR.P=1;
+            //tmpR.parameter=(char **)omAllocBin(char *);
+            //tmpR.parameter[0]=omStrDup(r1->parameter[0]);
+            //tmpR.minpoly=n_Copy(r1->minpoly, r1->cf);
+            //tmpR.P=1;
             // HANNES: TODO: delete nSetChar
           }
@@ -988 +988 @@
               && (rPar(r2)==1))
           {
-            tmpR.parameter=(char_ptr *)omAllocBin(char_ptr_bin);
-            tmpR.parameter[0]=omStrDup(r1->parameter[0]);
-            tmpR.P=1;
-            tmpR.minpoly=n_Copy(r1->minpoly, r1->cf);
+            //tmpR.parameter=(char **)omAllocBin(char *);
+            //tmpR.parameter[0]=omStrDup(r1->parameter[0]);
+            //tmpR.P=1;
+            //tmpR.minpoly=n_Copy(r1->minpoly, r1->cf);
           }
           else
@@ -1007 +1007 @@
               && (rPar(r1)==1))
           {
-            tmpR.parameter=(char_ptr *)omAllocBin(char_ptr_bin);
-            tmpR.parameter[0]=omStrDup(r1->parameter[0]);
-            tmpR.P=1;
-            tmpR.minpoly=n_Copy(r2->minpoly, r2->cf);
+            //tmpR.parameter=(char **)omAllocBin(char *);
+            //tmpR.parameter[0]=omStrDup(r1->parameter[0]);
+            //tmpR.P=1;
+            //tmpR.minpoly=n_Copy(r2->minpoly, r2->cf);
           }
           else
@@ -1122 +1122 @@
       if ((r2->ch<-1)||(r2->ch==1)) /* Z/p(a),Q(a) */
       {
-        tmpR.ch=rInternalChar(r2);
+        tmpR.ch=r2->ch;
         tmpR.P=rPar(r2);
         tmpR.parameter=(char **)omAlloc(rPar(r2)*sizeof(char *));
@@ -1182 +1182 @@
       else if (r2->ch==-r1->ch) /* Z/p(a) */
       {
-        tmpR.ch=rInternalChar(r2);
+        tmpR.ch=r2->ch;
         tmpR.P=rPar(r2);
         tmpR.parameter=(char **)omAlloc(rPar(r2)*sizeof(char *));
@@ -1601 +1601 @@
   ideal Q=NULL;
   ideal Q1=NULL, Q2=NULL;
-//  ring old_ring2 = currRing;
   if (r1->qideal!=NULL)
   {
@@ -1657 +1656 @@
   {
     Q = idSimpleAdd(Q1,Q2);
-    //rChangeCurrRing(old_ring2);
   }
   sum->qideal = Q;
@@ -3381 +3379 @@
 static void rOptimizeLDeg(ring r)
 {
-  if (r->pFDeg == p_Deg)
+  if (r->pFDeg == pDeg)
   {
     if (r->pLDeg == pLDeg1)
@@ -3518 +3516 @@
       r->pLDeg = pLDeg1;
     }
-    r->pFDeg = pWTotaldegree; // may be improved: p_Totaldegree for lp/dp/ls/.. blocks
+    r->pFDeg = p_WTotaldegree; // may be improved: p_Totaldegree for lp/dp/ls/.. blocks
   }