test

[mothur.git] / bellerophon.h

diff --git a/bellerophon.h b/bellerophon.h
index b79089c97c87e13e8f93288707ef9b374595d34a..aa53f9852f20202ae77841fbf9262a9802356bbe 100644 (file)
--- a/bellerophon.h
+++ b/bellerophon.h
@@ -13,30 +13,22 @@
 
 #include "chimera.h"
 #include "filterseqscommand.h"
+#include "sparsematrix.hpp"
 #include "sequence.hpp"
 #include "dist.h"
 
-struct Preference {
-               string name;
-               vector<string> leftParent; //keep the name of closest left associated with the two scores
-               vector<string> rightParent; //keep the name of closest right associated with the two scores
-               vector<float> score;  //so you can keep last score and calc this score and keep whichever is bigger.
-               vector<float> closestLeft;  //keep the closest left associated with the two scores
-               vector<float> closestRight; //keep the closest right associated with the two scores
-               int midpoint;
-
-};
-
+typedef list<PCell>::iterator MatData;
+typedef map<int, float> SeqMap;  //maps sequence to all distance for that seqeunce
 
 /***********************************************************/
 
 class Bellerophon : public Chimera {
        
        public:
-               Bellerophon(string);    
+               Bellerophon(string, string);    
                ~Bellerophon() {};
                
-               void getChimeras();
+               int getChimeras();
                void print(ostream&);
                
                void setCons(string){};
@@ -46,7 +38,7 @@ class Bellerophon : public Chimera {
        private:
                Dist* distCalculator;
                FilterSeqsCommand* filterSeqs;
-               vector<Sequence> seqs;
+               vector<Sequence*> seqs;
                vector<Preference> pref;
                string fastafile;
                int iters;