Changeset 5d68a6 in git for kernel/clapconv.cc

Timestamp:

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

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

06babc58e0b2f4d1aa9531df0295f716578651d1

Parents:

aa5055c85d54ecfba96a8906de445fdb57edb98d

Message:

*hannes: factory conversion:GF


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

File:

• kernel/clapconv.cc (modified) (5 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)