Changeset d77a70 in git


Ignore:
Timestamp:
Nov 15, 2010, 12:52:43 PM (14 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b52fc4b2495505785981d640dcf7eb3e456778ef')
Children:
c840d97af622b4e4da8761738b540e21144f716b
Parents:
7993adcf5a444486c5b07eacda51e7dfc6d67afc
Message:
experimenatl stuff removed

git-svn-id: file:///usr/local/Singular/svn/trunk@13653 2c84dea3-7e68-4137-9b89-c4e89433aadc
Location:
libfac
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • libfac/charset/charset.cc

    r7993ad rd77a70  
    323323}
    324324
    325 #ifdef EXPERIMENTAL
    326 static CFList
    327 getItemNr( int nr, const ListCFList & copy){
    328   int i =1;
    329   CFList elem;
    330 
    331   for ( ListCFListIterator j=copy; j.hasItem(); j++ )
    332     if ( i == nr ) { elem=j.getItem(); break; }
    333     else { i+= 1; }
    334   return elem;
    335 }
    336 
    337 static int
    338 choosefrom(){
    339 int choice;
    340     CERR << "choose from qhi! ->";
    341     CIN >> choice;
    342 return choice;
    343 }
    344 
    345 static ListCFList
    346 msort( const ListCFList & list_to_sort ){
    347   int nr, number = list_to_sort.length();
    348   ListCFList output;
    349 
    350   CERR << "Sort: list to sort is: " <<  list_to_sort << "\n";
    351   for (int i=1; i<= number; i++){
    352     CERR << " Next elem = "; CIN >> nr;
    353     output.append(getItemNr(nr,list_to_sort));
    354   }
    355   return output;
    356 }
    357 #endif
    358 
    359325#ifdef IRRCHARSERIESDEBUG
    360326#  define DEBUGOUTPUT
     
    370336  ListCFList pi,ppi,qqi,qsi,iss,qhi= ListCFList(PS);
    371337  int nr_of_iteration=0,ts2,highestlevel=0;
    372 #ifdef EXPERIMENTAL
    373   int choice=1;;
    374 #endif
    375338
    376339//  CERR << getCharacteristic() << "\n";
     
    386349    qhi=sort(qhi);
    387350    DEBOUTLN(CERR, "qhi is: ", qhi);
    388 #ifdef EXPERIMENTAL
    389     choice=choosefrom();
    390     CERR <<"/n Choose " << choice << "\n";
    391     qs= getItemNr(choice, qhi);
    392 #else
    393351    qs=qhi.getFirst();
    394 #endif
    395352    DEBOUTLN(CERR, "qs  is: ", qs);
    396353    DEBOUTLN(CERR, "ppi is: ", ppi);
  • libfac/factor/Factor.cc

    r7993ad rd77a70  
    588588}
    589589
    590 #ifdef EXPERIMENTAL
    591 static int
    592 find_evaluation(int maxtries, int sametries, int failtries, const CanonicalForm &f , const Variable & Extension, SFormList & BestEvaluationpoint, CFFList & BestFactorisation ){
    593   int success;
    594 
    595   success=evaluate( maxtries, sametries, failtries, f , Extension, BestEvaluationpoint, BestFactorisation );
    596   return success;
    597 }
    598 #endif
    599 
    600590///////////////////////////////////////////////////////////////
    601591// A factorization routine for a sqrfree polynomial.         //
     
    820810}
    821811
    822 // for debuggig:
    823812int cmpCF( const CFFactor & f, const CFFactor & g );
    824813
Note: See TracChangeset for help on using the changeset viewer.