Changeset 9a038bd in git

Timestamp:

Mar 17, 2011, 5:32:58 PM (12 years ago)

Author:

Martin Monerjan

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

4199b35cfc53b9be00ef55a9d8750f9f784d4254

Parents:

2ab4af50ab6c7100bb04b9bf33d43dc7ea86a33d

Message:

HAVE_GFAN is now HAVE_FANS
grfan returns gfan::ZFan


git-svn-id: file:///usr/local/Singular/svn/trunk@14010 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• Singular/extra.cc (modified) (4 diffs)

Singular/extra.cc

@@ -62 +62 @@
 #endif
 
-#ifdef HAVE_GFAN
+#ifdef HAVE_FANS
 #include <kernel/gfan.h>
+#include <gfanlib/gfanlib.h>
 #endif
 
@@ -3656 +3657 @@
   #endif
 
-#ifdef HAVE_GFAN
+#ifdef HAVE_FANS
   /*======== GFAN ==============*/
   /*
@@ -3674 +3675 @@
       heuristic=(int)(long)h->next->Data();
       ideal I=((ideal)h->Data());
-      res->rtyp=LIST_CMD;
-      res->data=(lists) gfan(I,heuristic,FALSE);
+      #ifndef USE_ZFAN
+        #define USE_ZFAN    
+      #endif
+      #ifndef USE_ZFAN
+        res->rtyp=LIST_CMD; //res->rtyp=coneID; res->data(char*)zcone;
+        res->data=(lists) grfan(I,heuristic,FALSE);
+      #else
+        extern int fanID;
+        res->rtyp=fanID;
+        res->data=(void*)(grfan(I,heuristic,FALSE));
+      #endif
       return FALSE;
     }
@@ -3686 +3696 @@
   //Possibility to have only one Gröbner cone computed by specifying a weight vector FROM THE RELATIVE INTERIOR!
   //Needs wp as ordering!
-  if(strcmp(sys_cmd,"grcone")==0)
-  {
-    if(h!=NULL && h->Typ()==IDEAL_CMD && h->next!=NULL && h->next->Typ()==INT_CMD)
-    {
-      ideal I=((ideal)h->Data());
-      res->rtyp=LIST_CMD;
-      res->data=(lists)grcone_by_intvec(I);
-    }
-  }
+//   if(strcmp(sys_cmd,"grcone")==0)
+//   {
+//     if(h!=NULL && h->Typ()==IDEAL_CMD && h->next!=NULL && h->next->Typ()==INT_CMD)
+//     {
+//       ideal I=((ideal)h->Data());
+//       res->rtyp=LIST_CMD;
+//       res->data=(lists)grcone_by_intvec(I);
+//     }
+//   }
   else
 #endif