Changeset f14e40 in git

Timestamp:

Aug 1, 2011, 2:43:23 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

283ef732868790f43d179f5c606f84691eaba355

Parents:

f625fe2dcd54b36842ce99b5160bfe10d0073f83

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-08-01 14:43:23+02:00

git-committer:

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

Message:

fix walkMain.cc

File:

• kernel/walkMain.cc (modified) (12 diffs)

kernel/walkMain.cc

@@ -81 +81 @@
     rChangeCurrRing(rnew);
 
-    ideal newGw=idrMoveR(Gw, oldRing);
+    ideal newGw=idrMoveR(Gw, oldRing, rnew);
 
 
@@ -103 +103 @@
     idDelete(&newGw);
 
-    nextG=idrMoveR(G,oldRing); idTest(nextG);
+    nextG=idrMoveR(G,oldRing, rnew); idTest(nextG);
 
     matrix nextGmat=(matrix)nextG;
 
-    matrix resMat=mpMult(nextGmat,L);
+    matrix resMat=mp_Mult(nextGmat,L,rnew);
     idDelete((ideal *)&nextGmat);
     idDelete((ideal *)&L);
@@ -124 +124 @@
     rComplete(rnew);
     rChangeCurrRing(rnew);
-    nextG=idrMoveR(G,oldRing);
+    nextG=idrMoveR(G,oldRing, rnew);
   }
 
@@ -157 +157 @@
   rCopyAndChangeA(currw64);
 
-  ideal newGw=idrMoveR(Gw, oldRing);
+  ideal newGw=idrMoveR(Gw, oldRing,currRing);
 
   //HIER GEANDERT
@@ -184 +184 @@
     //PrintS("  lift for initial forms done\n");
 
-  ideal nextG=idrMoveR(G,oldRing);
+  ideal nextG=idrMoveR(G,oldRing,currRing);
   rKill(oldRing);
 
   matrix nextGmat=(matrix)nextG;
 
-  matrix resMat=mpMult(nextGmat,L);
+  matrix resMat=mp_Mult(nextGmat,L,currRing);
   idDelete((ideal *)&nextGmat);
   idDelete((ideal *)&L);
@@ -329 +329 @@
       rComplete(newRing);
       rChangeCurrRing(newRing);
-      G=idrMoveR(G,oldRing);
+      G=idrMoveR(G,oldRing,newRing);
     }
 
@@ -368 +368 @@
     rChangeCurrRing(rnew);
 
-    ideal newGw=idrMoveR(Gw, oldRing);
+    ideal newGw=idrMoveR(Gw, oldRing,rnew);
 
       //turn off bucket representation of polynomials and on redSB
@@ -384 +384 @@
     idDelete(&newGw);
 
-    nextG=idrMoveR(G,oldRing); idTest(nextG);
+    nextG=idrMoveR(G,oldRing,rnew); idTest(nextG);
 
     matrix nextGmat=(matrix)nextG;
 
-    matrix resMat=mpMult(nextGmat,L);
+    matrix resMat=mp_Mult(nextGmat,L,rnew);
     idDelete((ideal *)&nextGmat);
     idDelete((ideal *)&L);
@@ -405 +405 @@
     rComplete(rnew);
     rChangeCurrRing(rnew);
-    nextG=idrMoveR(G,oldRing);
+    nextG=idrMoveR(G,oldRing,rnew);
   }
 
@@ -528 +528 @@
       //rComplete(newring,1);
 
-      newGw=idrMoveR(GwCp,oldRing);
+      newGw=idrMoveR(GwCp,oldRing,newring);
 
       test|=Sy_bit(OPT_REDSB);
@@ -557 +557 @@
       rComplete(newring,1);
 
-      newGw=idrMoveR(GwCp,oldRing);
-
-      newStdGw=idrMoveR(recG,temp);
+      newGw=idrMoveR(GwCp,oldRing,newring);
+
+      newStdGw=idrMoveR(recG,temp,newring);
     }
 
@@ -571 +571 @@
     test=optionState;
 
-    newG=idrMoveR(GCp,oldRing);
+    newG=idrMoveR(GCp,oldRing,currRing);
     matrix MG=(matrix)newG;
 
-    matrix resMat=mpMult(MG,L);
+    matrix resMat=mp_Mult(MG,L,currRing);
     idDelete((ideal *)&MG);
     idDelete((ideal *)&L);