Changeset 6aacb6 in git for kernel/weight.cc

Timestamp:

Apr 4, 2007, 4:13:31 PM (17 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

d2891e1d3947c09a85c4a63722c29bab5d5db606

Parents:

96dff7b28aa80d21e3cbe5afdbe9afcad5004cb0

Message:

*hannes: global wNsqr removed


git-svn-id: file:///usr/local/Singular/svn/trunk@9970 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• kernel/weight.cc (modified) (7 diffs)

kernel/weight.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: weight.cc,v 1.3 2006-06-16 17:17:14 Singular Exp $ */
+/* $Id: weight.cc,v 1.4 2007-04-04 14:13:31 Singular Exp $ */
 
 /*
@@ -20 +20 @@
 /*0 implementation*/
 extern "C" double (*wFunctional)(int *degw, int *lpol, int npol,
-       double *rel, double wx);
+       double *rel, double wx, double wNsqr);
 extern "C" double wFunctionalMora(int *degw, int *lpol, int npol,
-       double *rel, double wx);
+       double *rel, double wx, double wNsqr);
 extern "C" double wFunctionalBuch(int *degw, int *lpol, int npol,
-       double *rel, double wx);
+       double *rel, double wx, double wNsqr);
 extern "C" void wAdd(int *A, int mons, int kn, int xx);
 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);
+        int *lpol, int npol, double *rel, double *fopt, double wNsqr);
 extern "C" void wSecondSearch(int *A, int *x, int *lpol,
-        int npol, int mons, double *rel, double *fk);
+        int npol, int mons, double *rel, double *fk, double wNsqr);
 extern "C" void wGcd(int *x, int n);
-extern double wNsqr;
 
 static void wDimensions(polyset s, int sl, int *lpol, int *npol, int *mons)
@@ -108 +107 @@
 }
 
-void wCall(polyset s, int sl, int *x)
+void wCall(polyset s, int sl, int *x, double wNsqr)
 {
   int  n, q, npol, mons, i;
@@ -136 +135 @@
     wAdd(A, mons, i, 1);
   wNorm(degw, lpol, npol, rel);
-  f1 = (*wFunctional)(degw, lpol, npol, rel, (double)1.0);
+  f1 = (*wFunctional)(degw, lpol, npol, rel, (double)1.0, wNsqr);
   if (TEST_OPT_PROT) Print("// %e\n",f1);
   eps = f1;
   fx = (double)2.0 * eps;
   memset(x, 0, (n + 1) * sizeof(int));
-  wFirstSearch(A, x, mons, lpol, npol, rel, &fx);
+  wFirstSearch(A, x, mons, lpol, npol, rel, &fx, wNsqr);
   if (TEST_OPT_PROT) Print("// %e\n",fx);
   memcpy(x + 1, xopt + 1, n * sizeof(int));
@@ -150 +149 @@
     wAdd(A, mons, i, x[i]);
   }
-  wSecondSearch(A, x, lpol, npol, mons, rel, &fx);
+  wSecondSearch(A, x, lpol, npol, mons, rel, &fx, wNsqr);
   if (TEST_OPT_PROT) Print("// %e\n",fx);
   if (fx >= eps)
@@ -189 +188 @@
   *eweight = 0;
   n = pVariables;
-  wNsqr = (double)2.0 / (double)n;
   if (pOrdSgn == -1)
     wFunctional = wFunctionalMora;
@@ -195 +193 @@
     wFunctional = wFunctionalBuch;
   x = (int * )omAlloc(2 * (n + 1) * sizeof(int));
-  wCall(s, sl, x);
+  wCall(s, sl, x, (double)2.0 / (double)n);
   for (i = n; i!=0; i--)
     eweight[i] = x[i + n + 1];