Changeset 9502424 in git

Timestamp:

May 20, 2008, 1:34:33 PM (15 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

2fa632f4d8657b736d23478f2b9ef512df3e7fdb

Parents:

ef20c7f187d2cee703db198bb13baadf2e349296

Message:

*hannes: fix index err. in rSubring


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

File:

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

Singular/ipshell.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipshell.cc,v 1.183 2008-05-14 14:08:41 Singular Exp $ */
+/* $Id: ipshell.cc,v 1.184 2008-05-20 11:34:33 Singular Exp $ */
 /*
 * ABSTRACT:
@@ -1646 +1646 @@
     else
     {
-      lists Lc=(lists)omAlloc0Bin(slists_bin); 
+      lists Lc=(lists)omAlloc0Bin(slists_bin);
       Lc->Init(4);
       // char:
@@ -2069 +2069 @@
       { // gf-char
         R->ch=fftable[is_gf_char];
-        R->P=1;
+        R->P=1;
         R->parameter=(char**)omAlloc0(1*sizeof(char_ptr));
         R->parameter[0]=omStrDup((char*)((lists)(LL->m[1].Data()))->m[0].Data());
@@ -4190 +4190 @@
   }
 
-  // test for valid "currRing": 
+  // test for valid "currRing":
   if ((rg!=NULL) && (rg->idroot==NULL))
   {
@@ -4781 +4781 @@
   {
     i=0;
-    
+
     for(j=0;j<R->N;j++)
     {
@@ -4799 +4799 @@
     }
   }
+  //Print("perm=");
+  //for(i=1;i<org_ring->N;i++) Print("v%d -> v%d\n",i,perm[i]);
   /* ordering -------------------------------------------------------------*/
 
@@ -4823 +4825 @@
         omFree(R->wvhdl[i]);
         R->wvhdl[i]=(int*)omAlloc0((max_var-min_var+1)*sizeof(int));
-        for(j=R->block0[i];j<=R->block1[i];j++)
+        for(j=org_ring->block0[i];j<=org_ring->block1[i];j++)
         {
           if (perm[j]>0)
-            R->wvhdl[i][j-R->block0[i]]=
-                org_ring->wvhdl[i][perm[j]-org_ring->block0[i]]; 
+          {
+            R->wvhdl[i][perm[j]-R->block0[i]]=
+                org_ring->wvhdl[i][j-org_ring->block0[i]];
+            //Print("w%d=%d (orig_w%d)\n",perm[j],R->wvhdl[i][perm[j]-R->block0[i]],j);
+          }
         }
       }
@@ -4834 +4839 @@
     {
       if(R->block0[i]>0)
-      { 
+      {
         //Print("skip block %d\n",i);
         R->order[i]=ringorder_unspec;
@@ -4842 +4847 @@
       //else Print("keep block %d\n",i);
     }
-  }   
+  }
   i=n-1;
   while(i>0)
@@ -4862 +4867 @@
     i--;
   }
-  n=rBlocks(org_ring)-1; 
+  n=rBlocks(org_ring)-1;
   while (R->order[n]==0)  n--;
   while (R->order[n]==ringorder_unspec)  n--;
@@ -5103 +5108 @@
   return FALSE;
 }
-  
+
 BOOLEAN jjVARIABLES_ID(leftv res, leftv u)
 {