Changeset 930ea8 in git for kernel/sca.cc

Timestamp:

Jan 11, 2012, 2:42:18 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

6c98d526bf15bb5a2845bfd4fb4f54474229668c

Parents:

31f1850ad6697d9acd155b53fa63f9e1a648ed9c

Message:

chg: compiler warnings: newHEdge, messageStat

File:

• kernel/sca.cc (modified) (17 diffs)

kernel/sca.cc

@@ -149 +149 @@
 #endif
 
-  int srmax, lrmax;
   int olddeg, reduc;
   int red_result = 1;
@@ -168 +167 @@
   strat->posInT=posInT110; // !!!
 
-  srmax = strat->sl;
-  reduc = olddeg = lrmax = 0;
+  reduc = olddeg = 0;
 
 
@@ -180 +178 @@
     )
   {
-    if (strat->Ll > lrmax) lrmax =strat->Ll;// stat.
-
 #ifdef KDEBUG
     if (TEST_OPT_DEBUG) messageSets(strat);
@@ -235 +231 @@
 
     addLObject(strat->P, strat);
-
-    if (strat->sl > srmax) srmax = strat->sl;
 
     const poly save = strat->P.p;
@@ -307 +301 @@
   //       h.p = save;
   //       addLObject(h, strat);
-
-//         if (strat->sl > srmax) srmax = strat->sl;
       }
 
@@ -340 +332 @@
   }
 
-  if (TEST_OPT_PROT) messageStat(srmax,lrmax,hilbcount,strat);
+  if (TEST_OPT_PROT) messageStat(hilbcount,strat);
 
   if (tempQ!=NULL) updateResult(strat->Shdl,tempQ,strat);
@@ -436 +428 @@
 #endif
 
-  int   srmax, lrmax, red_result = 1;
+  int   red_result = 1;
   int   olddeg, reduc;
 
@@ -458 +450 @@
 //   if (strat->minim>0) strat->M = idInit(IDELEMS(F),F->rank);
 
-  srmax = strat->sl;
-  reduc = olddeg = lrmax = 0;
+  reduc = olddeg = 0;
 
 #define NO_BUCKETS
@@ -548 +539 @@
   while (strat->Ll >= 0)
   {
-    if (strat->Ll > lrmax) lrmax =strat->Ll;// stat.
-
 #ifdef KDEBUG
 //     loop_count++;
@@ -693 +682 @@
       if (strat->P.lcm!=NULL) pLmFree(strat->P.lcm);
 
-      if (strat->sl>srmax) srmax = strat->sl;
-
       // //////////////////////////////////////////////////////////
       // SCA:
@@ -836 +823 @@
   }
 
-  if (TEST_OPT_PROT) messageStat(srmax,lrmax,hilbcount,strat);
+  if (TEST_OPT_PROT) messageStat(hilbcount,strat);
 
 
@@ -969 +956 @@
 
 
-  int srmax = strat->sl;
-  int lrmax = strat->Ll;
   int olddeg = 0;
   int reduc = 0;
@@ -1036 +1021 @@
 
               enterL(&strat->L,&strat->Ll,&strat->Lmax,h,pos);
-
-              if (strat->Ll>lrmax) lrmax = strat->Ll;
             }
       }
@@ -1052 +1035 @@
     sca_mora_loop_count++;
 #endif
-    if (lrmax< strat->Ll) lrmax=strat->Ll; // stat
     //test_int_std(strat->kIdeal);
 #ifdef KDEBUG
@@ -1145 +1127 @@
       strat->P.lcm=NULL;
 
-      if (strat->sl>srmax) srmax = strat->sl; // stat.
-      if (strat->Ll>lrmax) lrmax = strat->Ll;
-
-
-
       // //////////////////////////////////////////////////////////
       // SCA:
@@ -1186 +1163 @@
 
         enterL(&strat->L,&strat->Ll,&strat->Lmax,h,pos);
-
-        if (strat->Ll>lrmax) lrmax = strat->Ll;
       }
 
@@ -1231 +1206 @@
   pDelete(&strat->kNoether);
   omFreeSize((ADDRESS)strat->NotUsedAxis,(pVariables+1)*sizeof(BOOLEAN));
-  if (TEST_OPT_PROT) messageStat(srmax,lrmax,hilbcount,strat);
+  if (TEST_OPT_PROT) messageStat(hilbcount,strat);
   if (TEST_OPT_WEIGHTM)
   {