Fixes problem with insert location in opti

mothur · 031e1b861dc2c94392e04b1275c203dcd056cf52 · mothur-westcott committed Aug 31, 2016 · Aug 31, 2016 · 031e1b8
1 parent 10a6f19
commit 031e1b861dc2c94392e04b1275c203dcd056cf52
Unified Split

Showing with 110 additions and 82 deletions.

+1 −1 source/commands/clustercommand.cpp

+1 −1 source/commands/clustersplitcommand.cpp

+1 −1 source/commands/sensspeccommand.h

+89 −62 source/opticluster.cpp

+18 −17 source/opticluster.h
diff --git a/source/commands/clustercommand.cpp b/source/commands/clustercommand.cpp
@@ -881,7 +881,7 @@ int ClusterCommand::runOptiCluster(){
         
         m->mothurOut("\n\niter\tlabel\tcutoff\ttp\ttn\tfp\tfn\tsensitivity\tspecificity\tppv\tnpv\tfdr\taccuracy\tmcc\tf1score\n");
         outStep << "iter\tlabel\tcutoff\ttp\ttn\tfp\tfn\tsensitivity\tspecificity\tppv\tnpv\tfdr\taccuracy\tmcc\tf1score\n";
-        unsigned long long tp, tn, fp, fn;
+         long long tp, tn, fp, fn;
         vector<double> results = cluster.getStats(tp, tn, fp, fn);
         m->mothurOut("0\t" + toString(cutoff) + "\t" + toString(cutoff) + "\t" + toString(tp) + "\t" + toString(tn) + "\t" + toString(fp) + "\t" + toString(fn) + "\t");
         outStep << "0\t" + toString(cutoff) + "\t" + toString(cutoff) + "\t" << tp << '\t' << tn << '\t' << fp << '\t' << fn << '\t';
diff --git a/source/commands/clustersplitcommand.cpp b/source/commands/clustersplitcommand.cpp
@@ -1428,7 +1428,7 @@ string ClusterSplitCommand::runOptiCluster(string thisDistFile, string thisNamef
             m->mothurRemove(thisNamefile);
         }
         
-        unsigned long long tp, tn, fp, fn;
+         long long tp, tn, fp, fn;
         m->mothurOut("\ntp\ttn\tfp\tfn\tsensitivity\tspecificity\tppv\tnpv\tfdr\taccuracy\tmcc\tf1score\n");
         vector<double> results = cluster.getStats(tp, tn, fp, fn);
         m->mothurOut(toString(tp) + "\t" + toString(tn) + "\t" + toString(fp) + "\t" + toString(fn) + "\t");
diff --git a/source/commands/sensspeccommand.h b/source/commands/sensspeccommand.h
@@ -47,7 +47,7 @@ class SensSpecCommand : public Command {
 	vector<string> outputNames;
 	set<string> labels; //holds labels to be used
 
-	unsigned long long truePositives, falsePositives, trueNegatives, falseNegatives;
+	 long long truePositives, falsePositives, trueNegatives, falseNegatives;
 	bool abort, allLines, square;
 	double cutoff;
 	int precision;