Changeset 4b47563 in git

Timestamp:

Nov 21, 2014, 6:04:44 PM (9 years ago)

Author:

Yue Ren <ren@…>

Branches:

(u'spielwiese', 'a719bcf0b8dbc648b128303a49777a094b57592c')

Children:

bf83d38c96216c127968a607729c0b2aa4b88985

Parents:

e4c54031d2902cbf09cf0ab7914602044e166cc0

git-author:

Yue Ren <ren@mathematik.uni-kl.de>2014-11-21 18:04:44+01:00

git-committer:

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

Message:

chg: minor fixes, mainly cleanup

Location:

Singular/dyn_modules/gfanlib

Files:

• bbcone.cc (modified) (1 diff)
• tropicalStrategy.cc (modified) (3 diffs)
• tropicalStrategy.h (modified) (1 diff)
• tropicalTraversal.cc (modified) (2 diffs)
• tropicalVariety.cc (modified) (3 diffs)

Singular/dyn_modules/gfanlib/bbcone.cc

@@ -104 +104 @@
       delete zd;
     }
-    gfan::ZCone* zc = (gfan::ZCone*)r->Data();
-    newZc = new gfan::ZCone(*zc);
+    newZc = (gfan::ZCone*)r->CopyD();
   }
   else if (r->Typ()==INT_CMD)

Singular/dyn_modules/gfanlib/tropicalStrategy.cc

@@ -515 +515 @@
 }
 
-ideal tropicalStrategy::getStdOfInitialIdeal(const ideal inI, const ring r) const
-{
-  ideal inJ;
+ideal tropicalStrategy::computeStdOfInitialIdeal(const ideal inI, const ring r) const
+{
+  // if valuation trivial, then compute std as usual
   if (isValuationTrivial())
-    // if valuation trivial, then compute std as usual
-    inJ = gfanlib_kStd_wrapper(inI,r);
-  else
-  {
-    // if valuation non-trivial, then uniformizing parameter is in ideal
-    // so switch to residue field first and compute standard basis over the residue field
-    ring rShortcut = copyAndChangeCoefficientRing(r);
-    nMapFunc takingResidues = n_SetMap(r->cf,rShortcut->cf);
-    int k = idSize(inI);
-    ideal inIShortcut = idInit(k);
-    for (int i=0; i<k; i++)
-      inIShortcut->m[i] = p_PermPoly(inI->m[i],NULL,r,rShortcut,takingResidues,NULL,0);
-    ideal inJShortcut = gfanlib_kStd_wrapper(inIShortcut,rShortcut);
-
-    // and lift the result back to the ring with valuation
-    nMapFunc takingRepresentatives = n_SetMap(rShortcut->cf,r->cf);
-    k = idSize(inJShortcut);
-    inJ = idInit(k+1);
-    inJ->m[0] = p_One(r);
-    nMapFunc identity = n_SetMap(startingRing->cf,r->cf);
-    p_SetCoeff(inJ->m[0],identity(uniformizingParameter,startingRing->cf,r->cf),r);
-    for (int i=0; i<k; i++)
-      inJ->m[i+1] = p_PermPoly(inJShortcut->m[i],NULL,rShortcut,r,takingRepresentatives,NULL,0);
-
-    id_Delete(&inIShortcut,rShortcut);
-    rDelete(rShortcut);
-  }
+    return gfanlib_kStd_wrapper(inI,r);
+
+  // if valuation non-trivial, then uniformizing parameter is in ideal
+  // so switch to residue field first and compute standard basis over the residue field
+  ring rShortcut = copyAndChangeCoefficientRing(r);
+  nMapFunc takingResidues = n_SetMap(r->cf,rShortcut->cf);
+  int k = idSize(inI);
+  ideal inIShortcut = idInit(k);
+  for (int i=0; i<k; i++)
+    inIShortcut->m[i] = p_PermPoly(inI->m[i],NULL,r,rShortcut,takingResidues,NULL,0);
+  ideal inJShortcut = gfanlib_kStd_wrapper(inIShortcut,rShortcut);
+
+  // and lift the result back to the ring with valuation
+  nMapFunc takingRepresentatives = n_SetMap(rShortcut->cf,r->cf);
+  k = idSize(inJShortcut);
+  ideal inJ = idInit(k+1);
+  inJ->m[0] = p_One(r);
+  nMapFunc identity = n_SetMap(startingRing->cf,r->cf);
+  p_SetCoeff(inJ->m[0],identity(uniformizingParameter,startingRing->cf,r->cf),r);
+  for (int i=0; i<k; i++)
+    inJ->m[i+1] = p_PermPoly(inJShortcut->m[i],NULL,rShortcut,r,takingRepresentatives,NULL,0);
+
+  id_Delete(&inJShortcut,rShortcut);
+  id_Delete(&inIShortcut,rShortcut);
+  rDelete(rShortcut);
   return inJ;
 }
@@ -658 +656 @@
   ring sAdjusted = copyAndChangeOrderingWP(r,interiorPoint,facetNormal);
   nMapFunc identity = n_SetMap(r->cf,sAdjusted->cf);
-  int k = idSize(Ir); ideal inIsAdjusted = idInit(k);
+  int k = idSize(Ir);
+  ideal inIsAdjusted = idInit(k);
   for (int i=0; i<k; i++)
     inIsAdjusted->m[i] = p_PermPoly(inIr->m[i],NULL,r,sAdjusted,identity,NULL,0);
-  ideal inJsAdjusted = getStdOfInitialIdeal(inIsAdjusted,sAdjusted);
+  ideal inJsAdjusted = computeStdOfInitialIdeal(inIsAdjusted,sAdjusted);
 
   // find witnesses of the new standard basis elements of the initial ideal
@@ -680 +679 @@
   // this->reduce(Jr,r);
   // cleanup
+  id_Delete(&inIsAdjusted,sAdjusted);
   id_Delete(&inJsAdjusted,sAdjusted);
   rDelete(sAdjusted);
+  id_Delete(&inIr,r);
   id_Delete(&Jr,r);
   id_Delete(&inJr,r);

Singular/dyn_modules/gfanlib/tropicalStrategy.h

@@ -322 +322 @@
    * given generators of the initial ideal, computes its standard basis
    */
-  ideal getStdOfInitialIdeal(const ideal inI, const ring r) const;
+  ideal computeStdOfInitialIdeal(const ideal inI, const ring r) const;
 
   /**

Singular/dyn_modules/gfanlib/tropicalTraversal.cc

@@ -8 +8 @@
   while(!workingList.empty())
   {
-    std::cout << "starting traversal" << std::endl;
+    // std::cout << "starting traversal" << std::endl;
     const groebnerCone sigma=*(workingList.begin());
     const groebnerCones neighbours = sigma.tropicalNeighbours();
@@ -18 +18 @@
     tropicalVariety.insert(sigma);
     workingList.erase(sigma);
-    std::cout << "tropicalVariety.size():" << tropicalVariety.size() << std::endl;
-    std::cout << "workingList.size():" << workingList.size() << std::endl;
+    // std::cout << "tropicalVariety.size():" << tropicalVariety.size() << std::endl;
+    // std::cout << "workingList.size():" << workingList.size() << std::endl;
   }
   return tropicalVariety;

Singular/dyn_modules/gfanlib/tropicalVariety.cc

@@ -76 +76 @@
       if ((v!=NULL) && (v->Typ()==NUMBER_CMD))
       {
-        number p = (number) v->CopyD();
+        number p = (number) v->Data();
         tropicalStrategy currentStrategy(I,p,currRing);
         std::set<gfan::ZCone> maxCones = tropicalVariety(g,currRing,currentStrategy);
         res->rtyp = fanID;
         res->data = (char*) toZFan(maxCones);
-        id_Delete(&I,currRing);
-        n_Delete(&p,currRing->cf);
         return FALSE;
       }
@@ -90 +88 @@
     {
       setOptionRedSB();
+      ideal stdI;
       if (!hasFlag(u,FLAG_STD))
-      {
-        ideal stdI = gfanlib_kStd_wrapper(I,currRing);
-        id_Delete(&I,currRing);
-        I = stdI;
-      }
+        stdI = gfanlib_kStd_wrapper(I,currRing);
+      else
+        stdI = id_Copy(I,currRing);
       tropicalStrategy currentStrategy(I,currRing);
       gfan::ZFan* tropI = tropicalVariety(currentStrategy);
@@ -101 +98 @@
       res->data = (char*) tropI;
       undoSetOptionRedSB();
-      id_Delete(&I,currRing);
+      id_Delete(&stdI,currRing);
       return FALSE;
     }
     if ((v!=NULL) && (v->Typ()==NUMBER_CMD))
     {
-      number p = (number) v->CopyD();
+      number p = (number) v->Data();
+      ideal stdI;
       if (!hasFlag(u,FLAG_STD))
-      {
-        ideal stdI = gfanlib_kStd_wrapper(I,currRing);
-        id_Delete(&I,currRing);
-        I = stdI;
-      }
-      tropicalStrategy currentStrategy(I,p,currRing);
+        stdI = gfanlib_kStd_wrapper(I,currRing);
+      else
+        stdI = id_Copy(I,currRing);
+      tropicalStrategy currentStrategy(stdI,p,currRing);
       gfan::ZFan* tropI = tropicalVariety(currentStrategy);
       res->rtyp = fanID;
       res->data = (char*) tropI;
-      id_Delete(&I,currRing);
+      id_Delete(&stdI,currRing);
       return FALSE;
     }