Changeset b9e18a3 in git

Timestamp:

Apr 21, 2010, 5:37:49 PM (13 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

b372c66b93132cf385d57ad259bf341460fa9575

Parents:

c11951e6cc1b26a68bd26f0429981f14de14a185

Message:

tr 223 and off-by-1 in ring construction

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

Location:

Singular

Files:

• ipshell.cc (modified) (4 diffs)
• subexpr.cc (modified) (1 diff)

Singular/ipshell.cc

@@ -4409 +4409 @@
             else last += (*iv)[0];
             R->block1[n] = last;
-            if (R->block0[n]>R->block1[n]) return TRUE;
+            //if ((R->block0[n]>R->block1[n])
+            //|| (R->block1[n]>rVar(R)))
+            //{
+            //  R->block1[n]=rVar(R);
+            //  //WerrorS("ordering larger than number of variables");
+            //  break;
+            //}
             if (rCheckIV(iv)) return TRUE;
-            for(i=R->block0[n];i<=R->block1[n];i++)
+            for(i=si_min(rVar(R),R->block1[n]);i>=R->block0[n];i--)
             {
               if (weights[i]==0) weights[i]=typ;
@@ -4424 +4430 @@
           case ringorder_a:
             R->block0[n] = last+1;
-            R->block1[n] = si_min(last+iv->length()-2 , R->N);
+            R->block1[n] = si_min(last+iv->length()-2 , rVar(R));
             R->wvhdl[n] = (int*)omAlloc((iv->length()-1)*sizeof(int));
             for (i=2; i<iv->length(); i++)
@@ -4437 +4443 @@
           {
             R->block0[n] = last+1;
-            R->block1[n] = si_min(last+iv->length()-2 , R->N);
+            R->block1[n] = si_min(last+iv->length()-2 , rVar(R));
             R->wvhdl[n] = (int*)omAlloc((iv->length()-1)*sizeof(int64));
             int64 *w=(int64 *)R->wvhdl[n];
@@ -4462 +4468 @@
             last += (int)sqrt((double)(iv->length()-2));
             R->block1[n] = last;
-            for(i=R->block0[n];i<=R->block1[n];i++)
+            for(i=si_min(rVar(R),R->block1[n]);i>=R->block0[n];i--)
             {
               if (weights[i]==0) weights[i]=typ;

Singular/subexpr.cc

@@ -1313 +1313 @@
     }
     /* 4. local ring: ringvar */
-    if ((currRingHdl!=NULL) && (IDLEV(currRingHdl)==myynest))
+    if ((currRingHdl!=NULL) && (IDLEV(currRingHdl)==myynest)
+    && (!yyInRingConstruction))
     {
       int vnr;