Changeset 4874de3 in git for Singular

Timestamp:

Sep 25, 2016, 10:48:16 AM (8 years ago)

Author:

Yue <ren@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

20455fdc150eb77793fd10243cafe4e9dba71407

Parents:

c240db58915f633fce3013f72a3b9824f231e6ed

git-author:

Yue <ren@mathematik.uni-kl.de>2016-09-25 10:48:16+02:00

git-committer:

Yue <ren@mathematik.uni-kl.de>2016-09-27 07:29:55+02:00

Message:

chg: uniformizing ring orderings (wp -> a + lp)

File:

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

Singular/dyn_modules/gfanlib/flip.cc

@@ -49 +49 @@
   int n = rVar(sAdjusted);
   deleteOrdering(sAdjusted);
-  sAdjusted->order = (int*) omAlloc0(4*sizeof(int));
-  sAdjusted->block0 = (int*) omAlloc0(4*sizeof(int));
-  sAdjusted->block1 = (int*) omAlloc0(4*sizeof(int));
-  sAdjusted->wvhdl = (int**) omAlloc0(4*sizeof(int**));
+  sAdjusted->order = (int*) omAlloc0(5*sizeof(int));
+  sAdjusted->block0 = (int*) omAlloc0(5*sizeof(int));
+  sAdjusted->block1 = (int*) omAlloc0(5*sizeof(int));
+  sAdjusted->wvhdl = (int**) omAlloc0(5*sizeof(int**));
   sAdjusted->order[0] = ringorder_a;
   sAdjusted->block0[0] = 1;
   sAdjusted->block1[0] = n;
   sAdjusted->wvhdl[0] = ZVectorToIntStar(adjustedInteriorPoint,ok);
-  sAdjusted->order[1] = ringorder_wp;
+  sAdjusted->order[1] = ringorder_a;
   sAdjusted->block0[1] = 1;
   sAdjusted->block1[1] = n;
   sAdjusted->wvhdl[1] = ZVectorToIntStar(adjustedFacetNormal,ok);
-  sAdjusted->order[2] = ringorder_C;
+  sAdjusted->order[2] = ringorder_lp;
+  sAdjusted->block0[2] = 1;
+  sAdjusted->block1[2] = n;
+  sAdjusted->wvhdl[2] = ZVectorToIntStar(adjustedFacetNormal,ok);
+  sAdjusted->order[3] = ringorder_C;
   rComplete(sAdjusted);
   rTest(sAdjusted);