Changeset 1135a61 in git for libpolys/polys/weight0.c

Timestamp:

Apr 19, 2011, 12:00:52 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8d54773d6c9e2f1d2593a28bc68b7eeab54ed529')

Children:

ec0d9b416a53586bd0d5b780545cea184cf3d824

Parents:

f27003fd89ac86ed0bd7cc93a1342d129926c00c

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-04-19 12:00:52+02:00

git-committer:

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

Message:

fix weight0.c

File:

• libpolys/polys/weight0.c (moved) (moved from kernel/weight0.c) (17 diffs)

libpolys/polys/weight0.c

@@ -10 +10 @@
 #include <math.h>
 #include <string.h>
-#include <kernel/mod2.h>
+#include <misc/auxiliary.h>
 #include <omalloc/omalloc.h>
-#include <kernel/structs.h>
 
 double wFunctionalMora(int *degw, int *lpol, int npol,
@@ -18 +17 @@
 double wFunctionalBuch(int *degw, int *lpol, int npol,
        double *rel, double wx, double wwNsqr);
-void wAdd(int *A, int mons, int kn, int xx);
+void wAdd(int *A, int mons, int kn, int xx, int rvar);
 void wNorm(int *degw, int *lpol, int npol, double *rel);
 void wFirstSearch(int *A, int *x, int mons,
-        int *lpol, int npol, double *rel, double *fopt, double wNsqr);
+        int *lpol, int npol, double *rel, double *fopt, double wNsqr, int rvar);
 void wSecondSearch(int *A, int *x, int *lpol,
-        int npol, int mons, double *rel, double *fk, double wNsqr);
+        int npol, int mons, double *rel, double *fk, double wNsqr, int rvar);
 void wGcd(int *x, int n);
 /*0 implementation*/
 
 short * ecartWeights=NULL;
-extern int pVariables;
 
 double (*wFunctional)(int *degw, int *lpol, int npol,
@@ -112 +110 @@
 
 
-static void wSub(int *A, int mons, int kn, int xx)
+static void wSub(int *A, int mons, int kn, int xx,int rvar)
 {
   int  i, *B, *ex;
 
   B = A + ((kn - 1) * mons);
-  ex = A + (pVariables * mons);
+  ex = A + (rvar * mons);
   i = mons;
   if (xx == 1)
@@ -132 +130 @@
 
 
-void wAdd(int *A, int mons, int kn, int xx)
+void wAdd(int *A, int mons, int kn, int xx, int rvar)
 {
   int  i, *B, *ex;
 
   B = A + ((kn - 1) * mons);
-  ex = A + (pVariables * mons);
+  ex = A + (rvar * mons);
   i = mons;
   if (xx == 1)
@@ -153 +151 @@
 
 void wFirstSearch(int *A, int *x, int mons,
-  int *lpol, int npol, double *rel, double *fopt, double wNsqr)
+  int *lpol, int npol, double *rel, double *fopt, double wNsqr, int rvar)
 {
   int  a0, a, n, xn, t, xx, y1;
@@ -162 +160 @@
 
   fy = *fopt;
-  n = pVariables;
+  n = rvar;
   xn = n + 6 + (21 / n);
   a0 = n * sizeof(double);
@@ -187 +185 @@
         x[t] = xx;
         if (xx > 1)
-          wAdd(A, mons, t, 1);
+          wAdd(A, mons, t, 1, rvar);
         t++;
       }
@@ -195 +193 @@
         x[t] = 0;
         if (xx!=0)
-          wSub(A, mons, t, xx);
+          wSub(A, mons, t, xx, rvar);
         t--;
         if (t==0)
@@ -211 +209 @@
     xx--;
     if (xx!=0)
-      wAdd(A, mons, t, xx);
+      wAdd(A, mons, t, xx, rvar);
     fmax = (*wFunctional)(degw, lpol, npol, rel, wx,wNsqr);
     if (xx!=0)
-      wSub(A, mons, t, xx);
+      wSub(A, mons, t, xx, rvar);
     if (fmax < fy)
     {
@@ -238 +236 @@
 
 static void wEstimate(int *A, int *x, int *lpol, int npol, int mons,
-double wx, double *rel, double *fopt, int *s0, int *s1, int *s2, double wNsqr)
+double wx, double *rel, double *fopt, int *s0, int *s1, int *s2, double wNsqr, int rvar)
 {
   int  n, i1, i2, k0 = 0, k1 = 0, k2 = 0;
@@ -244 +242 @@
   double fo1, fo2, fmax, wx1, wx2;
 
-  n = pVariables;
+  n = rvar;
   degw = A + (n * mons);
   fo2 = fo1 = (double)1.0e10;
@@ -251 +249 @@
     if (x[i1] > 1)
     {
-      wSub(A, mons, i1, 1);
+      wSub(A, mons, i1, 1, rvar);
       wx1 = wx - wx / (double)x[i1];
       x[i1]--;
@@ -264 +262 @@
         if (x[i2] > 1)
         {
-          wSub(A, mons, i2, 1);
+          wSub(A, mons, i2, 1, rvar);
           wx2 = wx1 - wx1 / (double)x[i2];
           fmax = (*wFunctional)(degw, lpol, npol, rel, wx2, wNsqr);
@@ -273 +271 @@
             k2 = i2;
           }
-          wAdd(A, mons, i2, 1);
+          wAdd(A, mons, i2, 1, rvar);
         }
       }
-      wAdd(A, mons, i1, 1);
+      wAdd(A, mons, i1, 1, rvar);
       x[i1]++;
     }
@@ -296 +294 @@
 
 void wSecondSearch(int *A, int *x, int *lpol,
-int npol, int mons, double *rel, double *fk, double wNsqr)
+int npol, int mons, double *rel, double *fk, double wNsqr, int rvar)
 {
   int  n, s0, s1, s2, *xopt;
   double  one, fx, fopt, wx;
 
-  n = pVariables;
+  n = rvar;
   xopt = x + (n + 2);
   fopt = *fk * (double)0.999999999999;
@@ -308 +306 @@
   loop
   {
-    wEstimate(A, x, lpol, npol, mons, wx, rel, &fx, &s0, &s1, &s2, wNsqr);
+    wEstimate(A, x, lpol, npol, mons, wx, rel, &fx, &s0, &s1, &s2, wNsqr, rvar);
     if (fx > fopt)
     {
@@ -341 +339 @@
     }
     if (s0!=0)
-      wSub(A, mons, s0, 1);
+      wSub(A, mons, s0, 1, rvar);
     else
     {
-      wSub(A, mons, s1, 1);
-      wSub(A, mons, s2, 1);
+      wSub(A, mons, s1, 1, rvar);
+      wSub(A, mons, s2, 1, rvar);
     }
     wx = wPrWeight(x, n);