cleaning

Author: blackrim

src/BioGeoTree.cpp

@@ -249,7 +249,7 @@ vector<Superdouble> BioGeoTree::conditionals(Node &node, bool marginal, bool spa
             }
         }
         for (unsigned int j = 0; j < distconds.size(); j++) {
-            distconds[j] = v->at(j);
+            distconds[j] = v->at(j);            
         }
         if (store_p_matrices == true) {
             tsegs->at(i).seg_sp_alphas = distconds;

src/RateMatrixUtils.cpp

@@ -186,6 +186,13 @@ void print_vector_double(vector<double> & in){
 	}cout << endl;
 }
 
+void print_vector_superdouble(vector<Superdouble> & in){
+	for(unsigned int i=0;i<in.size();i++){
+		cout << in[i].getMantissa() << "x" << in[i].getExponent() << " ";
+	}cout << endl;
+}
+
+
 inline bool IsMoreThanZero (double & i) { return (i!=0); }
 
 int get_size_for_coo(vector<vector<double> > & inmatrix, double t){

src/RateMatrixUtils.h

@@ -63,6 +63,8 @@ void iter_ancsplits_just_int(RateModel *rm, vector<int> & dist,vector<int> & lef
  */
 void print_vector_int(vector<int> & in);
 void print_vector_double(vector<double> & in);
+void print_vector_superdouble(vector<Superdouble> & in);
+
 
 /*
   used for generating all the distributions with maximium number of areas involved

src/superdouble.cpp

@@ -29,19 +29,25 @@ double Superdouble::getMantissa(){
 
 void Superdouble::adjustDecimal() {
 	stilldouble = false;
+	if (fabs(mantissa) < 1e+100 &&  fabs(mantissa) > 1e-100){
+		return;
+	}
 	if (mantissa==0 || isinf(mantissa) || isnan(mantissa)) {
 		exponent=0;
 		stilldouble = true;
-	}
-	else {
+	}else {
+		int exa = int(round(log10(mantissa) - 0.5));
+		mantissa=mantissa / pow(10,exa);
+		exponent += exa;
+		/*
 		while (fabs(mantissa)>=10) {
 			mantissa*=0.1;
 			exponent+=1;
 		}
 		while (fabs(mantissa)<1) {
 			mantissa*=10.0;
 			exponent+=-1;
-		}
+		}*/
 	}
 }