X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=aligncommand.h;h=7eeaa1eb7e7bc3e2dc28d144d646b2190eb34983;hb=2c97dd48b8e27ee0a6a86c7a082f4c504c3357c6;hp=6236958a42a886bf5178aab8571f1513c596e00f;hpb=ae57e166b2ed7b475ec3f466106bd76fabadd063;p=mothur.git

diff --git a/aligncommand.h b/aligncommand.h
index 6236958..7eeaa1e 100644
--- a/aligncommand.h
+++ b/aligncommand.h
@@ -1,6 +1,5 @@
 #ifndef ALIGNCOMMAND_H
 #define ALIGNCOMMAND_H
-
 /*
  *  aligncommand.h
  *  Mothur
@@ -10,7 +9,6 @@
  *
  */
 
-#include "mothur.h"
 #include "command.hpp"
 #include "database.hpp"
 #include "alignment.hpp"
@@ -25,7 +23,7 @@
 #include "nast.hpp"
 #include "nastreport.hpp"
 
-
+//test
 class AlignCommand : public Command {
 	
 public:
@@ -78,7 +76,8 @@ private:
 //custom data structure for threads to use.
 // This is passed by void pointer so it can be any data type
 // that can be passed using a single void pointer (LPVOID).
-typedef struct alignData {
+struct alignData {
+	string templateFileName;
 	string alignFName; 
 	string reportFName; 
 	string accnosFName;
@@ -94,7 +93,8 @@ typedef struct alignData {
 	int count, kmerSize, threadID;
 	
 	alignData(){}
-	alignData(string a, string r, string ac, string f, string al, string se, int ks, MothurOut* mout, unsigned long long st, unsigned long long en, bool fl, float ma, float misMa, float gapO, float gapE, float thr, int tid) {
+	alignData(string te, string a, string r, string ac, string f, string al, string se, int ks, MothurOut* mout, unsigned long long st, unsigned long long en, bool fl, float ma, float misMa, float gapO, float gapE, float thr, int tid) {
+		templateFileName = te;
 		alignFName = a;
 		reportFName = r;
 		accnosFName = ac;
@@ -118,7 +118,7 @@ typedef struct alignData {
 };
 
 /**************************************************************************************************/
-#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
 #else
 static DWORD WINAPI MyAlignThreadFunction(LPVOID lpParam){ 
 	alignData* pDataArray;
@@ -145,7 +145,7 @@ static DWORD WINAPI MyAlignThreadFunction(LPVOID lpParam){
 		
 		pDataArray->count = pDataArray->end;
 		
-		AlignmentDB* templateDB = new AlignmentDB("saved-silent", pDataArray->search, pDataArray->kmerSize, pDataArray->gapOpen, pDataArray->gapExtend, pDataArray->match, pDataArray->misMatch, pDataArray->threadID);
+		AlignmentDB* templateDB = new AlignmentDB(pDataArray->templateFileName, pDataArray->search, pDataArray->kmerSize, pDataArray->gapOpen, pDataArray->gapExtend, pDataArray->match, pDataArray->misMatch, pDataArray->threadID);
 		
 		//moved this into driver to avoid deep copies in windows paralellized version
 		Alignment* alignment;