Changeset 99e6fde in git for Singular/ipshell.cc

Timestamp:

Aug 4, 2005, 2:21:37 PM (19 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

ad408c91cc440f15e25c340805838886deb55e13

Parents:

1dcad287ef1372af510684f7a97e7e484a817dd2

Message:

*hannes: rCompose: fixed counting block start after order a


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

File:

• Singular/ipshell.cc (modified) (5 diffs)

Singular/ipshell.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipshell.cc,v 1.121 2005-08-03 12:14:16 Singular Exp $ */
+/* $Id: ipshell.cc,v 1.122 2005-08-04 12:21:37 Singular Exp $ */
 /*
 * ABSTRACT:
@@ -1895 +1895 @@
       R->order[j]=rOrderName(omStrDup((char*)vv->m[0].Data())); // assume STRING
       if (j==0) R->block0[0]=1;
-      else      R->block0[j]=R->block1[j-1]+1;
+      else 
+      {
+         int jj=j-1;
+         while((jj>0)
+         && ((R->order[jj]== ringorder_a) || (R->order[jj]== ringorder_aa)))
+           jj--;
+         R->block0[j]=R->block1[jj]+1;
+      }
       intvec *iv;
       if (vv->m[1].Typ()==INT_CMD)
@@ -1902 +1909 @@
         iv=ivCopy((intvec*)vv->m[1].Data()); //assume INTVEC
       R->block1[j]=si_max(R->block0[j],R->block0[j]+iv->length()-1);
+      //Print("block %d from %d to %d\n",j,R->block0[j], R->block1[j]);
       int i;
       switch (R->order[j])
@@ -1908 +1916 @@
          case ringorder_Ws:
             R->OrdSgn=-1;
+         case ringorder_aa:
+         case ringorder_a:
          case ringorder_wp:
          case ringorder_Wp:
@@ -1928 +1938 @@
            R->block1[j]=R->block0[j]-1;
            break;
-         case ringorder_aa:
-         case ringorder_a:
-           R->wvhdl[j] =( int *)omAlloc((iv->length())*sizeof(int));
-           for (i=0; i<iv->length();i++) R->wvhdl[j][i]=(*iv)[i];
+         case ringorder_M:
          // todo
            break;
-         case ringorder_M:
-         // todo
+         case 0:
            break;
       }