merged with superdouble for large trees without the library

AncSplit.cpp

@@ -16,16 +16,13 @@
 
 #include "AncSplit.h"
 #include "RateModel.h"
-
+#include "superdouble.h"
 #include <vector>
 using namespace std;
 
-#ifdef BIGTREE
-#include "gmpfrxx/gmpfrxx.h"
-#endif
 
 
-AncSplit::AncSplit(RateModel * mod,int dist,int ldesc,int rdesc,double we):model(mod),weight(we),
+AncSplit::AncSplit(RateModel * mod,int dist,int ldesc,int rdesc,Superdouble we):model(mod),weight(we),
 		likelihood(0),ancdistint(dist),ldescdistint(ldesc),rdescdistint(rdesc){}
 
 RateModel * AncSplit::getModel(){
@@ -36,21 +33,10 @@ double AncSplit::getWeight(){
 	return weight;
 }
 
-
-#ifdef BIGTREE
-mpfr_class AncSplit::getLikelihood(){
-	return likelihood;
-}
-
-void AncSplit::setLikelihood(mpfr_class li){
-	likelihood = li;
-}
-#else
-double AncSplit::getLikelihood(){
+Superdouble AncSplit::getLikelihood(){
 	return likelihood;
 }
 
-void AncSplit::setLikelihood(double li){
+void AncSplit::setLikelihood(Superdouble li){
 	likelihood = li;
 }
-#endif

AncSplit.h

@@ -20,33 +20,21 @@
 #include <vector>
 //using namespace std;
 
+#include "superdouble.h"
 #include "RateModel.h"
 
-#ifdef BIGTREE
-#include "gmpfrxx/gmpfrxx.h"
-#endif
-
 class AncSplit{
 	private:
 		RateModel * model;
 		double weight;
-#ifdef BIGTREE
-		mpfr_class likelihood;
-#else
-		double likelihood;
-#endif
+		Superdouble likelihood;
 
 	public:
-		AncSplit(RateModel * mod,int,int,int,double);
+		AncSplit(RateModel * mod,int,int,int,Superdouble);
 		RateModel * getModel();
 		double getWeight();
-#ifdef BIGTREE
-		mpfr_class getLikelihood();
-		void setLikelihood(mpfr_class li);
-#else
-		double getLikelihood();
-		void setLikelihood(double li);
-#endif
+		Superdouble getLikelihood();
+		void setLikelihood(Superdouble li);
 		int ancdistint;
 		int ldescdistint;
 		int rdescdistint;