Changeset 8838ab in git

Timestamp:

Jun 15, 1999, 10:34:18 AM (24 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

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

Children:

df4422b2fdaedca7c8e3cbd827167ed22d5024c7

Parents:

3c8e50bcc6eb720109f4b83d71567c36d48d8ae1

Message:

*hannes: GF-conversion


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

Files:

• Singular/clapconv.h (modified) (2 diffs)
• Singular/clapsing.cc (modified) (4 diffs)
• Singular/extra.cc (modified) (2 diffs)
• factory/singext.cc (modified) (3 diffs)
• factory/singext.h (modified) (2 diffs)

Singular/clapconv.h

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-// $Id: clapconv.h,v 1.6 1998-12-16 18:43:35 Singular Exp $
+// $Id: clapconv.h,v 1.7 1999-06-15 08:33:13 Singular Exp $
 /*
 * ABSTRACT: convert data between Singular and factory
@@ -25 +25 @@
 poly convClapAPSingAP ( const CanonicalForm & f );
 
-CanonicalForm convSingGFClapGF ( poly p , const Variable & a );
+CanonicalForm convSingGFClapGF ( poly p );
 poly convClapGFSingGF ( const CanonicalForm & f );
 

Singular/clapsing.cc

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-// $Id: clapsing.cc,v 1.51 1999-06-14 16:25:42 Singular Exp $
+// $Id: clapsing.cc,v 1.52 1999-06-15 08:32:31 Singular Exp $
 /*
 * ABSTRACT: interface between Singular and factory
@@ -683 +683 @@
     }
   }
+  #if 0
   else if (rField_is_GF())
   {
@@ -697 +698 @@
     }
   }
+  #endif
   // and over Q(a) / Fp(a)
   else if (rField_is_Extension())
@@ -775 +777 @@
       if (rField_is_Zp() || rField_is_Q())           /* Q, Fp */
         res->m[j] = convClapPSingP( J.getItem().factor() );
+      #if 0
       else if (rField_is_GF())
         res->m[j] = convClapGFSingGF( J.getItem().factor() );
+      #endif
       else if (rField_is_Extension())     /* Q(a), Fp(a) */
       {

Singular/extra.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR      *
 *****************************************/
-/* $Id: extra.cc,v 1.92 1999-06-09 11:53:42 mschulze Exp $ */
+/* $Id: extra.cc,v 1.93 1999-06-15 08:29:23 Singular Exp $ */
 /*
 * ABSTRACT: general interface to internals of Singular ("system" command)
@@ -1000 +1000 @@
     else
 #endif
+/*==================== GF =================*/
+#if 0
+    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;
+    }
+    else
+#endif
 /*============================================================*/
       Werror( "system(\"%s\",...) %s", sys_cmd, feNotImplemented );

factory/singext.cc

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: singext.cc,v 1.2 1997-06-19 12:21:59 schmidt Exp $ */
+/* $Id: singext.cc,v 1.3 1999-06-15 08:34:18 Singular Exp $ */
 
 #include <config.h>
@@ -54 +54 @@
 }
 
+int gf_value (const CanonicalForm & f )
+{
+    InternalCF * ff = f.getval();
+    return ((int)ff) >>2; 
+}
+
 CanonicalForm
 make_cf ( const MP_INT & n )
@@ -65 +71 @@
     return CanonicalForm( CFFactory::rational( n, d, normalize ) );
 }
+
+CanonicalForm make_cf_from_gf ( const int z )
+{
+    return CanonicalForm(int2imm_gf(z));
+}

factory/singext.h

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: singext.h,v 1.5 1998-06-08 15:40:54 schmidt Exp $ */
+/* $Id: singext.h,v 1.6 1999-06-15 08:34:02 Singular Exp $ */
 
 #ifndef INCL_SINGEXT_H
@@ -26 +26 @@
 MP_INT gmp_denominator ( const CanonicalForm & f );
 
+int gf_value (const CanonicalForm & f );
+
 CanonicalForm make_cf ( const MP_INT & n );
 
 CanonicalForm make_cf ( const MP_INT & n, const MP_INT & d, bool normalize );
 
+CanonicalForm make_cf_from_gf ( const int z );
+
 /*ENDPUBLIC*/