Changeset 6dccbc in git for kernel/prCopy.cc

Timestamp:

Jun 5, 2009, 7:16:07 AM (15 years ago)

Author:

Motsak Oleksandr <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

c6b84991198316580f29110f1b17042b0cbfd434

Parents:

51d7f7bf9e26957b6f4bfed8b88ec964eb69f77a

Message:

*motsak: +idrHeadR


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

File:

• kernel/prCopy.cc (modified) (11 diffs)

kernel/prCopy.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: prCopy.cc,v 1.3 2007-09-17 08:33:17 Singular Exp $ */
+/* $Id: prCopy.cc,v 1.4 2009-06-05 05:16:07 motsak Exp $ */
 /*
 * ABSTRACT - implementation of functions for Copy/Move/Delete for Polys
@@ -87 +87 @@
   else
     res =  pr_Move_NoREqual_NoNSimple_NoSort(p, src_r, dest_r);
-  p_Test(res, dest_r);  
+  p_Test(res, dest_r);
   return res;
 }
@@ -113 +113 @@
   head = prproc(q, src_r, dest_r);
   pNext(p) = tail;
+
+  p_Test(p, src_r);
+  p_Test(head, dest_r);
+
   return head;
 }
@@ -119 +123 @@
 {
   prCopyProc_t prproc;
-  if (rField_has_simple_Alloc(dest_r)) 
+  if (rField_has_simple_Alloc(dest_r))
     prproc = pr_Copy_NoREqual_NSimple_NoSort;
   else
-    prproc = pr_Copy_NoREqual_NoNSimple_NoSort;  
-  
-  return prHeadR(p, src_r, dest_r, prproc);
+    prproc = pr_Copy_NoREqual_NoNSimple_NoSort;
+
+  const poly res = prHeadR(p, src_r, dest_r, prproc);
+  p_Test(res, dest_r);
+  return res;
 }
 
 /////////////////////////////////////////////////////////////////////////
 // idrCopy
+/// Copy leading terms of id[i] via prHeeadR into dest_r
+ideal idrHeadR(ideal id, ring r, ring dest_r)
+{
+  if (id == NULL) return NULL;
+
+  prCopyProc_t prproc = pr_Copy_NoREqual_NoNSimple_NoSort;
+  if (rField_has_simple_Alloc(dest_r))
+    prproc = pr_Copy_NoREqual_NSimple_NoSort;
+
+  const int N = IDELEMS(id);
+  ideal res = idInit(N, id->rank);
+
+  for (int i = N - 1; i >= 0; i--)
+    res->m[i] = prHeadR(id->m[i], r, dest_r, prproc); // !!!
+
+  return res;
+}
+
+
+
 static inline ideal
 idrCopy(ideal id, ring src_r, ring dest_r, prCopyProc_t prproc)
@@ -150 +176 @@
   ideal res;
   prCopyProc_t prproc;
-  if (rField_has_simple_Alloc(dest_r)) 
+  if (rField_has_simple_Alloc(dest_r))
     prproc = pr_Copy_REqual_NSimple_NoSort;
   else
@@ -162 +188 @@
   ideal res;
   prCopyProc_t prproc;
-  if (rField_has_simple_Alloc(dest_r)) 
+  if (rField_has_simple_Alloc(dest_r))
     prproc = pr_Copy_NoREqual_NSimple_Sort;
   else
@@ -169 +195 @@
   return res;
 }
-  
+
 ideal idrCopyR_NoSort(ideal id, ring src_r, ring dest_r)
 {
   ideal res;
   prCopyProc_t prproc;
-  if (rField_has_simple_Alloc(dest_r)) 
+  if (rField_has_simple_Alloc(dest_r))
     prproc = pr_Copy_NoREqual_NSimple_NoSort;
   else
@@ -188 +214 @@
   return idrCopy(id, src_r, dest_r, pr_Copy_NoREqual_NSimple_Sort);
 }
-  
+
 ideal idrShallowCopyR_NoSort(ideal id, ring src_r, ring dest_r)
 {
   return idrCopy(id, src_r, dest_r, pr_Copy_NoREqual_NSimple_NoSort);
 }
-  
+
 /////////////////////////////////////////////////////////////////////////
 // idrMove
@@ -213 +239 @@
   prCopyProc_t prproc;
   ideal res;
-  if (rField_has_simple_Alloc(dest_r)) 
+  if (rField_has_simple_Alloc(dest_r))
     prproc = pr_Move_NoREqual_NSimple_Sort;
   else
@@ -220 +246 @@
   return res;
 }
-  
+
 ideal idrMoveR_NoSort(ideal &id, ring src_r, ring dest_r)
 {
   prCopyProc_t prproc;
   ideal res;
-  if (rField_has_simple_Alloc(dest_r)) 
+  if (rField_has_simple_Alloc(dest_r))
     prproc = pr_Move_NoREqual_NSimple_NoSort;
   else
@@ -233 +259 @@
 }
 
+