Changeset 1135a61 in git for libpolys/polys/weight.cc

Timestamp:

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

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

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/weight.cc (modified) (5 diffs)

libpolys/polys/weight.cc

@@ -26 +26 @@
 extern "C" double wFunctionalBuch(int *degw, int *lpol, int npol,
        double *rel, double wx, double wNsqr);
-extern "C" void wAdd(int *A, int mons, int kn, int xx);
+extern "C" void wAdd(int *A, int mons, int kn, int xx, int rvar);
 extern "C" void wNorm(int *degw, int *lpol, int npol, double *rel);
 extern "C" 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);
 extern "C" 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);
 extern "C" void wGcd(int *x, int n);
 
@@ -134 +134 @@
   memset(degw, 0, mons * sizeof(int));
   for (i = n; i!=0; i--)
-    wAdd(A, mons, i, 1);
+    wAdd(A, mons, i, 1, rVar(R));
   wNorm(degw, lpol, npol, rel);
   f1 = (*wFunctional)(degw, lpol, npol, rel, (double)1.0, wNsqr);
@@ -141 +141 @@
   fx = (double)2.0 * eps;
   memset(x, 0, (n + 1) * sizeof(int));
-  wFirstSearch(A, x, mons, lpol, npol, rel, &fx, wNsqr);
+  wFirstSearch(A, x, mons, lpol, npol, rel, &fx, wNsqr, rVar(R));
   if (TEST_OPT_PROT) Print("// %e\n",fx);
   memcpy(x + 1, xopt + 1, n * sizeof(int));
@@ -148 +148 @@
   {
     x[i] *= 16;
-    wAdd(A, mons, i, x[i]);
-  }
-  wSecondSearch(A, x, lpol, npol, mons, rel, &fx, wNsqr);
+    wAdd(A, mons, i, x[i], rVar(R));
+  }
+  wSecondSearch(A, x, lpol, npol, mons, rel, &fx, wNsqr, rVar(R));
   if (TEST_OPT_PROT) Print("// %e\n",fx);
   if (fx >= eps)
@@ -166 +166 @@
 //      memset(degw, 0, mons * sizeof(int));
 //      for (i = n; i!=0; i--)
-//        wAdd(A, mons, i, x[i]);
+//        wAdd(A, mons, i, x[i], rVar(R));
 //      eps = wPrWeight(x, n);
 //      fx = (*wFunctional)(degw, lpol, npol, rel, eps);