Changeset 69745c in git

Timestamp:

Feb 22, 2013, 5:24:56 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'e7cc1ebecb61be8b9ca6c18016352af89940b21a')

Children:

3fe5653d30a5eb7c6185adb2fba661116e7cf0d85f737de70c628044e317187ef3d73f675c9b4aaf

Parents:

7964f9c956558e8b0001c238e40b87ea1f0d9757

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-02-22 17:24:56+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-02-22 18:24:51+01:00

Message:

Fixed walk

Files:

• Singular/walk_ip.cc (modified) (1 diff)
• libpolys/polys/prCopy.cc (modified) (1 diff)
• libpolys/polys/prCopyTemplate.cc (modified) (1 diff)

Singular/walk_ip.cc

@@ -220 +220 @@
        ring almostDestRing=currRing;
        rChangeCurrRing(destRing);
-       destIdeal=idrMoveR(destIdeal,destRing,almostDestRing);
+       destIdeal=idrMoveR(destIdeal, almostDestRing, destRing);
      }
 

libpolys/polys/prCopy.cc

@@ -202 +202 @@
 {
   assume(src_r->cf==dest_r->cf);
+  assume( prproc != NULL );
+   
   if (id == NULL) return NULL;
-  ideal res = id;
-
-  int i;
-  for (i=IDELEMS(id)-1; i>=0; i--)
-    res->m[i] = prproc(id->m[i], src_r, dest_r);
-  id = NULL;
+
+  ideal res = id; id = NULL;
+
+  for (int i = IDELEMS(res) - 1; i >= 0; i--)
+    res->m[i] = prproc(res->m[i], src_r, dest_r);
+   
   return res;
 }

libpolys/polys/prCopyTemplate.cc

@@ -8 +8 @@
 
 static poly PR_NAME
-(poly &src, ring r_src, ring r_dest)
+(poly &src, const ring r_src, const ring r_dest)
 {
   if (src==NULL) return NULL;
+
+  /* PrintS("src: "); p_Write(src, r_src); PrintLn(); */
+   
+  //  p_Test(src, r_src); // may fail due to wrong monomial order
   spolyrec dest_s;
+   
   poly dest = &dest_s;
-  poly tmp;
   PR_INIT_EVECTOR_COPY(r_src, r_dest);
 
-  while (src != NULL)
+  poly p = src; src = NULL;
+  while (p != NULL)
   {
-    pNext(dest) = (poly) PR_ALLOC_MONOM(r_dest);
-    pIter(dest);
-    pSetCoeff0(dest, PR_NCOPY(pGetCoeff(src), r_src));
-    PR_CPY_EVECTOR(dest, r_dest, src, r_src);
-    tmp = pNext(src);
-    PR_DELETE_MONOM(src, r_src);
-    src = tmp;
+    pNext(dest) = (poly) PR_ALLOC_MONOM(r_dest); pIter(dest);
+     
+    p_SetCoeff0(dest, PR_NCOPY(p_GetCoeff(p, r_src), r_src), r_dest);
+    PR_CPY_EVECTOR(dest, r_dest, p, r_src);
+     
+    { poly tmp = pNext(p); PR_DELETE_MONOM(p, r_src); p = tmp; }
   }
   pNext(dest) = NULL;