Changeset f85f9f in git

Timestamp:

Nov 7, 2007, 3:28:46 PM (16 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

e8d46a5bec7c92ebe23eb113e18b6a8c4b3be957

Parents:

2302217da042315eb0c77eb207bebd8a2bdff294

Message:

*hannes: fix newHEdge


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

Location:

kernel

Files:

• kstd1.cc (modified) (2 diffs)
• kutil.cc (modified) (19 diffs)

kernel/kstd1.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd1.cc,v 1.28 2007-11-06 17:55:57 Singular Exp $ */
+/* $Id: kstd1.cc,v 1.29 2007-11-07 14:28:46 Singular Exp $ */
 /*
 * ABSTRACT:
@@ -1146 +1146 @@
   strat->update = TRUE;
   /*- setting global variables ------------------- -*/
-  {
-    int i;
-    currRing->weight_all_1=TRUE;
-    for(i=currRing->N; i>0; i--)
-    {
-      if (pWeight(i)!=1) { currRing->weight_all_1=FALSE; break; }
-    }
-    if ((currRing->weight_all_1==0) && TEST_OPT_PROT) PrintS("not all weights are 1\n");
-  }
   initBuchMoraCrit(strat);
   initHilbCrit(F,Q,&hilb,strat);

kernel/kutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.cc,v 1.69 2007-11-06 17:55:58 Singular Exp $ */
+/* $Id: kutil.cc,v 1.70 2007-11-07 14:28:46 Singular Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -4895 +4895 @@
         if (TEST_OPT_DEBUG)
           {PrintS("reduce ");wrp(h);Print(" with S[%d] (",j);wrp(strat->S[j]);}
-
 #endif
         h = ksOldSpolyRed(strat->S[j],h,strat->kNoetherTail());
@@ -4901 +4900 @@
         if(TEST_OPT_DEBUG)
           {PrintS(")\nto "); wrp(h); PrintLn();}
-
 #endif
         // pDelete(&h);
@@ -4954 +4952 @@
             change=TRUE;
             any_change=TRUE;
-            #ifdef KDEBUG
+            #ifdef KDEBUG
             if (TEST_OPT_DEBUG)
             {
@@ -4960 +4958 @@
               wrp(redSi);PrintS(" to ");p_wrp(strat->S[i], currRing, strat->tailRing);PrintLn();
             }
-            #endif
+            #endif
             if (TEST_OPT_PROT)
             {
@@ -5316 +5314 @@
   }
 #endif
+  #ifdef KDEBUG
   if (TEST_OPT_DEBUG)
   {
@@ -5321 +5320 @@
     else              PrintS("ideal/module is not homogeneous\n");
   }
+  #endif
 }
 
@@ -5669 +5669 @@
   poly newNoether;
 
+#if 0
   if (currRing->weight_all_1)
     scComputeHC(strat->Shdl,NULL,strat->ak,strat->kHEdge, strat->tailRing);
   else
     scComputeHCw(strat->Shdl,NULL,strat->ak,strat->kHEdge, strat->tailRing);
+#else    
+  scComputeHC(strat->Shdl,NULL,strat->ak,strat->kHEdge, strat->tailRing);
+#endif  
   if (strat->t_kHEdge != NULL) p_LmFree(strat->t_kHEdge, strat->tailRing);
   if (strat->tailRing != currRing)
@@ -6056 +6060 @@
   }
 }
-
 #endif
 
@@ -6065 +6068 @@
 * put the pairs (s[i],sh \dot p)  into the set B, ecart=ecart(p)
 */
-
 void enterOnePairManyShifts (int i, poly p, int ecart, int isFromQ, kStrategy strat, int atR, int uptodeg, int lV)
 {
@@ -6078 +6080 @@
   }
 }
-
+#endif
+
+#ifdef HAVE_PLURAL
 /*2
 * put the pair (s[i],p)  into the set B, ecart=ecart(p)
 */
-
-
 void enterOnePairShift (int i, poly p, int ecart, int isFromQ, kStrategy strat, int atR, int uptodeg, int lV)
 {
@@ -6337 +6339 @@
   }
 }
-
-
-
+#endif
+
+#ifdef HAVE_PLURAL
 /*3
 *(s[0],h),...,(s[k],h) will be put to the pairset L
@@ -6399 +6401 @@
 #endif
 
-
-
 #ifdef HAVE_PLURAL
 /*2
@@ -6408 +6408 @@
 int redFirstShift (LObject* h,kStrategy strat)
 {
-  assume(rIsPluralRing(currRing));
   int at,reddeg,d,i;
   int pass = 0;
@@ -6447 +6446 @@
       #endif
       (*h).p = nc_ReduceSpoly(strat->S[j],(*h).p, currRing);
-      //  spSpolyRed(strat->T[j].p,(*h).p,strat->kNoether);
+      //spSpolyRed(strat->T[j].p,(*h).p,strat->kNoether);
 
       #ifdef KDEBUG
@@ -6476 +6475 @@
           #ifdef KDEBUG
           if (TEST_OPT_DEBUG) PrintS(" > sysComp\n");
-          #endif
+          #endif
           return 0;
         }
@@ -6503 +6502 @@
           #ifdef KDEBUG
           if (TEST_OPT_DEBUG) Print(" degree jumped; ->L%d\n",at);
-          #endif
+          #endif
           (*h).p = NULL;
           return 0;
@@ -6527 +6526 @@
   }
 }
-#endif
 
 
@@ -6650 +6648 @@
   }
 }
+#endif // HAVE_PLURAL
 
 #endif // KUTIL_CC