Changeset 822aa3a in git for kernel/kstd1.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/kstd1.cc (modified) (8 diffs)

kernel/kstd1.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd1.cc,v 1.49 2009-04-23 11:36:32 Singular Exp $ */
+/* $Id: kstd1.cc,v 1.50 2009-04-23 16:24:08 Singular Exp $ */
 /*
 * ABSTRACT:
@@ -1300 +1300 @@
 
       // clear strat->P
-      if (strat->P.lcm!=NULL) 
+      if (strat->P.lcm!=NULL)
 #ifdef HAVE_RINGS_LOC
         pLmDelete(strat->P.lcm);
@@ -1368 +1368 @@
 poly kNF1 (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
@@ -1380 +1383 @@
   BITSET save_test=test;
 
-  if ((idIs0(F))&&(Q==NULL))
-    return pCopy(q); /*F=0*/
+  //if ((idIs0(F))&&(Q==NULL))
+  //  return pCopy(q); /*F=0*/
   //strat->ak = si_max(idRankFreeModule(F),pMaxComp(q));
   /*- creating temp data structures------------------- -*/
@@ -1491 +1494 @@
 ideal kNF1 (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
@@ -1504 +1510 @@
   BITSET save_test=test;
 
-  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 = si_max(idRankFreeModule(F),idRankFreeModule(q));
   /*- creating temp data structures------------------- -*/
@@ -1987 +1993 @@
   if (p==NULL)
      return NULL;
+  if ((idIs0(F))&&(Q==NULL))
+    return pCopy(p); /*F+Q=0*/
   kStrategy strat=new skStrategy;
   strat->syzComp = syzComp;
@@ -2028 +2036 @@
     Print("(S:%d)",IDELEMS(p));mflush();
   }
+  if (idIs0(p))
+    return idInit(IDELEMS(p),si_max(p->rank,F->rank));
+  if ((idIs0(F))&&(Q==NULL))
+    return idCopy(p); /*F+Q=0*/
+
   kStrategy strat=new skStrategy;
   strat->syzComp = syzComp;