Changeset ff48aa in git for Singular/dyn_modules/gfanlib/tropicalCurves.cc

Timestamp:

Jan 31, 2015, 11:44:20 AM (9 years ago)

Author:

Yue Ren <ren@…>

Branches:

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

Children:

5510099a60c7cd4cb8ef47b8e583ed11e4b4ffe3

Parents:

08749da88db85345212e694597d458072913a9c5

git-author:

Yue Ren <ren@mathematik.uni-kl.de>2015-01-31 11:44:20+01:00

git-committer:

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

Message:

chg: timing tests begin

File:

• Singular/dyn_modules/gfanlib/tropicalCurves.cc (modified) (7 diffs)

Singular/dyn_modules/gfanlib/tropicalCurves.cc

@@ -131 +131 @@
    * If all initial ideals are monomial free, then we have our tropical curve */
   // gfan::ZFan* zf = toFanStar(C);
-  // std::cout << zf->toString();
+  // std::cout << zf->toString(2+4+8+128) << std::endl;
   // delete zf;
   for (std::set<gfan::ZCone>::iterator zc=C.begin(); zc!=C.end();)
@@ -137 +137 @@
     gfan::ZVector w = zc->getRelativeInteriorPoint();
     gfan::ZMatrix W = zc->generatorsOfSpan();
+    // std::cout << zc->extremeRays() << std::endl;
 
     ring s = genericlyWeightedOrdering(r,u,w,W,currentStrategy);
@@ -148 +149 @@
 
     poly mons = currentStrategy.checkInitialIdealForMonomial(ininIs,s,w);
-    // poly mons = checkForMonomialViaSuddenSaturation(ininIs,s);
     if (mons)
     {
+      // std::cout << "computing witness in tropical star!" << std::endl;
       poly gs = witness(mons,inIsSTD,ininIs,s);
       C = intersect(C,tropicalVariety(gs,s,currentStrategy),d);
@@ -161 +162 @@
       zc = C.begin();
       // gfan::ZFan* zf = toFanStar(C);
-      // std::cout << zf->toString();
+      // std::cout << zf->toString(2+4+8+128) << std::endl;
       // delete zf;
       id_Delete(&inIs,s);
@@ -170 +171 @@
     else
     {
-      gfan::ZVector wNeg = -w;
+      id_Delete(&inIs,s);
+      id_Delete(&inIsSTD,s);
+      id_Delete(&ininIs,s);
+      rDelete(s);
+
+      gfan::ZVector wNeg = currentStrategy.negateWeight(w);
       if (zc->contains(wNeg))
       {
@@ -183 +189 @@
 
         mons = currentStrategy.checkInitialIdealForMonomial(ininIs,s,wNeg);
-        // mons = checkForMonomialViaSuddenSaturation(ininIs,s);
         if (mons)
         {
@@ -217 +222 @@
 {
   std::set<gfan::ZCone> C = tropicalStar(I,r,u,currentStrategy);
-  gfan::ZFan* zf = toFanStar(C);
+  // gfan::ZFan* zf = toFanStar(C);
   // std::cout << zf->toString();
-  delete zf;
+  // delete zf;
   gfan::ZMatrix raysOfC(0,u.size());
   if (!currentStrategy.restrictToLowerHalfSpace())