Changeset 61197f in git

Timestamp:

Oct 29, 2009, 4:55:50 PM (14 years ago)

Author:

Martin Monerjan

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '00e2e9c41af3fde1273eb3633f4c0c7c3db2579d')

Children:

3b9cf64cc4481c348f8e1d222c5e90f75390d920

Parents:

7d60f7ef29be846d8ebb02dd71d5c04294bc7831

Message:

gfan parameters


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

File:

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

Singular/extra.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR      *
 *****************************************/
-/* $Id: extra.cc,v 1.327 2009-10-21 15:36:00 seelisch Exp $ */
+/* $Id: extra.cc,v 1.328 2009-10-29 15:55:50 monerjan Exp $ */
 /*
 * ABSTRACT: general interface to internals of Singular ("system" command)
@@ -3476 +3476 @@
 /*======== GFAN ==============*/
 /*
-WILL HAVE TO CHANGE RETURN TYPE TO LIST_CMD
+ WILL HAVE TO CHANGE RETURN TYPE TO LIST_CMD
 */
 if (strcmp(sys_cmd,"gfan")==0)
 {
-        if ((h==NULL) || (h!=NULL && h->Typ()!=IDEAL_CMD))
-        {
-                Werror("system(\"gfan\"...) Ideal expected");
-                return TRUE; //Ooooops
-        }
-ideal I=((ideal)h->Data());
-res->rtyp=IDEAL_CMD;
-res->data=(ideal) gfan(I);
+//         if ((h==NULL) || (h!=NULL && h->Typ()!=IDEAL_CMD))
+//         {
+//                 Werror("system(\"gfan\"...) Ideal expected");
+//                 return TRUE; //Ooooops
+//         }
+//      else if(h->next==NULL)
+//      {
+//              Werror("gfan expects an integer parameter");
+//              return TRUE;
+//      }
+//      else if(h->next!=NULL && h->next->Typ()!=INT_CMD)
+//      {
+//              Werror("1st parameter ist no integer");
+//              return TRUE;
+//      }
+        /*
+        heuristic:
+          0 = keep all Gröbner bases in memory
+          1 = write all Gröbner bases to disk and read whenever necessary
+          2 = use a mixed heuristic, based on length of Gröbner bases
+        */
+          if( h!=NULL && h->Typ()==IDEAL_CMD && h->next!=NULL && h->next->Typ()==INT_CMD)
+          {
+                  int heuristic;
+                  heuristic=(int)(long)h->next->Data();
+                  ideal I=((ideal)h->Data());
+                  res->rtyp=IDEAL_CMD;
+                  res->data=(ideal) gfan(I,heuristic);
+                  return FALSE;
+          }
+          else
+          {
+                  WerrorS("Usage: system(\"gfan\",I,int)");
+                  return TRUE;
+          }
 //res->rtyp=LIST_CMD;
 //res->data= ???
 
-return FALSE; //Everything went fine
+// return FALSE; //Everything went fine
 }
 else