Changeset 5d68a6 in git

Timestamp:

Dec 17, 2008, 4:08:50 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

06babc58e0b2f4d1aa9531df0295f716578651d1

Parents:

aa5055c85d54ecfba96a8906de445fdb57edb98d

Message:

*hannes: factory conversion:GF


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

Location:

kernel

Files:

• clapconv.cc (modified) (5 diffs)
• clapsing.cc (modified) (3 diffs)
• ffields.cc (modified) (2 diffs)
• ffields.h (modified) (2 diffs)

kernel/clapconv.cc

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-// $Id: clapconv.cc,v 1.11 2008-04-08 16:59:53 Singular Exp $
+// $Id: clapconv.cc,v 1.12 2008-12-17 15:07:46 Singular Exp $
 /*
 * ABSTRACT: convert data between Singular and factory
@@ -22 +22 @@
 #include "ring.h"
 #include "sbuckets.h"
+#include "ffields.h"
+void out_cf(char *s1,const CanonicalForm &f,char *s2);
 
 static void convRec( const CanonicalForm & f, int * exp, poly & result );
@@ -625 +627 @@
 }
 
-#if 0
 CanonicalForm
 convSingGFFactoryGF( poly p )
 {
-  CanonicalForm result = 0;
+  CanonicalForm result=CanonicalForm(0);
   int e, n = pVariables;
 
@@ -635 +636 @@
   {
     CanonicalForm term;
-    term = make_cf_from_gf( pGetCoeff( p ) );
+    term = make_cf_from_gf( (int)(long)pGetCoeff( p ) );
+    //int * A=(int *)&term;
+    //Print("term=%x, == 0 ?: %d\n",*A, term.isZero());
     for ( int i = 1; i <= n; i++ )
     {
@@ -687 +690 @@
   }
 }
-#endif
 
 int convFactoryISingI( const CanonicalForm & f)

kernel/clapsing.cc

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-// $Id: clapsing.cc,v 1.31 2008-09-12 14:16:01 Singular Exp $
+// $Id: clapsing.cc,v 1.32 2008-12-17 15:08:50 Singular Exp $
 /*
 * ABSTRACT: interface between Singular and factory
@@ -17 +17 @@
 #include "numbers.h"
 #include "ring.h"
+#include "ffields.h"
 #include <factory.h>
 #include "clapconv.h"
@@ -554 +555 @@
     }
   }
+  #if 0 // not yet working
+  else if (rField_is_GF())
+  {
+    //Print("GF(%d^%d)\n",nfCharP,nfMinPoly[0]);
+    setCharacteristic( nfCharP,nfMinPoly[0], currRing->parameter[0][0] );
+    CanonicalForm F( convSingGFFactoryGF( f ) ), G( convSingGFFactoryGF( g ) );
+    res = convFactoryGFSingGF( F / G );
+  }
+  #endif
   else
     WerrorS( feNotImplemented );

kernel/ffields.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ffields.cc,v 1.9 2008-03-19 17:44:08 Singular Exp $ */
+/* $Id: ffields.cc,v 1.10 2008-12-17 15:07:46 Singular Exp $ */
 /*
 * ABSTRACT: finite fields with a none-prime number of elements (via tables)
@@ -18 +18 @@
 int nfCharQ=0;  /* the number of elemts: q*/
 int nfM1;       /*representation of -1*/
-static int nfCharP=0;  /* the characteristic: p*/
+int nfCharP=0;  /* the characteristic: p*/
 static int nfCharQ1=0; /* q-1 */
 CARDINAL *nfPlus1Table=NULL; /* the table i=log(z^i) -> log(z^i+1) */

kernel/ffields.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ffields.h,v 1.2 2008-03-19 17:44:08 Singular Exp $ */
+/* $Id: ffields.h,v 1.3 2008-12-17 15:07:46 Singular Exp $ */
 /*
 * ABSTRACT: finite fields with a none-prime number of elements (via tables)
@@ -38 +38 @@
 char *  nfName        (number n);
 extern  int nfMinPoly[];
+extern  int nfCharP;  /* the characteristic: p*/
+extern  int nfCharQ;  /* p^n = number of el. = repr. of 0 */
 void    nfShowMipo();
 #endif