Changeset 935bb1b in git

Timestamp:

Feb 1, 2008, 2:46:09 PM (15 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

3901ebf059dc5ef7abe8c2726771e6d8edee6d96

Parents:

60d118332f6eec4e3ce8410bb77c08ca9711d1a3

Message:

*hannes: rAssure_HasComp


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

Location:

kernel

Files:

• ring.cc (modified) (2 diffs)
• ring.h (modified) (2 diffs)

kernel/ring.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ring.cc,v 1.72 2008-01-30 16:14:24 wienand Exp $ */
+/* $Id: ring.cc,v 1.73 2008-02-01 13:46:09 Singular Exp $ */
 
 /*
@@ -3576 +3576 @@
   if (complete) rComplete(res, 1);
   return res;
+}
+
+ring rAssure_HasComp(ring r)
+{
+  int last_block = rBlocks(r) - 2;
+  int i=last_block;
+  do
+  { 
+     if (r->order[i] == ringorder_c ||
+        r->order[i] == ringorder_C) return r;
+     i--;
+  } while (i>=0);
+  
+  ring new_r = rCopy0(r, FALSE, FALSE);
+  i=last_block+3;
+  new_r->wvhdl=(int **)omAlloc(i * sizeof(int_ptr));
+  new_r->order   = (int *) omAlloc(i * sizeof(int));
+  new_r->block0   = (int *) omAlloc(i * sizeof(int));
+  new_r->block1   = (int *) omAlloc(i * sizeof(int));
+  memcpy4(new_r->order,r->order,(i-1) * sizeof(int));
+  memcpy4(new_r->block0,r->block0,(i-1) * sizeof(int));
+  memcpy4(new_r->block1,r->block1,(i-1) * sizeof(int));
+  for (int j=0; j<=last_block; j++)
+  {
+    if (r->wvhdl[j]!=NULL)
+    {
+      new_r->wvhdl[j] = (int*) omMemDup(r->wvhdl[j]);
+    }
+    else
+      new_r->wvhdl[j]=NULL;
+  }
+  last_block++;
+  new_r->order[last_block]=ringorder_C;
+  new_r->block0[last_block]=0;
+  new_r->block1[last_block]=0;
+  new_r->wvhdl[last_block]=NULL;
+
+  rComplete(new_r, 1);
+  return new_r;
 }
 

kernel/ring.h

@@ -7 +7 @@
 * ABSTRACT - the interpreter related ring operations
 */
-/* $Id: ring.h,v 1.24 2008-01-30 16:14:25 wienand Exp $ */
+/* $Id: ring.h,v 1.25 2008-02-01 13:46:08 Singular Exp $ */
 
 /* includes */
@@ -325 +325 @@
 
 // Ring Manipulations
+ring   rAssure_HasComp(ring r);
 ring   rCurrRingAssure_SyzComp();
 void   rSetSyzComp(int k);