Changeset 1f637e in git for kernel/gr_kstd2.cc

Timestamp:

Jul 19, 2011, 5:11:57 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

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

Children:

1c4e9a5798bda4bc92d0013041b99005a50a7d7c

Parents:

6ed8c424bfe6fd9dc397bfdde3e8acf884469342

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-07-19 17:11:57+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:52:40+01:00

Message:

FIX: replaced pVariables by currRing->N...
ADD: added 'void rChangeCurrRing(ring r);' to polys/polys.h
CHG: started changing gr_kstd2.cc and syz*.cc

File:

• kernel/gr_kstd2.cc (modified) (4 diffs)

kernel/gr_kstd2.cc

@@ -6 +6 @@
 *  ABSTRACT -  Kernel: noncomm. alg. of Buchberger
 */
-
-#include <kernel/mod2.h>
+#define PLURAL_INTERNAL_DECLARATIONS
+
+#include "mod2.h"
 
 #ifdef HAVE_PLURAL
 
-#define PLURAL_INTERNAL_DECLARATIONS
 
 #include <omalloc/omalloc.h>
+#include <misc/options.h>
+#include <misc/intvec.h>
+
+#include <polys/weight.h>
 #include <polys/polys.h>
+
+#include <polys/nc/nc.h>
+#include <polys/nc/sca.h>
+
+
+#include <kernel/febase.h>
 #include <kernel/ideals.h>
-#include <kernel/febase.h>
-#include <misc/options.h>
-#include <kernel/kutil.h>
 #include <kernel/kstd1.h>
 #include <kernel/khstd.h>
-#include <kernel/kutil.h>
 //#include "spolys.h"
 //#include "cntrlc.h"
-#include <polys/weight.h>
-#include <misc/intvec.h>
-#include <polys/nc/nc.h>
-#include <polys/nc/sca.h>
 #include <kernel/ratgring.h>
+
+#include <kernel/kutil.h>
 
 #if 0
@@ -1026 +1030 @@
   //   else
     {
-      ecartWeights=(short *)omAlloc((pVariables+1)*sizeof(short));
+      ecartWeights=(short *)omAlloc(((currRing->N)+1)*sizeof(short));
       /*uses automatic computation of the ecartWeights to set them*/
       kEcartWeights(F->m,IDELEMS(F)-1,ecartWeights);
@@ -1032 +1036 @@
     pFDeg=totaldegreeWecart;
     pLDeg=maxdegreeWecart;
-    for(i=1; i<=pVariables; i++)
+    for(i=1; i<=(currRing->N); i++)
       Print(" %d",ecartWeights[i]);
     PrintLn();
@@ -1283 +1287 @@
     if (ecartWeights)
     {
-      omFreeSize((ADDRESS)ecartWeights,(pVariables+1)*sizeof(short));
+      omFreeSize((ADDRESS)ecartWeights,((currRing->N)+1)*sizeof(short));
       ecartWeights=NULL;
     }