Changeset 0bf7dff in git

Timestamp:

Sep 19, 2000, 5:22:25 PM (24 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

9c8b81ebdf5b81ba6d682234d624c628c8c2f128

Parents:

82063a79ea38ca00e3f4367decdd79d1b0fcdfb7

Message:

* hannes: rGetExpSize, removed some HAVE_SHIFTED_EXPONENTS


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

Location:

Singular

Files:

• ring.cc (modified) (2 diffs)
• ring.h (modified) (3 diffs)
• structs.h (modified) (4 diffs)
• subexpr.cc (modified) (2 diffs)

Singular/ring.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ring.cc,v 1.117 2000-09-18 09:19:31 obachman Exp $ */
+/* $Id: ring.cc,v 1.118 2000-09-19 15:22:23 Singular Exp $ */
 
 /*
@@ -2293 +2293 @@
 
 /*2
+* optimize rGetExpSize for a block of N variables, exp <=bitmask
+*/
+unsigned long rGetExpSize(unsigned long bitmask, int & bits, int N)
+{
+#if SIZEOF_LONG == 8
+#define BITS_FOR_EXPS 64
+#else
+// SIZEOF_LONG ==4, 32 bits
+#define BITS_FOR_EXPS 32
+#endif
+  bitmask =rGetExpSize(bitmask, &bits);
+  int vars_per_long=BITS_FOR_EXPS/bits;
+  int bits1;
+  loop
+  {
+    unsigned long bitmask1 =rGetExpSize(bitmask+1, &bits1);
+    int vars_per_long1=BITS_FOR_EXPS/bits1;
+    if (((N+vars_per_long-1)/vars_per_long)
+    == ((N+vars_per_long1-1)/vars_per_long1))
+    {
+      vars_per_long=vars_per_long1;
+      bits=bits1;
+      bitmask=bitmask1;
+    }
+    else
+    {
+      return bitmask; /* and bits */
+    }
+  }
+}
+
+/*2
  * create a copy of the ring r, which must be equivalent to currRing
  * used for std computations

Singular/ring.h

@@ -7 +7 @@
 * ABSTRACT - the interpreter related ring operations
 */
-/* $Id: ring.h,v 1.50 2000-09-07 16:22:02 Singular Exp $ */
+/* $Id: ring.h,v 1.51 2000-09-19 15:22:25 Singular Exp $ */
 
 /* includes */
@@ -166 +166 @@
   ringorder_ws,
   ringorder_Ws,
-  #ifdef HAVE_SHIFTED_EXPONENTS
   ringorder_L,
-  #endif
   ringorder_unspec
 } rRingOrder_t;
@@ -224 +222 @@
 #endif
 
-#ifdef HAVE_SHIFTED_EXPONENTS
 unsigned long rGetExpSize(unsigned long bitmask, int & bits);
+unsigned long rGetExpSize(unsigned long bitmask, int & bits, int N);
 ring rModifyRing(ring r, BOOLEAN omit_degree,
                          BOOLEAN omit_comp,
                          unsigned long exp_limit);
 void rKillModifiedRing(ring r);
-#endif
 
 void rDebugPrint(ring r);
 void pDebugPrint(poly p);
-
-#endif
-
+#endif

Singular/structs.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: structs.h,v 1.36 2000-09-12 16:01:17 obachman Exp $ */
+/* $Id: structs.h,v 1.37 2000-09-19 15:22:25 Singular Exp $ */
 /*
 * ABSTRACT
@@ -114 +114 @@
 typedef struct p_Procs_s p_Procs_s;
 
-// for hdegree.cc   
+// for hdegree.cc
 typedef struct sindlist indlist;
 typedef indlist * indset;
@@ -132 +132 @@
 
 
-// for sparsemat.cc 
+// for sparsemat.cc
 typedef struct smprec sm_prec;
 typedef sm_prec * smpoly;
@@ -256 +256 @@
   int      *VarOffset;
   /* mapping exp. of var(i) -> p->exp */
-#ifdef HAVE_SHIFTED_EXPONENTS
   /* mapping exp. of var(i) ->
   p->exp[(VarOffset[i] & 0xffffff)] >> (VarOffset[i] >> 24) & bitmask */
-#else
-  /* mapping exp. of var(i) -> p->exp.e[VarOffset[i]] */
-#endif
 
   struct omBin_s*   PolyBin; /* Bin from where monoms are allocated */

Singular/subexpr.cc

@@ -5 +5 @@
 * ABSTRACT: handling of leftv
 */
-/* $Id: subexpr.cc,v 1.68 2000-09-19 12:43:32 Singular Exp $ */
+/* $Id: subexpr.cc,v 1.69 2000-09-19 15:22:25 Singular Exp $ */
 
 #include <stdlib.h>
@@ -1109 +1109 @@
       }
       tmp.data=r;
-      if (rtyp==IDHDL)
+      if ((rtyp==IDHDL)||(rtyp==STRING_CMD))
       {
         tmp.next=next; next=NULL;