Changeset 930ea8 in git


Ignore:
Timestamp:
Jan 11, 2012, 2:42:18 PM (12 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '4188d308699580d975efd0f6cca8dcb41c396f70')
Children:
6c98d526bf15bb5a2845bfd4fb4f54474229668c
Parents:
31f1850ad6697d9acd155b53fa63f9e1a648ed9c
Message:
chg: compiler warnings: newHEdge, messageStat
Location:
kernel
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • kernel/gr_kstd2.cc

    r31f1850 r930ea8  
    10681068  intvec *w=NULL;
    10691069  intvec *hilb=NULL;
    1070   int   srmax,lrmax;
    10711070  int   olddeg,reduc;
    10721071  int red_result=1;
     
    10851084  /*Shdl=*/initBuchMora(F, Q,strat);
    10861085  strat->posInT=posInT110;
    1087   srmax = strat->sl;
    1088   reduc = olddeg = lrmax = 0;
     1086  reduc = olddeg = 0;
    10891087
    10901088  /* compute------------------------------------------------------- */
    10911089  while (strat->Ll >= 0)
    10921090  {
    1093     if (strat->Ll > lrmax) lrmax =strat->Ll;/*stat.*/
    1094 
    10951091    if (TEST_OPT_DEBUG) messageSets(strat);
    10961092
     
    12481244      }
    12491245      if (strat->P.lcm!=NULL) pLmFree(strat->P.lcm);
    1250       if (strat->sl>srmax) srmax = strat->sl;
    12511246    }
    12521247#ifdef KDEBUG
     
    12891284//    }
    12901285//  }
    1291   if (TEST_OPT_PROT) messageStat(srmax,lrmax,hilbcount,strat);
     1286  if (TEST_OPT_PROT) messageStat(hilbcount,strat);
    12921287  if (Q!=NULL) updateResult(strat->Shdl,Q,strat);
    12931288
  • kernel/kstd1.cc

    r31f1850 r930ea8  
    993993  if (strat->kHEdgeFound)
    994994  {
    995     if (newHEdge(strat->S,strat))
     995    if (newHEdge(strat))
    996996    {
    997997      firstUpdate(strat);
     
    10371037  if ((!strat->kHEdgeFound) || (strat->kNoether!=NULL)) HEckeTest(p.p,strat);
    10381038  if (strat->kHEdgeFound)
    1039     newHEdge(strat->S,strat);
     1039    newHEdge(strat);
    10401040  else if (strat->kNoether!=NULL)
    10411041    strat->kHEdgeFound = TRUE;
     
    11641164  om_Opts.MinTrack = 5;
    11651165#endif
    1166   int srmax;
    1167   int lrmax = 0;
    11681166  int olddeg = 0;
    11691167  int reduc = 0;
     
    12051203    reorderL(strat);
    12061204  }
    1207   srmax = strat->sl;
    1208 
    12091205  kTest_TS(strat);
    12101206  strat->use_buckets = kMoraUseBucket(strat);
     
    12251221    mora_loop_count++;
    12261222#endif
    1227     if (lrmax< strat->Ll) lrmax=strat->Ll; /*stat*/
    12281223    #ifdef KDEBUG
    12291224    if (TEST_OPT_DEBUG) messageSets(strat);
     
    13451340      memset(&strat->P,0,sizeof(strat->P));
    13461341#endif
    1347       if (strat->sl>srmax) srmax = strat->sl; /*stat.*/
    1348       if (strat->Ll>lrmax) lrmax = strat->Ll;
    13491342    }
    13501343    if (strat->kHEdgeFound)
     
    13851378  pDelete(&strat->kNoether);
    13861379  omFreeSize((ADDRESS)strat->NotUsedAxis,((currRing->N)+1)*sizeof(BOOLEAN));
    1387   if (TEST_OPT_PROT) messageStat(srmax,lrmax,hilbcount,strat);
     1380  if (TEST_OPT_PROT) messageStat(hilbcount,strat);
    13881381//  if (TEST_OPT_WEIGHTM)
    13891382//  {
     
    22482241{
    22492242  need_retry=0;
    2250   int   srmax,lrmax, red_result = 1;
     2243  int   red_result = 1;
    22512244  int   olddeg,reduc;
    22522245  BOOLEAN withT = FALSE;
     
    22982291
    22992292  /*Shdl=*/initBuchMora(F, Q, strat);
    2300   srmax = strat->sl;
    2301   reduc = olddeg = lrmax = 0;
     2293  reduc = olddeg = 0;
    23022294
    23032295#ifndef NO_BUCKETS
     
    23202312  while (strat->Ll >= 0)
    23212313  {
    2322     if (strat->Ll > lrmax) lrmax =strat->Ll;/*stat.*/
    23232314    #ifdef KDEBUG
    23242315      if (TEST_OPT_DEBUG) messageSets(strat);
     
    23972388        pLmFree(strat->P.lcm);
    23982389#endif
    2399       if (strat->sl>srmax) srmax = strat->sl;
    24002390      if (pos<strat->sl)
    24012391      {
     
    24922482//    }
    24932483//  }
    2494   //if (TEST_OPT_PROT) messageStat(srmax,lrmax,0/*hilbcount*/,strat);
     2484  //if (TEST_OPT_PROT) messageStat(0/*hilbcount*/,strat);
    24952485  if (Q!=NULL) updateResult(strat->Shdl,Q,strat);
    24962486  ideal res=strat->Shdl;
  • kernel/kstd2.cc

    r31f1850 r930ea8  
    980980#endif /* KDEBUG */
    981981  om_Opts.MinTrack = 5;
    982   int   srmax,lrmax, red_result = 1;
     982  int   red_result = 1;
    983983  int   olddeg,reduc;
    984984  int hilbeledeg=1,hilbcount=0,minimcnt=0;
     
    992992  /*Shdl=*/initBuchMora(F, Q,strat);
    993993  if (strat->minim>0) strat->M=idInit(IDELEMS(F),F->rank);
    994   srmax = strat->sl;
    995   reduc = olddeg = lrmax = 0;
     994  reduc = olddeg = 0;
    996995
    997996#ifndef NO_BUCKETS
     
    10371036  while (strat->Ll >= 0)
    10381037  {
    1039     if (strat->Ll > lrmax) lrmax =strat->Ll;/*stat.*/
    10401038    #ifdef KDEBUG
    10411039      loop_count++;
     
    12221220        pLmFree(strat->P.lcm);
    12231221#endif
    1224       if (strat->sl>srmax) srmax = strat->sl;
    12251222    }
    12261223    else if (strat->P.p1 == NULL && strat->minim > 0)
     
    12881285//    }
    12891286//  }
    1290   if (TEST_OPT_PROT) messageStat(srmax,lrmax,hilbcount,strat);
     1287  if (TEST_OPT_PROT) messageStat(hilbcount,strat);
    12911288  if (Q!=NULL) updateResult(strat->Shdl,Q,strat);
    12921289
     
    14631460#endif
    14641461  om_Opts.MinTrack = 5;
    1465   int   srmax,lrmax, red_result = 1;
     1462  int   red_result = 1;
    14661463  int   olddeg,reduc;
    14671464  int hilbeledeg=1,hilbcount=0,minimcnt=0;
     
    14771474
    14781475  if (strat->minim>0) strat->M=idInit(IDELEMS(F),F->rank);
    1479   srmax = strat->sl;
    1480   reduc = olddeg = lrmax = 0;
     1476  reduc = olddeg = 0;
    14811477  strat->lV=lV;
    14821478
     
    15001496  while (strat->Ll >= 0)
    15011497  {
    1502     if (strat->Ll > lrmax) lrmax =strat->Ll;/*stat.*/
    15031498#ifdef KDEBUG
    15041499    loop_count++;
     
    17181713//      Print("[%d]",hilbeledeg);
    17191714      if (strat->P.lcm!=NULL) pLmFree(strat->P.lcm);
    1720       if (strat->sl>srmax) srmax = strat->sl;
    17211715    }
    17221716    else
     
    18001794//    }
    18011795//  }
    1802   if (TEST_OPT_PROT) messageStat(srmax,lrmax,hilbcount,strat);
     1796  if (TEST_OPT_PROT) messageStat(hilbcount,strat);
    18031797  if (Q!=NULL) updateResult(strat->Shdl,Q,strat);
    18041798  return (strat->Shdl);
  • kernel/kstdfac.cc

    r31f1850 r930ea8  
    547547ideal bbafac (ideal F, ideal Q,intvec *w,kStrategy strat, ideal_list FL)
    548548{
    549   int   srmax,lrmax;
    550549  int   olddeg,reduc=0;
    551550  int red_result = 1;
    552   srmax = strat->sl;
    553   reduc = olddeg = lrmax = 0;
     551  reduc = olddeg = 0;
    554552  /* compute------------------------------------------------------- */
    555553  if ((strat->Ll==-1) && (strat->sl>=0))
     
    560558  while (strat->Ll >= 0)
    561559  {
    562     if (strat->Ll > lrmax) lrmax =strat->Ll;/*stat.*/
    563560    if (TEST_OPT_DEBUG) messageSets(strat);
    564561    if (strat->Ll== 0) strat->interpt=TRUE;
     
    711708        }
    712709        kTest_TS(n);
    713         if (n->sl>srmax) srmax = n->sl;
    714 
    715710        /* construct D */
    716711        if (IDELEMS(fac)>1)
     
    888883  }
    889884  exitBuchMora(strat);
    890   if (TEST_OPT_PROT) { PrintLn(); messageStat(srmax,lrmax,0,strat); }
     885  if (TEST_OPT_PROT) { PrintLn(); messageStat(0,strat); }
    891886  if (Q!=NULL) updateResult(strat->Shdl,Q,strat);
    892887  return (strat->Shdl);
  • kernel/kutil.cc

    r31f1850 r930ea8  
    47664766*statistics
    47674767*/
    4768 void messageStat (int srmax,int lrmax,int hilbcount,kStrategy strat)
     4768void messageStat (int hilbcount,kStrategy strat)
    47694769{
    47704770  //PrintS("\nUsage/Allocation of temporary storage:\n");
     
    55325532        }
    55335533        if (strat->kHEdgeFound)
    5534           newHEdge(strat->S,strat);
     5534          newHEdge(strat);
    55355535      }
    55365536    }
     
    57435743}
    57445744
    5745 void initHilbCrit(ideal F, ideal Q, intvec **hilb,kStrategy strat)
     5745void initHilbCrit(ideal/*F*/, ideal /*Q*/, intvec **hilb,kStrategy strat)
    57465746{
    57475747  if (strat->homog!=isHomog)
     
    61346134      }
    61356135      #endif
    6136       poly p;
    61376136      if (currRing->OrdSgn == 1)
    61386137        strat->S[i] = redtailBba(&L, end_pos, strat, withT);
     
    62186217* returns TRUE, if pNoether has changed
    62196218*/
    6220 BOOLEAN newHEdge(polyset S, kStrategy strat)
     6219BOOLEAN newHEdge(kStrategy strat)
    62216220{
    62226221  int i,j;
  • kernel/kutil.h

    r31f1850 r930ea8  
    441441void pairs ();
    442442void message (int i,int* reduc,int* olddeg,kStrategy strat,int red_result);
    443 void messageStat (int srmax,int lrmax,int hilbcount,kStrategy strat);
     443void messageStat (int hilbcount,kStrategy strat);
    444444#ifdef KDEBUG
    445445void messageSets (kStrategy strat);
     
    467467void chainCritNormal (poly p,int ecart,kStrategy strat);
    468468BOOLEAN homogTest(polyset F, int Fmax);
    469 BOOLEAN newHEdge(polyset S, kStrategy strat);
     469BOOLEAN newHEdge(kStrategy strat);
    470470// returns index of p in TSet, or -1 if not found
    471471int kFindInT(poly p, TSet T, int tlength);
  • kernel/sca.cc

    r31f1850 r930ea8  
    149149#endif
    150150
    151   int srmax, lrmax;
    152151  int olddeg, reduc;
    153152  int red_result = 1;
     
    168167  strat->posInT=posInT110; // !!!
    169168
    170   srmax = strat->sl;
    171   reduc = olddeg = lrmax = 0;
     169  reduc = olddeg = 0;
    172170
    173171
     
    180178    )
    181179  {
    182     if (strat->Ll > lrmax) lrmax =strat->Ll;// stat.
    183 
    184180#ifdef KDEBUG
    185181    if (TEST_OPT_DEBUG) messageSets(strat);
     
    235231
    236232    addLObject(strat->P, strat);
    237 
    238     if (strat->sl > srmax) srmax = strat->sl;
    239233
    240234    const poly save = strat->P.p;
     
    307301  //       h.p = save;
    308302  //       addLObject(h, strat);
    309 
    310 //         if (strat->sl > srmax) srmax = strat->sl;
    311303      }
    312304
     
    340332  }
    341333
    342   if (TEST_OPT_PROT) messageStat(srmax,lrmax,hilbcount,strat);
     334  if (TEST_OPT_PROT) messageStat(hilbcount,strat);
    343335
    344336  if (tempQ!=NULL) updateResult(strat->Shdl,tempQ,strat);
     
    436428#endif
    437429
    438   int   srmax, lrmax, red_result = 1;
     430  int   red_result = 1;
    439431  int   olddeg, reduc;
    440432
     
    458450//   if (strat->minim>0) strat->M = idInit(IDELEMS(F),F->rank);
    459451
    460   srmax = strat->sl;
    461   reduc = olddeg = lrmax = 0;
     452  reduc = olddeg = 0;
    462453
    463454#define NO_BUCKETS
     
    548539  while (strat->Ll >= 0)
    549540  {
    550     if (strat->Ll > lrmax) lrmax =strat->Ll;// stat.
    551 
    552541#ifdef KDEBUG
    553542//     loop_count++;
     
    693682      if (strat->P.lcm!=NULL) pLmFree(strat->P.lcm);
    694683
    695       if (strat->sl>srmax) srmax = strat->sl;
    696 
    697684      // //////////////////////////////////////////////////////////
    698685      // SCA:
     
    836823  }
    837824
    838   if (TEST_OPT_PROT) messageStat(srmax,lrmax,hilbcount,strat);
     825  if (TEST_OPT_PROT) messageStat(hilbcount,strat);
    839826
    840827
     
    969956
    970957
    971   int srmax = strat->sl;
    972   int lrmax = strat->Ll;
    973958  int olddeg = 0;
    974959  int reduc = 0;
     
    10361021
    10371022              enterL(&strat->L,&strat->Ll,&strat->Lmax,h,pos);
    1038 
    1039               if (strat->Ll>lrmax) lrmax = strat->Ll;
    10401023            }
    10411024      }
     
    10521035    sca_mora_loop_count++;
    10531036#endif
    1054     if (lrmax< strat->Ll) lrmax=strat->Ll; // stat
    10551037    //test_int_std(strat->kIdeal);
    10561038#ifdef KDEBUG
     
    11451127      strat->P.lcm=NULL;
    11461128
    1147       if (strat->sl>srmax) srmax = strat->sl; // stat.
    1148       if (strat->Ll>lrmax) lrmax = strat->Ll;
    1149 
    1150 
    1151 
    11521129      // //////////////////////////////////////////////////////////
    11531130      // SCA:
     
    11861163
    11871164        enterL(&strat->L,&strat->Ll,&strat->Lmax,h,pos);
    1188 
    1189         if (strat->Ll>lrmax) lrmax = strat->Ll;
    11901165      }
    11911166
     
    12311206  pDelete(&strat->kNoether);
    12321207  omFreeSize((ADDRESS)strat->NotUsedAxis,(pVariables+1)*sizeof(BOOLEAN));
    1233   if (TEST_OPT_PROT) messageStat(srmax,lrmax,hilbcount,strat);
     1208  if (TEST_OPT_PROT) messageStat(hilbcount,strat);
    12341209  if (TEST_OPT_WEIGHTM)
    12351210  {
Note: See TracChangeset for help on using the changeset viewer.