Changeset 494884 in git

Timestamp:

Mar 22, 2011, 11:16:48 AM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

58ea04393add5871d2f9f54b118b57b5395f173f

Parents:

c462b558d2bcc56ce39d2181b2f9d9cd1b82345b

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-03-22 11:16:48+01:00

git-committer:

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

Message:

fixed weight.cc

Location:

libpolys/polys

Files:

• weight.cc (modified) (12 diffs)
• weight.h (modified) (3 diffs)

libpolys/polys/weight.cc

@@ -9 +9 @@
 
 #include <math.h>
-#include <kernel/mod2.h>
-#include <kernel/options.h>
+//#include <kernel/mod2.h>
 #include <omalloc/omalloc.h>
-#include <kernel/polys.h>
-#include <kernel/intvec.h>
-#include <kernel/febase.h>
-#include <kernel/ideals.h>
-#include <kernel/ring.h>
-#include <kernel/weight.h>
+#include <misc/options.h>
+#include <polys/monomials/p_polys.h>
+#include <misc/intvec.h>
+//#include <kernel/febase.h>
+//#include <kernel/ideals.h>
+#include <polys/monomials/ring.h>
+#include <polys/weight.h>
 
 /*0 implementation*/
@@ -34 +34 @@
 extern "C" void wGcd(int *x, int n);
 
-static void wDimensions(polyset s, int sl, int *lpol, int *npol, int *mons)
+static void wDimensions(poly* s, int sl, int *lpol, int *npol, int *mons)
 {
   int  i, i1, j, k;
@@ -64 +64 @@
 
 
-static void wInit(polyset s, int sl, int mons, int *A)
+static void wInit(poly* s, int sl, int mons, int *A, const ring R)
 {
   int  n, a, i, j, *B, *C;
@@ -71 +71 @@
 
   B = A;
-  n = pVariables;
+  n = rVar(R);
   a = (n + 1) * sizeof(int);
   pl = (int *)omAlloc(a);
@@ -84 +84 @@
         C = B;
         B++;
-        pGetExpV(p, pl);
+        p_GetExpV(p, pl,R);
         for (j = 0; j < n; j++)
         {
@@ -95 +95 @@
         C = B;
         B++;
-        pGetExpV(q, pl);
+        p_GetExpV(q, pl,R);
         for (j = 0; j < n; j++)
         {
@@ -108 +108 @@
 }
 
-void wCall(polyset s, int sl, int *x, double wNsqr)
+void wCall(poly* s, int sl, int *x, double wNsqr, const ring R)
 {
   int  n, q, npol, mons, i;
@@ -115 +115 @@
   void *adr;
 
-  n = pVariables;
+  n = rVar(R);
   lpol = (int * )omAlloc((sl + 1) * sizeof(int));
   wDimensions(s, sl, lpol, &npol, &mons);
@@ -130 +130 @@
   q = (n + 1) * mons * sizeof(int);
   A = (int * )omAlloc(q);
-  wInit(s, sl, mons, A);
+  wInit(s, sl, mons, A, R);
   degw = A + (n * mons);
   memset(degw, 0, mons * sizeof(int));
@@ -182 +182 @@
 
 
-void kEcartWeights(polyset s, int sl, short *eweight)
+void kEcartWeights(poly* s, int sl, short *eweight, const ring R)
 {
   int  n, i;
@@ -188 +188 @@
 
   *eweight = 0;
-  n = pVariables;
-  if (rHasLocalOrMixedOrdering_currRing())
+  n = rVar(R);
+  if (rHasLocalOrMixedOrdering(R))
     wFunctional = wFunctionalMora;
   else
     wFunctional = wFunctionalBuch;
   x = (int * )omAlloc(2 * (n + 1) * sizeof(int));
-  wCall(s, sl, x, (double)2.0 / (double)n);
+  wCall(s, sl, x, (double)2.0 / (double)n, R);
   for (i = n; i!=0; i--)
     eweight[i] = x[i + n + 1];
@@ -200 +200 @@
 }
 
-short * iv2array(intvec * iv)
-{
-  short *s=(short *)omAlloc0((pVariables+1)*sizeof(short));
+short * iv2array(intvec * iv, const ring R)
+{
+  short *s=(short *)omAlloc0((rVar(R)+1)*sizeof(short));
   int len=0;
   if(iv!=NULL)

libpolys/polys/weight.h

@@ -11 +11 @@
 #include <polys/monomials/ring.h>
 
-//extern short * ecartWeights;
+extern short * ecartWeights;
 //extern pFDegProc pFDegOld;
 //extern pLDegProc pLDegOld;
 
-void kEcartWeights(poly* s, int sl, short *eweight);
+void kEcartWeights(poly* s, int sl, short *eweight, const ring R);
 //BOOLEAN kWeight(leftv res,leftv id);
 //BOOLEAN kQHWeight(leftv res,leftv v);
@@ -22 +22 @@
 long totaldegreeWecart_IV(poly p, ring r, const short *w);
 
-short * iv2array(intvec * iv);
+short * iv2array(intvec * iv, const ring R);
 
 // internal:
@@ -29 +29 @@
 extern "C" double wFunctionalBuch(int *degw, int *lpol, int npol,
        double *rel, double wx, double wNsqr);
-void wCall(poly* s, int sl, int *x, double wNsqr);
+void wCall(poly* s, int sl, int *x, double wNsqr, const ring R);
 
 #endif