Changeset 6133f6e in git for kernel

Timestamp:

Jun 24, 2022, 1:54:59 PM (22 months ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

8ec24eb2c30b2bb3584117f9e2f0768e4b7f6ea1

Parents:

306b2992d264f1dd1853f31ef0f93800fc2cc119

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2022-06-24 13:54:59+02:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2022-06-24 14:05:22+02:00

Message:

scMult0Int: 64bit

Location:

kernel/combinatorics

Files:

• hdegree.cc (modified) (7 diffs)
• hutil.h (modified) (1 diff)
• stairc.h (modified) (1 diff)

kernel/combinatorics/hdegree.cc

@@ -25 +25 @@
 #endif
 
-VAR int  hCo, hMu, hMu2;
+VAR int  hCo, hMu2;
+VAR long hMu;
 VAR omBin indlist_bin = omGetSpecBin(sizeof(indlist));
 
@@ -618 +619 @@
 // multiplicity
 
-static int hZeroMult(scmon pure, scfmon stc, int Nstc, varset var, int Nvar)
-{
-  int  iv = Nvar -1, sum, a, a0, a1, b, i;
+static long hZeroMult(scmon pure, scfmon stc, int Nstc, varset var, int Nvar)
+{
+  int  iv = Nvar -1, a, a0, a1, b, i;
+  long sum;
   int  x, x0;
   scmon pn;
@@ -637 +639 @@
   sn = hGetmem(Nstc, stc, stcmem[iv]);
   hStepS(sn, Nstc, var, Nvar, &a, &x);
-  int64 t=hZeroMult(pn, sn, a, var, iv);
   if (a == Nstc)
   {
+    #if  SIZEOF_LONG==8
+    return (long)pure[var[Nvar]] * hZeroMult(pn, sn, a, var, iv);
+    #else
+    int64 t=hZeroMult(pn, sn, a, var, iv);
     t *= pure[var[Nvar]];
     if ((t>=INT_MIN)&&(t<=INT_MAX)) sum=t;
     else if (!errorreported) WerrorS("int overflow in vdim 3");
     return sum;
-    /*return pure[var[Nvar]] * hZeroMult(pn, sn, a, var, iv);*/
+    #endif
   }
   else
   {
+    #if  SIZEOF_LONG==8
+    sum = x * hZeroMult(pn, sn, a, var, iv);
+    #else
+    int64 t=hZeroMult(pn, sn, a, var, iv);
     t *= x;
     if ((t>=INT_MIN)&&(t<=INT_MAX)) sum=t;
     else if (!errorreported) WerrorS("int overflow in vdim 4");
-    /*sum = x * hZeroMult(pn, sn, a, var, iv);*/
+    #endif
   }
   b = a;
@@ -666 +675 @@
     if (a < Nstc)
     {
+      #if  SIZEOF_LONG==8
+      sum += (long)(x - x0) * hZeroMult(pn, sn, b, var, iv);
+      #else
       int64 t=hZeroMult(pn, sn, b, var, iv);
       t *= (x-x0);
@@ -671 +683 @@
       if ((t>=INT_MIN)&&(t<=INT_MAX)) sum=t;
       else if (!errorreported) WerrorS("int overflow in vdim 1");
-      /*sum += (x - x0) * hZeroMult(pn, sn, b, var, iv);*/
+      #endif
     }
     else
     {
+      #if  SIZEOF_LONG==8
+      sum += (long)(pure[var[Nvar]] - x0) * hZeroMult(pn, sn, b, var, iv);
+      #else
       int64 t=hZeroMult(pn, sn, b, var, iv);
       t *= (pure[var[Nvar]]-x0);
@@ -680 +695 @@
       if ((t>=INT_MIN)&&(t<=INT_MAX)) sum=t;
       else if (!errorreported) WerrorS("int overflow in vdim 2");
-      /*sum += (pure[var[Nvar]] - x0) * hZeroMult(pn, sn, b, var, iv);*/
+      #endif
       return sum;
     }
@@ -933 +948 @@
 }
 
-int  scMult0Int(ideal S, ideal Q)
+long  scMult0Int(ideal S, ideal Q)
 {
   id_LmTest(S, currRing);

kernel/combinatorics/hutil.h

@@ -45 +45 @@
 EXTERN_VAR monf stcmem, radmem;
 EXTERN_VAR indset ISet, JSet;
-EXTERN_VAR int  hCo, hMu, hMu2;
+EXTERN_VAR int  hCo, hMu2;
+EXTERN_VAR long  hMu;
 
 

kernel/combinatorics/stairc.h

@@ -26 +26 @@
 int scDimIntRing(ideal  s,ideal Q=NULL); // dim (general)
 int scMultInt(ideal  s,ideal Q=NULL); // mult
-int scMult0Int(ideal  s,ideal Q=NULL); // vdim
+long scMult0Int(ideal  s,ideal Q=NULL); // vdim
 void scPrintDegree(int co, int mu);
 void scDegree(ideal  s,intvec *modulweight,ideal Q=NULL);