Changeset e4c540 in git

Timestamp:

Nov 21, 2014, 4:30:01 PM (9 years ago)

Author:

Yue Ren <ren@…>

Branches:

(u'spielwiese', 'a719bcf0b8dbc648b128303a49777a094b57592c')

Children:

4b47563a73afa1ce8193b66caba4ddd88af4f706

Parents:

c9641474cc5811d6eed949bf4509b30db0cbb721

git-author:

Yue Ren <ren@mathematik.uni-kl.de>2014-11-21 16:30:01+01:00

git-committer:

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

Message:

chg: status update for Sebastian

Location:

Singular/dyn_modules/gfanlib

Files:

• bbfan.cc (modified) (1 diff)
• tropicalVariety.cc (modified) (3 diffs)

Singular/dyn_modules/gfanlib/bbfan.cc

@@ -85 +85 @@
       delete zd;
     }
-    gfan::ZFan* zf = (gfan::ZFan*) r->Data();
-    newZf = new gfan::ZFan(*zf);
+    newZf = (gfan::ZFan*) r->CopyD();
   }
   else if (r->Typ()==INT_CMD)

Singular/dyn_modules/gfanlib/tropicalVariety.cc

@@ -47 +47 @@
   if ((u!=NULL) && (u->Typ()==IDEAL_CMD))
   {
-    ideal I = (ideal) u->CopyD();
+    ideal I = (ideal) u->Data();
     leftv v = u->next;
 
@@ -57 +57 @@
         tropicalStrategy currentStrategy(I,currRing);
         std::set<gfan::ZCone> maxCones = tropicalVariety(g,currRing,currentStrategy);
+        // gfan::ZFan* zf = toZFan(maxCones);
+        // delete zf;
+        // res->rtyp = NONE;
+        // res->data = NULL;
         // while (1)
         // {
@@ -68 +72 @@
         res->rtyp = fanID;
         res->data = (char*) toZFan(maxCones);
-        id_Delete(&I,currRing);
         return FALSE;
       }