Changeset 822aa3a in git for kernel/kstd2.cc

Timestamp:

Apr 23, 2009, 6:24:08 PM (15 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

9f17c9f13b717a920473663201c9bb8a3daa9f77

Parents:

063680689bc561c179b7e8efb10db4bccf20efbf

Message:

*hannes: simple tests from kNF[12] to kNF


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

File:

• kernel/kstd2.cc (modified) (6 diffs)

kernel/kstd2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd2.cc,v 1.84 2009-04-23 11:36:46 Singular Exp $ */
+/* $Id: kstd2.cc,v 1.85 2009-04-23 16:24:08 Singular Exp $ */
 /*
 *  ABSTRACT -  Kernel: alg. of Buchberger
@@ -746 +746 @@
     if (ei <= h->ecart)
       h->ecart = d-h_d;
-    else 
+    else
       h->ecart = d-h_d+ei-h->ecart;
 
@@ -1182 +1182 @@
 poly kNF2 (ideal F,ideal Q,poly q,kStrategy strat, int lazyReduce)
 {
+  assume(q!=NULL);
+  assume(!(idIs0(F)&&(Q==NULL)));
+
 // lazy_reduce flags: can be combined by |
 //#define KSTD_NF_LAZY   1
@@ -1190 +1193 @@
   int   i;
 
-  if ((idIs0(F))&&(Q==NULL))
-    return pCopy(q); /*F=0*/
+  //if ((idIs0(F))&&(Q==NULL))
+  //  return pCopy(q); /*F=0*/
   //strat->ak = idRankFreeModule(F);
   /*- creating temp data structures------------------- -*/
@@ -1242 +1245 @@
 ideal kNF2 (ideal F,ideal Q,ideal q,kStrategy strat, int lazyReduce)
 {
+  assume(!idIs0(q));
+  assume(!(idIs0(F)&&(Q==NULL)));
 // lazy_reduce flags: can be combined by |
 //#define KSTD_NF_LAZY   1
@@ -1252 +1257 @@
   int max_ind;
 
-  if (idIs0(q))
-    return idInit(IDELEMS(q),si_max(q->rank,F->rank));
-  if ((idIs0(F))&&(Q==NULL))
-    return idCopy(q); /*F=0*/
+  //if (idIs0(q))
+  //  return idInit(IDELEMS(q),si_max(q->rank,F->rank));
+  //if ((idIs0(F))&&(Q==NULL))
+  //  return idCopy(q); /*F=0*/
   //strat->ak = idRankFreeModule(F);
   /*- creating temp data structures------------------- -*/