Changeset 1d85871 in git for Singular/dyn_modules/gfanlib/tropicalStrategy.cc

Timestamp:

Feb 18, 2015, 9:41:53 AM (9 years ago)

Author:

Yue Ren <ren@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

9f7a9cd448041b035d092b0dcf11b4d5f14ac002

Parents:

4a6847d88eb8e6f833551e2a34563ba917cb5c52

Message:

new: functions for groebnerFans, groebnerComplexes

File:

• Singular/dyn_modules/gfanlib/tropicalStrategy.cc (modified) (3 diffs)

Singular/dyn_modules/gfanlib/tropicalStrategy.cc

@@ -134 +134 @@
   extraReductionAlgorithm(noExtraReduction)
 {
-  assume(rField_is_Q(r) || rField_is_Zp(r));
+  assume(rField_is_Q(r) || rField_is_Zp(r) || rField_is_Ring_Z(r));
   if (!completelyHomogeneous)
   {
@@ -225 +225 @@
   omFreeSize(shiftByOne,(n+1)*sizeof(int));
 
-  // ring origin = currRing;
-  // rChangeCurrRing(startingRing);
-  // ideal startingIdeal = kNF(pt,startingRing->qideal,J);
-  // rChangeCurrRing(origin);
-  ideal startingIdeal = J; J = NULL;
+  ring origin = currRing;
+  rChangeCurrRing(startingRing);
+  ideal startingIdeal = kNF(pt,startingRing->qideal,J); // mathematically redundant,
+  rChangeCurrRing(origin);                              // but helps with upcoming std computation
+  // ideal startingIdeal = J; J = NULL;
   assume(startingIdeal->m[k]==NULL);
   startingIdeal->m[k] = pt->m[0];
@@ -271 +271 @@
   /* map the input ideal into the new polynomial ring */
   startingIdeal = constructStartingIdeal(J,s,uniformizingParameter,startingRing);
+  reduce(startingIdeal,startingRing);
 
   linealitySpace = homogeneitySpace(startingIdeal,startingRing);