Changeset 0e64fdd in git

Timestamp:

Jun 11, 1999, 7:13:40 PM (24 years ago)

Author:

Mathias Schulze <mschulze@…>

Branches:

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

Children:

74fe50d0de12691ddaa37a4a8527e5e220253ab8

Parents:

32820ddece73298afa8bef909edd914a3d0b8c3f

Message:

*** empty log message ***


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

Location:

Singular

Files:

• mod2.h.in (modified) (1 diff)
• pcv.cc (modified) (4 diffs)
• pcv.h (modified) (2 diffs)

Singular/mod2.h.in

@@ -227 +227 @@
 #if SIZEOF_EXPONENT == 1
 #define MAX_EXPONENT 0x7f
-#define MAX_COMPONENT 0xff
+#define MAX_COMPONENT 0x7f
 #elif SIZEOF_EXPONENT == 2
-#define MAX_EXPONENT 0xffff
-#define MAX_COMPONENT 0xff
+#define MAX_EXPONENT 0x7fff
+#define MAX_COMPONENT 0x7fff
 #else /* SIZEOF_EXPONENT == 4 */
 #define MAX_EXPONENT 0x7fffffff
-#define MAX_COMPONENT 0xffffffff
+#define MAX_COMPONENT 0x7fffffff
 #endif
 

Singular/pcv.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR      *
 *****************************************/
-/* $Id: pcv.cc,v 1.24 1999-06-11 14:45:29 Singular Exp $ */
+/* $Id: pcv.cc,v 1.25 1999-06-11 17:13:40 mschulze Exp $ */
 /*
 * ABSTRACT: conversion between polys and coef vectors
@@ -174 +174 @@
   for(int i=0;i<pcvMaxDegree;i++)
     pcvIndex[0][i]=i;
+  unsigned k,l;
   for(int i=1;i<pVariables;i++)
   {
-    unsigned x=0;
+    k=0;
     for(int j=0;j<pcvMaxDegree;j++)
     {
-      unsigned y=pcvIndex[i-1][j];
-      if(y>(unsigned)~0-x)
+      l=pcvIndex[i-1][j];
+      if(l>unsigned(~0)-k)
       {
         j=pcvMaxDegree;
@@ -186 +187 @@
         WerrorS("unsigned overflow");
       }
-      pcvIndex[i][j]=x+=y;
+      else pcvIndex[i][j]=k+=l;
     }
   }
@@ -207 +208 @@
 int pcvM2N(poly m)
 {
-  unsigned n=0,d=0;
+  unsigned n=0,dn,d=0;
   for(int i=0;i<pVariables;i++)
   {
     d+=pGetExp(m,i+1);
-    n+=pcvIndex[i][d];
+    dn=pcvIndex[i][d];
+    if(dn>MAX_COMPONENT-n)
+    {
+      i=pVariables;
+      WerrorS("component overflow");
+    }
+    else n+=dn;
   }
   return n+1;

Singular/pcv.h

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: pcv.h,v 1.12 1999-06-09 11:53:06 mschulze Exp $ */
+/* $Id: pcv.h,v 1.13 1999-06-11 17:13:33 mschulze Exp $ */
 /*
 * ABSTRACT: conversion between polys and coef vectors
@@ -20 +20 @@
 void pcvInit(int d);
 void pcvClean();
+int pcvM2N(poly m);
+poly pcvN2M(int n);
 poly pcvP2CV(poly p,int d0,int d1);
 poly pcvCV2P(poly cv,int d0,int d1);