Changeset a09a42 in git for kernel/kstd2.cc

Timestamp:

Jan 16, 2006, 3:02:52 PM (18 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

ce89df54a95c17d936886fb9f5a3c977f877d690

Parents:

e6e28e89e44a9e577c2fdbae4479e7ab4a01d1ca

Message:

*hannes: memeory leaks, formatting


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

File:

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

kernel/kstd2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd2.cc,v 1.6 2006-01-16 03:27:10 wienand Exp $ */
+/* $Id: kstd2.cc,v 1.7 2006-01-16 14:02:51 Singular Exp $ */
 /*
 *  ABSTRACT -  Kernel: alg. of Buchberger
@@ -164 +164 @@
 */
 
-long factorial(long arg) {
-   long tmp = 1;
-   for (int i = 2; i < arg + 1; i++) {
+long factorial(long arg)
+{
+   long tmp = 1; arg++;
+   for (int i = 2; i < arg; i++)
+   {
      tmp = tmp * i;
    }
@@ -172 +174 @@
 }
 
-poly kFindZeroPoly(poly input_p, ring leadRing, ring tailRing) {
+poly kFindZeroPoly(poly input_p, ring leadRing, ring tailRing)
+{
   // m = currRing->ch
 
@@ -185 +188 @@
   long k = 1;
 
-  while (a%2 == 0) {
+  while (a%2 == 0)
+  {
     a = a / 2;
     a_ind2++;
   }
 
-  for (int i = 1; i <= leadRing->N; i++) {
+  for (int i = 1; i <= leadRing->N; i++)
+  {
     a = factorial(pGetExp(p, i));
     k = k * a;
-    while (a%2 == 0) {
+    while (a%2 == 0)
+    {
       a = a / 2;
       k_ind2++;
@@ -202 +208 @@
   number tmp1;
   poly tmp2, tmp3;
-  if (leadRing->ch <= k_ind2 + a_ind2) {
+  if (leadRing->ch <= k_ind2 + a_ind2)
+  {
     zeroPoly = p_ISet(a, tailRing);
-    for (int i = 1; i <= leadRing->N; i++) {
-      for (long j = 1; j <= pGetExp(p, i); j++) {
+    for (int i = 1; i <= leadRing->N; i++)
+    {
+      for (long j = 1; j <= pGetExp(p, i); j++)
+      {
         tmp1 = nInit(j);
         tmp2 = p_ISet(1, tailRing);
         p_SetExp(tmp2, i, 1, tailRing);
         p_Setm(tmp2, tailRing);
-        if (nIsZero(tmp1)) {
+        if (nIsZero(tmp1))
+        {
           zeroPoly = p_Mult_q(zeroPoly, tmp2, tailRing);
         }
-        else {
+        else
+        {
           tmp3 = p_ISet((long) tmp1, tailRing);
           zeroPoly = p_Mult_q(zeroPoly, p_Add_q(tmp2, tmp3, tailRing), tailRing);
@@ -221 +232 @@
     zeroPoly = p_LmDeleteAndNext(zeroPoly, tailRing);
     tmp2 = pISet(a);
-    for (int i = 1; i <= leadRing->N; i++) {
+    for (int i = 1; i <= leadRing->N; i++)
+    {
       pSetExp(tmp2, i, pGetExp(p, i));
     }
@@ -228 +240 @@
     return tmp2;
   }
-  if (leadRing->ch - k_ind2 <= a_ind2) {
-    PrintS("Case not implented yet !!!"); PrintLn();
-    PrintS("But it should not mae any difference."); PrintLn();
+  if (leadRing->ch - k_ind2 <= a_ind2)
+  {
+    PrintS("Case not implented yet !!!\n");
+    PrintS("But it should not mae any difference.\n");
     return zeroPoly;
   }
@@ -236 +249 @@
 }
 
-poly kFindDivisibleByZeroPoly(LObject* h) {
+poly kFindDivisibleByZeroPoly(LObject* h)
+{
   return kFindZeroPoly(h->GetLmCurrRing(), currRing, h->tailRing);
 }
 
+#ifdef HAVE_RING2TOM
 /*2
 *  reduction procedure for the ring Z/2^m
@@ -253 +268 @@
   poly zeroPoly;
 
-#ifdef HAVE_RING2TOM
+//#ifdef HAVE_RING2TOM
   h->SetpFDeg();
   assume(h->pFDeg() == h->FDeg);
-  if (h->pFDeg() != h->FDeg) {
+  if (h->pFDeg() != h->FDeg)
+  {
     Print("h->pFDeg()=%d =!= h->FDeg=%d\n", h->pFDeg(), h->FDeg);
   }
   long reddeg = h->SetpFDeg();
-#else
-  assume(h->pFDeg() == h->FDeg);
-  long reddeg = h->GetpFDeg();
-#endif
+//#else
+//  assume(h->pFDeg() == h->FDeg);
+//  long reddeg = h->GetpFDeg();
+//#endif
 
   h->SetShortExpVector();
@@ -269 +285 @@
   {
     zeroPoly = kFindDivisibleByZeroPoly(h);
-    if (zeroPoly != NULL) {
+    if (zeroPoly != NULL)
+    {
 #ifdef KDEBUG
       if (TEST_OPT_DEBUG)
@@ -288 +305 @@
       j = strat->tl;
     }
-    else {
+    else
+    {
       j = kFindDivisibleByInT(strat->T, strat->sevT, strat->tl, h);
       if (j < 0) return 1;
@@ -359 +377 @@
   }
 }
+#endif
 #endif