Changeset 7cb467 in git

Timestamp:

Feb 5, 2015, 1:03:22 AM (9 years ago)

Author:

Yue Ren <ren@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

14168dd1bd4daa95e0d692cc9a107490c19d7c3f

Parents:

08b7c2ac6141d36536d3eb58dd62e9ad4be529da

git-author:

Yue Ren <ren@mathematik.uni-kl.de>2015-02-05 01:03:22+01:00

git-committer:

Yue Ren <ren@mathematik.uni-kl.de>2015-02-06 13:47:06+01:00

Message:

chg: improved weight adjusting algorithm

File:

• Singular/dyn_modules/gfanlib/adjustWeights.cc (modified) (1 diff)

Singular/dyn_modules/gfanlib/adjustWeights.cc

@@ -81 +81 @@
  * w containing only positive weights
  **/
-gfan::ZVector nonvalued_adjustWeightUnderHomogeneity(const gfan::ZVector &e, const gfan::ZVector &w)
+gfan::ZVector nonvalued_adjustWeightUnderHomogeneity(const gfan::ZVector &e, const gfan::ZVector &/*w*/)
 {
-  assume(checkForNonPositiveEntries(w));
-  /* find k such that e+k*w is strictly positive,
-   * i.e. k such that e[i]+k*w[i] is strictly positive
-   * for all i=0,...,n
-   * note that the division is rounded towards zero,
-   * hence we increment the value by 1 */
-  gfan::Integer k((long)0);
-  if (e[0].sign()<=0)
-    k = gfan::Integer((long)1)-(e[0]/w[0]);
+  /* since ideal is homogeneous, we can basically do the same as before */
+  gfan::Integer min=e[0];
   for (unsigned i=1; i<e.size(); i++)
-  {
-    if (e[i].sign()<=0)
-    {
-      gfan::Integer kk = gfan::Integer((long)1)-(e[i]/w[i]);
-      if (k<kk)
-        k = kk;
-    }
-  }
-  /* compute e+k*w, check it for correctness and return it */
-  gfan::ZVector v = e+k*w;
+    if (e[i]<min) min=e[i];
+
+  if (min.sign()>0)
+    return e;
+
+  /* compute w+(1-min)*(1,...,1) and return it */
+  gfan::ZVector v=gfan::ZVector(e.size());
+  for (unsigned i=0; i<e.size(); i++)
+    v[i]=e[i]-min+1;
   assume(checkForNonPositiveEntries(v));
   return v;