Changeset d77a70 in git

Timestamp:

Nov 15, 2010, 12:52:43 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

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:

• charset/charset.cc (modified) (3 diffs)
• factor/Factor.cc (modified) (2 diffs)

libfac/charset/charset.cc

@@ -323 +323 @@
 }
 
-#ifdef EXPERIMENTAL
-static CFList
-getItemNr( int nr, const ListCFList & copy){
-  int i =1;
-  CFList elem;
-
-  for ( ListCFListIterator j=copy; j.hasItem(); j++ )
-    if ( i == nr ) { elem=j.getItem(); break; }
-    else { i+= 1; }
-  return elem;
-}
-
-static int
-choosefrom(){
-int choice;
-    CERR << "choose from qhi! ->";
-    CIN >> choice;
-return choice;
-}
-
-static ListCFList
-msort( const ListCFList & list_to_sort ){
-  int nr, number = list_to_sort.length();
-  ListCFList output;
-
-  CERR << "Sort: list to sort is: " <<  list_to_sort << "\n";
-  for (int i=1; i<= number; i++){
-    CERR << " Next elem = "; CIN >> nr;
-    output.append(getItemNr(nr,list_to_sort));
-  }
-  return output;
-}
-#endif
-
 #ifdef IRRCHARSERIESDEBUG
 #  define DEBUGOUTPUT
@@ -370 +336 @@
   ListCFList pi,ppi,qqi,qsi,iss,qhi= ListCFList(PS);
   int nr_of_iteration=0,ts2,highestlevel=0;
-#ifdef EXPERIMENTAL
-  int choice=1;;
-#endif
 
 //  CERR << getCharacteristic() << "\n";
@@ -386 +349 @@
     qhi=sort(qhi);
     DEBOUTLN(CERR, "qhi is: ", qhi);
-#ifdef EXPERIMENTAL
-    choice=choosefrom();
-    CERR <<"/n Choose " << choice << "\n";
-    qs= getItemNr(choice, qhi);
-#else
     qs=qhi.getFirst();
-#endif
     DEBOUTLN(CERR, "qs  is: ", qs);
     DEBOUTLN(CERR, "ppi is: ", ppi);

libfac/factor/Factor.cc

@@ -588 +588 @@
 }
 
-#ifdef EXPERIMENTAL
-static int
-find_evaluation(int maxtries, int sametries, int failtries, const CanonicalForm &f , const Variable & Extension, SFormList & BestEvaluationpoint, CFFList & BestFactorisation ){
-  int success;
-
-  success=evaluate( maxtries, sametries, failtries, f , Extension, BestEvaluationpoint, BestFactorisation );
-  return success;
-}
-#endif
-
 ///////////////////////////////////////////////////////////////
 // A factorization routine for a sqrfree polynomial.         //
@@ -820 +810 @@
 }
 
-// for debuggig:
 int cmpCF( const CFFactor & f, const CFFactor & g );