Changeset 482844 in git

Timestamp:

Jul 3, 2000, 12:22:17 PM (24 years ago)

Author:

Wilfred Pohl <pohl@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

6361e617ac5bc0e47f935d3e88a540e628f89111

Parents:

db65122f57a5f541c93a6f282e5baf4881b09dca

Message:

bug fix from Hans (hospital)


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

Location:

Singular

Files:

• clapconv.cc (modified) (10 diffs)
• clapsing.cc (modified) (3 diffs)
• longrat.cc (modified) (2 diffs)
• longrat.h (modified) (2 diffs)
• subexpr.cc (modified) (2 diffs)

Singular/clapconv.cc

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-// $Id: clapconv.cc,v 1.24 2000-06-02 07:46:57 Singular Exp $
+// $Id: clapconv.cc,v 1.25 2000-07-03 10:22:17 pohl Exp $
 /*
 * ABSTRACT: convert data between Singular and factory
@@ -44 +44 @@
   CanonicalForm result = 0;
   int e, n = pVariables;
+  assume( rPar(currRing)==0);
 
   while ( p != NULL )
@@ -311 +312 @@
   CanonicalForm result = 0;
   int e, n = pVariables;
+  int off=rPar(currRing);
 
   On(SW_RATIONAL);
@@ -319 +321 @@
     {
       if ( (e = pGetExp( p, i )) != 0 )
-        term *= power( Variable( i+1 ), e );
+        term *= power( Variable( i + off), e );
     }
     result += term;
@@ -329 +331 @@
 poly convClapAPSingAP ( const CanonicalForm & f )
 {
-  int n = pVariables+1+1 /* =rPar(currRing)*/;
-  /* ASSERT( level( f ) <= pVariables, "illegal number of variables" ); */
+  int n = pVariables+1+1/*rPar(currRing)*/;
   int * exp = new int[n];
   // for ( int i = 0; i < n; i++ ) exp[i] = 0;
@@ -345 +346 @@
   if (f == 0)
     return;
+  int off=rPar(currRing);
   if ( ! f.inCoeffDomain() )
   {
     int l = f.level();
-    if (l==1) PrintS("f.inCoeffDomain()=FALSE and level=1 ?\n");
     for ( CFIterator i = f; i.hasTerms(); i++ )
     {
-      exp[l-1] = i.exp();
+      exp[l] = i.exp();
       convRecAP( i.coeff(), exp, result );
     }
-    exp[l-1] = 0;
+    exp[l] = 0;
   }
   else
@@ -363 +364 @@
       poly term = pInit();
       pNext( term ) = NULL;
-      for ( int i = 1; i <= pVariables; i++ )
-        pSetExp( term, i , exp[i]);
+      int i;
+      for ( i = 1; i <= pVariables; i++ )
+        pSetExp( term, i , exp[i+off]);
       pSetComp(term, 0);
+      for ( i = 0; i < off; i++ )
+        z->e[i]+=exp[i+1];
       pGetCoeff(term)=(number)Alloc0SizeOf(rnumber);
       ((lnumber)pGetCoeff(term))->z=z;
@@ -382 +386 @@
   {
     CanonicalForm term;
-    /* does only work for finite fields */
-    if ( getCharacteristic() != 0 )
+    /* does only work for finite fields:Z/p */
+    if ( rField_is_Zp_a() )
     {
       Off(SW_USE_EZGCD);
@@ -394 +398 @@
       //&&  ( napGetCoeff( p )->s == 0))
       //  naNormalize( naGetCoeff( p ) );
-      if ( (int)(napGetCoeff( p )) & 1 )
+      if ( (int)(napGetCoeff( p )) & SR_INT )
         term = nlInt( napGetCoeff( p ) );
+        //term = SR_TO_INT(napGetCoeff( p )) ;
       else
       {
@@ -503 +508 @@
 {
   int n = pVariables+1;
-  /* ASSERT( level( f ) <= pVariables, "illegal number of variables" ); */
   int * exp = new int[n];
   // for ( int i = 0; i < n; i++ ) exp[i] = 0;

Singular/clapsing.cc

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-// $Id: clapsing.cc,v 1.67 2000-06-14 07:29:59 Singular Exp $
+// $Id: clapsing.cc,v 1.68 2000-07-03 10:22:17 pohl Exp $
 /*
 * ABSTRACT: interface between Singular and factory
@@ -133 +133 @@
   StringSetS( tag ); \
   napWrite( f ); \
-  PrintS(StringAppendS("\n"));
+  pRINtS(StringAppendS("\n"));
 // CanonicalForm f, represents transcendent extension
 #define FACTORY_CFTROUT_POLY( tag, f ) \
@@ -294 +294 @@
     if (currRing->minpoly!=NULL)
     {
-      Variable X(i+rPar(currRing));
+      Variable X(i);
       CanonicalForm mipo=convSingTrClapP(((lnumber)currRing->minpoly)->z);
       Variable a=rootOf(mipo);

Singular/longrat.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: longrat.cc,v 1.28 2000-05-02 14:55:41 Singular Exp $ */
+/* $Id: longrat.cc,v 1.29 2000-07-03 10:21:20 pohl Exp $ */
 /*
 * ABSTRACT: computation with long rational numbers (Hubert Grassmann)
@@ -106 +106 @@
 /*#define SR_INT    1*/
 /*#define INT_TO_SR(INT)  ((number) (((long)INT << 2) + SR_INT))*/
-#define SR_TO_INT(SR)   (((long)SR) >> 2)
+// #define SR_TO_INT(SR)   (((long)SR) >> 2)
 
 #define MP_SMALL 1

Singular/longrat.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: longrat.h,v 1.15 1999-11-15 17:20:20 obachman Exp $ */
+/* $Id: longrat.h,v 1.16 2000-07-03 10:21:21 pohl Exp $ */
 /*
 * ABSTRACT: computation with long rational numbers
@@ -30 +30 @@
 #define SR_INT    1
 #define INT_TO_SR(INT)  ((number) (((long)INT << 2) + SR_INT))
+#define SR_TO_INT(SR)   (((long)SR) >> 2)
+
 
 #define MP_SMALL 1

Singular/subexpr.cc

@@ -5 +5 @@
 * ABSTRACT: handling of leftv
 */
-/* $Id: subexpr.cc,v 1.56 2000-04-27 10:07:11 obachman Exp $ */
+/* $Id: subexpr.cc,v 1.57 2000-07-03 10:21:21 pohl Exp $ */
 
 #include <stdlib.h>
@@ -978 +978 @@
   if (rtyp == IDHDL)
   {
-    (void*) IDDATA((idhdl)data) = what;
+    IDDATA((idhdl)data) = (char *)what;
   }
   else