ReadColumnMatrix::ReadColumnMatrix(string df) : distFile(df){
- successOpen = openInputFile(distFile, fileHandle);
+ successOpen = m->openInputFile(distFile, fileHandle);
}
if(itB == nameMap->end()){
cerr << "ABError: Sequence '" << secondName << "' was not found in the names file, please correct\n"; exit(1);
}
+//if (((itA->second == 8) && (itB->second == 1588)) || ((itA->second == 1588) && (itB->second == 8))) { cout << "found it" << endl; }
if (distance == -1) { distance = 1000000; }
else if (globaldata->sim) { distance = 1.0 - distance; } //user has entered a sim matrix that we need to convert.
}
reading->update(itA->second * nseqs);
}
- gobble(fileHandle);
+ m->gobble(fileHandle);
}
if(lt == 0){ // oops, it was square
fileHandle.close(); //let's start over
D->clear(); //let's start over
- openInputFile(distFile, fileHandle); //let's start over
+ m->openInputFile(distFile, fileHandle); //let's start over
while(fileHandle){
fileHandle >> firstName >> secondName >> distance;
reading->update(itA->second * nseqs);
}
- gobble(fileHandle);
+ m->gobble(fileHandle);
}
}