Changeset 06babc in git

Timestamp:

Dec 17, 2008, 4:10:37 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

c13fbe98a2d05c35998930d431996de46717415f

Parents:

5d68a6461c92be4d1e47a759b7bafae1be5ffb12

Message:

*hannes: GF test


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

File:

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

Singular/extra.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR      *
 *****************************************/
-/* $Id: extra.cc,v 1.285 2008-11-13 14:06:07 Singular Exp $ */
+/* $Id: extra.cc,v 1.286 2008-12-17 15:10:37 Singular Exp $ */
 /*
 * ABSTRACT: general interface to internals of Singular ("system" command)
@@ -54 +54 @@
 #include "prCopy.h"
 #include "mpr_complex.h"
+#include "ffields.h" // test GF only
 
 #ifdef HAVE_RINGS
@@ -2319 +2320 @@
 #endif
 /*==================== GF =================*/
-#if 0
+#if 0 // for testing only
     if (strcmp(sys_cmd, "GF") == 0)
     {
-      int c=rChar(currRing);
-      setCharacteristic( c, 2);
-      CanonicalForm F( convSingGFClapGF( (poly)h->Data() ) );
-      res->rtyp=POLY_CMD;
-      res->data=convClapGFSingGF( F );
-      return FALSE;
+      if ((h!=NULL) && (h->Typ()==POLY_CMD))
+      {
+        int c=rChar(currRing);
+        setCharacteristic( c,nfMinPoly[0], currRing->parameter[0][0] );
+        CanonicalForm F( convSingGFFactoryGF( (poly)h->Data() ) );
+        res->rtyp=POLY_CMD;
+        res->data=convFactoryGFSingGF( F );
+        return FALSE;
+      }
+      else { Werror("wrong typ"); return TRUE;}
     }
     else