Changeset 6bd405 in git for kernel

Timestamp:

Nov 12, 2008, 5:06:50 PM (15 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

4378bb1d8689acd01ff886e652e17cc6f231274c

Parents:

254a326422aa010fa57986f524945ceabe9f9b82

Message:

*hannes: old idElim-ring


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

File:

• kernel/ideals.cc (modified) (4 diffs)

kernel/ideals.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ideals.cc,v 1.61 2008-11-12 12:41:03 Singular Exp $ */
+/* $Id: ideals.cc,v 1.62 2008-11-12 16:06:50 Singular Exp $ */
 /*
 * ABSTRACT - all basic methods to manipulate ideals
@@ -2442 +2442 @@
   block1=(int*)omAlloc0(ordersize*sizeof(int));
   wv=(int**) omAlloc0(ordersize*sizeof(int**));
+#if 0
   if (rIsPluralRing(origR)) // we have too keep the odering: it may be needed
                             // for G-algebra
@@ -2469 +2470 @@
     omFreeSize((ADDRESS)x, 2 * (pVariables + 1) * sizeof(int));
 
-#if 0
-    for (k=0;k<ordersize-1; k++)
-    {
-      if ( (origR->order[k]==ringorder_c)
-      || (origR->order[k]==ringorder_C))
-      {
-        ord[2]=origR->order[k];
-        break;
-      }
-    }
+    ord[2]=ringorder_C;
+    ord[3]=0;
+  }
 #else
-    ord[2]=ringorder_C;
+  for (k=0;k<ordersize-1; k++)
+  {
+    block0[k+1] = origR->block0[k];
+    block1[k+1] = origR->block1[k];
+    ord[k+1] = origR->order[k];
+    if (origR->wvhdl[k]!=NULL) wv[k+1] = (int*) omMemDup(origR->wvhdl[k]);
+  }
 #endif
-    ord[3]=0;
-  }
   block0[0] = 1;
   block1[0] = rVar(origR);
@@ -2493 +2491 @@
   // ignore it
   ord[0] = ringorder_aa;
-
   // fill in tmp ring to get back the data later on
   tmpR  = rCopy0(origR,FALSE,FALSE); // qring==NULL
   //rUnComplete(tmpR);
+  tmpR->p_Procs=NULL;
   tmpR->order = ord;
   tmpR->block0 = block0;
   tmpR->block1 = block1;
   tmpR->wvhdl = wv;
-  tmpR->p_Procs=NULL;
-
   rComplete(tmpR, 1);