Changeset 173030 in git

Timestamp:

Nov 22, 2000, 6:35:33 PM (24 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

730df2d43b6668d0ab2cde91c2bd1c49421fee12

Parents:

06082a2ad474301e52b48db5caf09e0c56a40bac

Message:

*hannes: NF +HEcke +Modules


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

File:

• Singular/kstd1.cc (modified) (5 diffs)

Singular/kstd1.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd1.cc,v 1.64 2000-11-17 14:07:10 Singular Exp $ */
+/* $Id: kstd1.cc,v 1.65 2000-11-22 17:35:33 Singular Exp $ */
 /*
 * ABSTRACT:
@@ -1295 +1295 @@
   if ((idIs0(F))&&(Q==NULL))
     return pCopy(q); /*F=0*/
-  strat->ak = idRankFreeModule(F);
+  strat->ak = max(idRankFreeModule(F),pMaxComp(q));
   /*- creating temp data structures------------------- -*/
   strat->kHEdgeFound = ppNoether != NULL;
@@ -1327 +1327 @@
   /*- init local data struct.-------------------------- -*/
   /*Shdl=*/initS(F,Q,strat);
+  if ((strat->ak!=0)
+  && (strat->kHEdgeFound))
+  {
+    if (strat->ak!=1)
+    {
+      pSetComp(strat->kNoether,1);
+      pSetmComp(strat->kNoether);
+      poly p=pHead(strat->kNoether);
+      pSetComp(p,strat->ak);
+      pSetmComp(p);
+      p=pAdd(strat->kNoether,p);
+      strat->kNoether=pNext(p);
+      p_LmFree(p,currRing);
+    }
+  }
   if ((lazyReduce & 1)==0)
   {
@@ -1400 +1415 @@
   if ((idIs0(F))&&(Q==NULL))
     return idCopy(q); /*F=0*/
-  strat->ak = idRankFreeModule(F);
+  strat->ak = max(idRankFreeModule(F),idRankFreeModule(q));
   /*- creating temp data structures------------------- -*/
   strat->kHEdgeFound = ppNoether != NULL;
@@ -1430 +1445 @@
   /*- init local data struct.-------------------------- -*/
   /*Shdl=*/initS(F,Q,strat);
+  if ((strat->ak!=0)
+  && (strat->kHEdgeFound))
+  {
+    if (strat->ak!=1)
+    {
+      pSetComp(strat->kNoether,1);
+      pSetmComp(strat->kNoether);
+      poly p=pHead(strat->kNoether);
+      pSetComp(p,strat->ak);
+      pSetmComp(p);
+      p=pAdd(strat->kNoether,p);
+      strat->kNoether=pNext(p);
+      p_LmFree(p,currRing);
+    }
+  }
   if (TEST_OPT_INTSTRATEGY && ((lazyReduce & 1)==0))
   {