X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=readtree.h;h=540f80cfa731ab2102fa0a8908737321f73a5cba;hb=44b464979e91c2a1f144ac45ca12c14fcf6579f0;hp=653a853c5f300de0886205217a6b8d99682627b6;hpb=5e8fcd2454ba4bd2e11983afd682b8aa6f7bb5c2;p=mothur.git

diff --git a/readtree.h b/readtree.h
index 653a853..540f80c 100644
--- a/readtree.h
+++ b/readtree.h
@@ -9,12 +9,8 @@
  *
  */
 
-using namespace std;
-
-#include <string>
-#include <iostream>
+#include "mothur.h"
 #include "globaldata.hpp"
-#include "utilities.hpp"
 #include "tree.h"
 
 #define MAX_LINE		513
@@ -27,9 +23,9 @@ class Tree;
 class ReadTree {
 	public:
 		ReadTree(); 
-		~ReadTree() {};
+		virtual ~ReadTree() {};
 		
-		virtual void read() {};
+		virtual int read() = 0;
 		int readSpecialChar(istream&, char, string);
 		int readNodeChar(istream& f);
 		float readBranchLength(istream& f);
@@ -37,6 +33,8 @@ class ReadTree {
 	protected:
 		GlobalData* globaldata;
 		int numNodes, numLeaves;
+		MothurOut* m;
+		
 		
 };
 
@@ -45,18 +43,20 @@ class ReadTree {
 class ReadNewickTree : public ReadTree {
 	
 public:
-	ReadNewickTree(string file) : treeFile(file) { openInputFile(file, filehandle);  } 
+	ReadNewickTree(string file) : treeFile(file) { openInputFile(file, filehandle); readOk = 0; } 
 	~ReadNewickTree() {};
-	void read();
+	int read();
 	
 private:
 	Tree* T;
 	int readNewickInt(istream&, int&, Tree*);
-	void readTreeString();
+	int readTreeString();
 	void nexusTranslation();
 	ifstream filehandle;
 	string treeFile;
 	string holder;
+	int readOk;  // readOk = 0 means success, readOk = 1 means errors.
+	
 };
 
 /****************************************************************************/