Changeset c985c5 in git

Timestamp:

Sep 17, 2007, 10:33:17 AM (17 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'fc741b6502fd8a97288eaa3eba6e5220f3c3df87')

Children:

cff7ceca60f37e140376ee20d9be20dfdd968d7d

Parents:

37a003af153acc2b6945be5b60d23ec814d47ae9

Message:

*hannes: fix bug 48(exp bound for maps)


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

Files:

• Singular/ipshell.cc (modified) (3 diffs)
• Tst/Short/bug_48.res.gz.uu (added)
• Tst/Short/bug_48.stat (added)
• Tst/Short/bug_48.tst (added)
• Tst/Short/ok_s.lst (modified) (1 diff)
• kernel/Makefile.in (modified) (1 diff)
• kernel/fast_maps.cc (modified) (13 diffs)
• kernel/prCopy.cc (modified) (2 diffs)
• kernel/ring.cc (modified) (7 diffs)

Singular/ipshell.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipshell.cc,v 1.168 2007-08-07 11:41:00 Singular Exp $ */
+/* $Id: ipshell.cc,v 1.169 2007-09-17 08:33:16 Singular Exp $ */
 /*
 * ABSTRACT:
@@ -716 +716 @@
       }
       tmpW.data=IDDATA(w);
+      #if 0
       if (((tmpW.rtyp==IDEAL_CMD)||(tmpW.rtyp==MODUL_CMD)) && idIs0(IDIDEAL(w)))
       {
@@ -722 +723 @@
       }
       else
+      #endif
       {
         #ifdef FAST_MAP

Tst/Short/ok_s.lst

@@ -43 +43 @@
 bug_46
 bug_47
+bug_48
 bug_5
 bug_6

kernel/Makefile.in

@@ -380 +380 @@
 
 tags:   
-        ctags *.y *.l *.c *.h *.cc *.inc
+        ctags *.c *.h *.cc *.inc
 
 echoLIBS:

kernel/fast_maps.cc

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 02/01
- *  Version: $Id: fast_maps.cc,v 1.5 2006-05-02 14:15:46 Singular Exp $
+ *  Version: $Id: fast_maps.cc,v 1.6 2007-09-17 08:33:17 Singular Exp $
  *******************************************************************/
 #include "mod2.h"
@@ -36 +36 @@
   int n = si_min(pi_r->N, n_max_map_monomials);
   int i, j;
-  Exponent_t e_i, e_j;
+  unsigned long e_i, e_j;
   poly m_i, map_j = p_Init(map_r);
 
@@ -42 +42 @@
   {
     e_i = p_GetExp(pi_m, i, pi_r);
+    if (e_i==0) e_i=1;
     m_i = max_map_monomials[i-1];
-    if (e_i > 0 && m_i != NULL && ! p_IsConstantComp(m_i, map_r))
+    if (m_i != NULL && ! p_IsConstantComp(m_i, map_r))
     {
       for (j = 1; j<= map_r->N; j++)
       {
         e_j = p_GetExp(m_i, j, map_r);
-        if (e_j > 0)
-        {
-          p_AddExp(map_j, j, e_j*e_i, map_r);
-        }
+        if (e_j == 0) e_j=1;
+        p_AddExp(map_j, j, e_j*e_i, map_r);
       }
     }
@@ -59 +58 @@
 
 // returns maximal exponent if map_id is applied to pi_id
-static Exponent_t maGetMaxExp(ideal pi_id, ring pi_r, ideal map_id, ring map_r)
-{
-  Exponent_t max=0;
+static unsigned long maGetMaxExp(ideal pi_id, ring pi_r, ideal map_id, ring map_r)
+{
+  unsigned long max=0;
   poly* max_map_monomials = (poly*) omAlloc(IDELEMS(map_id)*sizeof(poly));
   poly max_pi_i, max_map_i;
@@ -76 +75 @@
     max_map_i = maGetMaxExpP(max_map_monomials, IDELEMS(map_id), map_r,
                               max_pi_i, pi_r);
-    Exponent_t temp = p_GetMaxExp(max_map_i, map_r);
-    if (temp > max){
-      max=temp;
-    }
+    unsigned long temp = p_GetMaxExp(max_map_i, map_r);
+    if (temp > max){ max=temp; }
 
     p_LmFree(max_pi_i, pi_r);
@@ -292 +289 @@
 
 #if HAVE_DEST_R > 0
-  Exponent_t maxExp = maGetMaxExp(map_id, map_r, image_id, image_r);
+  unsigned long maxExp = maGetMaxExp(map_id, map_r, image_id, image_r);
   if (maxExp <=  1) maxExp = 2;
-  else if (maxExp > (Exponent_t) image_r->bitmask)
-    maxExp = (Exponent_t) image_r->bitmask;
+  else if (maxExp > (unsigned long) image_r->bitmask)
+    maxExp = (unsigned long) image_r->bitmask;
   dest_r = rModifyRing_Simple(image_r, TRUE, TRUE, maxExp,  simple);
 #else
@@ -583 +580 @@
 
   for (i=1;i<=r->N;i++) {
-    Exponent_t e1 = p_GetExp(m1, i, r);
-    Exponent_t e2 = p_GetExp(m2, i, r);
-    if (e1 > 0 && e2 > 0){
-      Exponent_t em = (e1 > e2 ? e2 : e1);
+    unsigned long e1 = p_GetExp(m1, i, r);
+    unsigned long e2 = p_GetExp(m2, i, r);
+    if (e1 > 0 && e2 > 0)
+    {
+      unsigned long em = (e1 > e2 ? e2 : e1);
       dg += em;
       p_SetExp(ggt, i, em, r);
@@ -592 +590 @@
       p_SetExp(q2, i, e2 - em, r);
     }
-    else {
+    else
+    {
       p_SetExp(q1, i, e1, r);
       p_SetExp(q2, i, e2, r);
@@ -602 +601 @@
     p_Setm(q1, r);
     p_Setm(q2, r);
-
-
-  }
-  else {
+  }
+  else
+  {
     p_LmFree(ggt, r);
     p_LmFree(q1, r);
@@ -664 +662 @@
     iter=iter->next;
   }
-  if(ggT!=NULL){
-
+  if(ggT!=NULL)
+  {
     int dq =pTotaldegree(fq_p,r);
-    if (dq!=0){
+    if (dq!=0)
+    {
       fq=maPoly_InsertMonomial(mp, fq_p, r, NULL);
       fp=maPoly_InsertMonomial(mp, fp_p, r, NULL);
       return maPoly_InsertMonomial(mp, ggT, r, NULL);
     }
-    else {
+    else
+    {
       fq=NULL;
       p_LmFree(fq_p, r);
@@ -681 +681 @@
     }
   }
-  else {
+  else
+  {
     return NULL;
   }
-
-
 }
 
@@ -701 +700 @@
   mapoly fp=NULL;
   mapoly fq=NULL;
-  while (iter->next!=NULL){
+  while (iter->next!=NULL)
+  {
     choice=iter->next;
-    if ((iter->f1==NULL)){
+    if ((iter->f1==NULL))
+    {
       ggT=maFindBestggT(iter, choice, fp, fq,src_r);
-      if (choice!=NULL){
+      if (choice!=NULL)
+      {
         iter->f1=fp;
         iter->f2=ggT;
-        if (fq!=NULL){
+        if (fq!=NULL)
+        {
           ggT->ref++;
           choice->f1=fq;
@@ -714 +717 @@
         }
       }
-
     }
     iter=iter->next;

kernel/prCopy.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: prCopy.cc,v 1.2 2005-04-25 18:15:25 Singular Exp $ */
+/* $Id: prCopy.cc,v 1.3 2007-09-17 08:33:17 Singular Exp $ */
 /*
 * ABSTRACT - implementation of functions for Copy/Move/Delete for Polys
@@ -19 +19 @@
 prCopyEvector(poly dest, ring dest_r, poly src, ring src_r,int max)
 {
-  number n = pGetCoeff(dest);
+  //memset(dest->exp,0,dest_r->ExpL_Size*sizeof(long));
   int i;
   for (i=max; i>0; i--)
   {
     p_SetExp(dest, i, p_GetExp( src, i,src_r), dest_r);
-    assume(n == pGetCoeff(dest));
   }
   if (rRing_has_Comp(dest_r) && rRing_has_Comp(src_r))
     p_SetComp(dest, p_GetComp( src,src_r), dest_r);
-  assume(n == pGetCoeff(dest));
   p_Setm(dest, dest_r);
-  assume(n == pGetCoeff(dest));
 }
 

kernel/ring.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ring.cc,v 1.67 2007-07-27 14:09:52 Singular Exp $ */
+/* $Id: ring.cc,v 1.68 2007-09-17 08:33:17 Singular Exp $ */
 
 /*
@@ -1604 +1604 @@
           case ringorder_unspec:
             if (r->order[1] == ringorder_C
-            ||  r->order[0] == ringorder_unspec)
+            ||  r->order[0] == ringorder_unspec)
               return rOrderType_ExpComp;
             return rOrderType_Exp;
@@ -2992 +2992 @@
                    tmp_typ[typ_i], r->wvhdl[i]);
         typ_i++;
-        { // check for weights <=0
-          int jj;
-          BOOLEAN have_bad_weights=FALSE;
-          for(jj=r->block1[i]-r->block0[i];jj>=0; jj--)
-          {
-            if (r->wvhdl[i][jj]<=0) have_bad_weights=TRUE;
-          }
-          if (have_bad_weights)
-          {
-             rO_TDegree(j,j_bits,r->block0[i],r->block1[i],tmp_ordsgn,
-                                     tmp_typ[typ_i]);
+        { // check for weights <=0
+          int jj;
+          BOOLEAN have_bad_weights=FALSE;
+          for(jj=r->block1[i]-r->block0[i];jj>=0; jj--)
+          {
+            if (r->wvhdl[i][jj]<=0) have_bad_weights=TRUE;
+          }
+          if (have_bad_weights)
+          {
+             rO_TDegree(j,j_bits,r->block0[i],r->block1[i],tmp_ordsgn,
+                                     tmp_typ[typ_i]);
              typ_i++;
-          }
-        }
+          }
+        }
         if (r->block1[i]!=r->block0[i])
         {
@@ -3017 +3017 @@
                    tmp_typ[typ_i], r->wvhdl[i]);
         typ_i++;
-        { // check for weights <=0
-          int j;
-          BOOLEAN have_bad_weights=FALSE;
-          for(j=r->block1[i]-r->block0[i];j>=0; j--)
-          {
-            if (r->wvhdl[i][j]<=0) have_bad_weights=TRUE;
-          }
-          if (have_bad_weights)
-          {
-             rO_TDegree(j,j_bits,r->block0[i],r->block1[i],tmp_ordsgn,
-                                     tmp_typ[typ_i]);
+        { // check for weights <=0
+          int j;
+          BOOLEAN have_bad_weights=FALSE;
+          for(j=r->block1[i]-r->block0[i];j>=0; j--)
+          {
+            if (r->wvhdl[i][j]<=0) have_bad_weights=TRUE;
+          }
+          if (have_bad_weights)
+          {
+             rO_TDegree(j,j_bits,r->block0[i],r->block1[i],tmp_ordsgn,
+                                     tmp_typ[typ_i]);
              typ_i++;
-          }
-        }
+          }
+        }
         if (r->block1[i]!=r->block0[i])
         {
@@ -3104 +3104 @@
   }
   // the variables
-  for(i=1 ; i<r->N+1 ; i++)
+  for(i=1 ; i<=r->N ; i++)
   {
     if(v[i]==(-1))
@@ -3297 +3297 @@
     shifts[i] = BIT_SIZEOF_LONG;
 
-  // find minimal bit in each long var
+  // find minimal bit shift in each long exp entry
   for (i=1;i<=r->N;i++)
   {
@@ -3303 +3303 @@
       shifts[r->VarOffset[i] & 0xffffff] = r->VarOffset[i] >> 24;
   }
-  // reset r->VarOffset
+  // reset r->VarOffset: set the minimal shift to 0
   for (i=1;i<=r->N;i++)
   {